BACKPORT: service: Uprev Codec 2.0 VNDK to 1.2

This CL uprevs Codec 2.0 VNDK version 1.2 to take advantage of
asynchronous graphic buffer fetching from buffer queue in following
patches.

Bug: 268301611
Bug: 268305422
Bug: 270329448
Bug: 238710012
Bug: 238390060
Bug: 270331759
Bug: 238709912
Test: CtsMediaCodecTestCases
Test: CtsMediaDecoderTestCases
Test: CtsMediaV2TestCases
Test: GtsExoPlayerTestCases com.google.android.exoplayer.gts.CommonEncryptionDrmTest#cencSchemeTypeV*
Change-Id: Icad6d78c3f36d365749af787f2b3bab3edc54d3e
(cherry picked from commit d1454490)
(cherry picked from commit 35f4783d)
[mkorpershoek: adjusted because of patches to remove multilib]
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

plugin_store/C2VdaBqBlockPool.cpp

@@ -918,6 +918,16 @@ c2_status_t C2VdaBqBlockPool::fetchGraphicBlock(
     return C2_NO_INIT;
 }
 
+c2_status_t C2VdaBqBlockPool::fetchGraphicBlock(uint32_t width, uint32_t height, uint32_t format,
+                                                C2MemoryUsage usage,
+                                                std::shared_ptr<C2GraphicBlock>* block,
+                                                C2Fence* fence) {
+    if (mImpl) {
+        return mImpl->fetchGraphicBlock(width, height, format, usage, block);
+    }
+    return C2_NO_INIT;
+}
+
 void C2VdaBqBlockPool::setRenderCallback(
         const C2BufferQueueBlockPool::OnRenderCallback& renderCallback) {
     if (mImpl) {

plugin_store/include/v4l2_codec2/plugin_store/C2VdaBqBlockPool.h

@@ -55,6 +55,10 @@ public:
                                   C2MemoryUsage usage,
                                   std::shared_ptr<C2GraphicBlock>* block /* nonnull */) override;
 
+    c2_status_t fetchGraphicBlock(uint32_t width, uint32_t height, uint32_t format,
+                                  C2MemoryUsage usage, std::shared_ptr<C2GraphicBlock>* block,
+                                  C2Fence* fence) override;
+
     void setRenderCallback(const C2BufferQueueBlockPool::OnRenderCallback& renderCallback =
                                    C2BufferQueueBlockPool::OnRenderCallback()) override;
     void configureProducer(const android::sp<HGraphicBufferProducer>& producer) override;

service/Android.bp

@@ -8,7 +8,7 @@ package {
 }
 
 cc_binary {
-    name: "android.hardware.media.c2@1.0-service-v4l2",
+    name: "android.hardware.media.c2@1.2-service-v4l2",
 
     defaults: [
         "hidl_defaults",
@@ -34,6 +34,6 @@ cc_binary {
     required: ["android.hardware.media.c2-default-seccomp_policy"],
 
     compile_multilib: "first",
-    init_rc: ["android.hardware.media.c2@1.0-service-v4l2.rc"],
-    vintf_fragments: ["android.hardware.media.c2@1.0-service-v4l2.xml"],
+    init_rc: ["android.hardware.media.c2@1.2-service-v4l2.rc"],
+    vintf_fragments: ["android.hardware.media.c2@1.2-service-v4l2.xml"],
 }

service/android.hardware.media.c2@1.0-service-v4l2.rc → service/android.hardware.media.c2@1.2-service-v4l2.rc

-service android-hardware-media-c2-v4l2-hal-1-0 /vendor/bin/hw/android.hardware.media.c2@1.0-service-v4l2
+service android-hardware-media-c2-v4l2-hal-1-2 /vendor/bin/hw/android.hardware.media.c2@1.2-service-v4l2
     class hal
     user media
     group mediadrm drmrpc

service/android.hardware.media.c2@1.0-service-v4l2.xml → service/android.hardware.media.c2@1.2-service-v4l2.xml

@@ -2,7 +2,7 @@
     <hal format="hidl">
       <name>android.hardware.media.c2</name>
       <transport>hwbinder</transport>
-      <version>1.0</version>
+      <version>1.2</version>
       <interface>
           <name>IComponentStore</name>
           <instance>default</instance>

service/service.cpp

@@ -5,9 +5,9 @@
 //#define LOG_NDEBUG 0
 #define LOG_TAG "android.hardware.media.c2@1.0-service-v4l2"
 
-#include <base/logging.h>
 #include <C2Component.h>
-#include <codec2/hidl/1.0/ComponentStore.h>
+#include <base/logging.h>
+#include <codec2/hidl/1.2/ComponentStore.h>
 #include <hidl/HidlTransportSupport.h>
 #include <log/log.h>
 #include <minijail.h>
@@ -39,7 +39,7 @@ int main(int /* argc */, char** /* argv */) {
 
     // Create IComponentStore service.
     {
-        using namespace ::android::hardware::media::c2::V1_0;
+        using namespace ::android::hardware::media::c2::V1_2;
 
         ALOGD("Instantiating Codec2's V4L2 IComponentStore service...");
         android::sp<IComponentStore> store(