October 2024 - ffmpeg-cvslog - lists.ffmpeg.org

swscale/input: add XV48 input support
by James Almer 26 Oct '24

26 Oct '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Oct 23 13:10:53 2024 -0300| [2f13f74791a207b2a6ca3e76a8e5de8c9fc7865f] | committer: James Almer swscale/input: add XV48 input support Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f13f74791a207b2a… --- libswscale/input.c | 40 ++++++++++++++++++++++++++++++++-------- libswscale/utils.c | 2 ++ 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/libswscale/input.c b/libswscale/input.c index 15bd9fbe2d..a298b92a05 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -674,26 +674,42 @@ static void read_ayuv64be_Y_c(uint8_t *dst, const uint8_t *src, const uint8_t *u AV_WN16(dst + i * 2, AV_RB16(src + i * 8 + 2)); } -static void read_ayuv64le_UV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *unused0, const uint8_t *src, - const uint8_t *unused1, int width, uint32_t *unused2, void *opq) +static av_always_inline void ayuv64le_UV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src, int width, + int u_offset, int v_offset) { int i; for (i = 0; i < width; i++) { - AV_WN16(dstU + i * 2, AV_RL16(src + i * 8 + 4)); - AV_WN16(dstV + i * 2, AV_RL16(src + i * 8 + 6)); + AV_WN16(dstU + i * 2, AV_RL16(src + i * 8 + u_offset)); + AV_WN16(dstV + i * 2, AV_RL16(src + i * 8 + v_offset)); } } -static void read_ayuv64be_UV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *unused0, const uint8_t *src, - const uint8_t *unused1, int width, uint32_t *unused2, void *opq) +static av_always_inline void ayuv64be_UV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src, int width, + int u_offset, int v_offset) { int i; for (i = 0; i < width; i++) { - AV_WN16(dstU + i * 2, AV_RB16(src + i * 8 + 4)); - AV_WN16(dstV + i * 2, AV_RB16(src + i * 8 + 6)); + AV_WN16(dstU + i * 2, AV_RB16(src + i * 8 + u_offset)); + AV_WN16(dstV + i * 2, AV_RB16(src + i * 8 + v_offset)); } } +#define ayuv64_UV_funcs(pixfmt, U, V) \ +static void read_ ## pixfmt ## le_UV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *unused0, const uint8_t *src, \ + const uint8_t *unused1, int width, uint32_t *unused2, void *opq) \ +{ \ + ayuv64le_UV_c(dstU, dstV, src, width, U, V); \ +} \ + \ +static void read_ ## pixfmt ## be_UV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *unused0, const uint8_t *src, \ + const uint8_t *unused1, int width, uint32_t *unused2, void *opq) \ +{ \ + ayuv64be_UV_c(dstU, dstV, src, width, U, V); \ +} + +ayuv64_UV_funcs(ayuv64, 4, 6) +ayuv64_UV_funcs(xv48, 0, 4) + static void read_ayuv64le_A_c(uint8_t *dst, const uint8_t *src, const uint8_t *unused0, const uint8_t *unused1, int width, uint32_t *unused2, void *opq) { @@ -1722,6 +1738,12 @@ av_cold void ff_sws_init_input_funcs(SwsInternal *c, case AV_PIX_FMT_XV36BE: *chrToYV12 = read_xv36be_UV_c; break; + case AV_PIX_FMT_XV48LE: + *chrToYV12 = read_xv48le_UV_c; + break; + case AV_PIX_FMT_XV48BE: + *chrToYV12 = read_xv48be_UV_c; + break; case AV_PIX_FMT_P010LE: case AV_PIX_FMT_P210LE: case AV_PIX_FMT_P410LE: @@ -2146,9 +2168,11 @@ av_cold void ff_sws_init_input_funcs(SwsInternal *c, *lumToYV12 = read_ayuv_Y_c; break; case AV_PIX_FMT_AYUV64LE: + case AV_PIX_FMT_XV48LE: *lumToYV12 = read_ayuv64le_Y_c; break; case AV_PIX_FMT_AYUV64BE: + case AV_PIX_FMT_XV48BE: *lumToYV12 = read_ayuv64be_Y_c; break; case AV_PIX_FMT_XV36LE: diff --git a/libswscale/utils.c b/libswscale/utils.c index 31c136ad15..004cdf749f 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -277,6 +277,8 @@ static const FormatEntry format_entries[] = { [AV_PIX_FMT_XV30LE] = { 1, 1 }, [AV_PIX_FMT_XV36LE] = { 1, 1 }, [AV_PIX_FMT_XV36BE] = { 1, 1 }, + [AV_PIX_FMT_XV48LE] = { 1, 0 }, + [AV_PIX_FMT_XV48BE] = { 1, 0 }, [AV_PIX_FMT_AYUV] = { 1, 1 }, [AV_PIX_FMT_UYVA] = { 1, 1 }, [AV_PIX_FMT_VYU444] = { 1, 1 },

1 0

avutil/pixfmt: add XV48 pixel format
by James Almer 26 Oct '24

