From 9a09f68f579dd30dbd2a0d8e41fac7c17403b6ae Mon Sep 17 00:00:00 2001 From: Lina Sun Date: Mon, 12 Aug 2024 11:35:41 +0000 Subject: [PATCH] Disable VP9 HDR support by default Currently VP9 HDR is not supported in mediasdk_c2, but in framework VP9 HDR is set to supported by default and caused some cts tests run failed. Will need to revert this patch when VP9 HDR support is added in mediasdk_c2. Tracked-On: OAM-123529 Signed-off-by: Lina Sun --- ...lt-disable-HDR-support-for-VP9-codec.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 aosp_diff/preliminary/frameworks/av/0009-By-default-disable-HDR-support-for-VP9-codec.patch diff --git a/aosp_diff/preliminary/frameworks/av/0009-By-default-disable-HDR-support-for-VP9-codec.patch b/aosp_diff/preliminary/frameworks/av/0009-By-default-disable-HDR-support-for-VP9-codec.patch new file mode 100644 index 0000000000..f209cdcad7 --- /dev/null +++ b/aosp_diff/preliminary/frameworks/av/0009-By-default-disable-HDR-support-for-VP9-codec.patch @@ -0,0 +1,32 @@ +From 695fa89a4552a52498e92151440848aa4a968eed Mon Sep 17 00:00:00 2001 +From: Lina Sun +Date: Mon, 29 Jul 2024 08:06:16 +0000 +Subject: [PATCH] By default disable HDR support for VP9 codec + +The change is because current mediasdk_c2 doesn't support HDR for +VP9 codec, but in framework VP9 HDR is supported by default. + +Will need to remove this patch when VP9 is supported in +mediasdk_c2. +--- + media/codec2/sfplugin/Codec2InfoBuilder.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/media/codec2/sfplugin/Codec2InfoBuilder.cpp b/media/codec2/sfplugin/Codec2InfoBuilder.cpp +index 453a0d2f59..3e00dc5ee5 100644 +--- a/media/codec2/sfplugin/Codec2InfoBuilder.cpp ++++ b/media/codec2/sfplugin/Codec2InfoBuilder.cpp +@@ -154,7 +154,9 @@ bool addSupportedProfileLevels( + // VP9 does not support HDR metadata in the bitstream and static metadata + // can always be carried by the framework. (The framework does not propagate + // dynamic metadata as that needs to be frame accurate.) +- supportsHdr |= (mediaType == MIMETYPE_VIDEO_VP9); ++ // TODO: comment out this line for now as VP9 HDR is not supported in SDK yet ++ // will need uncomment it when adding VP9 HDR support in SDK. ++ //supportsHdr |= (mediaType == MIMETYPE_VIDEO_VP9); + + // HDR support implies 10-bit support. AV1 codecs are also required to + // support 10-bit per CDD. +-- +2.34.1 +