DO NOT MERGE TO MR2

There is a crash due to OMX_UseBuffer change. In Reset(), media input node deletes the media input node port, which deletes the allocator. When encoder node releases the media data, it calls the allocator to release the memory. That causes crash. Cherry-picked from MR2 branch. commit af748e6 Author: Jianhong Jiang <jianhong@google.com> Date: Fri Oct 23 14:41:57 2009 -0700 RIO-7762: OMX_UseBuffer support buffers allocated in MIO. The change depends on https://android-git.corp.google.com/g/30984
aosp-mirror · Nov 2, 2009 · 2481a65 · 2481a65
1 parent 52da244
commit 2481a65
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/nodes/pvmediainputnode/src/pvmf_media_input_node.h b/nodes/pvmediainputnode/src/pvmf_media_input_node.h
@@ -331,6 +331,8 @@ class PvmfMediaInputNode : public OsclActiveObject,
         } TimeStamp_KSV;
         TimeStamp_KSV iErrorTimeStamp;
 #endif
+
+        PVMFBufferPoolAllocator iPrivateDataFsiFragmentAlloc;
 };
 
 #endif // PVMF_MEDIA_INPUT_NODE_H_INCLUDED

diff --git a/nodes/pvmediainputnode/src/pvmf_media_input_node_outport.cpp b/nodes/pvmediainputnode/src/pvmf_media_input_node_outport.cpp
@@ -66,7 +66,7 @@ PvmfMediaInputNodeOutPort::PvmfMediaInputNodeOutPort(PvmfMediaInputNode* aNode,
     iMediaDataAlloc = OSCL_NEW(PvmfMediaInputDataBufferAlloc, (iMediaDataAllocMemPool));
     iDataPathLogger = PVLogger::GetLoggerObject("datapath.sourcenode");
 
-    iPrivateDataFsiFragmentAlloc.size(32, sizeof(OsclAny *)); //TODO REMOVE THE HARDCODED VALUE
+    iNode->iPrivateDataFsiFragmentAlloc.size(32, sizeof(OsclAny *)); //TODO REMOVE THE HARDCODED VALUE
 #ifdef _TEST_AE_EROR_HANDLING
     iTimeStampJunk = 0x000FFFFF;
 #endif
@@ -412,7 +412,7 @@ PVMFCommandId PvmfMediaInputNodeOutPort::writeAsync(uint8 format_type, int32 for
                 OsclRefCounterMemFrag privatedataFsiMemFrag;
                 OsclLeaveCode fsiErrorCode = OsclErrNone;
 
-                OSCL_TRY(fsiErrorCode, privatedataFsiMemFrag = iPrivateDataFsiFragmentAlloc.get(););
+                OSCL_TRY(fsiErrorCode, privatedataFsiMemFrag = iNode->iPrivateDataFsiFragmentAlloc.get(););
 
                 OSCL_FIRST_CATCH_ANY(fsiErrorCode,
                         LOG_ERR((0, "Failed to allocate memory for  FSI for private data"));

diff --git a/nodes/pvmediainputnode/src/pvmf_media_input_node_outport.h b/nodes/pvmediainputnode/src/pvmf_media_input_node_outport.h
@@ -185,7 +185,6 @@ class PvmfMediaInputNodeOutPort : public OsclTimerObject,
         //logging
         OSCL_HeapString<OsclMemAllocator> iMimeType;
         PVLogger* iDataPathLogger;
-        PVMFBufferPoolAllocator iPrivateDataFsiFragmentAlloc;
 };
 
 #endif // PVMF_MEDIA_INPUT_NODE_INPORT_H_INCLUDED