Store audio length in AudioStream.

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

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 64866047863afc9de6b9f9893609d84958e4c723..bf9bafbfa8400a6c24a7386913e1bc0480e81e8b 100644 (file)
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -61,9 +61,17 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
                                s->codec->channel_layout = av_get_default_channel_layout (s->codec->channels);
                        }
 
+                       DCPOMATIC_ASSERT (_format_context->duration != AV_NOPTS_VALUE);
+
                        _audio_streams.push_back (
                                shared_ptr<FFmpegAudioStream> (
-                                       new FFmpegAudioStream (audio_stream_name (s), s->id, s->codec->sample_rate, s->codec->channels)
+                                       new FFmpegAudioStream (
+                                               audio_stream_name (s),
+                                               s->id,
+                                               s->codec->sample_rate,
+                                               (double (_format_context->duration) / AV_TIME_BASE) * s->codec->sample_rate,
+                                               s->codec->channels
+                                               )
                                        )
                                );
 
@@ -72,10 +80,12 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
                }
        }
 
-       /* See if the header has duration information in it */
-       _need_video_length = _format_context->duration == AV_NOPTS_VALUE;
-       if (!_need_video_length) {
-               _video_length = (double (_format_context->duration) / AV_TIME_BASE) * video_frame_rate().get ();
+       if (has_video ()) {
+               /* See if the header has duration information in it */
+               _need_video_length = _format_context->duration == AV_NOPTS_VALUE;
+               if (!_need_video_length) {
+                       _video_length = (double (_format_context->duration) / AV_TIME_BASE) * video_frame_rate().get ();
+               }
        }
 
        if (job) {
@@ -113,7 +123,7 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
 
                AVCodecContext* context = _format_context->streams[_packet.stream_index]->codec;
 
-               if (_packet.stream_index == _video_stream) {
+               if (_video_stream && _packet.stream_index == _video_stream.get()) {
                        video_packet (context);
                }
 
@@ -169,7 +179,7 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
           this is because we might not know the PTS offset when the first subtitle is seen.
           Now we know the PTS offset so we can apply it to those subtitles.
        */
-       if (video_frame_rate()) {
+       if (has_video() && video_frame_rate()) {
                BOOST_FOREACH (shared_ptr<FFmpegSubtitleStream> i, _subtitle_streams) {
                        i->add_offset (pts_offset (_audio_streams, _first_video, video_frame_rate().get()));
                }
@@ -179,6 +189,8 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
 void
 FFmpegExaminer::video_packet (AVCodecContext* context)
 {
+       DCPOMATIC_ASSERT (_video_stream);
+
        if (_first_video && !_need_video_length) {
                return;
        }
@@ -186,11 +198,11 @@ FFmpegExaminer::video_packet (AVCodecContext* context)
        int frame_finished;
        if (avcodec_decode_video2 (context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
                if (!_first_video) {
-                       _first_video = frame_time (_format_context->streams[_video_stream]);
+                       _first_video = frame_time (_format_context->streams[_video_stream.get()]);
                }
                if (_need_video_length) {
                        _video_length = frame_time (
-                               _format_context->streams[_video_stream]
+                               _format_context->streams[_video_stream.get()]
                                ).get_value_or (ContentTime ()).frames_round (video_frame_rate().get ());
                }
        }
@@ -249,6 +261,19 @@ FFmpegExaminer::subtitle_packet (AVCodecContext* context, shared_ptr<FFmpegSubti
 
                for (unsigned int i = 0; i < sub.num_rects; ++i) {
                        if (sub.rects[i]->type == SUBTITLE_BITMAP) {
+#ifdef DCPOMATIC_HAVE_AVSUBTITLERECT_PICT
+                               uint32_t* palette = (uint32_t *) sub.rects[i]->pict.data[1];
+                               for (int j = 0; j < sub.rects[i]->nb_colors; ++j) {
+                                       RGBA rgba  (
+                                               (palette[j] & 0x00ff0000) >> 16,
+                                               (palette[j] & 0x0000ff00) >> 8,
+                                               (palette[j] & 0x000000ff) >> 0,
+                                               (palette[j] & 0xff000000) >> 24
+                                               );
+
+                                       stream->set_colour (rgba, rgba);
+                               }
+#else
                                uint32_t* palette = (uint32_t *) sub.rects[i]->data[1];
                                for (int j = 0; j < sub.rects[i]->nb_colors; ++j) {
                                        RGBA rgba  (
@@ -260,6 +285,7 @@ FFmpegExaminer::subtitle_packet (AVCodecContext* context, shared_ptr<FFmpegSubti
 
                                        stream->set_colour (rgba, rgba);
                                }
+#endif
                        }
                }
 
@@ -283,11 +309,12 @@ FFmpegExaminer::frame_time (AVStream* s) const
 optional<double>
 FFmpegExaminer::video_frame_rate () const
 {
+       DCPOMATIC_ASSERT (_video_stream);
        /* 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]));
+       return av_q2d (av_stream_get_r_frame_rate (_format_context->streams[_video_stream.get()]));
 }
 
 dcp::Size
@@ -306,7 +333,8 @@ FFmpegExaminer::video_length () const
 optional<double>
 FFmpegExaminer::sample_aspect_ratio () const
 {
-       AVRational sar = av_guess_sample_aspect_ratio (_format_context, _format_context->streams[_video_stream], 0);
+       DCPOMATIC_ASSERT (_video_stream);
+       AVRational sar = av_guess_sample_aspect_ratio (_format_context, _format_context->streams[_video_stream.get()], 0);
        if (sar.num == 0) {
                /* I assume this means that we don't know */
                return optional<double> ();
@@ -459,3 +487,9 @@ FFmpegExaminer::yuv () const
                return false;
        }
 }
+
+bool
+FFmpegExaminer::has_video () const
+{
+       return static_cast<bool> (_video_stream);
+}