OSDN Git Service

RIO-8381: Revert "Addition of DLNA specific 'byte-seek' support for Pause/Resume...
authorPacketVideo CM <engbuild@pv.com>
Thu, 7 Jan 2010 23:10:50 +0000 (15:10 -0800)
committerPacketVideo CM <engbuild@pv.com>
Thu, 7 Jan 2010 23:10:50 +0000 (15:10 -0800)
engines/2way/src/pv_2way_sdkinfo.h
engines/author/src/pv_author_sdkinfo.h
engines/player/src/pv_player_sdkinfo.h
nodes/pvmp4ffparsernode/src/pvmf_mp4ffparser_node.cpp

index b5fac04..bf9514f 100644 (file)
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PV2WAY_ENGINE_SDKINFO_LABEL "1162806"
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1162934"
 #define PV2WAY_ENGINE_SDKINFO_DATE 0x20100104
 
 #endif //PV_2WAY_SDKINFO_H_INCLUDED
index adb9014..e962ebb 100644 (file)
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1162806"
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1162934"
 #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100104
 
 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED
index dd18941..11ccb5b 100644 (file)
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVPLAYER_ENGINE_SDKINFO_LABEL "1162806"
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1162934"
 #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100104
 
 #endif //PV_PLAYER_SDKINFO_H_INCLUDED
index ddbb238..806ff07 100644 (file)
@@ -2406,12 +2406,10 @@ PVMFStatus PVMFMP4FFParserNode::DoSetDataSourcePosition()
             {
                 /*This means engine is trying to start the playback session at a non-zero NPT.
                 In case of PPB, this is not possible if server does not support byte-seek. */
-                PVMF_BASE_NODE_ARRAY_DELETE(trackList);
                 return PVMFFailure;
             }
             else
             {
-                PVMF_BASE_NODE_ARRAY_DELETE(trackList);
                 return PVMFErrNotSupported;
             }
         }
@@ -2419,10 +2417,7 @@ PVMFStatus PVMFMP4FFParserNode::DoSetDataSourcePosition()
         if (iDataStreamInterface->QueryBufferingCapacity() == 0)
         {
             if (!iDownloadComplete)
-            {
-                PVMF_BASE_NODE_ARRAY_DELETE(trackList);
                 return PVMFErrNotSupported;
-            }
         }
     }
 
@@ -2702,7 +2697,6 @@ PVMFStatus PVMFMP4FFParserNode::DoSetDataSourcePosition()
     {
         PVLOGGER_LOGMSG(PVLOGMSG_INST_HLDBG, iLogger, PVLOGMSG_ERR,
                         (0, "PVMFMP4FFParserNode::DoSetDataSourcePosition() Memory alloc for array to keep the timestamp of the samples failed"));
-        PVMF_BASE_NODE_ARRAY_DELETE(trackList);
         OSCL_FREE(trackTSAfterRepo);
         trackTSAfterRepo = NULL;
         OSCL_FREE(retValPerTrack);