"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."

Modified by: saleem.adookkattil at nokia.com

Reviewed by:

Date: 03/15/2010

Project: symbian_client_apps

ErrorId: JLIU-83KSEU

Synopsis: DRM protected 3gp file parsing failure.

Overview:

DRM protected 3gp file parsing is failing due to a change in MP4 file format project (qtffplin.cpp) made recently.
Function call retVal = m_pAtomizer->Atomize(); changed to retVal = m_pAtomizer->Atomize(0, m_ulFileSize);
When we pass the file size as the second parameter, DRM file parsing is failing in void CompleteAtomization(HX_RESULT status) method of CAtomizer with error code HXR_CORRUPT_FILE.
Removed the condition (m_ullFinalOffset != ATOMIZE_ALL) && (m_ullFinalOffset != m_ullCurrentOffset) from IF statement as given in the diff to fix the error.

Files modified:

cvsroot\datatype\mp4\fileformat\atomizer.cpp

Files added:

Image Size and Heap Use impact: None.

Module Release testing (STIF) : Yes

Test case(s) Added  : No

Memory leak check performed : Yes

Platforms and Profiles Build Verified: helix-client-symbian-4

Platforms and Profiles Functionality verified: armv5, winscw

Branch: 4_2_0_brizo, HEAD

Index: atomizer.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/atomizer.cpp,v
retrieving revision 1.23.4.2
diff -u -w -r1.23.4.2 atomizer.cpp
--- atomizer.cpp        23 Dec 2009 22:41:02 -0000      1.23.4.2
+++ atomizer.cpp        15 Mar 2010 00:57:06 -0000
@@ -574,9 +574,7 @@
         }

        // See if parsing fully completed
-       if (((m_ullFinalOffset != ATOMIZE_ALL) &&
-            (m_ullFinalOffset != m_ullCurrentOffset)) ||
-           (m_pRoot != m_pCurrentRoot))
+       if (m_pRoot != m_pCurrentRoot)
        {
            status = HXR_CORRUPT_FILE;
        }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100315/ae77b896/attachment.html