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

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] avi/fileformat avistrm.cpp, 1.10.2.13.2.25,
From:       zlin () helixcommunity ! org
Date:       2011-10-27 9:38:05
[Download RAW message or body]

Update of /cvsroot/datatype/avi/fileformat
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv16314

Modified Files:
      Tag: hxclient_3_6_1_atlas
	avistrm.cpp 
Log Message:
Modified by:zlin@real.com
Date: 10/11/2011
Project: RealPlayer for Android Smartphones
Synopsis:Add DTS and AC3 for avi fileformat

Overview:According to the requirements for Lenovo,the playback of avi which contains \
DTS and AC3 should be supported.Therefore,add relevant mime types to AVI \
fileformat(NOTE:Some format tag defined in the file seems wrong and update them all \
to fulfill customers' requirments). Meanwhile,the content has video type x264,add it \
as well.

Files Added:
None

Files Modified:
datatype/avi/fileformat/avistrm.cpp

Image Size and Heap Use impact (Client -Only): None

Platforms and Profiles Affected:
Platform: android-2.3-arm-smdk_c110
Profile: helix-client-android-LePhoneTD-C110

Distribution Libraries Affected:None

Distribution library impact and planned action:None

Platforms and Profiles Build Verified:
Platform: android-2.3-arm-smdk_c110
Profile: helix-client-android-LePhoneTD-C110

Platforms and Profiles Functionality verified:
Platform: android-2.3-arm-smdk_c110
Profile: helix-client-android-LePhoneTD-C110

Branch: 361atlas


Index: avistrm.cpp
===================================================================
RCS file: /cvsroot/datatype/avi/fileformat/avistrm.cpp,v
retrieving revision 1.10.2.13.2.25
retrieving revision 1.10.2.13.2.26
diff -u -d -r1.10.2.13.2.25 -r1.10.2.13.2.26
--- avistrm.cpp	27 Oct 2011 07:43:57 -0000	1.10.2.13.2.25
+++ avistrm.cpp	27 Oct 2011 09:38:02 -0000	1.10.2.13.2.26
@@ -127,7 +127,6 @@
 #define  WAVE_FORMAT_IBM_CVSD                   0x0005 /* IBM Corporation */
 #define  WAVE_FORMAT_ALAW                       0x0006 /* Microsoft Corporation */
 #define  WAVE_FORMAT_MULAW                      0x0007 /* Microsoft Corporation */
-#define  WAVE_FORMAT_DTS                        0x0008 /* Microsoft Corporation */
 #define  WAVE_FORMAT_OKI_ADPCM                  0x0010 /* OKI */
 #define  WAVE_FORMAT_DVI_ADPCM                  0x0011 /* Intel Corporation */
 #define  WAVE_FORMAT_IMA_ADPCM                  (WAVE_FORMAT_DVI_ADPCM) /*  Intel \
Corporation */ @@ -246,7 +245,8 @@
 #define  WAVE_FORMAT_LH_CODEC                   0x1100 /* Lernout & Hauspie */
 #define  WAVE_FORMAT_NORRIS                     0x1400 /* Norris Communications, \
Inc. */  #define  WAVE_FORMAT_SOUNDSPACE_MUSICOMPRESS    0x1500 /* AT&T Labs, Inc. */
-#define  WAVE_FORMAT_DVM                        0x2000 /* FAST Multimedia AG */
+#define  WAVE_FORMAT_AC3                        0x2000 /* Dolby Surround Digital \
Audio Coding-3 */ +#define  WAVE_FORMAT_DTS                        0x2001 /* Digital \
Theater Systems (DTS) audio. */  #define  WAVE_FORMAT_EXTENSIBLE                 \
0xFFFE /* Microsoft */  #define  WAVE_FORMAT_DEVELOPMENT                0xFFFF /* new \
wave formats in development */  #define  WAVE_FORMAT_AAC                        \
0x00FF  @@ -263,6 +263,7 @@
 #define  VIDEO_FORMAT_div3 HX_MAKE4CC('3', 'v', 'i', 'd')
 #define  VIDEO_FORMAT_H264 HX_MAKE4CC('4', '6', '2', 'H')
 #define  VIDEO_FORMAT_h264 HX_MAKE4CC('4', '6', '2', 'h') 
+#define  VIDEO_FORMAT_x264 HX_MAKE4CC('4', '6', '2', 'x')
 #define  VIDEO_FORMAT_AVC1 HX_MAKE4CC('1', 'C', 'V', 'A')
 #define  VIDEO_FORMAT_avc1 HX_MAKE4CC('1', 'c', 'v', 'a') 
 #define  VIDEO_FORMAT_FMP4 HX_MAKE4CC('4', 'P', 'M', 'F')
@@ -771,6 +772,7 @@
                         }
                         else if ((m_header.ulHandler == VIDEO_FORMAT_H264) ||
                                         (m_header.ulHandler == VIDEO_FORMAT_h264) || \
 +                                        (m_header.ulHandler == VIDEO_FORMAT_x264) \
                ||
                                         (m_header.ulHandler == VIDEO_FORMAT_AVC1) || \
                
                                         (m_header.ulHandler == VIDEO_FORMAT_avc1))
                         {
@@ -1024,6 +1026,16 @@
                                 pWaveInfo->usBitsPerSample = 16;
                             }
                             break;
+                        case WAVE_FORMAT_DTS:
+                                {
+                                    pMimeType = "audio/dts";
+                                }
+                                break;
+                        case WAVE_FORMAT_AC3:
+                                {
+                                    pMimeType = "audio/AC3";
+                                }
+                                break;
                         default:
                             {
                                 pMimeType = szMimeTypeACM;


_______________________________________________
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]