26 Oct '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Oct 23 12:38:13 2024 -0300| [e02a3b40a5eef7b5441602c1e5ec6ffa562eec7d] | committer: James Almer avutil/pixfmt: add XV48 pixel format Much like XV30 and XV36 in d75c4693fef51e8f0a1b88798530f4c5147ea906, XV48 is added to support 16bit 4:4:4 as defined by Microsoft. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e02a3b40a5eef7b54… --- doc/APIchanges | 3 +++ libavutil/pixdesc.c | 25 +++++++++++++++++++++++++ libavutil/pixfmt.h | 4 ++++ libavutil/tests/pixfmt_best.c | 2 ++ libavutil/version.h | 2 +- tests/ref/fate/imgutils | 4 ++++ tests/ref/fate/pixfmt_best | 2 +- tests/ref/fate/sws-pixdesc-query | 7 +++++++ 8 files changed, 47 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index eeb859b873..6f21a952dd 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2024-03-07 API changes, most recent first: +2024-10-26 - xxxxxxxxxx - lavu 59.46.100 - pixfmt.h + Add AV_PIX_FMT_XV48. + 2024-10-23 - xxxxxxxxxx - lsws 8.9.100 - swscale.h Add sws_is_noop(). diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index ba96803e5b..e595c76232 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2771,6 +2771,31 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_BE, }, + [AV_PIX_FMT_XV48LE] = { + .name = "xv48le", + .nb_components = 3, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 8, 2, 0, 16 }, /* Y */ + { 0, 8, 0, 0, 16 }, /* U */ + { 0, 8, 4, 0, 16 }, /* V */ + { 0, 8, 6, 0, 16 }, /* X */ + }, + }, + [AV_PIX_FMT_XV48BE] = { + .name = "xv48be", + .nb_components = 3, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 8, 2, 0, 16 }, /* Y */ + { 0, 8, 0, 0, 16 }, /* U */ + { 0, 8, 4, 0, 16 }, /* V */ + { 0, 8, 6, 0, 16 }, /* X */ + }, + .flags = AV_PIX_FMT_FLAG_BE, + }, [AV_PIX_FMT_V30XLE] = { .name = "v30xle", .nb_components = 3, diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 0b6b69fdeb..3215266091 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -460,6 +460,9 @@ enum AVPixelFormat { AV_PIX_FMT_Y216BE, ///< packed YUV 4:2:2 like YUYV422, 32bpp, big-endian AV_PIX_FMT_Y216LE, ///< packed YUV 4:2:2 like YUYV422, 32bpp, little-endian + AV_PIX_FMT_XV48BE, ///< packed XVYU 4:4:4, 64bpp, big-endian, variant of Y416 where alpha channel is left undefined + AV_PIX_FMT_XV48LE, ///< packed XVYU 4:4:4, 64bpp, little-endian, variant of Y416 where alpha channel is left undefined + 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 }; @@ -555,6 +558,7 @@ enum AVPixelFormat { #define AV_PIX_FMT_Y216 AV_PIX_FMT_NE(Y216BE, Y216LE) #define AV_PIX_FMT_XV30 AV_PIX_FMT_NE(XV30BE, XV30LE) #define AV_PIX_FMT_XV36 AV_PIX_FMT_NE(XV36BE, XV36LE) +#define AV_PIX_FMT_XV48 AV_PIX_FMT_NE(XV48BE, XV48LE) #define AV_PIX_FMT_V30X AV_PIX_FMT_NE(V30XBE, V30XLE) #define AV_PIX_FMT_X2RGB10 AV_PIX_FMT_NE(X2RGB10BE, X2RGB10LE) #define AV_PIX_FMT_X2BGR10 AV_PIX_FMT_NE(X2BGR10BE, X2BGR10LE) diff --git a/libavutil/tests/pixfmt_best.c b/libavutil/tests/pixfmt_best.c index c853be0e34..fb16fe6f2f 100644 --- a/libavutil/tests/pixfmt_best.c +++ b/libavutil/tests/pixfmt_best.c @@ -47,6 +47,7 @@ static const enum AVPixelFormat semiplanar_list[] = { }; static const enum AVPixelFormat packed_list[] = { + AV_PIX_FMT_XV48, AV_PIX_FMT_XV36, AV_PIX_FMT_XV30, AV_PIX_FMT_VUYX, @@ -208,6 +209,7 @@ int main(void) TEST_PACKED(AV_PIX_FMT_YUV444P, AV_PIX_FMT_VUYX); TEST_PACKED(AV_PIX_FMT_YUV444P10, AV_PIX_FMT_XV30); TEST_PACKED(AV_PIX_FMT_YUV444P12, AV_PIX_FMT_XV36); + TEST_PACKED(AV_PIX_FMT_YUV444P16, AV_PIX_FMT_XV48); TEST_PACKED(AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUYV422); TEST_PACKED(AV_PIX_FMT_YUV422P10, AV_PIX_FMT_Y210); TEST_PACKED(AV_PIX_FMT_YUV422P12, AV_PIX_FMT_Y212); diff --git a/libavutil/version.h b/libavutil/version.h index b4268a14a7..84a7cb1c02 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 59 -#define LIBAVUTIL_VERSION_MINOR 45 +#define LIBAVUTIL_VERSION_MINOR 46 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils index 7fbb1fd902..b03e6c5824 100644 --- a/tests/ref/fate/imgutils +++ b/tests/ref/fate/imgutils @@ -282,6 +282,8 @@ rgb96be planes: 1, linesizes: 768 0 0 0, plane_sizes: 36864 0 rgb96le planes: 1, linesizes: 768 0 0 0, plane_sizes: 36864 0 0 0, plane_offsets: 0 0 0, total_size: 36864 y216be planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 y216le planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 +xv48be planes: 1, linesizes: 512 0 0 0, plane_sizes: 24576 0 0 0, plane_offsets: 0 0 0, total_size: 24576 +xv48le planes: 1, linesizes: 512 0 0 0, plane_sizes: 24576 0 0 0, plane_offsets: 0 0 0, total_size: 24576 image_fill_black tests yuv420p total_size: 4608, black_unknown_crc: 0xd00f6cc6, black_tv_crc: 0xd00f6cc6, black_pc_crc: 0x234969af @@ -511,3 +513,5 @@ rgb96be total_size: 36864, black_unknown_crc: 0x00000000, black_tv_cr rgb96le total_size: 36864, black_unknown_crc: 0x00000000, black_tv_crc: 0x00000000, black_pc_crc: 0x00000000 y216be total_size: 12288, black_unknown_crc: 0x5483d935, black_tv_crc: 0x5483d935, black_pc_crc: 0x06397bf3 y216le total_size: 12288, black_unknown_crc: 0x5d8e1cf6, black_tv_crc: 0x5d8e1cf6, black_pc_crc: 0x8fceec45 +xv48be total_size: 24576, black_unknown_crc: 0x6ba828bd, black_tv_crc: 0x6ba828bd, black_pc_crc: 0x5f450f41 +xv48le total_size: 24576, black_unknown_crc: 0xc3794950, black_tv_crc: 0xc3794950, black_pc_crc: 0x40874939 diff --git a/tests/ref/fate/pixfmt_best b/tests/ref/fate/pixfmt_best index 72560f5df9..90ced69245 100644 --- a/tests/ref/fate/pixfmt_best +++ b/tests/ref/fate/pixfmt_best @@ -1 +1 @@ -111 tests passed, 0 tests failed. +113 tests passed, 0 tests failed. diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query index a4bbc8bfcb..bc6a07959d 100644 --- a/tests/ref/fate/sws-pixdesc-query +++ b/tests/ref/fate/sws-pixdesc-query @@ -25,6 +25,8 @@ is16BPS: rgbaf16le rgbf16be rgbf16le + xv48be + xv48le y216be y216le ya16be @@ -194,6 +196,7 @@ isBE: x2rgb10be xv30be xv36be + xv48be xyz12be y210be y212be @@ -269,6 +272,8 @@ isYUV: xv30le xv36be xv36le + xv48be + xv48le xyz12be xyz12le y210be @@ -875,6 +880,8 @@ Packed: xv30le xv36be xv36le + xv48be + xv48le xyz12be xyz12le y210be

