highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg_enc: inline init_encoder_time_base() into its callers

Browse Source 
The function now reduces to a ternary operator, so it is shorter and
clearer to eliminate it.
This commit is contained in:
Anton Khirnov
2023-05-28 18:16:53 +02:00
parent 93e26a4db7
commit 2f92650c5d
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fftools/ffmpeg_enc.c
View File

@@ -177,18 +177,6 @@ static void set_encoder_id(OutputFile *of, OutputStream *ost)
AV_DICT_DONT_STRDUP_VAL | AV_DICT_DONT_OVERWRITE); AV_DICT_DONT_STRDUP_VAL | AV_DICT_DONT_OVERWRITE);
} }
static void init_encoder_time_base(OutputStream *ost, AVRational default_time_base)
{
AVCodecContext *enc_ctx = ost->enc_ctx;
if (ost->enc_timebase.num > 0) {
enc_ctx->time_base = ost->enc_timebase;
return;
}
enc_ctx->time_base = default_time_base;
}
int enc_open(OutputStream *ost, AVFrame *frame) int enc_open(OutputStream *ost, AVFrame *frame)
{ {
InputStream *ist = ost->ist; InputStream *ist = ost->ist;
@@ -222,7 +210,8 @@ int enc_open(OutputStream *ost, AVFrame *frame)
enc_ctx->bits_per_raw_sample = FFMIN(dec_ctx->bits_per_raw_sample, enc_ctx->bits_per_raw_sample = FFMIN(dec_ctx->bits_per_raw_sample,
av_get_bytes_per_sample(enc_ctx->sample_fmt) << 3); av_get_bytes_per_sample(enc_ctx->sample_fmt) << 3);
init_encoder_time_base(ost, av_make_q(1, enc_ctx->sample_rate)); enc_ctx->time_base = ost->enc_timebase.num > 0 ? ost->enc_timebase :
av_make_q(1, enc_ctx->sample_rate);
break; break;
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
@@ -252,7 +241,8 @@ int enc_open(OutputStream *ost, AVFrame *frame)
ost->frame_rate.num, ost->frame_rate.den, 65535); ost->frame_rate.num, ost->frame_rate.den, 65535);
} }
init_encoder_time_base(ost, av_inv_q(ost->frame_rate)); enc_ctx->time_base = ost->enc_timebase.num > 0 ? ost->enc_timebase :
av_inv_q(ost->frame_rate);
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);