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

List:       helix-datatype-dev
Subject:    [datatype-dev] CR: Change Helix internal WM audio/video mimetypes
From:       <Eero.Jyske () nokia ! com>
Date:       2007-04-25 0:59:03
Message-ID: 73FFFC8A49173C4B84C3A466E633A6BF03CB3897 () daebe102 ! NOE ! Nokia ! com
[Download RAW message or body]

--===============1289445419==
Content-class: urn:content-classes:message
Content-Type: multipart/alternative;
	boundary="----_=_NextPart_001_01C786D4.EDB4AA5A"

This is a multi-part message in MIME format.


"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:  eero.jyske@nokia.com

Reviewed by:

Date: 4/24/2007

Project: SymbianMmf_wm

ErrorId:  ECTN-72FJXA

Synopsis: CR: Change Helix internal WM audio/video mimetypes

Common Code changes: 

Windows media uses internally the following mimetypes:
application/vnd.rn-wmv application/vnd.rn-wma.
This causes a problem as in number of locations the mimetype is checked
for being either audio or video.
The recognition is based on the mimetype having either "audio" or
"video" as the first five characters.
Fix is to change the mimetypes to:

Old                                      New
----------------------------------------------------
application/vnd.rn-wma               audio/x-hx-wma
application/vnd.rn-wmv               video/x-hx-wmv

and we'll leave these the same:

application/vnd.rn-wm-script
application/vnd.rn-wm-image       
application/vnd.rn-wm-filetransfer
application/vnd.rn-wm-binary

Root Cause of the problem:  Bug fix

 
Files Modified:
/datatype/wm/fileformat/asf_file_format_file.cpp
/datatype/wm/fileformat/platform/win32/hxwmreader.cpp
/datatype/wm/audio/renderer/wmarender.cpp
/datatype/wm/video/renderer/wmvrender.cpp
/datatype/mdf/video/format/wmv/mdfwmvpayloadformat.cpp


Files Added:

None

Image Size and Heap Use impact: No significant change.

Module Release testing (STIF) :  N/A - Will be done once the WM support
is enabled.

Test case(s) Added  :  N/A - Will be added once the WM support is
enabled.

Memory leak check performed : Yes No new leaks introduced

Platforms and Profiles Build Verified: helix-client-s60-32-mmf-mdf-arm

Platforms and Profiles Functionality verified: armv5, winscw 

      Branch: 210CayS, HEAD

Index: asf_file_format_file.cpp
===================================================================
RCS file: /cvsroot/datatype/wm/fileformat/asf_file_format_file.cpp,v
retrieving revision 1.5.4.2
diff -u -w -r1.5.4.2 asf_file_format_file.cpp
--- asf_file_format_file.cpp	24 Apr 2007 19:42:10 -0000	1.5.4.2
+++ asf_file_format_file.cpp	24 Apr 2007 21:27:25 -0000
@@ -70,8 +70,8 @@
 const char* const CASFFileFormatFile::m_ppszFileExtensions[] = {"asf",
"wma", "wmv", NULL};
 const char* const CASFFileFormatFile::m_ppszFileOpenNames[]  =
{"Windows Media Files (*.asf,*.wma,*.wmv)", NULL};
 
