Rename Time::round_up to Time::ceil.

[dcpomatic.git] / src / lib / ffmpeg.cc

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 8c0f0798eb0742d7e1ddc388c39a451fafd437c8..ce87cc14f2d7801f2974202008012f624b09d1ae 100644 (file)
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -23,12 +23,12 @@
 #include "film.h"
 #include "exceptions.h"
 #include "util.h"
-#include "raw_convert.h"
 #include "log.h"
 #include "ffmpeg_subtitle_stream.h"
 #include "ffmpeg_audio_stream.h"
 #include "digester.h"
 #include "compose.hpp"
+#include <dcp/raw_convert.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
@@ -46,6 +46,7 @@ using std::cerr;
 using std::vector;
 using boost::shared_ptr;
 using boost::optional;
+using dcp::raw_convert;
 
 boost::mutex FFmpeg::_mutex;
 boost::weak_ptr<Log> FFmpeg::_ffmpeg_log;
@@ -130,8 +131,9 @@ FFmpeg::setup_general ()
        av_dict_set (&options, "analyzeduration", raw_convert<string> (5 * 60 * 1000000).c_str(), 0);
        av_dict_set (&options, "probesize", raw_convert<string> (5 * 60 * 1000000).c_str(), 0);
 
-       if (avformat_open_input (&_format_context, 0, 0, &options) < 0) {
-               throw OpenFileError (_ffmpeg_content->path(0).string ());
+       int e = avformat_open_input (&_format_context, 0, 0, &options);
+       if (e < 0) {
+               throw OpenFileError (_ffmpeg_content->path(0).string(), e, true);
        }
 
        if (avformat_find_stream_info (_format_context, 0) < 0) {
@@ -224,7 +226,10 @@ FFmpeg::setup_decoders ()
 AVCodecContext *
 FFmpeg::video_codec_context () const
 {
-       DCPOMATIC_ASSERT (_video_stream);
+       if (!_video_stream) {
+               return 0;
+       }
+
        return _format_context->streams[_video_stream.get()]->codec;
 }
 
@@ -277,21 +282,27 @@ FFmpeg::subtitle_id (AVSubtitle const & sub)
        digester.add (sub.pts);
        for (unsigned int i = 0; i < sub.num_rects; ++i) {
                AVSubtitleRect* rect = sub.rects[i];
-               digester.add (rect->x);
-               digester.add (rect->y);
-               digester.add (rect->w);
-               digester.add (rect->h);
+               if (rect->type == SUBTITLE_BITMAP) {
+                       digester.add (rect->x);
+                       digester.add (rect->y);
+                       digester.add (rect->w);
+                       digester.add (rect->h);
 #ifdef DCPOMATIC_HAVE_AVSUBTITLERECT_PICT
-               int const line = rect->pict.linesize[0];
-               for (int j = 0; j < rect->h; ++j) {
-                       digester.add (rect->pict.data[0] + j * line, line);
-               }
+                       int const line = rect->pict.linesize[0];
+                       for (int j = 0; j < rect->h; ++j) {
+                               digester.add (rect->pict.data[0] + j * line, line);
+                       }
 #else
-               int const line = rect->linesize[0];
-               for (int j = 0; j < rect->h; ++j) {
-                       digester.add (rect->data[0] + j * line, line);
-               }
+                       int const line = rect->linesize[0];
+                       for (int j = 0; j < rect->h; ++j) {
+                               digester.add (rect->data[0] + j * line, line);
+                       }
 #endif
+               } else if (rect->type == SUBTITLE_TEXT) {
+                       digester.add (string (rect->text));
+               } else if (rect->type == SUBTITLE_ASS) {
+                       digester.add (string (rect->ass));
+               }
        }
        return digester.get ();
 }
@@ -370,7 +381,7 @@ FFmpeg::pts_offset (vector<shared_ptr<FFmpegAudioStream> > audio_streams, option
        /* Now adjust so that the video pts starts on a frame */
        if (first_video) {
                ContentTime const fvc = first_video.get() + po;
-               po += fvc.round_up (video_frame_rate) - fvc;
+               po += fvc.ceil (video_frame_rate) - fvc;
        }
 
        return po;