Update of /cvsroot/common/system/platform/symbian
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv4087

Modified Files:
	symbianrecognizer.cpp 
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with RealNetworks, and I am authorized to contribute this code under said agreement."

Modified by:  yury.ramanovich at nokia.com

Reviewed by: ashish.as.gupta at nokia.com, ehyche at real.com

Date: 04/27/2009

Project: SymbianMmf_wm 

ErrorId: ESMA-7R6D5B ou1cimx1#126199

Synopsis:  adding support for MSNV brand in mp4 files

Overview:  mp4 files with MSNV  brand didn’t play in helix, because MSNV brand was not recognized by mp4 file format.

Solution:  adding MSNV brand recognition to mp4 file format, symbianrecognizer.cpp and helix plugin .rss file. 
Also add recognition of 3gp4, and 3gp5 and avc1 major brands to symbianrecognizer.cpp since helix plugin already claims this support in the .rss file
  
Files Added: 
none.


Files Modified: 
clientapps/symbianMmf/videocontroller/101F8513.rss   
common/system/platform/symbian/symbianrecognizer.cpp 
datatype/mp4/fileformat/qttrkmgr.cpp                 
datatype/mp4/fileformat/pub/qtatoms.h

 

Image Size and Heap Use impact: minor

Module Release testing (STIF) :  MRT subset passed

Test case(s) Added  :  No.

Memory leak check performed : Yes. No new leaks introduced 

Platforms and Profiles Build Verified: helix-client-s60-50-mmf-mdf-dsp,
helix-client-s60-50-mmf-mdf-arm

Platforms and Profiles Functionality verified: armv5, winscw 

Branch: 223Cays, 210CayS, HEAD


Index: symbianrecognizer.cpp
===================================================================
RCS file: /cvsroot/common/system/platform/symbian/symbianrecognizer.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- symbianrecognizer.cpp	15 Apr 2009 20:05:43 -0000	1.12
+++ symbianrecognizer.cpp	27 Apr 2009 17:03:25 -0000	1.13
@@ -38,6 +38,8 @@
     _LIT8(K3GPRel6 , "ftyp3gp6" );  // Release 6
     _LIT8(K3GPProg , "ftyp3gr6" );  // Progressive Download.
     _LIT8(K3GPStrm , "ftyp3gs6" );  // streaming
+    _LIT8(K3GPRel4 , "ftyp3gp4" );  // Release 4
+    _LIT8(K3GPRel5 , "ftyp3gp5" );  // Release 5
     _LIT8(KMP4Type , "ftypmp4"  );  // mp4 format
     _LIT8(KM4AType , "ftypM4A"  );  // mp4 audio
     _LIT8(KM4VType , "ftypM4V"  );  // mp4 video
@@ -45,6 +47,8 @@
     _LIT8(KMmp4Type ,"ftypmmp4" );  // mp4 format
     _LIT8(KIsomType ,"ftypisom" );  // isom format
     _LIT8(KMp42Type ,"ftypmp42" );  // mp42 format
+    _LIT8(KMSNVType ,"ftypMSNV" );  // mp4 MSNV format
+    _LIT8(KAvc1Type ,"ftypavc1" );  // avc1 format
 
     // mime types can be returned
     _LIT8(K3GPPVideo    ,  "video/3gpp"   );  
@@ -70,12 +74,16 @@
         || buffer.FindF(K3GPRel6) != KErrNotFound
         || buffer.FindF(K3GPProg) != KErrNotFound
         || buffer.FindF(K3GPStrm) != KErrNotFound
+        || buffer.FindF(K3GPRel4) != KErrNotFound
+        || buffer.FindF(K3GPRel5) != KErrNotFound		
        )
     {
         type = TDataType(K3GPPVideo);
     }
     else if(buffer.FindF(KMP4Type) != KErrNotFound || buffer.FindF(KMmp4Type) != KErrNotFound
-    				|| buffer.FindF(KIsomType) != KErrNotFound || buffer.FindF(KMp42Type) != KErrNotFound || buffer.FindF(KM4VType) != KErrNotFound )
+    				|| buffer.FindF(KIsomType) != KErrNotFound || buffer.FindF(KMp42Type) != KErrNotFound || buffer.FindF(KM4VType) != KErrNotFound
+                    || buffer.FindF(KMSNVType) != KErrNotFound
+                    || buffer.FindF(KAvc1Type) != KErrNotFound)
     {
         type = TDataType(KMP4Video);
     }