September 2023 - ffmpeg-cvslog

avfilter/vf_negate: add support for more planar with alpha
by Paul B Mahol 28 Sep '23

28 Sep '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Sep 28 22:08:59 2023 +0200| [35b6d9d80ca20a5598d2a7787acc73985bbf666b] | committer: Paul B Mahol avfilter/vf_negate: add support for more planar with alpha > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35b6d9d80ca20a559… --- libavfilter/vf_negate.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_negate.c b/libavfilter/vf_negate.c index 4887fc4860..58be43a44b 100644 --- a/libavfilter/vf_negate.c +++ b/libavfilter/vf_negate.c @@ -87,6 +87,8 @@ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV440P12, AV_PIX_FMT_YUV444P14, AV_PIX_FMT_YUV422P14, AV_PIX_FMT_YUV420P14, AV_PIX_FMT_YUV444P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV420P16, + AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA420P10, + AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_YUVA422P12, AV_PIX_FMT_YUVA444P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_ARGB, AV_PIX_FMT_RGBA, AV_PIX_FMT_ABGR, AV_PIX_FMT_BGRA, @@ -95,7 +97,7 @@ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_BGR48, AV_PIX_FMT_BGRA64, AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, - AV_PIX_FMT_GBRAP10, + AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP14, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRP16, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP16,

1 0

fate: add forgotten changes for GBRAP14
by Paul B Mahol 28 Sep '23

28 Sep '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Sep 28 20:06:19 2023 +0200| [3e7e5ec46b6573d2adbb051054e417c9fcfc984f] | committer: Paul B Mahol fate: add forgotten changes for GBRAP14 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e7e5ec46b6573d2a… --- tests/ref/fate/imgutils | 2 ++ tests/ref/fate/sws-pixdesc-query | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils index 02a755f2b7..f166cb67fb 100644 --- a/tests/ref/fate/imgutils +++ b/tests/ref/fate/imgutils @@ -266,3 +266,5 @@ p212be planes: 2, linesizes: 128 128 0 0, plane_sizes: 6144 6144 p212le planes: 2, linesizes: 128 128 0 0, plane_sizes: 6144 6144 0 0, plane_offsets: 6144 0 0, total_size: 12288 p412be planes: 2, linesizes: 128 256 0 0, plane_sizes: 6144 12288 0 0, plane_offsets: 6144 0 0, total_size: 18432 p412le planes: 2, linesizes: 128 256 0 0, plane_sizes: 6144 12288 0 0, plane_offsets: 6144 0 0, total_size: 18432 +gbrap14be planes: 4, linesizes: 128 128 128 128, plane_sizes: 6144 6144 6144 6144, plane_offsets: 6144 6144 6144, total_size: 24576 +gbrap14le planes: 4, linesizes: 128 128 128 128, plane_sizes: 6144 6144 6144 6144, plane_offsets: 6144 6144 6144, total_size: 24576 diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query index fd7f2aefc0..fff93bbf0e 100644 --- a/tests/ref/fate/sws-pixdesc-query +++ b/tests/ref/fate/sws-pixdesc-query @@ -43,6 +43,8 @@ isNBPS: gbrap10le gbrap12be gbrap12le + gbrap14be + gbrap14le gbrp10be gbrp10le gbrp12be @@ -145,6 +147,7 @@ isBE: bgra64be gbrap10be gbrap12be + gbrap14be gbrap16be gbrapf32be gbrp10be @@ -493,6 +496,8 @@ isRGB: gbrap10le gbrap12be gbrap12le + gbrap14be + gbrap14le gbrap16be gbrap16le gbrapf32be @@ -647,6 +652,8 @@ AnyRGB: gbrap10le gbrap12be gbrap12le + gbrap14be + gbrap14le gbrap16be gbrap16le gbrapf32be @@ -706,6 +713,8 @@ ALPHA: gbrap10le gbrap12be gbrap12le + gbrap14be + gbrap14le gbrap16be gbrap16le gbrapf32be @@ -839,6 +848,8 @@ Planar: gbrap10le gbrap12be gbrap12le + gbrap14be + gbrap14le gbrap16be gbrap16le gbrapf32be @@ -1018,6 +1029,8 @@ PlanarRGB: gbrap10le gbrap12be gbrap12le + gbrap14be + gbrap14le gbrap16be gbrap16le gbrapf32be

1 0

avfilter/vf_extractplanes: add GBRAP14 support
by Paul B Mahol 28 Sep '23

28 Sep '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Sep 27 17:08:16 2023 +0200| [3a5171c9f4925bf69291d28d0b5b289a49fab5b0] | committer: Paul B Mahol avfilter/vf_extractplanes: add GBRAP14 support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3a5171c9f4925bf69… --- libavfilter/vf_extractplanes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_extractplanes.c b/libavfilter/vf_extractplanes.c index 453e51a1ea..7b7149ab24 100644 --- a/libavfilter/vf_extractplanes.c +++ b/libavfilter/vf_extractplanes.c @@ -119,7 +119,7 @@ AVFILTER_DEFINE_CLASS(extractplanes); AV_PIX_FMT_YUVA422P9##suf, \ AV_PIX_FMT_YUVA444P9##suf, \ AV_PIX_FMT_GBRP9##suf, \ - AV_PIX_FMT_GBRP14##suf, \ + AV_PIX_FMT_GBRP14##suf, AV_PIX_FMT_GBRAP14##suf, \ AV_PIX_FMT_YUV420P14##suf, \ AV_PIX_FMT_YUV422P14##suf, \ AV_PIX_FMT_YUV444P14##suf

1 0

