Until now, for formats which were in the spec but not in the encoder's
list of supported formats required the -strict -1 flag. This enables
support for all video formats which are specified, all the way from
QSIF525 to 8K.
Signed-off-by: Rostislav Pehlivanov <atomnu...@gmail.com>
---
libavcodec/vc2enc.c | 99 +++++++++++++++++++++++++++++++++++------------------
1 file changed, 66 insertions(+), 33 deletions(-)
diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c
index 16e4110..71437d5 100644
--- a/libavcodec/vc2enc.c
+++ b/libavcodec/vc2enc.c
@@ -39,6 +39,48 @@
/* Decides the cutoff point in # of slices to distribute the leftover bytes */
#define SLICE_REDIST_TOTAL 150
+/* When pix_fmt, timebase.num/den, width, height and interlaced match */
+#define FORMAT_MAX_SCORE 6
+
+typedef struct VC2BaseVideoFormat {
+ enum AVPixelFormat pix_fmt;
+ AVRational time_base;
+ int width, height, interlaced, level, base_vf;
+ const char *name;
+} VC2BaseVideoFormat;
+
+static const VC2BaseVideoFormat base_video_fmts[] = {
+ { AV_PIX_FMT_YUV420P, { 1001, 15000 }, 176, 120, 0, 1, 1,
"QSIF525" },
+ { AV_PIX_FMT_YUV420P, { 2, 25 }, 176, 144, 0, 1, 2, "QCIF"
},
+ { AV_PIX_FMT_YUV420P, { 1001, 15000 }, 352, 240, 0, 1, 3,
"SIF525" },
+ { AV_PIX_FMT_YUV420P, { 2, 25 }, 352, 288, 0, 1, 4, "CIF"
},
+ { AV_PIX_FMT_YUV420P, { 1001, 15000 }, 704, 480, 0, 1, 5,
"4SIF525" },
+ { AV_PIX_FMT_YUV420P, { 2, 25 }, 704, 576, 0, 1, 6, "4CIF"
},
+
+ { AV_PIX_FMT_YUV422P10, { 1001, 30000 }, 720, 480, 1, 2, 7,
"SD480I-60" },
+ { AV_PIX_FMT_YUV422P10, { 1, 25 }, 720, 576, 1, 2, 8,
"SD576I-50" },
+
+ { AV_PIX_FMT_YUV422P10, { 1001, 60000 }, 1280, 720, 0, 3, 9,
"HD720P-60" },
+ { AV_PIX_FMT_YUV422P10, { 1, 50 }, 1280, 720, 0, 3, 10,
"HD720P-50" },
+ { AV_PIX_FMT_YUV422P10, { 1001, 30000 }, 1920, 1080, 1, 3, 11,
"HD1080I-60" },
+ { AV_PIX_FMT_YUV422P10, { 1, 25 }, 1920, 1080, 1, 3, 12,
"HD1080I-50" },
+ { AV_PIX_FMT_YUV422P10, { 1001, 60000 }, 1920, 1080, 1, 3, 13,
"HD1080P-60" },
+ { AV_PIX_FMT_YUV422P10, { 1, 50 }, 1920, 1080, 1, 3, 14,
"HD1080P-50" },
+
+ { AV_PIX_FMT_YUV444P12, { 1, 24 }, 2048, 1080, 0, 4, 15,
"DC2K" },
+ { AV_PIX_FMT_YUV444P12, { 1, 24 }, 4096, 2160, 0, 5, 16,
"DC4K" },
+
+ { AV_PIX_FMT_YUV422P10, { 1001, 60000 }, 3840, 2160, 0, 6, 17, "UHDTV
4K-60" },
+ { AV_PIX_FMT_YUV422P10, { 1, 50 }, 3840, 2160, 0, 6, 18, "UHDTV
4K-50" },
+
+ { AV_PIX_FMT_YUV422P10, { 1001, 60000 }, 7680, 4320, 0, 7, 19, "UHDTV
8K-60" },
+ { AV_PIX_FMT_YUV422P10, { 1, 50 }, 7680, 4320, 0, 7, 20, "UHDTV
8K-50" },
+
+ { AV_PIX_FMT_YUV422P10, { 1001, 24000 }, 1920, 1080, 0, 3, 21,
"HD1080P-24" },
+ { AV_PIX_FMT_YUV422P10, { 1001, 30000 }, 720, 486, 1, 2, 22, "SD
Pro486" },
+};
+static const int base_video_fmts_len = FF_ARRAY_ELEMS(base_video_fmts);
+
enum VC2_QM {
VC2_QM_DEF = 0,
VC2_QM_COL,
@@ -1028,7 +1070,7 @@ static av_cold int vc2_encode_init(AVCodecContext *avctx)
{
Plane *p;
SubBand *b;
- int i, j, level, o, shift;
+ int i, j, level, o, shift, top_score = 0, top_fmt = 0;
const AVPixFmtDescriptor *fmt = av_pix_fmt_desc_get(avctx->pix_fmt);
const int depth = fmt->comp[0].depth;
VC2EncContext *s = avctx->priv_data;
@@ -1054,40 +1096,30 @@ static av_cold int vc2_encode_init(AVCodecContext
*avctx)
s->interlaced = !((avctx->field_order == AV_FIELD_UNKNOWN) ||
(avctx->field_order == AV_FIELD_PROGRESSIVE));
- if (avctx->pix_fmt == AV_PIX_FMT_YUV422P10) {
- if (avctx->width == 1280 && avctx->height == 720) {
- s->level = 3;
- if (avctx->time_base.num == 1001 && avctx->time_base.den == 60000)
- s->base_vf = 9;
- if (avctx->time_base.num == 1 && avctx->time_base.den == 50)
- s->base_vf = 10;
- } else if (avctx->width == 1920 && avctx->height == 1080) {
- s->level = 3;
- if (s->interlaced) {
- if (avctx->time_base.num == 1001 && avctx->time_base.den ==
30000)
- s->base_vf = 11;
- if (avctx->time_base.num == 1 && avctx->time_base.den == 50)
- s->base_vf = 12;
- } else {
- if (avctx->time_base.num == 1001 && avctx->time_base.den ==
60000)
- s->base_vf = 13;
- if (avctx->time_base.num == 1 && avctx->time_base.den == 50)
- s->base_vf = 14;
- if (avctx->time_base.num == 1001 && avctx->time_base.den ==
24000)
- s->base_vf = 21;
- }
- } else if (avctx->width == 3840 && avctx->height == 2160) {
- s->level = 6;
- if (avctx->time_base.num == 1001 && avctx->time_base.den == 60000)
- s->base_vf = 17;
- if (avctx->time_base.num == 1 && avctx->time_base.den == 50)
- s->base_vf = 18;
+ for (i = 0; i < base_video_fmts_len; i++) {
+ int score = 0;
+ const VC2BaseVideoFormat *fmt = &base_video_fmts[i];
+ if (avctx->pix_fmt == fmt->pix_fmt)
+ score++;
+ if (avctx->time_base.num == fmt->time_base.num)
+ score++;
+ if (avctx->time_base.den == fmt->time_base.den)
+ score++;
+ if (avctx->width == fmt->width)
+ score++;
+ if (avctx->height == fmt->height)
+ score++;
+ if (s->interlaced == fmt->interlaced)
+ score++;
+ if (score > top_score) {
+ top_score = score;
+ top_fmt = i;
}
}
- if (s->interlaced && s->base_vf <= 0) {
- av_log(avctx, AV_LOG_ERROR, "Interlacing not supported with non
standard formats!\n");
- return AVERROR_UNKNOWN;
+ if (top_score == FORMAT_MAX_SCORE) {
+ s->base_vf = base_video_fmts[top_fmt].base_vf;
+ s->level = base_video_fmts[top_fmt].level;
}
if (s->interlaced)
@@ -1115,7 +1147,8 @@ static av_cold int vc2_encode_init(AVCodecContext *avctx)
return AVERROR_UNKNOWN;
}
} else {
- av_log(avctx, AV_LOG_INFO, "Selected base video format = %i\n",
s->base_vf);
+ av_log(avctx, AV_LOG_INFO, "Selected base video format = %i (%s)\n",
+ s->base_vf, base_video_fmts[top_fmt].name);
}
/* Chroma subsampling */
--
2.8.0.rc3
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
