diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-29 00:27:49 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-05-01 01:31:57 +0200 |
| commit | e29ce33a36c2e20444d57196defc86d5072bce81 (patch) | |
| tree | f3a0e5bc200af5a94170b96779d4407ce0db7e39 /src/lib/ffmpeg.cc | |
| parent | 81646d1dd5b28fa05d8f134142dcbaed6314ebab (diff) | |
Switch decoding to ffmpeg send/receive API.
Diffstat (limited to 'src/lib/ffmpeg.cc')
| -rw-r--r-- | src/lib/ffmpeg.cc | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc index 3de5da275..d476b4c29 100644 --- a/src/lib/ffmpeg.cc +++ b/src/lib/ffmpeg.cc @@ -68,11 +68,9 @@ FFmpeg::~FFmpeg () { boost::mutex::scoped_lock lm (_mutex); -DCPOMATIC_DISABLE_WARNINGS - for (uint32_t i = 0; i < _format_context->nb_streams; ++i) { - avcodec_close (_format_context->streams[i]->codec); + for (auto& i: _codec_context) { + avcodec_free_context (&i); } -DCPOMATIC_ENABLE_WARNINGS av_frame_free (&_frame); avformat_close_input (&_format_context); @@ -202,15 +200,23 @@ FFmpeg::setup_decoders () { boost::mutex::scoped_lock lm (_mutex); -DCPOMATIC_DISABLE_WARNINGS + _codec_context.resize (_format_context->nb_streams); for (uint32_t i = 0; i < _format_context->nb_streams; ++i) { - auto context = _format_context->streams[i]->codec; + auto codec = avcodec_find_decoder (_format_context->streams[i]->codecpar->codec_id); + if (codec) { + auto context = avcodec_alloc_context3 (codec); + if (!context) { + throw std::bad_alloc (); + } + _codec_context[i] = context; - context->thread_count = 8; - context->thread_type = FF_THREAD_FRAME | FF_THREAD_SLICE; + int r = avcodec_parameters_to_context (context, _format_context->streams[i]->codecpar); + if (r < 0) { + throw DecodeError ("avcodec_parameters_to_context", "FFmpeg::setup_decoders", r); + } - AVCodec* codec = avcodec_find_decoder (context->codec_id); - if (codec) { + context->thread_count = 8; + context->thread_type = FF_THREAD_FRAME | FF_THREAD_SLICE; AVDictionary* options = nullptr; /* This option disables decoding of DCA frame footers in our patched version @@ -225,7 +231,7 @@ DCPOMATIC_DISABLE_WARNINGS /* Enable following of links in files */ av_dict_set_int (&options, "enable_drefs", 1, 0); - int r = avcodec_open2 (context, codec, &options); + r = avcodec_open2 (context, codec, &options); if (r < 0) { throw DecodeError (N_("avcodec_open2"), N_("FFmpeg::setup_decoders"), r); } @@ -233,11 +239,9 @@ DCPOMATIC_DISABLE_WARNINGS dcpomatic_log->log (String::compose ("No codec found for stream %1", i), LogEntry::TYPE_WARNING); } } -DCPOMATIC_ENABLE_WARNINGS } -DCPOMATIC_DISABLE_WARNINGS AVCodecContext * FFmpeg::video_codec_context () const { @@ -245,20 +249,20 @@ FFmpeg::video_codec_context () const return nullptr; } - return _format_context->streams[_video_stream.get()]->codec; + return _codec_context[_video_stream.get()]; } AVCodecContext * FFmpeg::subtitle_codec_context () const { - if (!_ffmpeg_content->subtitle_stream()) { + auto str = _ffmpeg_content->subtitle_stream(); + if (!str) { return nullptr; } - return _ffmpeg_content->subtitle_stream()->stream(_format_context)->codec; + return _codec_context[str->index(_format_context)]; } -DCPOMATIC_ENABLE_WARNINGS int |