From a9209e5f586f490f77cda359aca4adc4a8cf1c00 Mon Sep 17 00:00:00 2001 From: "Wan, Hao" Date: Thu, 29 Aug 2024 08:26:29 +0000 Subject: [PATCH 1/7] Fix issue that recording video got stuck When we enable Perf Profiler and the perf data exceeds the specified buffer size, normal encoding processing will be interrupted. Removing Perf related configurations in igfx_user_feature_next.txt can solve the issue. Tracked-On: OAM-123532 Signed-off-by: Shaofeng Tang Signed-off-by: Nana Zhang Signed-off-by: Wan, Hao (cherry picked from commit 4144713c48a3588778362137b91e5061527e98ff) Tracked-On: OAM-128364 Signed-off-by: Lina Sun --- groups/media/auto/igfx_user_feature_next.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/groups/media/auto/igfx_user_feature_next.txt b/groups/media/auto/igfx_user_feature_next.txt index 6cdf1fa6f..51c4f9aef 100644 --- a/groups/media/auto/igfx_user_feature_next.txt +++ b/groups/media/auto/igfx_user_feature_next.txt @@ -1,9 +1,4 @@ [config] -Perf Profiler Enable=1 -Perf Profiler Output File Name=linux_perf_out.bin -Perf Profiler Multi Process Support=0 -Perf Profiler Register 8=1835148 -Perf Profiler Buffer Size=10000000 Enable HCP Scalability Decode=0 Disable Media Encode Scalability=1 From c41687e8d8940df9f57068eba99d3ebd190f1c55 Mon Sep 17 00:00:00 2001 From: Lina Sun Date: Thu, 29 Aug 2024 12:32:12 +0000 Subject: [PATCH 2/7] Disable HDR display cts android.mediav2.cts.CodecInfoTest#testHDRDisplayCapabilities test failed with "java.lang.AssertionError: c2.intel.vp9.encoder Advertises support for HDR10/HDR10+ profile 4096 without any HDR display" Cause: HDR currently is not supported by intel VP9 encoder/ decoder, while in framework VP9 HDR is enabled by default. Solution: Disable HDR display. When HDR display is disabled, HDR capability will be disabled for VP9 codec. This way we can keep profile2/profile3 for VP9 and 10-bit decoder can still work. Note: HDR capability of other codec types like HEVC will also be disabled with this patch. Tracked-On: OAM-123681 Signed-off-by: Lina Sun (cherry picked from commit a39f072672505990fcfe18f2aba4c78d46dd376b) Tracked-On: OAM-128364 Signed-off-by: Lina Sun --- groups/media/auto/product.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/groups/media/auto/product.mk b/groups/media/auto/product.mk index 6b1dcd4a7..577abba36 100644 --- a/groups/media/auto/product.mk +++ b/groups/media/auto/product.mk @@ -50,4 +50,4 @@ PRODUCT_PACKAGES += libhdcpsdk PRODUCT_PACKAGES += lihdcpcommon PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.stagefright.c2inputsurface=-1 - +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.has_HDR_display=false From 4201603d021f99edd3d83c3e263c1f9e1d938969 Mon Sep 17 00:00:00 2001 From: "Wan, Hao" Date: Fri, 27 Sep 2024 09:24:07 +0000 Subject: [PATCH 3/7] Add video test tools into image /vendor/bin * hello-encode * vpl_sample_decode Tracked-On: OAM-125583 Signed-off-by: Wan, Hao (cherry picked from commit 86dd8d08f42c1fe754fca8b2f3fdd0be63ffc559) Tracked-On: OAM-128364 Signed-off-by: Lina Sun --- groups/codec2/true/product.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/groups/codec2/true/product.mk b/groups/codec2/true/product.mk index 2a1388891..d3c909bd6 100755 --- a/groups/codec2/true/product.mk +++ b/groups/codec2/true/product.mk @@ -26,7 +26,9 @@ BOARD_HAVE_MEDIASDK_CODEC2 := true {{#use_onevpl}} PRODUCT_PACKAGES += \ libvpl \ - libmfx-gen + libmfx-gen \ + hello-encode \ + vpl_sample_decode USE_ONEVPL := true {{/use_onevpl}} From 64d2c7be9d2ecad61ef601a72fc293563d69c6ec Mon Sep 17 00:00:00 2001 From: Lina Sun Date: Mon, 30 Sep 2024 09:30:38 +0000 Subject: [PATCH 4/7] Remove C2 encoder dump option in config file C2 dump change to be enabled by set property. Tracked-On: OAM-124732 Signed-off-by: Lina Sun (cherry picked from commit 556deec112312e6ed84cb91d18057d45f580ac2b) Tracked-On: OAM-128364 Signed-off-by: Lina Sun --- groups/codec2/true/media_codecs_intel_c2_video.xml | 3 +-- groups/codec2/true/media_codecs_intel_c2_video_gen13.xml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/groups/codec2/true/media_codecs_intel_c2_video.xml b/groups/codec2/true/media_codecs_intel_c2_video.xml index 45fa12c51..8fbe61a6c 100644 --- a/groups/codec2/true/media_codecs_intel_c2_video.xml +++ b/groups/codec2/true/media_codecs_intel_c2_video.xml @@ -129,8 +129,7 @@ and updated to vendor media codecs. - - + {{/hw_ve_h264}} diff --git a/groups/codec2/true/media_codecs_intel_c2_video_gen13.xml b/groups/codec2/true/media_codecs_intel_c2_video_gen13.xml index 660346cb6..3ec7d0bbb 100644 --- a/groups/codec2/true/media_codecs_intel_c2_video_gen13.xml +++ b/groups/codec2/true/media_codecs_intel_c2_video_gen13.xml @@ -104,8 +104,7 @@ and updated to vendor media codecs. - - + From 6f09c3f76c906fafc3925e4ce47f80cb5fc17beb Mon Sep 17 00:00:00 2001 From: "Wan, Hao" Date: Mon, 21 Oct 2024 14:03:09 +0000 Subject: [PATCH 5/7] Remove codec2 broken symbolic link. Tracked-On: OAM-124592 Signed-off-by: Wan, Hao (cherry picked from commit 4fa73606b1e19c677933d0803cd1ef1ce0293b68) Tracked-On: OAM-128364 Signed-off-by: Lina Sun --- groups/codec2/false/default | 1 - 1 file changed, 1 deletion(-) delete mode 120000 groups/codec2/false/default diff --git a/groups/codec2/false/default b/groups/codec2/false/default deleted file mode 120000 index 331d858ce..000000000 --- a/groups/codec2/false/default +++ /dev/null @@ -1 +0,0 @@ -default \ No newline at end of file From ca995c1fe6dd764b7c862b494a992011df788335 Mon Sep 17 00:00:00 2001 From: "Wan, Hao" Date: Mon, 4 Nov 2024 14:14:23 +0000 Subject: [PATCH 6/7] Add new DG2 device ID 0x56af for codec2 Tracked-On: OAM-127008 Signed-off-by: Wan, Hao (cherry picked from commit 26f4240388e1ba72da0e4e9780316600f9238805) Tracked-On: OAM-128364 Signed-off-by: Lina Sun --- groups/codec2/true/auto_hal.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/groups/codec2/true/auto_hal.in b/groups/codec2/true/auto_hal.in index cb526e52f..ce2db2f3a 100644 --- a/groups/codec2/true/auto_hal.in +++ b/groups/codec2/true/auto_hal.in @@ -1,7 +1,7 @@ DG2_IDS=( "0x4f80" "0x4f81" "0x4f82" "0x4f83" "0x4f84" "0x4f85" "0x4f86" "0x4f87" "0x4f88" "0x5690" "0x5691" "0x5692" "0x5693" "0x5694" "0x5695" "0x5696" "0x5697" "0x5698" - "0x56a0" "0x56a1" "0x56a2" "0x56a3" "0x56a4" "0x56a5" "0x56a6" "0x56a7" "0x56a8" "0x56a9" + "0x56a0" "0x56a1" "0x56a2" "0x56a3" "0x56a4" "0x56a5" "0x56a6" "0x56a7" "0x56a8" "0x56a9" "0x56af" "0x56b0" "0x56b1" "0x56b2" "0x56b3" "0x56ba" "0x56bb" "0x56bc" "0x56bd" "0x56be" "0x56bf" ) From ae76f45b0b798820812625e0d3b6d8649c4c254f Mon Sep 17 00:00:00 2001 From: Shaofeng Tang Date: Mon, 18 Nov 2024 15:04:45 +0800 Subject: [PATCH 7/7] Add VPL test tool into image. VPL sample tool for encoding, and transcoding are required by QA. Tracked-On: OAM-127106 Signed-off-by: Shaofeng Tang (cherry picked from commit 1640403f9252d179af29083ad2a6735fb93dac72) Tracked-On: OAM-128364 Signed-off-by: Lina Sun --- groups/codec2/true/product.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/groups/codec2/true/product.mk b/groups/codec2/true/product.mk index d3c909bd6..055234426 100755 --- a/groups/codec2/true/product.mk +++ b/groups/codec2/true/product.mk @@ -28,7 +28,10 @@ PRODUCT_PACKAGES += \ libvpl \ libmfx-gen \ hello-encode \ - vpl_sample_decode + vpl_sample_decode \ + vpl_sample_encode \ + vpl_sample_multi_transcode \ + vpl_sample_vpp USE_ONEVPL := true {{/use_onevpl}}