X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.cc;h=46f4f236e889515eca0254da7f7195be74efb5bb;hb=f3617efde1751ac9e55f692369dc4ba3c6350ca8;hp=4498fa698d07308e731cc00adab5bcf13f7694b8;hpb=d5960f1da64e08b01e799b65655c4e6a60a2b8ce;p=dcpomatic.git diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index 4498fa698..46f4f236e 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + #include "dcpomatic_log.h" #include "ffmpeg_examiner.h" #include "ffmpeg_content.h" @@ -25,26 +26,29 @@ #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" -using std::string; + using std::cout; +using std::make_shared; using std::max; -using std::vector; using std::shared_ptr; +using std::string; +using std::vector; using boost::optional; using namespace dcpomatic; @@ -65,37 +69,35 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr c, shared_ptrnb_streams; ++i) { - AVStream* s = _format_context->streams[i]; -DCPOMATIC_DISABLE_WARNINGS - if (s->codec->codec_type == AVMEDIA_TYPE_AUDIO) { + auto s = _format_context->streams[i]; + auto codec = _codec_context[i] ? _codec_context[i]->codec : nullptr; + if (s->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && codec) { /* 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); + if (s->codecpar->channel_layout == 0) { + s->codecpar->channel_layout = av_get_default_channel_layout (s->codecpar->channels); } 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 ( - shared_ptr ( - new FFmpegAudioStream ( - stream_name (s), - s->codec->codec->name, - s->id, - s->codec->sample_rate, - llrint ((double (_format_context->duration) / AV_TIME_BASE) * s->codec->sample_rate), - s->codec->channels - ) + make_shared( + stream_name (s), + codec->name, + s->id, + s->codecpar->sample_rate, + llrint ((double(_format_context->duration) / AV_TIME_BASE) * s->codecpar->sample_rate), + s->codecpar->channels, + s->codecpar->bits_per_raw_sample ? s->codecpar->bits_per_raw_sample : s->codecpar->bits_per_coded_sample ) ); - } 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)); } } @@ -124,8 +126,11 @@ DCPOMATIC_DISABLE_WARNINGS */ string temporal_reference; while (true) { - int r = av_read_frame (_format_context, &_packet); + auto packet = av_packet_alloc (); + DCPOMATIC_ASSERT (packet); + int r = av_read_frame (_format_context, packet); if (r < 0) { + av_packet_free (&packet); break; } @@ -137,25 +142,24 @@ 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); + if (_video_stream && packet->stream_index == _video_stream.get()) { + video_packet (context, temporal_reference, packet); } bool got_all_audio = true; for (size_t i = 0; i < _audio_streams.size(); ++i) { - if (_audio_streams[i]->uses_index (_format_context, _packet.stream_index)) { - audio_packet (context, _audio_streams[i]); + if (_audio_streams[i]->uses_index(_format_context, packet->stream_index)) { + audio_packet (context, _audio_streams[i], packet); } if (!_audio_streams[i]->first_audio) { got_all_audio = false; } } - av_packet_unref (&_packet); + av_packet_free (&packet); if (_first_video && got_all_audio && temporal_reference.size() >= (PULLDOWN_CHECK_FRAMES * 2)) { /* All done */ @@ -163,21 +167,20 @@ DCPOMATIC_ENABLE_WARNINGS } } - _packet.data = nullptr; - _packet.size = 0; - /* XXX: I'm not sure this makes any sense: how does _packet.stream_index get the right value here? */ - auto context = _format_context->streams[_packet.stream_index]->codec; - while (video_packet(context, temporal_reference)) {} - for (size_t i = 0; i < _audio_streams.size(); ++i) { - if (_audio_streams[i]->uses_index (_format_context, _packet.stream_index)) { - audio_packet (context, _audio_streams[i]); - } + if (_video_stream) { + auto context = _codec_context[_video_stream.get()]; + while (video_packet(context, temporal_reference, nullptr)) {} + } + + for (auto i: _audio_streams) { + auto context = _codec_context[i->index(_format_context)]; + audio_packet(context, i, nullptr); } if (_video_stream) { /* This code taken from get_rotation() in ffmpeg:cmdutils.c */ - AVStream* stream = _format_context->streams[*_video_stream]; - AVDictionaryEntry* rotate_tag = av_dict_get (stream->metadata, "rotate", 0, 0); + auto stream = _format_context->streams[*_video_stream]; + auto rotate_tag = av_dict_get (stream->metadata, "rotate", 0, 0); uint8_t* displaymatrix = av_stream_get_side_data (stream, AV_PKT_DATA_DISPLAYMATRIX, 0); _rotation = 0; @@ -211,7 +214,7 @@ DCPOMATIC_ENABLE_WARNINGS * @return true if some video was decoded, otherwise false. */ bool -FFmpegExaminer::video_packet (AVCodecContext* context, string& temporal_reference) +FFmpegExaminer::video_packet (AVCodecContext* context, string& temporal_reference, AVPacket* packet) { DCPOMATIC_ASSERT (_video_stream); @@ -219,24 +222,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; @@ -244,31 +261,36 @@ DCPOMATIC_ENABLE_WARNINGS void -FFmpegExaminer::audio_packet (AVCodecContext* context, shared_ptr stream) +FFmpegExaminer::audio_packet (AVCodecContext* context, shared_ptr stream, AVPacket* packet) { if (stream->first_audio) { return; } - int frame_finished; -DCPOMATIC_DISABLE_WARNINGS - if (avcodec_decode_audio4 (context, _frame, &frame_finished, &_packet) >= 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; @@ -282,12 +304,14 @@ FFmpegExaminer::video_frame_rate () const return av_q2d(av_guess_frame_rate(_format_context, _format_context->streams[_video_stream.get()], 0)); } + dcp::Size FFmpegExaminer::video_size () const { return dcp::Size (video_codec_context()->width, video_codec_context()->height); } + /** @return Length according to our content's header */ Frame FFmpegExaminer::video_length () const @@ -295,22 +319,24 @@ FFmpegExaminer::video_length () const return max (Frame (1), _video_length); } + optional FFmpegExaminer::sample_aspect_ratio () const { DCPOMATIC_ASSERT (_video_stream); - AVRational sar = av_guess_sample_aspect_ratio (_format_context, _format_context->streams[_video_stream.get()], 0); + auto 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 (); + return {}; } return double (sar.num) / sar.den; } + string FFmpegExaminer::subtitle_stream_name (AVStream* s) const { - string n = stream_name (s); + auto n = stream_name (s); if (n.empty()) { n = _("unknown"); @@ -319,18 +345,19 @@ FFmpegExaminer::subtitle_stream_name (AVStream* s) const return n; } + string FFmpegExaminer::stream_name (AVStream* s) const { string n; if (s->metadata) { - AVDictionaryEntry const * lang = av_dict_get (s->metadata, "language", 0, 0); + auto const lang = av_dict_get (s->metadata, "language", 0, 0); if (lang) { n = lang->value; } - AVDictionaryEntry const * title = av_dict_get (s->metadata, "title", 0, 0); + auto const title = av_dict_get (s->metadata, "title", 0, 0); if (title) { if (!n.empty()) { n += " "; @@ -342,18 +369,20 @@ FFmpegExaminer::stream_name (AVStream* s) const return n; } + optional FFmpegExaminer::bits_per_pixel () const { if (video_codec_context()->pix_fmt == -1) { - return optional(); + return {}; } - AVPixFmtDescriptor const * d = av_pix_fmt_desc_get (video_codec_context()->pix_fmt); + auto const d = av_pix_fmt_desc_get (video_codec_context()->pix_fmt); DCPOMATIC_ASSERT (d); return av_get_bits_per_pixel (d); } + bool FFmpegExaminer::yuv () const { @@ -435,12 +464,14 @@ FFmpegExaminer::yuv () const } } + bool FFmpegExaminer::has_video () const { - return static_cast (_video_stream); + return static_cast(_video_stream); } + VideoRange FFmpegExaminer::range () const { @@ -453,3 +484,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 }; +} +