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

avcodec/mpeg12enc: Perform size/level/profile checks earlier

Browse Source 
This has the advantage that one does not waste some allocations
if one errors out because of these checks.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-04-06 21:33:53 +02:00
parent d5c7e5cb65
commit bf61cbb7fc
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
libavcodec/mpeg12enc.c
View File

@@ -152,19 +152,16 @@ static av_cold int encode_init(AVCodecContext *avctx)
max_size, max_size); max_size, max_size);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if ((avctx->width & 0xFFF) == 0 && (avctx->height & 0xFFF) == 1) {
if ((ret = ff_mpv_encode_init(avctx)) < 0) av_log(avctx, AV_LOG_ERROR, "Width / Height is invalid for MPEG2\n");
return ret; return AVERROR(EINVAL);
}
if (find_frame_rate_index(s) < 0) {
if (s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { if (avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) {
av_log(avctx, AV_LOG_ERROR, "MPEG-1/2 does not support %d/%d fps\n", if ((avctx->width & 0xFFF) == 0 || (avctx->height & 0xFFF) == 0) {
avctx->time_base.den, avctx->time_base.num); av_log(avctx, AV_LOG_ERROR, "Width or Height are not allowed to be multiples of 4096\n"
"add '-strict %d' if you want to use them anyway.\n", FF_COMPLIANCE_UNOFFICIAL);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} else {
av_log(avctx, AV_LOG_INFO,
"MPEG-1/2 does not support %d/%d fps, there may be AV sync issues\n",
avctx->time_base.den, avctx->time_base.num);
} }
} }
@@ -174,9 +171,9 @@ static av_cold int encode_init(AVCodecContext *avctx)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
/* Main or 4:2:2 */ /* Main or 4:2:2 */
avctx->profile = s->chroma_format == CHROMA_420 ? FF_PROFILE_MPEG2_MAIN : FF_PROFILE_MPEG2_422; avctx->profile = avctx->pix_fmt == AV_PIX_FMT_YUV420P ? FF_PROFILE_MPEG2_MAIN
: FF_PROFILE_MPEG2_422;
} }
if (avctx->level == FF_LEVEL_UNKNOWN) { if (avctx->level == FF_LEVEL_UNKNOWN) {
if (avctx->profile == FF_PROFILE_MPEG2_422) { /* 4:2:2 */ if (avctx->profile == FF_PROFILE_MPEG2_422) { /* 4:2:2 */
if (avctx->width <= 720 && avctx->height <= 608) if (avctx->width <= 720 && avctx->height <= 608)
@@ -184,7 +181,8 @@ static av_cold int encode_init(AVCodecContext *avctx)
else else
avctx->level = 2; /* High */ avctx->level = 2; /* High */
} else { } else {
if (avctx->profile != FF_PROFILE_MPEG2_HIGH && s->chroma_format != CHROMA_420) { if (avctx->profile != FF_PROFILE_MPEG2_HIGH &&
avctx->pix_fmt != AV_PIX_FMT_YUV420P) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Only High(1) and 4:2:2(0) profiles support 4:2:2 color sampling\n"); "Only High(1) and 4:2:2(0) profiles support 4:2:2 color sampling\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
@@ -198,16 +196,18 @@ static av_cold int encode_init(AVCodecContext *avctx)
} }
} }
if ((avctx->width & 0xFFF) == 0 && (avctx->height & 0xFFF) == 1) { if ((ret = ff_mpv_encode_init(avctx)) < 0)
av_log(avctx, AV_LOG_ERROR, "Width / Height is invalid for MPEG2\n"); return ret;
return AVERROR(EINVAL);
}
if (s->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) { if (find_frame_rate_index(s) < 0) {
if ((avctx->width & 0xFFF) == 0 || (avctx->height & 0xFFF) == 0) { if (s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
av_log(avctx, AV_LOG_ERROR, "Width or Height are not allowed to be multiples of 4096\n" av_log(avctx, AV_LOG_ERROR, "MPEG-1/2 does not support %d/%d fps\n",
"add '-strict %d' if you want to use them anyway.\n", FF_COMPLIANCE_UNOFFICIAL); avctx->time_base.den, avctx->time_base.num);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} else {
av_log(avctx, AV_LOG_INFO,
"MPEG-1/2 does not support %d/%d fps, there may be AV sync issues\n",
avctx->time_base.den, avctx->time_base.num);
} }
} }