commit 260e56c9a17737bf280d776797d6dee411c9b4da
author Marco Nelissen <marcone@google.com> Thu Jan 28 21:41:25 2016 +0000
committer Marco Nelissen <marcone@google.com> Thu Jan 28 21:41:25 2016 +0000
tree 5e2de882c337b17d1d06dd5dd323be134d7bb882
parent 4f12d94fc26df1d0c7a566792711b8863fd39fe9

Revert "Run codecs in a separate process"

This reverts commit 4f12d94fc26df1d0c7a566792711b8863fd39fe9.

Change-Id: Ic850a950119a45efd3042f40147253b37c328853

media/libmedia/IMediaPlayerService.cpp

diff --git a/media/libmedia/IMediaPlayerService.cpp b/media/libmedia/IMediaPlayerService.cpp
index 5ae450a..afc94ab 100644
--- a/media/libmedia/IMediaPlayerService.cpp
+++ b/media/libmedia/IMediaPlayerService.cpp
@@ -41,7 +41,7 @@
     CREATE = IBinder::FIRST_CALL_TRANSACTION,
     CREATE_MEDIA_RECORDER,
     CREATE_METADATA_RETRIEVER,
-    //GET_OMX,
+    GET_OMX,
     MAKE_CRYPTO,
     MAKE_DRM,
     MAKE_HDCP,
@@ -87,12 +87,12 @@
         return interface_cast<IMediaRecorder>(reply.readStrongBinder());
     }
 
-//    virtual sp<IOMX> getOMX() {
-//        Parcel data, reply;
-//        data.writeInterfaceToken(IMediaPlayerService::getInterfaceDescriptor());
-//        remote()->transact(GET_OMX, data, &reply);
-//        return interface_cast<IOMX>(reply.readStrongBinder());
-//    }
+    virtual sp<IOMX> getOMX() {
+        Parcel data, reply;
+        data.writeInterfaceToken(IMediaPlayerService::getInterfaceDescriptor());
+        remote()->transact(GET_OMX, data, &reply);
+        return interface_cast<IOMX>(reply.readStrongBinder());
+    }
 
     virtual sp<ICrypto> makeCrypto() {
         Parcel data, reply;
@@ -179,12 +179,12 @@
             reply->writeStrongBinder(IInterface::asBinder(retriever));
             return NO_ERROR;
         } break;
-//        case GET_OMX: {
-//            CHECK_INTERFACE(IMediaPlayerService, data, reply);
-//            sp<IOMX> omx = getOMX();
-//            reply->writeStrongBinder(IInterface::asBinder(omx));
-//            return NO_ERROR;
-//        } break;
+        case GET_OMX: {
+            CHECK_INTERFACE(IMediaPlayerService, data, reply);
+            sp<IOMX> omx = getOMX();
+            reply->writeStrongBinder(IInterface::asBinder(omx));
+            return NO_ERROR;
+        } break;
         case MAKE_CRYPTO: {
             CHECK_INTERFACE(IMediaPlayerService, data, reply);
             sp<ICrypto> crypto = makeCrypto();