Avoid unnecessary buffer copying if at all possible, detect if running in the mediaserver process.

3 files changed, 21 insertions, 4 deletions

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index c4d3b5d..c583b93 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -1016,6 +1016,7 @@ OMXCodec::OMXCodec(
         const char *componentName,
         const sp<MediaSource> &source)
     : mOMX(omx),
+      mOMXLivesLocally(omx->livesLocally(getpid())),
       mNode(node),
       mQuirks(quirks),
       mIsEncoder(isEncoder),
@@ -1191,12 +1192,22 @@ status_t OMXCodec::allocateBuffersOnPort(OMX_U32 portIndex) {
         IOMX::buffer_id buffer;
         if (portIndex == kPortIndexInput
                 && (mQuirks & kRequiresAllocateBufferOnInputPorts)) {
-            err = mOMX->allocateBufferWithBackup(
-                    mNode, portIndex, mem, &buffer);
+            if (mOMXLivesLocally) {
+                err = mOMX->allocateBuffer(
+                        mNode, portIndex, def.nBufferSize, &buffer);
+            } else {
+                err = mOMX->allocateBufferWithBackup(
+                        mNode, portIndex, mem, &buffer);
+            }
         } else if (portIndex == kPortIndexOutput
                 && (mQuirks & kRequiresAllocateBufferOnOutputPorts)) {
-            err = mOMX->allocateBufferWithBackup(
-                    mNode, portIndex, mem, &buffer);
+            if (mOMXLivesLocally) {
+                err = mOMX->allocateBuffer(
+                        mNode, portIndex, def.nBufferSize, &buffer);
+            } else {
+                err = mOMX->allocateBufferWithBackup(
+                        mNode, portIndex, mem, &buffer);
+            }
         } else {
             err = mOMX->useBuffer(mNode, portIndex, mem, &buffer);
         }
diff --git a/media/libstagefright/include/OMX.h b/media/libstagefright/include/OMX.h
index ce0b0d5..b559101 100644
--- a/media/libstagefright/include/OMX.h
+++ b/media/libstagefright/include/OMX.h
@@ -31,6 +31,8 @@ class OMX : public BnOMX,
 public:
     OMX();
 
+    virtual bool livesLocally(pid_t pid);
+
     virtual status_t listNodes(List<ComponentInfo> *list);
 
     virtual status_t allocateNode(
diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp
index 0d617a5..2121321 100644
--- a/media/libstagefright/omx/OMX.cpp
+++ b/media/libstagefright/omx/OMX.cpp
@@ -164,6 +164,10 @@ void OMX::binderDied(const wp<IBinder> &the_late_who) {
     instance->onObserverDied(mMaster);
 }
 
+bool OMX::livesLocally(pid_t pid) {
+    return pid == getpid();
+}
+
 status_t OMX::listNodes(List<ComponentInfo> *list) {
     list->clear();