avcodec/magicyuv: add 14bit rgb(a) support
by Paul B Mahol 28 Sep '23

28 Sep '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Sep 27 15:41:01 2023 +0200| [eaffbd9ac4d975f1c6330c17af27fadf0bc3d0c3] | committer: Paul B Mahol avcodec/magicyuv: add 14bit rgb(a) support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eaffbd9ac4d975f1c… --- libavcodec/magicyuv.c | 26 +++++++++++++++++++++----- libavformat/isom_tags.c | 2 ++ libavformat/riff.c | 2 ++ 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/libavcodec/magicyuv.c b/libavcodec/magicyuv.c index 539da54c2f..3573db0f0a 100644 --- a/libavcodec/magicyuv.c +++ b/libavcodec/magicyuv.c @@ -73,12 +73,16 @@ typedef struct MagicYUVContext { int (*magy_decode_slice)(AVCodecContext *avctx, void *tdata, int j, int threadnr); LLVidDSPContext llviddsp; + HuffEntry he[1 << 14]; + uint8_t len[1 << 14]; } MagicYUVContext; -static int huff_build(const uint8_t len[], uint16_t codes_pos[33], +static int huff_build(AVCodecContext *avctx, + const uint8_t len[], uint16_t codes_pos[33], VLC *vlc, VLC_MULTI *multi, int nb_elems, void *logctx) { - HuffEntry he[4096]; + MagicYUVContext *s = avctx->priv_data; + HuffEntry *he = s->he; for (int i = 31; i > 0; i--) codes_pos[i] += codes_pos[i + 1]; @@ -381,7 +385,7 @@ static int build_huffman(AVCodecContext *avctx, const uint8_t *table, { MagicYUVContext *s = avctx->priv_data; GetByteContext gb; - uint8_t len[4096]; + uint8_t *len = s->len; uint16_t length_count[33] = { 0 }; int i = 0, j = 0, k; @@ -409,7 +413,7 @@ static int build_huffman(AVCodecContext *avctx, const uint8_t *table, if (j == max) { j = 0; - if (huff_build(len, length_count, &s->vlc[i], &s->multi[i], max, avctx)) { + if (huff_build(avctx, len, length_count, &s->vlc[i], &s->multi[i], max, avctx)) { av_log(avctx, AV_LOG_ERROR, "Cannot build Huffman codes\n"); return AVERROR_INVALIDDATA; } @@ -526,6 +530,16 @@ static int magy_decode_frame(AVCodecContext *avctx, AVFrame *p, s->decorrelate = 1; s->bps = 12; break; + case 0x71: + avctx->pix_fmt = AV_PIX_FMT_GBRP14; + s->decorrelate = 1; + s->bps = 14; + break; + case 0x72: + avctx->pix_fmt = AV_PIX_FMT_GBRAP14; + s->decorrelate = 1; + s->bps = 14; + break; case 0x73: avctx->pix_fmt = AV_PIX_FMT_GRAY10; s->bps = 10; @@ -653,7 +667,9 @@ static int magy_decode_frame(AVCodecContext *avctx, AVFrame *p, avctx->pix_fmt == AV_PIX_FMT_GBRP10 || avctx->pix_fmt == AV_PIX_FMT_GBRAP10|| avctx->pix_fmt == AV_PIX_FMT_GBRAP12|| - avctx->pix_fmt == AV_PIX_FMT_GBRP12) { + avctx->pix_fmt == AV_PIX_FMT_GBRAP14|| + avctx->pix_fmt == AV_PIX_FMT_GBRP12|| + avctx->pix_fmt == AV_PIX_FMT_GBRP14) { FFSWAP(uint8_t*, p->data[0], p->data[1]); FFSWAP(int, p->linesize[0], p->linesize[1]); } else { diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index 4738171a9c..4e0727bb45 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -260,6 +260,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_MAGICYUV, MKTAG('M', '8', 'Y', 'A') }, { AV_CODEC_ID_MAGICYUV, MKTAG('M', '2', 'R', 'A') }, { AV_CODEC_ID_MAGICYUV, MKTAG('M', '2', 'R', 'G') }, + { AV_CODEC_ID_MAGICYUV, MKTAG('M', '4', 'R', 'A') }, + { AV_CODEC_ID_MAGICYUV, MKTAG('M', '4', 'R', 'G') }, { AV_CODEC_ID_SHEERVIDEO, MKTAG('S', 'h', 'r', '0') }, { AV_CODEC_ID_SHEERVIDEO, MKTAG('S', 'h', 'r', '1') }, diff --git a/libavformat/riff.c b/libavformat/riff.c index 97708df6e3..51d23b290e 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -463,6 +463,8 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_MAGICYUV, MKTAG('M', '0', 'Y', '4') }, { AV_CODEC_ID_MAGICYUV, MKTAG('M', '2', 'R', 'A') }, { AV_CODEC_ID_MAGICYUV, MKTAG('M', '2', 'R', 'G') }, + { AV_CODEC_ID_MAGICYUV, MKTAG('M', '4', 'R', 'A') }, + { AV_CODEC_ID_MAGICYUV, MKTAG('M', '4', 'R', 'G') }, { AV_CODEC_ID_YLC, MKTAG('Y', 'L', 'C', '0') }, { AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '0') }, { AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '1') },

1 0

swscale: add GBRAP14 format support
by Paul B Mahol 28 Sep '23

