commit 2a7b6d0e99915da7c5166076ad4ce77f020d1a6f
author Android (Google) Code Review <android-gerrit@google.com> Tue Nov 03 15:28:11 2009 -0500
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 03 15:28:11 2009 -0500
tree ff5adb8e9de5a9003bf4e338bdab57863e668a64
parent f278fef2c7c4c802c1e18af4daafacfcc46ac3ae
parent 024bce9271a073aa0078874317e7a3ca8297cca6

Merge change I024bce92 into eclair

* changes:
  DO NOT MERGE TO MR2 2182157 Fix for [RIO-7730] valgrind errors in opencore (cherry picked from commit 806a89c8e5e12bc3c08beee22be7450140c46e9a)

android/playerdriver.cpp

diff --git a/android/playerdriver.cpp b/android/playerdriver.cpp
index 092ba83..ff849af 100644
--- a/android/playerdriver.cpp
+++ b/android/playerdriver.cpp
@@ -329,7 +329,8 @@
         mSeekPending(false),
         mIsLiveStreaming(false),
         mEmulation(false),
-        mContentLengthKnown(false)
+        mContentLengthKnown(false),
+        mLastBufferingLog(0)
 {
     LOGV("constructor");
     mSyncSem = new OsclSemaphore();

fileformats/mp4/parser/src/assetinfoatoms.cpp

diff --git a/fileformats/mp4/parser/src/assetinfoatoms.cpp b/fileformats/mp4/parser/src/assetinfoatoms.cpp
index 1214361..a1adfac 100644
--- a/fileformats/mp4/parser/src/assetinfoatoms.cpp
+++ b/fileformats/mp4/parser/src/assetinfoatoms.cpp
@@ -752,17 +752,17 @@
     {
         if (_pLocationStruct->_location_name != NULL)
         {
-            PV_MP4_FF_DELETE(NULL, oscl_wchar, _pLocationStruct->_location_name);
+            PV_MP4_ARRAY_DELETE(NULL, _pLocationStruct->_location_name);
             _pLocationStruct->_location_name = NULL;
         }
         if (_pLocationStruct->_astronomical_body != NULL)
         {
-            PV_MP4_FF_DELETE(NULL, oscl_wchar, _pLocationStruct->_astronomical_body);
+            PV_MP4_ARRAY_DELETE(NULL, _pLocationStruct->_astronomical_body);
             _pLocationStruct->_astronomical_body = NULL;
         }
         if (_pLocationStruct->_additional_notes != NULL)
         {
-            PV_MP4_FF_DELETE(NULL, oscl_wchar, _pLocationStruct->_additional_notes);
+            PV_MP4_ARRAY_DELETE(NULL, _pLocationStruct->_additional_notes);
             _pLocationStruct->_additional_notes = NULL;
         }
     }

nodes/pvdownloadmanagernode/include/pvmf_memorybufferdatastream_factory.h

diff --git a/nodes/pvdownloadmanagernode/include/pvmf_memorybufferdatastream_factory.h b/nodes/pvdownloadmanagernode/include/pvmf_memorybufferdatastream_factory.h
index 025ee7a..7069ddc 100644
--- a/nodes/pvdownloadmanagernode/include/pvmf_memorybufferdatastream_factory.h
+++ b/nodes/pvdownloadmanagernode/include/pvmf_memorybufferdatastream_factory.h
@@ -611,6 +611,15 @@
             uint32 iNewFilePosition;
 
             bool iFlushCache;
+
+            RepositionRequestStruct():
+                iOutstanding(false),
+                iRequestCompleted(false),
+                iSuccess(PVDS_FAILURE),
+                iRepositionSessionID(-1),
+                iNewFilePosition(0),
+                iFlushCache(false)
+            {}
         };
 
         struct ReadFilePositionStruct