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

tests/fate-run: Fix pixdesc failure
by Zhao Zhili 27 Oct '24

27 Oct '24

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Tue Oct 22 01:03:24 2024 +0800| [78525bc36b253c760326e7d02c8717ba84067bd4] | committer: Zhao Zhili tests/fate-run: Fix pixdesc failure -u and -q doesn't work together for diff on macOS. Reviewed-by: James Almer <jamrial(a)gmail.com> Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=78525bc36b253c760… --- tests/fate-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index f8d67de25a..c371bd1c3c 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -519,7 +519,7 @@ pixdesc(){ $FLAGS $ENC_OPTS -vf "scale,format=$pix_fmt,pixdesctest" -vcodec rawvideo -frames:v 5 \ "-pix_fmt $pix_fmt" -f nut md5:$md5file2 - diff -u -q $md5file1 $md5file2 || return + diff -q $md5file1 $md5file2 || return printf '%-20s' $label cat $md5file1 }

1 0

avcodec/mediacodecdec_common: Workaround MTK broken crop implementation
by Zhao Zhili 27 Oct '24

27 Oct '24

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Fri Oct 11 15:49:44 2024 +0800| [7fe9d12f2571265b2a7b5c763d62ee80f9a9e2e2] | committer: Zhao Zhili avcodec/mediacodecdec_common: Workaround MTK broken crop implementation MediaTek SOC return broken crop info, e.g., width: int32(3840) height: int32(2160) crop: Rect(0, 0, 318, 238) It will notify the right crop info with infoOutputFormatChanged, but too late. Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7fe9d12f2571265b2… --- libavcodec/mediacodecdec_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mediacodecdec_common.c b/libavcodec/mediacodecdec_common.c index b1ee8b609a..84c34ac270 100644 --- a/libavcodec/mediacodecdec_common.c +++ b/libavcodec/mediacodecdec_common.c @@ -593,7 +593,8 @@ static int mediacodec_dec_parse_video_format(AVCodecContext *avctx, MediaCodecDe AMEDIAFORMAT_GET_INT32(s->crop_right, "crop-right", 0); // Try "crop" for NDK - if (!(s->crop_right && s->crop_bottom) && s->use_ndk_codec) + // MediaTek SOC return some default value like Rect(0, 0, 318, 238) + if (!(s->crop_right && s->crop_bottom) && s->use_ndk_codec && !strstr(s->codec_name, ".mtk.")) ff_AMediaFormat_getRect(s->format, "crop", &s->crop_left, &s->crop_top, &s->crop_right, &s->crop_bottom); if (s->crop_right && s->crop_bottom) {

1 0

avcodec/mediacodecenc: Extract configOBUs from AV1CodecConfigurationRecord
by Zhao Zhili 27 Oct '24

27 Oct '24

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Sat Oct 5 01:54:21 2024 +0800| [0ee18ff23d923fd423352868c7344a78568b0e3e] | committer: Zhao Zhili avcodec/mediacodecenc: Extract configOBUs from AV1CodecConfigurationRecord MediaCodec can generate AV1CodecConfigurationRecord, which shouldn't be put into packet->data. Skip four bytes and extract configOBUs if it exist. Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ee18ff23d923fd42… --- libavcodec/mediacodecenc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavcodec/mediacodecenc.c b/libavcodec/mediacodecenc.c index e76ea81236..3880ea2fe9 100644 --- a/libavcodec/mediacodecenc.c +++ b/libavcodec/mediacodecenc.c @@ -429,6 +429,16 @@ static int mediacodec_receive(AVCodecContext *avctx, AVPacket *pkt) } if (out_info.flags & ff_AMediaCodec_getBufferFlagCodecConfig(codec)) { + if (avctx->codec_id == AV_CODEC_ID_AV1) { + // Skip AV1CodecConfigurationRecord without configOBUs + if (out_info.size <= 4) { + ff_AMediaCodec_releaseOutputBuffer(codec, index, false); + return mediacodec_receive(avctx, pkt); + } + out_info.size -= 4; + out_info.offset += 4; + } + ret = av_reallocp(&s->extradata, out_info.size); if (ret) goto bailout;

1 0

fftools/ffplay: use swapchain_colorspace_hint to get better HDR support
by Zhao Zhili 27 Oct '24

27 Oct '24

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Wed Sep 25 22:45:42 2024 +0800| [0552238570f3feec64d1cdbc6e89196ca46f7e66] | committer: Zhao Zhili fftools/ffplay: use swapchain_colorspace_hint to get better HDR support For example, the default surface configuration on macOS is: VK_FORMAT_A2B10G10R10_UNORM_PACK32 + VK_COLOR_SPACE_PASS_THROUGH_EXT With HDR10 content and swapchain_colorspace_hint, the surface configuration updated to: VK_FORMAT_A2B10G10R10_UNORM_PACK32 + VK_COLOR_SPACE_HDR10_ST2084_EXT Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0552238570f3feec6… --- fftools/ffplay_renderer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fftools/ffplay_renderer.c b/fftools/ffplay_renderer.c index f272cb46f1..618149e7b2 100644 --- a/fftools/ffplay_renderer.c +++ b/fftools/ffplay_renderer.c @@ -697,6 +697,7 @@ static int display(VkRenderer *renderer, AVFrame *frame) struct pl_frame target = {0}; RendererContext *ctx = (RendererContext *) renderer; int ret = 0; + struct pl_color_space hint = {0}; ret = convert_frame(renderer, frame); if (ret < 0) @@ -709,6 +710,8 @@ static int display(VkRenderer *renderer, AVFrame *frame) return AVERROR_EXTERNAL; } + pl_color_space_from_avframe(&hint, frame); + pl_swapchain_colorspace_hint(ctx->swapchain, &hint); if (!pl_swapchain_start_frame(ctx->swapchain, &swap_frame)) { av_log(NULL, AV_LOG_ERROR, "start frame failed\n"); ret = AVERROR_EXTERNAL;

1 0

avutil/hwcontext_d3d11va: drop duplicate pixfmt entry
by James Almer 26 Oct '24

26 Oct '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sat Oct 26 09:26:36 2024 -0300| [fe219446565e1ce5a13ad6a9b50f574922e2259f] | committer: James Almer avutil/hwcontext_d3d11va: drop duplicate pixfmt entry Added by accident in ca71b0b807b4d5588ec765976b8b18d3efde40fb. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe219446565e1ce5a… --- libavutil/hwcontext_dxva2.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavutil/hwcontext_dxva2.c b/libavutil/hwcontext_dxva2.c index f61715b513..b6eb13439d 100644 --- a/libavutil/hwcontext_dxva2.c +++ b/libavutil/hwcontext_dxva2.c @@ -95,7 +95,6 @@ static const struct { { MKTAG('P', '0', '1', '6'), AV_PIX_FMT_P012 }, { MKTAG('Y', '2', '1', '6'), AV_PIX_FMT_Y216 }, { MKTAG('Y', '4', '1', '6'), AV_PIX_FMT_XV48 }, - { MKTAG('Y', '2', '1', '6'), AV_PIX_FMT_Y212 }, { D3DFMT_P8, AV_PIX_FMT_PAL8 }, { D3DFMT_A8R8G8B8, AV_PIX_FMT_BGRA }, };

1 0

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

26 Oct '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Oct 23 16:30:48 2024 -0300| [ca71b0b807b4d5588ec765976b8b18d3efde40fb] | committer: James Almer libavutil/hwcontext_d3d11va: use the XV48 pixel format Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca71b0b807b4d5588… --- libavutil/hwcontext_dxva2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_dxva2.c b/libavutil/hwcontext_dxva2.c index d73799ec39..f61715b513 100644 --- a/libavutil/hwcontext_dxva2.c +++ b/libavutil/hwcontext_dxva2.c @@ -94,7 +94,8 @@ static const struct { { 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_Y216 }, - { MKTAG('Y', '4', '1', '6'), AV_PIX_FMT_XV36 }, + { MKTAG('Y', '4', '1', '6'), AV_PIX_FMT_XV48 }, + { MKTAG('Y', '2', '1', '6'), AV_PIX_FMT_Y212 }, { D3DFMT_P8, AV_PIX_FMT_PAL8 }, { D3DFMT_A8R8G8B8, AV_PIX_FMT_BGRA }, };

1 0

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

26 Oct '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Oct 23 16:30:58 2024 -0300| [dad3d9800df669ba20dcc0dc356bfae5a7b7a39a] | committer: James Almer libavutil/hwcontext_dxva2: use the XV48 pixel format Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dad3d9800df669ba2… --- 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 ecf4207b3c..9d81effe5e 100644 --- a/libavutil/hwcontext_d3d11va.c +++ b/libavutil/hwcontext_d3d11va.c @@ -103,7 +103,7 @@ static const struct { { DXGI_FORMAT_Y410, AV_PIX_FMT_XV30 }, { DXGI_FORMAT_P016, AV_PIX_FMT_P012 }, { DXGI_FORMAT_Y216, AV_PIX_FMT_Y216 }, - { DXGI_FORMAT_Y416, AV_PIX_FMT_XV36 }, + { DXGI_FORMAT_Y416, AV_PIX_FMT_XV48 }, // Special opaque formats. The pix_fmt is merely a place holder, as the // opaque format cannot be accessed directly. { DXGI_FORMAT_420_OPAQUE, AV_PIX_FMT_YUV420P },

1 0

avfilter/vsrc_testsrc: add support for XV48
by James Almer 26 Oct '24

26 Oct '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Oct 23 14:08:30 2024 -0300| [42b748f7382081a13e006dcaa6af4383bed95940] | committer: James Almer avfilter/vsrc_testsrc: add support for XV48 Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42b748f7382081a13… --- libavfilter/vsrc_testsrc.c | 3 ++- tests/fate/filter-video.mak | 3 +++ tests/ref/fate/filter-yuvtestsrc-xv48 | 10 ++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index ce7ca90ae8..e3e076e878 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -1175,6 +1175,7 @@ static void yuvtest_put_pixel(uint8_t *dstp[4], int dst_linesizep[4], AV_WL32(&dstp[0][i*4 + j*dst_linesizep[0]], n); break; case AV_PIX_FMT_XV36: + case AV_PIX_FMT_XV48: case AV_PIX_FMT_AYUV64: AV_WN16(&dstp[0][i*8 + ayuv_map[Y]*2 + j*dst_linesizep[0]], y << desc->comp[0].shift); AV_WN16(&dstp[0][i*8 + ayuv_map[U]*2 + j*dst_linesizep[0]], u << desc->comp[1].shift); @@ -1244,7 +1245,7 @@ static const enum AVPixelFormat yuvtest_pix_fmts[] = { AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV444P14, AV_PIX_FMT_YUV444P16, AV_PIX_FMT_VYU444, AV_PIX_FMT_AYUV, AV_PIX_FMT_UYVA, AV_PIX_FMT_AYUV64, - AV_PIX_FMT_VUYA, AV_PIX_FMT_VUYX, + AV_PIX_FMT_VUYA, AV_PIX_FMT_VUYX, AV_PIX_FMT_XV48, AV_PIX_FMT_XV30LE, AV_PIX_FMT_V30XLE, AV_PIX_FMT_XV36, AV_PIX_FMT_NONE }; diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 8ff9a6f225..c956a81050 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -133,6 +133,9 @@ fate-filter-yuvtestsrc-xv30le: CMD = framecrc -lavfi yuvtestsrc=rate=5:duration= FATE_FILTER-$(call FILTERFRAMECRC, YUVTESTSRC SCALE) += fate-filter-yuvtestsrc-xv36 fate-filter-yuvtestsrc-xv36: CMD = framecrc -lavfi yuvtestsrc=rate=5:duration=1,format=xv36,scale -pix_fmt xv36le +FATE_FILTER-$(call FILTERFRAMECRC, YUVTESTSRC SCALE) += fate-filter-yuvtestsrc-xv48 +fate-filter-yuvtestsrc-xv48: CMD = framecrc -lavfi yuvtestsrc=rate=5:duration=1,format=xv48,scale -pix_fmt xv48le + FATE_FILTER-$(call FILTERFRAMECRC, TESTSRC FORMAT CONCAT SCALE, LAVFI_INDEV FILE_PROTOCOL) += fate-filter-lavd-scalenorm fate-filter-lavd-scalenorm: tests/data/filtergraphs/scalenorm fate-filter-lavd-scalenorm: CMD = framecrc -f lavfi -graph_file $(TARGET_PATH)/tests/data/filtergraphs/scalenorm -i dummy diff --git a/tests/ref/fate/filter-yuvtestsrc-xv48 b/tests/ref/fate/filter-yuvtestsrc-xv48 new file mode 100644 index 0000000000..6449da42ff --- /dev/null +++ b/tests/ref/fate/filter-yuvtestsrc-xv48 @@ -0,0 +1,10 @@ +#tb 0: 1/5 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 320x240 +#sar 0: 1/1 +0, 0, 0, 1, 614400, 0x7fd08452 +0, 1, 1, 1, 614400, 0x7fd08452 +0, 2, 2, 1, 614400, 0x7fd08452 +0, 3, 3, 1, 614400, 0x7fd08452 +0, 4, 4, 1, 614400, 0x7fd08452

1 0

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

26 Oct '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Oct 23 13:42:48 2024 -0300| [707e2184cadaf9cce85492658ff55f7901a47d64] | committer: James Almer avformat/riff: map Y416 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=707e2184cadaf9cce… --- libavcodec/raw.c | 1 + libavformat/riff.c | 1 + tests/ref/fate/filter-pixdesc-xv48le | 2 +- 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-scale | 2 +- tests/ref/fate/filter-pixfmts-transpose | 2 +- tests/ref/fate/filter-pixfmts-vflip | 2 +- 13 files changed, 13 insertions(+), 11 deletions(-) diff --git a/libavcodec/raw.c b/libavcodec/raw.c index f3c1dcd059..578794cb7a 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -74,6 +74,7 @@ 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_XV48LE, MKTAG('Y', '4', '1', '6') }, { AV_PIX_FMT_Y210LE, MKTAG('Y', '2', '1', '0') }, { AV_PIX_FMT_Y216LE, MKTAG('Y', '2', '1', '6') }, diff --git a/libavformat/riff.c b/libavformat/riff.c index 6dc63426fa..739a4a5542 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -222,6 +222,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { 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', '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-xv48le b/tests/ref/fate/filter-pixdesc-xv48le index 4b69a41ab2..9982d7a375 100644 --- a/tests/ref/fate/filter-pixdesc-xv48le +++ b/tests/ref/fate/filter-pixdesc-xv48le @@ -1 +1 @@ -pixdesc-xv48le 35c1874574e1cf438ea3e97ef2a5a85e +pixdesc-xv48le 57282e6865accac431d05d0c54038e82 diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index 0ac7ba1d6e..46ba0cbac2 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -110,7 +110,7 @@ xv30le 7dfdd664a9792bb06a19a63353828da0 xv36be 9f556ee59a672fd8725f0bb36ce3e4b0 xv36le e08dcbde02f1c28a3554f372ad1278e2 xv48be ce34993b4b4411bba1d852b9b86aa39e -xv48le 30b5271d569d1ad6aba916fa5cdf82bd +xv48le df913a7e61b162aa98303e5393e60c63 xyz12be a1ef56bf746d71f59669c28e48fc8450 xyz12le 831ff03c1ba4ef19374686f16a064d8c y210le 04e9487b6cce38e7531437e946cdd586 diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop index dcb992226c..d2d45498b9 100644 --- a/tests/ref/fate/filter-pixfmts-crop +++ b/tests/ref/fate/filter-pixfmts-crop @@ -107,7 +107,7 @@ xv30le 7e2350aea136c6fb76dae54e9d3fe1f8 xv36be 23b6f253fcb375e4145cfcb562268c5f xv36le 778286003497f92b84d0bd8258d6b85d xv48be c90889b2cf54cc78bd58e8c47d4eb791 -xv48le 60d81aa388fd40e5bf8aa3323bc4e60f +xv48le 2c15c1254449ec5f9135ae61bdf4e1d5 xyz12be cb4571f9aaa7b59f999ef327276104b7 xyz12le cd6aae8d26b18bdb4b9d068586276d91 ya16be a3d18014454942a96f15a49947c0c55d diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index aac4e0adfa..b95d90d416 100644 --- a/tests/ref/fate/filter-pixfmts-field +++ b/tests/ref/fate/filter-pixfmts-field @@ -110,7 +110,7 @@ xv30le a8e8bfb66178ad5cbef5c82cedc1d3da xv36be bcc7bda2d0a5d43db4464af6a4cb5d65 xv36le ba99f258370f2a56993e8760e6b30194 xv48be 2abcd986a34789ba4310be3969020d0d -xv48le 90591fca801a6d0ee3fb19bf3c8587f8 +xv48le f6f2e33f260f48334197538f3331f7bc xyz12be d2fa69ec91d3ed862f2dac3f8e7a3437 xyz12le 02bccd5e0b6824779a1f848b0ea3e3b5 y210le 4c2fba1dc40322584977d15dd07c9146 diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder index f5dddd0a37..104e268572 100644 --- a/tests/ref/fate/filter-pixfmts-fieldorder +++ b/tests/ref/fate/filter-pixfmts-fieldorder @@ -99,7 +99,7 @@ xv30le 8d1921d4a210d8107c20a805cb9a8117 xv36be 962386c88268f4382004c3a7a82c5eb8 xv36le bcceffc985aaa8414c4b8072aa0889bd xv48be 4d6e4004b03767f12df8bb4e76c98ddf -xv48le f1b19076ff69cb8d587454615015297a +xv48le 9e94d82461a2131063157ac0dbe9467b xyz12be 15f5cda71de5fef9cec5e75e3833b6bc xyz12le 7be6c8781f38c21a6b8f602f62ca31e6 y210le 22b1a02a39c4b325726bf8793bf1e8f2 diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip index a4630144e3..679f0105e7 100644 --- a/tests/ref/fate/filter-pixfmts-hflip +++ b/tests/ref/fate/filter-pixfmts-hflip @@ -107,7 +107,7 @@ xv30le 7370eadd13a2fc79186443713a639332 xv36be 98f578df965eed369f46cb135e2d1345 xv36le e478b4b54698beb3ce1b9a2dd691d544 xv48be e030a2c7b1b600cfacb691b6e90c2e3d -xv48le d2fd726fcd96a696ea67cb6281c45b6b +xv48le fbd7f8c65cd6fc9f9108dc9a1f977dc3 xyz12be 25f90259ff8a226befdaec3dfe82996e xyz12le 926c0791d59aaff61b2778e8ada3316d ya16be d5b342355bdd9e3197e01b13b7c6301e diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index 981fe287fd..4135eb98c0 100644 --- a/tests/ref/fate/filter-pixfmts-il +++ b/tests/ref/fate/filter-pixfmts-il @@ -109,7 +109,7 @@ xv30le ccd81ba2ba845917d5d1c9fa2a6e2fc6 xv36be 3bbb949278ea55cc947ee03bd9c27c2d xv36le 102c0e817d375ddd6b2cfbb4262dec95 xv48be 4d7376651fb7b3e84d00abad6c785aad -xv48le 7280a114df023964bdba651a9c2ca752 +xv48le a1a8ff16d9a864568e5e557734bf3d6d xyz12be 7c7d54c55f136cbbc50b18029f3be0b3 xyz12le 090ba6b1170baf2b1358b43b971d33b0 y210le d4cf9b53cd7ff22f087743d483e88480 diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index 0ac7ba1d6e..46ba0cbac2 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -110,7 +110,7 @@ xv30le 7dfdd664a9792bb06a19a63353828da0 xv36be 9f556ee59a672fd8725f0bb36ce3e4b0 xv36le e08dcbde02f1c28a3554f372ad1278e2 xv48be ce34993b4b4411bba1d852b9b86aa39e -xv48le 30b5271d569d1ad6aba916fa5cdf82bd +xv48le df913a7e61b162aa98303e5393e60c63 xyz12be a1ef56bf746d71f59669c28e48fc8450 xyz12le 831ff03c1ba4ef19374686f16a064d8c y210le 04e9487b6cce38e7531437e946cdd586 diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index 689ed6ba9a..8e5526935f 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -110,7 +110,7 @@ xv30le a2a351cbf936651b558abfc70a925057 xv36be 4d084adca0228d7750d1e2e877e0d79b xv36le de9c74e94dc19c828e1572aa283d8aca xv48be 9e58d1a045df100b0dec116e13be5b4e -xv48le c739efbfc98e9944911ffb7861b176b7 +xv48le fd873d53609b2fbdfe99470f515a234c xyz12be c7ba8345998c0141ddc079cdd29b1a40 xyz12le 95f5d3a0de834cc495c9032a14987cde y210le 7c2aef142d88ab343ec01acd45f38466 diff --git a/tests/ref/fate/filter-pixfmts-transpose b/tests/ref/fate/filter-pixfmts-transpose index 16fdba1140..985c63fca9 100644 --- a/tests/ref/fate/filter-pixfmts-transpose +++ b/tests/ref/fate/filter-pixfmts-transpose @@ -99,7 +99,7 @@ xv30le ebe26bf75c64406dea8b8a160c978fd9 xv36be 2261a0e3db5ee607d37f68d19704ae15 xv36le 9202133de91bf64c76ca27d5cd0c816a xv48be 14373b7fe123225689e76fe2ce43fb93 -xv48le ad174a65871cacf64275f7f7cef8467d +xv48le 319df9724a067c7b5efa215f9f54d127 xyz12be 68e5cba640f6e4ef72dff950e88b5342 xyz12le 8b6b6a6db4d7561e80db88ccaecce7a9 ya16be 3e161cb5f225922a80fefdc9cc02a4f9 diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index 032f3b58bb..c0d836a094 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -110,7 +110,7 @@ xv30le f61ddeb49ba8fb7c92294ad621cbf896 xv36be c0272372d3e1a59adb3931ee433a5d5b xv36le ffe6ab75ebc09134c3451f8f6ef0d501 xv48be bdfc3217ae456b370dbdcf4d52606a3f -xv48le 5e603d6635ddeba02f3201c70437cb9d +xv48le 53dbebab73a66539c04644ef56dc6bbb xyz12be 23fa9fb36d49dce61e284d41b83e0e6b xyz12le ef73e6d1f932a9a355df1eedd628394f y210le f8847bedd3ae6e1c0cf84a823f275e31

1 0

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

26 Oct '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Oct 23 13:19:13 2024 -0300| [a67ba3c13276cc082e650ad6df49b56268454668] | committer: James Almer swscale/output: add XV48 output support Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a67ba3c13276cc082… --- libswscale/output.c | 37 +++++++++++++++++++++----------- libswscale/utils.c | 4 ++-- libswscale/version.h | 2 +- tests/ref/fate/filter-pixdesc-xv48be | 1 + tests/ref/fate/filter-pixdesc-xv48le | 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-scale | 2 ++ tests/ref/fate/filter-pixfmts-transpose | 2 ++ tests/ref/fate/filter-pixfmts-vflip | 2 ++ 15 files changed, 49 insertions(+), 16 deletions(-) diff --git a/libswscale/output.c b/libswscale/output.c index 0df14e99d6..b37568a10a 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -2577,7 +2577,8 @@ yuv2ayuv64_X_c(SwsInternal *c, const int16_t *lumFilter, const int16_t **_lumSrc, int lumFilterSize, const int16_t *chrFilter, const int16_t **_chrUSrc, const int16_t **_chrVSrc, int chrFilterSize, - const int16_t **_alpSrc, uint8_t *dest, int dstW, int y, int is_be) + const int16_t **_alpSrc, uint8_t *dest, int dstW, int y, + int A_offset, int Y_offset, int U_offset, int V_offset, int is_be) { const int32_t **lumSrc = (const int32_t **) _lumSrc, **chrUSrc = (const int32_t **) _chrUSrc, @@ -2612,20 +2613,19 @@ yuv2ayuv64_X_c(SwsInternal *c, const int16_t *lumFilter, Y = 0x8000 + av_clip_int16(Y >> 15); U = 0x8000 + av_clip_int16(U >> 15); V = 0x8000 + av_clip_int16(V >> 15); - A = 0x8000 + av_clip_int16(A >> 15); + if (hasAlpha) + A = 0x8000 + av_clip_int16(A >> 15); - output_pixels(dest + 8 * i, hasAlpha ? A : 65535); - output_pixels(dest + 8 * i + 2, Y); - output_pixels(dest + 8 * i + 4, U); - output_pixels(dest + 8 * i + 6, V); + output_pixels(dest + 8 * i + A_offset, hasAlpha ? A : 65535); + output_pixels(dest + 8 * i + Y_offset, Y); + output_pixels(dest + 8 * i + U_offset, U); + output_pixels(dest + 8 * i + V_offset, V); } } -#undef output_pixels - -#define YUV2AYUV64(BE_LE, is_be) \ +#define YUV2AYUV64(pixfmt, BE_LE, A, Y, U, V, is_be) \ static void \ -yuv2ayuv64 ## BE_LE ##_X_c(SwsInternal *c, const int16_t *lumFilter, \ +yuv2 ## pixfmt ## BE_LE ##_X_c(SwsInternal *c, const int16_t *lumFilter, \ const int16_t **lumSrc, int lumFilterSize, \ const int16_t *chrFilter, const int16_t **chrUSrc, \ const int16_t **chrVSrc, int chrFilterSize, \ @@ -2633,11 +2633,16 @@ yuv2ayuv64 ## BE_LE ##_X_c(SwsInternal *c, const int16_t *lumFilter, \ { \ yuv2ayuv64_X_c(c, lumFilter, lumSrc, lumFilterSize, \ chrFilter, chrUSrc, chrVSrc, chrFilterSize, \ - alpSrc, dest, dstW, y, is_be); \ + alpSrc, dest, dstW, y, A, Y, U, V, is_be); \ } -YUV2AYUV64(le, 0) -YUV2AYUV64(be, 1) +YUV2AYUV64(ayuv64, le, 0, 2, 4, 6, 0) +YUV2AYUV64(ayuv64, be, 0, 2, 4, 6, 1) + +YUV2AYUV64(xv48, le, 6, 2, 0, 4, 0) +YUV2AYUV64(xv48, be, 6, 2, 0, 4, 1) + +#undef output_pixels static av_always_inline void yuv2v30_X_c_template(SwsInternal *c, const int16_t *lumFilter, @@ -3692,6 +3697,12 @@ av_cold void ff_sws_init_output_funcs(SwsInternal *c, case AV_PIX_FMT_XV36BE: *yuv2packedX = yuv2xv36be_X_c; break; + case AV_PIX_FMT_XV48LE: + *yuv2packedX = yuv2xv48le_X_c; + break; + case AV_PIX_FMT_XV48BE: + *yuv2packedX = yuv2xv48be_X_c; + break; case AV_PIX_FMT_Y210LE: *yuv2packedX = yuv2y210le_X_c; break; diff --git a/libswscale/utils.c b/libswscale/utils.c index 004cdf749f..c49121de59 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -277,8 +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_XV48LE] = { 1, 1 }, + [AV_PIX_FMT_XV48BE] = { 1, 1 }, [AV_PIX_FMT_AYUV] = { 1, 1 }, [AV_PIX_FMT_UYVA] = { 1, 1 }, [AV_PIX_FMT_VYU444] = { 1, 1 }, diff --git a/libswscale/version.h b/libswscale/version.h index 109bb5cfd9..41c4181e22 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -29,7 +29,7 @@ #include "version_major.h" #define LIBSWSCALE_VERSION_MINOR 9 -#define LIBSWSCALE_VERSION_MICRO 100 +#define LIBSWSCALE_VERSION_MICRO 101 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ LIBSWSCALE_VERSION_MINOR, \ diff --git a/tests/ref/fate/filter-pixdesc-xv48be b/tests/ref/fate/filter-pixdesc-xv48be new file mode 100644 index 0000000000..9bbbfce6b4 --- /dev/null +++ b/tests/ref/fate/filter-pixdesc-xv48be @@ -0,0 +1 @@ +pixdesc-xv48be 9d848c07ad49d025b9d1421b906ee191 diff --git a/tests/ref/fate/filter-pixdesc-xv48le b/tests/ref/fate/filter-pixdesc-xv48le new file mode 100644 index 0000000000..4b69a41ab2 --- /dev/null +++ b/tests/ref/fate/filter-pixdesc-xv48le @@ -0,0 +1 @@ +pixdesc-xv48le 35c1874574e1cf438ea3e97ef2a5a85e diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index bd44c34fe0..0ac7ba1d6e 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -109,6 +109,8 @@ x2rgb10le c1e3ac21be04a16bb157b22784524520 xv30le 7dfdd664a9792bb06a19a63353828da0 xv36be 9f556ee59a672fd8725f0bb36ce3e4b0 xv36le e08dcbde02f1c28a3554f372ad1278e2 +xv48be ce34993b4b4411bba1d852b9b86aa39e +xv48le 30b5271d569d1ad6aba916fa5cdf82bd xyz12be a1ef56bf746d71f59669c28e48fc8450 xyz12le 831ff03c1ba4ef19374686f16a064d8c y210le 04e9487b6cce38e7531437e946cdd586 diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop index 25879c4acd..dcb992226c 100644 --- a/tests/ref/fate/filter-pixfmts-crop +++ b/tests/ref/fate/filter-pixfmts-crop @@ -106,6 +106,8 @@ x2rgb10le f4265aca7a67dbfa9354370098ca6f33 xv30le 7e2350aea136c6fb76dae54e9d3fe1f8 xv36be 23b6f253fcb375e4145cfcb562268c5f xv36le 778286003497f92b84d0bd8258d6b85d +xv48be c90889b2cf54cc78bd58e8c47d4eb791 +xv48le 60d81aa388fd40e5bf8aa3323bc4e60f xyz12be cb4571f9aaa7b59f999ef327276104b7 xyz12le cd6aae8d26b18bdb4b9d068586276d91 ya16be a3d18014454942a96f15a49947c0c55d diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index d35eec2a2f..aac4e0adfa 100644 --- a/tests/ref/fate/filter-pixfmts-field +++ b/tests/ref/fate/filter-pixfmts-field @@ -109,6 +109,8 @@ x2rgb10le a18bc4ae5274e0a8cca9137ecd50c677 xv30le a8e8bfb66178ad5cbef5c82cedc1d3da xv36be bcc7bda2d0a5d43db4464af6a4cb5d65 xv36le ba99f258370f2a56993e8760e6b30194 +xv48be 2abcd986a34789ba4310be3969020d0d +xv48le 90591fca801a6d0ee3fb19bf3c8587f8 xyz12be d2fa69ec91d3ed862f2dac3f8e7a3437 xyz12le 02bccd5e0b6824779a1f848b0ea3e3b5 y210le 4c2fba1dc40322584977d15dd07c9146 diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder index a19f58e73d..f5dddd0a37 100644 --- a/tests/ref/fate/filter-pixfmts-fieldorder +++ b/tests/ref/fate/filter-pixfmts-fieldorder @@ -98,6 +98,8 @@ x2rgb10le cdf6a9e8a8d081aa768c6ae2e6221676 xv30le 8d1921d4a210d8107c20a805cb9a8117 xv36be 962386c88268f4382004c3a7a82c5eb8 xv36le bcceffc985aaa8414c4b8072aa0889bd +xv48be 4d6e4004b03767f12df8bb4e76c98ddf +xv48le f1b19076ff69cb8d587454615015297a xyz12be 15f5cda71de5fef9cec5e75e3833b6bc xyz12le 7be6c8781f38c21a6b8f602f62ca31e6 y210le 22b1a02a39c4b325726bf8793bf1e8f2 diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip index f9e6b564bb..a4630144e3 100644 --- a/tests/ref/fate/filter-pixfmts-hflip +++ b/tests/ref/fate/filter-pixfmts-hflip @@ -106,6 +106,8 @@ x2rgb10le d4a8189b65395a88d0a38a7053f3359f xv30le 7370eadd13a2fc79186443713a639332 xv36be 98f578df965eed369f46cb135e2d1345 xv36le e478b4b54698beb3ce1b9a2dd691d544 +xv48be e030a2c7b1b600cfacb691b6e90c2e3d +xv48le d2fd726fcd96a696ea67cb6281c45b6b xyz12be 25f90259ff8a226befdaec3dfe82996e xyz12le 926c0791d59aaff61b2778e8ada3316d ya16be d5b342355bdd9e3197e01b13b7c6301e diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index 67a44ef361..981fe287fd 100644 --- a/tests/ref/fate/filter-pixfmts-il +++ b/tests/ref/fate/filter-pixfmts-il @@ -108,6 +108,8 @@ x2rgb10le 517fb186f523dc7cdc5c5c6967cfbe94 xv30le ccd81ba2ba845917d5d1c9fa2a6e2fc6 xv36be 3bbb949278ea55cc947ee03bd9c27c2d xv36le 102c0e817d375ddd6b2cfbb4262dec95 +xv48be 4d7376651fb7b3e84d00abad6c785aad +xv48le 7280a114df023964bdba651a9c2ca752 xyz12be 7c7d54c55f136cbbc50b18029f3be0b3 xyz12le 090ba6b1170baf2b1358b43b971d33b0 y210le d4cf9b53cd7ff22f087743d483e88480 diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index bd44c34fe0..0ac7ba1d6e 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -109,6 +109,8 @@ x2rgb10le c1e3ac21be04a16bb157b22784524520 xv30le 7dfdd664a9792bb06a19a63353828da0 xv36be 9f556ee59a672fd8725f0bb36ce3e4b0 xv36le e08dcbde02f1c28a3554f372ad1278e2 +xv48be ce34993b4b4411bba1d852b9b86aa39e +xv48le 30b5271d569d1ad6aba916fa5cdf82bd xyz12be a1ef56bf746d71f59669c28e48fc8450 xyz12le 831ff03c1ba4ef19374686f16a064d8c y210le 04e9487b6cce38e7531437e946cdd586 diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index 0cb96c0e1c..689ed6ba9a 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -109,6 +109,8 @@ x2rgb10le d56bdb23fa6a8e12a0b4394987f89935 xv30le a2a351cbf936651b558abfc70a925057 xv36be 4d084adca0228d7750d1e2e877e0d79b xv36le de9c74e94dc19c828e1572aa283d8aca +xv48be 9e58d1a045df100b0dec116e13be5b4e +xv48le c739efbfc98e9944911ffb7861b176b7 xyz12be c7ba8345998c0141ddc079cdd29b1a40 xyz12le 95f5d3a0de834cc495c9032a14987cde y210le 7c2aef142d88ab343ec01acd45f38466 diff --git a/tests/ref/fate/filter-pixfmts-transpose b/tests/ref/fate/filter-pixfmts-transpose index 3faceb5f5d..16fdba1140 100644 --- a/tests/ref/fate/filter-pixfmts-transpose +++ b/tests/ref/fate/filter-pixfmts-transpose @@ -98,6 +98,8 @@ x2rgb10le 09cb1d98fe17ad8a6d9d3bec97ddc845 xv30le ebe26bf75c64406dea8b8a160c978fd9 xv36be 2261a0e3db5ee607d37f68d19704ae15 xv36le 9202133de91bf64c76ca27d5cd0c816a +xv48be 14373b7fe123225689e76fe2ce43fb93 +xv48le ad174a65871cacf64275f7f7cef8467d xyz12be 68e5cba640f6e4ef72dff950e88b5342 xyz12le 8b6b6a6db4d7561e80db88ccaecce7a9 ya16be 3e161cb5f225922a80fefdc9cc02a4f9 diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index e9ffa48cae..032f3b58bb 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -109,6 +109,8 @@ x2rgb10le 262c502230cf3724f8e2cf4737f18a42 xv30le f61ddeb49ba8fb7c92294ad621cbf896 xv36be c0272372d3e1a59adb3931ee433a5d5b xv36le ffe6ab75ebc09134c3451f8f6ef0d501 +xv48be bdfc3217ae456b370dbdcf4d52606a3f +xv48le 5e603d6635ddeba02f3201c70437cb9d xyz12be 23fa9fb36d49dce61e284d41b83e0e6b xyz12le ef73e6d1f932a9a355df1eedd628394f y210le f8847bedd3ae6e1c0cf84a823f275e31

1 0