X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.cc;h=673de3a1d771f2e14099d315496950cf26c7c283;hb=53d0a9a844841fe10b2720543c032a687c548108;hp=39951d13942e41b56cc8d0f62705989124b91c18;hpb=3339d3bce70afe9ae2ca10e9fcfc4b54b748fbf4;p=dcpomatic.git diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index 39951d139..673de3a1d 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -26,17 +26,18 @@ #include "ffmpeg_audio_stream.h" #include "ffmpeg_subtitle_stream.h" #include "util.h" -#include "warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS extern "C" { #include #include #include #include -#include +#include #include +#include } -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include "i18n.h" @@ -69,34 +70,25 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr c, shared_ptrnb_streams; ++i) { auto s = _format_context->streams[i]; -DCPOMATIC_DISABLE_WARNINGS - if (s->codec->codec_type == AVMEDIA_TYPE_AUDIO) { - - /* This is a hack; sometimes it seems that _audio_codec_context->channel_layout isn't set up, - so bodge it here. No idea why we should have to do this. - */ - - if (s->codec->channel_layout == 0) { - s->codec->channel_layout = av_get_default_channel_layout (s->codec->channels); - } + auto codec = _codec_context[i] ? _codec_context[i]->codec : nullptr; + if (s->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && codec) { DCPOMATIC_ASSERT (_format_context->duration != AV_NOPTS_VALUE); - DCPOMATIC_ASSERT (s->codec->codec); - DCPOMATIC_ASSERT (s->codec->codec->name); + DCPOMATIC_ASSERT (codec->name); _audio_streams.push_back ( make_shared( stream_name (s), - s->codec->codec->name, + codec->name, s->id, - s->codec->sample_rate, - llrint ((double(_format_context->duration) / AV_TIME_BASE) * s->codec->sample_rate), - s->codec->channels + s->codecpar->sample_rate, + llrint ((double(_format_context->duration) / AV_TIME_BASE) * s->codecpar->sample_rate), + s->codecpar->ch_layout.nb_channels ) ); - } else if (s->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) { - _subtitle_streams.push_back (shared_ptr (new FFmpegSubtitleStream (subtitle_stream_name (s), s->id))); + } else if (s->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) { + _subtitle_streams.push_back (make_shared(subtitle_stream_name (s), s->id)); } } @@ -141,8 +133,7 @@ DCPOMATIC_DISABLE_WARNINGS } } - auto context = _format_context->streams[packet->stream_index]->codec; -DCPOMATIC_ENABLE_WARNINGS + auto context = _codec_context[packet->stream_index]; if (_video_stream && packet->stream_index == _video_stream.get()) { video_packet (context, temporal_reference, packet); @@ -161,31 +152,20 @@ DCPOMATIC_ENABLE_WARNINGS av_packet_free (&packet); - if (_first_video && got_all_audio && temporal_reference.size() >= (PULLDOWN_CHECK_FRAMES * 2)) { + if (got_all_audio && (!_video_stream || (_first_video && temporal_reference.size() >= (PULLDOWN_CHECK_FRAMES * 2)))) { /* All done */ break; } } if (_video_stream) { - AVPacket packet; - av_init_packet (&packet); - packet.data = nullptr; - packet.size = 0; -DCPOMATIC_DISABLE_WARNINGS - auto context = _format_context->streams[*_video_stream]->codec; -DCPOMATIC_ENABLE_WARNINGS - while (video_packet(context, temporal_reference, &packet)) {} + auto context = _codec_context[_video_stream.get()]; + while (video_packet(context, temporal_reference, nullptr)) {} } for (auto i: _audio_streams) { - AVPacket packet; - av_init_packet (&packet); - packet.data = nullptr; - packet.size = 0; -DCPOMATIC_DISABLE_WARNINGS - audio_packet (i->stream(_format_context)->codec, i, &packet); -DCPOMATIC_ENABLE_WARNINGS + auto context = _codec_context[i->index(_format_context)]; + audio_packet(context, i, nullptr); } if (_video_stream) { @@ -233,24 +213,38 @@ FFmpegExaminer::video_packet (AVCodecContext* context, string& temporal_referenc return false; } - int frame_finished; -DCPOMATIC_DISABLE_WARNINGS - if (avcodec_decode_video2 (context, _frame, &frame_finished, packet) < 0 || !frame_finished) { - return false; - } -DCPOMATIC_ENABLE_WARNINGS + bool pending = false; + do { + int r = avcodec_send_packet (context, packet); + if (r < 0) { + LOG_WARNING("avcodec_send_packet returned %1 for a video packet", r); + } + + /* EAGAIN means we should call avcodec_receive_frame and then re-send the same packet */ + pending = r == AVERROR(EAGAIN); + + r = avcodec_receive_frame (context, _video_frame); + if (r == AVERROR(EAGAIN)) { + /* More input is required */ + return true; + } else if (r == AVERROR_EOF) { + /* No more output is coming */ + return false; + } + } while (pending); if (!_first_video) { - _first_video = frame_time (_format_context->streams[_video_stream.get()]); + _first_video = frame_time (_video_frame, _format_context->streams[_video_stream.get()]); } if (_need_video_length) { _video_length = frame_time ( + _video_frame, _format_context->streams[_video_stream.get()] ).get_value_or (ContentTime ()).frames_round (video_frame_rate().get ()); } if (temporal_reference.size() < (PULLDOWN_CHECK_FRAMES * 2)) { - temporal_reference += (_frame->top_field_first ? "T" : "B"); - temporal_reference += (_frame->repeat_pict ? "3" : "2"); + temporal_reference += (_video_frame->top_field_first ? "T" : "B"); + temporal_reference += (_video_frame->repeat_pict ? "3" : "2"); } return true; @@ -264,25 +258,30 @@ FFmpegExaminer::audio_packet (AVCodecContext* context, shared_ptr= 0 && frame_finished) { -DCPOMATIC_ENABLE_WARNINGS - stream->first_audio = frame_time (stream->stream (_format_context)); + int r = avcodec_send_packet (context, packet); + if (r < 0) { + LOG_WARNING("avcodec_send_packet returned %1 for an audio packet", r); + return; + } + + auto frame = audio_frame (stream); + + if (avcodec_receive_frame (context, frame) < 0) { + return; } + + stream->first_audio = frame_time (frame, stream->stream(_format_context)); } optional -FFmpegExaminer::frame_time (AVStream* s) const +FFmpegExaminer::frame_time (AVFrame* frame, AVStream* stream) const { optional t; -DCPOMATIC_DISABLE_WARNINGS - int64_t const bet = av_frame_get_best_effort_timestamp (_frame); -DCPOMATIC_ENABLE_WARNINGS + int64_t const bet = frame->best_effort_timestamp; if (bet != AV_NOPTS_VALUE) { - t = ContentTime::from_seconds (bet * av_q2d (s->time_base)); + t = ContentTime::from_seconds (bet * av_q2d(stream->time_base)); } return t; @@ -476,3 +475,13 @@ FFmpegExaminer::range () const return VideoRange::FULL; } } + + +PixelQuanta +FFmpegExaminer::pixel_quanta () const +{ + auto const desc = av_pix_fmt_desc_get(video_codec_context()->pix_fmt); + DCPOMATIC_ASSERT (desc); + return { 1 << desc->log2_chroma_w, 1 << desc->log2_chroma_h }; +} +