apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-26 18:30:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fftools/ffmpeg: use pre-BSF DTS for choosing next output

Browse Source 
The following commits will add a new buffering stage after bitstream
filters, which should not be taken into account for choosing next
output.

OutputStream.last_mux_dts is also used by the muxing code to make up
missing DTS values - that field is now moved to the muxer-private
MuxStream object.
This commit is contained in:
Anton Khirnov
2022-06-10 14:45:48 +02:00
parent b2b9e9ccee
commit d02ae31fb2
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fftools/ffmpeg.c
View File

@@ -716,6 +716,9 @@ static void output_packet(OutputFile *of, AVPacket *pkt,
{
int ret = 0;
if (!eof && pkt->dts != AV_NOPTS_VALUE)
ost->last_mux_dts = av_rescale_q(pkt->dts, ost->mux_timebase, AV_TIME_BASE_Q);
/* apply the output bitstream filters */
if (ost->bsf_ctx) {
ret = av_bsf_send_packet(ost->bsf_ctx, eof ? NULL : pkt);
@@ -3459,9 +3462,8 @@ static OutputStream *choose_output(void)
if (ost->filter && ost->last_filter_pts != AV_NOPTS_VALUE) {
opts = ost->last_filter_pts;
} else {
opts = ost->last_mux_dts == AV_NOPTS_VALUE ? INT64_MIN :
av_rescale_q(ost->last_mux_dts, ost->st->time_base,
AV_TIME_BASE_Q);
opts = ost->last_mux_dts == AV_NOPTS_VALUE ?
INT64_MIN : ost->last_mux_dts;
if (ost->last_mux_dts == AV_NOPTS_VALUE)
av_log(NULL, AV_LOG_DEBUG,
"cur_dts is invalid st:%d (%d) [init:%d i_done:%d finish:%d] (this is harmless if it occurs once at the start per stream)\n",