-const char* const
CASFFileFormatFile::m_ppszStreamMimeType[HX_ASF_Num_Stream_Types - 1] =
{"application/vnd.rn-wma",
-
"application/vnd.rn-wmv",
+const char* const
CASFFileFormatFile::m_ppszStreamMimeType[HX_ASF_Num_Stream_Types - 1] =
{"audio/x-hx-wma",
+
"video/x-hx-wmv",
 
"application/vnd.rn-wm-script",
 
"application/vnd.rn-wm-image",
 
"application/vnd.rn-wm-image",



Index: hxwmreader.cpp
===================================================================
RCS file:
/cvsroot/datatype/wm/fileformat/platform/win32/hxwmreader.cpp,v
retrieving revision 1.3
diff -u -w -r1.3 hxwmreader.cpp
--- hxwmreader.cpp	15 Jun 2006 14:32:55 -0000	1.3
+++ hxwmreader.cpp	24 Apr 2007 21:28:27 -0000
@@ -134,8 +134,8 @@
     "WMT_PROXIMITY_COMPLETED"           //  = 50
 };
 
-const char* const CHXWMReader::m_ppszStreamMimeTypes[] =
{"application/vnd.rn-wmv",
-
"application/vnd.rn-wma",
+const char* const CHXWMReader::m_ppszStreamMimeTypes[] =
{"video/x-hx-wmv",
+
"audio/x-hx-wma",
 
"application/vnd.rn-wm-script",
 
"application/vnd.rn-wm-filetransfer",
 
"application/vnd.rn-wm-image",




Index: wmarender.cpp
===================================================================
RCS file: /cvsroot/datatype/wm/audio/renderer/wmarender.cpp,v
retrieving revision 1.1.1.1
diff -u -w -r1.1.1.1 wmarender.cpp
--- wmarender.cpp	4 May 2006 20:45:19 -0000	1.1.1.1
+++ wmarender.cpp	24 Apr 2007 21:29:06 -0000
@@ -59,7 +59,7 @@
 #define WMA_CODEC_NAME      "Windows Media Audio 9"
 
 const char* const CWMAudioRenderer::m_pszDescription       = "Helix
Windows Media Audio Renderer Plugin";
-const char* const CWMAudioRenderer::m_ppszStreamMimeType[] =
{"application/vnd.rn-wma", NULL};
+const char* const CWMAudioRenderer::m_ppszStreamMimeType[] =
{"audio/x-hx-wma", NULL};
 
 CWMAudioRenderer::CWMAudioRenderer(void)
 {



Index: wmvrender.cpp
===================================================================
RCS file: /cvsroot/datatype/wm/video/renderer/wmvrender.cpp,v
retrieving revision 1.1.1.1
diff -u -w -r1.1.1.1 wmvrender.cpp
--- wmvrender.cpp	4 May 2006 20:45:41 -0000	1.1.1.1
+++ wmvrender.cpp	24 Apr 2007 21:29:46 -0000
@@ -63,7 +63,7 @@
 #define HX_WMV_RENDERER_NAME   "Windows Media Video"
 
 const char* const CWMVideoRenderer::m_pszDescription        =
"RealNetworks MPEG-4 Video Renderer Plugin";
-const char* const CWMVideoRenderer::m_ppszStreamMimeTypes[] =
{"application/vnd.rn-wmv", NULL};
+const char* const CWMVideoRenderer::m_ppszStreamMimeTypes[] =
{"video/x-hx-wmv", NULL};
 
 
 CWMVideoRenderer::CWMVideoRenderer(void)



Index: mdfwmvpayloadformat.cpp
===================================================================
RCS file:
/cvsroot/datatype/mdf/video/format/wmv/mdfwmvpayloadformat.cpp,v
retrieving revision 1.1.2.1
diff -u -w -r1.1.2.1 mdfwmvpayloadformat.cpp
--- mdfwmvpayloadformat.cpp	23 Apr 2007 18:16:30 -0000	1.1.2.1
+++ mdfwmvpayloadformat.cpp	24 Apr 2007 21:30:36 -0000
@@ -372,7 +372,7 @@
 void CWMVPayloadFormatPluginDevice::SetVideoMimetypes(
CPayloadFormatInfo& aPayloadFormatInfo ) const
 {
     MDFVIDEOLOG_ENTERFN( "SetVideoMimetypes" );
-    _LIT8( KVideoMimeTypeRNWMV, "application/vnd.rn-wmv" );
+    _LIT8( KVideoMimeTypeRNWMV, "video/x-hx-wmv" );
     _LIT8( KVideoMimeTypeVC1, "video/vc1" );
     _LIT8( KVideoMimeTypeWMV, "video/x-ms-wmv" );
 






[Attachment #3 (text/html)]

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=us-ascii">
<META NAME="Generator" CONTENT="MS Exchange Server version 6.5.7652.9">
<TITLE>CR: Change Helix internal WM audio/video mimetypes</TITLE>
</HEAD>
<BODY>
<!-- Converted from text/rtf format -->

<P><FONT SIZE=2 FACE="Courier New">&quot;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.&quot;</FONT></P>

<P><FONT SIZE=2 FACE="Courier New">Modified by:&nbsp; eero.jyske@nokia.com</FONT>
</P>

<P><FONT SIZE=2 FACE="Courier New">Reviewed by:</FONT>
</P>

<P><FONT SIZE=2 FACE="Courier New">Date: 4/24/2007</FONT>
</P>

<P><FONT SIZE=2 FACE="Courier New">Project: SymbianMmf_wm</FONT>
</P>

<P><FONT SIZE=2 FACE="Courier New">ErrorId:&nbsp; ECTN-72FJXA</FONT>
</P>

<P><FONT SIZE=2 FACE="Courier New">Synopsis: CR: Change Helix internal WM audio/video \
mimetypes</FONT> </P>

<P><FONT SIZE=2 FACE="Courier New">Common Code changes: </FONT>
</P>

<P><FONT SIZE=2 FACE="Courier New">Windows media uses internally the following \
mimetypes: application/vnd.rn-wmv application/vnd.rn-wma.</FONT>

<BR><FONT SIZE=2 FACE="Courier New">This causes a problem as in number of locations \
the mimetype is checked for being either audio or video.</FONT>

<BR><FONT SIZE=2 FACE="Courier New">The recognition is based on the mimetype having \
either &quot;audio&quot; or &quot;video&quot; as the first five characters.</FONT>

<BR><FONT SIZE=2 FACE="Courier New">Fix is to change the mimetypes to:</FONT>
</P>

<P><FONT SIZE=2 FACE="Courier \
New">Old&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
New</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">----------------------------------------------------</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">application/vnd.rn-wma&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
audio/x-hx-wma</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">application/vnd.rn-wmv&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
video/x-hx-wmv</FONT> </P>

<P><FONT SIZE=2 FACE="Courier New">and we'll leave these the same:</FONT>
</P>

<P><FONT SIZE=2 FACE="Courier New">application/vnd.rn-wm-script</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">application/vnd.rn-wm-image&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </FONT>

<BR><FONT SIZE=2 FACE="Courier New">application/vnd.rn-wm-filetransfer</FONT>

<BR><FONT SIZE=2 FACE="Courier New">application/vnd.rn-wm-binary</FONT>
</P>

<P><FONT SIZE=2 FACE="Courier New">Root Cause of the problem:&nbsp; Bug fix</FONT>
</P>

<P><FONT SIZE=2 FACE="Courier New">&nbsp;</FONT>

<BR><FONT SIZE=2 FACE="Courier New">Files Modified:</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">/datatype/wm/fileformat/asf_file_format_file.cpp</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">/datatype/wm/fileformat/platform/win32/hxwmreader.cpp</FONT>

<BR><FONT SIZE=2 FACE="Courier New">/datatype/wm/audio/renderer/wmarender.cpp</FONT>

<BR><FONT SIZE=2 FACE="Courier New">/datatype/wm/video/renderer/wmvrender.cpp</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">/datatype/mdf/video/format/wmv/mdfwmvpayloadformat.cpp</FONT> </P>
<BR>

<P><FONT SIZE=2 FACE="Courier New">Files Added:</FONT>
</P>

<P><FONT SIZE=2 FACE="Courier New">None</FONT>
</P>

<P><FONT SIZE=2 FACE="Courier New">Image Size and Heap Use impact: No significant \
change.</FONT> </P>

<P><FONT SIZE=2 FACE="Courier New">Module Release testing (STIF) :&nbsp; N/A - Will \
be done once the WM support is enabled.</FONT> </P>

<P><FONT SIZE=2 FACE="Courier New">Test case(s) Added&nbsp; :&nbsp; N/A - Will be \
added once the WM support is enabled.</FONT> </P>

<P><FONT SIZE=2 FACE="Courier New">Memory leak check performed : Yes No new leaks \
introduced</FONT> </P>

<P><FONT SIZE=2 FACE="Courier New">Platforms and Profiles Build Verified: \
helix-client-s60-32-mmf-mdf-arm</FONT> </P>

<P><FONT SIZE=2 FACE="Courier New">Platforms and Profiles Functionality verified: \
armv5, winscw </FONT> </P>

<P><FONT SIZE=2 FACE="Courier New">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Branch: 210CayS, \
HEAD</FONT> </P>

<P><FONT SIZE=2 FACE="Courier New">Index: asf_file_format_file.cpp</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">===================================================================</FONT>

<BR><FONT SIZE=2 FACE="Courier New">RCS file: \
/cvsroot/datatype/wm/fileformat/asf_file_format_file.cpp,v</FONT>

<BR><FONT SIZE=2 FACE="Courier New">retrieving revision 1.5.4.2</FONT>

<BR><FONT SIZE=2 FACE="Courier New">diff -u -w -r1.5.4.2 \
asf_file_format_file.cpp</FONT>

<BR><FONT SIZE=2 FACE="Courier New">--- asf_file_format_file.cpp&nbsp;&nbsp;&nbsp; 24 \
Apr 2007 19:42:10 -0000&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 1.5.4.2</FONT>

<BR><FONT SIZE=2 FACE="Courier New">+++ asf_file_format_file.cpp&nbsp;&nbsp;&nbsp; 24 \
Apr 2007 21:27:25 -0000</FONT>

<BR><FONT SIZE=2 FACE="Courier New">@@ -70,8 +70,8 @@</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;const char* const \
CASFFileFormatFile::m_ppszFileExtensions[] = {&quot;asf&quot;, &quot;wma&quot;, \
&quot;wmv&quot;, NULL};</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;const char* const \
CASFFileFormatFile::m_ppszFileOpenNames[]&nbsp; = {&quot;Windows Media Files \
(*.asf,*.wma,*.wmv)&quot;, NULL};</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;</FONT>

<BR><FONT SIZE=2 FACE="Courier New">-const char* const \
CASFFileFormatFile::m_ppszStreamMimeType[HX_ASF_Num_Stream_Types - 1] = \
{&quot;application/vnd.rn-wma&quot;,</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&n \
bsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbs \
p;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&n \
bsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbs \
p;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
&quot;application/vnd.rn-wmv&quot;,</FONT>

<BR><FONT SIZE=2 FACE="Courier New">+const char* const \
CASFFileFormatFile::m_ppszStreamMimeType[HX_ASF_Num_Stream_Types - 1] = \
{&quot;audio/x-hx-wma&quot;,</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&n \
bsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbs \
p;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&n \
bsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbs \
p;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
&quot;video/x-hx-wmv&quot;,</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb \
sp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp \
;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;& \
nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb \
sp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp \
;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
&quot;application/vnd.rn-wm-script&quot;,</FONT></P>

<P><FONT SIZE=2 FACE="Courier \
New">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb \
sp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp \
;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;& \
nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb \
sp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp \
;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
&quot;application/vnd.rn-wm-image&quot;,</FONT></P>

<P><FONT SIZE=2 FACE="Courier \
New">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb \
sp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp \
;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;& \
nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb \
sp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp \
;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
&quot;application/vnd.rn-wm-image&quot;,</FONT></P> <BR>
<BR>

<P><FONT SIZE=2 FACE="Courier New">Index: hxwmreader.cpp</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">===================================================================</FONT>

<BR><FONT SIZE=2 FACE="Courier New">RCS file: \
/cvsroot/datatype/wm/fileformat/platform/win32/hxwmreader.cpp,v</FONT>

<BR><FONT SIZE=2 FACE="Courier New">retrieving revision 1.3</FONT>

<BR><FONT SIZE=2 FACE="Courier New">diff -u -w -r1.3 hxwmreader.cpp</FONT>

<BR><FONT SIZE=2 FACE="Courier New">--- hxwmreader.cpp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
15 Jun 2006 14:32:55 -0000&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 1.3</FONT>

<BR><FONT SIZE=2 FACE="Courier New">+++ hxwmreader.cpp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
24 Apr 2007 21:28:27 -0000</FONT>

<BR><FONT SIZE=2 FACE="Courier New">@@ -134,8 +134,8 @@</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;&nbsp;&nbsp;&nbsp; \
&quot;WMT_PROXIMITY_COMPLETED&quot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
//&nbsp; = 50</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;};</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;</FONT>

<BR><FONT SIZE=2 FACE="Courier New">-const char* const \
CHXWMReader::m_ppszStreamMimeTypes[] = {&quot;application/vnd.rn-wmv&quot;,</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&n \
bsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbs \
p;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
&quot;application/vnd.rn-wma&quot;,</FONT>

<BR><FONT SIZE=2 FACE="Courier New">+const char* const \
CHXWMReader::m_ppszStreamMimeTypes[] = {&quot;video/x-hx-wmv&quot;,</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&n \
bsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbs \
p;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
&quot;audio/x-hx-wma&quot;,</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb \
sp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp \
;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;& \
nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
&quot;application/vnd.rn-wm-script&quot;,</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb \
sp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp \
;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;& \
nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
&quot;application/vnd.rn-wm-filetransfer&quot;,</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb \
sp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp \
;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;& \
nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; \
&quot;application/vnd.rn-wm-image&quot;,</FONT> </P>
<BR>
<BR>
<BR>

<P><FONT SIZE=2 FACE="Courier New">Index: wmarender.cpp</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">===================================================================</FONT>

<BR><FONT SIZE=2 FACE="Courier New">RCS file: \
/cvsroot/datatype/wm/audio/renderer/wmarender.cpp,v</FONT>

<BR><FONT SIZE=2 FACE="Courier New">retrieving revision 1.1.1.1</FONT>

<BR><FONT SIZE=2 FACE="Courier New">diff -u -w -r1.1.1.1 wmarender.cpp</FONT>

<BR><FONT SIZE=2 FACE="Courier New">--- \
wmarender.cpp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 4 May 2006 20:45:19 \
-0000&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 1.1.1.1</FONT>

<BR><FONT SIZE=2 FACE="Courier New">+++ \
wmarender.cpp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 24 Apr 2007 21:29:06 -0000</FONT>

<BR><FONT SIZE=2 FACE="Courier New">@@ -59,7 +59,7 @@</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;#define \
WMA_CODEC_NAME&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &quot;Windows Media Audio 9&quot;</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;const char* const \
CWMAudioRenderer::m_pszDescription&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = &quot;Helix \
Windows Media Audio Renderer Plugin&quot;;</FONT>

<BR><FONT SIZE=2 FACE="Courier New">-const char* const \
CWMAudioRenderer::m_ppszStreamMimeType[] = {&quot;application/vnd.rn-wma&quot;, \
NULL};</FONT>

<BR><FONT SIZE=2 FACE="Courier New">+const char* const \
CWMAudioRenderer::m_ppszStreamMimeType[] = {&quot;audio/x-hx-wma&quot;, NULL};</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">&nbsp;CWMAudioRenderer::CWMAudioRenderer(void)</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;{</FONT>
</P>
<BR>
<BR>

<P><FONT SIZE=2 FACE="Courier New">Index: wmvrender.cpp</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">===================================================================</FONT>

<BR><FONT SIZE=2 FACE="Courier New">RCS file: \
/cvsroot/datatype/wm/video/renderer/wmvrender.cpp,v</FONT>

<BR><FONT SIZE=2 FACE="Courier New">retrieving revision 1.1.1.1</FONT>

<BR><FONT SIZE=2 FACE="Courier New">diff -u -w -r1.1.1.1 wmvrender.cpp</FONT>

<BR><FONT SIZE=2 FACE="Courier New">--- \
wmvrender.cpp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 4 May 2006 20:45:41 \
-0000&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 1.1.1.1</FONT>

<BR><FONT SIZE=2 FACE="Courier New">+++ \
wmvrender.cpp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 24 Apr 2007 21:29:46 -0000</FONT>

<BR><FONT SIZE=2 FACE="Courier New">@@ -63,7 +63,7 @@</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;#define HX_WMV_RENDERER_NAME&nbsp;&nbsp; \
&quot;Windows Media Video&quot;</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;const char* const \
CWMVideoRenderer::m_pszDescription&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = \
&quot;RealNetworks MPEG-4 Video Renderer Plugin&quot;;</FONT>

<BR><FONT SIZE=2 FACE="Courier New">-const char* const \
CWMVideoRenderer::m_ppszStreamMimeTypes[] = {&quot;application/vnd.rn-wmv&quot;, \
NULL};</FONT>

<BR><FONT SIZE=2 FACE="Courier New">+const char* const \
CWMVideoRenderer::m_ppszStreamMimeTypes[] = {&quot;video/x-hx-wmv&quot;, \
NULL};</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">&nbsp;CWMVideoRenderer::CWMVideoRenderer(void)</FONT> </P>
<BR>
<BR>

<P><FONT SIZE=2 FACE="Courier New">Index: mdfwmvpayloadformat.cpp</FONT>

<BR><FONT SIZE=2 FACE="Courier \
New">===================================================================</FONT>

<BR><FONT SIZE=2 FACE="Courier New">RCS file: \
/cvsroot/datatype/mdf/video/format/wmv/mdfwmvpayloadformat.cpp,v</FONT>

<BR><FONT SIZE=2 FACE="Courier New">retrieving revision 1.1.2.1</FONT>

<BR><FONT SIZE=2 FACE="Courier New">diff -u -w -r1.1.2.1 \
mdfwmvpayloadformat.cpp</FONT>

<BR><FONT SIZE=2 FACE="Courier New">--- \
mdfwmvpayloadformat.cpp&nbsp;&nbsp;&nbsp;&nbsp; 23 Apr 2007 18:16:30 \
-0000&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 1.1.2.1</FONT>

<BR><FONT SIZE=2 FACE="Courier New">+++ \
mdfwmvpayloadformat.cpp&nbsp;&nbsp;&nbsp;&nbsp; 24 Apr 2007 21:30:36 -0000</FONT>

<BR><FONT SIZE=2 FACE="Courier New">@@ -372,7 +372,7 @@</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;void \
CWMVPayloadFormatPluginDevice::SetVideoMimetypes( CPayloadFormatInfo&amp; \
aPayloadFormatInfo ) const</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;{</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;&nbsp;&nbsp;&nbsp; MDFVIDEOLOG_ENTERFN( \
&quot;SetVideoMimetypes&quot; );</FONT>

<BR><FONT SIZE=2 FACE="Courier New">-&nbsp;&nbsp;&nbsp; _LIT8( KVideoMimeTypeRNWMV, \
&quot;application/vnd.rn-wmv&quot; );</FONT>

<BR><FONT SIZE=2 FACE="Courier New">+&nbsp;&nbsp;&nbsp; _LIT8( KVideoMimeTypeRNWMV, \
&quot;video/x-hx-wmv&quot; );</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;&nbsp;&nbsp;&nbsp; _LIT8( \
KVideoMimeTypeVC1, &quot;video/vc1&quot; );</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;&nbsp;&nbsp;&nbsp; _LIT8( \
KVideoMimeTypeWMV, &quot;video/x-ms-wmv&quot; );</FONT>

<BR><FONT SIZE=2 FACE="Courier New">&nbsp;</FONT>
</P>
<BR>
<BR>
<BR>
<BR>

</BODY>
</HTML>



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

--===============1289445419==--


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

Configure | About | News | Add a list | Sponsored by KoreLogic