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

fftools/ffmpeg_mux_init: do not overwrite OutputStream.frame_rate for encoding

Browse Source 
The values currently written into it are not used after
enc_open(), so it is better to confine them to that function.
This commit is contained in:
Anton Khirnov
2023-05-28 23:14:31 +02:00
parent 5bea8daa78
commit cf121592c5
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
fftools/ffmpeg_enc.c
View File

@@ -214,11 +214,13 @@ int enc_open(OutputStream *ost, AVFrame *frame)
av_make_q(1, enc_ctx->sample_rate); av_make_q(1, enc_ctx->sample_rate);
break; break;
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO: {
if (!ost->frame_rate.num) AVRational fr = ost->frame_rate;
ost->frame_rate = av_buffersink_get_frame_rate(ost->filter->filter);
if (!ost->frame_rate.num && !ost->max_frame_rate.num) { if (!fr.num)
ost->frame_rate = (AVRational){25, 1}; fr = av_buffersink_get_frame_rate(ost->filter->filter);
if (!fr.num && !ost->max_frame_rate.num) {
fr = (AVRational){25, 1};
av_log(ost, AV_LOG_WARNING, av_log(ost, AV_LOG_WARNING,
"No information " "No information "
"about the input framerate is available. Falling " "about the input framerate is available. Falling "
@@ -227,22 +229,22 @@ int enc_open(OutputStream *ost, AVFrame *frame)
} }
if (ost->max_frame_rate.num && if (ost->max_frame_rate.num &&
(av_q2d(ost->frame_rate) > av_q2d(ost->max_frame_rate) || (av_q2d(fr) > av_q2d(ost->max_frame_rate) ||
!ost->frame_rate.den)) !fr.den))
ost->frame_rate = ost->max_frame_rate; fr = ost->max_frame_rate;
if (enc->supported_framerates && !ost->force_fps) { if (enc->supported_framerates && !ost->force_fps) {
int idx = av_find_nearest_q_idx(ost->frame_rate, enc->supported_framerates); int idx = av_find_nearest_q_idx(fr, enc->supported_framerates);
ost->frame_rate = enc->supported_framerates[idx]; fr = enc->supported_framerates[idx];
} }
// reduce frame rate for mpeg4 to be within the spec limits // reduce frame rate for mpeg4 to be within the spec limits
if (enc_ctx->codec_id == AV_CODEC_ID_MPEG4) { if (enc_ctx->codec_id == AV_CODEC_ID_MPEG4) {
av_reduce(&ost->frame_rate.num, &ost->frame_rate.den, av_reduce(&fr.num, &fr.den,
ost->frame_rate.num, ost->frame_rate.den, 65535); fr.num, fr.den, 65535);
} }
enc_ctx->time_base = ost->enc_timebase.num > 0 ? ost->enc_timebase : enc_ctx->time_base = ost->enc_timebase.num > 0 ? ost->enc_timebase :
av_inv_q(ost->frame_rate); av_inv_q(fr);
if (!(enc_ctx->time_base.num && enc_ctx->time_base.den)) if (!(enc_ctx->time_base.num && enc_ctx->time_base.den))
enc_ctx->time_base = av_buffersink_get_time_base(ost->filter->filter); enc_ctx->time_base = av_buffersink_get_time_base(ost->filter->filter);
@@ -277,9 +279,9 @@ int enc_open(OutputStream *ost, AVFrame *frame)
enc_ctx->chroma_sample_location = frame->chroma_location; enc_ctx->chroma_sample_location = frame->chroma_location;
} }
enc_ctx->framerate = ost->frame_rate; enc_ctx->framerate = fr;
ost->st->avg_frame_rate = ost->frame_rate; ost->st->avg_frame_rate = fr;
// Field order: autodetection // Field order: autodetection
if (frame) { if (frame) {
@@ -307,6 +309,7 @@ int enc_open(OutputStream *ost, AVFrame *frame)
} }
break; break;
}
case AVMEDIA_TYPE_SUBTITLE: case AVMEDIA_TYPE_SUBTITLE:
enc_ctx->time_base = AV_TIME_BASE_Q; enc_ctx->time_base = AV_TIME_BASE_Q;
if (!enc_ctx->width) { if (!enc_ctx->width) {