OpenCORE 2.05 Update. Refer to ChangeLog for detailsv2.05

5 files changed, 16 insertions, 20 deletions

diff --git a/nodes/pvclientserversocketnode/Android.mk b/nodes/pvclientserversocketnode/Android.mk
index c1a2c07a5..511630cf8 100644
--- a/nodes/pvclientserversocketnode/Android.mk
+++ b/nodes/pvclientserversocketnode/Android.mk
@@ -9,7 +9,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_MODULE := libpvclientserversocketnode
 
-LOCAL_CFLAGS :=  $(PV_CFLAGS)
+LOCAL_CFLAGS :=   $(PV_CFLAGS)
 
 
 
diff --git a/nodes/pvclientserversocketnode/include/pvmf_clientserver_socket_node.h b/nodes/pvclientserversocketnode/include/pvmf_clientserver_socket_node.h
index 5094a6707..ef515c4a3 100644
--- a/nodes/pvclientserversocketnode/include/pvmf_clientserver_socket_node.h
+++ b/nodes/pvclientserversocketnode/include/pvmf_clientserver_socket_node.h
@@ -244,7 +244,6 @@ class SocketPortConfig : public OsclMemPoolFixedChunkAllocatorObserver
 /*
 ** Memory pool sizes.
 */
-#define SIMPLE_MEDIA_BUF_CLASS_SIZE 128 /*oscl_mem_aligned_size(sizeof(PVMFSimpleMediaBuffer) + oscl_mem_aligned_size(sizeof(OsclRefCounterSA<SimpleMediaBufferCombinedCleanupSA>)*/
 #define MEDIA_DATA_CLASS_SIZE 128 /*oscl_mem_aligned_size(sizeof(PVMFMediaData)) + oscl_mem_aligned_size(sizeof(OsclRefCounterDA)) + oscl_mem_aligned_size(sizeof(MediaDataCleanupDA)) + sizeof(PVMFMediaMsgHeader))*/
 
 /*
diff --git a/nodes/pvclientserversocketnode/include/pvmf_socket_buffer_allocators.h b/nodes/pvclientserversocketnode/include/pvmf_socket_buffer_allocators.h
index 3a24d7ec5..9f2c2c28f 100644
--- a/nodes/pvclientserversocketnode/include/pvmf_socket_buffer_allocators.h
+++ b/nodes/pvclientserversocketnode/include/pvmf_socket_buffer_allocators.h
@@ -140,6 +140,11 @@ class PVMFSocketBufferCleanupDA : public OsclDestructDealloc
 
         virtual void destruct_and_dealloc(OsclAny* ptr)
         {
+            const uint8* const my_ptr = (uint8*)ptr;
+            const uint aligned_refcnt_size = oscl_mem_aligned_size(sizeof(OsclRefCounterDA));
+            const uint aligned_cleanup_size = oscl_mem_aligned_size(sizeof(PVMFSocketBufferCleanupDA));
+            PVMFMediaDataImpl* media_data_ptr = OSCL_REINTERPRET_CAST(PVMFMediaDataImpl*, (my_ptr + aligned_refcnt_size + aligned_cleanup_size));
+            media_data_ptr->~PVMFMediaDataImpl();
             gen_alloc->deallocate(ptr);
             /*
              * in case there are no outstanding buffers delete the allocator
@@ -1338,6 +1343,12 @@ class PVMFSMSharedBufferAllocWithReSizeCleanupDA : public OsclDestructDealloc
             Oscl_DefAlloc* myalloc = gen_alloc;
             PVMFSMSharedBufferAllocWithReSize* socketDataAllocator =
                 reinterpret_cast<PVMFSMSharedBufferAllocWithReSize*>(myalloc);
+
+            uint8* const my_ptr = (uint8*)ptr;
+            const uint aligned_refcnt_size = oscl_mem_aligned_size(sizeof(OsclRefCounterDA));
+            const uint aligned_cleanup_size = oscl_mem_aligned_size(sizeof(PVMFSMSharedBufferAllocWithReSizeCleanupDA));
+            PVMFMediaDataImpl* media_data_ptr = (PVMFMediaDataImpl*)(my_ptr + aligned_refcnt_size + aligned_cleanup_size);
+            media_data_ptr->~PVMFMediaDataImpl();
             gen_alloc->deallocate(ptr);
 
             uint32 numBuffers = socketDataAllocator->getNumOutStandingBuffers();
diff --git a/nodes/pvclientserversocketnode/src/pvmf_clientserver_socket_node.cpp b/nodes/pvclientserversocketnode/src/pvmf_clientserver_socket_node.cpp
index 5934e83f2..76ef26c8c 100644
--- a/nodes/pvclientserversocketnode/src/pvmf_clientserver_socket_node.cpp
+++ b/nodes/pvclientserversocketnode/src/pvmf_clientserver_socket_node.cpp
@@ -1760,7 +1760,7 @@ void PVMFClientServerSocketNode::HandleRecvComplete(PVMFStatus aStatus, PVMFSock
     if (!aSocketActivity || !iSockConfig->iPVMFPort
             || !iSockConfig->iPVMFPort->IsConnected())
     {
-        OSCL_ASSERT(aStatus != PVMFSuccess);
+        //OSCL_ASSERT(aStatus != PVMFSuccess);
         ReportSocketNodeError(PVMFErrResource, PVMFSocketNodeErrorSocketFailure);
         //release media data
         if (iSockConfig->iPendingRecvMediaData.GetRep())
diff --git a/nodes/pvclientserversocketnode/src/pvmf_clientserver_socket_port.cpp b/nodes/pvclientserversocketnode/src/pvmf_clientserver_socket_port.cpp
index 8669aed8e..74dd19d3b 100644
--- a/nodes/pvclientserversocketnode/src/pvmf_clientserver_socket_port.cpp
+++ b/nodes/pvclientserversocketnode/src/pvmf_clientserver_socket_port.cpp
@@ -174,23 +174,9 @@ void PVMFClientServerSocketPort::setParametersSync(PvmiMIOSession aSession,
     PVLOGGER_LOGMSG(PVLOGMSG_INST_MLDBG, iLogger, PVLOGMSG_INFO, (0, "PVMFClientServerSocketPort::setParametersSync: aSession=0x%x, aParameters=0x%x, num_elements=%d, aRet_kvp=0x%x",
                     aSession, aParameters, num_elements, aRet_kvp));
     OSCL_UNUSED_ARG(aSession);
-    if (!aParameters || (num_elements != 1) ||
-            (pv_mime_strcmp(aParameters->key, PVMF_CLIENTSERVER_SOCKET_PORT_SPECIFIC_ALLOCATOR_VALTYPE) != 0))
-    {
-        aRet_kvp = aParameters;
-        OSCL_LEAVE(OsclErrArgument);
-    }
-    if (aParameters->value.key_specific_value == NULL)
-    {
-        aRet_kvp = aParameters;
-        OSCL_LEAVE(OsclErrArgument);
-    }
-    else
-    {
-        aRet_kvp = NULL;
-        iAllocSharedPtr =
-            *((OsclSharedPtr<PVMFSharedSocketDataBufferAlloc>*)(aParameters->value.key_specific_value));
-    }
+    OSCL_UNUSED_ARG(aParameters);
+    OSCL_UNUSED_ARG(num_elements);
+    OSCL_UNUSED_ARG(aRet_kvp);
 }