28 Sep '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Sep 27 16:13:16 2023 +0200| [29b673bdcfe1cd37de40b1714bfbcc03817cef7e] | committer: Paul B Mahol swscale: add GBRAP14 format support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29b673bdcfe1cd37d… --- libavcodec/raw.c | 2 ++ libavformat/nut.c | 2 ++ libswscale/input.c | 7 +++++++ libswscale/output.c | 2 ++ libswscale/swscale_unscaled.c | 3 +++ libswscale/utils.c | 6 ++++++ libswscale/version.h | 2 +- tests/ref/fate/filter-pixdesc-gbrap14be | 1 + tests/ref/fate/filter-pixdesc-gbrap14le | 1 + tests/ref/fate/filter-pixfmts-copy | 2 ++ tests/ref/fate/filter-pixfmts-crop | 2 ++ tests/ref/fate/filter-pixfmts-field | 2 ++ tests/ref/fate/filter-pixfmts-fieldorder | 2 ++ tests/ref/fate/filter-pixfmts-hflip | 2 ++ tests/ref/fate/filter-pixfmts-il | 2 ++ tests/ref/fate/filter-pixfmts-null | 2 ++ tests/ref/fate/filter-pixfmts-pad | 1 + tests/ref/fate/filter-pixfmts-scale | 2 ++ tests/ref/fate/filter-pixfmts-transpose | 2 ++ tests/ref/fate/filter-pixfmts-vflip | 2 ++ 20 files changed, 46 insertions(+), 1 deletion(-) diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 1e5b48d1e0..b73b80e5fd 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -206,6 +206,8 @@ static const PixelFormatTag raw_pix_fmt_tags[] = { { AV_PIX_FMT_GBRAP10BE, MKTAG(10 , 00 , '4', 'G') }, { AV_PIX_FMT_GBRAP12LE, MKTAG('G', '4', 00 , 12 ) }, { AV_PIX_FMT_GBRAP12BE, MKTAG(12 , 00 , '4', 'G') }, + { AV_PIX_FMT_GBRAP14LE, MKTAG('G', '4', 00 , 14 ) }, + { AV_PIX_FMT_GBRAP14BE, MKTAG(14 , 00 , '4', 'G') }, { AV_PIX_FMT_GBRAP16LE, MKTAG('G', '4', 00 , 16 ) }, { AV_PIX_FMT_GBRAP16BE, MKTAG(16 , 00 , '4', 'G') }, diff --git a/libavformat/nut.c b/libavformat/nut.c index 47ed152529..a0bf257c7d 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -184,6 +184,8 @@ const AVCodecTag ff_nut_video_tags[] = { { AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 00 , '4', 'G') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('G', '4', 00 , 12 ) }, { AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 00 , '4', 'G') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('G', '4', 00 , 14 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(14 , 00 , '4', 'G') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('G', '4', 00 , 16 ) }, { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 00 , '4', 'G') }, diff --git a/libswscale/input.c b/libswscale/input.c index 41795c636e..d171394bb2 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -1149,6 +1149,7 @@ rgb9plus_planar_funcs(16) rgb9plus_planar_transparency_funcs(10) rgb9plus_planar_transparency_funcs(12) +rgb9plus_planar_transparency_funcs(14) rgb9plus_planar_transparency_funcs(16) #define rgbf32_planar_funcs_endian(endian_name, endian) \ @@ -1326,6 +1327,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_GBRP12LE: c->readChrPlanar = planar_rgb12le_to_uv; break; + case AV_PIX_FMT_GBRAP14LE: case AV_PIX_FMT_GBRP14LE: c->readChrPlanar = planar_rgb14le_to_uv; break; @@ -1348,6 +1350,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_GBRP12BE: c->readChrPlanar = planar_rgb12be_to_uv; break; + case AV_PIX_FMT_GBRAP14BE: case AV_PIX_FMT_GBRP14BE: c->readChrPlanar = planar_rgb14be_to_uv; break; @@ -1686,6 +1689,8 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_GBRP12LE: c->readLumPlanar = planar_rgb12le_to_y; break; + case AV_PIX_FMT_GBRAP14LE: + c->readAlpPlanar = planar_rgb14le_to_a; case AV_PIX_FMT_GBRP14LE: c->readLumPlanar = planar_rgb14le_to_y; break; @@ -1712,6 +1717,8 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_GBRP12BE: c->readLumPlanar = planar_rgb12be_to_y; break; + case AV_PIX_FMT_GBRAP14BE: + c->readAlpPlanar = planar_rgb14be_to_a; case AV_PIX_FMT_GBRP14BE: c->readLumPlanar = planar_rgb14be_to_y; break; diff --git a/libswscale/output.c b/libswscale/output.c index 5c85bff971..8849a3201a 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -3047,6 +3047,8 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, case AV_PIX_FMT_GBRAP10LE: case AV_PIX_FMT_GBRAP12BE: case AV_PIX_FMT_GBRAP12LE: + case AV_PIX_FMT_GBRAP14BE: + case AV_PIX_FMT_GBRAP14LE: *yuv2anyX = yuv2gbrp_full_X_c; break; case AV_PIX_FMT_GBRP16BE: diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 9af2e7ecc3..a5c9917799 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -2073,6 +2073,7 @@ void ff_get_unscaled_swscale(SwsContext *c) dstFormat == AV_PIX_FMT_GBRP16LE || dstFormat == AV_PIX_FMT_GBRP16BE || dstFormat == AV_PIX_FMT_GBRAP10LE || dstFormat == AV_PIX_FMT_GBRAP10BE || dstFormat == AV_PIX_FMT_GBRAP12LE || dstFormat == AV_PIX_FMT_GBRAP12BE || + dstFormat == AV_PIX_FMT_GBRAP14LE || dstFormat == AV_PIX_FMT_GBRAP14BE || dstFormat == AV_PIX_FMT_GBRAP16LE || dstFormat == AV_PIX_FMT_GBRAP16BE )) c->convert_unscaled = Rgb16ToPlanarRgb16Wrapper; @@ -2083,6 +2084,7 @@ void ff_get_unscaled_swscale(SwsContext *c) srcFormat == AV_PIX_FMT_GBRP14LE || srcFormat == AV_PIX_FMT_GBRP14BE || srcFormat == AV_PIX_FMT_GBRAP10LE || srcFormat == AV_PIX_FMT_GBRAP10BE || srcFormat == AV_PIX_FMT_GBRAP12LE || srcFormat == AV_PIX_FMT_GBRAP12BE || + srcFormat == AV_PIX_FMT_GBRAP14LE || srcFormat == AV_PIX_FMT_GBRAP14BE || srcFormat == AV_PIX_FMT_GBRAP16LE || srcFormat == AV_PIX_FMT_GBRAP16BE) && (dstFormat == AV_PIX_FMT_RGB48LE || dstFormat == AV_PIX_FMT_RGB48BE || dstFormat == AV_PIX_FMT_BGR48LE || dstFormat == AV_PIX_FMT_BGR48BE || @@ -2132,6 +2134,7 @@ void ff_get_unscaled_swscale(SwsContext *c) IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRP16) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRAP10) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRAP12) || + IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRAP14) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRAP16) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB444) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB48) || diff --git a/libswscale/utils.c b/libswscale/utils.c index b3cc74331f..e1ad685972 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -204,6 +204,8 @@ static const FormatEntry format_entries[] = { [AV_PIX_FMT_GBRAP12BE] = { 1, 1 }, [AV_PIX_FMT_GBRP14LE] = { 1, 1 }, [AV_PIX_FMT_GBRP14BE] = { 1, 1 }, + [AV_PIX_FMT_GBRAP14LE] = { 1, 1 }, + [AV_PIX_FMT_GBRAP14BE] = { 1, 1 }, [AV_PIX_FMT_GBRP16LE] = { 1, 1 }, [AV_PIX_FMT_GBRP16BE] = { 1, 1 }, [AV_PIX_FMT_GBRPF32LE] = { 1, 1 }, @@ -1228,6 +1230,9 @@ static enum AVPixelFormat alphaless_fmt(enum AVPixelFormat fmt) case AV_PIX_FMT_GBRAP12LE: return AV_PIX_FMT_GBRP12; case AV_PIX_FMT_GBRAP12BE: return AV_PIX_FMT_GBRP12; + case AV_PIX_FMT_GBRAP14LE: return AV_PIX_FMT_GBRP14; + case AV_PIX_FMT_GBRAP14BE: return AV_PIX_FMT_GBRP14; + case AV_PIX_FMT_GBRAP16LE: return AV_PIX_FMT_GBRP16; case AV_PIX_FMT_GBRAP16BE: return AV_PIX_FMT_GBRP16; @@ -1496,6 +1501,7 @@ static av_cold int sws_init_single_context(SwsContext *c, SwsFilter *srcFilter, srcFormat != AV_PIX_FMT_GBRAP10BE && srcFormat != AV_PIX_FMT_GBRAP10LE && srcFormat != AV_PIX_FMT_GBRP12BE && srcFormat != AV_PIX_FMT_GBRP12LE && srcFormat != AV_PIX_FMT_GBRAP12BE && srcFormat != AV_PIX_FMT_GBRAP12LE && + srcFormat != AV_PIX_FMT_GBRAP14BE && srcFormat != AV_PIX_FMT_GBRAP14LE && srcFormat != AV_PIX_FMT_GBRP14BE && srcFormat != AV_PIX_FMT_GBRP14LE && srcFormat != AV_PIX_FMT_GBRP16BE && srcFormat != AV_PIX_FMT_GBRP16LE && srcFormat != AV_PIX_FMT_GBRAP16BE && srcFormat != AV_PIX_FMT_GBRAP16LE && diff --git a/libswscale/version.h b/libswscale/version.h index 51eb013a29..12412bd538 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -28,7 +28,7 @@ #include "version_major.h" -#define LIBSWSCALE_VERSION_MINOR 3 +#define LIBSWSCALE_VERSION_MINOR 4 #define LIBSWSCALE_VERSION_MICRO 100 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ diff --git a/tests/ref/fate/filter-pixdesc-gbrap14be b/tests/ref/fate/filter-pixdesc-gbrap14be new file mode 100644 index 0000000000..72ccf37005 --- /dev/null +++ b/tests/ref/fate/filter-pixdesc-gbrap14be @@ -0,0 +1 @@ +pixdesc-gbrap14be 31cab6d8ee655ff61cf44ea458268e4c diff --git a/tests/ref/fate/filter-pixdesc-gbrap14le b/tests/ref/fate/filter-pixdesc-gbrap14le new file mode 100644 index 0000000000..196c451dfa --- /dev/null +++ b/tests/ref/fate/filter-pixdesc-gbrap14le @@ -0,0 +1 @@ +pixdesc-gbrap14le db6b141efe8f0d9cfa8f77937e577b50 diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index 27f12e8f97..eb3e61b4f2 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -23,6 +23,8 @@ gbrap10be edcffb185e44b6dae5c2ead5505b7125 gbrap10le 2a7392e14b21b1f9457526a071236a6d gbrap12be 0c4c1f8af361571265ca259d5f70f026 gbrap12le 5f1d8c663d4c28863e687192433b34a4 +gbrap14be 25694ddb34dceabec5143a7677c8072d +gbrap14le 0eba343fc6f713d310db3d67f7d5a06b gbrap16be e4edca4361d643794034e5aa9ef290b1 gbrap16le 9a95b389d2bf556179e8f4b27fb550ab gbrapf32be d908f0950d3735863fe6f0793fa24f76 diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop index 7bd0cfcb89..01cb88bc54 100644 --- a/tests/ref/fate/filter-pixfmts-crop +++ b/tests/ref/fate/filter-pixfmts-crop @@ -23,6 +23,8 @@ gbrap10be 1880c4856d9cc6492b8b859f2711aaf1 gbrap10le c2b6e35f8b7ca363a7ec021ccdf31d1f gbrap12be c9769d18733cdc2664d8b9af09a03f6d gbrap12le 3f80453c1ac6c5d1b2febf3ef141b476 +gbrap14be 11238485c208bd064730fd4469869e98 +gbrap14le 59f0ae68812ac2c0b0ac04def7161ab7 gbrap16be 21c98d0d7e7de2a93f9f095e5bb5c227 gbrap16le ea9a96870c1b742dd9f065c5db568184 gbrapf32be ec06b3b168dc74048100f29a4412da90 diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index 0c40a4d90f..c7d9b8f133 100644 --- a/tests/ref/fate/filter-pixfmts-field +++ b/tests/ref/fate/filter-pixfmts-field @@ -23,6 +23,8 @@ gbrap10be 29d46cbf021b233f5f1886e5d5fe21b4 gbrap10le 4017c5d8c124438eb9aefa107db58d3b gbrap12be e7f471132628b1c034199cc109b84bc2 gbrap12le 886207e5aa379a0312485b94e5fd5edd +gbrap14be 6c56b7c47dbc7707e09d93f06eb34624 +gbrap14le e6077974ee36f906987319364b2a72a8 gbrap16be eaa0158f27ebc40cde9e3d6eef1e2ba1 gbrap16le 6cf68992d4fcac2aa025d1014b669d24 gbrapf32be 37c627796dee55ca6f4e7ca965460680 diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder index 8c024784e3..2f64bd3b14 100644 --- a/tests/ref/fate/filter-pixfmts-fieldorder +++ b/tests/ref/fate/filter-pixfmts-fieldorder @@ -23,6 +23,8 @@ gbrap10be 8b27254a69cd0e25fa55262a743f95e6 gbrap10le 52278021718ec370903dccc923dc8bf6 gbrap12be 302b353dff696ec9fd0d85a0cc14802b gbrap12le ae2d6db2c9c825f06d92389de21263d2 +gbrap14be 1d28d4af2b00d08a17278ca0a316f24a +gbrap14le 07bc3e6abb0ee23876c9605fd81e8a83 gbrap16be 52c10d8046d123dfc4a478276906467c gbrap16le 2317737b8f5140add27d121de8f5ba95 gbrapf32be 6781751ef9d444d150cb0a1e1cefe141 diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip index a80b1abd5b..66274890a7 100644 --- a/tests/ref/fate/filter-pixfmts-hflip +++ b/tests/ref/fate/filter-pixfmts-hflip @@ -23,6 +23,8 @@ gbrap10be f188dc23756469cbdd172fe97ad58121 gbrap10le 262f0501633ea4670020fae8ac6835e2 gbrap12be ffe9aa4cbcc42f71757efe18826764ac gbrap12le 88a85c1b3c5e19e299fdd209b73ac1ba +gbrap14be e4aedeb3aadedbe93cc415db0a65c1a2 +gbrap14le d6183b778f950a1255e27efe658127e4 gbrap16be 3117e84b258433a7efb9288bbb8815d4 gbrap16le 3ad08cf8b49d8eb31a1b356ec4b7b88b gbrapf32be d82e48eb62c1e2d2ce5d614aeda38a99 diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index 461b2b1720..03519f2a9d 100644 --- a/tests/ref/fate/filter-pixfmts-il +++ b/tests/ref/fate/filter-pixfmts-il @@ -23,6 +23,8 @@ gbrap10be bafa57a2e4331d8a39f6f0087c85d4b1 gbrap10le 553a1f439d8184dc400432d3f786fbce gbrap12be 48609d6b61ff6313939fa2d9c3ebb6d9 gbrap12le e3b5342c8e47820f2de7e2dd61872312 +gbrap14be 213d656dd43193eac7711cdcc91ed2d1 +gbrap14le 350ae0639e73f20efa867cfba5dd7afd gbrap16be 696c84c8b009c7320cad7f3847bb35da gbrap16le 9bacb81fbbe9cdfd04d71eb55a9719d2 gbrapf32be 5995aba2bf66254f63d5413cd9860353 diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index 27f12e8f97..eb3e61b4f2 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -23,6 +23,8 @@ gbrap10be edcffb185e44b6dae5c2ead5505b7125 gbrap10le 2a7392e14b21b1f9457526a071236a6d gbrap12be 0c4c1f8af361571265ca259d5f70f026 gbrap12le 5f1d8c663d4c28863e687192433b34a4 +gbrap14be 25694ddb34dceabec5143a7677c8072d +gbrap14le 0eba343fc6f713d310db3d67f7d5a06b gbrap16be e4edca4361d643794034e5aa9ef290b1 gbrap16le 9a95b389d2bf556179e8f4b27fb550ab gbrapf32be d908f0950d3735863fe6f0793fa24f76 diff --git a/tests/ref/fate/filter-pixfmts-pad b/tests/ref/fate/filter-pixfmts-pad index 8394622257..dd01059c59 100644 --- a/tests/ref/fate/filter-pixfmts-pad +++ b/tests/ref/fate/filter-pixfmts-pad @@ -9,6 +9,7 @@ bgra 929aac15e848038e367c250037575f9f gbrap 5f16cccab5a17cb766c882e865995167 gbrap10le e63e0a1ae9afd7e6a732f18be194e761 gbrap12le eb7a5ff44a9b5b46bb9829838224ed8e +gbrap14le 4c8b549942e66f442de0f5c1d21e9b8e gbrap16le d0f6fc33cb75588327aec1b5ad6ab4f0 gbrp 3c94d39256db2409015df913fd330a90 gbrp10le 5b356737cd8a396f39bbdadb7cb35e06 diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index 6435cc6ef2..b11384068b 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -23,6 +23,8 @@ gbrap10be 50735fbc471a5ac5a6645c85881f3670 gbrap10le 6e1cba57029fdf0f9d46b5e5cd55112b gbrap12be 58170165829484b3db4a3b9165198987 gbrap12le 24f5ecb32435b73353517e017c165e31 +gbrap14be 6addff84e986e7ea28aa3cdb80f44137 +gbrap14le a753ce2fc6d36920d678411434bed9b1 gbrap16be 31968e6872a46e8174fb57f8920ed10d gbrap16le 8c6758f33671b673b6d30969fc05a23d gbrapf32be 366b804d5697276e8c481c4bdf05a00b diff --git a/tests/ref/fate/filter-pixfmts-transpose b/tests/ref/fate/filter-pixfmts-transpose index 169f2708ec..ec157dee0c 100644 --- a/tests/ref/fate/filter-pixfmts-transpose +++ b/tests/ref/fate/filter-pixfmts-transpose @@ -23,6 +23,8 @@ gbrap10be 3e3be2d8f9aa5f449a1df404e27d0054 gbrap10le db4e4861010cbbf726492fad282d5813 gbrap12be 1518c9a565d1ba1a45dd369acc1aa75e gbrap12le 714fe318af81a46f83655c6e7e13351e +gbrap14be 929c440a44fbeab41111ebbf1d724464 +gbrap14le 577112fe137e056b4fb145403d5846e6 gbrap16be 39d488528aacff466aac7539c9b948a8 gbrap16le 5426ac9457289927bfe2ec03038a8780 gbrapf32be ea02b3912372c8671ff4eacbcbda740a diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index 705ab1a050..9a7972d6cf 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -23,6 +23,8 @@ gbrap10be e8134b72acc090b093b4d9b4d4703c7e gbrap10le 43bde7bd6a676c6ac33dbcc4c72762f3 gbrap12be 16a3d105ba852a9fa23ea5232db51b48 gbrap12le 6ef8a3ac4129ec23c34aec14ac41f249 +gbrap14be b5a84309c1ca113d950ca7aa4e64bad4 +gbrap14le 561babad7e222cc004250cabfd17a605 gbrap16be 70b020b6b9e1896b72f890de3570ffda gbrap16le e0cf341cdbaf1f5c40016f181bc9d7d4 gbrapf32be e82323abcb665014346a3a34a4b084c3

