Various fixes to FFmpeg decoder, including a couple of tests.

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

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index ceeaee112fdeba0d66680f9fa557a7833789d643..72db9bce1a3cd9abf1b3c2191eb5ed1f0180d10a 100644 (file)
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -24,8 +24,11 @@ extern "C" {
 #include "ffmpeg_examiner.h"
 #include "ffmpeg_content.h"
 
+#include "i18n.h"
+
 using std::string;
 using std::cout;
+using std::max;
 using std::stringstream;
 using boost::shared_ptr;
 using boost::optional;
@@ -49,12 +52,12 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c)
                        
                        _audio_streams.push_back (
                                shared_ptr<FFmpegAudioStream> (
-                                       new FFmpegAudioStream (stream_name (s), i, s->codec->sample_rate, s->codec->channels)
+                                       new FFmpegAudioStream (audio_stream_name (s), s->id, s->codec->sample_rate, s->codec->channels)
                                        )
                                );
 
                } else if (s->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
-                       _subtitle_streams.push_back (shared_ptr<FFmpegSubtitleStream> (new FFmpegSubtitleStream (stream_name (s), i)));
+                       _subtitle_streams.push_back (shared_ptr<FFmpegSubtitleStream> (new FFmpegSubtitleStream (subtitle_stream_name (s), s->id)));
                }
        }
 
@@ -67,19 +70,18 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c)
                }
 
                int frame_finished;
-               avcodec_get_frame_defaults (_frame);
 
                AVCodecContext* context = _format_context->streams[_packet.stream_index]->codec;
 
                if (_packet.stream_index == _video_stream && !_first_video) {
                        if (avcodec_decode_video2 (context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
-                               _first_video = frame_time (_video_stream);
+                               _first_video = frame_time (_format_context->streams[_video_stream]);
                        }
                } else {
                        for (size_t i = 0; i < _audio_streams.size(); ++i) {
-                               if (_packet.stream_index == _audio_streams[i]->id && !_audio_streams[i]->first_audio) {
+                               if (_audio_streams[i]->uses_index (_format_context, _packet.stream_index) && !_audio_streams[i]->first_audio) {
                                        if (avcodec_decode_audio4 (context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
-                                               _audio_streams[i]->first_audio = frame_time (_audio_streams[i]->id);
+                                               _audio_streams[i]->first_audio = frame_time (_audio_streams[i]->stream (_format_context));
                                        }
                                }
                        }
@@ -100,14 +102,14 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c)
        }
 }
 
-optional<double>
-FFmpegExaminer::frame_time (int stream) const
+optional<ContentTime>
+FFmpegExaminer::frame_time (AVStream* s) const
 {
-       optional<double> t;
+       optional<ContentTime> t;
        
        int64_t const bet = av_frame_get_best_effort_timestamp (_frame);
        if (bet != AV_NOPTS_VALUE) {
-               t = bet * av_q2d (_format_context->streams[stream]->time_base);
+               t = ContentTime::from_seconds (bet * av_q2d (s->time_base));
        }
 
        return t;
@@ -116,26 +118,55 @@ FFmpegExaminer::frame_time (int stream) const
 float
 FFmpegExaminer::video_frame_rate () const
 {
-       AVStream* s = _format_context->streams[_video_stream];
-
-       if (s->avg_frame_rate.num && s->avg_frame_rate.den) {
-               return av_q2d (s->avg_frame_rate);
-       }
-
-       return av_q2d (s->r_frame_rate);
+       /* This use of r_frame_rate is debateable; there's a few different
+        * frame rates in the format context, but this one seems to be the most
+        * reliable.
+        */
+       return av_q2d (av_stream_get_r_frame_rate (_format_context->streams[_video_stream]));
 }
 
-libdcp::Size
+dcp::Size
 FFmpegExaminer::video_size () const
 {
-       return libdcp::Size (video_codec_context()->width, video_codec_context()->height);
+       return dcp::Size (video_codec_context()->width, video_codec_context()->height);
 }
 
-/** @return Length (in video frames) according to our content's header */
-VideoContent::Frame
+/** @return Length according to our content's header */
+ContentTime
 FFmpegExaminer::video_length () const
 {
-       return (double (_format_context->duration) / AV_TIME_BASE) * video_frame_rate();
+       ContentTime const length = ContentTime::from_seconds (double (_format_context->duration) / AV_TIME_BASE);
+       return ContentTime (max (int64_t (1), length.get ()));
+}
+
+string
+FFmpegExaminer::audio_stream_name (AVStream* s) const
+{
+       stringstream n;
+
+       n << stream_name (s);
+
+       if (!n.str().empty()) {
+               n << "; ";
+       }
+
+       n << s->codec->channels << " channels";
+
+       return n.str ();
+}
+
+string
+FFmpegExaminer::subtitle_stream_name (AVStream* s) const
+{
+       stringstream n;
+
+       n << stream_name (s);
+
+       if (n.str().empty()) {
+               n << _("unknown");
+       }
+
+       return n.str ();
 }
 
 string
@@ -158,9 +189,5 @@ FFmpegExaminer::stream_name (AVStream* s) const
                }
        }
 
-       if (n.str().empty()) {
-               n << "unknown";
-       }
-
        return n.str ();
 }