diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-03-02 00:53:56 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-03-02 15:40:18 +0100 |
| commit | 431127d27fe697a60872d6020a8a5abcb47fa9e1 (patch) | |
| tree | f2d00b08cbf126fd6b1f1fa4062cde9d139c9dd4 /src/lib/ffmpeg_examiner.cc | |
| parent | 04e94f01295463f2c910ba2b4306c1b76e340a45 (diff) | |
Tidy up and do flushing more correctly.v2.15.133
This seems necessary with the multi-threaded decoding; it looks
like we were doing it quite wrong before but getting away with it.
Diffstat (limited to 'src/lib/ffmpeg_examiner.cc')
| -rw-r--r-- | src/lib/ffmpeg_examiner.cc | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index a3e78b65f..ed867b475 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -166,18 +166,25 @@ DCPOMATIC_ENABLE_WARNINGS } } - AVPacket packet; - 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? */ + if (_video_stream) { + AVPacket packet; + av_init_packet (&packet); + packet.data = nullptr; + packet.size = 0; DCPOMATIC_DISABLE_WARNINGS - auto context = _format_context->streams[packet.stream_index]->codec; + auto context = _format_context->streams[*_video_stream]->codec; +DCPOMATIC_ENABLE_WARNINGS + while (video_packet(context, temporal_reference, &packet)) {} + } + + 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 - while (_video_stream && video_packet(context, temporal_reference, &packet)) {} - 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], &packet); - } } if (_video_stream) { |