RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 09:12:33 +00:00
Code Issues Projects Releases Wiki Activity

lavc/libx264: reorder control flow in setup_roi() to reduce nesting depth

Browse Source
This commit is contained in:
Anton Khirnov 2022-11-27 10:47:53 +01:00
parent ce5b2d34b4
commit 9ed5b0ac3b
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavcodec/libx264.c
View File

@ -338,13 +338,6 @@ static int setup_roi(AVCodecContext *ctx, x264_picture_t *pic, int bit_depth,
{
X264Context *x4 = ctx->priv_data;
if (x4->params.rc.i_aq_mode == X264_AQ_NONE) {
if (!x4->roi_warned) {
x4->roi_warned = 1;
av_log(ctx, AV_LOG_WARNING, "Adaptive quantization must be enabled to use ROI encoding, skipping ROI.\n");
}
} else {
if (frame->interlaced_frame == 0) {
int mbx = (frame->width + MB_SIZE - 1) / MB_SIZE;
int mby = (frame->height + MB_SIZE - 1) / MB_SIZE;
int qp_range = 51 + 6 * (bit_depth - 8);
@ -353,6 +346,20 @@ static int setup_roi(AVCodecContext *ctx, x264_picture_t *pic, int bit_depth,
uint32_t roi_size;
float *qoffsets;
if (x4->params.rc.i_aq_mode == X264_AQ_NONE) {
if (!x4->roi_warned) {
x4->roi_warned = 1;
av_log(ctx, AV_LOG_WARNING, "Adaptive quantization must be enabled to use ROI encoding, skipping ROI.\n");
}
return 0;
} else if (frame->interlaced_frame) {
if (!x4->roi_warned) {
x4->roi_warned = 1;
av_log(ctx, AV_LOG_WARNING, "interlaced_frame not supported for ROI encoding yet, skipping ROI.\n");
}
return 0;
}
roi = (const AVRegionOfInterest*)data;
roi_size = roi->self_size;
if (!roi_size || size % roi_size != 0) {
@ -395,13 +402,6 @@ static int setup_roi(AVCodecContext *ctx, x264_picture_t *pic, int bit_depth,
pic->prop.quant_offsets = qoffsets;
pic->prop.quant_offsets_free = av_free;
} else {
if (!x4->roi_warned) {
x4->roi_warned = 1;
av_log(ctx, AV_LOG_WARNING, "interlaced_frame not supported for ROI encoding yet, skipping ROI.\n");
}
}
}
return 0;
}