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.h

diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h
index c0a7cf2..bd98ef1 100644
--- a/media/libmediaplayerservice/MediaPlayerService.h
+++ b/media/libmediaplayerservice/MediaPlayerService.h
@@ -217,6 +217,7 @@
     virtual sp<IMediaPlayer>    create(const sp<IMediaPlayerClient>& client, int audioSessionId);
 
     virtual sp<IMediaCodecList> getCodecList() const;
+    virtual sp<IOMX>            getOMX();
     virtual sp<ICrypto>         makeCrypto();
     virtual sp<IDrm>            makeDrm();
     virtual sp<IHDCP>           makeHDCP(bool createEncryptionModule);
@@ -407,6 +408,7 @@
                 SortedVector< wp<Client> >  mClients;
                 SortedVector< wp<MediaRecorderClient> > mMediaRecorderClients;
                 int32_t                     mNextConnId;
+                sp<IOMX>                    mOMX;
                 sp<ICrypto>                 mCrypto;
 };