| commit | 7cf3be25ef40f5a61d568857585376defa7ba412 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Sep 06 21:17:30 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 06 21:17:30 2023 +0000 |
| tree | bba3e602708aa0d71afbfe2aee4e48b426d20371 | |
| parent | e3e3bc93469fa7fc0d2faecdff1635e5ebb9e48e [diff] | |
| parent | fe44029e45958ae78c63899dcd3f600e32251c80 [diff] |
Merge "codec2 vts: Fix handling of codec config flag in decoders" into main am: caa957eafc am: ad0663bf80 am: e2371b823c am: cbd66b3cc1 am: fe44029e45 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2727155 Change-Id: I61c0d60d69367775dcc73de9a4682ea485cc8b8f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/codec2/hal/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp b/media/codec2/hal/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp index d47ef67..8b0ea91 100644 --- a/media/codec2/hal/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp +++ b/media/codec2/hal/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp
@@ -341,7 +341,7 @@ ASSERT_TRUE(false) << "Wait for generating C2Work exceeded timeout"; } int64_t timestamp = (*Info)[frameID].timestamp; - if ((*Info)[frameID].flags) flags = 1u << ((*Info)[frameID].flags - 1); + flags = ((*Info)[frameID].flags == FLAG_CONFIG_DATA) ? C2FrameData::FLAG_CODEC_CONFIG : 0; if (signalEOS && ((frameID == (int)Info->size() - 1) || (frameID == (offset + range - 1)))) flags |= C2FrameData::FLAG_END_OF_STREAM;
diff --git a/media/codec2/hal/hidl/1.0/vts/functional/common/media_c2_hidl_test_common.h b/media/codec2/hal/hidl/1.0/vts/functional/common/media_c2_hidl_test_common.h index 2222aaf..ecab0cb 100644 --- a/media/codec2/hal/hidl/1.0/vts/functional/common/media_c2_hidl_test_common.h +++ b/media/codec2/hal/hidl/1.0/vts/functional/common/media_c2_hidl_test_common.h
@@ -28,6 +28,8 @@ #include <fstream> #define FLAG_NON_DISPLAY_FRAME (1 << 4) +#define FLAG_CONFIG_DATA (1 << 5) + #define MAX_RETRY 20 #define TIME_OUT 400ms #define MAX_INPUT_BUFFERS 8
diff --git a/media/codec2/hal/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoDecTest.cpp b/media/codec2/hal/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoDecTest.cpp index 3dc5b29..c19701d 100644 --- a/media/codec2/hal/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoDecTest.cpp +++ b/media/codec2/hal/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoDecTest.cpp
@@ -460,7 +460,8 @@ ASSERT_TRUE(false) << "Wait for generating C2Work exceeded timeout"; } int64_t timestamp = (*Info)[frameID].timestamp; - if ((*Info)[frameID].flags) flags = (1 << ((*Info)[frameID].flags - 1)); + + flags = ((*Info)[frameID].flags == FLAG_CONFIG_DATA) ? C2FrameData::FLAG_CODEC_CONFIG : 0; if (signalEOS && ((frameID == (int)Info->size() - 1) || (frameID == (offset + range - 1)))) flags |= C2FrameData::FLAG_END_OF_STREAM;