1 0

libavutil/hwcontext_d3d11va: use the Y216 pixel format
by James Almer 26 Oct '24

26 Oct '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Mon Oct 21 22:24:42 2024 -0300| [e1bacfb5235f0a29215d299d224a58c218365711] | committer: James Almer libavutil/hwcontext_d3d11va: use the Y216 pixel format Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1bacfb5235f0a292… --- libavutil/hwcontext_d3d11va.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c index 9b3c5f389f..ecf4207b3c 100644 --- a/libavutil/hwcontext_d3d11va.c +++ b/libavutil/hwcontext_d3d11va.c @@ -102,7 +102,7 @@ static const struct { { DXGI_FORMAT_Y210, AV_PIX_FMT_Y210 }, { DXGI_FORMAT_Y410, AV_PIX_FMT_XV30 }, { DXGI_FORMAT_P016, AV_PIX_FMT_P012 }, - { DXGI_FORMAT_Y216, AV_PIX_FMT_Y212 }, + { DXGI_FORMAT_Y216, AV_PIX_FMT_Y216 }, { DXGI_FORMAT_Y416, AV_PIX_FMT_XV36 }, // Special opaque formats. The pix_fmt is merely a place holder, as the // opaque format cannot be accessed directly.

1 0

libavutil/hwcontext_dxva2: use the Y216 pixel format
by James Almer 26 Oct '24

26 Oct '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Oct 25 23:56:27 2024 -0300| [c76d92b2e068cf0a415b5bd19101657aff0ca730] | committer: James Almer libavutil/hwcontext_dxva2: use the Y216 pixel format Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c76d92b2e068cf0a4… --- libavutil/hwcontext_dxva2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/hwcontext_dxva2.c b/libavutil/hwcontext_dxva2.c index 0b76966ebf..d73799ec39 100644 --- a/libavutil/hwcontext_dxva2.c +++ b/libavutil/hwcontext_dxva2.c @@ -93,7 +93,7 @@ static const struct { { MKTAG('Y', '2', '1', '0'), AV_PIX_FMT_Y210 }, { MKTAG('Y', '4', '1', '0'), AV_PIX_FMT_XV30 }, { MKTAG('P', '0', '1', '6'), AV_PIX_FMT_P012 }, - { MKTAG('Y', '2', '1', '6'), AV_PIX_FMT_Y212 }, + { MKTAG('Y', '2', '1', '6'), AV_PIX_FMT_Y216 }, { MKTAG('Y', '4', '1', '6'), AV_PIX_FMT_XV36 }, { D3DFMT_P8, AV_PIX_FMT_PAL8 }, { D3DFMT_A8R8G8B8, AV_PIX_FMT_BGRA },

1 0

avformat/riff: map Y210 and Y216 fourcc to RAWVIDEO decoder
by James Almer 26 Oct '24

