commit 52257b75115135821bba562ac35c0c6325a1e100
author Pawin Vongmasa <pawin@google.com> Tue Apr 25 05:06:20 2017 -0700
committer Pawin Vongmasa <pawin@google.com> Tue Apr 25 05:15:37 2017 -0700
tree a9f4b354a9cfd8c70814d46c9b0368c07d44730a
parent 087f3af6ceee8fe61a27901c7c910218664265c0

Stub implementation for IOmxStore.

Test: Small CtsMediaTestCases

Bug: 37657124
Change-Id: I5728a12d000223231600ab3c3ab4eb044dd1847d

services/mediacodec/main_codecservice.cpp

diff --git a/services/mediacodec/main_codecservice.cpp b/services/mediacodec/main_codecservice.cpp
index c4e4cff..03d18f0 100644
--- a/services/mediacodec/main_codecservice.cpp
+++ b/services/mediacodec/main_codecservice.cpp
@@ -31,9 +31,9 @@
 #include "MediaCodecService.h"
 #include "minijail.h"
 
-#include <android/hardware/media/omx/1.0/IOmx.h>
 #include <hidl/HidlTransportSupport.h>
 #include <omx/1.0/Omx.h>
+#include <omx/1.0/OmxStore.h>
 
 using namespace android;
 
@@ -61,17 +61,24 @@
 
     if (treble) {
         using namespace ::android::hardware::media::omx::V1_0;
-        sp<IOmx> omx = new implementation::Omx();
-        if (omx == nullptr) {
-            LOG(ERROR) << "Cannot create a Treble IOmx service.";
-        } else if (omx->registerAsService() != OK) {
-            LOG(ERROR) << "Cannot register a Treble IOmx service.";
+        sp<IOmxStore> omxStore = new implementation::OmxStore();
+        if (omxStore == nullptr) {
+            LOG(ERROR) << "Cannot create IOmxStore HAL service.";
+        } else if (omxStore->registerAsService() != OK) {
+            LOG(ERROR) << "Cannot register IOmxStore HAL service.";
         } else {
-            LOG(INFO) << "Treble IOmx service created.";
+            sp<IOmx> omx = new implementation::Omx();
+            if (omx == nullptr) {
+                LOG(ERROR) << "Cannot create IOmx HAL service.";
+            } else if (omx->registerAsService() != OK) {
+                LOG(ERROR) << "Cannot register IOmx HAL service.";
+            } else {
+                LOG(INFO) << "Treble OMX service created.";
+            }
         }
     } else {
         MediaCodecService::instantiate();
-        LOG(INFO) << "Non-Treble IOMX service created.";
+        LOG(INFO) << "Non-Treble OMX service created.";
     }
 
     ProcessState::self()->startThreadPool();