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/libmediaplayerservice/MediaPlayerService.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 66185d5..dda0a57 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -347,6 +347,16 @@
     return MediaCodecList::getLocalInstance();
 }
 
+sp<IOMX> MediaPlayerService::getOMX() {
+    Mutex::Autolock autoLock(mLock);
+
+    if (mOMX.get() == NULL) {
+        mOMX = new OMX;
+    }
+
+    return mOMX;
+}
+
 sp<ICrypto> MediaPlayerService::makeCrypto() {
     return new Crypto;
 }