26 Oct '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Mon Oct 21 22:10:48 2024 -0300| [faec8763e8611e73cf99a56aa3ddfbf88d89a58f] | committer: James Almer avformat/riff: map Y210 and Y216 fourcc to RAWVIDEO decoder As defined in https://learn.microsoft.com/en-us/windows/win32/medfound/10-bit-and-16-bit-… Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=faec8763e8611e73c… --- libavcodec/raw.c | 2 ++ libavformat/riff.c | 2 ++ tests/ref/fate/filter-pixdesc-y210le | 2 +- tests/ref/fate/filter-pixdesc-y216le | 2 +- tests/ref/fate/filter-pixfmts-copy | 4 ++-- tests/ref/fate/filter-pixfmts-field | 4 ++-- tests/ref/fate/filter-pixfmts-fieldorder | 4 ++-- tests/ref/fate/filter-pixfmts-il | 4 ++-- tests/ref/fate/filter-pixfmts-null | 4 ++-- tests/ref/fate/filter-pixfmts-scale | 4 ++-- tests/ref/fate/filter-pixfmts-vflip | 4 ++-- 11 files changed, 20 insertions(+), 16 deletions(-) diff --git a/libavcodec/raw.c b/libavcodec/raw.c index b6c1dea8c1..f3c1dcd059 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -74,6 +74,8 @@ static const PixelFormatTag raw_pix_fmt_tags[] = { { AV_PIX_FMT_NV21, MKTAG('N', 'V', '2', '1') }, { AV_PIX_FMT_VUYA, MKTAG('A', 'Y', 'U', 'V') }, /* MS 4:4:4:4 */ { AV_PIX_FMT_XV30LE, MKTAG('Y', '4', '1', '0') }, + { AV_PIX_FMT_Y210LE, MKTAG('Y', '2', '1', '0') }, + { AV_PIX_FMT_Y216LE, MKTAG('Y', '2', '1', '6') }, /* nut */ { AV_PIX_FMT_RGB555LE, MKTAG('R', 'G', 'B', 15) }, diff --git a/libavformat/riff.c b/libavformat/riff.c index a882602220..6dc63426fa 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -220,6 +220,8 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_RAWVIDEO, MKTAG( 3 , 0 , 0 , 0 ) }, { AV_CODEC_ID_RAWVIDEO, MKTAG('I', '4', '2', '0') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'Y', '2') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '2', '1', '0') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '2', '1', '6') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '2', '2') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('V', '4', '2', '2') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '1', '0') }, diff --git a/tests/ref/fate/filter-pixdesc-y210le b/tests/ref/fate/filter-pixdesc-y210le index c6dc202948..fdedb58d0d 100644 --- a/tests/ref/fate/filter-pixdesc-y210le +++ b/tests/ref/fate/filter-pixdesc-y210le @@ -1 +1 @@ -pixdesc-y210le 7b0ba4b531e7dccca7f2a49102b23991 +pixdesc-y210le a66dba4aa4dca748a2dc2bd5f3619e5f diff --git a/tests/ref/fate/filter-pixdesc-y216le b/tests/ref/fate/filter-pixdesc-y216le index dd80ad0ad4..9088c3419b 100644 --- a/tests/ref/fate/filter-pixdesc-y216le +++ b/tests/ref/fate/filter-pixdesc-y216le @@ -1 +1 @@ -pixdesc-y216le ff17fa6e341a5cfe0d549faa25c24257 +pixdesc-y216le a7d1e552815201d1df4d731b32968e8a diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index 335eac9ad3..bd44c34fe0 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -111,9 +111,9 @@ xv36be 9f556ee59a672fd8725f0bb36ce3e4b0 xv36le e08dcbde02f1c28a3554f372ad1278e2 xyz12be a1ef56bf746d71f59669c28e48fc8450 xyz12le 831ff03c1ba4ef19374686f16a064d8c -y210le 0736b017e0814daf38d3350c42796f7a +y210le 04e9487b6cce38e7531437e946cdd586 y212le 825768be8fe92708ae80be84855066ed -y216le 610cc638e695eb64f3004cc5f24c5a7b +y216le 0e99aeddfee304e72d525d72998d9e9b ya16be 37c07787e544f900c87b853253bfc8dd ya16le e8cab8fad88cba6d285b224d8bf0d4df ya8 dbb99fbcdc204aaa1a7397ff561f1a67 diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index 0ecfa34e64..d35eec2a2f 100644 --- a/tests/ref/fate/filter-pixfmts-field +++ b/tests/ref/fate/filter-pixfmts-field @@ -111,9 +111,9 @@ xv36be bcc7bda2d0a5d43db4464af6a4cb5d65 xv36le ba99f258370f2a56993e8760e6b30194 xyz12be d2fa69ec91d3ed862f2dac3f8e7a3437 xyz12le 02bccd5e0b6824779a1f848b0ea3e3b5 -y210le 025beb25f047a762e3788dbea4b60864 +y210le 4c2fba1dc40322584977d15dd07c9146 y212le ac2a47c45187dd54d0f55293cbffd954 -y216le 332801737b0f779bdf14ff535fd925fd +y216le e65b5bfae1b40edbbed2012e9cd45e31 ya16be 40403b5277364777e0671da4d38e01ac ya16le 54f3295f5326a13d456ac53e973ba398 ya8 28cea4f98ed452bd3da9c752e5e3399c diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder index 4e7a8c5f43..a19f58e73d 100644 --- a/tests/ref/fate/filter-pixfmts-fieldorder +++ b/tests/ref/fate/filter-pixfmts-fieldorder @@ -100,9 +100,9 @@ xv36be 962386c88268f4382004c3a7a82c5eb8 xv36le bcceffc985aaa8414c4b8072aa0889bd xyz12be 15f5cda71de5fef9cec5e75e3833b6bc xyz12le 7be6c8781f38c21a6b8f602f62ca31e6 -y210le ee45acfb1386288af98af5313162ff3e +y210le 22b1a02a39c4b325726bf8793bf1e8f2 y212le 2f08fb195b948056c844acb1eee8d649 -y216le 4176a190d167f0f6d7dbca7ff65d3f48 +y216le 360cb98ac80b13d3a8ec61c9f1ff3bac ya16be 0f13e0f52586d172aaa07710fa3e8f31 ya16le d481d93ea1a1a04d759d9994958983de ya8 055ac5ab5ff8533dd319edc17a398af1 diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index 4d2affa190..67a44ef361 100644 --- a/tests/ref/fate/filter-pixfmts-il +++ b/tests/ref/fate/filter-pixfmts-il @@ -110,9 +110,9 @@ xv36be 3bbb949278ea55cc947ee03bd9c27c2d xv36le 102c0e817d375ddd6b2cfbb4262dec95 xyz12be 7c7d54c55f136cbbc50b18029f3be0b3 xyz12le 090ba6b1170baf2b1358b43b971d33b0 -y210le 306ec4238b49dbc8625a97b678ea1c5f +y210le d4cf9b53cd7ff22f087743d483e88480 y212le d5a2b4677ddb4a3bc3e5cd5cbb20f426 -y216le ef6d5ebd8bf99809fb8ac658cf7acbf8 +y216le 9e44c6d76b09bcbe71738423b4b3d67a ya16be 7bc720918bc0132e9717acbde89874e0 ya16le 61203295a8d39601b841de90f2c9797b ya8 a38d6e288f582f1a04310232ed764afc diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index 335eac9ad3..bd44c34fe0 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -111,9 +111,9 @@ xv36be 9f556ee59a672fd8725f0bb36ce3e4b0 xv36le e08dcbde02f1c28a3554f372ad1278e2 xyz12be a1ef56bf746d71f59669c28e48fc8450 xyz12le 831ff03c1ba4ef19374686f16a064d8c -y210le 0736b017e0814daf38d3350c42796f7a +y210le 04e9487b6cce38e7531437e946cdd586 y212le 825768be8fe92708ae80be84855066ed -y216le 610cc638e695eb64f3004cc5f24c5a7b +y216le 0e99aeddfee304e72d525d72998d9e9b ya16be 37c07787e544f900c87b853253bfc8dd ya16le e8cab8fad88cba6d285b224d8bf0d4df ya8 dbb99fbcdc204aaa1a7397ff561f1a67 diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index 8a99cf3fac..0cb96c0e1c 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -111,9 +111,9 @@ xv36be 4d084adca0228d7750d1e2e877e0d79b xv36le de9c74e94dc19c828e1572aa283d8aca xyz12be c7ba8345998c0141ddc079cdd29b1a40 xyz12le 95f5d3a0de834cc495c9032a14987cde -y210le 1c2708a520477f955d1fedf6ca7a41bd +y210le 7c2aef142d88ab343ec01acd45f38466 y212le 39a3c0c843041ad4501b3107dd91ef17 -y216le 21ead8be695827822e627df20ab49b1f +y216le 17be2999e97d36b8ed903f07ef428c09 ya16be 20d4842899d61068f5fb6af478bf26a6 ya16le 6a05895adce85143ae1c1b3470cb4070 ya8 0a9db5bb4b009de9197eede5e9d19e16 diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index ed8f6980e8..e9ffa48cae 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -111,9 +111,9 @@ xv36be c0272372d3e1a59adb3931ee433a5d5b xv36le ffe6ab75ebc09134c3451f8f6ef0d501 xyz12be 23fa9fb36d49dce61e284d41b83e0e6b xyz12le ef73e6d1f932a9a355df1eedd628394f -y210le 9544c81f8e1fc95e9fa4009dbecfea25 +y210le f8847bedd3ae6e1c0cf84a823f275e31 y212le c801725ae31e3b8f5be269359d49f191 -y216le 0ca0f60d7fd78ec32f417d6209f18a5b +y216le 985db498aedf3fb1c547ad07442b7258 ya16be 55b1dbbe4d56ed0d22461685ce85520d ya16le d5bf02471823a16dc523a46cace0101a ya8 4299c6ca3b470a7d8a420e26eb485b1d

