Rename MD5Digester -> Digester.

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

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 296002c742385cbbc4a2f10ea3e6f7bbefa86348..342b9a9990438ba39e383c710c9dd3bac7d36cb4 100644 (file)
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -26,7 +27,7 @@
 #include "log.h"
 #include "ffmpeg_subtitle_stream.h"
 #include "ffmpeg_audio_stream.h"
-#include "md5_digester.h"
+#include "digester.h"
 #include "compose.hpp"
 extern "C" {
 #include <libavcodec/avcodec.h>
@@ -56,7 +57,6 @@ FFmpeg::FFmpeg (boost::shared_ptr<const FFmpegContent> c)
        , _avio_context (0)
        , _format_context (0)
        , _frame (0)
-       , _video_stream (-1)
 {
        setup_general ();
        setup_decoders ();
@@ -140,7 +140,7 @@ FFmpeg::setup_general ()
 
        /* Find video stream */
 
-       int video_stream_undefined_frame_rate = -1;
+       optional<int> video_stream_undefined_frame_rate;
 
        for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
                AVStream* s = _format_context->streams[i];
@@ -158,12 +158,8 @@ FFmpeg::setup_general ()
        /* Files from iTunes sometimes have two video streams, one with the avg_frame_rate.num and .den set
           to zero.  Only use such a stream if there is no alternative.
        */
-       if (_video_stream == -1 && video_stream_undefined_frame_rate != -1) {
-               _video_stream = video_stream_undefined_frame_rate;
-       }
-
-       if (_video_stream < 0) {
-               throw DecodeError (N_("could not find video stream"));
+       if (!_video_stream && video_stream_undefined_frame_rate) {
+               _video_stream = video_stream_undefined_frame_rate.get();
        }
 
        /* Hack: if the AVStreams have duplicate IDs, replace them with our
@@ -224,7 +220,8 @@ FFmpeg::setup_decoders ()
 AVCodecContext *
 FFmpeg::video_codec_context () const
 {
-       return _format_context->streams[_video_stream]->codec;
+       DCPOMATIC_ASSERT (_video_stream);
+       return _format_context->streams[_video_stream.get()]->codec;
 }
 
 AVCodecContext *
@@ -272,7 +269,7 @@ FFmpeg::subtitle_period (AVSubtitle const & sub)
 string
 FFmpeg::subtitle_id (AVSubtitle const & sub)
 {
-       MD5Digester digester;
+       Digester digester;
        digester.add (sub.pts);
        for (unsigned int i = 0; i < sub.num_rects; ++i) {
                AVSubtitleRect* rect = sub.rects[i];
@@ -280,10 +277,17 @@ FFmpeg::subtitle_id (AVSubtitle const & sub)
                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);
+               }
+#else
                int const line = rect->linesize[0];
                for (int j = 0; j < rect->h; ++j) {
                        digester.add (rect->data[0] + j * line, line);
                }
+#endif
        }
        return digester.get ();
 }