1 0

avutil: add GBRAP14 format support
by Paul B Mahol 28 Sep '23

28 Sep '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Sep 27 16:06:02 2023 +0200| [8e1ef7c38f6906455ae96984d032e57106e11b77] | committer: Paul B Mahol avutil: add GBRAP14 format support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8e1ef7c38f6906455… --- doc/APIchanges | 3 +++ libavutil/pixdesc.c | 28 ++++++++++++++++++++++++++++ libavutil/pixfmt.h | 4 ++++ libavutil/version.h | 2 +- 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index f4eb7f6d68..5b86cf6fda 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2023-09-28 - xxxxxxxxxx - lavu 58.27.100 - pixfmt.h + Add AV_PIX_FMT_GBRAP14BE, AV_PIX_FMT_GBRAP14LE pixel formats. + 2023-09-28 - xxxxxxxxxx - lavu 58.26.100 - hwcontext_cuda.h Add AV_CUDA_USE_CURRENT_CONTEXT. diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index e1e0dd2a9e..6ded9467b0 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2223,6 +2223,34 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE, }, + [AV_PIX_FMT_GBRAP14LE] = { + .name = "gbrap14le", + .nb_components = 4, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 2, 2, 0, 0, 14 }, /* R */ + { 0, 2, 0, 0, 14 }, /* G */ + { 1, 2, 0, 0, 14 }, /* B */ + { 3, 2, 0, 0, 14 }, /* A */ + }, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | + AV_PIX_FMT_FLAG_ALPHA, + }, + [AV_PIX_FMT_GBRAP14BE] = { + .name = "gbrap14be", + .nb_components = 4, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 2, 2, 0, 0, 14 }, /* R */ + { 0, 2, 0, 0, 14 }, /* G */ + { 1, 2, 0, 0, 14 }, /* B */ + { 3, 2, 0, 0, 14 }, /* A */ + }, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | + AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, + }, [AV_PIX_FMT_GBRAP12LE] = { .name = "gbrap12le", .nb_components = 4, diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 63e07ba64f..a26c72d56b 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -426,6 +426,9 @@ enum AVPixelFormat { AV_PIX_FMT_P412BE, ///< interleaved chroma YUV 4:4:4, 36bpp, data in the high bits, big-endian AV_PIX_FMT_P412LE, ///< interleaved chroma YUV 4:4:4, 36bpp, data in the high bits, little-endian + AV_PIX_FMT_GBRAP14BE, ///< planar GBR 4:4:4:4 56bpp, big-endian + AV_PIX_FMT_GBRAP14LE, ///< planar GBR 4:4:4:4 56bpp, little-endian + AV_PIX_FMT_NB ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions }; @@ -484,6 +487,7 @@ enum AVPixelFormat { #define AV_PIX_FMT_GBRP16 AV_PIX_FMT_NE(GBRP16BE, GBRP16LE) #define AV_PIX_FMT_GBRAP10 AV_PIX_FMT_NE(GBRAP10BE, GBRAP10LE) #define AV_PIX_FMT_GBRAP12 AV_PIX_FMT_NE(GBRAP12BE, GBRAP12LE) +#define AV_PIX_FMT_GBRAP14 AV_PIX_FMT_NE(GBRAP14BE, GBRAP14LE) #define AV_PIX_FMT_GBRAP16 AV_PIX_FMT_NE(GBRAP16BE, GBRAP16LE) #define AV_PIX_FMT_BAYER_BGGR16 AV_PIX_FMT_NE(BAYER_BGGR16BE, BAYER_BGGR16LE) diff --git a/libavutil/version.h b/libavutil/version.h index 2dc1a647b8..4c0c545d40 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 58 -#define LIBAVUTIL_VERSION_MINOR 26 +#define LIBAVUTIL_VERSION_MINOR 27 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