1 0

avformat/mpegts: Initialize predefined_SLConfigDescriptor_seen
by Michael Niedermayer 25 Oct '24

25 Oct '24

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Oct 9 23:44:00 2024 +0200| [db7b4fc89fb18d5ff0a1426bd433c234555a3fff] | committer: Michael Niedermayer avformat/mpegts: Initialize predefined_SLConfigDescriptor_seen Fixes: use of uninitialized variable Fixes: 368729566/clusterfuzz-testcase-minimized-ffmpeg_dem_MPEGTS_fuzzer-6044501804646400 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db7b4fc89fb18d5ff… --- libavformat/mpegts.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 81481f6f76..78ab7f7efe 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1672,6 +1672,8 @@ static int mp4_read_iods(AVFormatContext *s, const uint8_t *buf, unsigned size, MP4DescrParseContext d; int ret; + d.predefined_SLConfigDescriptor_seen = 0; + ret = init_MP4DescrParseContext(&d, s, buf, size, descr, max_descr_count); if (ret < 0) return ret;

1 0

avformat/mxfdec: Fix overflow in midpoint computation
by Michael Niedermayer 25 Oct '24

25 Oct '24

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Oct 9 20:47:34 2024 +0200| [23088a5ff2b549fa4fc037bb9ed833fffbc89ca0] | committer: Michael Niedermayer avformat/mxfdec: Fix overflow in midpoint computation Fixes: signed integer overflow: 4611686016549392399 + 9223372033098784800 cannot be represented in type 'long long' Fixes: 368503277/clusterfuzz-testcase-minimized-ffmpeg_dem_MXF_fuzzer-5928227458056192 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=23088a5ff2b549fa4… --- libavformat/mxfdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 27e8e0c261..9ecaa287bb 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -3896,7 +3896,7 @@ static int mxf_get_next_track_edit_unit(MXFContext *mxf, MXFTrack *track, int64_ a = -1; b = track->original_duration; while (b - 1 > a) { - m = (a + b) >> 1; + m = (a + (uint64_t)b) >> 1; if (mxf_edit_unit_absolute_offset(mxf, t, m, track->edit_rate, NULL, &offset, NULL, 0) < 0) return -1; if (offset < current_offset)

1 0

swscale/output: used unsigned for bit accumulation
by Michael Niedermayer 25 Oct '24

25 Oct '24

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Oct 9 20:39:07 2024 +0200| [3fe3014405494503a03c2e6eff4743db91a21c00] | committer: Michael Niedermayer swscale/output: used unsigned for bit accumulation Fixes: Integer overflow Fixes: 368725672/clusterfuzz-testcase-minimized-ffmpeg_SWS_fuzzer-5009093023563776 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3fe3014405494503a… --- libswscale/output.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libswscale/output.c b/libswscale/output.c index b22db2e48d..0df14e99d6 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -664,7 +664,7 @@ yuv2mono_2_c_template(SwsInternal *c, const int16_t *buf[2], if (c->dither == SWS_DITHER_ED) { int err = 0; - int acc = 0; + unsigned acc = 0; for (i = 0; i < dstW; i +=2) { int Y; @@ -686,7 +686,8 @@ yuv2mono_2_c_template(SwsInternal *c, const int16_t *buf[2], c->dither_error[0][i] = err; } else { for (i = 0; i < dstW; i += 8) { - int Y, acc = 0; + int Y; + unsigned acc = 0; Y = (buf0[i + 0] * yalpha1 + buf1[i + 0] * yalpha) >> 19; accumulate_bit(acc, Y + d128[0]); @@ -721,7 +722,7 @@ yuv2mono_1_c_template(SwsInternal *c, const int16_t *buf0, if (c->dither == SWS_DITHER_ED) { int err = 0; - int acc = 0; + unsigned acc = 0; for (i = 0; i < dstW; i +=2) { int Y; @@ -743,7 +744,7 @@ yuv2mono_1_c_template(SwsInternal *c, const int16_t *buf0, c->dither_error[0][i] = err; } else { for (i = 0; i < dstW; i += 8) { - int acc = 0; + unsigned acc = 0; accumulate_bit(acc, ((buf0[i + 0] + 64) >> 7) + d128[0]); accumulate_bit(acc, ((buf0[i + 1] + 64) >> 7) + d128[1]); accumulate_bit(acc, ((buf0[i + 2] + 64) >> 7) + d128[2]);

1 0

swscale/rgb2rgb_template: Fix ff_rgb24toyv12_c() with odd height
by Michael Niedermayer 25 Oct '24

25 Oct '24

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Oct 9 18:59:19 2024 +0200| [14f5d67be38dcdf04932e557b7f25975fc91c851] | committer: Michael Niedermayer swscale/rgb2rgb_template: Fix ff_rgb24toyv12_c() with odd height Fixes: out of array access Fixes: 368143798/clusterfuzz-testcase-minimized-ffmpeg_SWS_fuzzer-6475823425585152 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=14f5d67be38dcdf04… --- libswscale/rgb2rgb_template.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c index 197450169a..84b9da0911 100644 --- a/libswscale/rgb2rgb_template.c +++ b/libswscale/rgb2rgb_template.c @@ -640,7 +640,7 @@ static inline void uyvytoyv12_c(const uint8_t *src, uint8_t *ydst, } /** - * Height should be a multiple of 2 and width should be a multiple of 2. + * width should be a multiple of 2. * (If this is a problem for anyone then tell me, and I will fix it.) */ void ff_rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst, @@ -659,6 +659,11 @@ void ff_rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst, for (y = 0; y < height; y += 2) { int i; + if (y + 1 == height) { + ydst2 = ydst1; + src2 = src1; + } + for (i = 0; i < chromWidth; i++) { unsigned int b11 = src1[6 * i + 0]; unsigned int g11 = src1[6 * i + 1];

1 0

avcodec/h2645: allocate film grain metadata dynamically
by Dale Curtis 24 Oct '24

24 Oct '24

ffmpeg | branch: master | Dale Curtis <dalecurtis(a)chromium.org> | Tue Aug 13 20:53:14 2024 +0000| [08b1bffa49715a9615acc025dfbea252d8409e1f] | committer: Niklas Haas avcodec/h2645: allocate film grain metadata dynamically Film grain support adds a huge amount of overhead to the H264Context structure for a feature that is rarely used. On low end devices or pages that have lots of media this bloats memory usage rapidly. This changes the static film grain metadata allocations to be dynamic which reduces the H264Context size from 851808 bytes to 53444 bytes. Bug: https://crbug.com/359358875 Signed-off-by: Dale Curtis <dalecurtis(a)chromium.org> Signed-off-by: Niklas Haas <git(a)haasn.dev> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=08b1bffa49715a961… --- libavcodec/h2645_sei.c | 30 ++++++++++++++++++++++-------- libavcodec/h2645_sei.h | 6 ++++-- libavcodec/h264_picture.c | 11 +++++++++-- libavcodec/h264_sei.c | 1 - libavcodec/h264_slice.c | 5 ++++- libavcodec/h264dec.c | 2 ++ libavcodec/h264dec.h | 2 +- libavcodec/hevc/hevcdec.c | 20 +++++++++++++------- libavcodec/hevc/hevcdec.h | 2 +- 9 files changed, 56 insertions(+), 23 deletions(-) diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index c46a563308..33551f5406 100644 --- a/libavcodec/h2645_sei.c +++ b/libavcodec/h2645_sei.c @@ -245,7 +245,12 @@ static int decode_registered_user_data(H2645SEI *h, GetByteContext *gb, provider_oriented_code = bytestream2_get_byteu(gb); if (provider_oriented_code == aom_grain_provider_oriented_code) { - return ff_aom_parse_film_grain_sets(&h->aom_film_grain, + if (!h->aom_film_grain) { + h->aom_film_grain = av_mallocz(sizeof(*h->aom_film_grain)); + if (!h->aom_film_grain) + return AVERROR(ENOMEM); + } + return ff_aom_parse_film_grain_sets(h->aom_film_grain, gb->buffer, bytestream2_get_bytes_left(gb)); } @@ -494,7 +499,12 @@ int ff_h2645_sei_message_decode(H2645SEI *h, enum SEIType type, case SEI_TYPE_DISPLAY_ORIENTATION: return decode_display_orientation(&h->display_orientation, gb); case SEI_TYPE_FILM_GRAIN_CHARACTERISTICS: - return decode_film_grain_characteristics(&h->film_grain_characteristics, codec_id, gb); + if (!h->film_grain_characteristics) { + h->film_grain_characteristics = av_mallocz(sizeof(*h->film_grain_characteristics)); + if (!h->film_grain_characteristics) + return AVERROR(ENOMEM); + } + return decode_film_grain_characteristics(h->film_grain_characteristics, codec_id, gb); case SEI_TYPE_FRAME_PACKING_ARRANGEMENT: return decode_frame_packing_arrangement(&h->frame_packing, gb, codec_id); case SEI_TYPE_ALTERNATIVE_TRANSFER_CHARACTERISTICS: @@ -811,8 +821,8 @@ int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, return ret; } - if (sei->film_grain_characteristics.present) { - H2645SEIFilmGrainCharacteristics *fgc = &sei->film_grain_characteristics; + if (sei->film_grain_characteristics && sei->film_grain_characteristics->present) { + H2645SEIFilmGrainCharacteristics *fgc = sei->film_grain_characteristics; AVFilmGrainParams *fgp = av_film_grain_params_create_side_data(frame); AVFilmGrainH274Params *h274; @@ -884,9 +894,11 @@ FF_ENABLE_DEPRECATION_WARNINGS } #if CONFIG_HEVC_SEI - ret = ff_aom_attach_film_grain_sets(&sei->aom_film_grain, frame); - if (ret < 0) - return ret; + if (sei->aom_film_grain) { + ret = ff_aom_attach_film_grain_sets(sei->aom_film_grain, frame); + if (ret < 0) + return ret; + } #endif return 0; @@ -913,5 +925,7 @@ void ff_h2645_sei_reset(H2645SEI *s) s->ambient_viewing_environment.present = 0; s->mastering_display.present = 0; s->content_light.present = 0; - s->aom_film_grain.enable = 0; + + av_freep(&s->film_grain_characteristics); + av_freep(&s->aom_film_grain); } diff --git a/libavcodec/h2645_sei.h b/libavcodec/h2645_sei.h index 598f78b585..8bcdc2bc5f 100644 --- a/libavcodec/h2645_sei.h +++ b/libavcodec/h2645_sei.h @@ -135,11 +135,13 @@ typedef struct H2645SEI { H2645SEIFramePacking frame_packing; H2645SEIDisplayOrientation display_orientation; H2645SEIAlternativeTransfer alternative_transfer; - H2645SEIFilmGrainCharacteristics film_grain_characteristics; H2645SEIAmbientViewingEnvironment ambient_viewing_environment; H2645SEIMasteringDisplay mastering_display; H2645SEIContentLight content_light; - AVFilmGrainAFGS1Params aom_film_grain; + + // Dynamic allocations due to large size. + H2645SEIFilmGrainCharacteristics* film_grain_characteristics; + AVFilmGrainAFGS1Params* aom_film_grain; } H2645SEI; enum { diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index 3234141dbd..371a794ec2 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -27,6 +27,7 @@ #include "libavutil/avassert.h" #include "libavutil/emms.h" +#include "libavutil/mem.h" #include "error_resilience.h" #include "avcodec.h" #include "h264dec.h" @@ -212,9 +213,15 @@ int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup) const AVFrameSideData *sd = av_frame_get_side_data(cur->f, AV_FRAME_DATA_FILM_GRAIN_PARAMS); err = AVERROR_INVALIDDATA; - if (sd) // a decoding error may have happened before the side data could be allocated - err = ff_h274_apply_film_grain(cur->f_grain, cur->f, &h->h274db, + if (sd) { // a decoding error may have happened before the side data could be allocated + if (!h->h274db) { + h->h274db = av_mallocz(sizeof(*h->h274db)); + if (!h->h274db) + return AVERROR(ENOMEM); + } + err = ff_h274_apply_film_grain(cur->f_grain, cur->f, h->h274db, (AVFilmGrainParams *) sd->data); + } if (err < 0) { av_log(h->avctx, AV_LOG_WARNING, "Failed synthesizing film " "grain, ignoring: %s\n", av_err2str(err)); diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 8d6dc77943..15a5232209 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -55,7 +55,6 @@ void ff_h264_sei_uninit(H264SEIContext *h) h->picture_timing.present = 0; h->buffering_period.present = 0; h->common.frame_packing.present = 0; - h->common.film_grain_characteristics.present = 0; h->common.display_orientation.present = 0; h->common.afd.present = 0; diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index a66b75ca80..84595b1a8b 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -516,7 +516,10 @@ static int h264_frame_start(H264Context *h) pic->f->crop_top = h->crop_top; pic->f->crop_bottom = h->crop_bottom; - pic->needs_fg = h->sei.common.film_grain_characteristics.present && !h->avctx->hwaccel && + pic->needs_fg = + h->sei.common.film_grain_characteristics && + h->sei.common.film_grain_characteristics->present && + !h->avctx->hwaccel && !(h->avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN); if ((ret = alloc_picture(h, pic)) < 0) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 0154fe17b6..af0913ca2c 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -156,6 +156,8 @@ void ff_h264_free_tables(H264Context *h) av_freep(&h->mb2b_xy); av_freep(&h->mb2br_xy); + av_freep(&h->h274db); + ff_refstruct_pool_uninit(&h->qscale_table_pool); ff_refstruct_pool_uninit(&h->mb_type_pool); ff_refstruct_pool_uninit(&h->motion_val_pool); diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index ccd7583bf4..bbc2a185eb 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -344,7 +344,7 @@ typedef struct H264Context { H264DSPContext h264dsp; H264ChromaContext h264chroma; H264QpelContext h264qpel; - H274FilmGrainDatabase h274db; + H274FilmGrainDatabase* h274db; // Dyanmic allocation due to large size. H264Picture DPB[H264_MAX_PICTURE_COUNT]; H264Picture *cur_pic_ptr; diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 4e3fa39e49..1ea8df0fa0 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -412,8 +412,8 @@ static int export_stream_params_from_sei(HEVCContext *s) avctx->color_trc = s->sei.common.alternative_transfer.preferred_transfer_characteristics; } - if (s->sei.common.film_grain_characteristics.present || - s->sei.common.aom_film_grain.enable) + if ((s->sei.common.film_grain_characteristics && s->sei.common.film_grain_characteristics->present) || + (s->sei.common.aom_film_grain && s->sei.common.aom_film_grain->enable)) avctx->properties |= FF_CODEC_PROPERTY_FILM_GRAIN; return 0; @@ -3267,8 +3267,8 @@ static int hevc_frame_start(HEVCContext *s, HEVCLayerContext *l, else s->cur_frame->f->flags &= ~AV_FRAME_FLAG_KEY; - s->cur_frame->needs_fg = (s->sei.common.film_grain_characteristics.present || - s->sei.common.aom_film_grain.enable) && + s->cur_frame->needs_fg = ((s->sei.common.film_grain_characteristics && s->sei.common.film_grain_characteristics->present) || + (s->sei.common.aom_film_grain && s->sei.common.aom_film_grain->enable)) && !(s->avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN) && !s->avctx->hwaccel; @@ -3277,8 +3277,8 @@ static int hevc_frame_start(HEVCContext *s, HEVCLayerContext *l, goto fail; if (s->cur_frame->needs_fg && - (s->sei.common.film_grain_characteristics.present && - !ff_h274_film_grain_params_supported(s->sei.common.film_grain_characteristics.model_id, + (s->sei.common.film_grain_characteristics && s->sei.common.film_grain_characteristics->present && + !ff_h274_film_grain_params_supported(s->sei.common.film_grain_characteristics->model_id, s->cur_frame->f->format) || !av_film_grain_params_select(s->cur_frame->f))) { av_log_once(s->avctx, AV_LOG_WARNING, AV_LOG_DEBUG, &s->film_grain_warning_shown, @@ -3415,8 +3415,13 @@ static int hevc_frame_end(HEVCContext *s, HEVCLayerContext *l) av_assert0(0); return AVERROR_BUG; case AV_FILM_GRAIN_PARAMS_H274: + if (!s->h274db) { + s->h274db = av_mallocz(sizeof(*s->h274db)); + if (!s->h274db) + return AVERROR(ENOMEM); + } ret = ff_h274_apply_film_grain(out->frame_grain, out->f, - &s->h274db, fgp); + s->h274db, fgp); break; case AV_FILM_GRAIN_PARAMS_AV1: ret = ff_aom_apply_film_grain(out->frame_grain, out->f, fgp); @@ -3844,6 +3849,7 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) av_buffer_unref(&s->rpu_buf); av_freep(&s->md5_ctx); + av_freep(&s->h274db); ff_container_fifo_free(&s->output_fifo); diff --git a/libavcodec/hevc/hevcdec.h b/libavcodec/hevc/hevcdec.h index 473709b4e8..73b792c880 100644 --- a/libavcodec/hevc/hevcdec.h +++ b/libavcodec/hevc/hevcdec.h @@ -531,7 +531,7 @@ typedef struct HEVCContext { HEVCDSPContext hevcdsp; VideoDSPContext vdsp; BswapDSPContext bdsp; - H274FilmGrainDatabase h274db; + H274FilmGrainDatabase* h274db; // Dynamically allocated due to large size. /** used on BE to byteswap the lines for checksumming */ uint8_t *checksum_buf;

1 0