summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_decoder.cc
AgeCommit message (Collapse)Author
2024-11-09wip2882-hangCarl Hetherington
2024-05-26Fix build with newer libsub.Carl Hetherington
2024-05-19Add and use Content::has_mapped_audio().Carl Hetherington
2024-05-13Don't bother decoding audio if none of it is mapped (#2809).Carl Hetherington
On a test adding subs from an MKV to an existing DCP this reduces the processing time from ~2h to ~1m because it doesn't resample the audio from the whole of the MKV, only to discard it.
2024-04-01Fix hanging/overlapping dvb subtitles (#2792).Carl Hetherington
This reverts a change made in 8ca6fd6d97e6d42492afddb655fa85130946853c "Fix doubled subtitles if subtitle stop times are specified." That change breaks the case where a subtitle _does_ have a stop time, but it's wrong (30s from the start time) and we want the next subtitle to clear the previous one. I can't now see how reverting this could cause doubled subtitles, so maybe that problem wlil come back. At least now there's a test for #2792.
2024-02-21Make DCPExaminer::size() optional and deal with the consequences.v2.16.78Carl Hetherington
This means we can fix the case of a VF having no known size in a nice way, in turn fixing problems caused by the fix to #2775.
2024-01-20Build fix for HAVE_AVSUBTITLERECT_PICT case.Carl Hetherington
2024-01-12Fix scaling of bitmap subs when the corresponding video is cropped (#2670).Carl Hetherington
Previously we would scale the bitmap size/position to a proportion of the original video frame, then scale it back up again to the DCP container. This didn't take into account some cropped cases where the picture would end up the same shape but the subtitles would be stretched.
2023-11-16Fix crash with subtitles for which we have no codec.Carl Hetherington
2023-09-29Fix errors with WAVs containing markers (#2617).Carl Hetherington
I'm not 100% sure about this but they seem to end up giving audio packets with no channels and no frames. Here we handle such packets better.
2023-08-15Cleanup: remove unused variable.Carl Hetherington
2023-08-15Remove now-unnecessary assertion.Carl Hetherington
Since e29ce33a36c2e20444d57196defc86d5072bce81 channels is the number of channels in the frame, and also the number in data, so we don't need to check this any more.
2023-05-11Remove incorrect silencing (#2526).Carl Hetherington
On switching to the new FFmpeg send/receive API in e29ce33a36c2e20444d57196defc86d5072bce81 the channels variable in deinterleave_audio() was switched from stream channels to frame channels. I'm not sure if this is right, but it does mean that audio has `channels` channels, so calling make_silent() up to the stream channel count is clearly wrong if the stream has more channels than the frame.
2022-11-15Improve flushing behaviour when there is a lot of space to fill (#2364).Carl Hetherington
Previously a call to flush() could result in a lot of audio being emitted from the decoder (if there is a big gap between the end of the audio and the video). This would end up being emitted in one chunk from the player, crashing the audio analyser with an OOM in some cases.
2022-11-15Clarify one log message and add another.Carl Hetherington
2022-10-18Extract VideoFilterGraphSet.Carl Hetherington
2022-10-18Remove believed-unnecessary mutex.Carl Hetherington
2022-10-01Fix checking of frame channels vs stream channels.Carl Hetherington
The comment says that we're handling differences between channel counts in the frame and stream but the code wasn't doing that.
2022-09-17Fix typo in log message.Carl Hetherington
2022-09-10Some improved logging.Carl Hetherington
2022-09-03Bump libdcp for better ContentKind support, and libsubCarl Hetherington
for fixes to \c tags in SSA files.
2022-06-12Set up TextDecoder position based on the time that the next thing willv2.16.14Carl Hetherington
be emitted, instead of the time that the last thing was (#2268). This is to avoid problems with the example shown in the test, where just because a subtitle in source A comes before a subtitle in source B, source A is pass()ed next and may then emit a subtitle which should be after the next one in B.
2022-04-28Handle multiple bitmap subtitles at the same time correctly (#2239).Carl Hetherington
Previously if there were two images at the same time we would start them both, then the stop time would be set in the second one but not the first. This meant that the first one would hang around forever.
2022-04-28Make emit_bitmap_start take a ContentBitmapText.Carl Hetherington
2022-04-03C++11 and whitespace cleanups.Carl Hetherington
2022-02-17Try to handle EAGAIN from avcodec_send_packet() properly.Carl Hetherington
The docs say on EAGAIN we should call avcodec_receive_frame() and then re-send the same packet again. This should do that. This is a fix for errors trigged by the accompanying test.
2022-01-11Fix failure to decode multiple video frames from one packet (#2159).v2.15.183Carl Hetherington
2022-01-11Cleanup: move some stuff into process_video_frame().Carl Hetherington
2022-01-11Use a separate AVFrame for each stream when decoding.Carl Hetherington
This seems to be what ffplay does and it feels like it makes sense as frames may be built from multiple packets AFAICS.
2021-10-13Ignore errors from avcodec_send_packet.Carl Hetherington
After seeking it appears that we often get irrelevant errors from this method. ffplay.c seems to ignore them, and this commit means that we do too (just logging them). I think these errors during a non-seeking "encoding" run could be cause for concern; perhaps we should take more note of them in that case.
2021-09-27Replace aligned bool with enum Alignment.Carl Hetherington
2021-09-27Various alignment adjustments.Carl Hetherington
2021-09-13Fix missing subtitles embedded in files decoded by FFmpeg (#2060).Carl Hetherington
Since the FFmpeg 4.4 update it seems that AVSubtitle::pts is no longer set (it's AV_NOPTS_VALUE, i think). Instead we apparently need to get the PTS from the packet, which in turn requires the stream's timebase.
2021-09-13Add missing avsubtitle_free().Carl Hetherington
2021-06-04Fix errors when seeking FFmpeg for some formats.Carl Hetherington
The comments discuss this in a bit more depth, but basically we see errors from avcodec_send_packet after seek. ffplay etc. seem basically to ignore all errors from avcodec_send_packet, and I can't find a "proper" fix, so here's a half-way house hack: ignore some errors after seek. Nasty.
2021-06-03Ignore errors from avcodec_receive_frame when flushing video (#2035).Carl Hetherington
The test fails if we don't do this; it doesn't really seem 100% convincing but we are already doing this for audio.
2021-05-01Switch decoding to ffmpeg send/receive API.Carl Hetherington
2021-05-01Remove some FFmpeg-related warnings by using AVStream::codecpar.Carl Hetherington
2021-04-29C++11 tidying.Carl Hetherington
2021-03-31Add an assert for a function that can fail.Carl Hetherington
2021-03-13Build fix for Ubuntu-16.04-era compilers.Carl Hetherington
2021-03-02Tidy up and do flushing more correctly.v2.15.133Carl Hetherington
This seems necessary with the multi-threaded decoding; it looks like we were doing it quite wrong before but getting away with it.
2021-03-02Rename some subtitle decoding / processing methods.Carl Hetherington
2021-03-02Key _next_time with the audio stream pointer.Carl Hetherington
2021-03-02Remove FFmpeg::_packet.Carl Hetherington
2021-03-02Extract process_audio_frame.Carl Hetherington
2021-03-02Extract audio_stream_from_index.Carl Hetherington
2021-02-28C++11 cleanups.Carl Hetherington
2021-01-13Fix for changes to libsub API.Carl Hetherington
2021-01-07BOOST_FOREACH.Carl Hetherington