1 0

avutil/hwcontext_cuda: add option to use current device context
by Roman Arzumanyan 28 Sep '23

28 Sep '23

ffmpeg | branch: master | Roman Arzumanyan <r.arzumanyan(a)visionlabs.ai> | Tue Sep 12 17:31:30 2023 +0300| [05f8b2ca0f7e28775837a572c65ce9218f534ee2] | committer: Timo Rothenpieler avutil/hwcontext_cuda: add option to use current device context Signed-off-by: Timo Rothenpieler <timo(a)rothenpieler.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=05f8b2ca0f7e28775… --- configure | 9 +++++---- doc/APIchanges | 3 +++ libavutil/hwcontext_cuda.c | 28 +++++++++++++++++++++++++++- libavutil/hwcontext_cuda.h | 5 +++++ libavutil/version.h | 2 +- 5 files changed, 41 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 6f9b223481..e1afcaa586 100755 --- a/configure +++ b/configure @@ -6577,10 +6577,11 @@ fi if ! disabled ffnvcodec; then ffnv_hdr_list="ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h" - check_pkg_config ffnvcodec "ffnvcodec >= 12.0.16.0" "$ffnv_hdr_list" "" || \ - check_pkg_config ffnvcodec "ffnvcodec >= 11.1.5.2 ffnvcodec < 12.0" "$ffnv_hdr_list" "" || \ - check_pkg_config ffnvcodec "ffnvcodec >= 11.0.10.2 ffnvcodec < 11.1" "$ffnv_hdr_list" "" || \ - check_pkg_config ffnvcodec "ffnvcodec >= 8.1.24.14 ffnvcodec < 8.2" "$ffnv_hdr_list" "" + check_pkg_config ffnvcodec "ffnvcodec >= 12.1.14.0" "$ffnv_hdr_list" "" || \ + check_pkg_config ffnvcodec "ffnvcodec >= 12.0.16.1 ffnvcodec < 12.1" "$ffnv_hdr_list" "" || \ + check_pkg_config ffnvcodec "ffnvcodec >= 11.1.5.3 ffnvcodec < 12.0" "$ffnv_hdr_list" "" || \ + check_pkg_config ffnvcodec "ffnvcodec >= 11.0.10.3 ffnvcodec < 11.1" "$ffnv_hdr_list" "" || \ + check_pkg_config ffnvcodec "ffnvcodec >= 8.1.24.15 ffnvcodec < 8.2" "$ffnv_hdr_list" "" fi if enabled_all libglslang libshaderc; then diff --git a/doc/APIchanges b/doc/APIchanges index f333ff5b24..f4eb7f6d68 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2023-09-28 - xxxxxxxxxx - lavu 58.26.100 - hwcontext_cuda.h + Add AV_CUDA_USE_CURRENT_CONTEXT. + 2023-09-19 - xxxxxxxxxx - lavu 58.25.100 - avutil.h Make AV_TIME_BASE_Q compatible with C++. diff --git a/libavutil/hwcontext_cuda.c b/libavutil/hwcontext_cuda.c index 4b298fa93e..c648723285 100644 --- a/libavutil/hwcontext_cuda.c +++ b/libavutil/hwcontext_cuda.c @@ -361,6 +361,11 @@ static int cuda_context_init(AVHWDeviceContext *device_ctx, int flags) { hwctx->internal->cuda_device)); if (ret < 0) return ret; + } else if (flags & AV_CUDA_USE_CURRENT_CONTEXT) { + ret = CHECK_CU(cu->cuCtxGetCurrent(&hwctx->cuda_ctx)); + if (ret < 0) + return ret; + av_log(device_ctx, AV_LOG_INFO, "Using current CUDA context.\n"); } else { ret = CHECK_CU(cu->cuCtxCreate(&hwctx->cuda_ctx, desired_flags, hwctx->internal->cuda_device)); @@ -382,8 +387,21 @@ static int cuda_flags_from_opts(AVHWDeviceContext *device_ctx, AVDictionary *opts, int *flags) { AVDictionaryEntry *primary_ctx_opt = av_dict_get(opts, "primary_ctx", NULL, 0); + AVDictionaryEntry *current_ctx_opt = av_dict_get(opts, "current_ctx", NULL, 0); + + int use_primary_ctx = 0, use_current_ctx = 0; + if (primary_ctx_opt) + use_primary_ctx = strtol(primary_ctx_opt->value, NULL, 10); + + if (current_ctx_opt) + use_current_ctx = strtol(current_ctx_opt->value, NULL, 10); - if (primary_ctx_opt && strtol(primary_ctx_opt->value, NULL, 10)) { + if (use_primary_ctx && use_current_ctx) { + av_log(device_ctx, AV_LOG_ERROR, "Requested both primary and current CUDA context simultaneously.\n"); + return AVERROR(EINVAL); + } + + if (primary_ctx_opt && use_primary_ctx) { av_log(device_ctx, AV_LOG_VERBOSE, "Using CUDA primary device context\n"); *flags |= AV_CUDA_USE_PRIMARY_CONTEXT; } else if (primary_ctx_opt) { @@ -391,6 +409,14 @@ static int cuda_flags_from_opts(AVHWDeviceContext *device_ctx, *flags &= ~AV_CUDA_USE_PRIMARY_CONTEXT; } + if (current_ctx_opt && use_current_ctx) { + av_log(device_ctx, AV_LOG_VERBOSE, "Using CUDA current device context\n"); + *flags |= AV_CUDA_USE_CURRENT_CONTEXT; + } else if (current_ctx_opt) { + av_log(device_ctx, AV_LOG_VERBOSE, "Disabling use of CUDA current device context\n"); + *flags &= ~AV_CUDA_USE_CURRENT_CONTEXT; + } + return 0; } diff --git a/libavutil/hwcontext_cuda.h b/libavutil/hwcontext_cuda.h index cefbe0ceab..cbad434fea 100644 --- a/libavutil/hwcontext_cuda.h +++ b/libavutil/hwcontext_cuda.h @@ -62,6 +62,11 @@ typedef struct AVCUDADeviceContext { */ #define AV_CUDA_USE_PRIMARY_CONTEXT (1 << 0) +/** + * Use current device context instead of creating a new one. + */ +#define AV_CUDA_USE_CURRENT_CONTEXT (1 << 1) + /** * @} */ diff --git a/libavutil/version.h b/libavutil/version.h index 00f229d233..2dc1a647b8 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 58 -#define LIBAVUTIL_VERSION_MINOR 25 +#define LIBAVUTIL_VERSION_MINOR 26 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

1 0

lavc/h274: fix comment (cosmetic)
by Niklas Haas 28 Sep '23

28 Sep '23

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Wed Sep 27 15:49:46 2023 +0200| [48fc414c7cc13185b5ffe462b288e95be2517196] | committer: Niklas Haas lavc/h274: fix comment (cosmetic) Either the average, or the sum right-shifted. Not the average right-shifted. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=48fc414c7cc13185b… --- libavcodec/h274.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h274.c b/libavcodec/h274.c index 2388826d54..a5caf09564 100644 --- a/libavcodec/h274.c +++ b/libavcodec/h274.c @@ -110,7 +110,7 @@ static void init_slice(H274FilmGrainDatabase *database, uint8_t h, uint8_t v) init_slice_c(database->db[h][v], h, v, database->slice_tmp); } -// Computes the average of an 8x8 block, right-shifted by 6 +// Computes the average of an 8x8 block static uint16_t avg_8x8_c(const uint8_t *in, int in_stride) { uint16_t avg[8] = {0}; // summing over an array vectorizes better

1 0

lavc/h274: correct grain DB indices
by Niklas Haas 28 Sep '23

28 Sep '23

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Wed Sep 27 15:39:00 2023 +0200| [616e9d24137d34fba02ebd159d5a7186aaf53eca] | committer: Niklas Haas lavc/h274: correct grain DB indices The spec specified indices in the order [x][y], but our code follows the traditional C convention of [y][x]. This was not correctly account for when calculating the base index of the grain database access. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=616e9d24137d34fba… --- libavcodec/h274.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/h274.c b/libavcodec/h274.c index fc111cdb50..2388826d54 100644 --- a/libavcodec/h274.c +++ b/libavcodec/h274.c @@ -259,11 +259,11 @@ int ff_h274_apply_film_grain(AVFrame *out_frame, const AVFrame *in_frame, // only advanced in 16x16 blocks, so use a nested loop for (int y = 0; y < height; y += 16) { for (int x = 0; x < width; x += 16) { - uint16_t y_offset = (seed >> 16) % 52; - uint16_t x_offset = (seed & 0xFFFF) % 56; + uint16_t x_offset = (seed >> 16) % 52; + uint16_t y_offset = (seed & 0xFFFF) % 56; const int invert = (seed & 0x1); - y_offset &= 0xFFFC; - x_offset &= 0xFFF8; + x_offset &= 0xFFFC; + y_offset &= 0xFFF8; prng_shift(&seed); for (int yy = 0; yy < 16 && y+yy < height; yy += 8) {

1 0

lavc/h274: fix PRNG definition
by Niklas Haas 28 Sep '23

28 Sep '23

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Wed Sep 27 15:16:51 2023 +0200| [338a5fcdbe9571e6f22817a111621259d83f2e59] | committer: Niklas Haas lavc/h274: fix PRNG definition The spec specifies x^31 + x^3 + 1 as the polynomial, but the diagram in Figure 1-1 omits the +1 offset. The initial implementation was based on the diagram, but this is wrong (produces subtly incorrect results). > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=338a5fcdbe9571e6f… --- libavcodec/h274.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h274.c b/libavcodec/h274.c index a69f941142..fc111cdb50 100644 --- a/libavcodec/h274.c +++ b/libavcodec/h274.c @@ -38,7 +38,7 @@ static void prng_shift(uint32_t *state) { // Primitive polynomial x^31 + x^3 + 1 (modulo 2) uint32_t x = *state; - uint8_t feedback = (x >> 2) ^ (x >> 30); + uint8_t feedback = 1u ^ (x >> 2) ^ (x >> 30); *state = (x << 1) | (feedback & 1u); }

1 0