Tidy up to use one list of servers.

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

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index ce87cc14f2d7801f2974202008012f624b09d1ae..5171166d5f0e9aeea6ea9ae60cbe5dd391cf79df 100644 (file)
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -110,8 +110,6 @@ FFmpeg::ffmpeg_log_callback (void* ptr, int level, const char* fmt, va_list vl)
 void
 FFmpeg::setup_general ()
 {
-       av_register_all ();
-
        /* This might not work too well in some cases of multiple FFmpeg decoders,
           but it's probably good enough.
        */
@@ -146,7 +144,7 @@ FFmpeg::setup_general ()
 
        for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
                AVStream* s = _format_context->streams[i];
-               if (s->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+               if (s->codec->codec_type == AVMEDIA_TYPE_VIDEO && avcodec_find_decoder(s->codec->codec_id)) {
                        if (s->avg_frame_rate.num > 0 && s->avg_frame_rate.den > 0) {
                                /* This is definitely our video stream */
                                _video_stream = i;
@@ -217,9 +215,12 @@ FFmpeg::setup_decoders ()
                        if (avcodec_open2 (context, codec, &options) < 0) {
                                throw DecodeError (N_("could not open decoder"));
                        }
+               } else {
+                       shared_ptr<Log> log = _ffmpeg_log.lock ();
+                       if (log) {
+                               log->log (String::compose ("No codec found for stream %1", i), LogEntry::TYPE_WARNING);
+                       }
                }
-
-               /* We are silently ignoring any failures to find suitable decoders here */
        }
 }
 
@@ -275,65 +276,6 @@ FFmpeg::subtitle_period (AVSubtitle const & sub)
                );
 }
 
-string
-FFmpeg::subtitle_id (AVSubtitle const & sub)
-{
-       Digester digester;
-       digester.add (sub.pts);
-       for (unsigned int i = 0; i < sub.num_rects; ++i) {
-               AVSubtitleRect* rect = sub.rects[i];
-               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);
-                       }
-#else
-                       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 ();
-}
-
-/** @return true if sub starts a new image subtitle */
-bool
-FFmpeg::subtitle_starts_image (AVSubtitle const & sub)
-{
-       bool image = false;
-       bool text = false;
-
-       for (unsigned int i = 0; i < sub.num_rects; ++i) {
-               switch (sub.rects[i]->type) {
-               case SUBTITLE_BITMAP:
-                       image = true;
-                       break;
-               case SUBTITLE_TEXT:
-               case SUBTITLE_ASS:
-                       text = true;
-                       break;
-               default:
-                       break;
-               }
-       }
-
-       /* We can't cope with mixed image/text in one AVSubtitle */
-       DCPOMATIC_ASSERT (!image || !text);
-
-       return image;
-}
-
 /** Compute the pts offset to use given a set of audio streams and some video details.
  *  Sometimes these parameters will have just been determined by an Examiner, sometimes
  *  they will have been retrieved from a piece of Content, hence the need for this method