commit bf69de9ebd9c7881a24d858158d9d60b0ff9064c
author Pawin Vongmasa <pawin@google.com> Tue Oct 29 06:21:27 2019 -0700
committer Pawin Vongmasa <pawin@google.com> Fri Nov 15 05:58:33 2019 -0800
tree 1d38033e2949ee4eaf3cff1dc740ced599b5015b
parent 8acbb6ce1856c479014a8f870b6f8ec7c2fe3bca

Codec2Utils: Add support for media.c2@1.1

mediaswcodec will now present
android.hardware.media.c2@1.1::IComponentStore.

Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice

Test: make vts -j123 && vts-tradefed run commandAndExit vts \
-m VtsHalMediaC2V1_0Host

Bug: 136316504

Change-Id: I5a78e4faf5961861a07d6ea6e95198cd0d49f0f2

services/mediacodec/registrant/CodecServiceRegistrant.cpp

diff --git a/services/mediacodec/registrant/CodecServiceRegistrant.cpp b/services/mediacodec/registrant/CodecServiceRegistrant.cpp
index 706ebee..58db801e 100644
--- a/services/mediacodec/registrant/CodecServiceRegistrant.cpp
+++ b/services/mediacodec/registrant/CodecServiceRegistrant.cpp
@@ -20,11 +20,11 @@
 #include <android-base/logging.h>
 
 #include <C2PlatformSupport.h>
-#include <codec2/hidl/1.0/ComponentStore.h>
+#include <codec2/hidl/1.1/ComponentStore.h>
 #include <media/CodecServiceRegistrant.h>
 
 extern "C" void RegisterCodecServices() {
-    using namespace ::android::hardware::media::c2::V1_0;
+    using namespace ::android::hardware::media::c2::V1_1;
     LOG(INFO) << "Creating software Codec2 service...";
     android::sp<IComponentStore> store =
         new utils::ComponentStore(