[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] wm/fileformat/pub asf_file_format_file.h, 1.5.10.3,
From:       zlin () helixcommunity ! org
Date:       2011-03-30 10:15:08
Message-ID: 201103301015.p2UAF0Oj020009 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/datatype/wm/fileformat/pub
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv26820

Modified Files:
      Tag: hxclient_3_6_5_atlas
	asf_file_format_file.h 
Log Message:
Fix for 12505

Bug Number: 12727

Bug URL:  https://bugs.helixcommunity.org/show_bug.cgi?id=12727

Synopsis: when scaning this wmv video for thumbnail, lead the system to block and pop \
up a dialog box show that the system is scanning video file.

Overview: For some buggy wmv file, the index object in the tail of file is broken, so \
when trying to get the index object, Helix client will drop into a loop forever. This \
fix is to break this forever loop when the calced object type is unknown and object \
size is 0.

Files Modified:
asf_file_format_file.cpp


Index: asf_file_format_file.h
===================================================================
RCS file: /cvsroot/datatype/wm/fileformat/pub/asf_file_format_file.h,v
retrieving revision 1.5.10.3
retrieving revision 1.5.10.3.18.1
diff -u -d -r1.5.10.3 -r1.5.10.3.18.1
--- asf_file_format_file.h	4 Dec 2009 17:05:31 -0000	1.5.10.3
+++ asf_file_format_file.h	30 Mar 2011 10:15:05 -0000	1.5.10.3.18.1
@@ -145,6 +145,7 @@
         kStateSeekIndexObjectSeekDonePending,
         kStateSeekIndexObjectHeaderReadDonePending,
         kStateSeekIndexObjectBodyReadDonePending,
+        kStateSeekStartIndexBuildDonePending,
         kNumStates
     };
 
@@ -194,7 +195,9 @@
     HX_RESULT                    AddASFObjectToList(CHXASFObject* pObj);
     void                         ClearASFObjectList();
     HX_RESULT                    GetASFObjectBytesToRead(HX_ASF_Object_Type eType, \
                UINT64 ullSize, REF(UINT32) rulBytes);
-    HX_RESULT                    SendFileHeader();
+    HX_RESULT                    BuildIndex();
+    HX_RESULT                    BuildIndexDone();
+    HX_RESULT                    SendFileHeader(HX_RESULT status);
     HX_RESULT                    SetupStreamObjects();
     HX_RESULT                    BuildStreamNumberMaps();
     void                         ClearStreamPropertiesMap();


_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs


[prev in list] [next in list] [prev in thread] [next in thread]