[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-datatype-dev
Subject: [datatype-dev] Re: [Nokia-private-dev] [MCL] ou1cimx1#854044 -
From: Qiang Luo <qluo () real ! com>
Date: 2011-07-24 21:52:56
Message-ID: 4E2C9438.6000502 () real ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Looks good.
Qiang
On 7/22/2011 9:51 AM, prasoon.jaiswal@nokia.com wrote:
>
> "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: Shubham.Baheti@nokia.com <mailto:Shubham.Baheti@nokia.com>
>
> Reviewed by: ext-dushyant.vipradas@nokia.com
> <mailto:ext-dushyant.vipradas@nokia.com>
>
> RC Id: ou1cimx1#854044
>
> Date: 07/22/2010
>
> Project: SymbianMmf_wm
>
> Synopsis: HTML5- SR1.11- Panic occurs on loading
> http://slides.html5rocks.com
>
> Overview:
>
> There is an error in the MKVFileFormat during construction when trying
> to stream content which is being recognized as Matroska.
>
> Fix:
>
> The fix is to properly handle the error in the constructor of the
> Matroska File Object
>
> Files modified & changes:
>
> Datatype/mkv/fileformat/mkv_file_format.cpp
>
> Image Size and Heap Use impact: No major impact
>
> Module Release testing (STIF) : Passed
>
> Test case(s) Added : No
>
> Memory leak check performed : Passed, No additional leaks introduced.
>
> Platforms and Profiles Build Verified: helix-client-s60-52-mmf-mdf-dsp
>
> Platforms and Profiles Functionality verified: armv5, winscw
>
> Branch: 420Brizo and HEAD
>
> CVS Diff on 420Brizo:
>
> Index: mkv_file_format.cpp
>
> diff -r 6690765b2377 -r 58a880fd2b1b
> ext/mw/helixext/helix_ren/src/datatype/mkv/fileformat/mkv_file_format.cpp
>
> ---
> a/ext/mw/helixext/helix_ren/src/datatype/mkv/fileformat/mkv_file_format.cpp
> Thu Jul 21 13:23:05 2011 +0100
>
> +++
> b/ext/mw/helixext/helix_ren/src/datatype/mkv/fileformat/mkv_file_format.cpp
> Thu Jul 21 21:57:56 2011 +0100
>
> @@ -326,11 +326,11 @@
>
> HX_RELEASE(m_pFormatResponse);
>
> m_pFormatResponse = pFormatResponse;
>
> m_pFormatResponse->AddRef();
>
> m_pMKVFileObject = new MKVFileObject(pFileObject,
> m_pCommonClassFactory);
>
> - if(m_pMKVFileObject)
>
> + if(m_pMKVFileObject &&
> SUCCEEDED(m_pMKVFileObject->GetLastError()))
>
> {
>
> //create MatroskaExports instance
>
> m_pMKVHandle =
> MatroskaExports::Init(*m_pMKVFileObject);
>
> if(m_pMKVHandle)
>
> {
>
> @@ -343,13 +343,15 @@
>
> m_ulAdjustedPresentationVideoTime = 0;
>
> m_pFormatResponse->InitDone(retVal);
>
> }
>
> -
>
> + else if (m_pMKVFileObject)
>
> + {
>
> + retVal = m_pMKVFileObject->GetLastError();
>
> + }
>
> }
>
> -
>
> return retVal;
>
> }
>
> STDMETHODIMP CMKVFileFormat::Close()
>
> {
>
> @@ -1207,11 +1209,11 @@
>
> }
>
> //initialise File Object
>
> if(pFileObject)
>
> {
>
> #ifdef HELIX_FEATURE_64_BIT_FILE_SUPPORT
>
> - pFileObject->QueryInterface(IID_IHXFileObject2,
> (void**) &m_pFileObject2);
>
> + m_ulLastError =
> pFileObject->QueryInterface(IID_IHXFileObject2, (void**) &m_pFileObject2);
>
> if(m_pFileObject2)
>
> {
>
> m_pFileObject2->InitSync(HX_FILE_READ |
> HX_FILE_BINARY);
>
> }
>
[Attachment #5 (text/html)]
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
<title></title>
</head>
<body bgcolor="#ffffff" text="#000000">
Looks good.<br>
<br>
Qiang<br>
<br>
On 7/22/2011 9:51 AM, <a class="moz-txt-link-abbreviated" \
href="mailto:prasoon.jaiswal@nokia.com">prasoon.jaiswal@nokia.com</a> wrote: \
<blockquote cite="mid:EC607DE521A40647A10FB2A015957ADF9F40DA@008-AM1MPN1-022.mgdnok.nokia.com"
type="cite">
<meta http-equiv="Content-Type" content="text/html;
charset=ISO-8859-1">
<meta name="Generator" content="Microsoft Word 14 (filtered
medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p.MsoPlainText, li.MsoPlainText, div.MsoPlainText
{mso-style-priority:99;
mso-style-link:"Plain Text Char";
margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
span.PlainTextChar
{mso-style-name:"Plain Text Char";
mso-style-priority:99;
mso-style-link:"Plain Text";
font-family:"Calibri","sans-serif";}
span.EmailStyle19
{mso-style-type:personal;
font-family:"Calibri","sans-serif";
color:windowtext;}
span.EmailStyle20
{mso-style-type:personal-reply;
font-family:"Calibri","sans-serif";
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
<div class="WordSection1">
<p class="MsoPlainText">"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."<o:p></o:p></p> <p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Modified by: <a moz-do-not-send="true"
href="mailto:Shubham.Baheti@nokia.com">Shubham.Baheti@nokia.com</a><o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Reviewed by: <span style="color:
rgb(31, 73, 125);"><a moz-do-not-send="true"
href="mailto:ext-dushyant.vipradas@nokia.com">ext-dushyant.vipradas@nokia.com</a></span><o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">RC Id: ou1cimx1#854044<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Date: 07/22/2010<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Project: SymbianMmf_wm<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Synopsis: HTML5- SR1.11- Panic occurs on
loading <a moz-do-not-send="true"
href="http://slides.html5rocks.com">
http://slides.html5rocks.com</a><o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Overview:<o:p></o:p></p>
<p class="MsoPlainText"><span lang="EN-US">There is an error in
the MKVFileFormat during construction when trying to stream
content which is being recognized as Matroska</span>.
<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Fix:<o:p></o:p></p>
<p class="MsoPlainText"><span lang="EN-US">The fix is to
properly handle the error in the constructor of the Matroska
File Object</span><o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Files modified & changes:<o:p></o:p></p>
<p class="MsoPlainText">Datatype/mkv/fileformat/mkv_file_format.cpp<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Image Size and Heap Use impact: No major
impact<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Module Release testing (STIF) : Passed<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Test case(s) Added : No<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Memory leak check performed : Passed, No
additional leaks introduced.<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Platforms and Profiles Build Verified:
helix-client-s60-52-mmf-mdf-dsp<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Platforms and Profiles Functionality
verified: armv5, winscw<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Branch: 420Brizo and HEAD<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">CVS Diff on 420Brizo:<o:p></o:p></p>
<p class="MsoPlainText">Index: mkv_file_format.cpp<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">diff -r 6690765b2377 -r 58a880fd2b1b
ext/mw/helixext/helix_ren/src/datatype/mkv/fileformat/mkv_file_format.cpp<o:p></o:p></p>
<p class="MsoPlainText">---
a/ext/mw/helixext/helix_ren/src/datatype/mkv/fileformat/mkv_file_format.cpp
Thu Jul 21 13:23:05 2011 +0100<o:p></o:p></p>
<p class="MsoPlainText">+++
b/ext/mw/helixext/helix_ren/src/datatype/mkv/fileformat/mkv_file_format.cpp
Thu Jul 21 21:57:56 2011 +0100<o:p></o:p></p>
<p class="MsoPlainText">@@ -326,11 +326,11 @@<o:p></o:p></p>
<p class="MsoPlainText">
HX_RELEASE(m_pFormatResponse);<o:p></o:p></p>
<p class="MsoPlainText"> \
m_pFormatResponse = pFormatResponse;<o:p></o:p></p>
<p class="MsoPlainText">
m_pFormatResponse->AddRef();<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText"> \
m_pMKVFileObject = new
MKVFileObject(pFileObject, m_pCommonClassFactory);<o:p></o:p></p>
<p class="MsoPlainText">- \
if(m_pMKVFileObject)<o:p></o:p></p>
<p class="MsoPlainText">+ \
if(m_pMKVFileObject
&& SUCCEEDED(m_pMKVFileObject->GetLastError()))<o:p></o:p></p>
<p class="MsoPlainText"> \
{<o:p></o:p></p> <p \
class="MsoPlainText"> \
//create MatroskaExports instance<o:p></o:p></p>
<p class="MsoPlainText"> \
\
m_pMKVHandle = MatroskaExports::Init(*m_pMKVFileObject);<o:p></o:p></p>
<p class="MsoPlainText"> \
\
if(m_pMKVHandle)<o:p></o:p></p> <p \
class="MsoPlainText"> \
{<o:p></o:p></p> <p \
class="MsoPlainText">@@ -343,13 +343,15 @@<o:p></o:p></p> <p \
class="MsoPlainText"><o:p> </o:p></p> <p \
class="MsoPlainText">
m_ulAdjustedPresentationVideoTime = 0;<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText"> \
\
m_pFormatResponse->InitDone(retVal);<o:p></o:p></p>
<p class="MsoPlainText"> \
}<o:p></o:p></p> <p class="MsoPlainText">-<o:p></o:p></p>
<p class="MsoPlainText">+ \
else if (m_pMKVFileObject)<o:p></o:p></p>
<p class="MsoPlainText">+ \
{<o:p></o:p></p> <p \
class="MsoPlainText">+ \
retVal = m_pMKVFileObject->GetLastError();<o:p></o:p></p>
<p class="MsoPlainText">+ \
}<o:p></o:p></p>
<p class="MsoPlainText"> \
}<o:p></o:p></p> <p class="MsoPlainText">-<o:p></o:p></p>
<p class="MsoPlainText"> return \
retVal;<o:p></o:p></p> <p class="MsoPlainText">}<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">STDMETHODIMP CMKVFileFormat::Close()<o:p></o:p></p>
<p class="MsoPlainText">{<o:p></o:p></p>
<p class="MsoPlainText">@@ -1207,11 +1209,11 @@<o:p></o:p></p>
<p class="MsoPlainText"> \
}<o:p></o:p></p>
<p class="MsoPlainText"> \
//initialise File Object<o:p></o:p></p>
<p class="MsoPlainText"> \
if(pFileObject)<o:p></o:p></p>
<p class="MsoPlainText"> \
{<o:p></o:p></p>
<p class="MsoPlainText">#ifdef \
HELIX_FEATURE_64_BIT_FILE_SUPPORT<o:p></o:p></p>
<p class="MsoPlainText">-
pFileObject->QueryInterface(IID_IHXFileObject2, (void**)
&m_pFileObject2);<o:p></o:p></p>
<p class="MsoPlainText">+ \
m_ulLastError = pFileObject->QueryInterface(IID_IHXFileObject2, (void**)
&m_pFileObject2);<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText"> \
if(m_pFileObject2)<o:p></o:p></p>
<p class="MsoPlainText"> \
{<o:p></o:p></p> <p \
class="MsoPlainText">
m_pFileObject2->InitSync(HX_FILE_READ | HX_FILE_BINARY);<o:p></o:p></p>
<p class="MsoPlainText"> \
}<o:p></o:p></p> </div>
</blockquote>
<br>
</body>
</html>
_______________________________________________
Datatype-dev mailing list
Datatype-dev@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic