[FFmpeg-devel] [PATCH] vf_zscale: Add more supported input properties
--- libavfilter/vf_zscale.c | 26 -- libavformat/mxfdec.c| 20 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index 09fd842fe5..7d048da1ef 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -353,10 +353,10 @@ static int convert_matrix(enum AVColorSpace colorspace) return ZIMG_MATRIX_709; case AVCOL_SPC_UNSPECIFIED: return ZIMG_MATRIX_UNSPECIFIED; -case AVCOL_SPC_BT470BG: -return ZIMG_MATRIX_470BG; case AVCOL_SPC_SMPTE170M: return ZIMG_MATRIX_170M; +case AVCOL_SPC_SMPTE240M: +return ZIMG_MATRIX_240M; case AVCOL_SPC_YCGCO: return ZIMG_MATRIX_YCGCO; case AVCOL_SPC_BT2020_NCL: @@ -374,10 +374,22 @@ static int convert_trc(enum AVColorTransferCharacteristic color_trc) return ZIMG_TRANSFER_UNSPECIFIED; case AVCOL_TRC_BT709: return ZIMG_TRANSFER_709; +case AVCOL_TRC_GAMMA22: +return ZIMG_TRANSFER_470_M; +case AVCOL_TRC_GAMMA28: +return ZIMG_TRANSFER_470_BG; case AVCOL_TRC_SMPTE170M: return ZIMG_TRANSFER_601; +case AVCOL_TRC_SMPTE240M: +return ZIMG_TRANSFER_240M; case AVCOL_TRC_LINEAR: return ZIMG_TRANSFER_LINEAR; +case AVCOL_TRC_LOG: +return ZIMG_TRANSFER_LOG_100; +case AVCOL_TRC_LOG_SQRT: +return ZIMG_TRANSFER_LOG_316; +case AVCOL_TRC_IEC61966_2_4: +return ZIMG_TRANSFER_IEC_61966_2_4; case AVCOL_TRC_BT2020_10: return ZIMG_TRANSFER_2020_10; case AVCOL_TRC_BT2020_12: @@ -399,6 +411,10 @@ static int convert_primaries(enum AVColorPrimaries color_primaries) return ZIMG_PRIMARIES_UNSPECIFIED; case AVCOL_PRI_BT709: return ZIMG_PRIMARIES_709; +case AVCOL_PRI_BT470M: +return ZIMG_PRIMARIES_470_M; +case AVCOL_PRI_BT470BG: +return ZIMG_PRIMARIES_470_BG; case AVCOL_PRI_SMPTE170M: return ZIMG_PRIMARIES_170M; case AVCOL_PRI_SMPTE240M: @@ -745,6 +761,8 @@ static const AVOption zscale_options[] = { { "2020", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_2020},0, 0, FLAGS, "primaries" }, { "unknown", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_UNSPECIFIED}, 0, 0, FLAGS, "primaries" }, { "bt709",0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_709}, 0, 0, FLAGS, "primaries" }, +{ "bt470m", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_470_M}, 0, 0, FLAGS, "primaries" }, +{ "bt470bg", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_470_BG}, 0, 0, FLAGS, "primaries" }, { "smpte170m",0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_170M},0, 0, FLAGS, "primaries" }, { "smpte240m",0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_240M},0, 0, FLAGS, "primaries" }, { "bt2020", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_2020},0, 0, FLAGS, "primaries" }, @@ -756,9 +774,13 @@ static const AVOption zscale_options[] = { { "unspecified", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_UNSPECIFIED}, 0, 0, FLAGS, "transfer" }, { "601", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_601}, 0, 0, FLAGS, "transfer" }, { "linear", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_LINEAR}, 0, 0, FLAGS, "transfer" }, +{ "log100", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_LOG_100}, 0, 0, FLAGS, "transfer" }, +{ "log316", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_LOG_316}, 0, 0, FLAGS, "transfer" }, { "2020_10", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_2020_10}, 0, 0, FLAGS, "transfer" }, { "2020_12", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_2020_12}, 0, 0, FLAGS, "transfer" }, { "unknown", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_UNSPECIFIED}, 0, 0, FLAGS, "transfer" }, +{ "bt470m", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_470_M}, 0, 0, FLAGS, "transfer" }, +{ "bt470bg", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_470_BG}, 0, 0, FLAGS, "transfer" }, { "smpte170m",0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_601}, 0, 0, FLAGS, "transfer" }, { "bt709",0, 0, AV_OPT_TYPE_CONST, {.i6
[FFmpeg-devel] [PATCH] vf_zscale: Add more supported input properties
--- Now without mxf code >_> There is a stable release with this code, and it's a minor update, not sure if it warrants a configure check, but I'll add it if requested. Vittorio libavfilter/vf_zscale.c | 26 -- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index 09fd842fe5..7d048da1ef 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -353,10 +353,10 @@ static int convert_matrix(enum AVColorSpace colorspace) return ZIMG_MATRIX_709; case AVCOL_SPC_UNSPECIFIED: return ZIMG_MATRIX_UNSPECIFIED; -case AVCOL_SPC_BT470BG: -return ZIMG_MATRIX_470BG; case AVCOL_SPC_SMPTE170M: return ZIMG_MATRIX_170M; +case AVCOL_SPC_SMPTE240M: +return ZIMG_MATRIX_240M; case AVCOL_SPC_YCGCO: return ZIMG_MATRIX_YCGCO; case AVCOL_SPC_BT2020_NCL: @@ -374,10 +374,22 @@ static int convert_trc(enum AVColorTransferCharacteristic color_trc) return ZIMG_TRANSFER_UNSPECIFIED; case AVCOL_TRC_BT709: return ZIMG_TRANSFER_709; +case AVCOL_TRC_GAMMA22: +return ZIMG_TRANSFER_470_M; +case AVCOL_TRC_GAMMA28: +return ZIMG_TRANSFER_470_BG; case AVCOL_TRC_SMPTE170M: return ZIMG_TRANSFER_601; +case AVCOL_TRC_SMPTE240M: +return ZIMG_TRANSFER_240M; case AVCOL_TRC_LINEAR: return ZIMG_TRANSFER_LINEAR; +case AVCOL_TRC_LOG: +return ZIMG_TRANSFER_LOG_100; +case AVCOL_TRC_LOG_SQRT: +return ZIMG_TRANSFER_LOG_316; +case AVCOL_TRC_IEC61966_2_4: +return ZIMG_TRANSFER_IEC_61966_2_4; case AVCOL_TRC_BT2020_10: return ZIMG_TRANSFER_2020_10; case AVCOL_TRC_BT2020_12: @@ -399,6 +411,10 @@ static int convert_primaries(enum AVColorPrimaries color_primaries) return ZIMG_PRIMARIES_UNSPECIFIED; case AVCOL_PRI_BT709: return ZIMG_PRIMARIES_709; +case AVCOL_PRI_BT470M: +return ZIMG_PRIMARIES_470_M; +case AVCOL_PRI_BT470BG: +return ZIMG_PRIMARIES_470_BG; case AVCOL_PRI_SMPTE170M: return ZIMG_PRIMARIES_170M; case AVCOL_PRI_SMPTE240M: @@ -745,6 +761,8 @@ static const AVOption zscale_options[] = { { "2020", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_2020},0, 0, FLAGS, "primaries" }, { "unknown", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_UNSPECIFIED}, 0, 0, FLAGS, "primaries" }, { "bt709",0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_709}, 0, 0, FLAGS, "primaries" }, +{ "bt470m", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_470_M}, 0, 0, FLAGS, "primaries" }, +{ "bt470bg", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_470_BG}, 0, 0, FLAGS, "primaries" }, { "smpte170m",0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_170M},0, 0, FLAGS, "primaries" }, { "smpte240m",0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_240M},0, 0, FLAGS, "primaries" }, { "bt2020", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_2020},0, 0, FLAGS, "primaries" }, @@ -756,9 +774,13 @@ static const AVOption zscale_options[] = { { "unspecified", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_UNSPECIFIED}, 0, 0, FLAGS, "transfer" }, { "601", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_601}, 0, 0, FLAGS, "transfer" }, { "linear", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_LINEAR}, 0, 0, FLAGS, "transfer" }, +{ "log100", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_LOG_100}, 0, 0, FLAGS, "transfer" }, +{ "log316", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_LOG_316}, 0, 0, FLAGS, "transfer" }, { "2020_10", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_2020_10}, 0, 0, FLAGS, "transfer" }, { "2020_12", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_2020_12}, 0, 0, FLAGS, "transfer" }, { "unknown", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_UNSPECIFIED}, 0, 0, FLAGS, "transfer" }, +{ "bt470m", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_470_M}, 0, 0, FLAGS, "transfer" }, +{ "bt470bg", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_470_BG}, 0, 0, FLAGS, "transfer" }, { "smpte170m",0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_
Re: [FFmpeg-devel] [PATCH] vf_zscale: Add more supported input properties
On 11/15/2017 12:56 AM, Vittorio Giovara wrote: > --- > libavfilter/vf_zscale.c | 26 -- > libavformat/mxfdec.c| 20 > 2 files changed, 44 insertions(+), 2 deletions(-) Accidental inclusion of MXF code? Also, Does the minimum zimg version need to be bumped in configure? - Derek ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] vf_zscale: Add more supported input properties
2017-11-15 1:56 GMT+01:00 Vittorio Giovara : > @@ -2111,6 +2124,12 @@ static int mxf_parse_structural_metadata(MXFContext > *mxf) > st->codecpar->codec_id = container_ul->id; > st->codecpar->width = descriptor->width; > st->codecpar->height = descriptor->height; /* Field height, not > frame height */ > + > +/*int coeffcients; > +int primaries; > +int transfer; > +int range; > +*/ I wanted to suggest to split the patch but I assume this wasn't intended. Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] vf_zscale: Add more supported input properties
2017-11-15 17:26 GMT+01:00 Vittorio Giovara : > There is a stable release with this code, and it's a minor update, > not sure if it warrants a configure check, but I'll add it if requested. Does it compile without? Does configure succeed? The patch must not lead to a situation where configure passes but build fails. Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] vf_zscale: Add more supported input properties
On 11/15/17, Carl Eugen Hoyos wrote: > 2017-11-15 17:26 GMT+01:00 Vittorio Giovara : > >> There is a stable release with this code, and it's a minor update, >> not sure if it warrants a configure check, but I'll add it if requested. > > Does it compile without? Does configure succeed? > > The patch must not lead to a situation where configure > passes but build fails. Just raise accepted zimg version. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel