From ext-anugrah.2.kashari at nokia.com Mon Jan 4 00:45:56 2010
From: ext-anugrah.2.kashari at nokia.com (ext-anugrah.2.kashari@nokia.com)
Date: Mon Jan 4 08:13:26 2010
Subject: [Datatype-dev]: CR : TMAA-7YLAN6 - Thumbnail not generated
Message-ID:
"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: ext-anugrah.2.kashari@nokia.com
Review By: Ashish.As.Gupta@nokia.com
TSW-ID: TMAA-7YLAN6
Date : 04/01/2010
Project: SymbianMmf_wm
Synopsis: Thumbnail not generated
Overview : In thumbnail generation, decoded picture is not send to client when decoder is trying to decode picture is time synchronized mode. Time synchronization is not required for thumbnail generation therefore there is no need to set clock source.
Fix: For TNE, when disabling post-processor, disable the clock source as well.
Files modified & changes 210Cays , Brizo420 and Head :
/Datatype/mdf/video/renderer/mdfvideoadapter.cpp
Image Size and Heap Use impact: No major impact
Module Release testing (STIF) : NA
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
Branch : 210Cays, Brizo420 & Head :
CVS Diff:
Index: mdfvideoadapter.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/video/renderer/mdfvideoadapter.cpp,v
retrieving revision 1.3.2.102
diff -u -w -r1.3.2.102 mdfvideoadapter.cpp
--- mdfvideoadapter.cpp 30 Oct 2009 16:50:30 -0000 1.3.2.102
+++ mdfvideoadapter.cpp 4 Jan 2010 08:38:19 -0000
@@ -2517,6 +2517,7 @@
void CMdfVideoAdapter::SetPostProcessing(HXBOOL bEnable)
{
m_bDisablePostProcessor = !bEnable;
+ m_bDisableVideoClock = !bEnable;
}
void CMdfVideoAdapter::SetPictureReturn(HXBOOL bEnable)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100104/f2ec527c/attachment.html
From pbasic at real.com Mon Jan 4 01:06:57 2010
From: pbasic at real.com (Petar Basic)
Date: Mon Jan 4 08:33:34 2010
Subject: [datatype-dev] CR: Added ability to output ID3v2 v2.3.0;
added DTDriver engine
parameter for controlling the ID3v2 output in MP4 writer
Message-ID: <9b8350411001040106x55a13583had8dfd233ac989@mail.gmail.com>
Modified by: pbasic at real.com
Date: 2010/01/04
Project: GMP MetaEditor (meta3gp.exe)
Synopsis:
Added ability to output ID3v2 v2.3.0; added DTDriver engine parameter
for controlling the ID3v2 output in MP4 writer
Overview:
To allow testing of meta-data outputted by MP4 file-writer with other
software and with MP4 file-format it is useful to be able to output an
older version of ID3v2 tag.
Details:
1.) Extended ID3Tools methods to allow writing of ID3v2 according to
v2.3.0 specs.
2.) Added DTDriver engine parameter which controls the behaviour of
MP4 file-writer during ID3v2 tag output.
3.) Added ID3v2 related command-line options to GMPMetaEditor. These
are mapped to DTDriver engine parameters.
Testing:
Verified that the portion of meta-info injected as ID3v2 by GMP
MetaEditor can be read with other software (iTunes 9, CT metadata
extractor 1.3) regardless of the version of ID3v2 outputted (v2.4.0 or
v2.3.0). Verified that meta-info injected by other software can be
read with GMP MetaEditor.
Files Modified:
datatype/common/util/metautil.cpp
datatype/common/util/pub/metautil.h
datatype/mp4/filewriter/mp4sm.cpp
datatype/mp4/filewriter/mp4sm.h
datatype/tools/dtdriver/engine/ffdriver.cpp
datatype/tools/dtdriver/engine/pub/ffdriver.h
datatype/tools/dtdriver/apps/meta3gp/HXXmlInputParser.cpp
datatype/tools/dtdriver/apps/meta3gp/main.cpp
Platforms and Profiles Affected:
All
Image Size and Heap Use impact:
Small increase
Platforms and Profiles Build Verified:
system id: win32-i386-vc7
profile: helix-client-all-defines
Platforms and Profiles Functionality Verified:
x86 Windows XP SP2
Branch:
HEAD
Copyright assignment:
I am a RealNetworks employee or contractor.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_common_util.diff
Type: text/x-patch
Size: 39544 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100104/5c2b6090/datatype_common_util-0001.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_mp4_filewriter.diff
Type: text/x-patch
Size: 10411 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100104/5c2b6090/datatype_mp4_filewriter-0001.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_tools_dtdriver_apps_meta3gp.diff
Type: text/x-patch
Size: 23228 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100104/5c2b6090/datatype_tools_dtdriver_apps_meta3gp-0001.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_tools_dtdriver_engine.diff
Type: text/x-patch
Size: 14562 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100104/5c2b6090/datatype_tools_dtdriver_engine-0001.bin
From gahluwalia at real.com Mon Jan 4 01:49:28 2010
From: gahluwalia at real.com (Gurpreet)
Date: Mon Jan 4 09:16:05 2010
Subject: [datatype-dev] Resend : CR: Fix for Bug 9915 a particular mp3 file
cannot be played
In-Reply-To: <4B3849CB.4040901@real.com>
References: <4B384955.7020604@real.com> <4B3849CB.4040901@real.com>
Message-ID: <4B41B9A8.9050009@real.com>
Gurpreet wrote:
> Forgot to attach diff.
> PFA.
>
> Thanks,
> Gurpreet
>
> Gurpreet wrote:
>> Synopsis:
>> Fix for Bug 9915 a particular mp3 file cannot be played
>>
>> Overview:
>> This particular mp3 file mentioned in the bug is not recognized by
>> the android player.
>> Reason for that is:
>> Frame Sync bits are at position 16128 where as we check till 512.
>> There fore for android we have increased the scan bytes value to 16 KB.
>>
>> Files Modified:
>> /common/system/recognizer.cpp
>>
>> Image Size and Heap Use impact (Client -Only):
>> None
>>
>> Platforms and Profiles Build Verified:
>> BIF branch -> atlas 310, atlas 361, brizo 401, head
>> Target(s) -> android_all
>> Profile -> helix-client-android-surf_8x50
>> SYSTEM_ID -> android-donut-arm.eabi
>>
>> Files Attached::
>> common.diff
>>
>> Thanks & Best Regards,
>> Gurpreet
>>
>
> ------------------------------------------------------------------------
>
> Index: recognizer.cpp
> ===================================================================
> RCS file: /cvsroot/common/system/recognizer.cpp,v
> retrieving revision 1.12.8.4.2.7
> diff -u -r1.12.8.4.2.7 recognizer.cpp
> --- recognizer.cpp 6 Nov 2009 18:12:03 -0000 1.12.8.4.2.7
> +++ recognizer.cpp 28 Dec 2009 05:47:09 -0000
> @@ -26,7 +26,11 @@
> #define HX_MIMETYPE_AMR "audio/amr"
>
> // length of buffer read from file and passed to recognizer
> +#if defined(ANDROID)
> +static const int KRecogLength = 16384;
> +#else
> static const int KRecogLength = 512;
> +#endif
>
> #if !defined (_SYMBIAN)
> HX_RESULT CHXFileRecognizer::GetMimeType(const char* pFileName, IHXBuffer* pBuffer, REF(IHXBuffer*) pMimeType)
>
From sgarg at real.com Mon Jan 4 03:27:31 2010
From: sgarg at real.com ( Sushant Garg)
Date: Mon Jan 4 10:54:04 2010
Subject: [datatype-dev] CR/CN: Fix for Bug 9845: Un-able to play the *.mp4
files at http://vidfeed.homeip.net/films webpage
Message-ID: <00af01ca8d30$e9bdd800$8001a8c0@adroit02a604c1>
Skipped content of type multipart/alternative-------------- next part --------------
Index: atomizer.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/atomizer.cpp,v
retrieving revision 1.18.8.3
diff -u -r1.18.8.3 atomizer.cpp
--- atomizer.cpp 28 Apr 2008 02:09:58 -0000 1.18.8.3
+++ atomizer.cpp 4 Jan 2010 09:54:13 -0000
@@ -159,14 +159,14 @@
// Find out if syncrhonous use of input is possible
if (SUCCEEDED(retVal))
{
- if (SUCCEEDED(m_pFileSwitcher->Advise(HX_FILEADVISE_SYNCACCESS)))
+ HX_RESULT adviseRes = m_pFileSwitcher->Advise(HX_FILEADVISE_SYNCACCESS);
+ if (SUCCEEDED(adviseRes) && adviseRes != HXR_ADVISE_NETWORK_ACCESS)
{
m_bSyncAccessEnabled = TRUE;
m_pFileSwitcher->Advise(HX_FILEADVISE_ASYNCACCESS);
}
- HX_RESULT adviseRes =
- m_pFileSwitcher->Advise(HX_FILEADVISE_RANDOMACCESS);
+ adviseRes = m_pFileSwitcher->Advise(HX_FILEADVISE_RANDOMACCESS);
if (HXR_ADVISE_PREFER_LINEAR == adviseRes)
{
@@ -394,6 +394,10 @@
return retVal;
}
}
+ else if (m_ulFinalOffset != ATOMIZE_ALL && m_ulCurrentOffset > m_ulFinalOffset)
+ {
+ m_ulCurrentOffset = m_ulFinalOffset;
+ }
CompleteAtomization(retVal);
@@ -564,6 +568,11 @@
if (SUCCEEDED(status))
{
+ if (m_ulFinalOffset != ATOMIZE_ALL)
+ {
+ m_ulCurrentOffset = m_ulCurrentOffset > m_ulFinalOffset ? m_ulFinalOffset : m_ulCurrentOffset;
+ }
+
// See if parsing fully completed
if (((m_ulFinalOffset != ATOMIZE_ALL) &&
(m_ulFinalOffset != m_ulCurrentOffset)) ||
Index: mempager.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/mempager.cpp,v
retrieving revision 1.6
diff -u -r1.6 mempager.cpp
--- mempager.cpp 27 Apr 2005 13:57:41 -0000 1.6
+++ mempager.cpp 4 Jan 2010 09:54:14 -0000
@@ -198,7 +198,8 @@
}
// Page in here only if it can be done synchronously
- if (SUCCEEDED(m_pFileSwitcher->Advise(HX_FILEADVISE_SYNCACCESS)))
+ HX_RESULT adviseRes = m_pFileSwitcher->Advise(HX_FILEADVISE_SYNCACCESS);
+ if (SUCCEEDED(adviseRes) && adviseRes != HXR_ADVISE_NETWORK_ACCESS)
{
m_bSyncMode = TRUE;
retVal = _LoadPage();
From vkathuria at real.com Mon Jan 4 03:59:35 2010
From: vkathuria at real.com (Varun Kathuria)
Date: Mon Jan 4 11:26:16 2010
Subject: [datatype-dev] CR: Changes to fix [Bug 9762] It costs about 4 sec
for some mov file
Message-ID:
Skipped content of type multipart/alternative-------------- next part --------------
Index: qttrack.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/qttrack.cpp,v
retrieving revision 1.30.2.3
diff -u -r1.30.2.3 qttrack.cpp
--- qttrack.cpp 24 Jul 2008 23:53:19 -0000 1.30.2.3
+++ qttrack.cpp 4 Jan 2010 11:27:53 -0000
@@ -883,20 +883,26 @@
if (SUCCEEDED(retVal))
{
- do
- {
- if (!m_SampleSize.EstablishBySample(
- m_TimeToSample.GetSampleNumber(),
- m_SampleToChunk.GetChunkSampleNum()))
- {
- break;
- }
-
- ulTrackSize += m_SampleSize.GetSampleSize();
- } while (AdvanceSample(m_TrackEdit,
- m_TimeToSample,
- m_SampleToChunk));
+ if(m_SampleSize.IsGenericSize())
+ {
+ ulTrackSize = m_SampleSize.GetSampleSize() * m_SampleSize.Get_NumEntries();
+ }
+ else
+ {
+ do
+ {
+ if (!m_SampleSize.EstablishBySample(
+ m_TimeToSample.GetSampleNumber(),
+ m_SampleToChunk.GetChunkSampleNum()))
+ {
+ break;
+ }
+ ulTrackSize += m_SampleSize.GetSampleSize();
+ } while (AdvanceSample(m_TrackEdit,
+ m_TimeToSample,
+ m_SampleToChunk));
+ }
ulTrackSizeOut = ulTrackSize;
}
Index: pub/qtatmmgs.h
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/pub/qtatmmgs.h,v
retrieving revision 1.19.8.9
diff -u -r1.19.8.9 qtatmmgs.h
--- pub/qtatmmgs.h 31 Mar 2009 02:56:01 -0000 1.19.8.9
+++ pub/qtatmmgs.h 4 Jan 2010 11:27:54 -0000
@@ -332,7 +332,7 @@
ULONG32 GetChunkSampleOffset(void) { return m_ulChunkSampleOffset; }
ULONG32 GetChunkSize(void) { return m_ulChunkSize; }
ULONG32 Get_NumEntries(void) { return m_ulNumEntries; }
-
+ HXBOOL IsGenericSize(void) { return m_ulGenericSize ? TRUE:FALSE; }
private:
CQT_stsz_Atom* m_pSampleSizeAtom;
From ehyche at real.com Mon Jan 4 06:23:02 2010
From: ehyche at real.com (Eric Hyche)
Date: Mon Jan 4 13:49:35 2010
Subject: [datatype-dev] Re: [Porting-android] Re: CR: Fix for Bug 9915 a
particular mp3 file cannot be played
In-Reply-To: <4B3849CB.4040901@real.com>
References: <4B384955.7020604@real.com> <4B3849CB.4040901@real.com>
Message-ID:
I think it's safe to increase this to 16k on all platforms, not just Android.
Eric
On Dec 28, 2009, at 1:01 AM, Gurpreet wrote:
> Forgot to attach diff.
> PFA.
>
> Thanks,
> Gurpreet
>
> Gurpreet wrote:
>> Synopsis:
>> Fix for Bug 9915 a particular mp3 file cannot be played
>>
>> Overview:
>> This particular mp3 file mentioned in the bug is not recognized by the
>> android player.
>> Reason for that is:
>> Frame Sync bits are at position 16128 where as we check till 512.
>> There fore for android we have increased the scan bytes value to 16 KB.
>>
>> Files Modified:
>> /common/system/recognizer.cpp
>>
>> Image Size and Heap Use impact (Client -Only):
>> None
>>
>> Platforms and Profiles Build Verified:
>> BIF branch -> atlas 310, atlas 361, brizo 401, head
>> Target(s) -> android_all
>> Profile -> helix-client-android-surf_8x50
>> SYSTEM_ID -> android-donut-arm.eabi
>>
>> Files Attached::
>> common.diff
>>
>> Thanks & Best Regards,
>> Gurpreet
>>
>
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From ehyche at real.com Mon Jan 4 06:43:27 2010
From: ehyche at real.com (Eric Hyche)
Date: Mon Jan 4 14:09:54 2010
Subject: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays
incorrect duration for a wav file recorded by gnome-sound-recorder.
In-Reply-To: <01ed01ca8492$b14289e0$8001a8c0@adroit02a604c1>
References: <011601ca78cd$6011f9a0$8001a8c0@adroit02a604c1>
<7ECCEA249B7CDC49A079EC0075E999AA07D82CC716@SEAMBX.corp.real.com>
<012301ca798f$c8a9dce0$8001a8c0@adroit02a604c1>
<268FD6EA-49A7-42FA-AFC6-78547C20C18B@real.com>
<01ed01ca8492$b14289e0$8001a8c0@adroit02a604c1>
Message-ID: <5FC21ACD-FE11-427F-BA16-49FA0D27F818@real.com>
You are treating IHXFileStat::Stat() like a synchronous call and there is
no guarantee that it will be. Once you issue the call to Stat(), then
you will need to wait in StatDone() before calling back to InitDone().
Eric
On Dec 24, 2009, at 7:14 AM, Sushant Garg wrote:
> Eric,
>
> Please find the updated diff.
>
> Thanks & Regards
> Sushant Garg
> ----- Original Message -----
> From: Eric Hyche
> To: Sushant Grag
> Cc: Datatype-Dev
> Sent: Friday, December 11, 2009 12:04 AM
> Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
>
> Sushant,
>
> After thinking about this some more, I think the Stat() call should be moved inside the RIFF reader, for a couple of reasons:
>
> - centralize it in one place, so other uses of the RIFF reader don't have to do the same thing.
> - the most natural time to do the Stat is immediately after the IHXFileObject is Init'd, which in this case the RIFF reader does.
>
> So I think the RIFF reader could do the IHXFileStat::Stat() call, and then store the filesize result. Then we could just add an accessor function on the RIFF reader so that users of the RIFF reader can read the size. The file size would only be valid after the CRIFFREader::Open() call had returned with a RIFFOpenDone() callback.
>
> Eric
>
> On Dec 10, 2009, at 6:56 AM, Sushant Grag wrote:
>
> > Thanks Eric,
> >
> > Please find the updated diff.
> >
> > Thanks & Regards
> > Sushant Garg
> > ----- Original Message -----
> > From: Eric Hyche
> > To: Sushant Grag ; Datatype-Dev
> > Sent: Wednesday, December 09, 2009 7:17 PM
> > Subject: RE: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> >
> > +UINT32 CRIFFReader::GetFileDataSize()
> > +{
> > + CHXString strFilePath = m_pFilename;
> > + const char* szFileProtocol = "file://";
> > + UINT32 ulFiledataSize =0;
> > +
> > + if( !strFilePath.Left(strlen(szFileProtocol)).CompareNoCase(szFileProtocol) )
> > + {
> > + strFilePath = strFilePath.Mid(strlen(szFileProtocol));
> > + struct stat fileInfo;
> > + if(!stat(strFilePath, &fileInfo))
> > + {
> > + ulFiledataSize = fileInfo.st_size;
> > + }
> > + }
> > + return ulFiledataSize;
> > +}
> > +
> >
> > I did not mean do a C-library stat() on the file. The file object that
> > the RIFF readers uses will not always be a local file that you can call stat() on.
> > What I meant was QI the file object for IHXFileStat and then call IHXFileStat::Stat().
> > You will have to implement IHXFileStatResponse::StatDone().
> >
> > Eric
> >
> > >-----Original Message-----
> > >From: datatype-dev-bounces@helixcommunity.org [mailto:datatype-dev-bounces@helixcommunity.org] On
> > >Behalf Of Sushant Grag
> > >Sent: Wednesday, December 09, 2009 7:45 AM
> > >To: Datatype-Dev
> > >Subject: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file
> > >recorded by gnome-sound-recorder.
> > >
> > >Project: RealPlayer for Netbook
> > >
> > >Synopsis:
> > >
> > >Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-
> > >recorder.
> > >
> > >
> > >
> > >Overview:
> > >
> > >There is an issue with wav files which are recorded from ubuntu sound recorder.
> > >
> > >The calculated file duration in Realplayer for linux is much & much larger then original file duration
> > >
> > >eg: file has duration of 6secs & Realplayer shows more than 3hr 22 min.
> > >
> > >Reason behind is, sound recorder adds garbage value in data chunk which leads to very big value of
> > >m_ulChunkBodyLen calculated in riff.cpp around line 380
> > >
> > > if ( (UINT32)getlong(buf) == m_ulFindChunkId )
> > >
> > > {
> > >
> > > // Found the chunk we were asked for
> > >
> > > m_state = RS_Ready;
> > >
> > > m_ulChunkBodyLen = GetLong(&buf[4]);
> > >
> > > m_ulChunkSize = m_ulChunkBodyLen;
> > >
> > >Which cause a very higher value of duration.
> > >
> > >
> > >
> > >Now I have created two different functions in riff.cpp;
> > >
> > >CRIFFReader::GetFileDataSize() & CRIFFReader::GetCurrentFileOffset() in which I am getting the length
> > >of file & the file offset and calling these functions in function CWaveFileFormat::RIFFFindChunkDone()
> > >, case WS_FindDataChunkPending to set m_ulDataSizeInBytes if "len" is greater then
> > >"ulDataSizeInBytes".
> > >
> > >
> > >
> > >Files Modified:
> > >/cvsroot/datatype/common/util/riff.cpp
> > >
> > >/cvsroot/datatype/common/util/pub/riff.h
> > >
> > >/cvsroot/datatype/wav/fileformat/wvffplin.cpp
> > >
> > >
> > >
> > >Files Added:
> > >
> > >None
> > >
> > >
> > >
> > >Platforms and Profiles Affected:
> > >Linux
> > >
> > >Distribution Libraries Affected:
> > >None.
> > >
> > >Platforms and Profiles Build Verified:
> > >Bif: realplay_gtk_atlas_restricted_gold_1.2
> > >Profile: helix-client-moblin
> > >Target: player_all
> > >
> > >Branch:
> > >Atlas347, Atlas310, Atlas3_4_10, 401 Brizo, Head
> > >
> > >
> > >
> > >Files Attached:
> > >
> > >9840_diff.txt
> > >
> > >
> > >
> > >Thanks & Regards
> > >Sushant Garg
> > <9840_diff.txt>
>
> Eric Hyche (ehyche@real.com)
> Principal Engineer
> RealNetworks, Inc.
>
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From ehyche at real.com Mon Jan 4 09:04:06 2010
From: ehyche at real.com (Eric Hyche)
Date: Mon Jan 4 16:30:33 2010
Subject: [Datatype-dev]: CR : TMAA-7YLAN6 - Thumbnail not generated
In-Reply-To:
References:
Message-ID:
Looks good.
On Jan 4, 2010, at 3:45 AM, wrote:
> "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: ext-anugrah.2.kashari@nokia.com
>
> Review By: Ashish.As.Gupta@nokia.com
>
> TSW-ID: TMAA-7YLAN6
>
> Date : 04/01/2010
>
> Project: SymbianMmf_wm
>
> Synopsis: Thumbnail not generated
>
> Overview : In thumbnail generation, decoded picture is not send to client when decoder is trying to decode picture is time synchronized mode. Time synchronization is not required for thumbnail generation therefore there is no need to set clock source.
>
> Fix: For TNE, when disabling post-processor, disable the clock source as well.
>
> Files modified & changes 210Cays , Brizo420 and Head :
> /Datatype/mdf/video/renderer/mdfvideoadapter.cpp
>
> Image Size and Heap Use impact: No major impact
>
> Module Release testing (STIF) : NA
>
> 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
>
> Branch : 210Cays, Brizo420 & Head :
>
> CVS Diff:
> Index: mdfvideoadapter.cpp
> ===================================================================
> RCS file: /cvsroot/datatype/mdf/video/renderer/mdfvideoadapter.cpp,v
> retrieving revision 1.3.2.102
> diff -u -w -r1.3.2.102 mdfvideoadapter.cpp
> --- mdfvideoadapter.cpp 30 Oct 2009 16:50:30 -0000 1.3.2.102
> +++ mdfvideoadapter.cpp 4 Jan 2010 08:38:19 -0000
> @@ -2517,6 +2517,7 @@
> void CMdfVideoAdapter::SetPostProcessing(HXBOOL bEnable)
> {
> m_bDisablePostProcessor = !bEnable;
> + m_bDisableVideoClock = !bEnable;
> }
>
> void CMdfVideoAdapter::SetPictureReturn(HXBOOL bEnable)
>
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From rajesh.rathinasamy at nokia.com Mon Jan 4 09:16:03 2010
From: rajesh.rathinasamy at nokia.com (rajesh.rathinasamy@nokia.com)
Date: Mon Jan 4 16:42:48 2010
Subject: [datatype-dev] CR: Changes to fix [Bug 9762] It costs about 4
sec for some mov file
In-Reply-To:
References:
Message-ID:
Hi Varun,
When this CR is approved, can you please check in the changes to 210CayS and 420Brizo too ?
Thanks,
Rajesh.
________________________________
From: datatype-dev-bounces@helixcommunity.org [mailto:datatype-dev-bounces@helixcommunity.org] On Behalf Of ext Varun Kathuria
Sent: Monday, January 04, 2010 6:00 AM
To: porting-android@helixcommunity.org
Cc: datatype-dev@helixcommunity.org
Subject: [datatype-dev] CR: Changes to fix [Bug 9762] It costs about 4 sec for some mov file
Synopsis:
Changes to fix [Bug 9762] It costs about 4 sec for some mov file
Overview:
In android player, when we scan some mov files it takes more than 4 sec to scan files. The problem in these files are audio track have sample size of 4 & sample count is 5990384. When it tries to calculate audio tracksize from CQTTrack::ComputeTrackSize() then it takes 5990384 iterations to compute audio track size. We know that the audio track has generic sample size . Added code to calculate tracksize based on generic size in a CQTTrack::ComputeTrackSize() so that it can be calculated in 1 iteration rather than 5990384 iterations. Now it saves around 3850ms approx in android platform.
Files Added:
None
Files Modified:
/cvsroot/datatype/mp4/fileformat/qttrack.cpp
/cvsroot/datatype/mp4/fileformat/pub/qtatmmgs.h
Image Size and Heap Use impact (Client -Only):
None.
Platforms and Profiles Affected:
None
Distribution Libraries Affected:
None
Distribution library impact and planned action:
None
Platforms and Profiles Build Verified:
BIF branch -> hxclient_3_6_1_atlas_restricted
Target(s) -> android_all
Profile -> helix-client-android-full
SYSTEM_ID -> android-donut-arm-qsd_8x50
Branch
atlas310, atlas361, head, 401brizo
Files Attached:
diff_9762.txt
Thanks
Varun Kathuria
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100104/0d29cc82/attachment.html
From ehyche at real.com Mon Jan 4 09:53:05 2010
From: ehyche at real.com (Eric Hyche)
Date: Mon Jan 4 17:19:30 2010
Subject: [datatype-dev] CR: Add movie fragments support to mp4fformat
In-Reply-To: <4B3C272C.80802@real.com>
References: <4B3C272C.80802@real.com>
Message-ID: <046D7BA3-3F83-4991-9FDC-3F272A443320@real.com>
These changes look good to me. Couple of questions/requests:
- can you add HX_ASSERT()'s when we encounter the
unsupported cases?
- how does random access work when there is no mfra? Do
we have to simply read through the file, looking for
moof's?
Eric
On Dec 30, 2009, at 11:23 PM, Jamie Gordon wrote:
> Synopsis
> ========
> Adds basic support for moof fragments
>
> Branches: HEAD (SERVER_CURRENT)
> Suggested Reviewer: eric or milko, shantha or dean
>
>
> Description
> ===========
> Adds fragments support. Currently Only enabled for server profiles.
> This is needed in order to support content created by Flash Live
> Encoder, and this is the only encoder I currently have that will create
> fragmented files so that is all I have tested with.
>
> The various atom definitions are updated to add the various accessors
> and missing values and to make trun a PagingAtom. trun and tfhd had
> to depart a bit from the structure of the other atom classes, due to
> the way they are defined. Most of the values are optional, and present
> or not depending on the flags. So they can't use the packed struct for
> accessing, and need to be parsed all at once.
>
> A new class CQT_TrackFragment_Manager is added to the atom managers
> which manages the fragments associated with a track. Another manager
> is also added, CQT_Sample_Manager, which manages the
> CQT_TrackFragment_Manager and the stbl managers and the incredible
> awkwardness of switching between stbl and fragments. The logic in
> QTTrack that handles/depends on the structure of stbl atoms was moved
> into this class when reading stbl samples.
>
> I did not add handling or usage of mfra atom, as Adobe's encoder does
> not add it. It just makes seeking more efficient.
>
> I did not add support for the case where the traf atom does not have a
> base offset. In that case, the base offset of the first fragment in a
> moof is the file offset of the moof, and then for each following
> fragment is the end of the previous fragment. This will require passing
> the file offset all the way down, etc.
>
> In case hint tracks are present in a fragmented file, they will be
> ignored. Hint tracks and fragments don't really work together since
> hint tracks reference samples by the absolute stbl sample number.
>
> There was a change somewhat recently that changed from passing
> ATOMIZE_ALL to the atomization of the file root to instead get the file
> size and pass that. (This was added to fix/improve progressive download
> case.) This is a problem however, as it causes the atomizer to stop
> parsing too soon, after it gets to the mdat. I just ifdef'd that logic
> out for server builds as we really want to do a true atomize all, but it
> will probably need to be fixed properly for the client.
>
>
> Files Affected
> ==============
> datatype/mp4/fileformat/qtatmmgs.cpp
> datatype/mp4/fileformat/qtatmmgs_inline.h
> datatype/mp4/fileformat/qtffplin.cpp
> datatype/mp4/fileformat/qttrack.cpp
> datatype/mp4/fileformat/qttrkmgr.cpp
> datatype/mp4/fileformat/pub/iqttrack.h
> datatype/mp4/fileformat/pub/qtatmmgs.h
> datatype/mp4/fileformat/pub/qtatoms.h
> datatype/mp4/fileformat/pub/qtatoms_inline.h
> datatype/mp4/fileformat/pub/qtswtrack.h
> datatype/mp4/fileformat/pub/qttrack.h
> datatype/mp4/fileformat/pub/qttrkmgr.h
> datatype/mp4/payload/Umakefil
>
>
> Testing Performed
> =================
> - Streaming and seeking of fragmented files
> - Streaming and seeking of normal files
> - Client local playback and seeking of normal files (with fragments
> disabled at build)
>
> Platforms Tested: win32-i386-vc7
> Build verified: linux-rhel5-i686, sunos-5.10-sparc-server,
> win32-i386-vc7
>
>
> QA Hints
> ===============
>
> Normal 3GP/MP4 playback needs to be spot checked as well as Flash Live
> Encoder content.
>
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From jgordon at real.com Mon Jan 4 11:11:12 2010
From: jgordon at real.com (Jamie Gordon)
Date: Mon Jan 4 18:37:34 2010
Subject: [datatype-dev] CR: Add movie fragments support to mp4fformat
In-Reply-To: <046D7BA3-3F83-4991-9FDC-3F272A443320@real.com>
References: <4B3C272C.80802@real.com>
<046D7BA3-3F83-4991-9FDC-3F272A443320@real.com>
Message-ID: <4B423D50.4020503@real.com>
On 1/4/2010 9:53 AM, Eric Hyche wrote:
> These changes look good to me. Couple of questions/requests:
>
> - can you add HX_ASSERT()'s when we encounter the
> unsupported cases?
Yeah that's probably a good idea, I will do that.
> - how does random access work when there is no mfra? Do
> we have to simply read through the file, looking for
> moof's?
>
Basically! We have to go through each sample until we find the right
time. This can be improved in the future for cases where you are
seeking back into time already played or parsed. I added much of what is
needed for this, storing fragment start times and a reverse seek, but it
is not complete or in use yet.
Thanks,
Jamie
> Eric
>
> On Dec 30, 2009, at 11:23 PM, Jamie Gordon wrote:
>
>> Synopsis
>> ========
>> Adds basic support for moof fragments
>>
>> Branches: HEAD (SERVER_CURRENT)
>> Suggested Reviewer: eric or milko, shantha or dean
>>
>>
>> Description
>> ===========
>> Adds fragments support. Currently Only enabled for server profiles.
>> This is needed in order to support content created by Flash Live
>> Encoder, and this is the only encoder I currently have that will create
>> fragmented files so that is all I have tested with.
>>
>> The various atom definitions are updated to add the various accessors
>> and missing values and to make trun a PagingAtom. trun and tfhd had
>> to depart a bit from the structure of the other atom classes, due to
>> the way they are defined. Most of the values are optional, and present
>> or not depending on the flags. So they can't use the packed struct for
>> accessing, and need to be parsed all at once.
>>
>> A new class CQT_TrackFragment_Manager is added to the atom managers
>> which manages the fragments associated with a track. Another manager
>> is also added, CQT_Sample_Manager, which manages the
>> CQT_TrackFragment_Manager and the stbl managers and the incredible
>> awkwardness of switching between stbl and fragments. The logic in
>> QTTrack that handles/depends on the structure of stbl atoms was moved
>> into this class when reading stbl samples.
>>
>> I did not add handling or usage of mfra atom, as Adobe's encoder does
>> not add it. It just makes seeking more efficient.
>>
>> I did not add support for the case where the traf atom does not have a
>> base offset. In that case, the base offset of the first fragment in a
>> moof is the file offset of the moof, and then for each following
>> fragment is the end of the previous fragment. This will require passing
>> the file offset all the way down, etc.
>>
>> In case hint tracks are present in a fragmented file, they will be
>> ignored. Hint tracks and fragments don't really work together since
>> hint tracks reference samples by the absolute stbl sample number.
>>
>> There was a change somewhat recently that changed from passing
>> ATOMIZE_ALL to the atomization of the file root to instead get the file
>> size and pass that. (This was added to fix/improve progressive download
>> case.) This is a problem however, as it causes the atomizer to stop
>> parsing too soon, after it gets to the mdat. I just ifdef'd that logic
>> out for server builds as we really want to do a true atomize all, but it
>> will probably need to be fixed properly for the client.
>>
>>
>> Files Affected
>> ==============
>> datatype/mp4/fileformat/qtatmmgs.cpp
>> datatype/mp4/fileformat/qtatmmgs_inline.h
>> datatype/mp4/fileformat/qtffplin.cpp
>> datatype/mp4/fileformat/qttrack.cpp
>> datatype/mp4/fileformat/qttrkmgr.cpp
>> datatype/mp4/fileformat/pub/iqttrack.h
>> datatype/mp4/fileformat/pub/qtatmmgs.h
>> datatype/mp4/fileformat/pub/qtatoms.h
>> datatype/mp4/fileformat/pub/qtatoms_inline.h
>> datatype/mp4/fileformat/pub/qtswtrack.h
>> datatype/mp4/fileformat/pub/qttrack.h
>> datatype/mp4/fileformat/pub/qttrkmgr.h
>> datatype/mp4/payload/Umakefil
>>
>>
>> Testing Performed
>> =================
>> - Streaming and seeking of fragmented files
>> - Streaming and seeking of normal files
>> - Client local playback and seeking of normal files (with fragments
>> disabled at build)
>>
>> Platforms Tested: win32-i386-vc7
>> Build verified: linux-rhel5-i686, sunos-5.10-sparc-server,
>> win32-i386-vc7
>>
>>
>> QA Hints
>> ===============
>>
>> Normal 3GP/MP4 playback needs to be spot checked as well as Flash Live
>> Encoder content.
>>
>>
>
> Eric Hyche (ehyche@real.com)
> Principal Engineer
> RealNetworks, Inc.
>
>
From jgordon at real.com Mon Jan 4 12:13:15 2010
From: jgordon at real.com (Jamie Gordon)
Date: Mon Jan 4 19:39:42 2010
Subject: [datatype-dev] Checkin: Add movie fragments support to mp4fformat
Message-ID: <4B424BDB.9070200@real.com>
Synopsis
========
Adds basic support for moof fragments
Branches: HEAD (SERVER_CURRENT)
Reviewer: ehyche
Description
===========
Adds fragments support. Currently Only enabled for server profiles.
This is needed in order to support content created by Flash Live
Encoder, and this is the only encoder I currently have that will create
fragmented files so that is all I have tested with.
The various atom definitions are updated to add the various accessors
and missing values and to make trun a PagingAtom. trun and tfhd had
to depart a bit from the structure of the other atom classes, due to
the way they are defined. Most of the values are optional, and present
or not depending on the flags. So they can't use the packed struct for
accessing, and need to be parsed all at once.
A new class CQT_TrackFragment_Manager is added to the atom managers
which manages the fragments associated with a track. Another manager
is also added, CQT_Sample_Manager, which manages the
CQT_TrackFragment_Manager and the stbl managers and the incredible
awkwardness of switching between stbl and fragments. The logic in
QTTrack that handles/depends on the structure of stbl atoms was moved
into this class when reading stbl samples.
I did not add handling or usage of mfra atom, as Adobe's encoder does
not add it. It just makes seeking more efficient.
I did not add support for the case where the traf atom does not have a
base offset. In that case, the base offset of the first fragment in a
moof is the file offset of the moof, and then for each following
fragment is the end of the previous fragment. This will require passing
the file offset all the way down, etc.
In case hint tracks are present in a fragmented file, they will be
ignored. Hint tracks and fragments don't really work together since
hint tracks reference samples by the absolute stbl sample number.
There was a change somewhat recently that changed from passing
ATOMIZE_ALL to the atomization of the file root to instead get the file
size and pass that. (This was added to fix/improve progressive download
case.) This is a problem however, as it causes the atomizer to stop
parsing too soon, after it gets to the mdat. I just ifdef'd that logic
out for server builds as we really want to do a true atomize all, but it
will probably need to be fixed properly for the client.
Files Affected
==============
datatype/mp4/fileformat/qtatmmgs.cpp
datatype/mp4/fileformat/qtatmmgs_inline.h
datatype/mp4/fileformat/qtffplin.cpp
datatype/mp4/fileformat/qttrack.cpp
datatype/mp4/fileformat/qttrkmgr.cpp
datatype/mp4/fileformat/pub/iqttrack.h
datatype/mp4/fileformat/pub/qtatmmgs.h
datatype/mp4/fileformat/pub/qtatoms.h
datatype/mp4/fileformat/pub/qtatoms_inline.h
datatype/mp4/fileformat/pub/qtswtrack.h
datatype/mp4/fileformat/pub/qttrack.h
datatype/mp4/fileformat/pub/qttrkmgr.h
datatype/mp4/payload/Umakefil
Testing Performed
=================
- Streaming and seeking of fragmented files
- Streaming and seeking of normal files
- Client local playback and seeking of normal files (with fragments
disabled at build)
Platforms Tested: win32-i386-vc7
Build verified: linux-rhel5-i686, sunos-5.10-sparc-server,
win32-i386-vc7
QA Hints
===============
Normal 3GP/MP4 playback needs to be spot checked as well as Flash Live
Encoder content.
From gahluwalia at real.com Mon Jan 4 23:09:59 2010
From: gahluwalia at real.com (Gurpreet)
Date: Tue Jan 5 06:36:22 2010
Subject: [datatype-dev] CN: Fix for Bug 9915 a particular mp3 file cannot be
played
In-Reply-To:
References: <4B384955.7020604@real.com> <4B3849CB.4040901@real.com>
Message-ID: <4B42E5C7.8080105@real.com>
Thanks Eric,
I have done this for all not just Android.
This is checked into at310, at361, head and brizo 401.
Thanks,
Gurpreet
Eric Hyche wrote:
> I think it's safe to increase this to 16k on all platforms, not just Android.
>
> Eric
>
> On Dec 28, 2009, at 1:01 AM, Gurpreet wrote:
>
>
>> Forgot to attach diff.
>> PFA.
>>
>> Thanks,
>> Gurpreet
>>
>> Gurpreet wrote:
>>
>>> Synopsis:
>>> Fix for Bug 9915 a particular mp3 file cannot be played
>>>
>>> Overview:
>>> This particular mp3 file mentioned in the bug is not recognized by the
>>> android player.
>>> Reason for that is:
>>> Frame Sync bits are at position 16128 where as we check till 512.
>>> There fore for android we have increased the scan bytes value to 16 KB.
>>>
>>> Files Modified:
>>> /common/system/recognizer.cpp
>>>
>>> Image Size and Heap Use impact (Client -Only):
>>> None
>>>
>>> Platforms and Profiles Build Verified:
>>> BIF branch -> atlas 310, atlas 361, brizo 401, head
>>> Target(s) -> android_all
>>> Profile -> helix-client-android-surf_8x50
>>> SYSTEM_ID -> android-donut-arm.eabi
>>>
>>> Files Attached::
>>> common.diff
>>>
>>> Thanks & Best Regards,
>>> Gurpreet
>>>
>>>
>>
>>
>
> Eric Hyche (ehyche@real.com)
> Principal Engineer
> RealNetworks, Inc.
>
>
>
>
From ehyche at real.com Tue Jan 5 08:50:32 2010
From: ehyche at real.com (Eric Hyche)
Date: Tue Jan 5 16:19:37 2010
Subject: [datatype-dev] CR: Add ISO-based file format for RealMedia
Message-ID: <7ECCEA249B7CDC49A079EC0075E999AA07D84D8522@SEAMBX.corp.real.com>
Description
------------------------------------------------
For the NGV project, Sujeet and I are experimenting with a new ISO-based file format to contain RealAudio and RealVideo. This CR contains the player-related changes necessary to play this new file format.
These changes are only on the HEAD and are all cordoned off by the use of the HELIX_FEATURE_RMFF_ISO_BASED feature define. Therefore, these changes should have no effect on any current builds or products. In order to make use of these changes, this feature define would have to be added to a profile.
Files Modified
------------------------------------------------
See attached diff files.
Branches
------------------------------------------------
HEAD only
Eric Hyche
Principal Engineer, RealNetworks
ehyche@real.com
-------------- next part --------------
Index: hxmime.h
===================================================================
RCS file: /cvsroot/common/include/hxmime.h,v
retrieving revision 1.3
diff -u -w -r1.3 hxmime.h
--- hxmime.h 21 Apr 2009 14:10:07 -0000 1.3
+++ hxmime.h 5 Jan 2010 16:25:37 -0000
@@ -61,6 +61,9 @@
#define REALAUDIO_PD_MIME_TYPE "audio/x-pn-realaudio-pd"
#define REALVIDEO_MIME_TYPE "video/x-pn-realvideo"
#define REALVIDEO_ENCRYPTED_MIME_TYPE "video/x-pn-realvideo-encrypted"
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+#define REALVIDEO_UNPACKETIZED_MIME_TYPE "video/x-pn-realvideo-unpacketized"
+#endif
#define IMAGEMAP_MIME_TYPE "image_map/x-pn-realvideo"
#define IMAGEMAP_ENCRYPTED_MIME_TYPE "image_map/x-pn-realvideo-encrypted"
#define SYNCMM_MIME_TYPE "syncMM/x-pn-realvideo"
-------------- next part --------------
Index: qtatmmgs.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/qtatmmgs.cpp,v
retrieving revision 1.67
diff -u -w -r1.67 qtatmmgs.cpp
--- qtatmmgs.cpp 4 Jan 2010 20:13:40 -0000 1.67
+++ qtatmmgs.cpp 5 Jan 2010 16:26:29 -0000
@@ -48,6 +48,9 @@
#include "mp4desc.h"
#include "hxstrutl.h"
#include "iso639.h"
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+#include "rmngdefs.h"
+#endif
#include "rtptypes.h"
#include "rtsputil.h"
@@ -2807,6 +2810,17 @@
SkipToAvcC(m_pOpaqueData, ulSampleDescEntrySize);
}
break;
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ case QT_rv41:
+ if (ulSampleDescEntrySize > sizeof(CQT_stsd_Atom::VideoRVArrayEntry))
+ {
+ CQT_stsd_Atom::VideoRVArrayEntry* pEntry = (CQT_stsd_Atom::VideoRVArrayEntry*) pSampleDescEntry;
+ m_ulFrameWidth = CQTAtom::GetUI16((UINT8*) pEntry->pWidth);
+ m_ulFrameHeight = CQTAtom::GetUI16((UINT8*) pEntry->pHeight);
+ m_pOpaqueData = pEntry->pOpaqueData;
+ }
+ break;
+#endif
case QT_sqcp:
if (ulSampleDescEntrySize >
sizeof(CQT_stsd_Atom::AudioQCELPArrayEntry))
@@ -2935,6 +2949,18 @@
SkipToAvcC(m_pOpaqueData, ulSampleDescEntrySize);
}
}
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ else if (pSampleDescManager->GetDataFormat() == QT_rv41)
+ {
+ if (ulSampleDescEntrySize > sizeof(CQT_stsd_Atom::VideoRVArrayEntry))
+ {
+ CQT_stsd_Atom::VideoRVArrayEntry* pEntry = (CQT_stsd_Atom::VideoRVArrayEntry*) pSampleDescEntry;
+ m_ulFrameWidth = CQTAtom::GetUI16((UINT8*) pEntry->pWidth);
+ m_ulFrameHeight = CQTAtom::GetUI16((UINT8*) pEntry->pHeight);
+ m_pOpaqueData = pEntry->pOpaqueData;
+ }
+ }
+#endif
break;
case QT_soun:
if (ulSampleDescEntrySize >=
@@ -3158,6 +3184,11 @@
case QT_avc1:
pMediaName = "X-HX-AVC1";
break;
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ case QT_rv41:
+ pMediaName = HX_RMNG_STREAM_MIME_TYPE_RV10_SUFFIX;
+ break;
+#endif
default:
// nothing to do
break;
Index: qtffplin.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/qtffplin.cpp,v
retrieving revision 1.83
diff -u -w -r1.83 qtffplin.cpp
--- qtffplin.cpp 4 Jan 2010 20:13:40 -0000 1.83
+++ qtffplin.cpp 5 Jan 2010 16:26:29 -0000
@@ -91,6 +91,9 @@
#include "metainfokeys.h"
#include "metautil.h"
#include "hxurl.h"
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+#include "rmngdefs.h"
+#endif
/****************************************************************************
* Constants
@@ -120,11 +123,23 @@
#define ONM_MOV "QuickTime Files (*.mov, *.qt)"
#define ONM_F4V "F4V Files (*.f4v)"
-const char* const CQTFileFormat::zm_pFileMimeTypes[] = {"application/x-pn-quicktime-stream", "audio/3gpp", "video/3gpp", "audio/x-m4a", "video/mp4", "audio/mp4", "video/3gpp2", "audio/mpeg4-generic", NULL};
-
-const char* const CQTFileFormat::zm_pFileExtensions[] = {EXT_MOV, EXT_MP4, EXT_3GP, EXT_3G2, EXT_M4A,EXT_F4V, NULL};
-
-const char* const CQTFileFormat::zm_pFileOpenNames[] = {ONM_MOV, ONM_MP4, ONM_3GP, ONM_F4V, NULL};
+const char* const CQTFileFormat::zm_pFileMimeTypes[] = {"application/x-pn-quicktime-stream", "audio/3gpp", "video/3gpp", "audio/x-m4a", "video/mp4", "audio/mp4", "video/3gpp2", "audio/mpeg4-generic",
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ HX_RMNG_MIME_TYPE,
+#endif
+ NULL};
+
+const char* const CQTFileFormat::zm_pFileExtensions[] = {EXT_MOV, EXT_MP4, EXT_3GP, EXT_3G2, EXT_M4A,EXT_F4V,
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ HX_RMNG_EXTENSION,
+#endif
+ NULL};
+
+const char* const CQTFileFormat::zm_pFileOpenNames[] = {ONM_MOV, ONM_MP4, ONM_3GP, ONM_F4V,
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ HX_RMNG_FILE_OPEN_DESC,
+#endif
+ NULL};
const char* const CQTFileFormat::zm_pPacketFormats[] = {"rtp", "rdt", NULL};
Index: qtpacketizerfct.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/qtpacketizerfct.cpp,v
retrieving revision 1.12
diff -u -w -r1.12 qtpacketizerfct.cpp
--- qtpacketizerfct.cpp 5 Oct 2009 20:50:08 -0000 1.12
+++ qtpacketizerfct.cpp 5 Jan 2010 16:26:29 -0000
@@ -402,6 +402,13 @@
case QT_FTYPE_EMC:
retVal = HXR_NOTIMPL;
break;
+
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ case QT_FTYPE_RMNG:
+ retVal = HXR_NO_DATA;
+ break;
+#endif
+
default:
retVal = HXR_FAIL;
break;
Index: qttrack.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/qttrack.cpp,v
retrieving revision 1.42
diff -u -w -r1.42 qttrack.cpp
--- qttrack.cpp 4 Jan 2010 20:13:40 -0000 1.42
+++ qttrack.cpp 5 Jan 2010 16:26:29 -0000
@@ -65,6 +65,8 @@
#include "sdpchunk.h"
#include "sdppyldinfo.h"
#include "metautil.h"
+#include "hxpacketflags.h"
+#include "rule2flg.h"
/****************************************************************************
@@ -81,6 +83,7 @@
, m_pPacketAssembler(NULL)
, m_pClassFactory(NULL)
, m_ulTrackID(0)
+ , m_ulDataFormat0(0)
, m_ulReadSize(0)
, m_ulReadPageSize(0)
, m_ulReadPageOffset(0)
@@ -355,6 +358,7 @@
ULONG32 ulHeight = 0;
ULONG32 ulFrameWidth = 0;
ULONG32 ulFrameHeight = 0;
+ UINT32 ulDataFormat = 0;
HX_RESULT retVal = HXR_OK;
if (m_TrackInfo.GetHeader(pHeader) == HXR_OK)
@@ -574,6 +578,14 @@
}
#endif
+ // Get the data format from the sample description manager
+ if (m_SampleDesc.EstablishByIdx(0))
+ {
+ // Get the first data forma in the sample description box
+ ulDataFormat = m_SampleDesc.GetDataFormat();
+ // Save this data format
+ m_ulDataFormat0 = ulDataFormat;
+ }
// Set ASM Rule Book
if (SUCCEEDED(retVal))
{
@@ -647,6 +659,18 @@
}
else
#endif // QTCONFIG_SERVER
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ if (ulDataFormat == QT_rv41)
+ {
+ // Set the ASMRuleBook for RealVideo
+ SafeSprintf(pRuleBook, 256,
+ "#($Bandwidth >= %lu),Priority=9,AverageBandwidth=%lu,PNMKeyFrameRule=T;"
+ "#($Bandwidth >= %lu),OnDepend=\"0\",Priority=5,AverageBandwidth=0,PNMNonKeyFrameRule=T;"
+ "#($Bandwidth < %lu),Priority=9,timestampdelivery=T,DropByN=T,PNMThinningRule=T;",
+ ulAvgBitRate, ulAvgBitRate, ulAvgBitRate, ulAvgBitRate);
+ }
+ else
+#endif
{
// Player Side
SafeSprintf(pRuleBook, 128, "Marker=%d;Marker=%d;",
@@ -664,6 +688,34 @@
{
pHeader->SetPropertyCString("ASMRuleBook", pASMRuleBook);
}
+
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ if (ulDataFormat == QT_rv41)
+ {
+ // Compute the number of bytes needed for the RuleToFlag map
+ // One UINT16 for the number of rules and 3 UINT16's for the rules.
+ UINT32 ulMapBytes = sizeof(UINT16) + 3 * sizeof(UINT32);
+ // We need to set the Rule2Flag map.
+ BYTE* pRuleToFlagMap = new BYTE [ulMapBytes];
+ if (pRuleToFlagMap)
+ {
+ BYTE* pBuf = pRuleToFlagMap;
+ UINT32 ulBufLen = ulMapBytes;
+ // Pack the number of rules
+ PackUINT16BEInc(&pBuf, &ulBufLen, 3);
+ // Pack flags for rule 0
+ PackUINT16BEInc(&pBuf, &ulBufLen, HX_KEYFRAME_FLAG);
+ // Pack flags for rule 1
+ PackUINT16BEInc(&pBuf, &ulBufLen, 0);
+ // Pack flags for rule 2
+ PackUINT16BEInc(&pBuf, &ulBufLen, HX_KEYFRAME_FLAG);
+ // Set this into the stream header
+ SetBufferPropertyCCF(pHeader, RULE_TO_FLAG_MAP_PROPERTY, pRuleToFlagMap, ulMapBytes, (IUnknown*) m_pClassFactory);
+ }
+ HX_VECTOR_DELETE(pRuleToFlagMap);
+ }
+#endif
+
}
HX_RELEASE(pASMRuleBook);
@@ -1219,6 +1271,15 @@
{
if (status == HXR_OK)
{
+ // Set the ASM rule number
+ UINT16 usASMRuleNum = m_uBaseRuleNumber + QTASM_MARKER_ON_RULE;
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ if (m_ulDataFormat0 && m_ulDataFormat0 == QT_rv41)
+ {
+ // For RealVideo, if this is a keyframe, then rule 0. Non-keyframe: rule 1 (from the base rule)
+ usASMRuleNum = (m_SampleManager.IsOnSyncSample() ? m_uBaseRuleNumber : (m_uBaseRuleNumber + 1));
+ }
+#endif
status = ((IHXRTPPacket*) pPacket)->SetRTP(
pBuffer,
ulTime,
@@ -1227,7 +1288,7 @@
m_SampleManager.IsOnSyncSample() ?
(HX_ASM_SWITCH_ON | HX_ASM_SWITCH_OFF) :
HX_ASM_SWITCH_OFF, // ASM Flags
- m_uBaseRuleNumber + QTASM_MARKER_ON_RULE);
+ usASMRuleNum);
}
pBuffer->Release();
Index: qttrkmgr.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/qttrkmgr.cpp,v
retrieving revision 1.25
diff -u -w -r1.25 qttrkmgr.cpp
--- qttrkmgr.cpp 4 Jan 2010 20:13:40 -0000 1.25
+++ qttrkmgr.cpp 5 Jan 2010 16:26:30 -0000
@@ -1440,6 +1440,12 @@
m_FType = QT_FTYPE_MP4;
break;
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ case QT_rmng:
+ m_FType = QT_FTYPE_RMNG;
+ break;
+#endif
+
default:
if (ulCompBrandIdx < ulNumCompBrands)
{
Index: pub/qtatoms.h
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/pub/qtatoms.h,v
retrieving revision 1.38
diff -u -w -r1.38 qtatoms.h
--- pub/qtatoms.h 4 Jan 2010 20:13:41 -0000 1.38
+++ pub/qtatoms.h 5 Jan 2010 16:26:30 -0000
@@ -206,6 +206,9 @@
QT_alac = QT_ENCODE_TYPE('a', 'l', 'a', 'c'),
QT_alaw = QT_ENCODE_TYPE('a', 'l', 'a', 'w'),
QT_ulaw = QT_ENCODE_TYPE('u','l','a','w'),
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ QT_rv41 = QT_ENCODE_TYPE('r', 'v', '4', '1'),
+#endif
// /-->> 3GPP Timed Text box types:
QT_text = QT_ENCODE_TYPE('t', 'e', 'x', 't'),
QT_tx3g = QT_ENCODE_TYPE('t', 'x', '3', 'g'),
@@ -233,6 +236,7 @@
typedef enum
{
QT_isom = QT_ENCODE_TYPE('i', 's', 'o', 'm'),
+ QT_iso2 = QT_ENCODE_TYPE('i', 's', 'o', '2'),
QT_3gp4 = QT_ENCODE_TYPE('3', 'g', 'p', '4'),
QT_3gp5 = QT_ENCODE_TYPE('3', 'g', 'p', '5'),
QT_mp41 = QT_ENCODE_TYPE('m', 'p', '4', '1'),
@@ -245,6 +249,9 @@
QT_3gr6 = QT_ENCODE_TYPE('3', 'g', 'r', '6'),
QT_3gs6 = QT_ENCODE_TYPE('3', 'g', 's', '6'),
QT_MSNV = QT_ENCODE_TYPE('M', 'S', 'N', 'V')
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ ,QT_rmng = QT_ENCODE_TYPE('r', 'm', 'n', 'g')
+#endif
} QTKnownBrandType;
/****************************************************************************
@@ -3341,6 +3348,14 @@
UINT8 pDecoderSpecificInfo[1];
} PACKING;
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ class VideoRVArrayEntry : public VideoArrayEntry
+ {
+ public:
+ UINT8 pOpaqueData[1];
+ } PACKING;
+#endif
+
class AudioALACArrayEntry : public AudioArrayEntry
{
public:
Index: pub/qttrack.h
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/pub/qttrack.h,v
retrieving revision 1.20
diff -u -w -r1.20 qttrack.h
--- pub/qttrack.h 4 Jan 2010 20:13:41 -0000 1.20
+++ pub/qttrack.h 5 Jan 2010 16:26:30 -0000
@@ -272,6 +272,7 @@
IHXCommonClassFactory* m_pClassFactory;
ULONG32 m_ulTrackID;
+ UINT32 m_ulDataFormat0;
ULONG32 m_ulReadSize;
ULONG32 m_ulReadPageSize;
Index: pub/qttrkmgr.h
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/pub/qttrkmgr.h,v
retrieving revision 1.15
diff -u -w -r1.15 qttrkmgr.h
--- pub/qttrkmgr.h 4 Jan 2010 20:13:41 -0000 1.15
+++ pub/qttrkmgr.h 5 Jan 2010 16:26:30 -0000
@@ -59,6 +59,9 @@
QT_FTYPE_QT,
QT_FTYPE_MP4,
QT_FTYPE_EMC
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ ,QT_FTYPE_RMNG
+#endif
} QT_FTYPE;
typedef enum
-------------- next part --------------
? rvsh.cpp
? rvsh.h
Index: Umakefil
===================================================================
RCS file: /cvsroot/datatype/mp4/filewriter/Umakefil,v
retrieving revision 1.11
diff -u -w -r1.11 Umakefil
--- Umakefil 20 Apr 2009 17:24:05 -0000 1.11
+++ Umakefil 5 Jan 2010 16:26:47 -0000
@@ -17,6 +17,7 @@
'client/audiosvc/pub',
'client/common/container/pub',
'datatype/include',
+ 'datatype/rm/include',
'datatype/common/util/pub',
'datatype/common/filewriter/pub',
'datatype/rm/audio/common/pub',
@@ -63,6 +64,9 @@
project.AddSources('3gpmeta.cpp')
+if project.IsDefined("HELIX_FEATURE_RMFF_ISO_BASED"):
+ project.AddSources('rvsh.cpp')
+
project.AddExportedFunctions('RMACreateInstance')
DLLTarget('mp4wrtr')
Index: mp4atomgateway.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/filewriter/mp4atomgateway.cpp,v
retrieving revision 1.3
diff -u -w -r1.3 mp4atomgateway.cpp
--- mp4atomgateway.cpp 16 Oct 2009 16:46:17 -0000 1.3
+++ mp4atomgateway.cpp 5 Jan 2010 16:26:47 -0000
@@ -35,10 +35,25 @@
#include "mp4wrtr.h"
#include "mp4sm.h"
#include "mp4atomgateway.h"
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+#include "rmngdefs.h"
+#endif
-const char* CMP4FileWriter::zm_pFileMimeTypes[] = {"audio/X-RN-MP4-RAWAU", NULL};
-const char* CMP4FileWriter::zm_pFileExtensions[] = {"m4a", "mp4", "3gp", "3g2", NULL};
-const char* CMP4FileWriter::zm_pFileOpenNames[] = {"MP4 Files (.mp4;.m4a;.3gp;.3g2)", NULL};
+const char* CMP4FileWriter::zm_pFileMimeTypes[] = {"audio/X-RN-MP4-RAWAU",
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ HX_RMNG_MIME_TYPE,
+#endif
+ NULL};
+const char* CMP4FileWriter::zm_pFileExtensions[] = {"m4a", "mp4", "3gp", "3g2",
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ HX_RMNG_EXTENSION,
+#endif
+ NULL};
+const char* CMP4FileWriter::zm_pFileOpenNames[] = {"MP4 Files (.mp4;.m4a;.3gp;.3g2)",
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ HX_RMNG_FILE_OPEN_DESC,
+#endif
+ NULL};
// Build out an stsd entry for a specific stream
HX_RESULT CMP4AtomsGateway::BuildSpecificStsdEntry(CMP4StreamMixer* pM4AStreamMixer,
Index: mp4atoms.h
===================================================================
RCS file: /cvsroot/datatype/mp4/filewriter/mp4atoms.h,v
retrieving revision 1.16
diff -u -w -r1.16 mp4atoms.h
--- mp4atoms.h 23 Oct 2009 09:47:54 -0000 1.16
+++ mp4atoms.h 5 Jan 2010 16:26:48 -0000
@@ -1654,6 +1654,73 @@
UINT32 m_ulAVCCDataSize;
};
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+
+// atom: rv41
+// container: stsd
+// purpose: RealVideo sample description entry
+class CMP4Atom_rv41 : public CMP4Atom_VisualSampleEntry
+{
+public:
+ CMP4Atom_rv41() : CMP4Atom_VisualSampleEntry(MP4_BUILD_ATOMID('r','v','4','1'))
+ {
+ m_pRVOpaqueData = NULL;
+ m_ulRVOpaqueDataSize = 0;
+ }
+
+ ~CMP4Atom_rv41()
+ {
+ HX_VECTOR_DELETE(m_pRVOpaqueData);
+ m_ulRVOpaqueDataSize = 0;
+ }
+
+ STDMETHOD_(UINT32,GetCurrentSize) (THIS_ HXBOOL bIncludeChildren = FALSE)
+ {
+ UINT32 len = CMP4Atom_VisualSampleEntry::GetCurrentSize(bIncludeChildren) + m_ulRVOpaqueDataSize;
+ return len;
+ }
+
+ STDMETHOD(WriteToBuffer) (THIS_ UCHAR*& pBuffer, HXBOOL bIncludeChildren = FALSE)
+ {
+ HX_RESULT retVal = HXR_OK;
+
+ if (pBuffer)
+ {
+ // Write out the base VisualSampleEntry class
+ CMP4Atom_VisualSampleEntry::WriteToBuffer(pBuffer, FALSE);
+ // Write out the RV Opaque Data
+ CMP4Atom::WriteToBufferAndInc(pBuffer, m_pRVOpaqueData, m_ulRVOpaqueDataSize);
+ // Write out any children
+ if (bIncludeChildren)
+ {
+ ChildrenWriteToBuffer(pBuffer);
+ }
+ }
+
+ return retVal;
+ }
+
+ void SetRVOpaqueData(BYTE* pData, UINT32 ulSize)
+ {
+ if (pData && ulSize)
+ {
+ HX_VECTOR_DELETE(m_pRVOpaqueData);
+ m_pRVOpaqueData = new BYTE [ulSize];
+ if (m_pRVOpaqueData)
+ {
+ memcpy(m_pRVOpaqueData, pData, ulSize);
+ m_ulRVOpaqueDataSize = ulSize;
+ }
+ }
+ }
+
+private:
+ BYTE* m_pRVOpaqueData;
+ UINT32 m_ulRVOpaqueDataSize;
+};
+
+#endif /* #if defined(HELIX_FEATURE_RMFF_ISO_BASED) */
+
// atom: mp4v
// container: stsd
// purpose: mp4v video sample description entry
Index: mp4sm.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/filewriter/mp4sm.cpp,v
retrieving revision 1.22
diff -u -w -r1.22 mp4sm.cpp
--- mp4sm.cpp 23 Dec 2009 03:05:44 -0000 1.22
+++ mp4sm.cpp 5 Jan 2010 16:26:48 -0000
@@ -41,6 +41,9 @@
#include "mp4sm.h"
#include "mp4atoms.h"
#include "asmrulep.h"
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+#include "rmngdefs.h"
+#endif
#include "m4amdatoms.h"
#include "pspmeta.h"
@@ -1352,6 +1355,38 @@
return retVal;
}
+STDMETHODIMP_(HXBOOL) CMP4StreamMixer::ShouldIgnorePacket(IHXPacket* pPacket)
+{
+ HXBOOL bRet = FALSE;
+
+ if (pPacket)
+ {
+ // Get the stream number
+ UINT32 ulStreamNum = (UINT32) pPacket->GetStreamNumber();
+ // Sanity check
+ if (m_pStreamInfo && ulStreamNum < m_ulStreamCount)
+ {
+ // Get the ASM rule number
+ UINT32 ulASMRuleNum = (UINT32) pPacket->GetASMRuleNumber();
+ // Sanity check
+ if (m_pStreamInfo->m_pASMRuleInfo && ulASMRuleNum < m_pStreamInfo->m_ulNumASMRules)
+ {
+ // Is this a "thinning" rule? In RV streams, the rm session format generates
+ // a thiining rule which applies to keyframes. Therefore, the ASM Mux will duplicate
+ // keyframe packets - the first will belong to the keyframe rule, and the second to
+ // the thinning rule. We want to ignore the thinning rule packets.
+ if (m_pStreamInfo->m_pASMRuleInfo[ulASMRuleNum].m_bPNMThinning)
+ {
+ // This is a thinning rule packet, so we should ignore it.
+ bRet = TRUE;
+ }
+ }
+ }
+ }
+
+ return bRet;
+}
+
HX_RESULT CMP4StreamMixer::BuildMP4Atoms()
{
HX_RESULT retVal = HXR_OUTOFMEMORY;
@@ -1444,6 +1479,15 @@
m_eMetaFlavor = META_3GPP;
}
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ else
+ if (stricmp(fileExt, HX_RMNG_EXTENSION_WITH_DOT) == 0)
+ {
+ pFtyp->SetMajorBrand(HX_RMNG_MAJOR_BRAND);
+ pFtyp->SetCompatibleBrands(HX_RMNG_COMPATIBLE_BRANDS);
+ pFtyp->SetMinorVersion(0);
+ }
+#endif
else
if ( stricmp(fileExt, ".m4a") == 0
|| stricmp(fileExt, ".m4p") == 0 )
@@ -4616,6 +4660,11 @@
case MP4_BUILD_ATOMID('a', 'm', 'r', ' '):
return BuildAMRStsdEntry(pStsd, usStreamNum);
break;
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ case MP4_BUILD_ATOMID('r', 'v', '4', '1'):
+ return BuildRVStsdEntry(pStsd, usStreamNum);
+ break;
+#endif
default:
return HXR_INVALID_PARAMETER;
break;
@@ -4921,6 +4970,45 @@
return retVal;
}
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+
+HX_RESULT CMP4StreamMixer::BuildRVStsdEntry( CMP4Atom_stsd* pStsd, UINT16 usStreamNum )
+{
+ IHXValues* pStreamHeader = m_pStreamInfo[usStreamNum].m_pStreamHeader;
+ HX_RESULT retVal = HXR_OUTOFMEMORY;
+ IHXBuffer* pDecoderInfo = NULL;
+
+ retVal = pStreamHeader->GetPropertyBuffer("DecoderInfo", pDecoderInfo);
+
+ if( SUCCEEDED( retVal ) )
+ {
+ UCHAR* pBuf = pDecoderInfo->GetBuffer();
+ UINT32 len = pDecoderInfo->GetSize();
+
+ CMP4Atom_rv41* pRV41 = new CMP4Atom_rv41();
+ if (pRV41)
+ {
+ retVal = HXR_OK;
+
+ UINT32 ulWidth = 0, ulHeight = 0;
+ m_pStreamInfo[usStreamNum].m_pStreamHeader->GetPropertyULONG32("Width", ulWidth);
+ m_pStreamInfo[usStreamNum].m_pStreamHeader->GetPropertyULONG32("Height", ulHeight);
+ // Set Width and Height - these are located in base VisualSampleEntry class
+ pRV41->SetWidth((UINT16) ulWidth);
+ pRV41->SetHeight((UINT16) ulHeight);
+ // Set the RV Opaque Data
+ pRV41->SetRVOpaqueData(pBuf, len);
+
+ pStsd->AddChild(pRV41);
+ }
+ HX_RELEASE(pDecoderInfo);
+ }
+
+ return retVal;
+}
+
+#endif /* #if defined(HELIX_FEATURE_RMFF_ISO_BASED) */
+
HX_RESULT CMP4StreamMixer::UpdateTrackDuration( UINT16 usStreamNo, UINT32 ulDuration )
{
Index: mp4sm.h
===================================================================
RCS file: /cvsroot/datatype/mp4/filewriter/mp4sm.h,v
retrieving revision 1.14
diff -u -w -r1.14 mp4sm.h
--- mp4sm.h 9 Nov 2009 19:51:43 -0000 1.14
+++ mp4sm.h 5 Jan 2010 16:26:48 -0000
@@ -97,6 +97,7 @@
STDMETHOD(SetPacket) (THIS_ IHXPacket* pPacket );
STDMETHOD(StreamDone) (THIS_ UINT16 unStreamNumber );
STDMETHOD(MapThroughSwitchGroup) (THIS_ IHXPacket* pPacket, REF(IHXPacket*) rpPacket);
+ STDMETHOD_(HXBOOL,ShouldIgnorePacket) (THIS_ IHXPacket* pPacket );
// XXXAQL
HX_RESULT StartBuildStsdEntry( CMP4Atom_stsd* pStsd, UINT16 usStreamNum );
@@ -256,6 +257,9 @@
HX_RESULT BuildAVC1StsdEntry( CMP4Atom_stsd* pStsd, UINT16 usStreamNum );
HX_RESULT BuildH263StsdEntry( CMP4Atom_stsd* pStsd, UINT16 usStreamNum );
HX_RESULT BuildAMRStsdEntry( CMP4Atom_stsd* pStsd, UINT16 usStreamNum );
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ HX_RESULT BuildRVStsdEntry( CMP4Atom_stsd* pStsd, UINT16 usStreamNum );
+#endif
// 3GP Utilities
void Meta3GP_SetLanguageEncoding(C3GPAtom_LangBase* pAtom, const char* propertySpec = 0);
Index: mp4wrtr.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/filewriter/mp4wrtr.cpp,v
retrieving revision 1.12
diff -u -w -r1.12 mp4wrtr.cpp
--- mp4wrtr.cpp 7 May 2009 15:41:10 -0000 1.12
+++ mp4wrtr.cpp 5 Jan 2010 16:26:48 -0000
@@ -73,6 +73,9 @@
#include "ra10sh.h"
#include "m4avsh.h"
#include "avcsh.h"
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+#include "rvsh.h"
+#endif
#include "h263sh.h"
#include "amrsh.h"
@@ -724,6 +727,22 @@
}
}
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ // RealVideo stream handler
+ if( FAILED( retVal ) )
+ {
+ HX_RELEASE( pTempHandler );
+ retVal = HXR_OUTOFMEMORY;
+ pTempHandler = new CRVStreamHandler( m_pContext, m_pStreamMixer );
+
+ if( pTempHandler )
+ {
+ pTempHandler->AddRef();
+ retVal = TestForMimeSupport( pTempHandler, pStreamMimeType );
+ }
+ }
+#endif /* #if defined(HELIX_FEATURE_RMFF_ISO_BASED) */
+
//h.263 stream handler
if( FAILED( retVal ) )
{
@@ -824,6 +843,12 @@
if (m_State == PacketsReady && m_pStreamMixer && pPacket)
{
+ // Clear the return value
+ retVal = HXR_OK;
+ // Should we ignore this packet?
+ HXBOOL bIgnorePacket = m_pStreamMixer->ShouldIgnorePacket(pPacket);
+ if (!bIgnorePacket)
+ {
// We need to map this packet through the switch group
// to the proper stream number
IHXPacket* pMappedPacket = NULL;
@@ -847,6 +872,7 @@
}
HX_RELEASE(pMappedPacket);
}
+ }
return retVal;
}
Index: pub/mp4fwplg.h
===================================================================
RCS file: /cvsroot/datatype/mp4/filewriter/pub/mp4fwplg.h,v
retrieving revision 1.3
diff -u -w -r1.3 mp4fwplg.h
--- pub/mp4fwplg.h 7 May 2009 15:41:11 -0000 1.3
+++ pub/mp4fwplg.h 5 Jan 2010 16:26:48 -0000
@@ -92,6 +92,7 @@
STDMETHOD(SetPacket) (THIS_ IHXPacket* pPacket ) PURE;
STDMETHOD(StreamDone) (THIS_ UINT16 unStreamNumber ) PURE;
STDMETHOD(MapThroughSwitchGroup) (THIS_ IHXPacket* pPacket, REF(IHXPacket*) rpPacket) PURE;
+ STDMETHOD_(HXBOOL,ShouldIgnorePacket) (THIS_ IHXPacket* pPacket ) PURE;
};
-------------- next part --------------
? pub/rv_payload_format.h
? pub/rv_payload_format_unpacketized.h
Index: pub/rvxpyld.h
===================================================================
RCS file: /cvsroot/datatype/rm/video/common/pub/rvxpyld.h,v
retrieving revision 1.7
diff -u -w -r1.7 rvxpyld.h
--- pub/rvxpyld.h 10 May 2005 14:43:29 -0000 1.7
+++ pub/rvxpyld.h 5 Jan 2010 16:27:25 -0000
@@ -39,6 +39,7 @@
/****************************************************************************
* Includes
*/
+#include "rv_payload_format.h"
#include "hxalloc.h"
class IHXUnknown;
@@ -49,7 +50,7 @@
/****************************************************************************
* RVXPayloadFormat
*/
-class RVXPayloadFormat : public IHXPayloadFormatObject
+class RVXPayloadFormat : public IHXRVPayloadFormatObject
{
public:
RVXPayloadFormat(IHX20MemoryAllocator* pOutputAllocator);
@@ -80,24 +81,18 @@
REF(IHXPacket*) pPacket);
STDMETHOD(Flush) (THIS);
- /*
- * Custom public interface methods
- */
- HX_RESULT CreateHXCodecPacket(HXCODEC_DATA* &pHXCodecDataOut);
- void DisposeHXCodecPacket(HXCODEC_DATA* pHXCodecData);
-
- ULONG32 GetBitstreamHeaderSize(void) { return m_ulBitStrmHeaderSize; }
- const HX_MOF* GetBitstreamHeader(void) { return ((HX_MOF*) m_pBitStrmHeader); }
- const HX_MOF* GetBitstreamHeaderNetOrder(void);
-
- HXBOOL IsSureStream(void);
- HX_RESULT GetFrameRate(UINT16 usASMRule, REF(float) rFrameRate);
-
- HXBOOL IsKeyFramePacket(IHXPacket* pPacket);
- HXBOOL IsFirstKeyFramePacket(IHXPacket* pPacket);
- void SetVelocity(INT32 lVel);
- void SetKeyFrameMode(HXBOOL bMode);
-
+ // IHXRVPayloadFormatObject methods
+ STDMETHOD(CreateHXCodecPacket) (THIS_ REF(HXCODEC_DATA*) rpCodecData);
+ STDMETHOD(DisposeHXCodecPacket) (THIS_ HXCODEC_DATA* pHXCodecData);
+ STDMETHOD_(ULONG32,GetBitstreamHeaderSize) (THIS);
+ STDMETHOD_(const HX_MOF*,GetBitstreamHeader) (THIS);
+ STDMETHOD_(const HX_MOF*,GetBitstreamHeaderNetOrder) (THIS);
+ STDMETHOD_(HXBOOL,IsSureStream) (THIS);
+ STDMETHOD(GetFrameRate) (THIS_ UINT16 usASMRule, REF(float) rfFrameRate);
+ STDMETHOD_(HXBOOL,IsKeyFramePacket) (THIS_ IHXPacket* pPacket);
+ STDMETHOD_(HXBOOL,IsFirstKeyFramePacket) (THIS_ IHXPacket* pPacket);
+ STDMETHOD_(void,SetVelocity) (THIS_ INT32 lVel);
+ STDMETHOD_(void,SetKeyFrameMode) (THIS_ HXBOOL bMode);
private:
void _Close(void);
-------------- next part --------------
Index: rvxvdfmt.cpp
===================================================================
RCS file: /cvsroot/datatype/rm/video/renderer/rvxvdfmt.cpp,v
retrieving revision 1.40
diff -u -w -r1.40 rvxvdfmt.cpp
--- rvxvdfmt.cpp 13 Aug 2008 06:01:31 -0000 1.40
+++ rvxvdfmt.cpp 5 Jan 2010 16:27:57 -0000
@@ -93,6 +93,10 @@
#include "bincount.h"
#include "hxprefs.h"
#include "hxprefutil.h"
+#include "hxmime.h"
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+#include "rv_payload_format_unpacketized.h"
+#endif
#include "rvxvideo.h"
@@ -233,14 +237,43 @@
// Create Packet Assembler
if (SUCCEEDED(retVal))
{
+ // Get the mime type
+ IHXBuffer* pMimeType = NULL;
+ retVal = pHeader->GetPropertyCString("MimeType", pMimeType);
+ if (SUCCEEDED(retVal))
+ {
+ // Set the return value
+ retVal = HXR_FAIL;
+ // Get the mime type string
+ const char* pszMimeType = (const char*) pMimeType->GetBuffer();
+ if (pszMimeType)
+ {
+ // Set the return value
retVal = HXR_OUTOFMEMORY;
- m_pRssm = new RVXPayloadFormat(m_pInputAllocator);
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ // Is this the unpacketized mime type?
+ if (strcmp(pszMimeType, REALVIDEO_UNPACKETIZED_MIME_TYPE) == 0)
+ {
+ // Create the payload format object for unpacketized data
+ m_pRssm = (IHXRVPayloadFormatObject*) new CHXRVPayloadFormatUnpacketized(m_pInputAllocator);
+ }
+ else
+ {
+ // Create the payload format for RV-Packetized data
+ m_pRssm = (IHXRVPayloadFormatObject*) new RVXPayloadFormat(m_pInputAllocator);
+ }
+#else /* #if defined(HELIX_FEATURE_RMFF_ISO_BASED) */
+ // Create the payload format for RV-Packetized data
+ m_pRssm = (IHXRVPayloadFormatObject*) new RVXPayloadFormat(m_pInputAllocator);
+#endif /* #if defined(HELIX_FEATURE_RMFF_ISO_BASED) */
if (m_pRssm)
{
m_pRssm->AddRef();
retVal = HXR_OK;
}
}
+ }
+ }
// Create Decoder
if (SUCCEEDED(retVal))
@@ -1473,7 +1506,7 @@
pCodecData->dataLength = 0;
pCodecData->data = NULL;
pCodecData->timestamp = m_ulLastTimestamp;
- pCodecData->sequenceNum = m_ulLastSequenceNumber + 1;
+ pCodecData->sequenceNum = (UINT16) m_ulLastSequenceNumber + 1;
pCodecData->flags = 0; // don't care
pCodecData->lastPacket = TRUE;
pCodecData->numSegments = 1;
Index: rvxvideo.cpp
===================================================================
RCS file: /cvsroot/datatype/rm/video/renderer/rvxvideo.cpp,v
retrieving revision 1.22
diff -u -w -r1.22 rvxvideo.cpp
--- rvxvideo.cpp 10 Dec 2007 18:02:47 -0000 1.22
+++ rvxvideo.cpp 5 Jan 2010 16:27:57 -0000
@@ -123,6 +123,9 @@
{
REALVIDEO_MIME_TYPE,
REALVIDEO_MULTIRATE_MIME_TYPE,
+#if defined(HELIX_FEATURE_RMFF_ISO_BASED)
+ REALVIDEO_UNPACKETIZED_MIME_TYPE,
+#endif
NULL
};
Index: pub/rvxvdfmt.h
===================================================================
RCS file: /cvsroot/datatype/rm/video/renderer/pub/rvxvdfmt.h,v
retrieving revision 1.16
diff -u -w -r1.16 rvxvdfmt.h
--- pub/rvxvdfmt.h 21 Jul 2008 13:43:41 -0000 1.16
+++ pub/rvxvdfmt.h 5 Jan 2010 16:27:57 -0000
@@ -49,6 +49,7 @@
#include "hxformt.h"
#include "rvxpyld.h"
#include "rvxvdec.h"
+#include "rv_payload_format.h"
/****************************************************************************
* Globals
@@ -178,7 +179,7 @@
void _Reset(void);
void ReleaseDecodedPacket(HXCODEC_DATA* &pDecodedData);
- RVXPayloadFormat* m_pRssm;
+ IHXRVPayloadFormatObject* m_pRssm;
CHXMemoryAllocator* m_pInputAllocator;
-------------- next part --------------
/* ***** BEGIN LICENSE BLOCK *****
* Version: RCSL 1.0/RPSL 1.0
*
* Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved.
*
* The contents of this file, and the files included with this file, are
* subject to the current version of the RealNetworks Public Source License
* Version 1.0 (the "RPSL") available at
* http://www.helixcommunity.org/content/rpsl unless you have licensed
* the file under the RealNetworks Community Source License Version 1.0
* (the "RCSL") available at http://www.helixcommunity.org/content/rcsl,
* in which case the RCSL will apply. You may also obtain the license terms
* directly from RealNetworks. You may not use this file except in
* compliance with the RPSL or, if you have a valid RCSL with RealNetworks
* applicable to this file, the RCSL. Please see the applicable RPSL or
* RCSL for the rights, obligations and limitations governing use of the
* contents of the file.
*
* This file is part of the Helix DNA Technology. RealNetworks is the
* developer of the Original Code and owns the copyrights in the portions
* it created.
*
* This file, and the files included with this file, is distributed and made
* available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
*
* Technology Compatibility Kit Test Suite(s) Location:
* http://www.helixcommunity.org/content/tck
*
* Contributor(s):
*
* ***** END LICENSE BLOCK ***** */
#include "hxcom.h"
#include "hxcomm.h"
#include "chxpckts.h"
#include "hxassert.h"
#include "mp4atoms.h"
#include "mp4sm.h"
#include "rvsh.h"
#include "hxmime.h"
#include "rmfftype.h"
#include "netbyte.h" /* common/util/pub/netbyte.h, dwtohost */
//#include "mp4desc.h" /* for parsing es descriptor/channel count */
// These are the mime types we support
const char* CRVStreamHandler::m_pszFileMimeTypes[] =
{
REALVIDEO_UNPACKETIZED_MIME_TYPE,
NULL
};
const char* CRVStreamHandler::m_pszFileExtensions[] =
{
NULL
};
const char* CRVStreamHandler::m_pszFileOpenNames[] =
{
NULL
};
// CRVStreamHandler code
CRVStreamHandler::CRVStreamHandler( IUnknown* pContext, IMP4StreamMixer* pMixer )
{
m_lRefCount = 0;
m_unStreamNumber = 0;
HX_ASSERT(pMixer);
pMixer->AddRef();
m_pStreamMixer = pMixer;
HX_ASSERT(pContext);
pContext->AddRef();
m_pContext = pContext;
m_pCommonClassFactory = NULL;
}
CRVStreamHandler::~CRVStreamHandler()
{
HX_RELEASE( m_pStreamMixer );
HX_RELEASE( m_pContext );
HX_RELEASE( m_pCommonClassFactory );
}
STDMETHODIMP CRVStreamHandler::QueryInterface( REFIID riid, void** ppvObj )
{
// dont support, for now
return HXR_NOINTERFACE;
}
STDMETHODIMP_(ULONG32) CRVStreamHandler::AddRef()
{
return InterlockedIncrement( &m_lRefCount );
}
STDMETHODIMP_(ULONG32) CRVStreamHandler::Release()
{
if( InterlockedDecrement( &m_lRefCount ) > 0 )
{
return m_lRefCount;
}
delete this;
return 0;
}
STDMETHODIMP CRVStreamHandler::GetFormatInfo( const char*** pppFileMimeTypes, const char*** pppFileExtensions, const char*** pppFileOpenNames )
{
if( pppFileMimeTypes )
{
*pppFileMimeTypes = m_pszFileMimeTypes;
}
if( pppFileExtensions )
{
*pppFileExtensions = m_pszFileExtensions;
}
if( pppFileOpenNames )
{
*pppFileOpenNames = m_pszFileOpenNames;
}
return HXR_OK;
}
// InitStreamHandler; this is called after the mp4 filewriter
// has determined it has a stream that actually matches our supported
// mime types, and allows us to do any initialization that would be
// inappropriate in the constructor (such as memory allocation)
STDMETHODIMP CRVStreamHandler::InitStreamHandler()
{
HX_RESULT retVal;
retVal = m_pContext->QueryInterface( IID_IHXCommonClassFactory, (void**) &m_pCommonClassFactory );
return retVal;
}
STDMETHODIMP CRVStreamHandler::SetFileHeader( IHXValues* pHeader )
{
// We dont need the fileheader at all
return HXR_OK;
}
// SetStreamHeader; called when the stream header for this stream is available
STDMETHODIMP CRVStreamHandler::SetStreamHeader( IHXValues* pHeader )
{
HX_RESULT retVal = HXR_OK;
UINT32 ulStreamNumber;
pHeader->GetPropertyULONG32("StreamNumber", ulStreamNumber);
m_unStreamNumber = (UINT16) ulStreamNumber;
IHXBuffer* pOpaqueData = NULL;
UINT8* ucDecoderInfo = NULL;
retVal = pHeader->GetPropertyBuffer("OpaqueData", pOpaqueData);
UCHAR* pBuffer = pOpaqueData->GetBuffer();
UINT32 ulLen = pOpaqueData->GetSize();
IHXBuffer* pDecoderInfoBuffer = NULL;
if (SUCCEEDED(retVal))
{
retVal = m_pCommonClassFactory->CreateInstance( IID_IHXBuffer, (void**) &pDecoderInfoBuffer );
}
if (SUCCEEDED(retVal))
{
pDecoderInfoBuffer->Set(pBuffer, ulLen);
pHeader->SetPropertyBuffer("DecoderInfo", pDecoderInfoBuffer );
}
HX_RELEASE(pDecoderInfoBuffer);
HX_RELEASE(pOpaqueData);
if (SUCCEEDED(retVal))
{
// Indicate this is a video track with avc1 sample format
pHeader->SetPropertyULONG32( "TrackType", MP4_BUILD_ATOMID('v','i','d','e') );
// May have to parse the opaque data to know which codec. For now, assume 'rv41'
pHeader->SetPropertyULONG32( "SampleFormat", MP4_BUILD_ATOMID('r','v','4','1') );
m_pStreamMixer->SetStreamHeader( pHeader );
}
return retVal;
}
// SetPacket; called every time a packet comes in
STDMETHODIMP CRVStreamHandler::SetPacket( IHXPacket* pPacket )
{
HX_RESULT retVal = HXR_FAIL;
if( pPacket )
{
// pass through
retVal = m_pStreamMixer->SetPacket( pPacket );
}
return HXR_OK;
}
// StreamDone; called after the final SetPacket() call for this stream
STDMETHODIMP CRVStreamHandler::StreamDone()
{
m_pStreamMixer->StreamDone( m_unStreamNumber );
return HXR_OK;
}
-------------- next part --------------
/* ***** BEGIN LICENSE BLOCK *****
* Version: RCSL 1.0/RPSL 1.0
*
* Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved.
*
* The contents of this file, and the files included with this file, are
* subject to the current version of the RealNetworks Public Source License
* Version 1.0 (the "RPSL") available at
* http://www.helixcommunity.org/content/rpsl unless you have licensed
* the file under the RealNetworks Community Source License Version 1.0
* (the "RCSL") available at http://www.helixcommunity.org/content/rcsl,
* in which case the RCSL will apply. You may also obtain the license terms
* directly from RealNetworks. You may not use this file except in
* compliance with the RPSL or, if you have a valid RCSL with RealNetworks
* applicable to this file, the RCSL. Please see the applicable RPSL or
* RCSL for the rights, obligations and limitations governing use of the
* contents of the file.
*
* This file is part of the Helix DNA Technology. RealNetworks is the
* developer of the Original Code and owns the copyrights in the portions
* it created.
*
* This file, and the files included with this file, is distributed and made
* available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
*
* Technology Compatibility Kit Test Suite(s) Location:
* http://www.helixcommunity.org/content/tck
*
* Contributor(s):
*
* ***** END LICENSE BLOCK ***** */
#ifndef RVSH_H
#define RVSH_H
#include "mp4fwplg.h"
typedef _INTERFACE IHXCommonClassFactory IHXCommonClassFactory;
class CRVStreamHandler : public IMP4StreamHandler
{
public:
CRVStreamHandler( IUnknown* pContext, IMP4StreamMixer* pMixer );
~CRVStreamHandler();
/*
* IUnknown
*/
STDMETHOD(QueryInterface) ( THIS_ REFIID riid, void** ppvObj );
STDMETHOD_(ULONG32,AddRef) ( THIS );
STDMETHOD_(ULONG32,Release) ( THIS );
/*
* IMP4StreamHandler
*/
STDMETHOD(GetFormatInfo) ( THIS_
const char*** /*OUT*/ pFileMimeTypes,
const char*** /*OUT*/ pFileExtensions,
const char*** /*OUT*/ pFileOpenNames
);
STDMETHOD(InitStreamHandler) ( THIS );
STDMETHOD(SetFileHeader) ( THIS_ IHXValues* pHeader );
STDMETHOD(SetStreamHeader) ( THIS_ IHXValues* pHeader );
STDMETHOD(SetPacket) ( THIS_ IHXPacket* pPacket );
STDMETHOD(StreamDone) ( THIS );
private:
static const char* m_pszFileMimeTypes[];
static const char* m_pszFileExtensions[];
static const char* m_pszFileOpenNames[];
LONG32 m_lRefCount;
UINT16 m_unStreamNumber;
IMP4StreamMixer* m_pStreamMixer;
IUnknown* m_pContext;
IHXCommonClassFactory* m_pCommonClassFactory;
};
#endif /* #ifndef RVSH_H */
-------------- next part --------------
/* ***** BEGIN LICENSE BLOCK *****
*
* Copyright Notices:
*
* Portions Copyright (c) 1995-2006 RealNetworks, Inc. All Rights Reserved.
*
* Patent Notices: This file may contain technology protected by one or
* more of the patents listed at www.helixcommunity.org
*
* 1. The contents of this file, and the files included with this file,
* are protected by copyright controlled by RealNetworks and its
* licensors, and made available by RealNetworks subject to the current
* version of the RealNetworks Public Source License (the "RPSL")
* available at * http://www.helixcommunity.org/content/rpsl unless
* you have licensed the file under the current version of the
* RealNetworks Community Source License (the "RCSL") available at
* http://www.helixcommunity.org/content/rcsl, in which case the RCSL
* will apply. You may also obtain the license terms directly from
* RealNetworks. You may not use this file except in compliance with
* the RPSL or, if you have a valid RCSL with RealNetworks applicable
* to this file, the RCSL. Please see the applicable RPSL or RCSL for
* the rights, obligations and limitations governing use of the
* contents of the file.
*
* 2. Alternatively, the contents of this file may be used under the
* terms of the GNU General Public License Version 2 (the
* "GPL") in which case the provisions of the GPL are applicable
* instead of those above. Please note that RealNetworks and its
* licensors disclaim any implied patent license under the GPL.
* If you wish to allow use of your version of this file only under
* the terms of the GPL, and not to allow others
* to use your version of this file under the terms of either the RPSL
* or RCSL, indicate your decision by deleting Paragraph 1 above
* and replace them with the notice and other provisions required by
* the GPL. If you do not delete Paragraph 1 above, a recipient may
* use your version of this file under the terms of any one of the
* RPSL, the RCSL or the GPL.
*
* This file is part of the Helix DNA Technology. RealNetworks is the
* developer of the Original Code and owns the copyrights in the
* portions it created. Copying, including reproducing, storing,
* adapting or translating, any or all of this material other than
* pursuant to the license terms referred to above requires the prior
* written consent of RealNetworks and its licensors
*
* This file, and the files included with this file, is distributed
* and made available by RealNetworks on an 'AS IS' basis, WITHOUT
* WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS
* AND ITS LICENSORS HEREBY DISCLAIM ALL SUCH WARRANTIES, INCLUDING
* WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
*
* Technology Compatibility Kit Test Suite(s) Location:
* http://www.helixcommunity.org/content/tck
*
* Contributor(s):
*
* ***** END LICENSE BLOCK ***** */
#ifndef RMNGDEFS_H
#define RMNGDEFS_H
// File extension for the ISO-based file format
#define HX_RMNG_EXTENSION "rmng"
#define HX_RMNG_EXTENSION_WITH_DOT ".rmng"
// Mime type for the ISO-based file format
#define HX_RMNG_MIME_TYPE "video/x-pn-realmediang"
// Description for file open dialogs
#define HX_RMNG_FILE_OPEN_DESC "RealMedia Next Generation (*.rmng)"
// Mime type for unpacketized RealVideo 10 in this container
#define HX_RMNG_STREAM_MIME_TYPE_RV10 "video/x-pn-realvideo-unpacketized"
// Same as mime type above, but just with suffix
#define HX_RMNG_STREAM_MIME_TYPE_RV10_SUFFIX "x-pn-realvideo-unpacketized"
// Major brand for the ISO-based file format
#define HX_RMNG_MAJOR_BRAND "rmng"
// Compatible brands for the ISO-based file format
#define HX_RMNG_COMPATIBLE_BRANDS "iso2"
// Codec 4cc for RealAudio 10
#define HX_RMNG_4CC_REALAUDIO_10 0x72616163 // 'raac'
#define HX_RMNG_4CC_STRING_REALAUDIO_10 "raac"
// Codec 4cc for RealVideo 10
#define HX_RMNG_4CC_REALVIDEO_10 0x72763431 // 'rv41'
#define HX_RMNG_4CC_STRING_REALVIDEO_10 "rv41"
// Codec 4cc for RealVideo NGV
#define HX_RMNG_4CC_REALVIDEO_NGV 0x72766E67 // 'rvng'
#define HX_RMNG_4CC_STRING_REALVIDEO_NGV "rvng"
// Producer output type
#define HX_RMNG_PRODUCER_OUTPUT_TYPE "rmng"
#endif /* #ifndef RMNGDEFS_H */
-------------- next part --------------
/* ***** BEGIN LICENSE BLOCK *****
*
* Copyright Notices:
*
* Portions Copyright (c) 1995-2006 RealNetworks, Inc. All Rights Reserved.
*
* Patent Notices: This file may contain technology protected by one or
* more of the patents listed at www.helixcommunity.org
*
* 1. The contents of this file, and the files included with this file,
* are protected by copyright controlled by RealNetworks and its
* licensors, and made available by RealNetworks subject to the current
* version of the RealNetworks Public Source License (the "RPSL")
* available at * http://www.helixcommunity.org/content/rpsl unless
* you have licensed the file under the current version of the
* RealNetworks Community Source License (the "RCSL") available at
* http://www.helixcommunity.org/content/rcsl, in which case the RCSL
* will apply. You may also obtain the license terms directly from
* RealNetworks. You may not use this file except in compliance with
* the RPSL or, if you have a valid RCSL with RealNetworks applicable
* to this file, the RCSL. Please see the applicable RPSL or RCSL for
* the rights, obligations and limitations governing use of the
* contents of the file.
*
* 2. Alternatively, the contents of this file may be used under the
* terms of the GNU General Public License Version 2 (the
* "GPL") in which case the provisions of the GPL are applicable
* instead of those above. Please note that RealNetworks and its
* licensors disclaim any implied patent license under the GPL.
* If you wish to allow use of your version of this file only under
* the terms of the GPL, and not to allow others
* to use your version of this file under the terms of either the RPSL
* or RCSL, indicate your decision by deleting Paragraph 1 above
* and replace them with the notice and other provisions required by
* the GPL. If you do not delete Paragraph 1 above, a recipient may
* use your version of this file under the terms of any one of the
* RPSL, the RCSL or the GPL.
*
* This file is part of the Helix DNA Technology. RealNetworks is the
* developer of the Original Code and owns the copyrights in the
* portions it created. Copying, including reproducing, storing,
* adapting or translating, any or all of this material other than
* pursuant to the license terms referred to above requires the prior
* written consent of RealNetworks and its licensors
*
* This file, and the files included with this file, is distributed
* and made available by RealNetworks on an 'AS IS' basis, WITHOUT
* WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS
* AND ITS LICENSORS HEREBY DISCLAIM ALL SUCH WARRANTIES, INCLUDING
* WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
*
* Technology Compatibility Kit Test Suite(s) Location:
* http://www.helixcommunity.org/content/tck
*
* Contributor(s):
*
* ***** END LICENSE BLOCK ***** */
#ifndef RV_PAYLOAD_FORMAT_H
#define RV_PAYLOAD_FORMAT_H
#include "hxtypes.h"
#include "hxcom.h"
#include "hxformt.h"
#include "hxcodec.h"
#include "ihxpckts.h"
/****************************************************************************
*
* Interface:
*
* IHXRVPayloadFormatObject
*
* Purpose:
*
* Object that knows how to properly convert data into a particular
* payload format
*
* IID_IHXRVPayloadFormatObject:
*
* {6C723E29-5C2B-4271-8FF4-E72F96EF5F60}
*
*/
DEFINE_GUID(IID_IHXRVPayloadFormatObject, 0x6c723e29, 0x5c2b, 0x4271, 0x8f, 0xf4, 0xe7,
0x2f, 0x96, 0xef, 0x5f, 0x60);
#undef INTERFACE
#define INTERFACE IHXRVPayloadFormatObject
DECLARE_INTERFACE_(IHXRVPayloadFormatObject, IHXPayloadFormatObject)
{
// IUnknown metods
STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE;
STDMETHOD_(ULONG32,AddRef) (THIS) PURE;
STDMETHOD_(ULONG32,Release) (THIS) PURE;
// IHXPayloadFormatObject methods
STDMETHOD(Init) (THIS_ IUnknown* pContext, HXBOOL bPacketize) PURE;
STDMETHOD(Close) (THIS) PURE;
STDMETHOD(Reset) (THIS) PURE;
STDMETHOD(SetStreamHeader) (THIS_ IHXValues* pHeader) PURE;
STDMETHOD(GetStreamHeader) (THIS_ REF(IHXValues*) pHeader) PURE;
STDMETHOD(SetPacket) (THIS_ IHXPacket* pPacket) PURE;
STDMETHOD(GetPacket) (THIS_ REF(IHXPacket*) pPacket) PURE;
STDMETHOD(Flush) (THIS) PURE;
// IHXRVPayloadFormatObject methods
STDMETHOD(CreateHXCodecPacket) (THIS_ REF(HXCODEC_DATA*) rpCodecData) PURE;
STDMETHOD(DisposeHXCodecPacket) (THIS_ HXCODEC_DATA* pHXCodecData) PURE;
STDMETHOD_(ULONG32,GetBitstreamHeaderSize) (THIS) PURE;
STDMETHOD_(const HX_MOF*,GetBitstreamHeader) (THIS) PURE;
STDMETHOD_(const HX_MOF*,GetBitstreamHeaderNetOrder) (THIS) PURE;
STDMETHOD_(HXBOOL,IsSureStream) (THIS) PURE;
STDMETHOD(GetFrameRate) (THIS_ UINT16 usASMRule, REF(float) rfFrameRate) PURE;
STDMETHOD_(HXBOOL,IsKeyFramePacket) (THIS_ IHXPacket* pPacket) PURE;
STDMETHOD_(HXBOOL,IsFirstKeyFramePacket) (THIS_ IHXPacket* pPacket) PURE;
STDMETHOD_(void,SetVelocity) (THIS_ INT32 lVel) PURE;
STDMETHOD_(void,SetKeyFrameMode) (THIS_ HXBOOL bMode) PURE;
};
#endif /* #ifndef RV_PAYLOAD_FORMAT_H */
-------------- next part --------------
/* ***** BEGIN LICENSE BLOCK *****
*
* Copyright Notices:
*
* Portions Copyright (c) 1995-2006 RealNetworks, Inc. All Rights Reserved.
*
* Patent Notices: This file may contain technology protected by one or
* more of the patents listed at www.helixcommunity.org
*
* 1. The contents of this file, and the files included with this file,
* are protected by copyright controlled by RealNetworks and its
* licensors, and made available by RealNetworks subject to the current
* version of the RealNetworks Public Source License (the "RPSL")
* available at * http://www.helixcommunity.org/content/rpsl unless
* you have licensed the file under the current version of the
* RealNetworks Community Source License (the "RCSL") available at
* http://www.helixcommunity.org/content/rcsl, in which case the RCSL
* will apply. You may also obtain the license terms directly from
* RealNetworks. You may not use this file except in compliance with
* the RPSL or, if you have a valid RCSL with RealNetworks applicable
* to this file, the RCSL. Please see the applicable RPSL or RCSL for
* the rights, obligations and limitations governing use of the
* contents of the file.
*
* 2. Alternatively, the contents of this file may be used under the
* terms of the GNU General Public License Version 2 (the
* "GPL") in which case the provisions of the GPL are applicable
* instead of those above. Please note that RealNetworks and its
* licensors disclaim any implied patent license under the GPL.
* If you wish to allow use of your version of this file only under
* the terms of the GPL, and not to allow others
* to use your version of this file under the terms of either the RPSL
* or RCSL, indicate your decision by deleting Paragraph 1 above
* and replace them with the notice and other provisions required by
* the GPL. If you do not delete Paragraph 1 above, a recipient may
* use your version of this file under the terms of any one of the
* RPSL, the RCSL or the GPL.
*
* This file is part of the Helix DNA Technology. RealNetworks is the
* developer of the Original Code and owns the copyrights in the
* portions it created. Copying, including reproducing, storing,
* adapting or translating, any or all of this material other than
* pursuant to the license terms referred to above requires the prior
* written consent of RealNetworks and its licensors
*
* This file, and the files included with this file, is distributed
* and made available by RealNetworks on an 'AS IS' basis, WITHOUT
* WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS
* AND ITS LICENSORS HEREBY DISCLAIM ALL SUCH WARRANTIES, INCLUDING
* WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
*
* Technology Compatibility Kit Test Suite(s) Location:
* http://www.helixcommunity.org/content/tck
*
* Contributor(s):
*
* ***** END LICENSE BLOCK ***** */
#ifndef RV_PAYLOAD_FORMAT_UNPACKETIZED_H
#define RV_PAYLOAD_FORMAT_UNPACKETIZED_H
#include "rv_payload_format.h"
#include "hxalloc.h"
class IHXUnknown;
class CRVXHeader;
class CHXRVPayloadFormatUnpacketized : public IHXRVPayloadFormatObject
{
public:
CHXRVPayloadFormatUnpacketized(IHX20MemoryAllocator* pOutputAllocator);
~CHXRVPayloadFormatUnpacketized();
// IUnknown methods
STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj);
STDMETHOD_(ULONG32,AddRef) (THIS);
STDMETHOD_(ULONG32,Release) (THIS);
// IHXPayloadFormatObject methods
STDMETHOD(Init) (THIS_ IUnknown* pContext, HXBOOL bPacketize);
STDMETHOD(Close) (THIS);
STDMETHOD(Reset) (THIS);
STDMETHOD(SetStreamHeader) (THIS_ IHXValues* pHeader);
STDMETHOD(GetStreamHeader) (THIS_ REF(IHXValues*) pHeader);
STDMETHOD(SetPacket) (THIS_ IHXPacket* pPacket);
STDMETHOD(GetPacket) (THIS_ REF(IHXPacket*) pPacket);
STDMETHOD(Flush) (THIS);
// IHXRVPayloadFormatObject methods
STDMETHOD(CreateHXCodecPacket) (THIS_ REF(HXCODEC_DATA*) rpCodecData);
STDMETHOD(DisposeHXCodecPacket) (THIS_ HXCODEC_DATA* pHXCodecData);
STDMETHOD_(ULONG32,GetBitstreamHeaderSize) (THIS);
STDMETHOD_(const HX_MOF*,GetBitstreamHeader) (THIS);
STDMETHOD_(const HX_MOF*,GetBitstreamHeaderNetOrder) (THIS);
STDMETHOD_(HXBOOL,IsSureStream) (THIS);
STDMETHOD(GetFrameRate) (THIS_ UINT16 usASMRule, REF(float) rfFrameRate);
STDMETHOD_(HXBOOL,IsKeyFramePacket) (THIS_ IHXPacket* pPacket);
STDMETHOD_(HXBOOL,IsFirstKeyFramePacket) (THIS_ IHXPacket* pPacket);
STDMETHOD_(void,SetVelocity) (THIS_ INT32 lVel);
STDMETHOD_(void,SetKeyFrameMode) (THIS_ HXBOOL bMode);
private:
void _Close(void);
HX_RESULT SetAssemblerHeader(IHXValues* pHeader);
HX_RESULT SetAssemblerPacket(IHXPacket* pPacket);
INT32 m_lRefCount;
IUnknown* m_pContext;
IHXCommonClassFactory* m_pCommonClassFactory;
IHX20MemoryAllocator* m_pOutputAllocator;
IHXValues* m_pStreamHeader;
CRVXHeader* m_pRVHeader;
HXCODEC_DATA* m_pCodecData;
UINT32* m_pulBitStreamHeader;
UINT32 m_ulBitStreamHeaderSize;
UINT16 m_usSequenceNumber;
HXBOOL m_bFlushed;
HXBOOL m_bPacketize;
INT32 m_lPlaybackVelocity;
HXBOOL m_bKeyFrameMode;
};
#endif /* #ifndef RV_PAYLOAD_FORMAT_UNPACKETIZED_H */
From Yury.Ramanovich at nokia.com Tue Jan 5 09:42:18 2010
From: Yury.Ramanovich at nokia.com (Yury.Ramanovich@nokia.com)
Date: Tue Jan 5 17:09:41 2010
Subject: [datatype-dev] RE: RESEND CR needed: CPHU-7YMRTM,
ou1cimx1#218155 - crash during AVI file playback
Message-ID:
seems like dec18 check-in got lost...; Checked in this change to 210Cays again today;
BR
Yury
_____________________________________________
From: Ramanovich Yury (Nokia-D/Dallas)
Sent: Friday, December 18, 2009 3:32 PM
To: Ramanovich Yury (Nokia-D/Dallas); 'datatype-dev@helixcommunity.org'
Subject: RE: RESEND CR needed: CPHU-7YMRTM, ou1cimx1#218155 - crash during AVI file playback
Checked in to 210Cays
BR
Yury
_____________________________________________
From: Ramanovich Yury (Nokia-D/Dallas)
Sent: Friday, December 18, 2009 1:52 PM
To: datatype-dev@helixcommunity.org
Subject: FW: RESEND CR needed: CPHU-7YMRTM, ou1cimx1#218155 - crash during AVI file playback
If no objections, will check this in shortly to 210Cays
BR
Yury
_____________________________________________
From: Ramanovich Yury (Nokia-D/Dallas)
Sent: Thursday, December 17, 2009 3:26 PM
To: datatype-dev@helixcommunity.org
Subject: RESEND CR needed: CPHU-7YMRTM, ou1cimx1#218155 - crash during AVI file playback
"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@nokia.com, dushyant.vipradas@nokia.com
Reviewed by:
Date: 12/16/2009
Project: SymbianMmf_wm
ErrorId: CPHU-7YMRTM, ou1cimx1#218155
Synopsis: crash during AVI file playback
Overview: AVI stream index was not set (NULL) for AVI v1.0 files, which lead to crash during CAVIIndex::GetMaxChunkSize()
Solution: set AVI stream index for all AVI v1.0 files
Files Added:
None.
Files Modified:
datatype/avi/fileformat/aviffpln.cpp
Image Size and Heap Use impact: minor
Module Release testing (STIF) : MRT subset
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-52-mmf-mdf-dsp
Platforms and Profiles Functionality verified: armv5, winscw
Branch: cay210, brizo420, HEAD
<< File: diff.txt >>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100105/3820a5cf/attachment.html
From ext-sudhir.1.mishra at nokia.com Tue Jan 5 11:34:42 2010
From: ext-sudhir.1.mishra at nokia.com (ext-sudhir.1.mishra@nokia.com)
Date: Tue Jan 5 19:01:11 2010
Subject: [datatype-dev] CR: JPKN-7YXDS7 - Performance: File logging
enabled in release build of Helix
In-Reply-To:
References: <0D5D8A0728D4FC43BB0A2393C9AE8F17277837B3C7@NOK-EUMSG-02.mgdnok.nokia.com>
Message-ID: <0D5D8A0728D4FC43BB0A2393C9AE8F1727799CFC7C@NOK-EUMSG-02.mgdnok.nokia.com>
Checked into 210 cays, 420brizo & head.
Warm regards,
Sudhir
-----Original Message-----
From: ext Eric Hyche [mailto:ehyche@real.com]
Sent: Friday, December 25, 2009 2:31 PM
To: Mishra Sudhir.1 (EXT-Sasken/Dallas)
Cc: datatype-dev@helixcommunity.org
Subject: Re: [datatype-dev] CR: JPKN-7YXDS7 - Performance: File logging enabled in release build of Helix
Looks good.
On Dec 24, 2009, at 12:39 PM, wrote:
> "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: ext-sudhir.1.mishra@nokia.com
>
> Reviewed by: Ashish.As.Gupta@nokia.com
>
> Date: 12/23/2009
>
> Project: datatype
>
> Error Id: JPKN-7YXDS7
>
> Synopsis: Performance: File logging enabled in release build of Helix
>
> Overview:
> In release build, file logging of Helix slows down hxmetadataeng.dll several ms per method call.
> The reason is, if HELIX_FEATURE_LOGLEVEL_NONE is not defined in release build, then file logging is enabled. This causes the performance to degrade.
>
> Solution:
> Enable file logging in debug mode only further constrained by HELIX_FEATURE_LOGLEVEL_NONE flag.
>
> Files added: None
>
> Files modified:
> /cvsroot/datatype/tools/metadataeng/engine/pub/hxmetadatalog.h
>
> Image size and heap use impact: Minimal
>
> Module release testing (STIF): NA
>
> Test case(s) added: No
>
> Memory leak check performed: NA
>
> Branch: 210 Cays, 420 brizo and head
>
> CVS Diff:
>
> Index: tools/metadataeng/engine/pub/hxmetadatalog.h
> ===================================================================
> RCS file:
> /cvsroot/datatype/tools/metadataeng/engine/pub/hxmetadatalog.h,v
> retrieving revision 1.1.2.2
> diff -u -w -r1.1.2.2 hxmetadatalog.h
> --- tools/metadataeng/engine/pub/hxmetadatalog.h 24 Jan 2008 17:03:33 -0000 1.1.2.2
> +++ tools/metadataeng/engine/pub/hxmetadatalog.h 24 Dec 2009 14:59:49 -0000
> @@ -51,7 +51,7 @@
> #define _HX_METADATA_LOG_H_
>
>
> -#ifdef HELIX_FEATURE_LOGLEVEL_NONE
> +#if defined(HELIX_FEATURE_LOGLEVEL_NONE) || (!defined(_DEBUG))
>
> #if defined(__GNUC__)
> #define FileLogNull(args...)
> @@ -61,7 +61,7 @@
>
> #define MD_LOG FileLogNull
>
> -#else // HELIX_FEATURE_LOGLEVEL_NONE
> +#else // defined(HELIX_FEATURE_LOGLEVEL_NONE) || (!defined(_DEBUG))
>
>
> #define MD_LOG FileLog
>
>
>
>
>
>
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From jgordon at real.com Tue Jan 5 13:59:16 2010
From: jgordon at real.com (Jamie Gordon)
Date: Tue Jan 5 21:25:26 2010
Subject: [datatype-dev] CR: Add ISO-based file format for RealMedia
In-Reply-To: <7ECCEA249B7CDC49A079EC0075E999AA07D84D8522@SEAMBX.corp.real.com>
References: <7ECCEA249B7CDC49A079EC0075E999AA07D84D8522@SEAMBX.corp.real.com>
Message-ID: <4B43B634.5060308@real.com>
Looks good.
> + // One UINT16 for the number of rules and 3 UINT16's for the rules.
> + UINT32 ulMapBytes = sizeof(UINT16) + 3 * sizeof(UINT32);
I think you wanted sizeof(UINT16) here rather than sizeof(UINT32).
In the RV renderer, there is a new "unpacketized" payload format. What
is the difference is between the payload formats?
On 1/5/2010 8:50 AM, Eric Hyche wrote:
> Description
> ------------------------------------------------
> For the NGV project, Sujeet and I are experimenting with a new ISO-based file format to contain RealAudio and RealVideo. This CR contains the player-related changes necessary to play this new file format.
>
> These changes are only on the HEAD and are all cordoned off by the use of the HELIX_FEATURE_RMFF_ISO_BASED feature define. Therefore, these changes should have no effect on any current builds or products. In order to make use of these changes, this feature define would have to be added to a profile.
>
> Files Modified
> ------------------------------------------------
> See attached diff files.
>
> Branches
> ------------------------------------------------
> HEAD only
>
>
>
> Eric Hyche
> Principal Engineer, RealNetworks
> ehyche@real.com
>
From vkathuria at real.com Tue Jan 5 22:06:14 2010
From: vkathuria at real.com (Varun Kathuria)
Date: Wed Jan 6 05:32:32 2010
Subject: [datatype-dev] [Resending]CR: Changes to fix [Bug 9762] It costs
about 4 secfor some mov file
Message-ID:
Skipped content of type multipart/alternative-------------- next part --------------
Index: qttrack.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/qttrack.cpp,v
retrieving revision 1.30.2.3
diff -u -r1.30.2.3 qttrack.cpp
--- qttrack.cpp 24 Jul 2008 23:53:19 -0000 1.30.2.3
+++ qttrack.cpp 4 Jan 2010 11:27:53 -0000
@@ -883,20 +883,26 @@
if (SUCCEEDED(retVal))
{
- do
- {
- if (!m_SampleSize.EstablishBySample(
- m_TimeToSample.GetSampleNumber(),
- m_SampleToChunk.GetChunkSampleNum()))
- {
- break;
- }
-
- ulTrackSize += m_SampleSize.GetSampleSize();
- } while (AdvanceSample(m_TrackEdit,
- m_TimeToSample,
- m_SampleToChunk));
+ if(m_SampleSize.IsGenericSize())
+ {
+ ulTrackSize = m_SampleSize.GetSampleSize() * m_SampleSize.Get_NumEntries();
+ }
+ else
+ {
+ do
+ {
+ if (!m_SampleSize.EstablishBySample(
+ m_TimeToSample.GetSampleNumber(),
+ m_SampleToChunk.GetChunkSampleNum()))
+ {
+ break;
+ }
+ ulTrackSize += m_SampleSize.GetSampleSize();
+ } while (AdvanceSample(m_TrackEdit,
+ m_TimeToSample,
+ m_SampleToChunk));
+ }
ulTrackSizeOut = ulTrackSize;
}
Index: pub/qtatmmgs.h
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/pub/qtatmmgs.h,v
retrieving revision 1.19.8.9
diff -u -r1.19.8.9 qtatmmgs.h
--- pub/qtatmmgs.h 31 Mar 2009 02:56:01 -0000 1.19.8.9
+++ pub/qtatmmgs.h 4 Jan 2010 11:27:54 -0000
@@ -332,7 +332,7 @@
ULONG32 GetChunkSampleOffset(void) { return m_ulChunkSampleOffset; }
ULONG32 GetChunkSize(void) { return m_ulChunkSize; }
ULONG32 Get_NumEntries(void) { return m_ulNumEntries; }
-
+ HXBOOL IsGenericSize(void) { return m_ulGenericSize ? TRUE:FALSE; }
private:
CQT_stsz_Atom* m_pSampleSizeAtom;
From ext-anugrah.2.kashari at nokia.com Wed Jan 6 02:51:15 2010
From: ext-anugrah.2.kashari at nokia.com (ext-anugrah.2.kashari@nokia.com)
Date: Wed Jan 6 10:18:46 2010
Subject: [Datatype-dev]: CR : TMAA-7YLAN6 - Thumbnail not generated
In-Reply-To:
References:
Message-ID:
Thanks Eric,
Checked in 210Cays, Brizo420 and Head
-----Original Message-----
From: ext Eric Hyche [mailto:ehyche@real.com]
Sent: Monday, January 04, 2010 10:34 PM
To: Kashari Anugrah.2 (EXT-Sasken/Bangalore)
Cc: datatype-dev@helixcommunity.org
Subject: Re: [Datatype-dev]: CR : TMAA-7YLAN6 - Thumbnail not generated
Looks good.
On Jan 4, 2010, at 3:45 AM, wrote:
> "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: ext-anugrah.2.kashari@nokia.com
>
> Review By: Ashish.As.Gupta@nokia.com
>
> TSW-ID: TMAA-7YLAN6
>
> Date : 04/01/2010
>
> Project: SymbianMmf_wm
>
> Synopsis: Thumbnail not generated
>
> Overview : In thumbnail generation, decoded picture is not send to client when decoder is trying to decode picture is time synchronized mode. Time synchronization is not required for thumbnail generation therefore there is no need to set clock source.
>
> Fix: For TNE, when disabling post-processor, disable the clock source as well.
>
> Files modified & changes 210Cays , Brizo420 and Head :
> /Datatype/mdf/video/renderer/mdfvideoadapter.cpp
>
> Image Size and Heap Use impact: No major impact
>
> Module Release testing (STIF) : NA
>
> 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
>
> Branch : 210Cays, Brizo420 & Head :
>
> CVS Diff:
> Index: mdfvideoadapter.cpp
> ===================================================================
> RCS file: /cvsroot/datatype/mdf/video/renderer/mdfvideoadapter.cpp,v
> retrieving revision 1.3.2.102
> diff -u -w -r1.3.2.102 mdfvideoadapter.cpp
> --- mdfvideoadapter.cpp 30 Oct 2009 16:50:30 -0000 1.3.2.102
> +++ mdfvideoadapter.cpp 4 Jan 2010 08:38:19 -0000
> @@ -2517,6 +2517,7 @@
> void CMdfVideoAdapter::SetPostProcessing(HXBOOL bEnable)
> {
> m_bDisablePostProcessor = !bEnable;
> + m_bDisableVideoClock = !bEnable;
> }
>
> void CMdfVideoAdapter::SetPictureReturn(HXBOOL bEnable)
>
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From gahluwalia at real.com Wed Jan 6 03:25:54 2010
From: gahluwalia at real.com (Gurpreet)
Date: Wed Jan 6 10:51:56 2010
Subject: [datatype-dev] CR: Bug 9948: When the .flv video files contains
only audio, they can not be played
Message-ID: <4B447342.4020504@real.com>
Synopsis:
Bug 9948: When the .flv video files contains only audio, they can not be
played
Overview:
The flv files that have width and height values in file header but are
audio only.
These files are not playing because file format tries to find first
video frame but fails.
So instead of checking for width and height in case of audio only files,
we check if we have video stream.
For this a flag is added which is set to true in case we find a video
stream.
Files Modified:
datatype/flash/flv/fileformat/flv_file_format.cpp
datatype/flash/flv/fileformat/pub/flv_file_format.h
Image Size and Heap Use impact (Client -Only):
None
Platforms and Profiles Build Verified:
BIF branch -> atlas 310, atlas 361, brizo 401, head
Target(s) -> android_all
Profile -> helix-client-android-surf_8x50
SYSTEM_ID -> android-donut-arm.eabi
Files Attached::
flv.diff
Thanks & Best Regards,
Gurpreet
-------------- next part --------------
Index: flv_file_format.cpp
===================================================================
RCS file: /cvsroot/datatype/flash/flv/fileformat/flv_file_format.cpp,v
retrieving revision 1.9.2.25.2.3
diff -u -r1.9.2.25.2.3 flv_file_format.cpp
--- flv_file_format.cpp 10 Dec 2009 10:07:55 -0000 1.9.2.25.2.3
+++ flv_file_format.cpp 6 Jan 2010 10:13:13 -0000
@@ -162,6 +162,7 @@
, m_bHaveFileSize(FALSE)
, m_bHaveWidth(FALSE)
, m_bHaveHeight(FALSE)
+ , m_bHaveVideo(FALSE)
, m_bHaveDuration(FALSE)
, m_bHaveAudioBitrate(FALSE)
, m_bHaveVideoBitrate(FALSE)
@@ -1016,6 +1017,7 @@
}
if (SUCCEEDED(retVal))
{
+ m_bHaveVideo = TRUE;
// Were we able to get the width and height from the meta-data?
if (!m_bHaveWidth || !m_bHaveHeight)
{
@@ -1160,7 +1162,7 @@
}
// There are FLV files with no video flag in the Header but with actual video stream inside
- if(m_bAudioOnlyFile && m_bHaveWidth && m_bHaveHeight && m_bHaveVideoFrameRate)
+ if(m_bAudioOnlyFile && m_bHaveVideo)
{
m_cHeader.SetHasVideo();
m_bAudioOnlyFile = FALSE;
Index: pub/flv_file_format.h
===================================================================
RCS file: /cvsroot/datatype/flash/flv/fileformat/pub/flv_file_format.h,v
retrieving revision 1.7.2.10.4.1
diff -u -r1.7.2.10.4.1 flv_file_format.h
--- pub/flv_file_format.h 19 Nov 2009 03:59:11 -0000 1.7.2.10.4.1
+++ pub/flv_file_format.h 6 Jan 2010 10:13:13 -0000
@@ -269,6 +269,7 @@
HX_BITFIELD m_bHaveFileSize : 1;
HX_BITFIELD m_bHaveWidth : 1;
HX_BITFIELD m_bHaveHeight : 1;
+ HX_BITFIELD m_bHaveVideo : 1;
HX_BITFIELD m_bHaveDuration : 1;
HX_BITFIELD m_bHaveAudioBitrate : 1;
HX_BITFIELD m_bHaveVideoBitrate : 1;
From sgarg at real.com Wed Jan 6 03:53:38 2010
From: sgarg at real.com ( Sushant Garg)
Date: Wed Jan 6 11:19:42 2010
Subject: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays
incorrect duration for a wav file recorded by gnome-sound-recorder.
References: <011601ca78cd$6011f9a0$8001a8c0@adroit02a604c1>
<7ECCEA249B7CDC49A079EC0075E999AA07D82CC716@SEAMBX.corp.real.com>
<012301ca798f$c8a9dce0$8001a8c0@adroit02a604c1>
<268FD6EA-49A7-42FA-AFC6-78547C20C18B@real.com>
<01ed01ca8492$b14289e0$8001a8c0@adroit02a604c1>
<5FC21ACD-FE11-427F-BA16-49FA0D27F818@real.com>
Message-ID: <007401ca8ec6$e4d0abf0$8001a8c0@adroit02a604c1>
Skipped content of type multipart/alternative-------------- next part --------------
Index: riff.cpp
===================================================================
RCS file: /cvsroot/datatype/common/util/riff.cpp,v
retrieving revision 1.12.16.2
diff -u -r1.12.16.2 riff.cpp
--- riff.cpp 5 Jun 2008 08:33:31 -0000 1.12.16.2
+++ riff.cpp 6 Jan 2010 11:14:27 -0000
@@ -110,6 +110,8 @@
, m_ulChunkBytesRead(0)
, m_ulChunkSize(0)
, m_ulChunkType(0)
+ , m_pFileStatObj(NULL)
+ , m_ulTotalFileSizeInBytes(0L)
{
m_pContext = pContext;
m_pResponse = pResponse;
@@ -192,6 +194,11 @@
// return HXR_OK;
}
+UINT32 CRIFFReader::GetCurrentFileOffset()
+{
+ return m_ulCurOffset;
+}
+
STDMETHODIMP
CRIFFReader::InitDone(HX_RESULT status)
{
@@ -205,8 +212,45 @@
m_bFileIsOpen = TRUE;
+ HX_RELEASE(m_pFileStatObj);
+ if(m_pFileObject)
+ {
+ HX_RESULT retVal = m_pFileObject->QueryInterface(IID_IHXFileStat, (void **) &m_pFileStatObj);
+ if(SUCCEEDED(retVal) && m_pFileStatObj)
+ {
+ m_pFileStatObj->Stat((IHXFileStatResponse *) this);
+ }
+ }
+ return status;
+}
+
+/////////////////////////////////////////////////////////////////////////
+// Method:
+// IHXFileFormatObject::StatDone
+//
+STDMETHODIMP
+CRIFFReader::StatDone(HX_RESULT status, UINT32 ulSize,
+ ULONG32 ulCreationTime,
+ UINT32 ulAccessTime,
+ UINT32 ulModificationTime,
+ UINT32 ulMode)
+{
+ // We're finished with the IHXFileStat interface, so we'll release it:
+ HX_RELEASE(m_pFileStatObj);
+
+ if (SUCCEEDED(status))
+ {
+ // Now we know how big the file is, so we can calculate the
+ // actual duration for all streams using it.
+ m_ulTotalFileSizeInBytes = ulSize;
+ }
m_state = RS_GetFileTypePending;
- return m_pFileObject->Read(sizeof(UINT32) * 2);
+ return m_pFileObject->Read(sizeof(UINT32) * 2);
+}
+
+UINT32 CRIFFReader::GetTotalFileSize()
+{
+ return m_ulTotalFileSizeInBytes;
}
HX_RESULT
@@ -233,6 +277,8 @@
m_bFileIsOpen = FALSE;
+ HX_RELEASE(m_pFileStatObj);
+ m_ulTotalFileSizeInBytes = 0L;
return HXR_OK;
}
Index: pub/riff.h
===================================================================
RCS file: /cvsroot/datatype/common/util/pub/riff.h,v
retrieving revision 1.6
diff -u -r1.6 riff.h
--- pub/riff.h 14 Mar 2005 19:24:45 -0000 1.6
+++ pub/riff.h 6 Jan 2010 11:14:27 -0000
@@ -49,6 +49,7 @@
typedef _INTERFACE IHXFileObject IHXFileObject;
class CRIFFReader : public IHXFileResponse,
+ public IHXFileStatResponse,
public IHXThreadSafeMethods
{
public:
@@ -61,6 +62,9 @@
*/
HX_RESULT Open(char* filename);
+ IHXFileStat* m_pFileStatObj; //for getting the file size.
+ UINT32 m_ulTotalFileSizeInBytes;
+ UINT32 GetCurrentFileOffset();
/*
* Close: Close the file
*/
@@ -126,6 +130,12 @@
STDMETHOD(InitDone) (THIS_
HX_RESULT status);
+ STDMETHOD(StatDone) (THIS_
+ HX_RESULT status, UINT32 ulSize,
+ ULONG32 ulCreationTime,
+ UINT32 ulAccessTime,
+ UINT32 ulModificationTime,
+ UINT32 ulMode);
STDMETHOD(ReadDone) (THIS_
HX_RESULT status,
IHXBuffer* pBuffer);
@@ -174,6 +184,7 @@
UINT32 GetListType();
UINT32 GetOffset();
+ UINT32 GetTotalFileSize();
UINT32 GetChunkType();
UINT32 GetChunkRawSize(void);
Index: wvffplin.cpp
===================================================================
RCS file: /cvsroot/datatype/wav/fileformat/wvffplin.cpp,v
retrieving revision 1.12.2.1.6.1
diff -u -r1.12.2.1.6.1 wvffplin.cpp
--- wvffplin.cpp 2 Dec 2009 02:38:34 -0000 1.12.2.1.6.1
+++ wvffplin.cpp 6 Jan 2010 11:15:55 -0000
@@ -963,6 +963,14 @@
}
m_ulDataSizeInBytes = len;
+ UINT32 ulFileOffset = m_pRiffReader->GetCurrentFileOffset();
+ UINT32 ulTotalFileSizeInBytes = m_pRiffReader->GetTotalFileSize();
+ UINT32 ulDataSizeInBytes = ulTotalFileSizeInBytes - ulFileOffset;
+ if(ulDataSizeInBytes < len)
+ {
+ m_ulDataSizeInBytes = ulDataSizeInBytes;
+ }
+
m_ulAvgBitRate = 8 * m_ulAvgBytesPerSec;
// The duration is of course calculatable from the size of
From ehyche at real.com Wed Jan 6 06:34:22 2010
From: ehyche at real.com (Eric Hyche)
Date: Wed Jan 6 14:00:40 2010
Subject: [datatype-dev] Re: [Porting-android] CR: Changes to fix [Bug 9762]
It costs about 4 sec for some mov file
In-Reply-To:
References:
Message-ID: <9AF5AD05-0A2D-4648-B2EB-B4F0E8F598DD@real.com>
Good work on this optimization. This looks good to me.
Eric
On Jan 4, 2010, at 6:59 AM, Varun Kathuria wrote:
>
> Synopsis:
> Changes to fix [Bug 9762] It costs about 4 sec for some mov file
>
> Overview:
> In android player, when we scan some mov files it takes more than 4 sec to scan files. The problem in these files are audio track have sample size of 4 & sample count is 5990384. When it tries to calculate audio tracksize from CQTTrack::ComputeTrackSize() then it takes 5990384 iterations to compute audio track size. We know that the audio track has generic sample size . Added code to calculate tracksize based on generic size in a CQTTrack::ComputeTrackSize() so that it can be calculated in 1 iteration rather than 5990384 iterations. Now it saves around 3850ms approx in android platform.
>
> Files Added:
> None
>
> Files Modified:
> /cvsroot/datatype/mp4/fileformat/qttrack.cpp
> /cvsroot/datatype/mp4/fileformat/pub/qtatmmgs.h
>
> Image Size and Heap Use impact (Client -Only):
> None.
>
> Platforms and Profiles Affected:
> None
>
> Distribution Libraries Affected:
> None
>
> Distribution library impact and planned action:
> None
>
> Platforms and Profiles Build Verified:
> BIF branch -> hxclient_3_6_1_atlas_restricted
> Target(s) -> android_all
> Profile -> helix-client-android-full
> SYSTEM_ID -> android-donut-arm-qsd_8x50
>
> Branch
> atlas310, atlas361, head, 401brizo
>
> Files Attached:
> diff_9762.txt
>
> Thanks
> Varun Kathuria
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From ehyche at real.com Wed Jan 6 06:55:39 2010
From: ehyche at real.com (Eric Hyche)
Date: Wed Jan 6 14:21:37 2010
Subject: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays
incorrect duration for a wav file recorded by gnome-sound-recorder.
In-Reply-To: <007401ca8ec6$e4d0abf0$8001a8c0@adroit02a604c1>
References: <011601ca78cd$6011f9a0$8001a8c0@adroit02a604c1>
<7ECCEA249B7CDC49A079EC0075E999AA07D82CC716@SEAMBX.corp.real.com>
<012301ca798f$c8a9dce0$8001a8c0@adroit02a604c1>
<268FD6EA-49A7-42FA-AFC6-78547C20C18B@real.com>
<01ed01ca8492$b14289e0$8001a8c0@adroit02a604c1>
<5FC21ACD-FE11-427F-BA16-49FA0D27F818@real.com>
<007401ca8ec6$e4d0abf0$8001a8c0@adroit02a604c1>
Message-ID:
Looks good for the most part. However, if your QI for IHXFileStat fails, then we will hang, since no InitDone() back to the RIFF reader user will ever be made. So make sure that if either the QI for IHXFileStat fails, or the call to STat() returns failure that we properly make a failure InitDone() back to the RIFF reader user.
Actually, the QI for IHXFileStat should not be required, since file objects are not required to implement this. So if the QI for IHXFileStat fails, then the RIFF reader should continue on normally, just without knowing the file size. If the QI for IHXFileStat() succeeds but the call to STat() returns failure, then we can return failure in InitDone() back to the RIFF reader caller.
Eric
On Jan 6, 2010, at 6:53 AM, Sushant Garg wrote:
> Thanks Eric,
>
> Please find the updated diff.
>
> Now I am calling Read() from CRIFFReader::StatDone() rather then CRIFFReader::InitDone.
>
> Thanks & Regards
> Sushant Garg
> ----- Original Message -----
> From: Eric Hyche
> To: Sushant Garg
> Cc: Datatype-Dev
> Sent: Monday, January 04, 2010 8:13 PM
> Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
>
> You are treating IHXFileStat::Stat() like a synchronous call and there is
> no guarantee that it will be. Once you issue the call to Stat(), then
> you will need to wait in StatDone() before calling back to InitDone().
>
> Eric
>
> On Dec 24, 2009, at 7:14 AM, Sushant Garg wrote:
>
> > Eric,
> >
> > Please find the updated diff.
> >
> > Thanks & Regards
> > Sushant Garg
> > ----- Original Message -----
> > From: Eric Hyche
> > To: Sushant Grag
> > Cc: Datatype-Dev
> > Sent: Friday, December 11, 2009 12:04 AM
> > Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> >
> > Sushant,
> >
> > After thinking about this some more, I think the Stat() call should be moved inside the RIFF reader, for a couple of reasons:
> >
> > - centralize it in one place, so other uses of the RIFF reader don't have to do the same thing.
> > - the most natural time to do the Stat is immediately after the IHXFileObject is Init'd, which in this case the RIFF reader does.
> >
> > So I think the RIFF reader could do the IHXFileStat::Stat() call, and then store the filesize result. Then we could just add an accessor function on the RIFF reader so that users of the RIFF reader can read the size. The file size would only be valid after the CRIFFREader::Open() call had returned with a RIFFOpenDone() callback.
> >
> > Eric
> >
> > On Dec 10, 2009, at 6:56 AM, Sushant Grag wrote:
> >
> > > Thanks Eric,
> > >
> > > Please find the updated diff.
> > >
> > > Thanks & Regards
> > > Sushant Garg
> > > ----- Original Message -----
> > > From: Eric Hyche
> > > To: Sushant Grag ; Datatype-Dev
> > > Sent: Wednesday, December 09, 2009 7:17 PM
> > > Subject: RE: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> > >
> > > +UINT32 CRIFFReader::GetFileDataSize()
> > > +{
> > > + CHXString strFilePath = m_pFilename;
> > > + const char* szFileProtocol = "file://";
> > > + UINT32 ulFiledataSize =0;
> > > +
> > > + if( !strFilePath.Left(strlen(szFileProtocol)).CompareNoCase(szFileProtocol) )
> > > + {
> > > + strFilePath = strFilePath.Mid(strlen(szFileProtocol));
> > > + struct stat fileInfo;
> > > + if(!stat(strFilePath, &fileInfo))
> > > + {
> > > + ulFiledataSize = fileInfo.st_size;
> > > + }
> > > + }
> > > + return ulFiledataSize;
> > > +}
> > > +
> > >
> > > I did not mean do a C-library stat() on the file. The file object that
> > > the RIFF readers uses will not always be a local file that you can call stat() on.
> > > What I meant was QI the file object for IHXFileStat and then call IHXFileStat::Stat().
> > > You will have to implement IHXFileStatResponse::StatDone().
> > >
> > > Eric
> > >
> > > >-----Original Message-----
> > > >From: datatype-dev-bounces@helixcommunity.org [mailto:datatype-dev-bounces@helixcommunity.org] On
> > > >Behalf Of Sushant Grag
> > > >Sent: Wednesday, December 09, 2009 7:45 AM
> > > >To: Datatype-Dev
> > > >Subject: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file
> > > >recorded by gnome-sound-recorder.
> > > >
> > > >Project: RealPlayer for Netbook
> > > >
> > > >Synopsis:
> > > >
> > > >Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-
> > > >recorder.
> > > >
> > > >
> > > >
> > > >Overview:
> > > >
> > > >There is an issue with wav files which are recorded from ubuntu sound recorder.
> > > >
> > > >The calculated file duration in Realplayer for linux is much & much larger then original file duration
> > > >
> > > >eg: file has duration of 6secs & Realplayer shows more than 3hr 22 min.
> > > >
> > > >Reason behind is, sound recorder adds garbage value in data chunk which leads to very big value of
> > > >m_ulChunkBodyLen calculated in riff.cpp around line 380
> > > >
> > > > if ( (UINT32)getlong(buf) == m_ulFindChunkId )
> > > >
> > > > {
> > > >
> > > > // Found the chunk we were asked for
> > > >
> > > > m_state = RS_Ready;
> > > >
> > > > m_ulChunkBodyLen = GetLong(&buf[4]);
> > > >
> > > > m_ulChunkSize = m_ulChunkBodyLen;
> > > >
> > > >Which cause a very higher value of duration.
> > > >
> > > >
> > > >
> > > >Now I have created two different functions in riff.cpp;
> > > >
> > > >CRIFFReader::GetFileDataSize() & CRIFFReader::GetCurrentFileOffset() in which I am getting the length
> > > >of file & the file offset and calling these functions in function CWaveFileFormat::RIFFFindChunkDone()
> > > >, case WS_FindDataChunkPending to set m_ulDataSizeInBytes if "len" is greater then
> > > >"ulDataSizeInBytes".
> > > >
> > > >
> > > >
> > > >Files Modified:
> > > >/cvsroot/datatype/common/util/riff.cpp
> > > >
> > > >/cvsroot/datatype/common/util/pub/riff.h
> > > >
> > > >/cvsroot/datatype/wav/fileformat/wvffplin.cpp
> > > >
> > > >
> > > >
> > > >Files Added:
> > > >
> > > >None
> > > >
> > > >
> > > >
> > > >Platforms and Profiles Affected:
> > > >Linux
> > > >
> > > >Distribution Libraries Affected:
> > > >None.
> > > >
> > > >Platforms and Profiles Build Verified:
> > > >Bif: realplay_gtk_atlas_restricted_gold_1.2
> > > >Profile: helix-client-moblin
> > > >Target: player_all
> > > >
> > > >Branch:
> > > >Atlas347, Atlas310, Atlas3_4_10, 401 Brizo, Head
> > > >
> > > >
> > > >
> > > >Files Attached:
> > > >
> > > >9840_diff.txt
> > > >
> > > >
> > > >
> > > >Thanks & Regards
> > > >Sushant Garg
> > > <9840_diff.txt>
> >
> > Eric Hyche (ehyche@real.com)
> > Principal Engineer
> > RealNetworks, Inc.
> >
> >
>
> Eric Hyche (ehyche@real.com)
> Principal Engineer
> RealNetworks, Inc.
>
> <9840_diff.txt>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From ehyche at real.com Wed Jan 6 07:13:21 2010
From: ehyche at real.com (Eric Hyche)
Date: Wed Jan 6 14:39:20 2010
Subject: [datatype-dev] CR: Bug 9948: When the .flv video files contains
only audio, they can not be played
In-Reply-To: <4B447342.4020504@real.com>
References: <4B447342.4020504@real.com>
Message-ID:
Looks good.
On Jan 6, 2010, at 6:25 AM, Gurpreet wrote:
> Synopsis:
> Bug 9948: When the .flv video files contains only audio, they can not be
> played
>
> Overview:
> The flv files that have width and height values in file header but are
> audio only.
> These files are not playing because file format tries to find first
> video frame but fails.
> So instead of checking for width and height in case of audio only files,
> we check if we have video stream.
> For this a flag is added which is set to true in case we find a video
> stream.
>
> Files Modified:
> datatype/flash/flv/fileformat/flv_file_format.cpp
> datatype/flash/flv/fileformat/pub/flv_file_format.h
>
> Image Size and Heap Use impact (Client -Only):
> None
>
> Platforms and Profiles Build Verified:
> BIF branch -> atlas 310, atlas 361, brizo 401, head
> Target(s) -> android_all
> Profile -> helix-client-android-surf_8x50
> SYSTEM_ID -> android-donut-arm.eabi
>
> Files Attached::
> flv.diff
>
> Thanks & Best Regards,
> Gurpreet
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From pbasic at real.com Wed Jan 6 09:49:44 2010
From: pbasic at real.com (Petar Basic)
Date: Wed Jan 6 17:16:19 2010
Subject: [datatype-dev] CN: Added ability to output ID3v2 v2.3.0;
added DTDriver engine
parameter for controlling the ID3v2 output in MP4 writer
Message-ID: <9b8350411001060949q776a6ff4s8676c15f015297ea@mail.gmail.com>
Modified by: pbasic at real.com
Reviewed by: ehyche at real.com
Date: 2010/01/06
Project: GMP MetaEditor (meta3gp.exe)
Synopsis:
Added ability to output ID3v2 v2.3.0; added DTDriver engine parameter
for controlling the ID3v2 output in MP4 writer
Overview:
To allow testing of meta-data outputted by MP4 file-writer with other
software and with MP4 file-format it is useful to be able to output an
older version of ID3v2 tag.
Details:
1.) Extended ID3Tools methods to allow writing of ID3v2 according to
v2.3.0 specs.
2.) Added DTDriver engine parameter which controls the behaviour of
MP4 file-writer during ID3v2 tag output.
3.) Added ID3v2 related command-line options to GMPMetaEditor. These
are mapped to DTDriver engine parameters.
Testing:
Verified that the portion of meta-info injected as ID3v2 by GMP
MetaEditor can be read with other software (iTunes 9, CT metadata
extractor 1.3) regardless of the version of ID3v2 outputted (v2.4.0 or
v2.3.0). Verified that meta-info injected by other software can be
read with GMP MetaEditor.
Files Modified:
datatype/common/util/metautil.cpp
datatype/common/util/pub/metautil.h
datatype/mp4/filewriter/mp4sm.cpp
datatype/mp4/filewriter/mp4sm.h
datatype/tools/dtdriver/engine/ffdriver.cpp
datatype/tools/dtdriver/engine/pub/ffdriver.h
datatype/tools/dtdriver/apps/meta3gp/main.cpp
Platforms and Profiles Affected:
All
Image Size and Heap Use impact:
Small increase
Platforms and Profiles Build Verified:
system id: win32-i386-vc7
profile: helix-client-all-defines
Platforms and Profiles Functionality Verified:
x86 Windows XP SP2
Branch:
HEAD
Copyright assignment:
I am a RealNetworks employee or contractor.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_common_util.diff
Type: text/x-patch
Size: 39542 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100106/af12d71d/datatype_common_util-0001.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_mp4_filewriter.diff
Type: text/x-patch
Size: 10402 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100106/af12d71d/datatype_mp4_filewriter-0001.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_tools_dtdriver_apps_meta3gp.diff
Type: text/x-patch
Size: 20876 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100106/af12d71d/datatype_tools_dtdriver_apps_meta3gp-0001.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_tools_dtdriver_engine.diff
Type: text/x-patch
Size: 14560 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100106/af12d71d/datatype_tools_dtdriver_engine-0001.bin
From girish.shetty at nokia.com Wed Jan 6 15:32:27 2010
From: girish.shetty at nokia.com (girish.shetty@nokia.com)
Date: Wed Jan 6 22:58:22 2010
Subject: RESEND: [datatype-dev] CR: Fix MIME type printing in MDF and
print decoder, postprocessor id
In-Reply-To:
References:
Message-ID: <888A0A0FAF11234F9E0D17809A78D7E4177134E656@NOK-EUMSG-03.mgdnok.nokia.com>
This mail is to communicate that below mentioned old CR which was checked-in only to head and cays210 is now checked-in to Brizo 420.
Regards
Girish
-----Original Message-----
From: datatype-dev-bounces@helixcommunity.org [mailto:datatype-dev-bounces@helixcommunity.org] On Behalf Of ext Eric Hyche
Sent: Tuesday, October 06, 2009 2:29 PM
To: Lliu Xiaolin (Nokia-D/Dallas)
Cc: datatype-dev@helixcommunity.org
Subject: Re: RESEND: [datatype-dev] CR: Fix MIME type printing in MDF and print decoder, postprocessor id
Looks good.
On Oct 6, 2009, at 1:14 PM, xiaolin.lliu@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: lliu.xiaolin@nokia.com
> Reviewed by:
> Date: Oct 01 , 2009
> Project: SymbianMmf_wm
> ErrorId: N/A
>
> Synopsis: Fix MIME type printing in MDF and print decoder,
> postprocessor id .
>
> Overview:
>
> 1. Since mimetype is stored as a string without '\0', HXlog will
> keep print it till hits a '\0', therefore, there are some unknown
> characters after mimetype in the log. This change will attach a '\0'
> to mimetype, then print it in the hxlog.
> 2. Print decoder and postprocessor id in hxlog
>
> Modified files:
> datatype\mdf\video\renderer\mdfpluginmanager.cpp
> datatype\mdf\video\renderer\mdfvideoadapter.cpp
>
> New files: None
> Image size and heap use impact: N/A
> Module Release testing (STIF): Passed
> Test case(s) added: None
> Memory leak check performed: Yes, no new leaks introduced.
> Platforms and Profiles Build verified: helix-client-s60-50-mmf-mdf-arm
> Platforms and Profiles Functionality verified: armv5
> Branch: Cays210 and head
>
>
> Index: mdfpluginmanager.cpp
> ===================================================================
> RCS file: /cvsroot/datatype/mdf/video/renderer/mdfpluginmanager.cpp,v
> retrieving revision 1.2.2.14
> diff -u -r1.2.2.14 mdfpluginmanager.cpp
> --- mdfpluginmanager.cpp 23 Jan 2008 23:51:28 -0000 1.2.2.14
> +++ mdfpluginmanager.cpp 1 Oct 2009 20:38:10 -0000
> @@ -193,9 +193,11 @@
> void CMdfPluginManager::GetPackagesByMimeTypeL( const TDesC8&
> aMimeType, RPointerArray& packageList )
> {
> MDFVIDEOLOG_ENTERFN( "GetPackagesByMimeTypeL" );
> + HBufC8 *strMimeType = HBufC8::NewL(aMimeType.Length() + 1);
> + strMimeType->Des().Copy(aMimeType);
> + MDFVIDEOLOG_WRITE_FORMAT( "<-> Mimetype investigated for
> support is %s", strMimeType->Des().PtrZ() );
> + delete strMimeType;
>
> - MDFVIDEOLOG_WRITE_FORMAT( "<-> Mimetype investigated for
> support is %s", aMimeType.Ptr() );
> -
> TBool foundPackage = EFalse;
> TInt entryLocation = -1;
> TBool rulesMet = ETrue;
> @@ -401,8 +403,11 @@
> for( TInt j = 0; j < countMimeType; j++ )
> {
> HBufC8* tdesc = supportedmimetypearray[ j ];
> - MDFVIDEOLOG_WRITE_FORMAT( "<-> Mimetype targeted is
> %s", tdesc->Ptr() );
> -
> + HBufC8 *strMimeType = HBufC8::NewL(tdesc->Length() + 1);
> + strMimeType->Des().Copy(*tdesc);
> + MDFVIDEOLOG_WRITE_FORMAT( "<-> Mimetype targeted is
> %s", strMimeType->Des().PtrZ() );
> + delete strMimeType;
> +
> CPluginPackage* pluginpackage = NULL;
> TBool valid = EFalse;
> TRAPD( error, pluginpackage = CPluginPackage::NewL
> ( *tdesc ) );
> @@ -457,8 +462,7 @@
>
> TInt length = supportedMimeType.Length();
> const unsigned char* buffer = supportedMimeType.Ptr
> ();
> -
> - MDFVIDEOLOG_WRITE_FORMAT2( " Mimetype %s is
> supported", buffer );
> +
>
> pMimeType[ validPackage ] = new char[ length+1 ];
>
> @@ -468,6 +472,8 @@
> pMimeType[validPackage][m] = (char) buffer[m];
> }
> pMimeType[validPackage++][m] = '\0';
> + MDFVIDEOLOG_WRITE_FORMAT2( " Mimetype %s is
> supported", (pMimeType[validPackage - 1]) );
> +
> }
> }
> pMimeType[ validPackage ] = NULL;
> @@ -576,7 +582,11 @@
> MDFVIDEOLOG_ENTERFN( "FindDecoderOnly" );
>
> const TDesC8& aMimeType = aPluginPackage.GetHelixMimeType();
> - MDFVIDEOLOG_WRITE_FORMAT( "FindDecoderOnly searching for
> mimetype %s", aMimeType.Ptr() );
> + HBufC8 *strMimeType = HBufC8::NewL(aMimeType.Length() + 1);
> + strMimeType->Des().Copy(aMimeType);
> + MDFVIDEOLOG_WRITE_FORMAT( "FindDecoderOnly searching for
> mimetype %s", strMimeType->Des().PtrZ() );
> + delete strMimeType;
> +
> HX_RESULT retVal = HXR_FAIL;
> TBool foundPackage = EFalse;
>
>
> Index: mdfvideoadapter.cpp
> ===================================================================
> RCS file: /cvsroot/datatype/mdf/video/renderer/mdfvideoadapter.cpp,v
> retrieving revision 1.3.2.96.4.4
> diff -u -r1.3.2.96.4.4 mdfvideoadapter.cpp
> --- mdfvideoadapter.cpp 23 Sep 2009 20:02:47 -0000 1.3.2.96.4.4
> +++ mdfvideoadapter.cpp 2 Oct 2009 19:56:01 -0000
> @@ -362,11 +362,15 @@
> if( SUCCEEDED( retVal ) )
> {
> TUid formatId = m_pPluginPackage->Uid();
> + TUid hwDecoderId = m_pPluginPackage->GetHwDecoderId();
> + TUid hwPostProcessorId = m_pPluginPackage-
> >GetHwPostProcessorId();
> +
> HX_DELETE( m_pPayloadFormatPluginDevice );
> TRAPD( error, m_pPayloadFormatPluginDevice =
> CPayloadFormatPluginDevice::NewL( formatId ) );
> if( m_pPayloadFormatPluginDevice && error == KErrNone )
> {
> - MDFVIDEOLOG_WRITE_FORMAT2( " Payload id 0x%08x is
> successfully loaded", formatId.iUid );
> + HXLOGL2(HXLOG_VIDE, " Payload id 0x%08x is
> successfully loaded, HW decoder:0x%08x, PostProcessor:0x%08x",
> formatId.iUid,hwDecoderId.iUid,hwPostProcessorId.iUid );
> +
>
> UINT32 disableMinPrerollCheck( 0 );
>
> @@ -462,8 +466,14 @@
> TUid decoderId =
> pluginPackage.GetHwDecoderId();
> TUid postprocessorId =
> pluginPackage.GetHwPostProcessorId();
>
> - MDFVIDEOLOG_WRITE_FORMAT( " Mimetype for the Helix is %s",
> mimetypehelix.Ptr() );
> - MDFVIDEOLOG_WRITE_FORMAT( " Mimetype for the DevHw is %s",
> mimetypevidhw.Ptr() );
> + HBufC8 *strMimeType = HBufC8::NewL(mimetypehelix.Length() + 1);
> + strMimeType->Des().Copy(mimetypehelix);
> + MDFVIDEOLOG_WRITE_FORMAT( " Mimetype for the Helix is %s",
> strMimeType->Des().PtrZ() );
> + delete strMimeType;
> + HBufC8 *strMimeTypeVidhw = HBufC8::NewL(mimetypevidhw.Length()
> + 1);
> + strMimeTypeVidhw->Des().Copy(mimetypevidhw);
> + MDFVIDEOLOG_WRITE_FORMAT( " Mimetype for the DevHw is %s",
> strMimeTypeVidhw->Des().PtrZ() );
> + delete strMimeTypeVidhw;
> MDFVIDEOLOG_WRITE_FORMAT( " UID for decoder is 0x%x",
> decoderId.iUid );
> MDFVIDEOLOG_WRITE_FORMAT( " UID for postprocessor is 0x%x",
> postprocessorId.iUid );
>
> @@ -2343,7 +2353,10 @@
> {
> // if some rule exists for mimetype but it does not
> have valid info, return error
> // else do nothing, it'll fall back to use plugin
> package already selected
> - MDFVIDEOLOG_WRITE_FORMAT2( " Error: Valid codec rule
> not found for mimetype %s", aMimeType.Ptr() );
> + HBufC8 *strMimeType = HBufC8::NewL(aMimeType.Length() +
> 1);
> + strMimeType->Des().Copy(aMimeType);
> + MDFVIDEOLOG_WRITE_FORMAT2( " Error: Valid codec rule
> not found for mimetype %s", strMimeType->Des().PtrZ() );
> + delete strMimeType;
> retVal = HXR_UNSUPPORTED_VIDEO;
> }
> }
>
> _______________________________________________
> Datatype-dev mailing list
> Datatype-dev@helixcommunity.org
> http://lists.helixcommunity.org/mailman/listinfo/datatype-dev
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
_______________________________________________
Datatype-dev mailing list
Datatype-dev@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-dev
From vkathuria at real.com Wed Jan 6 23:52:01 2010
From: vkathuria at real.com (Varun Kathuria)
Date: Thu Jan 7 07:18:05 2010
Subject: [datatype-dev] CN: Changes to fix [Bug 9762] It costs about 4 sec
for some mov file
References:
<9AF5AD05-0A2D-4648-B2EB-B4F0E8F598DD@real.com>
Message-ID: <16BA9FD1FC154926A4F742DE6015CB28@abc>
Thanks Eric,
This has been checked into atlas310, atlas361, 401brizo, 420brizo,
210cayennes, head.
Thanks
Varun Kathuria
----- Original Message -----
From: "Eric Hyche"
To: "Varun Kathuria"
Cc: ;
Sent: Wednesday, January 06, 2010 8:04 PM
Subject: Re: [Porting-android] CR: Changes to fix [Bug 9762] It costs about
4 sec for some mov file
Good work on this optimization. This looks good to me.
Eric
On Jan 4, 2010, at 6:59 AM, Varun Kathuria wrote:
>
> Synopsis:
> Changes to fix [Bug 9762] It costs about 4 sec for some mov file
>
> Overview:
> In android player, when we scan some mov files it takes more than 4 sec to
> scan files. The problem in these files are audio track have sample size of
> 4 & sample count is 5990384. When it tries to calculate audio tracksize
> from CQTTrack::ComputeTrackSize() then it takes 5990384 iterations to
> compute audio track size. We know that the audio track has generic sample
> size . Added code to calculate tracksize based on generic size in a
> CQTTrack::ComputeTrackSize() so that it can be calculated in 1 iteration
> rather than 5990384 iterations. Now it saves around 3850ms approx in
> android platform.
>
> Files Added:
> None
>
> Files Modified:
> /cvsroot/datatype/mp4/fileformat/qttrack.cpp
> /cvsroot/datatype/mp4/fileformat/pub/qtatmmgs.h
>
> Image Size and Heap Use impact (Client -Only):
> None.
>
> Platforms and Profiles Affected:
> None
>
> Distribution Libraries Affected:
> None
>
> Distribution library impact and planned action:
> None
>
> Platforms and Profiles Build Verified:
> BIF branch -> hxclient_3_6_1_atlas_restricted
> Target(s) -> android_all
> Profile -> helix-client-android-full
> SYSTEM_ID -> android-donut-arm-qsd_8x50
>
> Branch
> atlas310, atlas361, head, 401brizo
>
> Files Attached:
> diff_9762.txt
>
> Thanks
> Varun Kathuria
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From vkathuria at real.com Thu Jan 7 00:55:13 2010
From: vkathuria at real.com (Varun Kathuria)
Date: Thu Jan 7 08:21:22 2010
Subject: [datatype-dev] CN: Changes to fix [Bug 9762] It costs about 4 sec
for some mov file
References:
<9AF5AD05-0A2D-4648-B2EB-B4F0E8F598DD@real.com>
Message-ID:
Also checked into atlas347 & atlas3410.
Thanks
Varun Kathuria
----- Original Message -----
From: "Eric Hyche"
To: "Varun Kathuria"
Cc: ;
Sent: Wednesday, January 06, 2010 8:04 PM
Subject: Re: [Porting-android] CR: Changes to fix [Bug 9762] It costs about
4 sec for some mov file
Good work on this optimization. This looks good to me.
Eric
On Jan 4, 2010, at 6:59 AM, Varun Kathuria wrote:
>
> Synopsis:
> Changes to fix [Bug 9762] It costs about 4 sec for some mov file
>
> Overview:
> In android player, when we scan some mov files it takes more than 4 sec to
> scan files. The problem in these files are audio track have sample size of
> 4 & sample count is 5990384. When it tries to calculate audio tracksize
> from CQTTrack::ComputeTrackSize() then it takes 5990384 iterations to
> compute audio track size. We know that the audio track has generic sample
> size . Added code to calculate tracksize based on generic size in a
> CQTTrack::ComputeTrackSize() so that it can be calculated in 1 iteration
> rather than 5990384 iterations. Now it saves around 3850ms approx in
> android platform.
>
> Files Added:
> None
>
> Files Modified:
> /cvsroot/datatype/mp4/fileformat/qttrack.cpp
> /cvsroot/datatype/mp4/fileformat/pub/qtatmmgs.h
>
> Image Size and Heap Use impact (Client -Only):
> None.
>
> Platforms and Profiles Affected:
> None
>
> Distribution Libraries Affected:
> None
>
> Distribution library impact and planned action:
> None
>
> Platforms and Profiles Build Verified:
> BIF branch -> hxclient_3_6_1_atlas_restricted
> Target(s) -> android_all
> Profile -> helix-client-android-full
> SYSTEM_ID -> android-donut-arm-qsd_8x50
>
> Branch
> atlas310, atlas361, head, 401brizo
>
> Files Attached:
> diff_9762.txt
>
> Thanks
> Varun Kathuria
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From sgarg at real.com Thu Jan 7 00:55:52 2010
From: sgarg at real.com ( Sushant Garg)
Date: Thu Jan 7 08:21:45 2010
Subject: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays
incorrect duration for a wav file recorded by gnome-sound-recorder.
References: <011601ca78cd$6011f9a0$8001a8c0@adroit02a604c1>
<7ECCEA249B7CDC49A079EC0075E999AA07D82CC716@SEAMBX.corp.real.com>
<012301ca798f$c8a9dce0$8001a8c0@adroit02a604c1>
<268FD6EA-49A7-42FA-AFC6-78547C20C18B@real.com>
<01ed01ca8492$b14289e0$8001a8c0@adroit02a604c1>
<5FC21ACD-FE11-427F-BA16-49FA0D27F818@real.com>
<007401ca8ec6$e4d0abf0$8001a8c0@adroit02a604c1>
Message-ID: <004901ca8f77$39950c70$8001a8c0@adroit02a604c1>
Before calling Stat() we have a condition to check whether QI is succeeded or not & if in case it does not then we will not send a call to Stat() & return status of InitDone().
+ HX_RELEASE(m_pFileStatObj);
+ if(m_pFileObject)
+ {
+ HX_RESULT retVal = m_pFileObject->QueryInterface(IID_IHXFileStat, (void **) &m_pFileStatObj);
+ if(SUCCEEDED(retVal) && m_pFileStatObj)
+ {
+ m_pFileStatObj->Stat((IHXFileStatResponse *) this);
+ }
+ }
+ return status;
Now if Stat() fails then we will get error in StatDone() & hence we will not get the size of file. And so we will not change m_ulDataSizeInBytes in wvffplin.cpp
Thanks & Regards
Sushant Garg
----- Original Message -----
From: Eric Hyche
To: Sushant Garg
Cc: Datatype-Dev
Sent: Wednesday, January 06, 2010 8:25 PM
Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
Looks good for the most part. However, if your QI for IHXFileStat fails, then we will hang, since no InitDone() back to the RIFF reader user will ever be made. So make sure that if either the QI for IHXFileStat fails, or the call to STat() returns failure that we properly make a failure InitDone() back to the RIFF reader user.
Actually, the QI for IHXFileStat should not be required, since file objects are not required to implement this. So if the QI for IHXFileStat fails, then the RIFF reader should continue on normally, just without knowing the file size. If the QI for IHXFileStat() succeeds but the call to STat() returns failure, then we can return failure in InitDone() back to the RIFF reader caller.
Eric
On Jan 6, 2010, at 6:53 AM, Sushant Garg wrote:
> Thanks Eric,
>
> Please find the updated diff.
>
> Now I am calling Read() from CRIFFReader::StatDone() rather then CRIFFReader::InitDone.
>
> Thanks & Regards
> Sushant Garg
> ----- Original Message -----
> From: Eric Hyche
> To: Sushant Garg
> Cc: Datatype-Dev
> Sent: Monday, January 04, 2010 8:13 PM
> Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
>
> You are treating IHXFileStat::Stat() like a synchronous call and there is
> no guarantee that it will be. Once you issue the call to Stat(), then
> you will need to wait in StatDone() before calling back to InitDone().
>
> Eric
>
> On Dec 24, 2009, at 7:14 AM, Sushant Garg wrote:
>
> > Eric,
> >
> > Please find the updated diff.
> >
> > Thanks & Regards
> > Sushant Garg
> > ----- Original Message -----
> > From: Eric Hyche
> > To: Sushant Grag
> > Cc: Datatype-Dev
> > Sent: Friday, December 11, 2009 12:04 AM
> > Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> >
> > Sushant,
> >
> > After thinking about this some more, I think the Stat() call should be moved inside the RIFF reader, for a couple of reasons:
> >
> > - centralize it in one place, so other uses of the RIFF reader don't have to do the same thing.
> > - the most natural time to do the Stat is immediately after the IHXFileObject is Init'd, which in this case the RIFF reader does.
> >
> > So I think the RIFF reader could do the IHXFileStat::Stat() call, and then store the filesize result. Then we could just add an accessor function on the RIFF reader so that users of the RIFF reader can read the size. The file size would only be valid after the CRIFFREader::Open() call had returned with a RIFFOpenDone() callback.
> >
> > Eric
> >
> > On Dec 10, 2009, at 6:56 AM, Sushant Grag wrote:
> >
> > > Thanks Eric,
> > >
> > > Please find the updated diff.
> > >
> > > Thanks & Regards
> > > Sushant Garg
> > > ----- Original Message -----
> > > From: Eric Hyche
> > > To: Sushant Grag ; Datatype-Dev
> > > Sent: Wednesday, December 09, 2009 7:17 PM
> > > Subject: RE: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> > >
> > > +UINT32 CRIFFReader::GetFileDataSize()
> > > +{
> > > + CHXString strFilePath = m_pFilename;
> > > + const char* szFileProtocol = "file://";
> > > + UINT32 ulFiledataSize =0;
> > > +
> > > + if( !strFilePath.Left(strlen(szFileProtocol)).CompareNoCase(szFileProtocol) )
> > > + {
> > > + strFilePath = strFilePath.Mid(strlen(szFileProtocol));
> > > + struct stat fileInfo;
> > > + if(!stat(strFilePath, &fileInfo))
> > > + {
> > > + ulFiledataSize = fileInfo.st_size;
> > > + }
> > > + }
> > > + return ulFiledataSize;
> > > +}
> > > +
> > >
> > > I did not mean do a C-library stat() on the file. The file object that
> > > the RIFF readers uses will not always be a local file that you can call stat() on.
> > > What I meant was QI the file object for IHXFileStat and then call IHXFileStat::Stat().
> > > You will have to implement IHXFileStatResponse::StatDone().
> > >
> > > Eric
> > >
> > > >-----Original Message-----
> > > >From: datatype-dev-bounces@helixcommunity.org [mailto:datatype-dev-bounces@helixcommunity.org] On
> > > >Behalf Of Sushant Grag
> > > >Sent: Wednesday, December 09, 2009 7:45 AM
> > > >To: Datatype-Dev
> > > >Subject: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file
> > > >recorded by gnome-sound-recorder.
> > > >
> > > >Project: RealPlayer for Netbook
> > > >
> > > >Synopsis:
> > > >
> > > >Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-
> > > >recorder.
> > > >
> > > >
> > > >
> > > >Overview:
> > > >
> > > >There is an issue with wav files which are recorded from ubuntu sound recorder.
> > > >
> > > >The calculated file duration in Realplayer for linux is much & much larger then original file duration
> > > >
> > > >eg: file has duration of 6secs & Realplayer shows more than 3hr 22 min.
> > > >
> > > >Reason behind is, sound recorder adds garbage value in data chunk which leads to very big value of
> > > >m_ulChunkBodyLen calculated in riff.cpp around line 380
> > > >
> > > > if ( (UINT32)getlong(buf) == m_ulFindChunkId )
> > > >
> > > > {
> > > >
> > > > // Found the chunk we were asked for
> > > >
> > > > m_state = RS_Ready;
> > > >
> > > > m_ulChunkBodyLen = GetLong(&buf[4]);
> > > >
> > > > m_ulChunkSize = m_ulChunkBodyLen;
> > > >
> > > >Which cause a very higher value of duration.
> > > >
> > > >
> > > >
> > > >Now I have created two different functions in riff.cpp;
> > > >
> > > >CRIFFReader::GetFileDataSize() & CRIFFReader::GetCurrentFileOffset() in which I am getting the length
> > > >of file & the file offset and calling these functions in function CWaveFileFormat::RIFFFindChunkDone()
> > > >, case WS_FindDataChunkPending to set m_ulDataSizeInBytes if "len" is greater then
> > > >"ulDataSizeInBytes".
> > > >
> > > >
> > > >
> > > >Files Modified:
> > > >/cvsroot/datatype/common/util/riff.cpp
> > > >
> > > >/cvsroot/datatype/common/util/pub/riff.h
> > > >
> > > >/cvsroot/datatype/wav/fileformat/wvffplin.cpp
> > > >
> > > >
> > > >
> > > >Files Added:
> > > >
> > > >None
> > > >
> > > >
> > > >
> > > >Platforms and Profiles Affected:
> > > >Linux
> > > >
> > > >Distribution Libraries Affected:
> > > >None.
> > > >
> > > >Platforms and Profiles Build Verified:
> > > >Bif: realplay_gtk_atlas_restricted_gold_1.2
> > > >Profile: helix-client-moblin
> > > >Target: player_all
> > > >
> > > >Branch:
> > > >Atlas347, Atlas310, Atlas3_4_10, 401 Brizo, Head
> > > >
> > > >
> > > >
> > > >Files Attached:
> > > >
> > > >9840_diff.txt
> > > >
> > > >
> > > >
> > > >Thanks & Regards
> > > >Sushant Garg
> > > <9840_diff.txt>
> >
> > Eric Hyche (ehyche@real.com)
> > Principal Engineer
> > RealNetworks, Inc.
> >
> >
>
> Eric Hyche (ehyche@real.com)
> Principal Engineer
> RealNetworks, Inc.
>
> <9840_diff.txt>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100107/543a23dc/attachment-0001.html
From sgarg at real.com Thu Jan 7 04:08:39 2010
From: sgarg at real.com ( Sushant Garg)
Date: Thu Jan 7 11:34:25 2010
Subject: [datatype-dev] CR/CN: Fix for Bug 9845: Un-able to play the *.mp4
files at http://vidfeed.homeip.net/films webpage.
Message-ID: <007e01ca8f92$28120ff0$8001a8c0@adroit02a604c1>
Project: RealPlayer for Netbook
Synopsis:
Fix for Bug 9845: Un-able to play the *.mp4 files at http://vidfeed.homeip.net/films webpage.
Overview:
The issue was because Decoder Specific Info Descriptor, Size is 8 for files on this site, whereas generally for most of the files Descriptor size is 2. And therefore we are getting parsing issues while parsing code in gaConfig.cpp file in function Read().
Files Modified:
/cvsroot/datatype/mp4/common/gaConfig.cpp
Files Added:
None
Platforms and Profiles Affected:
Linux
Distribution Libraries Affected:
None.
Platforms and Profiles Build Verified:
Bif: realplay_gtk_atlas_restricted_gold_1.1
Profile: helix-client-moblin
Target: player_all
Branch:
Atlas347, Atlas_3_4_10, Atlas310
Index: gaConfig.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/common/gaConfig.cpp,v
retrieving revision 1.4
diff -u -r1.4 gaConfig.cpp
--- gaConfig.cpp 3 Jul 2007 19:09:07 -0000 1.4
+++ gaConfig.cpp 7 Jan 2010 11:49:03 -0000
@@ -331,7 +331,7 @@
switch (extensionSamplingFrequencyIndex)
{
case 0xf: // ESC, read sr from bitstream
- extensionSamplingFrequency.Read(bs) ;
+ extensionSamplingFrequency.Read(bs, 24) ;
break ;
case 0xd: case 0xe: // these are reserved.
return HXR_FAIL ;
Thanks & Regards
Sushant Garg
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100107/cae9485c/attachment.html
From ext-shashi.merapala at nokia.com Thu Jan 7 06:21:02 2010
From: ext-shashi.merapala at nokia.com (ext-shashi.merapala@nokia.com)
Date: Thu Jan 7 13:48:07 2010
Subject: [datatype-dev] CR: ESLM-7YHD9L - Helix_wmv controller: Conflict
between the list
from SupportsMimeType and actually video type (mp4) for video playback
Message-ID:
Skipped content of type multipart/alternative-------------- next part --------------
Index: build/BIF/hxclient_2_1_0_cayennes.bif
===================================================================
RCS file: /cvsroot/client/build/BIF/hxclient_2_1_0_cayennes.bif,v
retrieving revision 1.34
diff -u -w -r1.34 hxclient_2_1_0_cayennes.bif
--- build/BIF/hxclient_2_1_0_cayennes.bif 20 Oct 2009 15:01:08 -0000 1.34
+++ build/BIF/hxclient_2_1_0_cayennes.bif 6 Jan 2010 10:39:17 -0000
@@ -7742,7 +7742,7 @@
-
+
Index: symbianMmf/audiocontroller/10207B64.rss
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/audiocontroller/10207B64.rss,v
retrieving revision 1.1.2.4
diff -u -w -r1.1.2.4 10207B64.rss
--- symbianMmf/audiocontroller/10207B64.rss 30 Oct 2009 16:40:52 -0000 1.1.2.4
+++ symbianMmf/audiocontroller/10207B64.rss 6 Jan 2010 11:58:15 -0000
@@ -50,6 +50,16 @@
default_data = "?";
opaque_data = "Real0x101f5d07.rm.ra.RMF?application/x-pn-realmediaaudio/x-pn-realaudio";
rom_only = ROM_ONLY_FLAG;
+ },
+ IMPLEMENTATION_INFO
+ {
+ // WMA
+ implementation_uid = 0x10283350;
+ version_no = 1;
+ display_name = "Helix Windows Media Audio";
+ default_data = "?";
+ opaque_data = "Nokia0x101f5d07.wma0&?uaudio/x-ms-wma";
+ rom_only = ROM_ONLY_FLAG;
}
};
}
Index: symbianMmf/audiocontroller/controllersis
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/audiocontroller/controllersis,v
retrieving revision 1.1.2.8
diff -u -w -r1.1.2.8 controllersis
--- symbianMmf/audiocontroller/controllersis 13 Apr 2009 14:54:02 -0000 1.1.2.8
+++ symbianMmf/audiocontroller/controllersis 6 Jan 2010 11:58:15 -0000
@@ -142,6 +142,8 @@
file = open(dll_names_file, 'w')
for dll in lib_files_copy:
file.write('%s\n' % os.path.basename(dll))
+for dll in additional_lib_names_copy:
+ file.write('%s\n' % os.path.basename(dll))
file.close()
Index: symbianMmf/audiocontroller/installMMF.pcf
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/audiocontroller/installMMF.pcf,v
retrieving revision 1.1.2.4
diff -u -w -r1.1.2.4 installMMF.pcf
--- symbianMmf/audiocontroller/installMMF.pcf 26 Aug 2008 16:11:23 -0000 1.1.2.4
+++ symbianMmf/audiocontroller/installMMF.pcf 6 Jan 2010 11:58:15 -0000
@@ -118,6 +118,9 @@
#
lib_names = []
+# Plugin Dlls [built separately] that need to be included to the *dll_names*.txt files
+additional_lib_names = []
+
# some dlls like vidplin aggregate functionality offered individually with
# other dlls; this list tracks those dlls that can be removed from the list
# of dlls to install because another dll duplicates or replaces the functionality
@@ -167,7 +170,10 @@
'log' : 'common/log/logsystem/[target]/log.dll',
'logobserverfile' : 'common/log/logobserver/[target]/logobserverfile.dll',
'arma' : 'datatype/mp4/audio/mdf/[target]/arma.dll',
- 'hxmetadataeng' : 'datatype/xps/fileformat/[target]/hxmetadataeng.dll'
+ 'hxmetadataeng' : 'datatype/xps/fileformat/[target]/hxmetadataeng.dll',
+ 'asfff' : 'datatype/wm/fileformat/[target]/asfff.dll',
+ 'wma9' : 'datatype/mdf/audio/arm/wma/[target]/wma9.dll',
+ 'wmarender' : 'datatype/wm/audio/renderer/[target]/wmarender.dll'
}
#
@@ -198,9 +204,22 @@
newList.append(item)
return newList
+def AddAdditionalDLLs(*files):
+ global additional_lib_names
+ for f in files:
+ additional_lib_names.append(f)
+
# always add client core dll
Add('clntcore')
+# always add asf file format
+Add('asfff')
+Add('wma9')
+Add('wmarender')
+
+# add hxwmdrmplugin to *dll_names*.txt
+AddAdditionalDLLs('hxwmdrmplugin')
+
if project.IsDefined("HELIX_FEATURE_METADATAENG"):
Add('hxmetadataeng')
@@ -252,6 +271,13 @@
path = os.path.normpath(path)
lib_files_copy.append(path)
+additional_lib_names_copy = []
+for f in additional_lib_names:
+ path = os.path.join(playerDllDir, f)
+ path += ".dll"
+ path = os.path.normpath(path)
+ additional_lib_names_copy.append(path)
+
#
# payld_dll_files, payld_rsc_files
#
Index: symbianMmf/videocontroller/101F8513.rss
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/videocontroller/101F8513.rss,v
retrieving revision 1.3.2.13
diff -u -w -r1.3.2.13 101F8513.rss
--- symbianMmf/videocontroller/101F8513.rss 30 Oct 2009 16:47:48 -0000 1.3.2.13
+++ symbianMmf/videocontroller/101F8513.rss 6 Jan 2010 11:58:15 -0000
@@ -157,6 +157,16 @@
default_data = "?";
opaque_data = "Real0x101f5d07.aviRIFF????AVIapplication/x-pn-avi-pluginvideo/avivideo/x-msvideovideo/msvideo";
rom_only = ROM_ONLY_FLAG;
+ },
+ IMPLEMENTATION_INFO
+ {
+ // WMV
+ implementation_uid = 0x10283349;
+ version_no = 1;
+ display_name = "Helix Windows Media 9";
+ default_data = "?";
+ opaque_data = "Nokia0x101f5d070x101f5d08.wmv0&?uvideo/x-ms-wmv";
+ rom_only = ROM_ONLY_FLAG;
}
};
}
Index: symbianMmf/videocontroller/MmfSis
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/videocontroller/MmfSis,v
retrieving revision 1.2.2.12
diff -u -w -r1.2.2.12 MmfSis
--- symbianMmf/videocontroller/MmfSis 13 Apr 2009 14:54:02 -0000 1.2.2.12
+++ symbianMmf/videocontroller/MmfSis 6 Jan 2010 11:58:15 -0000
@@ -145,6 +145,8 @@
file = open(dll_names_file, 'w')
for dll in lib_files_copy:
file.write('%s\n' % os.path.basename(dll))
+for dll in additional_lib_names_copy:
+ file.write('%s\n' % os.path.basename(dll))
file.close()
Index: symbianMmf/videocontroller/installMMF.pcf
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/videocontroller/installMMF.pcf,v
retrieving revision 1.5.2.21
diff -u -w -r1.5.2.21 installMMF.pcf
--- symbianMmf/videocontroller/installMMF.pcf 16 Oct 2009 17:43:48 -0000 1.5.2.21
+++ symbianMmf/videocontroller/installMMF.pcf 6 Jan 2010 11:58:16 -0000
@@ -125,6 +125,9 @@
#
lib_names = []
+# Plugin Dlls [built separately] that need to be included to the *dll_names*.txt files
+additional_lib_names = []
+
# some dlls like vidplin aggregate functionality offered individually with
# other dlls; this list tracks those dlls that can be removed from the list
# of dlls to install because another dll duplicates or replaces the functionality
@@ -180,7 +183,10 @@
'XPSFileFormat' : 'datatype/xps/fileformat/[target]/XPSFileFormat.dll',
'hxmetadataeng' : 'datatype/xps/fileformat/[target]/hxmetadataeng.dll',
'avifformat' : 'datatype/avi/fileformat/[target]/avifformat.dll',
- 'mkvff' : 'datatype/mkv/fileformat/[target]/mkvff.dll'
+ 'mkvff' : 'datatype/mkv/fileformat/[target]/mkvff.dll',
+ 'asfff' : 'datatype/wm/fileformat/[target]/asfff.dll',
+ 'wma9' : 'datatype/mdf/audio/arm/wma/[target]/wma9.dll',
+ 'wmarender' : 'datatype/wm/audio/renderer/[target]/wmarender.dll'
}
@@ -212,9 +218,22 @@
newList.append(item)
return newList
+def AddAdditionalDLLs(*files):
+ global additional_lib_names
+ for f in files:
+ additional_lib_names.append(f)
+
# always add client core dll
Add('clntcore')
+# always add asf file format
+Add('asfff')
+Add('wma9')
+Add('wmarender')
+
+# add hxwmdrmplugin to *dll_names*.txt
+AddAdditionalDLLs('hxwmdrmplugin')
+
if project.IsDefined("HELIX_FEATURE_S60_PROGDOWN"):
Add('progdownfs')
@@ -338,6 +357,13 @@
path = os.path.normpath(path)
lib_files_copy.append(path)
+additional_lib_names_copy = []
+for f in additional_lib_names:
+ path = os.path.join(playerDllDir, f)
+ path += ".dll"
+ path = os.path.normpath(path)
+ additional_lib_names_copy.append(path)
+
#
# payld_dll_files, payld_rsc_files
#
@@ -349,7 +375,8 @@
'mdfmp4payloadformat.dll' : 'datatype/mdf/video/format/mp4/[target]/mdfmp4payloadformat.dll',
'mdfrvxpayloadformat.dll' : 'datatype/mdf/video/format/rm/[target]/mdfrvxpayloadformat.dll',
'mdfh264payloadformat.dll' : 'datatype/mdf/video/format/h264/[target]/mdfh264payloadformat.dll',
- 'mdfflvpayloadformat.dll' : 'datatype/mdf/video/format/flv/[target]/mdfflvpayloadformat.dll' }
+ 'mdfflvpayloadformat.dll' : 'datatype/mdf/video/format/flv/[target]/mdfflvpayloadformat.dll',
+ 'mdfwmvpayloadformat.dll' : 'datatype/mdf/video/format/wmv/[target]/mdfwmvpayloadformat.dll' }
payld_rsc_names = []
@@ -359,11 +386,13 @@
'mdfrvxpayloadformat.rsc' : 'datatype/mdf/video/format/rm/[target]/mdfrvxpayloadformat.rsc',
'mdfh264payloadformat.rsc' : 'datatype/mdf/video/format/h264/[target]/mdfh264payloadformat.rsc',
'mdfflvpayloadformat.rsc' : 'datatype/mdf/video/format/flv/[target]/mdfflvpayloadformat.rsc',
+ 'mdfwmvpayloadformat.rsc' : 'datatype/mdf/video/format/wmv/[target]/mdfwmvpayloadformat.rsc',
'10207474.rsc' : 'datatype/mdf/video/format/h263/[target]/10207474.rsc',
'10207476.rsc' : 'datatype/mdf/video/format/mp4/[target]/10207476.rsc',
'10207478.rsc' : 'datatype/mdf/video/format/rm/[target]/10207478.rsc',
'1020747a.rsc' : 'datatype/mdf/video/format/h264/[target]/1020747a.rsc',
- '1028334d.rsc' : 'datatype/mdf/video/format/flv/[target]/1028334d.rsc' }
+ '1028334d.rsc' : 'datatype/mdf/video/format/flv/[target]/1028334d.rsc',
+ '10283353.rsc' : 'datatype/mdf/video/format/wmv/[target]/10283353.rsc' }
#
# some helpers to reduce clutter...
@@ -383,6 +412,7 @@
AddPayldDllMdf( 'mdfrvxpayloadformat.dll' )
AddPayldDllMdf( 'mdfh264payloadformat.dll' )
AddPayldDllMdf( 'mdfflvpayloadformat.dll' )
+AddPayldDllMdf( 'mdfwmvpayloadformat.dll' )
def AddPayldRsc(*files):
''' add files to list of files to install '''
@@ -400,12 +430,14 @@
AddPayldRscMdf( 'mdfrvxpayloadformat.rsc' )
AddPayldRscMdf( 'mdfh264payloadformat.rsc' )
AddPayldRscMdf( 'mdfflvpayloadformat.rsc' )
+ AddPayldRscMdf( 'mdfwmvpayloadformat.rsc' )
else:
AddPayldRscMdf( '10207474.rsc' )
AddPayldRscMdf( '10207476.rsc' )
AddPayldRscMdf( '10207478.rsc' )
AddPayldRscMdf( '1020747a.rsc' )
AddPayldRscMdf( '1028334d.rsc' )
+ AddPayldRscMdf( '10283353.rsc' )
# add make copy output dir prefix and .dll suffix, e.g. '../../debug/foo.dll'
payld_dll_files_copy = []
Index: tools/metadataeng/engine/platform/symbian/hxmetadata_dlls.txt
===================================================================
RCS file: /cvsroot/datatype/tools/metadataeng/engine/platform/symbian/hxmetadata_dlls.txt,v
retrieving revision 1.1.2.3
diff -u -w -r1.1.2.3 hxmetadata_dlls.txt
--- tools/metadataeng/engine/platform/symbian/hxmetadata_dlls.txt 16 Oct 2009 19:40:29 -0000 1.1.2.3
+++ tools/metadataeng/engine/platform/symbian/hxmetadata_dlls.txt 6 Jan 2010 12:11:13 -0000
@@ -3,3 +3,4 @@
smplfsys.dll
mkvff.dll
avifformat.dll
+asfff.dll
From ehyche at real.com Thu Jan 7 07:10:22 2010
From: ehyche at real.com (Eric Hyche)
Date: Thu Jan 7 14:36:06 2010
Subject: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays
incorrect duration for a wav file recorded by gnome-sound-recorder.
In-Reply-To: <004901ca8f77$39950c70$8001a8c0@adroit02a604c1>
References: <011601ca78cd$6011f9a0$8001a8c0@adroit02a604c1>
<7ECCEA249B7CDC49A079EC0075E999AA07D82CC716@SEAMBX.corp.real.com>
<012301ca798f$c8a9dce0$8001a8c0@adroit02a604c1>
<268FD6EA-49A7-42FA-AFC6-78547C20C18B@real.com>
<01ed01ca8492$b14289e0$8001a8c0@adroit02a604c1>
<5FC21ACD-FE11-427F-BA16-49FA0D27F818@real.com>
<007401ca8ec6$e4d0abf0$8001a8c0@adroit02a604c1>
<004901ca8f77$39950c70$8001a8c0@adroit02a604c1>
Message-ID: <0833E151-A5C6-4A11-9F0B-411840816C87@real.com>
But if I'm reading the diff correctly, if the QI for IHXFileStat fails, then we never call the RIFF reader user back with CRiffResponse::InitDone(), correct? If so, then we've hung the app.
Eric
On Jan 7, 2010, at 3:55 AM, Sushant Garg wrote:
> Before calling Stat() we have a condition to check whether QI is succeeded or not & if in case it does not then we will not send a call to Stat() & return status of InitDone().
>
> + HX_RELEASE(m_pFileStatObj);
> + if(m_pFileObject)
> + {
> + HX_RESULT retVal = m_pFileObject->QueryInterface(IID_IHXFileStat, (void **) &m_pFileStatObj);
> + if(SUCCEEDED(retVal) && m_pFileStatObj)
> + {
> + m_pFileStatObj->Stat((IHXFileStatResponse *) this);
> + }
> + }
> + return status;
>
> Now if Stat() fails then we will get error in StatDone() & hence we will not get the size of file. And so we will not change m_ulDataSizeInBytes in wvffplin.cpp
>
> Thanks & Regards
> Sushant Garg
> ----- Original Message -----
> From: Eric Hyche
> To: Sushant Garg
> Cc: Datatype-Dev
> Sent: Wednesday, January 06, 2010 8:25 PM
> Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
>
> Looks good for the most part. However, if your QI for IHXFileStat fails, then we will hang, since no InitDone() back to the RIFF reader user will ever be made. So make sure that if either the QI for IHXFileStat fails, or the call to STat() returns failure that we properly make a failure InitDone() back to the RIFF reader user.
>
> Actually, the QI for IHXFileStat should not be required, since file objects are not required to implement this. So if the QI for IHXFileStat fails, then the RIFF reader should continue on normally, just without knowing the file size. If the QI for IHXFileStat() succeeds but the call to STat() returns failure, then we can return failure in InitDone() back to the RIFF reader caller.
>
> Eric
>
> On Jan 6, 2010, at 6:53 AM, Sushant Garg wrote:
>
> > Thanks Eric,
> >
> > Please find the updated diff.
> >
> > Now I am calling Read() from CRIFFReader::StatDone() rather then CRIFFReader::InitDone.
> >
> > Thanks & Regards
> > Sushant Garg
> > ----- Original Message -----
> > From: Eric Hyche
> > To: Sushant Garg
> > Cc: Datatype-Dev
> > Sent: Monday, January 04, 2010 8:13 PM
> > Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> >
> > You are treating IHXFileStat::Stat() like a synchronous call and there is
> > no guarantee that it will be. Once you issue the call to Stat(), then
> > you will need to wait in StatDone() before calling back to InitDone().
> >
> > Eric
> >
> > On Dec 24, 2009, at 7:14 AM, Sushant Garg wrote:
> >
> > > Eric,
> > >
> > > Please find the updated diff.
> > >
> > > Thanks & Regards
> > > Sushant Garg
> > > ----- Original Message -----
> > > From: Eric Hyche
> > > To: Sushant Grag
> > > Cc: Datatype-Dev
> > > Sent: Friday, December 11, 2009 12:04 AM
> > > Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> > >
> > > Sushant,
> > >
> > > After thinking about this some more, I think the Stat() call should be moved inside the RIFF reader, for a couple of reasons:
> > >
> > > - centralize it in one place, so other uses of the RIFF reader don't have to do the same thing.
> > > - the most natural time to do the Stat is immediately after the IHXFileObject is Init'd, which in this case the RIFF reader does.
> > >
> > > So I think the RIFF reader could do the IHXFileStat::Stat() call, and then store the filesize result. Then we could just add an accessor function on the RIFF reader so that users of the RIFF reader can read the size. The file size would only be valid after the CRIFFREader::Open() call had returned with a RIFFOpenDone() callback.
> > >
> > > Eric
> > >
> > > On Dec 10, 2009, at 6:56 AM, Sushant Grag wrote:
> > >
> > > > Thanks Eric,
> > > >
> > > > Please find the updated diff.
> > > >
> > > > Thanks & Regards
> > > > Sushant Garg
> > > > ----- Original Message -----
> > > > From: Eric Hyche
> > > > To: Sushant Grag ; Datatype-Dev
> > > > Sent: Wednesday, December 09, 2009 7:17 PM
> > > > Subject: RE: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> > > >
> > > > +UINT32 CRIFFReader::GetFileDataSize()
> > > > +{
> > > > + CHXString strFilePath = m_pFilename;
> > > > + const char* szFileProtocol = "file://";
> > > > + UINT32 ulFiledataSize =0;
> > > > +
> > > > + if( !strFilePath.Left(strlen(szFileProtocol)).CompareNoCase(szFileProtocol) )
> > > > + {
> > > > + strFilePath = strFilePath.Mid(strlen(szFileProtocol));
> > > > + struct stat fileInfo;
> > > > + if(!stat(strFilePath, &fileInfo))
> > > > + {
> > > > + ulFiledataSize = fileInfo.st_size;
> > > > + }
> > > > + }
> > > > + return ulFiledataSize;
> > > > +}
> > > > +
> > > >
> > > > I did not mean do a C-library stat() on the file. The file object that
> > > > the RIFF readers uses will not always be a local file that you can call stat() on.
> > > > What I meant was QI the file object for IHXFileStat and then call IHXFileStat::Stat().
> > > > You will have to implement IHXFileStatResponse::StatDone().
> > > >
> > > > Eric
> > > >
> > > > >-----Original Message-----
> > > > >From: datatype-dev-bounces@helixcommunity.org [mailto:datatype-dev-bounces@helixcommunity.org] On
> > > > >Behalf Of Sushant Grag
> > > > >Sent: Wednesday, December 09, 2009 7:45 AM
> > > > >To: Datatype-Dev
> > > > >Subject: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file
> > > > >recorded by gnome-sound-recorder.
> > > > >
> > > > >Project: RealPlayer for Netbook
> > > > >
> > > > >Synopsis:
> > > > >
> > > > >Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-
> > > > >recorder.
> > > > >
> > > > >
> > > > >
> > > > >Overview:
> > > > >
> > > > >There is an issue with wav files which are recorded from ubuntu sound recorder.
> > > > >
> > > > >The calculated file duration in Realplayer for linux is much & much larger then original file duration
> > > > >
> > > > >eg: file has duration of 6secs & Realplayer shows more than 3hr 22 min.
> > > > >
> > > > >Reason behind is, sound recorder adds garbage value in data chunk which leads to very big value of
> > > > >m_ulChunkBodyLen calculated in riff.cpp around line 380
> > > > >
> > > > > if ( (UINT32)getlong(buf) == m_ulFindChunkId )
> > > > >
> > > > > {
> > > > >
> > > > > // Found the chunk we were asked for
> > > > >
> > > > > m_state = RS_Ready;
> > > > >
> > > > > m_ulChunkBodyLen = GetLong(&buf[4]);
> > > > >
> > > > > m_ulChunkSize = m_ulChunkBodyLen;
> > > > >
> > > > >Which cause a very higher value of duration.
> > > > >
> > > > >
> > > > >
> > > > >Now I have created two different functions in riff.cpp;
> > > > >
> > > > >CRIFFReader::GetFileDataSize() & CRIFFReader::GetCurrentFileOffset() in which I am getting the length
> > > > >of file & the file offset and calling these functions in function CWaveFileFormat::RIFFFindChunkDone()
> > > > >, case WS_FindDataChunkPending to set m_ulDataSizeInBytes if "len" is greater then
> > > > >"ulDataSizeInBytes".
> > > > >
> > > > >
> > > > >
> > > > >Files Modified:
> > > > >/cvsroot/datatype/common/util/riff.cpp
> > > > >
> > > > >/cvsroot/datatype/common/util/pub/riff.h
> > > > >
> > > > >/cvsroot/datatype/wav/fileformat/wvffplin.cpp
> > > > >
> > > > >
> > > > >
> > > > >Files Added:
> > > > >
> > > > >None
> > > > >
> > > > >
> > > > >
> > > > >Platforms and Profiles Affected:
> > > > >Linux
> > > > >
> > > > >Distribution Libraries Affected:
> > > > >None.
> > > > >
> > > > >Platforms and Profiles Build Verified:
> > > > >Bif: realplay_gtk_atlas_restricted_gold_1.2
> > > > >Profile: helix-client-moblin
> > > > >Target: player_all
> > > > >
> > > > >Branch:
> > > > >Atlas347, Atlas310, Atlas3_4_10, 401 Brizo, Head
> > > > >
> > > > >
> > > > >
> > > > >Files Attached:
> > > > >
> > > > >9840_diff.txt
> > > > >
> > > > >
> > > > >
> > > > >Thanks & Regards
> > > > >Sushant Garg
> > > > <9840_diff.txt>
> > >
> > > Eric Hyche (ehyche@real.com)
> > > Principal Engineer
> > > RealNetworks, Inc.
> > >
> > >
> >
> > Eric Hyche (ehyche@real.com)
> > Principal Engineer
> > RealNetworks, Inc.
> >
> > <9840_diff.txt>
>
> Eric Hyche (ehyche@real.com)
> Principal Engineer
> RealNetworks, Inc.
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From ehyche at real.com Thu Jan 7 07:13:35 2010
From: ehyche at real.com (Eric Hyche)
Date: Thu Jan 7 14:40:11 2010
Subject: [datatype-dev] Re: [Nokia-private-dev] CR: ESLM-7YHD9L - Helix_wmv
controller:
Conflict between the list from SupportsMimeType and actually video type
(mp4) for video playback
In-Reply-To:
References:
Message-ID: <553FE252-87A4-46E1-8434-2381CAED7A31@real.com>
Looks OK to me.
On Jan 7, 2010, at 9:21 AM, wrote:
>
> "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: ext-shashi.merapala@nokia.com
>
> Reviewed by: ashish.as.gupta@nokia.com
>
> Date: 01/07/2010
>
> Project: SymbianMmf_wm
>
> Error Id: ESLM-7YHD9L
>
> Synopsis: Helix_wmv controller: Conflict between the list from SupportsMimeType and actually video type (mp4) for video playback
>
> Overview: The WMV Extension Controller needs to be rolled up into the rest of Helix so that the Helix audio/video controllers support the Windows Media content.
>
> Solution: Diffs attached
>
> Files removed: The folder ?wmvextcontroller? and its contents are removed from \clientapps\symbianMmf\
>
> Files added: None
>
> Files modified: \client\build\BIF\hxclient_2_1_0_cayennes.bif
> \clientapps\symbianMmf\videocontroller\installMMF.pcf
> \clientapps\symbianMmf\videocontroller\MmfSis
> \clientapps\symbianMmf\audiocontroller\installMMF.pcf
> \clientapps\symbianMmf\audiocontroller\controllersis
> \clientapps\symbianMmf\videocontroller\101F8513.rss
> \clientapps\symbianMmf\audiocontroller\10207B64.rss
> \datatype\tools\metadataeng\engine\platform\symbian\hxmetadata_dlls.txt
>
> Image size and heap use impact: Approx. 289 kb of space saved on image creation
>
> Module release testing (STIF): Passed
>
> Test case(s) added: No
>
> Memory leak check performed: Yes. No new leaks introduced
>
> Platforms and profiles build verified: helix-client-s60-52-mmf-mdf-dsp
>
> Platforms and profiles functionality verified: armv5, winscw
>
> Branch: 210CayS, HEAD, 420Brizo
>
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From EXT-Edith.3.Hernandez at nokia.com Thu Jan 7 14:36:45 2010
From: EXT-Edith.3.Hernandez at nokia.com (EXT-Edith.3.Hernandez@nokia.com)
Date: Thu Jan 7 22:02:23 2010
Subject: [datatype-dev] CR:PAMK-7YKKXV Helix Metadata Engine does not clean
up archived data when upgraded/downgraded & PAMK-7YKK6F Helix
engine thubmail does not clean up archived data when
upgradeed/downgraded
Message-ID:
"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: EXT-Edith.3.Hernandez@nokia.com
Reviewed by:
Date: 07/01/2010
ErrorId: PAMK-7YKKXV , PAMK-7YKK6F
Project: symbianMmf_wm
Synopsis:
PAMK-7YKKXV Helix Metadata Engine does not clean up archived data when upgraded/downgraded
PAMK-7YKK6F Helix engine thubmail does not clean up archived data when upgradeed/downgraded
Overview:
TNE needs to be able to recognize, when it starts up, that it has been upgraded/downgraded then clean up and regenerate archived data files (hxmetadata_archive.txt, hxthumbnail_archive.txt, MdfPluginArchive.txt, plugin_archive.txt ). Versioning information should be stored in HXTNEngine_3_2.cfg.
MDE needs to be able to recognize, when it starts up, that it has been upgraded/downgraded then clean up and regenerate archived data files (hxmetadata_archive.txt, hxthumbnail_archive.txt, MdfPluginArchive.txt, plugin_archive.txt ). Versioning information should be stored in HXMDEngine_3_2.cfg.
Solution:
In CHXSymbianMetaDataEng::SetupPreferences() check
a) If MMFControllerVersion does not exist in config file: store MMFControllerVersion in the config file and delete required txt files.
b) If MMFControllerVersion has changed: store the New MMFControllerVersion in the config file and delete required txt files.
Config file could be HXMDEngine_3_2.cfg or HXTNEngine_3_2.cfg, It depends on which file we are working on, therefore same code fix both bugs.
Files modified:
/cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
/cvsroot/datatype/tools/metadataeng/engine/pub/platform/symbian/symbian_metadataeng.h
Files added: None
Image Size and Heap Use impact: None
Module Release testing (STIF) : Passed
Test case(s) Added : No
Memory leak check performed : Yes
Platforms and Profiles Build Verified:helix-client-s60-50-mmf-mdf-arm
Platforms and Profiles Functionality verified: armv5, winscw
Branch: 223Cays, 221Cays, HEAD
-------------- next part --------------
? Makefile
? Umakefil.upp
? armv5-dbg32
? armv5-rel32
? hxmetadataeng_dll_stub.c
? hxmetadataeng_ordinal.dat
? hxmetadataeng{000a0000}.def
? platform/symbian/Copy of symbian_metadataeng.cpp
? pub/platform/symbian/Copy of symbian_metadataeng.h
Index: platform/symbian/symbian_metadataeng.cpp
===================================================================
RCS file: /cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp,v
retrieving revision 1.1.2.5
diff -u -w -r1.1.2.5 symbian_metadataeng.cpp
--- platform/symbian/symbian_metadataeng.cpp 19 Jan 2009 22:29:17 -0000 1.1.2.5
+++ platform/symbian/symbian_metadataeng.cpp 22 Dec 2009 18:44:37 -0000
@@ -61,6 +61,8 @@
#include "dllpath.h"
#include "hxmetadatalog.h"
+#include "platform.h" //TARVER_STR_PLATFORM
+#include "hxprefutil.h" // ReadPrefCSTRING( )
static const int KMinMetaDataStartupMemory = 512*1024;
@@ -72,6 +74,8 @@
#define DESTOSTR(x) (CHXSymbianString::DescToString(x))
+#define CHXAV_MMFControllerVersion "MMFControllerVersion" // key preference in config file
+
void GetInstallDrive(CHXString &strDrive)
{
@@ -500,6 +504,39 @@
if (SUCCEEDED(hxr))
{
+ // once open the config file, verify if the MMFControllerVersion has changed
+ //get MMFControllerVersion from platform.h
+ CHXString strMmfControllerVerCur = TARVER_STR_PLATFORM;
+
+ // get MMFControllerVersion from cfg file
+ //cfg file could be HXMDEngine_3_2.cfg or HXTNEngine_3_2.cfg, It depends on which file we are working on
+ CHXString strMmfControllerVerOld;
+ hxr = ReadPrefCSTRING( m_pPrefs, CHXAV_MMFControllerVersion, strMmfControllerVerOld );
+
+ if( !SUCCEEDED(hxr) )
+ {
+ // MMFControllerVersion does not exist in cfg file ... add MMFControllerVersion and delete files
+ CreatePrefIfNoExist( CHXAV_MMFControllerVersion,strMmfControllerVerCur );
+ DeleteFiles();
+ }
+ else
+ {
+ //MMFControllerVersion exists in cfg file ..... compare MMFControllerVersion from cfg VS MMFControllerVersion from platform.h
+ if ( strMmfControllerVerCur != strMmfControllerVerOld )
+ {
+ // MMFControllerVersions are diferent then delete files and replace in cfg the value of MMFControllerVersion with the new value
+ DeleteFiles();
+ IHXBuffer* pBuffer = new CHXBuffer;
+ if(pBuffer)
+ {
+ pBuffer->AddRef();
+ pBuffer->Set( (const unsigned char*)(const char*)strMmfControllerVerCur, strlen(strMmfControllerVerCur) + 1 );
+ m_pPrefs->WritePref( CHXAV_MMFControllerVersion, pBuffer );
+ }
+ HX_RELEASE( pBuffer );
+ }
+ }
+
// set plugin archieve file name
CHXString strPluginArchiveFileName;
@@ -775,3 +812,32 @@
return;
}
+//------------------------------------------------------------------------------
+// CHXSymbianMetaDataEng::DeleteFiles
+//Delete txt files. Called when MMFControllerVersion has changed in cfg file
+//------------------------------------------------------------------------------
+void CHXSymbianMetaDataEng::DeleteFiles()
+{
+ RFs fsrv;
+ _LIT(KHxmetadataArchiveAndPath, "c:\\data\\hxmetadata_archive.txt ");
+ _LIT(KMdfPluginArchiveAndPath, "c:\\data\\MdfPluginArchive.txt");
+ _LIT(KPluginArchiveAndPath, "c:\\data\\plugin_archive.txt ");
+ _LIT(KHxthumbnailArchiveAndPath, "c:\\data\\hxthumbnail_archive.txt ");
+
+ TInt err = KErrNone;
+ CleanupClosePushL( fsrv );
+
+ err = fsrv.Connect();
+ if ( err != KErrNone )
+ {
+ User::Leave( err );
+ }
+
+ fsrv.Delete(KHxmetadataArchiveAndPath);
+ fsrv.Delete(KMdfPluginArchiveAndPath);
+ fsrv.Delete(KPluginArchiveAndPath);
+ fsrv.Delete(KHxthumbnailArchiveAndPath);
+
+ CleanupStack::PopAndDestroy( 1 );
+}
+
Index: pub/platform/symbian/symbian_metadataeng.h
===================================================================
RCS file: /cvsroot/datatype/tools/metadataeng/engine/pub/platform/symbian/symbian_metadataeng.h,v
retrieving revision 1.1.2.5
diff -u -w -r1.1.2.5 symbian_metadataeng.h
--- pub/platform/symbian/symbian_metadataeng.h 26 Jan 2009 20:50:27 -0000 1.1.2.5
+++ pub/platform/symbian/symbian_metadataeng.h 18 Dec 2009 17:20:31 -0000
@@ -176,6 +176,7 @@
HX_RESULT CheckRootConfigFile();
void GetPropertyL(MHXEngineProperties::EHXEngineProperty
PropertyId, CHXString &sValue);
+ void DeleteFiles();
protected:
CHXSymbianMetaDataEng();
From gahluwalia at real.com Thu Jan 7 23:46:21 2010
From: gahluwalia at real.com (Gurpreet)
Date: Fri Jan 8 07:12:00 2010
Subject: [datatype-dev] CR/CN: Bug 9959: appear garbage picture when switch
playing two VP6 files
Message-ID: <4B46E2CD.6060406@real.com>
Synopsis:
Bug 9959: appear garbage picture when switch playing two VP6 files
Overview:
The issue is because we are releasing active frame while its being
blitted(in Color Conversion).
For hardware decoder we have implemented EndStream in respective
renderer so that the active frame is released before decoder is closed
but the active frame is being released with out check.
We have reverted earlier change and now the active frame is released
when we have closed BltrPump and have DisplayMutex Lock.
Files Modified:
datatype/common/vidrend/vidrend.cpp
datatype/h263/renderer/h263video.cpp
datatype/h263/renderer/pub/h263video.h
datatype/mp4/video/renderer/mp4video.cpp
datatype/mp4/video/renderer/pub/mp4video.h
datatype/wm/video/renderer/wmvrender.cpp
datatype/wm/video/renderer/pub/wmvrender.h
Image Size and Heap Use impact (Client -Only):
None
Platforms and Profiles Build Verified:
BIF branch -> atlas 361
Target(s) -> android_all
Profile -> helix-client-android-surf_8x50
SYSTEM_ID -> android-donut-arm.eabi
Files Attached::
vidrend.diff
mp4rend,diff
h263rend.diff
wmrend.diff
Thanks & Best Regards,
Gurpreet
-------------- next part --------------
Index: vidrend.cpp
===================================================================
RCS file: /cvsroot/datatype/common/vidrend/vidrend.cpp,v
retrieving revision 1.97.2.7.2.2
diff -u -r1.97.2.7.2.2 vidrend.cpp
--- vidrend.cpp 12 Nov 2009 10:08:37 -0000 1.97.2.7.2.2
+++ vidrend.cpp 8 Jan 2010 07:10:09 -0000
@@ -797,6 +797,12 @@
}
DisplayMutex_Lock();
+ if (m_pActiveVideoPacket)
+ {
+ m_pActiveVideoPacket->Clear();
+ delete m_pActiveVideoPacket;
+ m_pActiveVideoPacket = NULL;
+ }
if (m_pVideoFormat)
{
m_pVideoFormat->Close();
-------------- next part --------------
Index: mp4video.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/video/renderer/mp4video.cpp,v
retrieving revision 1.13.8.2.6.1
diff -u -r1.13.8.2.6.1 mp4video.cpp
--- mp4video.cpp 19 Nov 2009 04:03:20 -0000 1.13.8.2.6.1
+++ mp4video.cpp 8 Jan 2010 07:10:47 -0000
@@ -100,18 +100,6 @@
HX_RELEASE(m_pMP4VideoFormat);
}
-STDMETHODIMP CMP4VideoRenderer::EndStream()
-{
- if (m_pActiveVideoPacket)
- {
- m_pActiveVideoPacket->Clear();
- delete m_pActiveVideoPacket;
- m_pActiveVideoPacket = NULL;
- }
- CVideoRenderer::EndStream();
-
- return HXR_OK;
-}
HX_RESULT STDAPICALLTYPE CMP4VideoRenderer::HXCreateInstance(IUnknown** ppIUnknown)
{
Index: pub/mp4video.h
===================================================================
RCS file: /cvsroot/datatype/mp4/video/renderer/pub/mp4video.h,v
retrieving revision 1.7.8.2
diff -u -r1.7.8.2 mp4video.h
--- pub/mp4video.h 15 May 2009 15:55:09 -0000 1.7.8.2
+++ pub/mp4video.h 8 Jan 2010 07:10:48 -0000
@@ -115,7 +115,6 @@
virtual HX_RESULT UntimedModeNotice(HXBOOL bUntimedRendering);
- STDMETHOD (EndStream) (THIS);
CHXMemoryAllocator* m_pOutputAllocator;
};
-------------- next part --------------
Index: h263video.cpp
===================================================================
RCS file: /cvsroot/datatype/h263/renderer/h263video.cpp,v
retrieving revision 1.11.2.1.2.2
diff -u -r1.11.2.1.2.2 h263video.cpp
--- h263video.cpp 12 Nov 2009 05:15:31 -0000 1.11.2.1.2.2
+++ h263video.cpp 8 Jan 2010 07:11:28 -0000
@@ -279,15 +279,4 @@
bitmapInfoHeader.biBitCount + 7) / 8;
}
-STDMETHODIMP CH263VideoRenderer::EndStream()
-{
- if (m_pActiveVideoPacket)
- {
- m_pActiveVideoPacket->Clear();
- delete m_pActiveVideoPacket;
- m_pActiveVideoPacket = NULL;
- }
- CVideoRenderer::EndStream();
- return HXR_OK;
-}
Index: pub/h263video.h
===================================================================
RCS file: /cvsroot/datatype/h263/renderer/pub/h263video.h,v
retrieving revision 1.5.70.1
diff -u -r1.5.70.1 h263video.h
--- pub/h263video.h 6 Nov 2009 16:35:04 -0000 1.5.70.1
+++ pub/h263video.h 8 Jan 2010 07:11:29 -0000
@@ -125,7 +125,6 @@
REF(UINT32) /*OUT*/ unInitialGranularity
);
- STDMETHOD (EndStream) (THIS);
};
#endif //__h263VIDEO_H__
-------------- next part --------------
Index: wmvrender.cpp
===================================================================
RCS file: /cvsroot/datatype/wm/video/renderer/wmvrender.cpp,v
retrieving revision 1.2.2.5
diff -u -r1.2.2.5 wmvrender.cpp
--- wmvrender.cpp 23 Sep 2009 06:05:21 -0000 1.2.2.5
+++ wmvrender.cpp 8 Jan 2010 07:12:45 -0000
@@ -276,16 +276,4 @@
{
return m_dDecodeTimeRatio;
}
-STDMETHODIMP CWMVideoRenderer::EndStream()
-{
- if (m_pActiveVideoPacket)
- {
- m_pActiveVideoPacket->Clear();
- delete m_pActiveVideoPacket;
- m_pActiveVideoPacket = NULL;
- }
- CVideoRenderer::EndStream();
-
- return HXR_OK;
-}
Index: pub/wmvrender.h
===================================================================
RCS file: /cvsroot/datatype/wm/video/renderer/pub/wmvrender.h,v
retrieving revision 1.1.1.1.24.3
diff -u -r1.1.1.1.24.3 wmvrender.h
--- pub/wmvrender.h 23 Sep 2009 06:05:22 -0000 1.1.1.1.24.3
+++ pub/wmvrender.h 8 Jan 2010 07:12:46 -0000
@@ -72,7 +72,6 @@
void SetDecodeTimeRatio(HXDOUBLE ratio);
HXDOUBLE GetDecodeTimeRatio();
- STDMETHOD (EndStream) (THIS);
protected:
CHXMemoryAllocator* m_pOutputAllocator;
HXDOUBLE m_dDecodeTimeRatio;
From sgarg at real.com Fri Jan 8 04:31:35 2010
From: sgarg at real.com ( Sushant Garg)
Date: Fri Jan 8 11:57:12 2010
Subject: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays
incorrect duration for a wav file recorded by gnome-sound-recorder.
References: <011601ca78cd$6011f9a0$8001a8c0@adroit02a604c1>
<7ECCEA249B7CDC49A079EC0075E999AA07D82CC716@SEAMBX.corp.real.com>
<012301ca798f$c8a9dce0$8001a8c0@adroit02a604c1>
<268FD6EA-49A7-42FA-AFC6-78547C20C18B@real.com>
<01ed01ca8492$b14289e0$8001a8c0@adroit02a604c1>
<5FC21ACD-FE11-427F-BA16-49FA0D27F818@real.com>
<007401ca8ec6$e4d0abf0$8001a8c0@adroit02a604c1>
<004901ca8f77$39950c70$8001a8c0@adroit02a604c1>
<0833E151-A5C6-4A11-9F0B-411840816C87@real.com>
Message-ID: <008601ca905e$868a8130$8001a8c0@adroit02a604c1>
Skipped content of type multipart/alternative-------------- next part --------------
Index: riff.cpp
===================================================================
RCS file: /cvsroot/datatype/common/util/riff.cpp,v
retrieving revision 1.12.16.2
diff -u -r1.12.16.2 riff.cpp
--- riff.cpp 5 Jun 2008 08:33:31 -0000 1.12.16.2
+++ riff.cpp 8 Jan 2010 12:26:54 -0000
@@ -110,6 +110,8 @@
, m_ulChunkBytesRead(0)
, m_ulChunkSize(0)
, m_ulChunkType(0)
+ , m_pFileStatObj(NULL)
+ , m_ulTotalFileSizeInBytes(0L)
{
m_pContext = pContext;
m_pResponse = pResponse;
@@ -192,6 +194,11 @@
// return HXR_OK;
}
+UINT32 CRIFFReader::GetCurrentFileOffset()
+{
+ return m_ulCurOffset;
+}
+
STDMETHODIMP
CRIFFReader::InitDone(HX_RESULT status)
{
@@ -205,8 +212,50 @@
m_bFileIsOpen = TRUE;
+ HX_RELEASE(m_pFileStatObj);
+ if ( !m_pFileObject )
+ return HXR_UNEXPECTED;
+
+ HX_RESULT retVal = m_pFileObject->QueryInterface(IID_IHXFileStat, (void **) &m_pFileStatObj);
+ if(SUCCEEDED(retVal) && m_pFileStatObj)
+ {
+ m_pFileStatObj->Stat((IHXFileStatResponse *) this);
+ }
+ else
+ {
+ m_state = RS_GetFileTypePending;
+ return m_pFileObject->Read(sizeof(UINT32) * 2);
+ }
+ return status;
+}
+
+/////////////////////////////////////////////////////////////////////////
+// Method:
+// IHXFileFormatObject::StatDone
+//
+STDMETHODIMP
+CRIFFReader::StatDone(HX_RESULT status, UINT32 ulSize,
+ ULONG32 ulCreationTime,
+ UINT32 ulAccessTime,
+ UINT32 ulModificationTime,
+ UINT32 ulMode)
+{
+ // We're finished with the IHXFileStat interface, so we'll release it:
+ HX_RELEASE(m_pFileStatObj);
+
+ if (SUCCEEDED(status))
+ {
+ // Now we know how big the file is, so we can calculate the
+ // actual duration for all streams using it.
+ m_ulTotalFileSizeInBytes = ulSize;
+ }
m_state = RS_GetFileTypePending;
- return m_pFileObject->Read(sizeof(UINT32) * 2);
+ return m_pFileObject->Read(sizeof(UINT32) * 2);
+}
+
+UINT32 CRIFFReader::GetTotalFileSize()
+{
+ return m_ulTotalFileSizeInBytes;
}
HX_RESULT
@@ -233,6 +282,8 @@
m_bFileIsOpen = FALSE;
+ HX_RELEASE(m_pFileStatObj);
+ m_ulTotalFileSizeInBytes = 0L;
return HXR_OK;
}
Index: pub/riff.h
===================================================================
RCS file: /cvsroot/datatype/common/util/pub/riff.h,v
retrieving revision 1.6
diff -u -r1.6 riff.h
--- pub/riff.h 14 Mar 2005 19:24:45 -0000 1.6
+++ pub/riff.h 6 Jan 2010 11:14:27 -0000
@@ -49,6 +49,7 @@
typedef _INTERFACE IHXFileObject IHXFileObject;
class CRIFFReader : public IHXFileResponse,
+ public IHXFileStatResponse,
public IHXThreadSafeMethods
{
public:
@@ -61,6 +62,9 @@
*/
HX_RESULT Open(char* filename);
+ IHXFileStat* m_pFileStatObj; //for getting the file size.
+ UINT32 m_ulTotalFileSizeInBytes;
+ UINT32 GetCurrentFileOffset();
/*
* Close: Close the file
*/
@@ -126,6 +130,12 @@
STDMETHOD(InitDone) (THIS_
HX_RESULT status);
+ STDMETHOD(StatDone) (THIS_
+ HX_RESULT status, UINT32 ulSize,
+ ULONG32 ulCreationTime,
+ UINT32 ulAccessTime,
+ UINT32 ulModificationTime,
+ UINT32 ulMode);
STDMETHOD(ReadDone) (THIS_
HX_RESULT status,
IHXBuffer* pBuffer);
@@ -174,6 +184,7 @@
UINT32 GetListType();
UINT32 GetOffset();
+ UINT32 GetTotalFileSize();
UINT32 GetChunkType();
UINT32 GetChunkRawSize(void);
Index: wvffplin.cpp
===================================================================
RCS file: /cvsroot/datatype/wav/fileformat/wvffplin.cpp,v
retrieving revision 1.12.2.1.6.1
diff -u -r1.12.2.1.6.1 wvffplin.cpp
--- wvffplin.cpp 2 Dec 2009 02:38:34 -0000 1.12.2.1.6.1
+++ wvffplin.cpp 6 Jan 2010 11:15:55 -0000
@@ -963,6 +963,14 @@
}
m_ulDataSizeInBytes = len;
+ UINT32 ulFileOffset = m_pRiffReader->GetCurrentFileOffset();
+ UINT32 ulTotalFileSizeInBytes = m_pRiffReader->GetTotalFileSize();
+ UINT32 ulDataSizeInBytes = ulTotalFileSizeInBytes - ulFileOffset;
+ if(ulDataSizeInBytes < len)
+ {
+ m_ulDataSizeInBytes = ulDataSizeInBytes;
+ }
+
m_ulAvgBitRate = 8 * m_ulAvgBytesPerSec;
// The duration is of course calculatable from the size of
From ehyche at real.com Fri Jan 8 05:45:29 2010
From: ehyche at real.com (Eric Hyche)
Date: Fri Jan 8 13:10:57 2010
Subject: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays
incorrect duration for a wav file recorded by gnome-sound-recorder.
In-Reply-To: <008601ca905e$868a8130$8001a8c0@adroit02a604c1>
References: <011601ca78cd$6011f9a0$8001a8c0@adroit02a604c1>
<7ECCEA249B7CDC49A079EC0075E999AA07D82CC716@SEAMBX.corp.real.com>
<012301ca798f$c8a9dce0$8001a8c0@adroit02a604c1>
<268FD6EA-49A7-42FA-AFC6-78547C20C18B@real.com>
<01ed01ca8492$b14289e0$8001a8c0@adroit02a604c1>
<5FC21ACD-FE11-427F-BA16-49FA0D27F818@real.com>
<007401ca8ec6$e4d0abf0$8001a8c0@adroit02a604c1>
<004901ca8f77$39950c70$8001a8c0@adroit02a604c1>
<0833E151-A5C6-4A11-9F0B-411840816C87@real.com>
<008601ca905e$868a8130$8001a8c0@adroit02a604c1>
Message-ID:
Also if the call to IHXFileStat::Stat() returns failure, then we will never get a callback to StatDone(). So we should check the return value of the Stat() call, and if it fails, then we should also go ahead and call read (just like if the QI for IHXFileStat failed).
Eric
On Jan 8, 2010, at 7:31 AM, Sushant Garg wrote:
> Oops! missed to notice that.
>
> Now changed that code to following:
>
> in CRIFFReader::InitDone() function.
>
> + HX_RELEASE(m_pFileStatObj);
> + if ( !m_pFileObject )
> + return HXR_UNEXPECTED;
> +
> + HX_RESULT retVal = m_pFileObject->QueryInterface(IID_IHXFileStat, (void **) &m_pFileStatObj);
> + if(SUCCEEDED(retVal) && m_pFileStatObj)
> + {
> + m_pFileStatObj->Stat((IHXFileStatResponse *) this);
> + }
> + else
> + {
> + m_state = RS_GetFileTypePending;
> + return m_pFileObject->Read(sizeof(UINT32) * 2);
> + }
> + return status;
>
> from
>
> + HX_RELEASE(m_pFileStatObj);
> + if(m_pFileObject)
> + {
> + HX_RESULT retVal = m_pFileObject->QueryInterface(IID_IHXFileStat, (void **) &m_pFileStatObj);
> + if(SUCCEEDED(retVal) && m_pFileStatObj)
> + {
> + m_pFileStatObj->Stat((IHXFileStatResponse *) this);
> + }
> + }
> + return status;
>
> Please find the updated diff.
>
> Thanks & Regards
> Sushant Garg
> ----- Original Message -----
> From: Eric Hyche
> To: Sushant Garg
> Cc: Datatype-Dev
> Sent: Thursday, January 07, 2010 8:40 PM
> Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
>
> But if I'm reading the diff correctly, if the QI for IHXFileStat fails, then we never call the RIFF reader user back with CRiffResponse::InitDone(), correct? If so, then we've hung the app.
>
> Eric
>
> On Jan 7, 2010, at 3:55 AM, Sushant Garg wrote:
>
> > Before calling Stat() we have a condition to check whether QI is succeeded or not & if in case it does not then we will not send a call to Stat() & return status of InitDone().
> >
> > + HX_RELEASE(m_pFileStatObj);
> > + if(m_pFileObject)
> > + {
> > + HX_RESULT retVal = m_pFileObject->QueryInterface(IID_IHXFileStat, (void **) &m_pFileStatObj);
> > + if(SUCCEEDED(retVal) && m_pFileStatObj)
> > + {
> > + m_pFileStatObj->Stat((IHXFileStatResponse *) this);
> > + }
> > + }
> > + return status;
> >
> > Now if Stat() fails then we will get error in StatDone() & hence we will not get the size of file. And so we will not change m_ulDataSizeInBytes in wvffplin.cpp
> >
> > Thanks & Regards
> > Sushant Garg
> > ----- Original Message -----
> > From: Eric Hyche
> > To: Sushant Garg
> > Cc: Datatype-Dev
> > Sent: Wednesday, January 06, 2010 8:25 PM
> > Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> >
> > Looks good for the most part. However, if your QI for IHXFileStat fails, then we will hang, since no InitDone() back to the RIFF reader user will ever be made. So make sure that if either the QI for IHXFileStat fails, or the call to STat() returns failure that we properly make a failure InitDone() back to the RIFF reader user.
> >
> > Actually, the QI for IHXFileStat should not be required, since file objects are not required to implement this. So if the QI for IHXFileStat fails, then the RIFF reader should continue on normally, just without knowing the file size. If the QI for IHXFileStat() succeeds but the call to STat() returns failure, then we can return failure in InitDone() back to the RIFF reader caller.
> >
> > Eric
> >
> > On Jan 6, 2010, at 6:53 AM, Sushant Garg wrote:
> >
> > > Thanks Eric,
> > >
> > > Please find the updated diff.
> > >
> > > Now I am calling Read() from CRIFFReader::StatDone() rather then CRIFFReader::InitDone.
> > >
> > > Thanks & Regards
> > > Sushant Garg
> > > ----- Original Message -----
> > > From: Eric Hyche
> > > To: Sushant Garg
> > > Cc: Datatype-Dev
> > > Sent: Monday, January 04, 2010 8:13 PM
> > > Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> > >
> > > You are treating IHXFileStat::Stat() like a synchronous call and there is
> > > no guarantee that it will be. Once you issue the call to Stat(), then
> > > you will need to wait in StatDone() before calling back to InitDone().
> > >
> > > Eric
> > >
> > > On Dec 24, 2009, at 7:14 AM, Sushant Garg wrote:
> > >
> > > > Eric,
> > > >
> > > > Please find the updated diff.
> > > >
> > > > Thanks & Regards
> > > > Sushant Garg
> > > > ----- Original Message -----
> > > > From: Eric Hyche
> > > > To: Sushant Grag
> > > > Cc: Datatype-Dev
> > > > Sent: Friday, December 11, 2009 12:04 AM
> > > > Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> > > >
> > > > Sushant,
> > > >
> > > > After thinking about this some more, I think the Stat() call should be moved inside the RIFF reader, for a couple of reasons:
> > > >
> > > > - centralize it in one place, so other uses of the RIFF reader don't have to do the same thing.
> > > > - the most natural time to do the Stat is immediately after the IHXFileObject is Init'd, which in this case the RIFF reader does.
> > > >
> > > > So I think the RIFF reader could do the IHXFileStat::Stat() call, and then store the filesize result. Then we could just add an accessor function on the RIFF reader so that users of the RIFF reader can read the size. The file size would only be valid after the CRIFFREader::Open() call had returned with a RIFFOpenDone() callback.
> > > >
> > > > Eric
> > > >
> > > > On Dec 10, 2009, at 6:56 AM, Sushant Grag wrote:
> > > >
> > > > > Thanks Eric,
> > > > >
> > > > > Please find the updated diff.
> > > > >
> > > > > Thanks & Regards
> > > > > Sushant Garg
> > > > > ----- Original Message -----
> > > > > From: Eric Hyche
> > > > > To: Sushant Grag ; Datatype-Dev
> > > > > Sent: Wednesday, December 09, 2009 7:17 PM
> > > > > Subject: RE: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> > > > >
> > > > > +UINT32 CRIFFReader::GetFileDataSize()
> > > > > +{
> > > > > + CHXString strFilePath = m_pFilename;
> > > > > + const char* szFileProtocol = "file://";
> > > > > + UINT32 ulFiledataSize =0;
> > > > > +
> > > > > + if( !strFilePath.Left(strlen(szFileProtocol)).CompareNoCase(szFileProtocol) )
> > > > > + {
> > > > > + strFilePath = strFilePath.Mid(strlen(szFileProtocol));
> > > > > + struct stat fileInfo;
> > > > > + if(!stat(strFilePath, &fileInfo))
> > > > > + {
> > > > > + ulFiledataSize = fileInfo.st_size;
> > > > > + }
> > > > > + }
> > > > > + return ulFiledataSize;
> > > > > +}
> > > > > +
> > > > >
> > > > > I did not mean do a C-library stat() on the file. The file object that
> > > > > the RIFF readers uses will not always be a local file that you can call stat() on.
> > > > > What I meant was QI the file object for IHXFileStat and then call IHXFileStat::Stat().
> > > > > You will have to implement IHXFileStatResponse::StatDone().
> > > > >
> > > > > Eric
> > > > >
> > > > > >-----Original Message-----
> > > > > >From: datatype-dev-bounces@helixcommunity.org [mailto:datatype-dev-bounces@helixcommunity.org] On
> > > > > >Behalf Of Sushant Grag
> > > > > >Sent: Wednesday, December 09, 2009 7:45 AM
> > > > > >To: Datatype-Dev
> > > > > >Subject: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file
> > > > > >recorded by gnome-sound-recorder.
> > > > > >
> > > > > >Project: RealPlayer for Netbook
> > > > > >
> > > > > >Synopsis:
> > > > > >
> > > > > >Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-
> > > > > >recorder.
> > > > > >
> > > > > >
> > > > > >
> > > > > >Overview:
> > > > > >
> > > > > >There is an issue with wav files which are recorded from ubuntu sound recorder.
> > > > > >
> > > > > >The calculated file duration in Realplayer for linux is much & much larger then original file duration
> > > > > >
> > > > > >eg: file has duration of 6secs & Realplayer shows more than 3hr 22 min.
> > > > > >
> > > > > >Reason behind is, sound recorder adds garbage value in data chunk which leads to very big value of
> > > > > >m_ulChunkBodyLen calculated in riff.cpp around line 380
> > > > > >
> > > > > > if ( (UINT32)getlong(buf) == m_ulFindChunkId )
> > > > > >
> > > > > > {
> > > > > >
> > > > > > // Found the chunk we were asked for
> > > > > >
> > > > > > m_state = RS_Ready;
> > > > > >
> > > > > > m_ulChunkBodyLen = GetLong(&buf[4]);
> > > > > >
> > > > > > m_ulChunkSize = m_ulChunkBodyLen;
> > > > > >
> > > > > >Which cause a very higher value of duration.
> > > > > >
> > > > > >
> > > > > >
> > > > > >Now I have created two different functions in riff.cpp;
> > > > > >
> > > > > >CRIFFReader::GetFileDataSize() & CRIFFReader::GetCurrentFileOffset() in which I am getting the length
> > > > > >of file & the file offset and calling these functions in function CWaveFileFormat::RIFFFindChunkDone()
> > > > > >, case WS_FindDataChunkPending to set m_ulDataSizeInBytes if "len" is greater then
> > > > > >"ulDataSizeInBytes".
> > > > > >
> > > > > >
> > > > > >
> > > > > >Files Modified:
> > > > > >/cvsroot/datatype/common/util/riff.cpp
> > > > > >
> > > > > >/cvsroot/datatype/common/util/pub/riff.h
> > > > > >
> > > > > >/cvsroot/datatype/wav/fileformat/wvffplin.cpp
> > > > > >
> > > > > >
> > > > > >
> > > > > >Files Added:
> > > > > >
> > > > > >None
> > > > > >
> > > > > >
> > > > > >
> > > > > >Platforms and Profiles Affected:
> > > > > >Linux
> > > > > >
> > > > > >Distribution Libraries Affected:
> > > > > >None.
> > > > > >
> > > > > >Platforms and Profiles Build Verified:
> > > > > >Bif: realplay_gtk_atlas_restricted_gold_1.2
> > > > > >Profile: helix-client-moblin
> > > > > >Target: player_all
> > > > > >
> > > > > >Branch:
> > > > > >Atlas347, Atlas310, Atlas3_4_10, 401 Brizo, Head
> > > > > >
> > > > > >
> > > > > >
> > > > > >Files Attached:
> > > > > >
> > > > > >9840_diff.txt
> > > > > >
> > > > > >
> > > > > >
> > > > > >Thanks & Regards
> > > > > >Sushant Garg
> > > > > <9840_diff.txt>
> > > >
> > > > Eric Hyche (ehyche@real.com)
> > > > Principal Engineer
> > > > RealNetworks, Inc.
> > > >
> > > >
> > >
> > > Eric Hyche (ehyche@real.com)
> > > Principal Engineer
> > > RealNetworks, Inc.
> > >
> > > <9840_diff.txt>
> >
> > Eric Hyche (ehyche@real.com)
> > Principal Engineer
> > RealNetworks, Inc.
> >
>
> Eric Hyche (ehyche@real.com)
> Principal Engineer
> RealNetworks, Inc.
>
> <9840_diff.txt>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From ehyche at real.com Fri Jan 8 05:52:18 2010
From: ehyche at real.com (Eric Hyche)
Date: Fri Jan 8 13:17:44 2010
Subject: [datatype-dev] CR/CN: Bug 9959: appear garbage picture when
switch playing two VP6 files
In-Reply-To: <4B46E2CD.6060406@real.com>
References: <4B46E2CD.6060406@real.com>
Message-ID: <2C59779A-D5ED-4A42-B633-ADDEF975FBCA@real.com>
Gurpreet,
You should also check all the other vidrend-derived video renderers to make
sure this fix makes it to them as well. Check your BIF file for a target
called "all_vidrend_renderers" and this should list all the video renderers
which derive from the base video renderer.
Eric
On Jan 8, 2010, at 2:46 AM, Gurpreet wrote:
> Synopsis:
> Bug 9959: appear garbage picture when switch playing two VP6 files
>
> Overview:
> The issue is because we are releasing active frame while its being
> blitted(in Color Conversion).
> For hardware decoder we have implemented EndStream in respective
> renderer so that the active frame is released before decoder is closed
> but the active frame is being released with out check.
> We have reverted earlier change and now the active frame is released
> when we have closed BltrPump and have DisplayMutex Lock.
>
> Files Modified:
> datatype/common/vidrend/vidrend.cpp
> datatype/h263/renderer/h263video.cpp
> datatype/h263/renderer/pub/h263video.h
> datatype/mp4/video/renderer/mp4video.cpp
> datatype/mp4/video/renderer/pub/mp4video.h
> datatype/wm/video/renderer/wmvrender.cpp
> datatype/wm/video/renderer/pub/wmvrender.h
>
>
> Image Size and Heap Use impact (Client -Only):
> None
>
> Platforms and Profiles Build Verified:
> BIF branch -> atlas 361
> Target(s) -> android_all
> Profile -> helix-client-android-surf_8x50
> SYSTEM_ID -> android-donut-arm.eabi
>
> Files Attached::
> vidrend.diff
> mp4rend,diff
> h263rend.diff
> wmrend.diff
>
> Thanks & Best Regards,
> Gurpreet
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From ckarusala at real.com Fri Jan 8 15:14:40 2010
From: ckarusala at real.com (Chytanya Karusala)
Date: Fri Jan 8 22:40:34 2010
Subject: [datatype-dev] CR: Correcting an earlier fix to MP4A depacketizer
Message-ID: <6.2.5.6.2.20100108150604.063f37c0@real.com>
Synopsis
========
This CR corrects a bug with an earlier fix to MP4A depacketizer
Branch : HEAD
Suggested Reviewer : Jamie, Eric
Description
=========
I''ve updated MP4APayloadFormat earlier to add the
"AudioSpecificConfig" to the stream header. But this was done at the
wrong place, it should have been done after m_pAudioConfig has been
initialized with the data and not before. Strangely, it worked all
along until I ran the server with --nfm option (the 2 byte config
must have been allocated earlier and the same memory might be getting
reused for m_pAudioConfig). Fixed this to change the order.
Files Changed:
============
datatype/mp4/payload/mp4apyld.cpp
Testing Performed
=================
Unit Tests:
- Verified that the stream headers have correct "AudioSpecificConfig"
even with --nfm run.
Integration Tests:
- None
Leak Tests:
Performance Tests:
- None
Build verified: win32-i386-vc7
Platform tested : win32-i386-vc7
Thanks,
Chytanya
Index: mp4apyld.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/payload/mp4apyld.cpp,v
retrieving revision 1.20
diff -u -r1.20 mp4apyld.cpp
--- mp4apyld.cpp 3 Dec 2009 21:50:22 -0000 1.20
+++ mp4apyld.cpp 8 Jan 2010 23:12:49 -0000
@@ -631,6 +631,15 @@
}
}
+
+ if (SUCCEEDED(retVal))
+ {
+ if (m_ulAudioConfigSize > 0)
+ {
+ memcpy(m_pAudioConfig, pCodecConfig,
m_ulAudioConfigSize); /* Flawfinder: ignore */
+ }
+ }
+
#ifdef HELIX_FEATURE_SERVER
if (SUCCEEDED(retVal) && m_pAudioConfig)
{
@@ -648,13 +657,6 @@
}
#endif //HELIX_FEATURE_SERVER
- if (SUCCEEDED(retVal))
- {
- if (m_ulAudioConfigSize > 0)
- {
- memcpy(m_pAudioConfig, pCodecConfig,
m_ulAudioConfigSize); /* Flawfinder: ignore */
- }
- }
}
HX_RELEASE(pConfigBuffer);
From jgordon at real.com Fri Jan 8 15:16:46 2010
From: jgordon at real.com (Jamie Gordon)
Date: Fri Jan 8 22:42:07 2010
Subject: [datatype-dev] Re: CR: Correcting an earlier fix to MP4A
depacketizer
In-Reply-To: <6.2.5.6.2.20100108150604.063f37c0@real.com>
References: <6.2.5.6.2.20100108150604.063f37c0@real.com>
Message-ID: <4B47BCDE.3030807@real.com>
ok
On 1/8/2010 3:14 PM, Chytanya Karusala wrote:
> Synopsis
> ========
> This CR corrects a bug with an earlier fix to MP4A depacketizer
>
> Branch : HEAD
> Suggested Reviewer : Jamie, Eric
>
> Description
> =========
> I''ve updated MP4APayloadFormat earlier to add the
> "AudioSpecificConfig" to the stream header. But this was done at the
> wrong place, it should have been done after m_pAudioConfig has been
> initialized with the data and not before. Strangely, it worked all
> along until I ran the server with --nfm option (the 2 byte config
> must have been allocated earlier and the same memory might be getting
> reused for m_pAudioConfig). Fixed this to change the order.
>
> Files Changed:
> ============
> datatype/mp4/payload/mp4apyld.cpp
>
> Testing Performed
> =================
> Unit Tests:
> - Verified that the stream headers have correct "AudioSpecificConfig"
> even with --nfm run.
>
> Integration Tests:
> - None
>
> Leak Tests:
>
> Performance Tests:
> - None
>
> Build verified: win32-i386-vc7
> Platform tested : win32-i386-vc7
>
> Thanks,
> Chytanya
>
> Index: mp4apyld.cpp
> ===================================================================
> RCS file: /cvsroot/datatype/mp4/payload/mp4apyld.cpp,v
> retrieving revision 1.20
> diff -u -r1.20 mp4apyld.cpp
> --- mp4apyld.cpp 3 Dec 2009 21:50:22 -0000 1.20
> +++ mp4apyld.cpp 8 Jan 2010 23:12:49 -0000
> @@ -631,6 +631,15 @@
> }
> }
>
> +
> + if (SUCCEEDED(retVal))
> + {
> + if (m_ulAudioConfigSize > 0)
> + {
> + memcpy(m_pAudioConfig, pCodecConfig,
> m_ulAudioConfigSize); /* Flawfinder: ignore */
> + }
> + }
> +
> #ifdef HELIX_FEATURE_SERVER
> if (SUCCEEDED(retVal) && m_pAudioConfig)
> {
> @@ -648,13 +657,6 @@
> }
> #endif //HELIX_FEATURE_SERVER
>
> - if (SUCCEEDED(retVal))
> - {
> - if (m_ulAudioConfigSize > 0)
> - {
> - memcpy(m_pAudioConfig, pCodecConfig,
> m_ulAudioConfigSize); /* Flawfinder: ignore */
> - }
> - }
> }
>
> HX_RELEASE(pConfigBuffer);
>
>
>
From EXT-Edith.3.Hernandez at nokia.com Fri Jan 8 15:42:29 2010
From: EXT-Edith.3.Hernandez at nokia.com (EXT-Edith.3.Hernandez@nokia.com)
Date: Fri Jan 8 23:07:48 2010
Subject: [datatype-dev] RESEND: PAMK-7YKKXV Helix Metadata Engine does not
clean up archived data when upgraded/downgraded & PAMK-7YKK6F
Helix engine thubmail does not clean up archived data when
upgradeed/downgraded
References:
Message-ID:
Sending the CR again with the updated diff file ...
"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: EXT-Edith.3.Hernandez@nokia.com
Reviewed by:
Date: 07/01/2010
ErrorId: PAMK-7YKKXV , PAMK-7YKK6F
Project: symbianMmf_wm
Synopsis:
PAMK-7YKKXV Helix Metadata Engine does not clean up archived data when upgraded/downgraded
PAMK-7YKK6F Helix engine thubmail does not clean up archived data when upgradeed/downgraded
Overview:
TNE needs to be able to recognize, when it starts up, that it has been upgraded/downgraded then clean up and regenerate archived data files (hxmetadata_archive.txt, hxthumbnail_archive.txt, MdfPluginArchive.txt, plugin_archive.txt ). Versioning information should be stored in HXTNEngine_3_2.cfg.
MDE needs to be able to recognize, when it starts up, that it has been upgraded/downgraded then clean up and regenerate archived data files (hxmetadata_archive.txt, hxthumbnail_archive.txt, MdfPluginArchive.txt, plugin_archive.txt ). Versioning information should be stored in HXMDEngine_3_2.cfg.
Solution:
In CHXSymbianMetaDataEng::SetupPreferences() check
a) If MMFControllerVersion does not exist in config file: store MMFControllerVersion in the config file and delete required txt files.
b) If MMFControllerVersion has changed: store the New MMFControllerVersion in the config file and delete required txt files.
Config file could be HXMDEngine_3_2.cfg or HXTNEngine_3_2.cfg, It depends on which file we are working on, therefore same code fix both bugs.
Files modified:
/cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
/cvsroot/datatype/tools/metadataeng/engine/pub/platform/symbian/symbian_metadataeng.h
Files added: None
Image Size and Heap Use impact: None
Module Release testing (STIF) : Passed
Test case(s) Added : No
Memory leak check performed : Yes
Platforms and Profiles Build Verified:helix-client-s60-50-mmf-mdf-arm
Platforms and Profiles Functionality verified: armv5, winscw
Branch: 223Cays, 221Cays, HEAD
-------------- next part --------------
? Makefile
? Umakefil.upp
? armv5-dbg32
? armv5-rel32
? hxmetadataeng_dll_stub.c
? hxmetadataeng_ordinal.dat
? hxmetadataeng{000a0000}.def
? platform/symbian/Copy of symbian_metadataeng.cpp
? platform/symbian/respaldo fix of symbian_metadataeng.cpp
? pub/platform/symbian/Copy of symbian_metadataeng.h
Index: platform/symbian/symbian_metadataeng.cpp
===================================================================
RCS file: /cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp,v
retrieving revision 1.1.2.5
diff -u -w -r1.1.2.5 symbian_metadataeng.cpp
--- platform/symbian/symbian_metadataeng.cpp 19 Jan 2009 22:29:17 -0000 1.1.2.5
+++ platform/symbian/symbian_metadataeng.cpp 8 Jan 2010 19:04:26 -0000
@@ -61,6 +61,8 @@
#include "dllpath.h"
#include "hxmetadatalog.h"
+#include "platform.h" //TARVER_STR_PLATFORM
+#include "hxprefutil.h" // ReadPrefCSTRING( )
static const int KMinMetaDataStartupMemory = 512*1024;
@@ -72,6 +74,8 @@
#define DESTOSTR(x) (CHXSymbianString::DescToString(x))
+#define CHXAV_MMFControllerVersion "MMFControllerVersion" // key preference in config file
+
void GetInstallDrive(CHXString &strDrive)
{
@@ -500,6 +504,39 @@
if (SUCCEEDED(hxr))
{
+ // once open the config file, verify if the MMFControllerVersion has changed
+ //get MMFControllerVersion from platform.h
+ CHXString strMmfControllerVerCur = TARVER_STR_PLATFORM;
+
+ // get MMFControllerVersion from cfg file
+ //cfg file could be HXMDEngine_3_2.cfg or HXTNEngine_3_2.cfg, It depends on which file we are working on
+ CHXString strMmfControllerVerOld;
+ hxr = ReadPrefCSTRING( m_pPrefs, CHXAV_MMFControllerVersion, strMmfControllerVerOld );
+
+ if( !SUCCEEDED(hxr) )
+ {
+ // MMFControllerVersion does not exist in cfg file ... add MMFControllerVersion and delete files
+ CreatePrefIfNoExist( CHXAV_MMFControllerVersion,strMmfControllerVerCur );
+ TRAPD( err, DeleteFilesL() );
+ }
+ else
+ {
+ //MMFControllerVersion exists in cfg file ..... compare MMFControllerVersion from cfg VS MMFControllerVersion from platform.h
+ if ( strMmfControllerVerCur != strMmfControllerVerOld )
+ {
+ // MMFControllerVersions are diferent then delete files and replace in cfg the value of MMFControllerVersion with the new value
+ TRAPD( err, DeleteFilesL() );
+
+ IHXBuffer* pBuffer = NULL;
+ if( m_pCCF->CreateInstance(CLSID_IHXBuffer, (void**)&pBuffer) == HXR_OK )
+ {
+ pBuffer->Set( (const unsigned char*)(const char*)strMmfControllerVerCur, strlen(strMmfControllerVerCur) + 1 );
+ m_pPrefs->WritePref( CHXAV_MMFControllerVersion, pBuffer );
+ }
+ HX_RELEASE( pBuffer );
+ }
+ }
+
// set plugin archieve file name
CHXString strPluginArchiveFileName;
@@ -775,3 +812,32 @@
return;
}
+//------------------------------------------------------------------------------
+// CHXSymbianMetaDataEng::DeleteFiles
+//Delete txt files. Called when MMFControllerVersion has changed in cfg file
+//------------------------------------------------------------------------------
+void CHXSymbianMetaDataEng::DeleteFilesL()
+{
+ RFs fsrv;
+ _LIT(KHxmetadataArchiveAndPath, "c:\\data\\hxmetadata_archive.txt ");
+ _LIT(KMdfPluginArchiveAndPath, "c:\\data\\MdfPluginArchive.txt");
+ _LIT(KPluginArchiveAndPath, "c:\\data\\plugin_archive.txt ");
+ _LIT(KHxthumbnailArchiveAndPath, "c:\\data\\hxthumbnail_archive.txt ");
+
+ TInt err = KErrNone;
+ CleanupClosePushL( fsrv );
+
+ err = fsrv.Connect();
+ if ( err != KErrNone )
+ {
+ User::Leave( err );
+ }
+
+ fsrv.Delete(KHxmetadataArchiveAndPath);
+ fsrv.Delete(KMdfPluginArchiveAndPath);
+ fsrv.Delete(KPluginArchiveAndPath);
+ fsrv.Delete(KHxthumbnailArchiveAndPath);
+
+ CleanupStack::PopAndDestroy( 1 );
+}
+
Index: pub/platform/symbian/symbian_metadataeng.h
===================================================================
RCS file: /cvsroot/datatype/tools/metadataeng/engine/pub/platform/symbian/symbian_metadataeng.h,v
retrieving revision 1.1.2.5
diff -u -w -r1.1.2.5 symbian_metadataeng.h
--- pub/platform/symbian/symbian_metadataeng.h 26 Jan 2009 20:50:27 -0000 1.1.2.5
+++ pub/platform/symbian/symbian_metadataeng.h 8 Jan 2010 17:27:34 -0000
@@ -176,6 +176,7 @@
HX_RESULT CheckRootConfigFile();
void GetPropertyL(MHXEngineProperties::EHXEngineProperty
PropertyId, CHXString &sValue);
+ void DeleteFilesL();
protected:
CHXSymbianMetaDataEng();
From gwright at real.com Fri Jan 8 15:55:31 2010
From: gwright at real.com (Gregory Wright)
Date: Fri Jan 8 23:20:50 2010
Subject: [datatype-dev] RESEND: PAMK-7YKKXV Helix Metadata Engine does
not clean up archived data when upgraded/downgraded & PAMK-7YKK6F Helix
engine thubmail does not clean up archived data
when upgradeed/downgraded
In-Reply-To:
References:
Message-ID: <0BE91E9E-9D00-4F55-9A61-7536F69ADE54@real.com>
Looks good to me.
--greg.
On Jan 8, 2010, at 3:42 PM, wrote:
> Sending the CR again with the updated diff file ...
>
> "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: EXT-Edith.3.Hernandez@nokia.com
> Reviewed by:
> Date: 07/01/2010
> ErrorId: PAMK-7YKKXV , PAMK-7YKK6F
> Project: symbianMmf_wm
>
> Synopsis:
> PAMK-7YKKXV Helix Metadata Engine does not clean up archived data when upgraded/downgraded
> PAMK-7YKK6F Helix engine thubmail does not clean up archived data when upgradeed/downgraded
>
> Overview:
> TNE needs to be able to recognize, when it starts up, that it has been upgraded/downgraded then clean up and regenerate archived data files (hxmetadata_archive.txt, hxthumbnail_archive.txt, MdfPluginArchive.txt, plugin_archive.txt ). Versioning information should be stored in HXTNEngine_3_2.cfg.
>
> MDE needs to be able to recognize, when it starts up, that it has been upgraded/downgraded then clean up and regenerate archived data files (hxmetadata_archive.txt, hxthumbnail_archive.txt, MdfPluginArchive.txt, plugin_archive.txt ). Versioning information should be stored in HXMDEngine_3_2.cfg.
>
> Solution:
> In CHXSymbianMetaDataEng::SetupPreferences() check
> a) If MMFControllerVersion does not exist in config file: store MMFControllerVersion in the config file and delete required txt files.
> b) If MMFControllerVersion has changed: store the New MMFControllerVersion in the config file and delete required txt files.
>
> Config file could be HXMDEngine_3_2.cfg or HXTNEngine_3_2.cfg, It depends on which file we are working on, therefore same code fix both bugs.
>
> Files modified:
> /cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
> /cvsroot/datatype/tools/metadataeng/engine/pub/platform/symbian/symbian_metadataeng.h
>
> Files added: None
> Image Size and Heap Use impact: None
> Module Release testing (STIF) : Passed
> Test case(s) Added : No
> Memory leak check performed : Yes
> Platforms and Profiles Build Verified:helix-client-s60-50-mmf-mdf-arm
> Platforms and Profiles Functionality verified: armv5, winscw
> Branch: 223Cays, 221Cays, HEAD
>
>
From gahluwalia at real.com Sun Jan 10 21:45:58 2010
From: gahluwalia at real.com (Gurpreet)
Date: Mon Jan 11 05:10:53 2010
Subject: [datatype-dev] CR: Bug 9955: a particular flv can not be played
Message-ID: <4B4ABB16.2090300@real.com>
Synopsis:
Bug 9955: a particular flv can not be played
Overview:
This particular file attached with bug is corrupt.
We are missing duration in header.
When fileformat tries to scan duration, it encounters bad tag size.
We return error if requested seekoffset is larger then file size.
Files Modified:
datatype/flash/flv/fileformat/flv_file_format.cpp
Image Size and Heap Use impact (Client -Only):
None
Platforms and Profiles Build Verified:
BIF branch -> atlas 361
Target(s) -> android_all
Profile -> helix-client-android-surf_8x50
SYSTEM_ID -> android-donut-arm.eabi
Files Attached::
flv.diff
Thanks & Best Regards,
Gurpreet
-------------- next part --------------
Index: flv_file_format.cpp
===================================================================
RCS file: /cvsroot/datatype/flash/flv/fileformat/flv_file_format.cpp,v
retrieving revision 1.9.2.25.2.4
diff -u -r1.9.2.25.2.4 flv_file_format.cpp
--- flv_file_format.cpp 7 Jan 2010 05:18:45 -0000 1.9.2.25.2.4
+++ flv_file_format.cpp 11 Jan 2010 05:19:27 -0000
@@ -2121,8 +2121,16 @@
m_ulState = kStateGFHScanDurationSeekDonePending;
// Compute the absolute file offset of the previous tag
m_ulSeekOffsetRequested = m_ulFileOffset - ulPrevTagSize - 8;
- // Seek to the previous tag
- m_pFileObject->Seek(m_ulSeekOffsetRequested, FALSE);
+ if (m_ulSeekOffsetRequested > m_ulFileSize)
+ {
+ //Corrupt File
+ m_pFormatResponse->FileHeaderReady(HXR_CORRUPT_FILE, NULL);
+ }
+ else
+ {
+ // Seek to the previous tag
+ m_pFileObject->Seek(m_ulSeekOffsetRequested, FALSE);
+ }
}
}
if (FAILED(retVal))
From ehyche at real.com Mon Jan 11 06:36:39 2010
From: ehyche at real.com (Eric Hyche)
Date: Mon Jan 11 14:01:23 2010
Subject: [datatype-dev] CR: Bug 9955: a particular flv can not be played
In-Reply-To: <4B4ABB16.2090300@real.com>
References: <4B4ABB16.2090300@real.com>
Message-ID: <4FECA986-4340-4AE0-AE8F-99EA0E46614C@real.com>
Looks good to me.
On Jan 11, 2010, at 12:45 AM, Gurpreet wrote:
> Synopsis:
> Bug 9955: a particular flv can not be played
>
> Overview:
> This particular file attached with bug is corrupt.
> We are missing duration in header.
> When fileformat tries to scan duration, it encounters bad tag size.
> We return error if requested seekoffset is larger then file size.
>
> Files Modified:
> datatype/flash/flv/fileformat/flv_file_format.cpp
>
> Image Size and Heap Use impact (Client -Only):
> None
>
> Platforms and Profiles Build Verified:
> BIF branch -> atlas 361
> Target(s) -> android_all
> Profile -> helix-client-android-surf_8x50
> SYSTEM_ID -> android-donut-arm.eabi
>
> Files Attached::
> flv.diff
>
> Thanks & Best Regards,
> Gurpreet
>
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From ehyche at real.com Mon Jan 11 07:14:04 2010
From: ehyche at real.com (Eric Hyche)
Date: Mon Jan 11 14:38:46 2010
Subject: [datatype-dev] RESEND: PAMK-7YKKXV Helix Metadata Engine does
not clean up archived data when upgraded/downgraded & PAMK-7YKK6F Helix
engine thubmail does not clean up archived data
when upgradeed/downgraded
In-Reply-To:
References:
Message-ID:
Looks good.
On Jan 8, 2010, at 6:42 PM, wrote:
> Sending the CR again with the updated diff file ...
>
> "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: EXT-Edith.3.Hernandez@nokia.com
> Reviewed by:
> Date: 07/01/2010
> ErrorId: PAMK-7YKKXV , PAMK-7YKK6F
> Project: symbianMmf_wm
>
> Synopsis:
> PAMK-7YKKXV Helix Metadata Engine does not clean up archived data when upgraded/downgraded
> PAMK-7YKK6F Helix engine thubmail does not clean up archived data when upgradeed/downgraded
>
> Overview:
> TNE needs to be able to recognize, when it starts up, that it has been upgraded/downgraded then clean up and regenerate archived data files (hxmetadata_archive.txt, hxthumbnail_archive.txt, MdfPluginArchive.txt, plugin_archive.txt ). Versioning information should be stored in HXTNEngine_3_2.cfg.
>
> MDE needs to be able to recognize, when it starts up, that it has been upgraded/downgraded then clean up and regenerate archived data files (hxmetadata_archive.txt, hxthumbnail_archive.txt, MdfPluginArchive.txt, plugin_archive.txt ). Versioning information should be stored in HXMDEngine_3_2.cfg.
>
> Solution:
> In CHXSymbianMetaDataEng::SetupPreferences() check
> a) If MMFControllerVersion does not exist in config file: store MMFControllerVersion in the config file and delete required txt files.
> b) If MMFControllerVersion has changed: store the New MMFControllerVersion in the config file and delete required txt files.
>
> Config file could be HXMDEngine_3_2.cfg or HXTNEngine_3_2.cfg, It depends on which file we are working on, therefore same code fix both bugs.
>
> Files modified:
> /cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
> /cvsroot/datatype/tools/metadataeng/engine/pub/platform/symbian/symbian_metadataeng.h
>
> Files added: None
> Image Size and Heap Use impact: None
> Module Release testing (STIF) : Passed
> Test case(s) Added : No
> Memory leak check performed : Yes
> Platforms and Profiles Build Verified:helix-client-s60-50-mmf-mdf-arm
> Platforms and Profiles Functionality verified: armv5, winscw
> Branch: 223Cays, 221Cays, HEAD
>
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From pbasic at real.com Mon Jan 11 09:58:37 2010
From: pbasic at real.com (Petar Basic)
Date: Mon Jan 11 17:24:04 2010
Subject: [datatype-dev] CR/CN: Solaris-Sparc-GCC patches for GMPMetaEditor
branch
Message-ID: <9b8350411001110958m6fb02f4fqa4ace1930abf35c1@mail.gmail.com>
Modified by: pbasic at real.com
Date: 2010/01/11
Project: GMP MetaEditor (meta3gp.exe)
Synopsis:
Solaris-Sparc-GCC patches for GMPMetaEditor branch
Overview:
This CR includes patches needed to successfully build/run meta3gp
project with GCC on Solaris-Sparc.
Checked into GMPMetaEditor branch immediately since I need to verify
the build on the farm ASAP. Some points below can be discussed and
improved on later, however, at this time they seem irrelevant in the
context of GMPMetaEditor.
Details:
1.) "audio/fixptutil/pub/math64.h" was failing to compile due to
missing implementation of 64-bit operations for Solaris-Sparc-GCC
combo.
In the CVS log, one can find traces of Sparc specific blocks of code
which according to CVS comments had some bugs and were replaced by
platform independent (plain C) implementations for Solaris-SunStudio
combo. Relevant ifdef statement has now been modified to also compile
platform independent implementations under Solaris-Sparc-GCC combo.
All tests performed by "audio/fixptutil/test/fixpttest.c" succeed,
although the execution proves slow. Testing with MetaEditor reveals
that these operations are not used during meta-data
extraction/injection, so at this time optimization for
Solaris-Sparc-GCC does not seem important.
2.) statvfs on Solaris fails if passed an empty path argument, which
causes calling method CHXFileSpecUtils::IsDiskLocal to print out an
error to the console. This is not acceptable for MetaEditor,
especially since everything works correctly. The culprit is actually
in MemoryMapDataFile::Bind method in
"common/fileio/platform/unix/mmapdatf.cpp". The code has been updated
to process empty paths as a special case before resorting to
CHXFileSpecUtils::IsDiskLocal. Also, what seems as a duplicate code
block due to a bad check-in has been removed.
3.) RMAShutdown entry point which is now required by plugin handler
has been added to metaeditor.dll.
4.) Defaulting meta3gp executable to DTDriver synchronous mode since
asynchronous mode is not implemented on Solaris.
5.) Fixed various build busters.
6.) Reordered library dependencies in a few projects to allow the
Solaris linker to link all symbols correctly.
Testing:
Verified operation on GMP MetaEditor on Solaris 5.10 Sparc via
standard MetaEditor test scripts.
Files Modified:
audio/fixptutil/pub/math64.h
client/medpltfm/hxmedpltfmdll
client/medpltfm/pub/chxmedpltfmkicker.h
client/medpltfm/pub/chxmedpltfmsched.h
common/fileio/platform/unix/mmapdatf.cpp
datatype/mp4/filewriter/m4avsh.cpp
datatype/mp4/filewriter/mp4atoms.h
datatype/mp4/filewriter/mp4sm.cpp
datatype/mp4/filewriter/ra10sh.cpp
datatype/tools/dtdriver/apps/meta3gp/HXXmlInputParser.h
datatype/tools/dtdriver/apps/meta3gp/Umakefil_meta3gp
datatype/tools/dtdriver/apps/meta3gp/Umakefil_tests
datatype/tools/dtdriver/apps/meta3gp/main.cpp
datatype/tools/dtdriver/dtdrplin/dtdr_genr_lib
datatype/tools/dtdriver/dtdrplin/dtdr_platform_dll
datatype/tools/metaeditor/Umakefil
datatype/tools/metaeditor/hxdll.cpp
Platforms and Profiles Affected:
All
Image Size and Heap Use impact:
None
Platforms and Profiles Build Verified:
system id: win32-i386-vc7, sunos-5.8-sparc-gcc-server
profile: helix-client-all-defines
Platforms and Profiles Functionality Verified:
x86 Windows XP SP2
Sparc SunOS 5.10
Branch:
GMPMetaEditor
Copyright assignment:
I am a RealNetworks employee or contractor.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: audio_fixptutil.diff
Type: text/x-patch
Size: 1752 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100111/51a53ed8/audio_fixptutil-0001.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: client_medpltfm.diff
Type: text/x-patch
Size: 7972 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100111/51a53ed8/client_medpltfm-0001.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: common_fileio_platform_unix.diff
Type: text/x-patch
Size: 3706 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100111/51a53ed8/common_fileio_platform_unix-0001.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_mp4_filewriter.diff
Type: text/x-patch
Size: 13265 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100111/51a53ed8/datatype_mp4_filewriter-0001.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_tools_dtdriver_apps_meta3gp.diff
Type: text/x-patch
Size: 31904 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100111/51a53ed8/datatype_tools_dtdriver_apps_meta3gp-0001.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_tools_dtdriver_dtdrplin.diff
Type: text/x-patch
Size: 4813 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100111/51a53ed8/datatype_tools_dtdriver_dtdrplin-0001.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_tools_metaeditor.diff
Type: text/x-patch
Size: 4286 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100111/51a53ed8/datatype_tools_metaeditor-0001.bin
From Gang.Jia at nokia.com Mon Jan 11 10:09:07 2010
From: Gang.Jia at nokia.com (Gang.Jia@nokia.com)
Date: Mon Jan 11 17:34:54 2010
Subject: [datatype-dev] CR: ESLM-7ZDRP4 AC-3 in a MP4 container does not play
Message-ID: <6F45DEE63C5BB542B6A7B0C4E41467D0152AFA744B@NOK-EUMSG-03.mgdnok.nokia.com>
Skipped content of type multipart/alternative-------------- next part --------------
Index: mdfaudfmt.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/audio/dsp/mdfaudfmt.cpp,v
retrieving revision 1.1.2.14
diff -u -w -r1.1.2.14 mdfaudfmt.cpp
--- mdfaudfmt.cpp 15 Dec 2009 20:37:34 -0000 1.1.2.14
+++ mdfaudfmt.cpp 8 Jan 2010 20:13:58 -0000
@@ -835,7 +835,12 @@
//failure of SetConfig we limit the channels to 2 if it is more than 2.
m_uChannels = (m_uChannels <= 2)? m_uChannels : 2;
}
-
+ if(m_uChannels==0)
+ {
+ //number of channels here is a dummy value but we need it to be >0
+ //to pass the renderer initialization
+ m_uChannels = 2;
+ }
m_uSamplesPerFrame = AC3_SAMPLES_PER_FRAME;
m_uBytesPerFrame = (m_uBitsPerSample * m_uSamplesPerFrame) >>3;
if (m_uBytesPerFrame==0)
@@ -963,7 +968,12 @@
//failure of SetConfig we limit the channels to 2 if it is more than 2.
m_uChannels = (m_uChannels <= 2)? m_uChannels : 2;
}
-
+ if(m_uChannels==0)
+ {
+ //number of channels here is a dummy value but we need it to be >0
+ //to pass the renderer initialization
+ m_uChannels = 2;
+ }
m_uSamplesPerFrame = AC3_SAMPLES_PER_FRAME;
m_uBytesPerFrame = (m_uBitsPerSample * m_uSamplesPerFrame) >>3;
if (m_uBytesPerFrame==0)
Index: qtatmmgs.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/qtatmmgs.cpp,v
retrieving revision 1.29.2.12
diff -u -w -r1.29.2.12 qtatmmgs.cpp
--- qtatmmgs.cpp 23 Dec 2009 03:12:15 -0000 1.29.2.12
+++ qtatmmgs.cpp 8 Jan 2010 20:17:13 -0000
@@ -2045,6 +2045,15 @@
pSampleDescEntry)->pDecoderSpecificInfo;
}
break;
+ case QT_ac3:
+ case QT_eac3:
+ if (ulSampleDescEntrySize >
+ sizeof(CQT_stsd_Atom::AudioDolbyDigitalArrayEntry))
+ {
+ m_pOpaqueData = ((CQT_stsd_Atom::AudioDolbyDigitalArrayEntry*)
+ pSampleDescEntry)->pDecoderSpecificInfo;
+ }
+ break;
#ifdef QTCONFIG_TIMEDTEXT_PACKETIZER
case QT_tx3g:
m_ulNumSamplesInOpaqueData = 1;
@@ -2238,6 +2247,12 @@
case QT_sawb:
pMediaName = "X-RN-3GPP-AMR-WB";
break;
+ case QT_ac3:
+ pMediaName = "AC3";
+ break;
+ case QT_eac3:
+ pMediaName = "EAC3";
+ break;
default:
// nothing to do
break;
Index: qtpacketizerfct.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/qtpacketizerfct.cpp,v
retrieving revision 1.6.2.1
diff -u -w -r1.6.2.1 qtpacketizerfct.cpp
--- qtpacketizerfct.cpp 12 Jan 2006 05:16:34 -0000 1.6.2.1
+++ qtpacketizerfct.cpp 8 Jan 2010 20:17:13 -0000
@@ -269,7 +269,9 @@
const char* pMimeType = pTrackInfo->GetMimeType();
if (pMimeType &&
(!strcasecmp(pMimeType, "audio/X-RN-3GPP-AMR") ||
- !strcasecmp(pMimeType, "audio/X-RN-3GPP-AMR-WB")))
+ !strcasecmp(pMimeType, "audio/X-RN-3GPP-AMR-WB") ||
+ !strcasecmp(pMimeType, "audio/AC3") ||
+ !strcasecmp(pMimeType, "audio/EAC3") ))
{
retVal =
HXConcatenatePayloadFormat::CreateInstance(pPacketizer);
Index: pub/qtatoms.h
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/pub/qtatoms.h,v
retrieving revision 1.19.2.7
diff -u -w -r1.19.2.7 qtatoms.h
--- pub/qtatoms.h 20 Oct 2009 19:12:46 -0000 1.19.2.7
+++ pub/qtatoms.h 8 Jan 2010 20:17:13 -0000
@@ -143,6 +143,8 @@
QT_avc1 = QT_ENCODE_TYPE('a', 'v', 'c', '1'),
QT_sawb = QT_ENCODE_TYPE('s', 'a', 'w', 'b'),
QT_alac = QT_ENCODE_TYPE('a', 'l', 'a', 'c'),
+ QT_ac3 = QT_ENCODE_TYPE('a', 'c', '-', '3'),
+ QT_eac3 = QT_ENCODE_TYPE('e', 'c', '-', '3'),
// /-->> 3GPP Timed Text box types:
QT_text = QT_ENCODE_TYPE('t', 'e', 'x', 't'),
QT_tx3g = QT_ENCODE_TYPE('t', 'x', '3', 'g'),
@@ -2227,6 +2229,13 @@
UINT8 pDecoderSpecificInfo[1];
} PACKING;
+ class AudioDolbyDigitalArrayEntry : public AudioArrayEntry
+ {
+ public:
+ UINT8 pDecoderSpecificInfo[1];
+ } PACKING;
+
+
////////////////////////////////
// / 3GPP Timed Text structs:
///
From stanb at real.com Mon Jan 11 10:30:36 2010
From: stanb at real.com (Stan Bobrovskiy)
Date: Mon Jan 11 17:55:07 2010
Subject: [datatype-dev] CR: PR# 256027 - Converssion of FLV fails when using
AVCQ.DLL dore decoding
Message-ID: <7ECCEA249B7CDC49A079EC0075E999AA07D8B6D8AE@SEAMBX.corp.real.com>
Modified by: stanb@real.com
Date: 01:11:10
Project: RealPlayer SP 1.5
Synopsis: Adding support for newly introduced output video format (UYVY) in DTDR system.
Files Added: none
Files Modified:
datatype/tools/dtdriver/decoder/video/vdecoder.cpp
datatype/tools/dtdriver/engine/cencsrchdlr.cpp
Platforms and Profiles Build Verified:
Platform: win32-i386-vc7
Profile: helix-client-all-defines
target(s): playinst
Branch: hxclient_3_1_0_atlas, hxclient_4_0_1_brizo, HEAD
Index: decoder/video/vdecoder.cpp
===================================================================
RCS file: /cvsroot/datatype/tools/dtdriver/decoder/video/vdecoder.cpp,v
retrieving revision 1.16.2.18
diff -u -1 -0 -r1.16.2.18 vdecoder.cpp
--- decoder/video/vdecoder.cpp 28 Dec 2009 16:43:33 -0000 1.16.2.18
+++ decoder/video/vdecoder.cpp 11 Jan 2010 18:22:40 -0000
@@ -864,21 +864,21 @@
if(rSrcRect.left != 0 || rSrcRect.top != 0 || rSrcRect.right != pHeader->biWidth || rSrcRect.bottom != pHeader->biHeight)
{
m_bDoConversion = TRUE;
m_bDoResizingVideo = TRUE;
m_ulColorFormatOut = MapFourCCtoCID(pHeader->biCompression);
}
if (m_bDoResizingVideo)
{
- if (pHeader->biCompression != HX_I420)
+ if (pHeader->biCompression != HX_I420 && pHeader->biCompression != HX_UYVY)
{
m_bValidResizingInputFormat = FALSE;
return HXR_UNSUPPORTED_VIDEO;
}
// Adjust the width/height as the aspect ratio
if (m_bPreserveAspectRatio)
{
retVal = AdjustAspectRatio(m_ulOutputWidth, m_ulOutputHeight);
}
Index: engine/cencsrchdlr.cpp
===================================================================
RCS file: /cvsroot/datatype/tools/dtdriver/engine/cencsrchdlr.cpp,v
retrieving revision 1.23.2.23
diff -u -1 -0 -r1.23.2.23 cencsrchdlr.cpp
--- engine/cencsrchdlr.cpp 29 Dec 2009 18:43:31 -0000 1.23.2.23
+++ engine/cencsrchdlr.cpp 11 Jan 2010 18:22:41 -0000
@@ -2434,21 +2434,21 @@
pStreamState->m_ulFrameWidth = pStreamState->m_ulVideoWidth;
}
if(pStreamState->m_ulFrameHeight == 0)
{
pStreamState->m_ulFrameHeight = pStreamState->m_ulVideoHeight;
}
// Clear the return value
retVal = HXR_OK;
// Get the color format
- if (!strcmp(pszMimeType, "video/X-HX-I420"))
+ if (!strcmp(pszMimeType, "video/X-HX-I420") || !strcmp(pszMimeType, "video/X-HX-UYVY"))
{
EHXTVideoColorFormat eColorFormat = HXT_VIDEO_FORMAT_I420;
// Get the "ImageFormat" property (if available)
UINT32 ulImageFormat = 0;
if (SUCCEEDED(pStreamState->m_pStreamHeader->GetPropertyULONG32("ImageFormat", ulImageFormat)))
{
switch (ulImageFormat)
{
case HX_I420: eColorFormat = HXT_VIDEO_FORMAT_I420; break;
case HX_YV12: eColorFormat = HXT_VIDEO_FORMAT_YV12; break;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100111/393431c6/attachment-0001.html
From ping at real.com Mon Jan 11 10:42:16 2010
From: ping at real.com (Henry Ping)
Date: Mon Jan 11 18:06:58 2010
Subject: [datatype-dev] CR: PR# 256027 - Converssion of FLV fails when
using AVCQ.DLL dore decoding
In-Reply-To: <7ECCEA249B7CDC49A079EC0075E999AA07D8B6D8AE@SEAMBX.corp.real.com>
References: <7ECCEA249B7CDC49A079EC0075E999AA07D8B6D8AE@SEAMBX.corp.real.com>
Message-ID: <766B5A29D28DA442AB229AAEE2AFC44507D839A8C6@SEAMBX.corp.real.com>
Looks good for the IR.
However, we shouldn't hang if we deal with un-supported video output. From the symptom, it's hard to relate it to un-supported video output. I suggest to at least insert an assert to remind us.
Thanks
Henry
________________________________
From: datatype-dev-bounces@helixcommunity.org [mailto:datatype-dev-bounces@helixcommunity.org] On Behalf Of Stan Bobrovskiy
Sent: Monday, January 11, 2010 10:31 AM
To: datatype-dev@helixcommunity.org
Subject: [datatype-dev] CR: PR# 256027 - Converssion of FLV fails when using AVCQ.DLL dore decoding
Modified by: stanb@real.com
Date: 01:11:10
Project: RealPlayer SP 1.5
Synopsis: Adding support for newly introduced output video format (UYVY) in DTDR system.
Files Added: none
Files Modified:
datatype/tools/dtdriver/decoder/video/vdecoder.cpp
datatype/tools/dtdriver/engine/cencsrchdlr.cpp
Platforms and Profiles Build Verified:
Platform: win32-i386-vc7
Profile: helix-client-all-defines
target(s): playinst
Branch: hxclient_3_1_0_atlas, hxclient_4_0_1_brizo, HEAD
Index: decoder/video/vdecoder.cpp
===================================================================
RCS file: /cvsroot/datatype/tools/dtdriver/decoder/video/vdecoder.cpp,v
retrieving revision 1.16.2.18
diff -u -1 -0 -r1.16.2.18 vdecoder.cpp
--- decoder/video/vdecoder.cpp 28 Dec 2009 16:43:33 -0000 1.16.2.18
+++ decoder/video/vdecoder.cpp 11 Jan 2010 18:22:40 -0000
@@ -864,21 +864,21 @@
if(rSrcRect.left != 0 || rSrcRect.top != 0 || rSrcRect.right != pHeader->biWidth || rSrcRect.bottom != pHeader->biHeight)
{
m_bDoConversion = TRUE;
m_bDoResizingVideo = TRUE;
m_ulColorFormatOut = MapFourCCtoCID(pHeader->biCompression);
}
if (m_bDoResizingVideo)
{
- if (pHeader->biCompression != HX_I420)
+ if (pHeader->biCompression != HX_I420 && pHeader->biCompression != HX_UYVY)
{
m_bValidResizingInputFormat = FALSE;
return HXR_UNSUPPORTED_VIDEO;
}
// Adjust the width/height as the aspect ratio
if (m_bPreserveAspectRatio)
{
retVal = AdjustAspectRatio(m_ulOutputWidth, m_ulOutputHeight);
}
Index: engine/cencsrchdlr.cpp
===================================================================
RCS file: /cvsroot/datatype/tools/dtdriver/engine/cencsrchdlr.cpp,v
retrieving revision 1.23.2.23
diff -u -1 -0 -r1.23.2.23 cencsrchdlr.cpp
--- engine/cencsrchdlr.cpp 29 Dec 2009 18:43:31 -0000 1.23.2.23
+++ engine/cencsrchdlr.cpp 11 Jan 2010 18:22:41 -0000
@@ -2434,21 +2434,21 @@
pStreamState->m_ulFrameWidth = pStreamState->m_ulVideoWidth;
}
if(pStreamState->m_ulFrameHeight == 0)
{
pStreamState->m_ulFrameHeight = pStreamState->m_ulVideoHeight;
}
// Clear the return value
retVal = HXR_OK;
// Get the color format
- if (!strcmp(pszMimeType, "video/X-HX-I420"))
+ if (!strcmp(pszMimeType, "video/X-HX-I420") || !strcmp(pszMimeType, "video/X-HX-UYVY"))
{
EHXTVideoColorFormat eColorFormat = HXT_VIDEO_FORMAT_I420;
// Get the "ImageFormat" property (if available)
UINT32 ulImageFormat = 0;
if (SUCCEEDED(pStreamState->m_pStreamHeader->GetPropertyULONG32("ImageFormat", ulImageFormat)))
{
switch (ulImageFormat)
{
case HX_I420: eColorFormat = HXT_VIDEO_FORMAT_I420; break;
case HX_YV12: eColorFormat = HXT_VIDEO_FORMAT_YV12; break;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100111/d90a5afe/attachment.html
From EXT-Edith.3.Hernandez at nokia.com Mon Jan 11 14:25:08 2010
From: EXT-Edith.3.Hernandez at nokia.com (EXT-Edith.3.Hernandez@nokia.com)
Date: Mon Jan 11 21:49:44 2010
Subject: [datatype-dev] RESEND: PAMK-7YKKXV Helix Metadata Engine does
not clean up archived data when upgraded/downgraded &
PAMK-7YKK6F Helix engine thubmail does not clean up archived
data when upgradeed/downgraded
References:
Message-ID:
Thanks
Cheked in to 223Cays, 221Cays, HEAD
Br,
Edith
________________________________
From: ext Eric Hyche [mailto:ehyche@real.com]
Sent: Mon 1/11/2010 5:14 PM
To: Hernandez Edith.3 (EXT-DextraTechnologies/USA)
Cc: datatype-dev@helixcommunity.org
Subject: Re: [datatype-dev] RESEND: PAMK-7YKKXV Helix Metadata Engine does not clean up archived data when upgraded/downgraded & PAMK-7YKK6F Helix engine thubmail does not clean up archived data when upgradeed/downgraded
Looks good.
On Jan 8, 2010, at 6:42 PM, wrote:
> Sending the CR again with the updated diff file ...
>
> "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: EXT-Edith.3.Hernandez@nokia.com
> Reviewed by:
> Date: 07/01/2010
> ErrorId: PAMK-7YKKXV , PAMK-7YKK6F
> Project: symbianMmf_wm
>
> Synopsis:
> PAMK-7YKKXV Helix Metadata Engine does not clean up archived data when upgraded/downgraded
> PAMK-7YKK6F Helix engine thubmail does not clean up archived data when upgradeed/downgraded
>
> Overview:
> TNE needs to be able to recognize, when it starts up, that it has been upgraded/downgraded then clean up and regenerate archived data files (hxmetadata_archive.txt, hxthumbnail_archive.txt, MdfPluginArchive.txt, plugin_archive.txt ). Versioning information should be stored in HXTNEngine_3_2.cfg.
>
> MDE needs to be able to recognize, when it starts up, that it has been upgraded/downgraded then clean up and regenerate archived data files (hxmetadata_archive.txt, hxthumbnail_archive.txt, MdfPluginArchive.txt, plugin_archive.txt ). Versioning information should be stored in HXMDEngine_3_2.cfg.
>
> Solution:
> In CHXSymbianMetaDataEng::SetupPreferences() check
> a) If MMFControllerVersion does not exist in config file: store MMFControllerVersion in the config file and delete required txt files.
> b) If MMFControllerVersion has changed: store the New MMFControllerVersion in the config file and delete required txt files.
>
> Config file could be HXMDEngine_3_2.cfg or HXTNEngine_3_2.cfg, It depends on which file we are working on, therefore same code fix both bugs.
>
> Files modified:
> /cvsroot/datatype/tools/metadataeng/engine/platform/symbian/symbian_metadataeng.cpp
> /cvsroot/datatype/tools/metadataeng/engine/pub/platform/symbian/symbian_metadataeng.h
>
> Files added: None
> Image Size and Heap Use impact: None
> Module Release testing (STIF) : Passed
> Test case(s) Added : No
> Memory leak check performed : Yes
> Platforms and Profiles Build Verified:helix-client-s60-50-mmf-mdf-arm
> Platforms and Profiles Functionality verified: armv5, winscw
> Branch: 223Cays, 221Cays, HEAD
>
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From sgarg at real.com Mon Jan 11 21:55:41 2010
From: sgarg at real.com ( Sushant Garg)
Date: Tue Jan 12 05:20:21 2010
Subject: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays
incorrect duration for a wav file recorded by gnome-sound-recorder.
References: <011601ca78cd$6011f9a0$8001a8c0@adroit02a604c1>
<7ECCEA249B7CDC49A079EC0075E999AA07D82CC716@SEAMBX.corp.real.com>
<012301ca798f$c8a9dce0$8001a8c0@adroit02a604c1>
<268FD6EA-49A7-42FA-AFC6-78547C20C18B@real.com>
<01ed01ca8492$b14289e0$8001a8c0@adroit02a604c1>
<5FC21ACD-FE11-427F-BA16-49FA0D27F818@real.com>
<007401ca8ec6$e4d0abf0$8001a8c0@adroit02a604c1>
<004901ca8f77$39950c70$8001a8c0@adroit02a604c1>
<0833E151-A5C6-4A11-9F0B-411840816C87@real.com>
<008601ca905e$868a8130$8001a8c0@adroit02a604c1>
Message-ID: <009101ca934b$e2d12cb0$8001a8c0@adroit02a604c1>
Skipped content of type multipart/alternative-------------- next part --------------
Index: riff.cpp
===================================================================
RCS file: /cvsroot/datatype/common/util/riff.cpp,v
retrieving revision 1.12.16.2
diff -u -r1.12.16.2 riff.cpp
--- riff.cpp 5 Jun 2008 08:33:31 -0000 1.12.16.2
+++ riff.cpp 12 Jan 2010 05:34:00 -0000
@@ -110,6 +110,8 @@
, m_ulChunkBytesRead(0)
, m_ulChunkSize(0)
, m_ulChunkType(0)
+ , m_pFileStatObj(NULL)
+ , m_ulTotalFileSizeInBytes(0L)
{
m_pContext = pContext;
m_pResponse = pResponse;
@@ -192,6 +194,11 @@
// return HXR_OK;
}
+UINT32 CRIFFReader::GetCurrentFileOffset()
+{
+ return m_ulCurOffset;
+}
+
STDMETHODIMP
CRIFFReader::InitDone(HX_RESULT status)
{
@@ -205,8 +212,49 @@
m_bFileIsOpen = TRUE;
+ HX_RELEASE(m_pFileStatObj);
+ if ( !m_pFileObject )
+ return HXR_UNEXPECTED;
+
+ HX_RESULT retVal = m_pFileObject->QueryInterface(IID_IHXFileStat, (void **) &m_pFileStatObj);
+ if(SUCCEEDED(retVal) && (m_pFileStatObj->Stat((IHXFileStatResponse *) this) == HXR_OK))
+ {
+ return status;
+ }
+ else
+ {
+ m_state = RS_GetFileTypePending;
+ return m_pFileObject->Read(sizeof(UINT32) * 2);
+ }
+}
+
+/////////////////////////////////////////////////////////////////////////
+// Method:
+// IHXFileFormatObject::StatDone
+//
+STDMETHODIMP
+CRIFFReader::StatDone(HX_RESULT status, UINT32 ulSize,
+ ULONG32 ulCreationTime,
+ UINT32 ulAccessTime,
+ UINT32 ulModificationTime,
+ UINT32 ulMode)
+{
+ // We're finished with the IHXFileStat interface, so we'll release it:
+ HX_RELEASE(m_pFileStatObj);
+
+ if (SUCCEEDED(status))
+ {
+ // Now we know how big the file is, so we can calculate the
+ // actual duration for all streams using it.
+ m_ulTotalFileSizeInBytes = ulSize;
+ }
m_state = RS_GetFileTypePending;
- return m_pFileObject->Read(sizeof(UINT32) * 2);
+ return m_pFileObject->Read(sizeof(UINT32) * 2);
+}
+
+UINT32 CRIFFReader::GetTotalFileSize()
+{
+ return m_ulTotalFileSizeInBytes;
}
HX_RESULT
@@ -233,6 +281,8 @@
m_bFileIsOpen = FALSE;
+ HX_RELEASE(m_pFileStatObj);
+ m_ulTotalFileSizeInBytes = 0L;
return HXR_OK;
}
Index: pub/riff.h
===================================================================
RCS file: /cvsroot/datatype/common/util/pub/riff.h,v
retrieving revision 1.6
diff -u -r1.6 riff.h
--- pub/riff.h 14 Mar 2005 19:24:45 -0000 1.6
+++ pub/riff.h 6 Jan 2010 11:14:27 -0000
@@ -49,6 +49,7 @@
typedef _INTERFACE IHXFileObject IHXFileObject;
class CRIFFReader : public IHXFileResponse,
+ public IHXFileStatResponse,
public IHXThreadSafeMethods
{
public:
@@ -61,6 +62,9 @@
*/
HX_RESULT Open(char* filename);
+ IHXFileStat* m_pFileStatObj; //for getting the file size.
+ UINT32 m_ulTotalFileSizeInBytes;
+ UINT32 GetCurrentFileOffset();
/*
* Close: Close the file
*/
@@ -126,6 +130,12 @@
STDMETHOD(InitDone) (THIS_
HX_RESULT status);
+ STDMETHOD(StatDone) (THIS_
+ HX_RESULT status, UINT32 ulSize,
+ ULONG32 ulCreationTime,
+ UINT32 ulAccessTime,
+ UINT32 ulModificationTime,
+ UINT32 ulMode);
STDMETHOD(ReadDone) (THIS_
HX_RESULT status,
IHXBuffer* pBuffer);
@@ -174,6 +184,7 @@
UINT32 GetListType();
UINT32 GetOffset();
+ UINT32 GetTotalFileSize();
UINT32 GetChunkType();
UINT32 GetChunkRawSize(void);
Index: wvffplin.cpp
===================================================================
RCS file: /cvsroot/datatype/wav/fileformat/wvffplin.cpp,v
retrieving revision 1.12.2.1.6.1
diff -u -r1.12.2.1.6.1 wvffplin.cpp
--- wvffplin.cpp 2 Dec 2009 02:38:34 -0000 1.12.2.1.6.1
+++ wvffplin.cpp 6 Jan 2010 11:15:55 -0000
@@ -963,6 +963,14 @@
}
m_ulDataSizeInBytes = len;
+ UINT32 ulFileOffset = m_pRiffReader->GetCurrentFileOffset();
+ UINT32 ulTotalFileSizeInBytes = m_pRiffReader->GetTotalFileSize();
+ UINT32 ulDataSizeInBytes = ulTotalFileSizeInBytes - ulFileOffset;
+ if(ulDataSizeInBytes < len)
+ {
+ m_ulDataSizeInBytes = ulDataSizeInBytes;
+ }
+
m_ulAvgBitRate = 8 * m_ulAvgBytesPerSec;
// The duration is of course calculatable from the size of
From pbasic at real.com Tue Jan 12 04:19:44 2010
From: pbasic at real.com (Petar Basic)
Date: Tue Jan 12 11:44:27 2010
Subject: [datatype-dev] Re: CR/CN: Solaris-Sparc-GCC patches for
GMPMetaEditor branch
In-Reply-To: <9b8350411001110958m6fb02f4fqa4ace1930abf35c1@mail.gmail.com>
References: <9b8350411001110958m6fb02f4fqa4ace1930abf35c1@mail.gmail.com>
Message-ID: <9b8350411001120419p7b849630ud12c8991378e0f54@mail.gmail.com>
Additional fixes for Solaris native compiler.
On Mon, Jan 11, 2010 at 6:58 PM, Petar Basic wrote:
> Modified by: pbasic at real.com
> Date: 2010/01/11
> Project: GMP MetaEditor (meta3gp.exe)
>
> Synopsis:
> Solaris-Sparc-GCC patches for GMPMetaEditor branch
>
> Overview:
> This CR includes patches needed to successfully build/run meta3gp
> project with GCC on Solaris-Sparc.
>
> Checked into GMPMetaEditor branch immediately since I need to verify
> the build on the farm ASAP. ?Some points below can be discussed and
> improved on later, however, at this time they seem irrelevant in the
> context of GMPMetaEditor.
>
> Details:
> 1.) "audio/fixptutil/pub/math64.h" was failing to compile due to
> missing implementation of 64-bit operations for Solaris-Sparc-GCC
> combo.
>
> In the CVS log, one can find traces of Sparc specific blocks of code
> which according to CVS comments had some bugs and were replaced by
> platform independent (plain C) implementations for Solaris-SunStudio
> combo. ?Relevant ifdef statement has now been modified to also compile
> platform independent implementations under Solaris-Sparc-GCC combo.
>
> All tests performed by "audio/fixptutil/test/fixpttest.c" succeed,
> although the execution proves slow. ?Testing with MetaEditor reveals
> that these operations are not used during meta-data
> extraction/injection, so at this time optimization for
> Solaris-Sparc-GCC does not seem important.
>
> 2.) statvfs on Solaris fails if passed an empty path argument, which
> causes calling method CHXFileSpecUtils::IsDiskLocal to print out an
> error to the console. ?This is not acceptable for MetaEditor,
> especially since everything works correctly. ?The culprit is actually
> in MemoryMapDataFile::Bind method in
> "common/fileio/platform/unix/mmapdatf.cpp". ?The code has been updated
> to process empty paths as a special case before resorting to
> CHXFileSpecUtils::IsDiskLocal. ?Also, what seems as a duplicate code
> block due to a bad check-in has been removed.
>
> 3.) RMAShutdown entry point which is now required by plugin handler
> has been added to metaeditor.dll.
>
> 4.) Defaulting meta3gp executable to DTDriver synchronous mode since
> asynchronous mode is not implemented on Solaris.
>
> 5.) Fixed various build busters.
>
> 6.) Reordered library dependencies in a few projects to allow the
> Solaris linker to link all symbols correctly.
>
> Testing:
> Verified operation on GMP MetaEditor on Solaris 5.10 Sparc via
> standard MetaEditor test scripts.
>
> Files Modified:
> audio/fixptutil/pub/math64.h
> client/medpltfm/hxmedpltfmdll
> client/medpltfm/pub/chxmedpltfmkicker.h
> client/medpltfm/pub/chxmedpltfmsched.h
> common/fileio/platform/unix/mmapdatf.cpp
> datatype/mp4/filewriter/m4avsh.cpp
> datatype/mp4/filewriter/mp4atoms.h
> datatype/mp4/filewriter/mp4sm.cpp
> datatype/mp4/filewriter/ra10sh.cpp
> datatype/tools/dtdriver/apps/meta3gp/HXXmlInputParser.h
> datatype/tools/dtdriver/apps/meta3gp/Umakefil_meta3gp
> datatype/tools/dtdriver/apps/meta3gp/Umakefil_tests
> datatype/tools/dtdriver/apps/meta3gp/main.cpp
> datatype/tools/dtdriver/dtdrplin/dtdr_genr_lib
> datatype/tools/dtdriver/dtdrplin/dtdr_platform_dll
> datatype/tools/metaeditor/Umakefil
> datatype/tools/metaeditor/hxdll.cpp
>
> Platforms and Profiles Affected:
> All
>
> Image Size and Heap Use impact:
> None
>
> Platforms and Profiles Build Verified:
> system id: win32-i386-vc7, sunos-5.8-sparc-gcc-server
> profile: helix-client-all-defines
>
> Platforms and Profiles Functionality Verified:
> x86 Windows XP SP2
> Sparc SunOS 5.10
>
> Branch:
> GMPMetaEditor
>
> Copyright assignment:
> I am a RealNetworks employee or contractor.
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: client_core.2.diff
Type: application/octet-stream
Size: 2941 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100112/e6260882/client_core.2.obj
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_tools_dtdriver_dtdrplin.2.diff
Type: application/octet-stream
Size: 3459 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100112/e6260882/datatype_tools_dtdriver_dtdrplin.2.obj
From ext-shashi.merapala at nokia.com Tue Jan 12 04:27:22 2010
From: ext-shashi.merapala at nokia.com (ext-shashi.merapala@nokia.com)
Date: Tue Jan 12 11:53:20 2010
Subject: [datatype-dev] RESEND CR: ESLM-7YHD9L - Helix_wmv controller:
Conflict between the
list from SupportsMimeType and actually video type (mp4) for video playback
Message-ID:
Skipped content of type multipart/alternative-------------- next part --------------
Index: build/BIF/hxclient_2_1_0_cayennes.bif
===================================================================
RCS file: /cvsroot/client/build/BIF/hxclient_2_1_0_cayennes.bif,v
retrieving revision 1.34
diff -u -w -r1.34 hxclient_2_1_0_cayennes.bif
--- build/BIF/hxclient_2_1_0_cayennes.bif 20 Oct 2009 15:01:08 -0000 1.34
+++ build/BIF/hxclient_2_1_0_cayennes.bif 8 Jan 2010 14:14:45 -0000
@@ -7742,7 +7742,7 @@
-
+
Index: build/BIF/hxclient_4_2_0_brizo.bif
===================================================================
RCS file: /cvsroot/client/build/BIF/hxclient_4_2_0_brizo.bif,v
retrieving revision 1.8
diff -u -w -r1.8 hxclient_4_2_0_brizo.bif
--- build/BIF/hxclient_4_2_0_brizo.bif 16 Nov 2009 22:35:40 -0000 1.8
+++ build/BIF/hxclient_4_2_0_brizo.bif 8 Jan 2010 14:14:53 -0000
@@ -9165,7 +9165,7 @@
-
+
-------------- next part --------------
Index: build/BIF/helix.bif
===================================================================
RCS file: /cvsroot/common/build/BIF/helix.bif,v
retrieving revision 1.788
diff -u -w -r1.788 helix.bif
--- build/BIF/helix.bif 22 Dec 2009 01:43:00 -0000 1.788
+++ build/BIF/helix.bif 8 Jan 2010 14:25:16 -0000
@@ -9367,7 +9367,7 @@
-
+
-------------- next part --------------
Index: symbianMmf/audiocontroller/10207B64.rss
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/audiocontroller/10207B64.rss,v
retrieving revision 1.1.2.4
diff -u -w -r1.1.2.4 10207B64.rss
--- symbianMmf/audiocontroller/10207B64.rss 30 Oct 2009 16:40:52 -0000 1.1.2.4
+++ symbianMmf/audiocontroller/10207B64.rss 8 Jan 2010 14:33:42 -0000
@@ -50,6 +50,16 @@
default_data = "?";
opaque_data = "Real0x101f5d07.rm.ra.RMF?application/x-pn-realmediaaudio/x-pn-realaudio";
rom_only = ROM_ONLY_FLAG;
+ },
+ IMPLEMENTATION_INFO
+ {
+ // WMA
+ implementation_uid = 0x10283350;
+ version_no = 1;
+ display_name = "Helix Windows Media Audio";
+ default_data = "?";
+ opaque_data = "Nokia0x101f5d07.wma0&?uaudio/x-ms-wma";
+ rom_only = ROM_ONLY_FLAG;
}
};
}
Index: symbianMmf/audiocontroller/controllersis
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/audiocontroller/controllersis,v
retrieving revision 1.1.2.8
diff -u -w -r1.1.2.8 controllersis
--- symbianMmf/audiocontroller/controllersis 13 Apr 2009 14:54:02 -0000 1.1.2.8
+++ symbianMmf/audiocontroller/controllersis 8 Jan 2010 14:33:42 -0000
@@ -142,6 +142,8 @@
file = open(dll_names_file, 'w')
for dll in lib_files_copy:
file.write('%s\n' % os.path.basename(dll))
+for dll in additional_lib_names_copy:
+ file.write('%s\n' % os.path.basename(dll))
file.close()
Index: symbianMmf/audiocontroller/installMMF.pcf
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/audiocontroller/installMMF.pcf,v
retrieving revision 1.1.2.4
diff -u -w -r1.1.2.4 installMMF.pcf
--- symbianMmf/audiocontroller/installMMF.pcf 26 Aug 2008 16:11:23 -0000 1.1.2.4
+++ symbianMmf/audiocontroller/installMMF.pcf 8 Jan 2010 14:33:43 -0000
@@ -118,6 +118,9 @@
#
lib_names = []
+# Plugin Dlls [built separately] that need to be included to the *dll_names*.txt files
+additional_lib_names = []
+
# some dlls like vidplin aggregate functionality offered individually with
# other dlls; this list tracks those dlls that can be removed from the list
# of dlls to install because another dll duplicates or replaces the functionality
@@ -167,7 +170,10 @@
'log' : 'common/log/logsystem/[target]/log.dll',
'logobserverfile' : 'common/log/logobserver/[target]/logobserverfile.dll',
'arma' : 'datatype/mp4/audio/mdf/[target]/arma.dll',
- 'hxmetadataeng' : 'datatype/xps/fileformat/[target]/hxmetadataeng.dll'
+ 'hxmetadataeng' : 'datatype/xps/fileformat/[target]/hxmetadataeng.dll',
+ 'asfff' : 'datatype/wm/fileformat/[target]/asfff.dll',
+ 'wma9' : 'datatype/mdf/audio/arm/wma/[target]/wma9.dll',
+ 'wmarender' : 'datatype/wm/audio/renderer/[target]/wmarender.dll'
}
#
@@ -198,9 +204,22 @@
newList.append(item)
return newList
+def AddAdditionalDLLs(*files):
+ global additional_lib_names
+ for f in files:
+ additional_lib_names.append(f)
+
# always add client core dll
Add('clntcore')
+# always add asf file format
+Add('asfff')
+Add('wma9')
+Add('wmarender')
+
+# add hxwmdrmplugin to *dll_names*.txt
+AddAdditionalDLLs('hxwmdrmplugin')
+
if project.IsDefined("HELIX_FEATURE_METADATAENG"):
Add('hxmetadataeng')
@@ -252,6 +271,13 @@
path = os.path.normpath(path)
lib_files_copy.append(path)
+additional_lib_names_copy = []
+for f in additional_lib_names:
+ path = os.path.join(playerDllDir, f)
+ path += ".dll"
+ path = os.path.normpath(path)
+ additional_lib_names_copy.append(path)
+
#
# payld_dll_files, payld_rsc_files
#
Index: symbianMmf/videocontroller/101F8513.rss
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/videocontroller/101F8513.rss,v
retrieving revision 1.3.2.13
diff -u -w -r1.3.2.13 101F8513.rss
--- symbianMmf/videocontroller/101F8513.rss 30 Oct 2009 16:47:48 -0000 1.3.2.13
+++ symbianMmf/videocontroller/101F8513.rss 8 Jan 2010 14:33:43 -0000
@@ -157,6 +157,16 @@
default_data = "?";
opaque_data = "Real0x101f5d07.aviRIFF????AVIapplication/x-pn-avi-pluginvideo/avivideo/x-msvideovideo/msvideo";
rom_only = ROM_ONLY_FLAG;
+ },
+ IMPLEMENTATION_INFO
+ {
+ // WMV
+ implementation_uid = 0x10283349;
+ version_no = 1;
+ display_name = "Helix Windows Media 9";
+ default_data = "?";
+ opaque_data = "Nokia0x101f5d070x101f5d08.wmv0&?uvideo/x-ms-wmv";
+ rom_only = ROM_ONLY_FLAG;
}
};
}
Index: symbianMmf/videocontroller/MmfSis
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/videocontroller/MmfSis,v
retrieving revision 1.2.2.12
diff -u -w -r1.2.2.12 MmfSis
--- symbianMmf/videocontroller/MmfSis 13 Apr 2009 14:54:02 -0000 1.2.2.12
+++ symbianMmf/videocontroller/MmfSis 8 Jan 2010 14:33:43 -0000
@@ -145,6 +145,8 @@
file = open(dll_names_file, 'w')
for dll in lib_files_copy:
file.write('%s\n' % os.path.basename(dll))
+for dll in additional_lib_names_copy:
+ file.write('%s\n' % os.path.basename(dll))
file.close()
Index: symbianMmf/videocontroller/installMMF.pcf
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/videocontroller/installMMF.pcf,v
retrieving revision 1.5.2.21
diff -u -w -r1.5.2.21 installMMF.pcf
--- symbianMmf/videocontroller/installMMF.pcf 16 Oct 2009 17:43:48 -0000 1.5.2.21
+++ symbianMmf/videocontroller/installMMF.pcf 8 Jan 2010 14:33:43 -0000
@@ -125,6 +125,9 @@
#
lib_names = []
+# Plugin Dlls [built separately] that need to be included to the *dll_names*.txt files
+additional_lib_names = []
+
# some dlls like vidplin aggregate functionality offered individually with
# other dlls; this list tracks those dlls that can be removed from the list
# of dlls to install because another dll duplicates or replaces the functionality
@@ -180,7 +183,10 @@
'XPSFileFormat' : 'datatype/xps/fileformat/[target]/XPSFileFormat.dll',
'hxmetadataeng' : 'datatype/xps/fileformat/[target]/hxmetadataeng.dll',
'avifformat' : 'datatype/avi/fileformat/[target]/avifformat.dll',
- 'mkvff' : 'datatype/mkv/fileformat/[target]/mkvff.dll'
+ 'mkvff' : 'datatype/mkv/fileformat/[target]/mkvff.dll',
+ 'asfff' : 'datatype/wm/fileformat/[target]/asfff.dll',
+ 'wma9' : 'datatype/mdf/audio/arm/wma/[target]/wma9.dll',
+ 'wmarender' : 'datatype/wm/audio/renderer/[target]/wmarender.dll'
}
@@ -212,9 +218,22 @@
newList.append(item)
return newList
+def AddAdditionalDLLs(*files):
+ global additional_lib_names
+ for f in files:
+ additional_lib_names.append(f)
+
# always add client core dll
Add('clntcore')
+# always add asf file format
+Add('asfff')
+Add('wma9')
+Add('wmarender')
+
+# add hxwmdrmplugin to *dll_names*.txt
+AddAdditionalDLLs('hxwmdrmplugin')
+
if project.IsDefined("HELIX_FEATURE_S60_PROGDOWN"):
Add('progdownfs')
@@ -338,6 +357,13 @@
path = os.path.normpath(path)
lib_files_copy.append(path)
+additional_lib_names_copy = []
+for f in additional_lib_names:
+ path = os.path.join(playerDllDir, f)
+ path += ".dll"
+ path = os.path.normpath(path)
+ additional_lib_names_copy.append(path)
+
#
# payld_dll_files, payld_rsc_files
#
@@ -349,7 +375,8 @@
'mdfmp4payloadformat.dll' : 'datatype/mdf/video/format/mp4/[target]/mdfmp4payloadformat.dll',
'mdfrvxpayloadformat.dll' : 'datatype/mdf/video/format/rm/[target]/mdfrvxpayloadformat.dll',
'mdfh264payloadformat.dll' : 'datatype/mdf/video/format/h264/[target]/mdfh264payloadformat.dll',
- 'mdfflvpayloadformat.dll' : 'datatype/mdf/video/format/flv/[target]/mdfflvpayloadformat.dll' }
+ 'mdfflvpayloadformat.dll' : 'datatype/mdf/video/format/flv/[target]/mdfflvpayloadformat.dll',
+ 'mdfwmvpayloadformat.dll' : 'datatype/mdf/video/format/wmv/[target]/mdfwmvpayloadformat.dll' }
payld_rsc_names = []
@@ -359,11 +386,13 @@
'mdfrvxpayloadformat.rsc' : 'datatype/mdf/video/format/rm/[target]/mdfrvxpayloadformat.rsc',
'mdfh264payloadformat.rsc' : 'datatype/mdf/video/format/h264/[target]/mdfh264payloadformat.rsc',
'mdfflvpayloadformat.rsc' : 'datatype/mdf/video/format/flv/[target]/mdfflvpayloadformat.rsc',
+ 'mdfwmvpayloadformat.rsc' : 'datatype/mdf/video/format/wmv/[target]/mdfwmvpayloadformat.rsc',
'10207474.rsc' : 'datatype/mdf/video/format/h263/[target]/10207474.rsc',
'10207476.rsc' : 'datatype/mdf/video/format/mp4/[target]/10207476.rsc',
'10207478.rsc' : 'datatype/mdf/video/format/rm/[target]/10207478.rsc',
'1020747a.rsc' : 'datatype/mdf/video/format/h264/[target]/1020747a.rsc',
- '1028334d.rsc' : 'datatype/mdf/video/format/flv/[target]/1028334d.rsc' }
+ '1028334d.rsc' : 'datatype/mdf/video/format/flv/[target]/1028334d.rsc',
+ '10283353.rsc' : 'datatype/mdf/video/format/wmv/[target]/10283353.rsc' }
#
# some helpers to reduce clutter...
@@ -383,6 +412,7 @@
AddPayldDllMdf( 'mdfrvxpayloadformat.dll' )
AddPayldDllMdf( 'mdfh264payloadformat.dll' )
AddPayldDllMdf( 'mdfflvpayloadformat.dll' )
+AddPayldDllMdf( 'mdfwmvpayloadformat.dll' )
def AddPayldRsc(*files):
''' add files to list of files to install '''
@@ -400,12 +430,14 @@
AddPayldRscMdf( 'mdfrvxpayloadformat.rsc' )
AddPayldRscMdf( 'mdfh264payloadformat.rsc' )
AddPayldRscMdf( 'mdfflvpayloadformat.rsc' )
+ AddPayldRscMdf( 'mdfwmvpayloadformat.rsc' )
else:
AddPayldRscMdf( '10207474.rsc' )
AddPayldRscMdf( '10207476.rsc' )
AddPayldRscMdf( '10207478.rsc' )
AddPayldRscMdf( '1020747a.rsc' )
AddPayldRscMdf( '1028334d.rsc' )
+ AddPayldRscMdf( '10283353.rsc' )
# add make copy output dir prefix and .dll suffix, e.g. '../../debug/foo.dll'
payld_dll_files_copy = []
-------------- next part --------------
Index: tools/metadataeng/engine/platform/symbian/hxmetadata_dlls.txt
===================================================================
RCS file: /cvsroot/datatype/tools/metadataeng/engine/platform/symbian/hxmetadata_dlls.txt,v
retrieving revision 1.1.2.3
diff -u -w -r1.1.2.3 hxmetadata_dlls.txt
--- tools/metadataeng/engine/platform/symbian/hxmetadata_dlls.txt 16 Oct 2009 19:40:29 -0000 1.1.2.3
+++ tools/metadataeng/engine/platform/symbian/hxmetadata_dlls.txt 8 Jan 2010 14:44:15 -0000
@@ -3,3 +3,4 @@
smplfsys.dll
mkvff.dll
avifformat.dll
+asfff.dll
From ehyche at real.com Tue Jan 12 07:16:58 2010
From: ehyche at real.com (Eric Hyche)
Date: Tue Jan 12 14:42:32 2010
Subject: [datatype-dev] Re: [Nokia-private-dev] RESEND CR: ESLM-7YHD9L -
Helix_wmv
controller: Conflict between the list from SupportsMimeType and actually
video type (mp4) for video playback
In-Reply-To:
References:
Message-ID: <5701CE13-A77B-45A7-A614-3470F2637C85@real.com>
Looks good to me.
On Jan 12, 2010, at 7:27 AM, wrote:
> Sending the CR again with updated diffs. This time the diffs of hxclient_4_2_0_brizo.bif and helix.bif have also been attached (which I had missed previously).
>
> "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: ext-shashi.merapala@nokia.com
>
> Reviewed by: ashish.as.gupta@nokia.com
>
> Date: 01/12/2010
>
> Project: SymbianMmf_wm
>
> Error Id: ESLM-7YHD9L
>
> Synopsis: Helix_wmv controller: Conflict between the list from SupportsMimeType and actually video type (mp4) for video playback
>
> Overview: The WMV Extension Controller needs to be rolled up into the rest of Helix so that the Helix audio/video controllers support the Windows Media content.
>
> Solution: Diffs attached
>
> Files removed: The folder ?wmvextcontroller? and its contents are removed from \clientapps\symbianMmf\
>
> Files added: None
>
> Files modified: \client\build\BIF\hxclient_2_1_0_cayennes.bif
> \client\build\BIF\hxclient_4_2_0_brizo.bif
> \common\build\BIF\helix.bif
> \clientapps\symbianMmf\videocontroller\installMMF.pcf
> \clientapps\symbianMmf\videocontroller\MmfSis
> \clientapps\symbianMmf\audiocontroller\installMMF.pcf
> \clientapps\symbianMmf\audiocontroller\controllersis
> \clientapps\symbianMmf\videocontroller\101F8513.rss
> \clientapps\symbianMmf\audiocontroller\10207B64.rss
> \datatype\tools\metadataeng\engine\platform\symbian\hxmetadata_dlls.txt
>
> Image size and heap use impact: Approx. 289 kb of space saved on image creation
>
> Module release testing (STIF): Passed
>
> Test case(s) added: No
>
> Memory leak check performed: Yes. No new leaks introduced
>
> Platforms and profiles build verified: helix-client-s60-52-mmf-mdf-dsp
>
> Platforms and profiles functionality verified: armv5, winscw
>
> Branch: 210CayS, HEAD, 420Brizo
>
>
>
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From ehyche at real.com Tue Jan 12 07:18:20 2010
From: ehyche at real.com (Eric Hyche)
Date: Tue Jan 12 14:43:26 2010
Subject: [datatype-dev] Re: [Nokia-private-dev] CR: ESLM-7ZDRP4 AC-3 in a
MP4 container does not play
In-Reply-To: <6F45DEE63C5BB542B6A7B0C4E41467D0152AFA744B@NOK-EUMSG-03.mgdnok.nokia.com>
References: <6F45DEE63C5BB542B6A7B0C4E41467D0152AFA744B@NOK-EUMSG-03.mgdnok.nokia.com>
Message-ID: <5C340DFB-CE1B-48E4-8D04-3F8D4F7BB16F@real.com>
Looks good, Gang. Thanks for making this addition.
Eric
On Jan 11, 2010, at 1:09 PM, wrote:
> "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: Gang.Jia@nokia.com
>
> Reviewed by:
>
> Date: 1/11/2010
>
> Project: SymbianMmf_wm
>
> ErrorId: ESLM-7ZDRP4
>
> Synopsis: CR: ESLM-7ZDRP4 AC-3 in a MP4 container does not play
>
> Added new QT Atoms for ac3/eac3. Based on these atoms to parse the SampleDescriptionBox and convert to internal ac3/eac3 mimetype. Using the HXConcatenatePayloadFormat
> as packetizer and the audio plays fine.
>
> Root Cause of the problem: New feature.
>
> Files Added:
> none.
>
>
> Files Modified:
>
> /datatype/mdf/audio/dsp/mdfaudfmt.cpp
> /datatype/mp4/fileformat/qtatmmgs.cpp
> /datatype/mp4/fileformat/qtpacketizerfct.cpp
> /datatype/mp4/fileformat/pub/qtatoms.h
>
>
> Image Size and Heap Use impact:
> minor
>
> Module Release testing (STIF) : Passed local test cases.
>
> Test case(s) Added : Yes.
>
> Memory leak check performed : Yes. No new leaks introduced
>
> Platforms and Profiles Build Verified: helix-client-s60-52-mmf-mdf-dsp
>
> Platforms and Profiles Functionality verified: armv5
>
> Branch: 210CayS,Head, 420Brizo
>
>
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From ehyche at real.com Tue Jan 12 07:15:38 2010
From: ehyche at real.com (Eric Hyche)
Date: Tue Jan 12 14:45:06 2010
Subject: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays
incorrect duration for a wav file recorded by gnome-sound-recorder.
In-Reply-To: <009101ca934b$e2d12cb0$8001a8c0@adroit02a604c1>
References: <011601ca78cd$6011f9a0$8001a8c0@adroit02a604c1>
<7ECCEA249B7CDC49A079EC0075E999AA07D82CC716@SEAMBX.corp.real.com>
<012301ca798f$c8a9dce0$8001a8c0@adroit02a604c1>
<268FD6EA-49A7-42FA-AFC6-78547C20C18B@real.com>
<01ed01ca8492$b14289e0$8001a8c0@adroit02a604c1>
<5FC21ACD-FE11-427F-BA16-49FA0D27F818@real.com>
<007401ca8ec6$e4d0abf0$8001a8c0@adroit02a604c1>
<004901ca8f77$39950c70$8001a8c0@adroit02a604c1>
<0833E151-A5C6-4A11-9F0B-411840816C87@real.com>
<008601ca905e$868a8130$8001a8c0@adroit02a604c1>
<009101ca934b$e2d12cb0$8001a8c0@adroit02a604c1>
Message-ID:
Looks good to me.
On Jan 12, 2010, at 12:55 AM, Sushant Garg wrote:
> Thanks Eric,
> Now the code changes to
>
> + HX_RESULT retVal = m_pFileObject->QueryInterface(IID_IHXFileStat, (void **) &m_pFileStatObj);
> + if(SUCCEEDED(retVal) && (m_pFileStatObj->Stat((IHXFileStatResponse *) this) == HXR_OK))
> + {
> + return status;
> + }
> + else
> + {
>
> from
> + HX_RESULT retVal = m_pFileObject->QueryInterface(IID_IHXFileStat, (void **) &m_pFileStatObj);
> + if(SUCCEEDED(retVal) && m_pFileStatObj)
> + {
> + m_pFileStatObj->Stat((IHXFileStatResponse *) this);
> + }
> + else
> + {
> Please find updated diff.
>
> Thanks & Regards
> Sushant Garg
> ----- Original Message -----
> From: Eric Hyche
> To: Sushant Garg
> Cc: Datatype-Dev
> Sent: Friday, January 08, 2010 7:15 PM
> Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
>
> Also if the call to IHXFileStat::Stat() returns failure, then we will never get a callback to StatDone(). So we should check the return value of the Stat() call, and if it fails, then we should also go ahead and call read (just like if the QI for IHXFileStat failed).
>
> Eric
>
> On Jan 8, 2010, at 7:31 AM, Sushant Garg wrote:
>
> > Oops! missed to notice that.
> >
> > Now changed that code to following:
> >
> > in CRIFFReader::InitDone() function.
> >
> > + HX_RELEASE(m_pFileStatObj);
> > + if ( !m_pFileObject )
> > + return HXR_UNEXPECTED;
> > +
> > + HX_RESULT retVal = m_pFileObject->QueryInterface(IID_IHXFileStat, (void **) &m_pFileStatObj);
> > + if(SUCCEEDED(retVal) && m_pFileStatObj)
> > + {
> > + m_pFileStatObj->Stat((IHXFileStatResponse *) this);
> > + }
> > + else
> > + {
> > + m_state = RS_GetFileTypePending;
> > + return m_pFileObject->Read(sizeof(UINT32) * 2);
> > + }
> > + return status;
> >
> > from
> >
> > + HX_RELEASE(m_pFileStatObj);
> > + if(m_pFileObject)
> > + {
> > + HX_RESULT retVal = m_pFileObject->QueryInterface(IID_IHXFileStat, (void **) &m_pFileStatObj);
> > + if(SUCCEEDED(retVal) && m_pFileStatObj)
> > + {
> > + m_pFileStatObj->Stat((IHXFileStatResponse *) this);
> > + }
> > + }
> > + return status;
> >
> > Please find the updated diff.
> >
> > Thanks & Regards
> > Sushant Garg
> > ----- Original Message -----
> > From: Eric Hyche
> > To: Sushant Garg
> > Cc: Datatype-Dev
> > Sent: Thursday, January 07, 2010 8:40 PM
> > Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> >
> > But if I'm reading the diff correctly, if the QI for IHXFileStat fails, then we never call the RIFF reader user back with CRiffResponse::InitDone(), correct? If so, then we've hung the app.
> >
> > Eric
> >
> > On Jan 7, 2010, at 3:55 AM, Sushant Garg wrote:
> >
> > > Before calling Stat() we have a condition to check whether QI is succeeded or not & if in case it does not then we will not send a call to Stat() & return status of InitDone().
> > >
> > > + HX_RELEASE(m_pFileStatObj);
> > > + if(m_pFileObject)
> > > + {
> > > + HX_RESULT retVal = m_pFileObject->QueryInterface(IID_IHXFileStat, (void **) &m_pFileStatObj);
> > > + if(SUCCEEDED(retVal) && m_pFileStatObj)
> > > + {
> > > + m_pFileStatObj->Stat((IHXFileStatResponse *) this);
> > > + }
> > > + }
> > > + return status;
> > >
> > > Now if Stat() fails then we will get error in StatDone() & hence we will not get the size of file. And so we will not change m_ulDataSizeInBytes in wvffplin.cpp
> > >
> > > Thanks & Regards
> > > Sushant Garg
> > > ----- Original Message -----
> > > From: Eric Hyche
> > > To: Sushant Garg
> > > Cc: Datatype-Dev
> > > Sent: Wednesday, January 06, 2010 8:25 PM
> > > Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> > >
> > > Looks good for the most part. However, if your QI for IHXFileStat fails, then we will hang, since no InitDone() back to the RIFF reader user will ever be made. So make sure that if either the QI for IHXFileStat fails, or the call to STat() returns failure that we properly make a failure InitDone() back to the RIFF reader user.
> > >
> > > Actually, the QI for IHXFileStat should not be required, since file objects are not required to implement this. So if the QI for IHXFileStat fails, then the RIFF reader should continue on normally, just without knowing the file size. If the QI for IHXFileStat() succeeds but the call to STat() returns failure, then we can return failure in InitDone() back to the RIFF reader caller.
> > >
> > > Eric
> > >
> > > On Jan 6, 2010, at 6:53 AM, Sushant Garg wrote:
> > >
> > > > Thanks Eric,
> > > >
> > > > Please find the updated diff.
> > > >
> > > > Now I am calling Read() from CRIFFReader::StatDone() rather then CRIFFReader::InitDone.
> > > >
> > > > Thanks & Regards
> > > > Sushant Garg
> > > > ----- Original Message -----
> > > > From: Eric Hyche
> > > > To: Sushant Garg
> > > > Cc: Datatype-Dev
> > > > Sent: Monday, January 04, 2010 8:13 PM
> > > > Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> > > >
> > > > You are treating IHXFileStat::Stat() like a synchronous call and there is
> > > > no guarantee that it will be. Once you issue the call to Stat(), then
> > > > you will need to wait in StatDone() before calling back to InitDone().
> > > >
> > > > Eric
> > > >
> > > > On Dec 24, 2009, at 7:14 AM, Sushant Garg wrote:
> > > >
> > > > > Eric,
> > > > >
> > > > > Please find the updated diff.
> > > > >
> > > > > Thanks & Regards
> > > > > Sushant Garg
> > > > > ----- Original Message -----
> > > > > From: Eric Hyche
> > > > > To: Sushant Grag
> > > > > Cc: Datatype-Dev
> > > > > Sent: Friday, December 11, 2009 12:04 AM
> > > > > Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> > > > >
> > > > > Sushant,
> > > > >
> > > > > After thinking about this some more, I think the Stat() call should be moved inside the RIFF reader, for a couple of reasons:
> > > > >
> > > > > - centralize it in one place, so other uses of the RIFF reader don't have to do the same thing.
> > > > > - the most natural time to do the Stat is immediately after the IHXFileObject is Init'd, which in this case the RIFF reader does.
> > > > >
> > > > > So I think the RIFF reader could do the IHXFileStat::Stat() call, and then store the filesize result. Then we could just add an accessor function on the RIFF reader so that users of the RIFF reader can read the size. The file size would only be valid after the CRIFFREader::Open() call had returned with a RIFFOpenDone() callback.
> > > > >
> > > > > Eric
> > > > >
> > > > > On Dec 10, 2009, at 6:56 AM, Sushant Grag wrote:
> > > > >
> > > > > > Thanks Eric,
> > > > > >
> > > > > > Please find the updated diff.
> > > > > >
> > > > > > Thanks & Regards
> > > > > > Sushant Garg
> > > > > > ----- Original Message -----
> > > > > > From: Eric Hyche
> > > > > > To: Sushant Grag ; Datatype-Dev
> > > > > > Sent: Wednesday, December 09, 2009 7:17 PM
> > > > > > Subject: RE: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> > > > > >
> > > > > > +UINT32 CRIFFReader::GetFileDataSize()
> > > > > > +{
> > > > > > + CHXString strFilePath = m_pFilename;
> > > > > > + const char* szFileProtocol = "file://";
> > > > > > + UINT32 ulFiledataSize =0;
> > > > > > +
> > > > > > + if( !strFilePath.Left(strlen(szFileProtocol)).CompareNoCase(szFileProtocol) )
> > > > > > + {
> > > > > > + strFilePath = strFilePath.Mid(strlen(szFileProtocol));
> > > > > > + struct stat fileInfo;
> > > > > > + if(!stat(strFilePath, &fileInfo))
> > > > > > + {
> > > > > > + ulFiledataSize = fileInfo.st_size;
> > > > > > + }
> > > > > > + }
> > > > > > + return ulFiledataSize;
> > > > > > +}
> > > > > > +
> > > > > >
> > > > > > I did not mean do a C-library stat() on the file. The file object that
> > > > > > the RIFF readers uses will not always be a local file that you can call stat() on.
> > > > > > What I meant was QI the file object for IHXFileStat and then call IHXFileStat::Stat().
> > > > > > You will have to implement IHXFileStatResponse::StatDone().
> > > > > >
> > > > > > Eric
> > > > > >
> > > > > > >-----Original Message-----
> > > > > > >From: datatype-dev-bounces@helixcommunity.org [mailto:datatype-dev-bounces@helixcommunity.org] On
> > > > > > >Behalf Of Sushant Grag
> > > > > > >Sent: Wednesday, December 09, 2009 7:45 AM
> > > > > > >To: Datatype-Dev
> > > > > > >Subject: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file
> > > > > > >recorded by gnome-sound-recorder.
> > > > > > >
> > > > > > >Project: RealPlayer for Netbook
> > > > > > >
> > > > > > >Synopsis:
> > > > > > >
> > > > > > >Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-
> > > > > > >recorder.
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >Overview:
> > > > > > >
> > > > > > >There is an issue with wav files which are recorded from ubuntu sound recorder.
> > > > > > >
> > > > > > >The calculated file duration in Realplayer for linux is much & much larger then original file duration
> > > > > > >
> > > > > > >eg: file has duration of 6secs & Realplayer shows more than 3hr 22 min.
> > > > > > >
> > > > > > >Reason behind is, sound recorder adds garbage value in data chunk which leads to very big value of
> > > > > > >m_ulChunkBodyLen calculated in riff.cpp around line 380
> > > > > > >
> > > > > > > if ( (UINT32)getlong(buf) == m_ulFindChunkId )
> > > > > > >
> > > > > > > {
> > > > > > >
> > > > > > > // Found the chunk we were asked for
> > > > > > >
> > > > > > > m_state = RS_Ready;
> > > > > > >
> > > > > > > m_ulChunkBodyLen = GetLong(&buf[4]);
> > > > > > >
> > > > > > > m_ulChunkSize = m_ulChunkBodyLen;
> > > > > > >
> > > > > > >Which cause a very higher value of duration.
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >Now I have created two different functions in riff.cpp;
> > > > > > >
> > > > > > >CRIFFReader::GetFileDataSize() & CRIFFReader::GetCurrentFileOffset() in which I am getting the length
> > > > > > >of file & the file offset and calling these functions in function CWaveFileFormat::RIFFFindChunkDone()
> > > > > > >, case WS_FindDataChunkPending to set m_ulDataSizeInBytes if "len" is greater then
> > > > > > >"ulDataSizeInBytes".
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >Files Modified:
> > > > > > >/cvsroot/datatype/common/util/riff.cpp
> > > > > > >
> > > > > > >/cvsroot/datatype/common/util/pub/riff.h
> > > > > > >
> > > > > > >/cvsroot/datatype/wav/fileformat/wvffplin.cpp
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >Files Added:
> > > > > > >
> > > > > > >None
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >Platforms and Profiles Affected:
> > > > > > >Linux
> > > > > > >
> > > > > > >Distribution Libraries Affected:
> > > > > > >None.
> > > > > > >
> > > > > > >Platforms and Profiles Build Verified:
> > > > > > >Bif: realplay_gtk_atlas_restricted_gold_1.2
> > > > > > >Profile: helix-client-moblin
> > > > > > >Target: player_all
> > > > > > >
> > > > > > >Branch:
> > > > > > >Atlas347, Atlas310, Atlas3_4_10, 401 Brizo, Head
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >Files Attached:
> > > > > > >
> > > > > > >9840_diff.txt
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >Thanks & Regards
> > > > > > >Sushant Garg
> > > > > > <9840_diff.txt>
> > > > >
> > > > > Eric Hyche (ehyche@real.com)
> > > > > Principal Engineer
> > > > > RealNetworks, Inc.
> > > > >
> > > > >
> > > >
> > > > Eric Hyche (ehyche@real.com)
> > > > Principal Engineer
> > > > RealNetworks, Inc.
> > > >
> > > > <9840_diff.txt>
> > >
> > > Eric Hyche (ehyche@real.com)
> > > Principal Engineer
> > > RealNetworks, Inc.
> > >
> >
> > Eric Hyche (ehyche@real.com)
> > Principal Engineer
> > RealNetworks, Inc.
> >
> > <9840_diff.txt>
>
> Eric Hyche (ehyche@real.com)
> Principal Engineer
> RealNetworks, Inc.
>
> <9840_diff.txt>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From Gang.Jia at nokia.com Tue Jan 12 08:57:37 2010
From: Gang.Jia at nokia.com (Gang.Jia@nokia.com)
Date: Tue Jan 12 16:22:11 2010
Subject: [datatype-dev] RE: [Nokia-private-dev] CR: ESLM-7ZDRP4 AC-3 in a
MP4 container does not play
In-Reply-To: <5C340DFB-CE1B-48E4-8D04-3F8D4F7BB16F@real.com>
References: <6F45DEE63C5BB542B6A7B0C4E41467D0152AFA744B@NOK-EUMSG-03.mgdnok.nokia.com>
<5C340DFB-CE1B-48E4-8D04-3F8D4F7BB16F@real.com>
Message-ID: <6F45DEE63C5BB542B6A7B0C4E41467D0152AFA7BA8@NOK-EUMSG-03.mgdnok.nokia.com>
Thanks Eric. Checked in to 210CayS & Head.
Gang
-----Original Message-----
From: ext Eric Hyche [mailto:ehyche@real.com]
Sent: Tuesday, January 12, 2010 9:18 AM
To: Jia Gang (Nokia-D/Dallas)
Cc: datatype-dev@helixcommunity.org; nokia-private-dev@helixcommunity.org
Subject: Re: [Nokia-private-dev] CR: ESLM-7ZDRP4 AC-3 in a MP4 container does not play
Looks good, Gang. Thanks for making this addition.
Eric
On Jan 11, 2010, at 1:09 PM, wrote:
> "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: Gang.Jia@nokia.com
>
> Reviewed by:
>
> Date: 1/11/2010
>
> Project: SymbianMmf_wm
>
> ErrorId: ESLM-7ZDRP4
>
> Synopsis: CR: ESLM-7ZDRP4 AC-3 in a MP4 container does not play
>
> Added new QT Atoms for ac3/eac3. Based on these atoms to parse the
> SampleDescriptionBox and convert to internal ac3/eac3 mimetype. Using the HXConcatenatePayloadFormat as packetizer and the audio plays fine.
>
> Root Cause of the problem: New feature.
>
> Files Added:
> none.
>
>
> Files Modified:
>
> /datatype/mdf/audio/dsp/mdfaudfmt.cpp
> /datatype/mp4/fileformat/qtatmmgs.cpp
> /datatype/mp4/fileformat/qtpacketizerfct.cpp
> /datatype/mp4/fileformat/pub/qtatoms.h
>
>
> Image Size and Heap Use impact:
> minor
>
> Module Release testing (STIF) : Passed local test cases.
>
> Test case(s) Added : Yes.
>
> Memory leak check performed : Yes. No new leaks introduced
>
> Platforms and Profiles Build Verified: helix-client-s60-52-mmf-mdf-dsp
>
> Platforms and Profiles Functionality verified: armv5
>
> Branch: 210CayS,Head, 420Brizo
>
>
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From stanb at real.com Tue Jan 12 11:19:07 2010
From: stanb at real.com (Stan Bobrovskiy)
Date: Tue Jan 12 18:43:35 2010
Subject: [datatype-dev] CR: PR# 256084 - Hang when cancelling FLV conversion
to M4V
Message-ID: <7ECCEA249B7CDC49A079EC0075E999AA07D8B6E182@SEAMBX.corp.real.com>
Modified by: stanb@real.com
Date: 01:12:10
Project: RealPlayer SP 1.5
Synopsis: This is request to reverse changes made about 6 weeks ago by umakantg with the following comment:
bug fix 9760: Low memory and media scanner died. CR: ehyche@real.com and sfu@real.com
The logic to release m_pContext is revoked back to its original (as seen in earlier
version of ffdriver.cpp 1.39.2.19)
This change introduces quite obvious deadlock in DTDR chain in case of CDataTypeMultiConverter involvement. Without reversing this change we cannot procede with our release schedule on RealPlayer.
Files Added: none
Files Modified:
datatype/tools/dtdriver/engine/ffdriver.cpp
Platforms and Profiles Build Verified:
Platform: win32-i386-vc7
Profile: helix-client-all-defines
target(s): playinst
Branch: hxclient_3_1_0_atlas
Index: ffdriver.cpp
===================================================================
RCS file: /cvsroot/datatype/tools/dtdriver/engine/ffdriver.cpp,v
retrieving revision 1.39.2.23
diff -u -1 -0 -r1.39.2.23 ffdriver.cpp
--- ffdriver.cpp 2 Dec 2009 22:00:51 -0000 1.39.2.23
+++ ffdriver.cpp 12 Jan 2010 18:58:36 -0000
@@ -384,25 +384,21 @@
m_bUsingPreferredAudioPayload = FALSE;
m_bUsingPreferredVideoPayload = FALSE;
// Context must be the last object to close
if (bCompleteShutdown || !m_bPersistentContext)
{
HX_RELEASE(m_pScheduler);
HX_RELEASE(m_pClientContext);
HX_RELEASE(m_pErrorMessages);
- if(m_pContext)
- {
- m_pContext->Destruct();
- m_pContext = NULL;
- }
+ HX_RELEASE(m_pContext);
}
}
void FFDriver::Stop()
{
HXLOGL1(HXLOG_DTDR, "FFDriver::Stop()");
m_bStop = TRUE;
if (m_pContext)
{
@@ -1545,26 +1541,22 @@
m_ulContextEvents = m_pContext->GetProcessEventCount();
HX_RELEASE(m_pSourceHandlerStack);
ReleaseSourceHandlerList(m_pUtilizedSourceHandlerList);
if (MEMORY_TRACKING_NEEDED && !m_bPersistentContext)
{
HX_RELEASE(m_pScheduler);
HX_RELEASE(m_pErrorMessages);
- if(m_pContext)
- {
- m_pContext->Destruct();
- m_pContext = NULL;
- }
- }
+ HX_RELEASE(m_pContext);
+ }
MEMPROBE_FREEZE(MEMPRB_TOTAL);
m_state = State_RunReport;
break;
case State_RunReport:
DT_LOGTIMING(pTimePointArray);
DT_LOGMEMORYUSE();
DT_LOGEVENTDATA();
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100112/b0d8fdd8/attachment.html
From awebster at real.com Tue Jan 12 11:21:42 2010
From: awebster at real.com (Andrew Webster)
Date: Tue Jan 12 18:46:13 2010
Subject: [datatype-dev] Re: CR: PR# 256084 - Hang when cancelling FLV
conversion to M4V
In-Reply-To: <7ECCEA249B7CDC49A079EC0075E999AA07D8B6E182@SEAMBX.corp.real.com>
Message-ID:
As Stan indicates, this is delaying a build for our Preview release, currently scheduled for tomorrow, so please expedite approval.
Thanks much
Andrew
On 12/1/10 11:19, "Stan Bobrovskiy" wrote:
Modified by: stanb@real.com
Date: 01:12:10
Project: RealPlayer SP 1.5
Synopsis: This is request to reverse changes made about 6 weeks ago by umakantg with the following comment:
bug fix 9760: Low memory and media scanner died. CR: ehyche@real.com and sfu@real.com
The logic to release m_pContext is revoked back to its original (as seen in earlier
version of ffdriver.cpp 1.39.2.19)
This change introduces quite obvious deadlock in DTDR chain in case of CDataTypeMultiConverter involvement. Without reversing this change we cannot procede with our release schedule on RealPlayer.
Files Added: none
Files Modified:
datatype/tools/dtdriver/engine/ffdriver.cpp
Platforms and Profiles Build Verified:
Platform: win32-i386-vc7
Profile: helix-client-all-defines
target(s): playinst
Branch: hxclient_3_1_0_atlas
Index: ffdriver.cpp
===================================================================
RCS file: /cvsroot/datatype/tools/dtdriver/engine/ffdriver.cpp,v
retrieving revision 1.39.2.23
diff -u -1 -0 -r1.39.2.23 ffdriver.cpp
--- ffdriver.cpp 2 Dec 2009 22:00:51 -0000 1.39.2.23
+++ ffdriver.cpp 12 Jan 2010 18:58:36 -0000
@@ -384,25 +384,21 @@
m_bUsingPreferredAudioPayload = FALSE;
m_bUsingPreferredVideoPayload = FALSE;
// Context must be the last object to close
if (bCompleteShutdown || !m_bPersistentContext)
{
HX_RELEASE(m_pScheduler);
HX_RELEASE(m_pClientContext);
HX_RELEASE(m_pErrorMessages);
- if(m_pContext)
- {
- m_pContext->Destruct();
- m_pContext = NULL;
- }
+ HX_RELEASE(m_pContext);
}
}
void FFDriver::Stop()
{
HXLOGL1(HXLOG_DTDR, "FFDriver::Stop()");
m_bStop = TRUE;
if (m_pContext)
{
@@ -1545,26 +1541,22 @@
m_ulContextEvents = m_pContext->GetProcessEventCount();
HX_RELEASE(m_pSourceHandlerStack);
ReleaseSourceHandlerList(m_pUtilizedSourceHandlerList);
if (MEMORY_TRACKING_NEEDED && !m_bPersistentContext)
{
HX_RELEASE(m_pScheduler);
HX_RELEASE(m_pErrorMessages);
- if(m_pContext)
- {
- m_pContext->Destruct();
- m_pContext = NULL;
- }
- }
+ HX_RELEASE(m_pContext);
+ }
MEMPROBE_FREEZE(MEMPRB_TOTAL);
m_state = State_RunReport;
break;
case State_RunReport:
DT_LOGTIMING(pTimePointArray);
DT_LOGMEMORYUSE();
DT_LOGEVENTDATA();
Andrew Webster
General Manager
RealPlayer and International Development
Direct: 206 892 6334
awebster@real.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100112/21a0a0fd/attachment-0001.html
From ehyche at real.com Tue Jan 12 11:39:46 2010
From: ehyche at real.com (Eric Hyche)
Date: Tue Jan 12 19:04:15 2010
Subject: [datatype-dev] CR: PR# 256084 - Hang when cancelling FLV
conversion to M4V
In-Reply-To: <7ECCEA249B7CDC49A079EC0075E999AA07D8B6E182@SEAMBX.corp.real.com>
References: <7ECCEA249B7CDC49A079EC0075E999AA07D8B6E182@SEAMBX.corp.real.com>
Message-ID:
Looks good.
On Jan 12, 2010, at 2:19 PM, Stan Bobrovskiy wrote:
> Modified by: stanb@real.com
> Date: 01:12:10
> Project: RealPlayer SP 1.5
>
> Synopsis: This is request to reverse changes made about 6 weeks ago by umakantg with the following comment:
> bug fix 9760: Low memory and media scanner died. CR: ehyche@real.com and sfu@real.com
> The logic to release m_pContext is revoked back to its original (as seen in earlier
> version of ffdriver.cpp 1.39.2.19)
>
> This change introduces quite obvious deadlock in DTDR chain in case of CDataTypeMultiConverter involvement. Without reversing this change we cannot procede with our release schedule on RealPlayer.
>
> Files Added: none
>
> Files Modified:
> datatype/tools/dtdriver/engine/ffdriver.cpp
>
> Platforms and Profiles Build Verified:
> Platform: win32-i386-vc7
>
> Profile: helix-client-all-defines
>
> target(s): playinst
>
> Branch: hxclient_3_1_0_atlas
>
> Index: ffdriver.cpp
> ===================================================================
> RCS file: /cvsroot/datatype/tools/dtdriver/engine/ffdriver.cpp,v
> retrieving revision 1.39.2.23
> diff -u -1 -0 -r1.39.2.23 ffdriver.cpp
> --- ffdriver.cpp 2 Dec 2009 22:00:51 -0000 1.39.2.23
> +++ ffdriver.cpp 12 Jan 2010 18:58:36 -0000
> @@ -384,25 +384,21 @@
>
> m_bUsingPreferredAudioPayload = FALSE;
> m_bUsingPreferredVideoPayload = FALSE;
>
> // Context must be the last object to close
> if (bCompleteShutdown || !m_bPersistentContext)
> {
> HX_RELEASE(m_pScheduler);
> HX_RELEASE(m_pClientContext);
> HX_RELEASE(m_pErrorMessages);
> - if(m_pContext)
> - {
> - m_pContext->Destruct();
> - m_pContext = NULL;
> - }
> + HX_RELEASE(m_pContext);
> }
> }
>
>
> void FFDriver::Stop()
> {
> HXLOGL1(HXLOG_DTDR, "FFDriver::Stop()");
> m_bStop = TRUE;
> if (m_pContext)
> {
> @@ -1545,26 +1541,22 @@
>
> m_ulContextEvents = m_pContext->GetProcessEventCount();
>
> HX_RELEASE(m_pSourceHandlerStack);
> ReleaseSourceHandlerList(m_pUtilizedSourceHandlerList);
>
> if (MEMORY_TRACKING_NEEDED && !m_bPersistentContext)
> {
> HX_RELEASE(m_pScheduler);
> HX_RELEASE(m_pErrorMessages);
> - if(m_pContext)
> - {
> - m_pContext->Destruct();
> - m_pContext = NULL;
> - }
> - }
> + HX_RELEASE(m_pContext);
> + }
>
> MEMPROBE_FREEZE(MEMPRB_TOTAL);
>
> m_state = State_RunReport;
> break;
>
> case State_RunReport:
> DT_LOGTIMING(pTimePointArray);
> DT_LOGMEMORYUSE();
> DT_LOGEVENTDATA();
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From pbasic at real.com Tue Jan 12 13:35:49 2010
From: pbasic at real.com (Petar Basic)
Date: Tue Jan 12 21:00:55 2010
Subject: [datatype-dev] Re: CR/CN: Solaris-Sparc-GCC patches for
GMPMetaEditor branch
In-Reply-To: <9b8350411001120419p7b849630ud12c8991378e0f54@mail.gmail.com>
References: <9b8350411001110958m6fb02f4fqa4ace1930abf35c1@mail.gmail.com>
<9b8350411001120419p7b849630ud12c8991378e0f54@mail.gmail.com>
Message-ID: <9b8350411001121335r29363fc3m202f3540c31e868e@mail.gmail.com>
Latest set of patches to fix the Solaris native compiler build:
1.) STL headers in encodesvc projects must precede Helix headers at some places.
2.) Reverted back GNUC conditional in math64.h since GCC build is not
needed anymore.
Build tested with:
SYSTEM_ID=sunos-5.10-sparc-studio11
On Tue, Jan 12, 2010 at 1:19 PM, Petar Basic wrote:
> Additional fixes for Solaris native compiler.
>
>
> On Mon, Jan 11, 2010 at 6:58 PM, Petar Basic wrote:
>> Modified by: pbasic at real.com
>> Date: 2010/01/11
>> Project: GMP MetaEditor (meta3gp.exe)
>>
>> Synopsis:
>> Solaris-Sparc-GCC patches for GMPMetaEditor branch
>>
>> Overview:
>> This CR includes patches needed to successfully build/run meta3gp
>> project with GCC on Solaris-Sparc.
>>
>> Checked into GMPMetaEditor branch immediately since I need to verify
>> the build on the farm ASAP. ?Some points below can be discussed and
>> improved on later, however, at this time they seem irrelevant in the
>> context of GMPMetaEditor.
>>
>> Details:
>> 1.) "audio/fixptutil/pub/math64.h" was failing to compile due to
>> missing implementation of 64-bit operations for Solaris-Sparc-GCC
>> combo.
>>
>> In the CVS log, one can find traces of Sparc specific blocks of code
>> which according to CVS comments had some bugs and were replaced by
>> platform independent (plain C) implementations for Solaris-SunStudio
>> combo. ?Relevant ifdef statement has now been modified to also compile
>> platform independent implementations under Solaris-Sparc-GCC combo.
>>
>> All tests performed by "audio/fixptutil/test/fixpttest.c" succeed,
>> although the execution proves slow. ?Testing with MetaEditor reveals
>> that these operations are not used during meta-data
>> extraction/injection, so at this time optimization for
>> Solaris-Sparc-GCC does not seem important.
>>
>> 2.) statvfs on Solaris fails if passed an empty path argument, which
>> causes calling method CHXFileSpecUtils::IsDiskLocal to print out an
>> error to the console. ?This is not acceptable for MetaEditor,
>> especially since everything works correctly. ?The culprit is actually
>> in MemoryMapDataFile::Bind method in
>> "common/fileio/platform/unix/mmapdatf.cpp". ?The code has been updated
>> to process empty paths as a special case before resorting to
>> CHXFileSpecUtils::IsDiskLocal. ?Also, what seems as a duplicate code
>> block due to a bad check-in has been removed.
>>
>> 3.) RMAShutdown entry point which is now required by plugin handler
>> has been added to metaeditor.dll.
>>
>> 4.) Defaulting meta3gp executable to DTDriver synchronous mode since
>> asynchronous mode is not implemented on Solaris.
>>
>> 5.) Fixed various build busters.
>>
>> 6.) Reordered library dependencies in a few projects to allow the
>> Solaris linker to link all symbols correctly.
>>
>> Testing:
>> Verified operation on GMP MetaEditor on Solaris 5.10 Sparc via
>> standard MetaEditor test scripts.
>>
>> Files Modified:
>> audio/fixptutil/pub/math64.h
>> client/medpltfm/hxmedpltfmdll
>> client/medpltfm/pub/chxmedpltfmkicker.h
>> client/medpltfm/pub/chxmedpltfmsched.h
>> common/fileio/platform/unix/mmapdatf.cpp
>> datatype/mp4/filewriter/m4avsh.cpp
>> datatype/mp4/filewriter/mp4atoms.h
>> datatype/mp4/filewriter/mp4sm.cpp
>> datatype/mp4/filewriter/ra10sh.cpp
>> datatype/tools/dtdriver/apps/meta3gp/HXXmlInputParser.h
>> datatype/tools/dtdriver/apps/meta3gp/Umakefil_meta3gp
>> datatype/tools/dtdriver/apps/meta3gp/Umakefil_tests
>> datatype/tools/dtdriver/apps/meta3gp/main.cpp
>> datatype/tools/dtdriver/dtdrplin/dtdr_genr_lib
>> datatype/tools/dtdriver/dtdrplin/dtdr_platform_dll
>> datatype/tools/metaeditor/Umakefil
>> datatype/tools/metaeditor/hxdll.cpp
>>
>> Platforms and Profiles Affected:
>> All
>>
>> Image Size and Heap Use impact:
>> None
>>
>> Platforms and Profiles Build Verified:
>> system id: win32-i386-vc7, sunos-5.8-sparc-gcc-server
>> profile: helix-client-all-defines
>>
>> Platforms and Profiles Functionality Verified:
>> x86 Windows XP SP2
>> Sparc SunOS 5.10
>>
>> Branch:
>> GMPMetaEditor
>>
>> Copyright assignment:
>> I am a RealNetworks employee or contractor.
>>
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: audio_fixptutil.3.diff
Type: application/octet-stream
Size: 1766 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100112/bdd11475/audio_fixptutil.3-0001.obj
-------------- next part --------------
A non-text attachment was scrubbed...
Name: client_encodesvc_common.3.diff
Type: application/octet-stream
Size: 13379 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100112/bdd11475/client_encodesvc_common.3-0001.obj
From sgarg at real.com Wed Jan 13 20:34:38 2010
From: sgarg at real.com ( Sushant Garg)
Date: Thu Jan 14 03:58:49 2010
Subject: [datatype-dev] CN: Fix for Bug 9840: RealPlayer displays incorrect
duration for a wav file recorded by gnome-sound-recorder.
References: <011601ca78cd$6011f9a0$8001a8c0@adroit02a604c1>
<7ECCEA249B7CDC49A079EC0075E999AA07D82CC716@SEAMBX.corp.real.com>
<012301ca798f$c8a9dce0$8001a8c0@adroit02a604c1>
<268FD6EA-49A7-42FA-AFC6-78547C20C18B@real.com>
<01ed01ca8492$b14289e0$8001a8c0@adroit02a604c1>
<5FC21ACD-FE11-427F-BA16-49FA0D27F818@real.com>
<007401ca8ec6$e4d0abf0$8001a8c0@adroit02a604c1>
<004901ca8f77$39950c70$8001a8c0@adroit02a604c1>
<0833E151-A5C6-4A11-9F0B-411840816C87@real.com>
<008601ca905e$868a8130$8001a8c0@adroit02a604c1>
<009101ca934b$e2d12cb0$8001a8c0@adroit02a604c1>
Message-ID: <007601ca94d2$e3dfd2e0$8001a8c0@adroit02a604c1>
Thanks Eric,
This is checked into Atlas310, Atlas3_4_10, Atlas347, Head, 401Brizo.
Thanks & Regards
Sushant Garg
----- Original Message -----
From: Eric Hyche
To: Sushant Garg
Cc: Datatype-Dev
Sent: Tuesday, January 12, 2010 8:45 PM
Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
Looks good to me.
On Jan 12, 2010, at 12:55 AM, Sushant Garg wrote:
> Thanks Eric,
> Now the code changes to
>
> + HX_RESULT retVal = m_pFileObject->QueryInterface(IID_IHXFileStat, (void **) &m_pFileStatObj);
> + if(SUCCEEDED(retVal) && (m_pFileStatObj->Stat((IHXFileStatResponse *) this) == HXR_OK))
> + {
> + return status;
> + }
> + else
> + {
>
> from
> + HX_RESULT retVal = m_pFileObject->QueryInterface(IID_IHXFileStat, (void **) &m_pFileStatObj);
> + if(SUCCEEDED(retVal) && m_pFileStatObj)
> + {
> + m_pFileStatObj->Stat((IHXFileStatResponse *) this);
> + }
> + else
> + {
> Please find updated diff.
>
> Thanks & Regards
> Sushant Garg
> ----- Original Message -----
> From: Eric Hyche
> To: Sushant Garg
> Cc: Datatype-Dev
> Sent: Friday, January 08, 2010 7:15 PM
> Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
>
> Also if the call to IHXFileStat::Stat() returns failure, then we will never get a callback to StatDone(). So we should check the return value of the Stat() call, and if it fails, then we should also go ahead and call read (just like if the QI for IHXFileStat failed).
>
> Eric
>
> On Jan 8, 2010, at 7:31 AM, Sushant Garg wrote:
>
> > Oops! missed to notice that.
> >
> > Now changed that code to following:
> >
> > in CRIFFReader::InitDone() function.
> >
> > + HX_RELEASE(m_pFileStatObj);
> > + if ( !m_pFileObject )
> > + return HXR_UNEXPECTED;
> > +
> > + HX_RESULT retVal = m_pFileObject->QueryInterface(IID_IHXFileStat, (void **) &m_pFileStatObj);
> > + if(SUCCEEDED(retVal) && m_pFileStatObj)
> > + {
> > + m_pFileStatObj->Stat((IHXFileStatResponse *) this);
> > + }
> > + else
> > + {
> > + m_state = RS_GetFileTypePending;
> > + return m_pFileObject->Read(sizeof(UINT32) * 2);
> > + }
> > + return status;
> >
> > from
> >
> > + HX_RELEASE(m_pFileStatObj);
> > + if(m_pFileObject)
> > + {
> > + HX_RESULT retVal = m_pFileObject->QueryInterface(IID_IHXFileStat, (void **) &m_pFileStatObj);
> > + if(SUCCEEDED(retVal) && m_pFileStatObj)
> > + {
> > + m_pFileStatObj->Stat((IHXFileStatResponse *) this);
> > + }
> > + }
> > + return status;
> >
> > Please find the updated diff.
> >
> > Thanks & Regards
> > Sushant Garg
> > ----- Original Message -----
> > From: Eric Hyche
> > To: Sushant Garg
> > Cc: Datatype-Dev
> > Sent: Thursday, January 07, 2010 8:40 PM
> > Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> >
> > But if I'm reading the diff correctly, if the QI for IHXFileStat fails, then we never call the RIFF reader user back with CRiffResponse::InitDone(), correct? If so, then we've hung the app.
> >
> > Eric
> >
> > On Jan 7, 2010, at 3:55 AM, Sushant Garg wrote:
> >
> > > Before calling Stat() we have a condition to check whether QI is succeeded or not & if in case it does not then we will not send a call to Stat() & return status of InitDone().
> > >
> > > + HX_RELEASE(m_pFileStatObj);
> > > + if(m_pFileObject)
> > > + {
> > > + HX_RESULT retVal = m_pFileObject->QueryInterface(IID_IHXFileStat, (void **) &m_pFileStatObj);
> > > + if(SUCCEEDED(retVal) && m_pFileStatObj)
> > > + {
> > > + m_pFileStatObj->Stat((IHXFileStatResponse *) this);
> > > + }
> > > + }
> > > + return status;
> > >
> > > Now if Stat() fails then we will get error in StatDone() & hence we will not get the size of file. And so we will not change m_ulDataSizeInBytes in wvffplin.cpp
> > >
> > > Thanks & Regards
> > > Sushant Garg
> > > ----- Original Message -----
> > > From: Eric Hyche
> > > To: Sushant Garg
> > > Cc: Datatype-Dev
> > > Sent: Wednesday, January 06, 2010 8:25 PM
> > > Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> > >
> > > Looks good for the most part. However, if your QI for IHXFileStat fails, then we will hang, since no InitDone() back to the RIFF reader user will ever be made. So make sure that if either the QI for IHXFileStat fails, or the call to STat() returns failure that we properly make a failure InitDone() back to the RIFF reader user.
> > >
> > > Actually, the QI for IHXFileStat should not be required, since file objects are not required to implement this. So if the QI for IHXFileStat fails, then the RIFF reader should continue on normally, just without knowing the file size. If the QI for IHXFileStat() succeeds but the call to STat() returns failure, then we can return failure in InitDone() back to the RIFF reader caller.
> > >
> > > Eric
> > >
> > > On Jan 6, 2010, at 6:53 AM, Sushant Garg wrote:
> > >
> > > > Thanks Eric,
> > > >
> > > > Please find the updated diff.
> > > >
> > > > Now I am calling Read() from CRIFFReader::StatDone() rather then CRIFFReader::InitDone.
> > > >
> > > > Thanks & Regards
> > > > Sushant Garg
> > > > ----- Original Message -----
> > > > From: Eric Hyche
> > > > To: Sushant Garg
> > > > Cc: Datatype-Dev
> > > > Sent: Monday, January 04, 2010 8:13 PM
> > > > Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> > > >
> > > > You are treating IHXFileStat::Stat() like a synchronous call and there is
> > > > no guarantee that it will be. Once you issue the call to Stat(), then
> > > > you will need to wait in StatDone() before calling back to InitDone().
> > > >
> > > > Eric
> > > >
> > > > On Dec 24, 2009, at 7:14 AM, Sushant Garg wrote:
> > > >
> > > > > Eric,
> > > > >
> > > > > Please find the updated diff.
> > > > >
> > > > > Thanks & Regards
> > > > > Sushant Garg
> > > > > ----- Original Message -----
> > > > > From: Eric Hyche
> > > > > To: Sushant Grag
> > > > > Cc: Datatype-Dev
> > > > > Sent: Friday, December 11, 2009 12:04 AM
> > > > > Subject: Re: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> > > > >
> > > > > Sushant,
> > > > >
> > > > > After thinking about this some more, I think the Stat() call should be moved inside the RIFF reader, for a couple of reasons:
> > > > >
> > > > > - centralize it in one place, so other uses of the RIFF reader don't have to do the same thing.
> > > > > - the most natural time to do the Stat is immediately after the IHXFileObject is Init'd, which in this case the RIFF reader does.
> > > > >
> > > > > So I think the RIFF reader could do the IHXFileStat::Stat() call, and then store the filesize result. Then we could just add an accessor function on the RIFF reader so that users of the RIFF reader can read the size. The file size would only be valid after the CRIFFREader::Open() call had returned with a RIFFOpenDone() callback.
> > > > >
> > > > > Eric
> > > > >
> > > > > On Dec 10, 2009, at 6:56 AM, Sushant Grag wrote:
> > > > >
> > > > > > Thanks Eric,
> > > > > >
> > > > > > Please find the updated diff.
> > > > > >
> > > > > > Thanks & Regards
> > > > > > Sushant Garg
> > > > > > ----- Original Message -----
> > > > > > From: Eric Hyche
> > > > > > To: Sushant Grag ; Datatype-Dev
> > > > > > Sent: Wednesday, December 09, 2009 7:17 PM
> > > > > > Subject: RE: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-recorder.
> > > > > >
> > > > > > +UINT32 CRIFFReader::GetFileDataSize()
> > > > > > +{
> > > > > > + CHXString strFilePath = m_pFilename;
> > > > > > + const char* szFileProtocol = "file://";
> > > > > > + UINT32 ulFiledataSize =0;
> > > > > > +
> > > > > > + if( !strFilePath.Left(strlen(szFileProtocol)).CompareNoCase(szFileProtocol) )
> > > > > > + {
> > > > > > + strFilePath = strFilePath.Mid(strlen(szFileProtocol));
> > > > > > + struct stat fileInfo;
> > > > > > + if(!stat(strFilePath, &fileInfo))
> > > > > > + {
> > > > > > + ulFiledataSize = fileInfo.st_size;
> > > > > > + }
> > > > > > + }
> > > > > > + return ulFiledataSize;
> > > > > > +}
> > > > > > +
> > > > > >
> > > > > > I did not mean do a C-library stat() on the file. The file object that
> > > > > > the RIFF readers uses will not always be a local file that you can call stat() on.
> > > > > > What I meant was QI the file object for IHXFileStat and then call IHXFileStat::Stat().
> > > > > > You will have to implement IHXFileStatResponse::StatDone().
> > > > > >
> > > > > > Eric
> > > > > >
> > > > > > >-----Original Message-----
> > > > > > >From: datatype-dev-bounces@helixcommunity.org [mailto:datatype-dev-bounces@helixcommunity.org] On
> > > > > > >Behalf Of Sushant Grag
> > > > > > >Sent: Wednesday, December 09, 2009 7:45 AM
> > > > > > >To: Datatype-Dev
> > > > > > >Subject: [datatype-dev] CR: Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file
> > > > > > >recorded by gnome-sound-recorder.
> > > > > > >
> > > > > > >Project: RealPlayer for Netbook
> > > > > > >
> > > > > > >Synopsis:
> > > > > > >
> > > > > > >Fix for Bug 9840: RealPlayer displays incorrect duration for a wav file recorded by gnome-sound-
> > > > > > >recorder.
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >Overview:
> > > > > > >
> > > > > > >There is an issue with wav files which are recorded from ubuntu sound recorder.
> > > > > > >
> > > > > > >The calculated file duration in Realplayer for linux is much & much larger then original file duration
> > > > > > >
> > > > > > >eg: file has duration of 6secs & Realplayer shows more than 3hr 22 min.
> > > > > > >
> > > > > > >Reason behind is, sound recorder adds garbage value in data chunk which leads to very big value of
> > > > > > >m_ulChunkBodyLen calculated in riff.cpp around line 380
> > > > > > >
> > > > > > > if ( (UINT32)getlong(buf) == m_ulFindChunkId )
> > > > > > >
> > > > > > > {
> > > > > > >
> > > > > > > // Found the chunk we were asked for
> > > > > > >
> > > > > > > m_state = RS_Ready;
> > > > > > >
> > > > > > > m_ulChunkBodyLen = GetLong(&buf[4]);
> > > > > > >
> > > > > > > m_ulChunkSize = m_ulChunkBodyLen;
> > > > > > >
> > > > > > >Which cause a very higher value of duration.
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >Now I have created two different functions in riff.cpp;
> > > > > > >
> > > > > > >CRIFFReader::GetFileDataSize() & CRIFFReader::GetCurrentFileOffset() in which I am getting the length
> > > > > > >of file & the file offset and calling these functions in function CWaveFileFormat::RIFFFindChunkDone()
> > > > > > >, case WS_FindDataChunkPending to set m_ulDataSizeInBytes if "len" is greater then
> > > > > > >"ulDataSizeInBytes".
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >Files Modified:
> > > > > > >/cvsroot/datatype/common/util/riff.cpp
> > > > > > >
> > > > > > >/cvsroot/datatype/common/util/pub/riff.h
> > > > > > >
> > > > > > >/cvsroot/datatype/wav/fileformat/wvffplin.cpp
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >Files Added:
> > > > > > >
> > > > > > >None
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >Platforms and Profiles Affected:
> > > > > > >Linux
> > > > > > >
> > > > > > >Distribution Libraries Affected:
> > > > > > >None.
> > > > > > >
> > > > > > >Platforms and Profiles Build Verified:
> > > > > > >Bif: realplay_gtk_atlas_restricted_gold_1.2
> > > > > > >Profile: helix-client-moblin
> > > > > > >Target: player_all
> > > > > > >
> > > > > > >Branch:
> > > > > > >Atlas347, Atlas310, Atlas3_4_10, 401 Brizo, Head
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >Files Attached:
> > > > > > >
> > > > > > >9840_diff.txt
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >Thanks & Regards
> > > > > > >Sushant Garg
> > > > > > <9840_diff.txt>
> > > > >
> > > > > Eric Hyche (ehyche@real.com)
> > > > > Principal Engineer
> > > > > RealNetworks, Inc.
> > > > >
> > > > >
> > > >
> > > > Eric Hyche (ehyche@real.com)
> > > > Principal Engineer
> > > > RealNetworks, Inc.
> > > >
> > > > <9840_diff.txt>
> > >
> > > Eric Hyche (ehyche@real.com)
> > > Principal Engineer
> > > RealNetworks, Inc.
> > >
> >
> > Eric Hyche (ehyche@real.com)
> > Principal Engineer
> > RealNetworks, Inc.
> >
> > <9840_diff.txt>
>
> Eric Hyche (ehyche@real.com)
> Principal Engineer
> RealNetworks, Inc.
>
> <9840_diff.txt>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100114/54e5e5c6/attachment-0001.html
From pbasic at real.com Thu Jan 14 15:14:13 2010
From: pbasic at real.com (Petar Basic)
Date: Thu Jan 14 22:38:46 2010
Subject: [datatype-dev] CR/CN: Windows-Unicode command line patches for
GMPMetaEditor branch
Message-ID: <9b8350411001141514m5fe592a5j1e7fc701fbd64f8@mail.gmail.com>
Modified by: pbasic at real.com
Date: 2010/01/14
Project: GMP MetaEditor (meta3gp.exe)
Synopsis:
Windows-Unicode command line patches for GMPMetaEditor branch
Details:
1.) Adjusted string types and transfers in meta3gp project to make
possible usage of Unicode command line on Windows.
2.) Fixed code-unit counting bugs in the following routines
IsUTF8StringAsciiOnly, IsUTF16StringAsciiOnly, IsUTF32StringAsciiOnly.
Testing:
Verified operation on GMP MetaEditor on Windows XP SP2 and Solaris
5.10 Sparc via standard MetaEditor test scripts.
Files Modified:
common/util/uniconv.cpp
datatype/tools/dtdriver/apps/meta3gp/HXXmlInputParser.cpp
datatype/tools/dtdriver/apps/meta3gp/HXXmlInputParser.h
datatype/tools/dtdriver/apps/meta3gp/main.cpp
Platforms and Profiles Affected:
All
Image Size and Heap Use impact:
None
Platforms and Profiles Build Verified:
system id: win32-i386-vc7, sunos-5.10-sparc-studio11
profile: helix-client-all-defines
Platforms and Profiles Functionality Verified:
x86 Windows XP SP2
Sparc SunOS 5.10
Branch:
GMPMetaEditor
Copyright assignment:
I am a RealNetworks employee or contractor.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: common_util.diff
Type: application/octet-stream
Size: 5464 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100115/59bfddc8/common_util-0001.obj
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_tools_dtdriver_apps_meta3gp.diff
Type: application/octet-stream
Size: 56908 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100115/59bfddc8/datatype_tools_dtdriver_apps_meta3gp-0001.obj
From jgordon at real.com Thu Jan 14 19:14:55 2010
From: jgordon at real.com (Jamie Gordon)
Date: Fri Jan 15 02:38:44 2010
Subject: [datatype-dev] CR/Checkin: PR 256454 spin out while attempting to
streaming RM content
Message-ID: <4B4FDDAF.70701@real.com>
Synopsis
========
Fixes PR 256454
Branches: HEAD (SERVER_CURRENT)
Suggested Reviewer: anyone
Description
===========
A checkin last night changed the CRIFFReader to use Stat and pass itself
cast as IHXFileStatResponse. But this change did not actually change
CRIFFReader to *actually* implement the IHXFileStatResponse interface.
So the cast is invalid and caused the file object's Stat method to call
InitDone when trying to call StatDone, which is especially unfortunate
since InitDone calls Stat, thus super-fun recursion time.
Files Affected
==============
datatype/common/util/riff.cpp
datatype/common/util/pub/riff.h
Testing Performed
=================
Unit Tests:
Integration Tests:
Streamed an RM file. Noted that it streamed rather than blowing the
stack in infinite recursion.
Leak Tests:
Performance Tests:
Platforms Tested: linux-rhel5-i686
Build verified: linux-rhel5-i686
QA Hints
===============
n/a
-------------- next part --------------
Index: datatype/common/util/riff.cpp
===================================================================
RCS file: /cvsroot/datatype/common/util/riff.cpp,v
retrieving revision 1.17
diff -u -w -r1.17 riff.cpp
--- datatype/common/util/riff.cpp 14 Jan 2010 04:31:56 -0000 1.17
+++ datatype/common/util/riff.cpp 15 Jan 2010 03:07:47 -0000
@@ -63,6 +63,7 @@
{
{ GET_IIDHANDLE(IID_IUnknown), this},
{ GET_IIDHANDLE(IID_IHXFileResponse), (IHXFileResponse*)this},
+ { GET_IIDHANDLE(IID_IHXFileStatResponse), (IHXFileStatResponse*)this},
};
HX_RESULT retVal = ::QIFind(qiList, QILISTSIZE(qiList), riid, ppvObj);
Index: datatype/common/util/pub/riff.h
===================================================================
RCS file: /cvsroot/datatype/common/util/pub/riff.h,v
retrieving revision 1.8
diff -u -w -r1.8 riff.h
--- datatype/common/util/pub/riff.h 14 Jan 2010 04:31:56 -0000 1.8
+++ datatype/common/util/pub/riff.h 15 Jan 2010 03:07:47 -0000
@@ -48,7 +48,8 @@
class CRIFFResponse;
typedef _INTERFACE IHXFileObject IHXFileObject;
-class CRIFFReader : public IHXFileResponse
+class CRIFFReader : public IHXFileResponse,
+ public IHXFileStatResponse
{
public:
CRIFFReader(IUnknown*, CRIFFResponse*, IHXFileObject*);
From ext-shashi.merapala at nokia.com Fri Jan 15 03:56:26 2010
From: ext-shashi.merapala at nokia.com (ext-shashi.merapala@nokia.com)
Date: Fri Jan 15 11:21:18 2010
Subject: [datatype-dev] RE: [Nokia-private-dev] RESEND CR: ESLM-7YHD9L -
Helix_wmv
controller: Conflict between the list from SupportsMimeType and actually
video type (mp4) for video playback
In-Reply-To: <5701CE13-A77B-45A7-A614-3470F2637C85@real.com>
References:
<5701CE13-A77B-45A7-A614-3470F2637C85@real.com>
Message-ID:
Thanks Eric. Checked into 210CayS, HEAD & 420Brizo.
Thanks & Warm Regards,
Shashi Kiran Merapala
-----Original Message-----
From: ext Eric Hyche [mailto:ehyche@real.com]
Sent: Tuesday, January 12, 2010 8:47 PM
To: Merapala Shashi (EXT-Sasken/Bangalore)
Cc: client-dev@helixcommunity.org; common-dev@helixcommunity.org; clientapps-dev@helixcommunity.org; datatype-dev@helixcommunity.org; nokia-private-dev@helixcommunity.org
Subject: Re: [Nokia-private-dev] RESEND CR: ESLM-7YHD9L - Helix_wmv controller: Conflict between the list from SupportsMimeType and actually video type (mp4) for video playback
Looks good to me.
On Jan 12, 2010, at 7:27 AM, wrote:
> Sending the CR again with updated diffs. This time the diffs of hxclient_4_2_0_brizo.bif and helix.bif have also been attached (which I had missed previously).
>
> "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: ext-shashi.merapala@nokia.com
>
> Reviewed by: ashish.as.gupta@nokia.com
>
> Date: 01/12/2010
>
> Project: SymbianMmf_wm
>
> Error Id: ESLM-7YHD9L
>
> Synopsis: Helix_wmv controller: Conflict between the list from SupportsMimeType and actually video type (mp4) for video playback
>
> Overview: The WMV Extension Controller needs to be rolled up into the rest of Helix so that the Helix audio/video controllers support the Windows Media content.
>
> Solution: Diffs attached
>
> Files removed: The folder 'wmvextcontroller' and its contents are removed from \clientapps\symbianMmf\
>
> Files added: None
>
> Files modified: \client\build\BIF\hxclient_2_1_0_cayennes.bif
> \client\build\BIF\hxclient_4_2_0_brizo.bif
> \common\build\BIF\helix.bif
> \clientapps\symbianMmf\videocontroller\installMMF.pcf
> \clientapps\symbianMmf\videocontroller\MmfSis
> \clientapps\symbianMmf\audiocontroller\installMMF.pcf
> \clientapps\symbianMmf\audiocontroller\controllersis
> \clientapps\symbianMmf\videocontroller\101F8513.rss
> \clientapps\symbianMmf\audiocontroller\10207B64.rss
> \datatype\tools\metadataeng\engine\platform\symbian\hxmetadata_dlls.txt
>
> Image size and heap use impact: Approx. 289 kb of space saved on image creation
>
> Module release testing (STIF): Passed
>
> Test case(s) added: No
>
> Memory leak check performed: Yes. No new leaks introduced
>
> Platforms and profiles build verified: helix-client-s60-52-mmf-mdf-dsp
>
> Platforms and profiles functionality verified: armv5, winscw
>
> Branch: 210CayS, HEAD, 420Brizo
>
>
>
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From pbasic at real.com Fri Jan 15 04:37:27 2010
From: pbasic at real.com (Petar Basic)
Date: Fri Jan 15 12:01:41 2010
Subject: [datatype-dev] CR/CN: Updated UITS data ID3 Owner Identifier to the
correct URL [GMPMetaEditor branch]
Message-ID: <9b8350411001150437y4f417a78g8f55d7bb1306e489@mail.gmail.com>
Modified by: pbasic at real.com
Date: 2010/01/15
Project: GMPMetaEditor (meta3gp.exe)
Synopsis:
Updated UITS data ID3 Owner Identifier to the correct URL
Details:
When stored inside the ID3 tag, UITS data must be placed into a PRIV
frame. That PRIV frame should be marked with correct Owner Identifier
to be able to distinguish it from other various PRIV frames. The
correct Owner Identifier to use for UITS is
"mailto:uits-info@umusic.com".
Files Modified:
datatype/include/metainfokeys.h
Platforms and Profiles Affected:
All
Image Size and Heap Use impact:
None
Platforms and Profiles Build Verified:
system id: win32-i386-vc7, sunos-5.10-sparc-studio11
profile: helix-client-all-defines
Platforms and Profiles Functionality Verified:
x86 Windows XP SP2
Sparc SunOS 5.10
Branch:
GMPMetaEditor
Copyright assignment:
I am a RealNetworks employee or contractor.
From pbasic at real.com Fri Jan 15 04:38:44 2010
From: pbasic at real.com (Petar Basic)
Date: Fri Jan 15 12:02:54 2010
Subject: [datatype-dev] Re: CR/CN: Updated UITS data ID3 Owner Identifier to
the correct URL [GMPMetaEditor branch]
In-Reply-To: <9b8350411001150437y4f417a78g8f55d7bb1306e489@mail.gmail.com>
References: <9b8350411001150437y4f417a78g8f55d7bb1306e489@mail.gmail.com>
Message-ID: <9b8350411001150438u368036cdo6308c26aff36e035@mail.gmail.com>
Forgot the diff file. Attached here.
On Fri, Jan 15, 2010 at 1:37 PM, Petar Basic wrote:
> Modified by: pbasic at real.com
> Date: 2010/01/15
> Project: GMPMetaEditor (meta3gp.exe)
>
> Synopsis:
> Updated UITS data ID3 Owner Identifier to the correct URL
>
> Details:
> When stored inside the ID3 tag, UITS data must be placed into a PRIV
> frame. ?That PRIV frame should be marked with correct Owner Identifier
> to be able to distinguish it from other various PRIV frames. ?The
> correct Owner Identifier to use for UITS is
> "mailto:uits-info@umusic.com".
>
> Files Modified:
> datatype/include/metainfokeys.h
>
> Platforms and Profiles Affected:
> All
>
> Image Size and Heap Use impact:
> None
>
> Platforms and Profiles Build Verified:
> system id: win32-i386-vc7, sunos-5.10-sparc-studio11
> profile: helix-client-all-defines
>
> Platforms and Profiles Functionality Verified:
> x86 Windows XP SP2
> Sparc SunOS 5.10
>
> Branch:
> GMPMetaEditor
>
> Copyright assignment:
> I am a RealNetworks employee or contractor.
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_include.diff
Type: application/octet-stream
Size: 2509 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100115/d171de7a/datatype_include.obj
From pbasic at real.com Fri Jan 15 08:43:11 2010
From: pbasic at real.com (Petar Basic)
Date: Fri Jan 15 16:07:30 2010
Subject: [datatype-dev] CR/CN: Metadata atom order modification: udta-box
comes before ID3-tag related meta-box [GMPMetaEditor branch]
Message-ID: <9b8350411001150843m4e2a2963t804fea0d0d11815f@mail.gmail.com>
Modified by: pbasic at real.com
Date: 2010/01/15
Project: GMPMetaEditor (meta3gp.exe)
Synopsis:
Metadata atom order modification: udta-box comes before ID3-tag
related meta-box [GMPMetaEditor branch]
Details:
Recognition of file type and metadata display work incorrectly with
particular metadata atom order on some HTC handsets.
'meta' atom which contains ID3 tag comes before 'udta' atom which
contains 3GPP assets in files produced by meta3gp, and the opposite is
true for files produced by CodingTech. HTC code obviously gets
confused while parsing 'meta' atom or ID3 tag within it. With
CodingTech files, HTC first reads textual metadata from 'udta' atom
then proceeds parsing ID3 and fails. With meta3gp files, HTC finds
ID3 first and fails before reading textual metadata in 'udta' atom.
This is why the files produced by CodingTech work better to some
extent if CoverArt is injected (i.e. ID3 tag stored in the file).
To improve compatibility with HTC handsets, MP4 filewriter has been
changed to produce metadata atom order in which 'udta' atom always
comes before ID3-tag related 'meta' atom. This does not influence the
position of other atoms in the file.
Files Modified:
datatype/mp4/filewriter/mp4sm.cpp
datatype/mp4/filewriter/mp4sm.h
Platforms and Profiles Affected:
All
Image Size and Heap Use impact:
None
Platforms and Profiles Build Verified:
system id: win32-i386-vc7, sunos-5.10-sparc-studio11
profile: helix-client-all-defines
Platforms and Profiles Functionality Verified:
x86 Windows XP SP2
Sparc SunOS 5.10
Branch:
GMPMetaEditor
Copyright assignment:
I am a RealNetworks employee or contractor.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_mp4_filewriter.diff
Type: application/octet-stream
Size: 10467 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100115/a199c5d3/datatype_mp4_filewriter-0001.obj
From pbasic at real.com Sat Jan 16 14:36:20 2010
From: pbasic at real.com (Petar Basic)
Date: Sat Jan 16 22:00:24 2010
Subject: [datatype-dev] CR/CN: Implemented redirection of output into log
file [GMPMetaEditor branch]
Message-ID: <9b8350411001161436w58490327rb923d790966fa59f@mail.gmail.com>
Modified by: pbasic at real.com
Date: 2010/01/16
Project: GMPMetaEditor (meta3gp.exe)
Synopsis:
Implemented redirection of output into log file [GMPMetaEditor branch]
Details:
Implemented -log option which redirects all output (stdout, stderr)
into specified log file.
Files Modified:
datatype/tools/dtdriver/apps/meta3gp/main.cpp
Platforms and Profiles Affected:
All
Image Size and Heap Use impact:
None
Platforms and Profiles Build Verified:
system id: win32-i386-vc7, sunos-5.10-sparc-studio11
profile: helix-client-all-defines
Platforms and Profiles Functionality Verified:
x86 Windows XP SP2
Sparc SunOS 5.10
Branch:
GMPMetaEditor
Copyright assignment:
I am a RealNetworks employee or contractor.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_tools_dtdriver_apps_meta3gp.diff
Type: application/octet-stream
Size: 53496 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100116/9239d9dd/datatype_tools_dtdriver_apps_meta3gp-0001.obj
From stanb at real.com Sat Jan 16 19:18:13 2010
From: stanb at real.com (Stan Bobrovskiy)
Date: Sun Jan 17 02:41:33 2010
Subject: [datatype-dev] CN: tempory fx for DTDR crasing on VP6 FLVs wth Alpha
Message-ID: <7ECCEA249B7CDC49A079EC0075E999AA07D8CE8931@SEAMBX.corp.real.com>
Modified by: stanb@real.com
Date: 01:16:10
Project: RealPlayer SP 1.1
Synopsis: This simply adds processing of VP6 Alpha as for simple VP6 FLVs.
Files Added: none
Files Modified:
datatype/mp4/payload/flvpyld.cpp
Platforms and Profiles Build Verified:
Platform: win32-i386-vc7
Profile: helix-client-all-defines
target(s): playinst
Branch: hxclient_3_1_0_atlas
Index: flvpyld.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/payload/flvpyld.cpp,v
retrieving revision 1.4.2.2
diff -u -1 -0 -r1.4.2.2 flvpyld.cpp
--- flvpyld.cpp 2 Dec 2009 07:51:17 -0000 1.4.2.2
+++ flvpyld.cpp 17 Jan 2010 03:13:01 -0000
@@ -103,20 +103,21 @@
#include "hxformt.h"
#include "hxengin.h"
#include "sdptools.h"
#include "mp4desc.h"
#include "flvpyld.h"
#include "mp4pyldutil.h"
#include "avcconfig.h"
# define HX_FLV_VIDEO_TYPE_VP6 4
+# define HX_FLV_VIDEO_TYPE_VP6_ALPHA 5
CHXFLVPayloadFormat::CHXFLVPayloadFormat(CHXBufferMemoryAllocator* pAllocator)
: m_lRefCount (0)
, m_pClassFactory (NULL)
, m_pAllocator (pAllocator)
, m_pStreamHeader (NULL)
, m_pBitstreamHeader (NULL)
, m_ulBitstreamHeaderSize (0)
, m_ulSamplesPerSecond(1000)
, m_ulFrameCount (0)
@@ -352,21 +353,21 @@
m_pCodecId = HX_SORENSEN_SPARK_CODEC_ID;
m_bIsSpark = TRUE;
pHeader->GetPropertyBuffer("OpaqueData", pOpaqueData);
m_ulBitstreamHeaderSize = (ULONG32)pOpaqueData->GetSize();
m_pBitstreamHeader = new UINT8[m_ulBitstreamHeaderSize+1];
memcpy(m_pBitstreamHeader,
pOpaqueData->GetBuffer(),
m_ulBitstreamHeaderSize);
HX_RELEASE(pOpaqueData);
}
- else if(CodecId == HX_FLV_VIDEO_TYPE_VP6)
+ else if(CodecId == HX_FLV_VIDEO_TYPE_VP6 || CodecId == HX_FLV_VIDEO_TYPE_VP6_ALPHA)
{
m_pCodecId = HX_FLV_VP67_CODEC_ID;
m_bIsVP6 = TRUE;
}
retVal = HXR_OK;
}
}
if (SUCCEEDED(retVal))
{
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100116/27ae74ea/attachment.html
From pbasic at real.com Sun Jan 17 09:44:02 2010
From: pbasic at real.com (Petar Basic)
Date: Sun Jan 17 17:07:54 2010
Subject: [datatype-dev] CR/CN: Introduced differentiated program return
codes for simpler errors [GMPMetaEditor branch]
Message-ID: <9b8350411001170944v39ea04b5h56dca273839da202@mail.gmail.com>
Modified by: pbasic at real.com
Date: 2010/01/17
Project: GMPMetaEditor (meta3gp.exe)
Synopsis:
Introduced differentiated program return codes for simpler errors
[GMPMetaEditor branch]
Details:
Added program return codes for each error condition that the main
executable can easily detect:
RC_SUCCESS
RC_ERROR_GENERIC
RC_ERROR_BAD_COMMAND_LINE
RC_ERROR_CANNOT_OPEN_LOG_FILE
RC_ERROR_MISSING_ENV_VAR
RC_ERROR_CANNOT_LOAD_DLL
RC_ERROR_CANNOT_INIT_PROGRAM_OBJECT
RC_ERROR_CANNOT_OPEN_INPUT_XML_FILE
RC_ERROR_BAD_INPUT_XML_FILE
RC_ERROR_INPUT_MEDIA_FILE_NOT_SPECIFIED
RC_ERROR_CANNOT_OPEN_INPUT_MEDIA_FILE
RC_ERROR_OUTPUT_MEDIA_FILE_EXISTS
RC_ERROR_SAME_INPUT_OUTPUT_MEDIA_FILE
RC_ERROR_CANNOT_OPEN_INPUT_PICTURE_FILE
RC_ERROR_UNSUPPORTED_INPUT_PICTURE_TYPE
RC_ERROR_CANNOT_OPEN_INPUT_UITS_FILE
RC_ERROR_UNSUPPORTED_INPUT_UITS_ENCODING
RC_ERROR_OUTPUT_PICTURE_FILE_EXISTS
RC_ERROR_CANNOT_OUTPUT_PICTURE_FILE
RC_ERROR_OUTPUT_UITS_FILE_EXISTS
RC_ERROR_CANNOT_OUTPUT_UITS_FILE
RC_ERROR_OUTPUT_XML_FILE_EXISTS
RC_ERROR_CANNOT_OUTPUT_XML_FILE
RC_ERROR_PROCESSING_MEDIA_FILE
Deep Helix errors are all reported as RC_ERROR_PROCESSING_MEDIA_FILE.
Files Modified:
datatype/tools/dtdriver/apps/meta3gp/main.cpp
Platforms and Profiles Affected:
All
Image Size and Heap Use impact:
None
Platforms and Profiles Build Verified:
system id: win32-i386-vc7, sunos-5.10-sparc-studio11
profile: helix-client-all-defines
Platforms and Profiles Functionality Verified:
x86 Windows XP SP2
Sparc SunOS 5.10
Branch:
GMPMetaEditor
Copyright assignment:
I am a RealNetworks employee or contractor.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_tools_dtdriver_apps_meta3gp.diff
Type: application/octet-stream
Size: 48881 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100117/15f87635/datatype_tools_dtdriver_apps_meta3gp-0001.obj
From pbasic at real.com Mon Jan 18 04:06:49 2010
From: pbasic at real.com (Petar Basic)
Date: Mon Jan 18 11:29:51 2010
Subject: [datatype-dev] CR/CN: Added MP4 fileformat configuration defines to
meta3gp project [GMPMetaEditor branch]
Message-ID: <9b8350411001180406h5c80983dxfd8431f90bfc572a@mail.gmail.com>
Modified by: pbasic at real.com
Date: 2010/01/17
Project: GMPMetaEditor (meta3gp.exe)
Synopsis:
Added MP4 fileformat configuration defines to meta3gp project
[GMPMetaEditor branch]
Details:
For meta3gp project, MP4 fileformat needs to be built with both
HELIX_FEATURE_3GPP_METAINFO and HELIX_FEATURE_ITUNES_METAINFO.
Both features have been defined in the BIF for meta3gp project to
avoid dependency on build profiles.
Files Modified:
GMPMetaEditor_internal.bif
Platforms and Profiles Affected:
All
Image Size and Heap Use impact:
None
Platforms and Profiles Build Verified:
system id: win32-i386-vc7, sunos-5.10-sparc-studio11
profile: helix-client-all-defines
Platforms and Profiles Functionality Verified:
x86 Windows XP SP2
Sparc SunOS 5.10
Branch:
GMPMetaEditor
Copyright assignment:
I am a RealNetworks employee or contractor.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: GMPMetaEditor_internal.bif.diff
Type: application/octet-stream
Size: 2216 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100118/3eaf1bc9/GMPMetaEditor_internal.bif.obj
From ext-shashi.merapala at nokia.com Mon Jan 18 06:00:41 2010
From: ext-shashi.merapala at nokia.com (ext-shashi.merapala@nokia.com)
Date: Mon Jan 18 13:24:57 2010
Subject: [datatype-dev] RESEND CR: ESLM-7YHD9L - Helix_wmv controller:
Conflict between the
list from SupportsMimeType and actually video type (mp4) for video playback
References:
<5701CE13-A77B-45A7-A614-3470F2637C85@real.com>
Message-ID:
Skipped content of type multipart/alternative-------------- next part --------------
--- J:\x_brizo\clientapps\symbianMmf\audiocontroller\ng_installMMF.pcf 2009-03-04 06:47:07.000000000 +-0530
+++ J:\x_brizo\clientapps\symbianMmf\audiocontroller\Copy of ng_installMMF.pcf 2010-01-18 11:51:29.000000000 +-0530
@@ -118,12 +118,15 @@
#
# lib_files
#
lib_names = []
+# Plugin Dlls [built separately] that need to be included to the *dll_names*.txt files
+additional_lib_names = []
+
# some dlls like vidplin aggregate functionality offered individually with
# other dlls; this list tracks those dlls that can be removed from the list
# of dlls to install because another dll duplicates or replaces the functionality
lib_names_remove = []
# maps lib short name to where it is output when built/distributed
@@ -168,13 +171,16 @@
'dmp4' : 'datatype_dist/rm/video/codec/g2mp4combo/dmp4.dll',
'log' : 'common/log/logsystem/[target]/log.dll',
'logobserverfile' : 'common/log/logobserver/[target]/logobserverfile.dll',
'arma' : 'datatype/mp4/audio/mdf/[target]/arma.dll',
'hxmetadataeng': 'datatype/xps/fileformat/[target]/hxmetadataeng.dll',
'hxmedpltfm' : 'client/medpltfm/[target]/hxmedpltfm.dll',
- 'hxmedplyeng' : 'client/core/[target]/hxmedplyeng.dll'
+ 'hxmedplyeng' : 'client/core/[target]/hxmedplyeng.dll',
+ 'asfff' : 'datatype/wm/fileformat/[target]/asfff.dll',
+ 'wma9' : 'datatype/mdf/audio/arm/wma/[target]/wma9.dll',
+ 'wmarender' : 'datatype/wm/audio/renderer/[target]/wmarender.dll'
}
#
# some helpers to reduce clutter...
#
def Add(*files):
@@ -198,15 +204,28 @@
''' return new list with duplicates removed '''
newList = []
for item in list:
if (item not in newList):
newList.append(item)
return newList
+
+def AddAdditionalDLLs(*files):
+ global additional_lib_names
+ for f in files:
+ additional_lib_names.append(f)
Add('hxmedpltfm')
Add('hxmedplyeng')
+
+# always add asf file format
+Add('asfff')
+Add('wma9')
+Add('wmarender')
+
+# add hxwmdrmplugin to *dll_names*.txt
+AddAdditionalDLLs('hxwmdrmplugin')
if project.IsDefined("HELIX_FEATURE_METADATAENG"):
Add('hxmetadataeng')
if project.IsDefined("HELIX_FEATURE_PLAYBACK_LOCAL"):
Add('smplfsys')
@@ -252,12 +271,19 @@
lib_files_copy = []
for f in lib_names:
path = os.path.join(playerDllDir, f)
path += ".dll"
path = os.path.normpath(path)
lib_files_copy.append(path)
+
+additional_lib_names_copy = []
+for f in additional_lib_names:
+ path = os.path.join(playerDllDir, f)
+ path += ".dll"
+ path = os.path.normpath(path)
+ additional_lib_names_copy.append(path)
#
# payld_dll_files, payld_rsc_files
#
payld_dll_names = []
-------------- next part --------------
--- J:\x_brizo\clientapps\symbianMmf\videocontroller\ng_installMMF.pcf 2009-03-04 06:47:49.000000000 +-0530
+++ J:\x_brizo\clientapps\symbianMmf\videocontroller\Copy of ng_installMMF.pcf 2010-01-18 11:58:10.000000000 +-0530
@@ -128,12 +128,15 @@
#
# lib_files
#
lib_names = []
+# Plugin Dlls [built separately] that need to be included to the *dll_names*.txt files
+additional_lib_names = []
+
# some dlls like vidplin aggregate functionality offered individually with
# other dlls; this list tracks those dlls that can be removed from the list
# of dlls to install because another dll duplicates or replaces the functionality
lib_names_remove = []
# maps lib short name to where it is output when built/distributed
@@ -185,13 +188,16 @@
'XPSFileFormat' : 'datatype/xps/fileformat/[target]/XPSFileFormat.dll',
'hxmetadataeng' : 'datatype/xps/fileformat/[target]/hxmetadataeng.dll',
'hxmedpltfm' : 'client/medpltfm/[target]/hxmedpltfm.dll',
'hxmedplyeng' : 'client/core/[target]/hxmedplyeng.dll',
'hxnetwksvc' : 'client/netwksvc/[target]/hxnetwksvc.dll',
'rtspclnt' : 'protocol/rtsp/[target]/rtspclnt.dll',
- 'avifformat' : 'datatype/avi/fileformat/[target]/avifformat.dll'
+ 'avifformat' : 'datatype/avi/fileformat/[target]/avifformat.dll',
+ 'asfff' : 'datatype/wm/fileformat/[target]/asfff.dll',
+ 'wma9' : 'datatype/mdf/audio/arm/wma/[target]/wma9.dll',
+ 'wmarender' : 'datatype/wm/audio/renderer/[target]/wmarender.dll'
}
#
# some helpers to reduce clutter...
#
@@ -216,17 +222,30 @@
''' return new list with duplicates removed '''
newList = []
for item in list:
if (item not in newList):
newList.append(item)
return newList
+
+def AddAdditionalDLLs(*files):
+ global additional_lib_names
+ for f in files:
+ additional_lib_names.append(f)
Add('hxmedpltfm')
Add('hxmedplyeng')
Add('rtspclnt')
Add('hxnetwksvc')
+
+# always add asf file format
+Add('asfff')
+Add('wma9')
+Add('wmarender')
+
+# add hxwmdrmplugin to *dll_names*.txt
+AddAdditionalDLLs('hxwmdrmplugin')
if project.IsDefined("HELIX_FEATURE_S60_PROGDOWN"):
Add('progdownfs')
Add('httpfsys')
Add('aacff')
@@ -344,38 +363,48 @@
for f in lib_names:
path = os.path.join(playerDllDir, f)
path += ".dll"
path = os.path.normpath(path)
lib_files_copy.append(path)
+additional_lib_names_copy = []
+for f in additional_lib_names:
+ path = os.path.join(playerDllDir, f)
+ path += ".dll"
+ path = os.path.normpath(path)
+ additional_lib_names_copy.append(path)
+
#
# payld_dll_files, payld_rsc_files
#
payld_dll_names = []
# maps short name to where it is output when built/distributed
payld_dll_name_map = {
'mdfh263payloadformat.dll' : 'datatype/mdf/video/format/h263/[target]/mdfh263payloadformat.dll',
'mdfmp4payloadformat.dll' : 'datatype/mdf/video/format/mp4/[target]/mdfmp4payloadformat.dll',
'mdfrvxpayloadformat.dll' : 'datatype/mdf/video/format/rm/[target]/mdfrvxpayloadformat.dll',
'mdfh264payloadformat.dll' : 'datatype/mdf/video/format/h264/[target]/mdfh264payloadformat.dll',
- 'mdfflvpayloadformat.dll' : 'datatype/mdf/video/format/flv/[target]/mdfflvpayloadformat.dll' }
+ 'mdfflvpayloadformat.dll' : 'datatype/mdf/video/format/flv/[target]/mdfflvpayloadformat.dll',
+ 'mdfwmvpayloadformat.dll' : 'datatype/mdf/video/format/wmv/[target]/mdfwmvpayloadformat.dll' }
payld_rsc_names = []
payld_rsc_name_map = {
'mdfh263payloadformat.rsc' : 'datatype/mdf/video/format/h263/[target]/mdfh263payloadformat.rsc',
'mdfmp4payloadformat.rsc' : 'datatype/mdf/video/format/mp4/[target]/mdfmp4payloadformat.rsc',
'mdfrvxpayloadformat.rsc' : 'datatype/mdf/video/format/rm/[target]/mdfrvxpayloadformat.rsc',
'mdfh264payloadformat.rsc' : 'datatype/mdf/video/format/h264/[target]/mdfh264payloadformat.rsc',
'mdfflvpayloadformat.rsc' : 'datatype/mdf/video/format/flv/[target]/mdfflvpayloadformat.rsc',
+ 'mdfwmvpayloadformat.rsc' : 'datatype/mdf/video/format/wmv/[target]/mdfwmvpayloadformat.rsc',
'h263.rsc' : 'datatype/mdf/video/format/h263/[target]/h263.rsc',
'mp4.rsc' : 'datatype/mdf/video/format/mp4/[target]/mp4.rsc',
'rm.rsc' : 'datatype/mdf/video/format/rm/[target]/rm.rsc',
'h264.rsc' : 'datatype/mdf/video/format/h264/[target]/h264.rsc',
- 'flv.rsc' : 'datatype/mdf/video/format/flv/[target]/flv.rsc' }
+ 'flv.rsc' : 'datatype/mdf/video/format/flv/[target]/flv.rsc',
+ 'wmv.rsc' : 'datatype/mdf/video/format/wmv/[target]/wmv.rsc' }
#
# some helpers to reduce clutter...
#
def AddPayldDll(*files):
''' add files to list of files to install '''
@@ -390,12 +419,13 @@
AddPayldDllMdf( 'mdfh263payloadformat.dll' )
AddPayldDllMdf( 'mdfmp4payloadformat.dll' )
AddPayldDllMdf( 'mdfrvxpayloadformat.dll' )
AddPayldDllMdf( 'mdfh264payloadformat.dll' )
AddPayldDllMdf( 'mdfflvpayloadformat.dll' )
+AddPayldDllMdf( 'mdfwmvpayloadformat.dll' )
def AddPayldRsc(*files):
''' add files to list of files to install '''
global payld_rsc_names
for f in files:
payld_rsc_names.append(f)
@@ -407,18 +437,20 @@
if project.IsDefined('HELIX_CONFIG_SYMBIAN_PLATFORM_SECURITY'):
AddPayldRscMdf( 'mdfh263payloadformat.rsc' )
AddPayldRscMdf( 'mdfmp4payloadformat.rsc' )
AddPayldRscMdf( 'mdfrvxpayloadformat.rsc' )
AddPayldRscMdf( 'mdfh264payloadformat.rsc' )
AddPayldRscMdf( 'mdfflvpayloadformat.rsc' )
+ AddPayldRscMdf( 'mdfwmvpayloadformat.rsc' )
else:
AddPayldRscMdf( 'h263.rsc' )
AddPayldRscMdf( 'mp4.rsc' )
AddPayldRscMdf( 'rm.rsc' )
AddPayldRscMdf( 'h264.rsc' )
AddPayldRscMdf( 'flv.rsc' )
+ AddPayldRscMdf( 'wmv.rsc' )
# add make copy output dir prefix and .dll suffix, e.g. '../../debug/foo.dll'
payld_dll_files_copy = []
for f in payld_dll_names:
path = os.path.join(playerDllDir, f)
path = os.path.normpath(path)
From Yury.Ramanovich at nokia.com Mon Jan 18 10:55:40 2010
From: Yury.Ramanovich at nokia.com (Yury.Ramanovich@nokia.com)
Date: Mon Jan 18 18:19:13 2010
Subject: [datatype-dev] CR needed: (Symbian) video preroll reduction for
local video playback
Message-ID:
Skipped content of type multipart/alternative-------------- next part --------------
Index: format/common/mdfpayloadformat.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/video/format/common/mdfpayloadformat.cpp,v
retrieving revision 1.2.2.16
diff -u -w -r1.2.2.16 mdfpayloadformat.cpp
--- format/common/mdfpayloadformat.cpp 26 Jan 2009 20:42:38 -0000 1.2.2.16
+++ format/common/mdfpayloadformat.cpp 18 Jan 2010 19:45:15 -0000
@@ -359,7 +359,7 @@
MDFVIDEOLOG_LEAVEFN( "Reset" );
}
-UINT32 CPayloadFormatPluginDevice::GetPreRollInMs() const
+UINT32 CPayloadFormatPluginDevice::GetPreRollInMs(HXBOOL /* bNetworkAccess */) const
{
MDFVIDEOLOG_ENTERFN( "GetPreRollInMs" );
MDFVIDEOLOG_LEAVEFN( "GetPreRollInMs" );
Index: format/common/pub/mdfpayloadformat.h
===================================================================
RCS file: /cvsroot/datatype/mdf/video/format/common/pub/mdfpayloadformat.h,v
retrieving revision 1.2.2.13
diff -u -w -r1.2.2.13 mdfpayloadformat.h
--- format/common/pub/mdfpayloadformat.h 20 Sep 2008 05:41:11 -0000 1.2.2.13
+++ format/common/pub/mdfpayloadformat.h 18 Jan 2010 19:45:15 -0000
@@ -146,7 +146,7 @@
virtual CMediaPacket* CreateAssembledPacket( IHXPacket* pPayloadData ) = 0;
virtual HX_RESULT FillBuffer( TVideoInputBuffer& pVideoInputBuffer, const CMediaPacket* pMediaPacket ) const;
virtual void Reset( UINT32 ulBeginTime );
- virtual UINT32 GetPreRollInMs() const;
+ virtual UINT32 GetPreRollInMs(HXBOOL bNetworkAccess = FALSE) const;
virtual const TDesC8& GetVideoProfile() const = 0;
virtual UINT32 GetVideoResolution() const;
Index: format/flv/mdfflvpayloadformat.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/video/format/flv/mdfflvpayloadformat.cpp,v
retrieving revision 1.1
diff -u -w -r1.1 mdfflvpayloadformat.cpp
--- format/flv/mdfflvpayloadformat.cpp 20 Feb 2008 17:52:19 -0000 1.1
+++ format/flv/mdfflvpayloadformat.cpp 18 Jan 2010 19:45:15 -0000
@@ -52,6 +52,7 @@
#include "pckunpck.h"
#define DEFAULT_FLV_PREROLL_IN_MS 2000
+#define DEFAULT_FLV_PREROLL_IN_MS_LOCAL 1000
#define KUidFLVPayloadFormatPluginDeviceDefine 0x1028334e
#define SYNCHRONIZE_DECODING_STRING_FLV "SynchronizeDecoding_FLV"
@@ -167,11 +168,11 @@
MDFVIDEOLOG_LEAVEFN( "Reset" );
}
-UINT32 CFLVPayloadFormatPluginDevice::GetPreRollInMs() const
+UINT32 CFLVPayloadFormatPluginDevice::GetPreRollInMs(HXBOOL bNetworkAccess) const
{
MDFVIDEOLOG_ENTERFN( "GetPreRollInMs" );
MDFVIDEOLOG_LEAVEFN( "GetPreRollInMs" );
- return DEFAULT_FLV_PREROLL_IN_MS;
+ return (bNetworkAccess ? DEFAULT_FLV_PREROLL_IN_MS : DEFAULT_FLV_PREROLL_IN_MS_LOCAL);
}
const char* CFLVPayloadFormatPluginDevice::GetConfigString() const
Index: format/flv/pub/mdfflvpayloadformat.h
===================================================================
RCS file: /cvsroot/datatype/mdf/video/format/flv/pub/mdfflvpayloadformat.h,v
retrieving revision 1.1
diff -u -w -r1.1 mdfflvpayloadformat.h
--- format/flv/pub/mdfflvpayloadformat.h 20 Feb 2008 17:52:53 -0000 1.1
+++ format/flv/pub/mdfflvpayloadformat.h 18 Jan 2010 19:45:15 -0000
@@ -71,7 +71,7 @@
virtual CMediaPacket* CreateAssembledPacket( IHXPacket* pPayloadData );
virtual HX_RESULT FillBuffer( TVideoInputBuffer& pVideoInputBuffer, const CMediaPacket* pMediaPacket ) const;
virtual void Reset( UINT32 ulBeginTime );
- virtual UINT32 GetPreRollInMs() const;
+ virtual UINT32 GetPreRollInMs(HXBOOL bNetworkAccess = FALSE) const;
virtual const char* GetConfigString() const;
virtual const TDesC8& GetVideoProfile() const;
Index: format/h263/mdfh263payloadformat.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/video/format/h263/mdfh263payloadformat.cpp,v
retrieving revision 1.2.2.13
diff -u -w -r1.2.2.13 mdfh263payloadformat.cpp
--- format/h263/mdfh263payloadformat.cpp 22 Apr 2009 14:31:05 -0000 1.2.2.13
+++ format/h263/mdfh263payloadformat.cpp 18 Jan 2010 19:45:15 -0000
@@ -51,6 +51,7 @@
#include "sdpchunk.h" //SDPParseChunk
#define DEFAULT_H263_PREROLL_IN_MS 3500
+#define DEFAULT_H263_PREROLL_IN_MS_LOCAL 1000
#define KUidH263PayloadFormatPluginDeviceDefine 0x10207475
#define MP4V_RN_3GPP_H263_PAYLOAD_MIME_TYPE "video/X-RN-3GPP-H263"
#define SYNCHRONIZE_DECODING_STRING_H263 "SynchronizeDecoding_H263"
@@ -269,11 +270,11 @@
return pFramePacket;
}
-UINT32 CH263PayloadFormatPluginDevice::GetPreRollInMs() const
+UINT32 CH263PayloadFormatPluginDevice::GetPreRollInMs(HXBOOL bNetworkAccess) const
{
MDFVIDEOLOG_ENTERFN( "GetPreRollInMs" );
MDFVIDEOLOG_LEAVEFN( "GetPreRollInMs" );
- return DEFAULT_H263_PREROLL_IN_MS;
+ return (bNetworkAccess ? DEFAULT_H263_PREROLL_IN_MS : DEFAULT_H263_PREROLL_IN_MS_LOCAL);
}
const TDesC8& CH263PayloadFormatPluginDevice::GetVideoProfile() const
Index: format/h263/pub/mdfh263payloadformat.h
===================================================================
RCS file: /cvsroot/datatype/mdf/video/format/h263/pub/mdfh263payloadformat.h,v
retrieving revision 1.2.2.9
diff -u -w -r1.2.2.9 mdfh263payloadformat.h
--- format/h263/pub/mdfh263payloadformat.h 22 Apr 2009 14:34:03 -0000 1.2.2.9
+++ format/h263/pub/mdfh263payloadformat.h 18 Jan 2010 19:45:15 -0000
@@ -65,7 +65,7 @@
public: //derived
virtual HX_RESULT CreatePayloadFormat( IHXPayloadFormatObject*& aPayloadFormatObject );
CMediaPacket* CreateAssembledPacket( IHXPacket* pPayloadData );
- virtual UINT32 GetPreRollInMs() const;
+ virtual UINT32 GetPreRollInMs(HXBOOL bNetworkAccess = FALSE) const;
virtual const TDesC8& GetVideoProfile() const;
private:
Index: format/h264/mdfh264payloadformat.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/video/format/h264/mdfh264payloadformat.cpp,v
retrieving revision 1.1.2.21
diff -u -w -r1.1.2.21 mdfh264payloadformat.cpp
--- format/h264/mdfh264payloadformat.cpp 6 Nov 2009 19:57:11 -0000 1.1.2.21
+++ format/h264/mdfh264payloadformat.cpp 18 Jan 2010 19:45:15 -0000
@@ -56,6 +56,8 @@
#define MP4V_H264_PAYLOAD_MIME_TYPE "video/H264"
#define DEFAULT_H264_PREROLL_IN_MS 3500
+#define DEFAULT_H264_PREROLL_IN_MS_LOCAL 1000
+
#define KUidH264PayloadFormatPluginDeviceDefine 0x1020747B
#define SYNCHRONIZE_DECODING_STRING_H264 "SynchronizeDecoding_H264"
@@ -371,11 +373,11 @@
MDFVIDEOLOG_LEAVEFN( "Reset" );
}
-UINT32 CH264PayloadFormatPluginDevice::GetPreRollInMs() const
+UINT32 CH264PayloadFormatPluginDevice::GetPreRollInMs(HXBOOL bNetworkAccess) const
{
MDFVIDEOLOG_ENTERFN( "GetPreRollInMs" );
MDFVIDEOLOG_LEAVEFN( "GetPreRollInMs" );
- return DEFAULT_H264_PREROLL_IN_MS;
+ return (bNetworkAccess ? DEFAULT_H264_PREROLL_IN_MS : DEFAULT_H264_PREROLL_IN_MS_LOCAL);
}
const TDesC8& CH264PayloadFormatPluginDevice::GetVideoProfile() const
Index: format/h264/pub/mdfh264payloadformat.h
===================================================================
RCS file: /cvsroot/datatype/mdf/video/format/h264/pub/mdfh264payloadformat.h,v
retrieving revision 1.1.2.8
diff -u -w -r1.1.2.8 mdfh264payloadformat.h
--- format/h264/pub/mdfh264payloadformat.h 30 Nov 2007 21:12:49 -0000 1.1.2.8
+++ format/h264/pub/mdfh264payloadformat.h 18 Jan 2010 19:45:15 -0000
@@ -69,7 +69,7 @@
virtual CMediaPacket* CreateAssembledPacket( IHXPacket* pPayloadData );
virtual HX_RESULT FillBuffer( TVideoInputBuffer& pVideoInputBuffer, const CMediaPacket* pMediaPacket ) const;
virtual void Reset( UINT32 ulBeginTime );
- virtual UINT32 GetPreRollInMs() const;
+ virtual UINT32 GetPreRollInMs(HXBOOL bNetworkAccess = FALSE) const;
virtual const TDesC8& GetVideoProfile() const;
private:
Index: format/mp4/mdfmp4payloadformat.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/video/format/mp4/mdfmp4payloadformat.cpp,v
retrieving revision 1.2.2.21
diff -u -w -r1.2.2.21 mdfmp4payloadformat.cpp
--- format/mp4/mdfmp4payloadformat.cpp 22 Apr 2009 14:41:52 -0000 1.2.2.21
+++ format/mp4/mdfmp4payloadformat.cpp 18 Jan 2010 19:45:15 -0000
@@ -51,6 +51,7 @@
#include "sdpchunk.h" //SDPParseChunk
#define DEFAULT_MP4_PREROLL_IN_MS 3500
+#define DEFAULT_MP4_PREROLL_IN_MS_LOCAL 1000
#define KUidMP4PayloadFormatPluginDeviceDefine 0x10207477
#define SYNCHRONIZE_DECODING_STRING_MP4 "SynchronizeDecoding_MP4"
@@ -250,11 +251,11 @@
MDFVIDEOLOG_LEAVEFN( "Reset" );
}
-UINT32 CMP4PayloadFormatPluginDevice::GetPreRollInMs() const
+UINT32 CMP4PayloadFormatPluginDevice::GetPreRollInMs(HXBOOL bNetworkAccess) const
{
MDFVIDEOLOG_ENTERFN( "GetPreRollInMs" );
MDFVIDEOLOG_LEAVEFN( "GetPreRollInMs" );
- return DEFAULT_MP4_PREROLL_IN_MS;
+ return (bNetworkAccess ? DEFAULT_MP4_PREROLL_IN_MS : DEFAULT_MP4_PREROLL_IN_MS_LOCAL);
}
const TDesC8& CMP4PayloadFormatPluginDevice::GetVideoProfile() const
Index: format/mp4/pub/mdfmp4payloadformat.h
===================================================================
RCS file: /cvsroot/datatype/mdf/video/format/mp4/pub/mdfmp4payloadformat.h,v
retrieving revision 1.2.2.9
diff -u -w -r1.2.2.9 mdfmp4payloadformat.h
--- format/mp4/pub/mdfmp4payloadformat.h 30 Nov 2007 21:12:50 -0000 1.2.2.9
+++ format/mp4/pub/mdfmp4payloadformat.h 18 Jan 2010 19:45:15 -0000
@@ -68,7 +68,7 @@
virtual CMediaPacket* CreateAssembledPacket( IHXPacket* pPayloadData );
virtual HX_RESULT FillBuffer( TVideoInputBuffer& pVideoInputBuffer, const CMediaPacket* pMediaPacket ) const;
virtual void Reset( UINT32 ulBeginTime );
- virtual UINT32 GetPreRollInMs() const;
+ virtual UINT32 GetPreRollInMs(HXBOOL bNetworkAccess = FALSE) const;
virtual const TDesC8& GetVideoProfile() const;
private:
Index: format/rm/mdfrvxpayloadformat.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/video/format/rm/mdfrvxpayloadformat.cpp,v
retrieving revision 1.1.2.16
diff -u -w -r1.1.2.16 mdfrvxpayloadformat.cpp
--- format/rm/mdfrvxpayloadformat.cpp 20 Sep 2008 05:42:29 -0000 1.1.2.16
+++ format/rm/mdfrvxpayloadformat.cpp 18 Jan 2010 19:45:15 -0000
@@ -52,6 +52,7 @@
#include
#define DEFAULT_RVX_PREROLL_IN_MS 3500
+#define DEFAULT_RVX_PREROLL_IN_MS_LOCAL 1000
#define KUidRVXPayloadFormatPluginDeviceDefine 0x10207479
#define SYNCHRONIZE_DECODING_STRING_RVX "SynchronizeDecoding_RVX"
@@ -169,11 +170,11 @@
return pFramePacket;
}
-UINT32 CRVXPayloadFormatPluginDevice::GetPreRollInMs() const
+UINT32 CRVXPayloadFormatPluginDevice::GetPreRollInMs(HXBOOL bNetworkAccess) const
{
MDFVIDEOLOG_ENTERFN( "GetPreRollInMs" );
MDFVIDEOLOG_LEAVEFN( "GetPreRollInMs" );
- return DEFAULT_RVX_PREROLL_IN_MS;
+ return (bNetworkAccess ? DEFAULT_RVX_PREROLL_IN_MS : DEFAULT_RVX_PREROLL_IN_MS_LOCAL);
}
const TDesC8& CRVXPayloadFormatPluginDevice::GetVideoProfile() const
Index: format/rm/pub/mdfrvxpayloadformat.h
===================================================================
RCS file: /cvsroot/datatype/mdf/video/format/rm/pub/mdfrvxpayloadformat.h,v
retrieving revision 1.1.2.9
diff -u -w -r1.1.2.9 mdfrvxpayloadformat.h
--- format/rm/pub/mdfrvxpayloadformat.h 20 Sep 2008 05:42:12 -0000 1.1.2.9
+++ format/rm/pub/mdfrvxpayloadformat.h 18 Jan 2010 19:45:15 -0000
@@ -67,7 +67,7 @@
virtual HX_RESULT Init( IUnknown *pContext, IHXValues* pHeader );
virtual HX_RESULT CreatePayloadFormat( IHXPayloadFormatObject*& aPayloadFormatObject );
virtual CMediaPacket* CreateAssembledPacket( IHXPacket* pPayloadData );
- virtual UINT32 GetPreRollInMs() const;
+ virtual UINT32 GetPreRollInMs(HXBOOL bStreaming = FALSE) const;
virtual HX_RESULT FillBuffer( TVideoInputBuffer& pVideoInputBuffer, const CMediaPacket* pMediaPacket ) const;
virtual const TDesC8& GetVideoProfile() const;
#ifdef HELIX_FEATURE_S60_TRICKPLAY
Index: format/wmv/mdfwmvpayloadformat.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/video/format/wmv/mdfwmvpayloadformat.cpp,v
retrieving revision 1.1.2.9
diff -u -w -r1.1.2.9 mdfwmvpayloadformat.cpp
--- format/wmv/mdfwmvpayloadformat.cpp 8 Apr 2008 21:16:13 -0000 1.1.2.9
+++ format/wmv/mdfwmvpayloadformat.cpp 18 Jan 2010 19:45:15 -0000
@@ -68,6 +68,7 @@
#define DEFAULT_WMV_PREROLL_IN_MS 2000
+#define DEFAULT_WMV_PREROLL_IN_MS_LOCAL 1000
#define KUidWMVPayloadFormatPluginDeviceDefine 0x10283354
const TUid KUidWMVPayloadFormatPluginDevice = {KUidWMVPayloadFormatPluginDeviceDefine};
@@ -375,11 +376,11 @@
MDFVIDEOLOG_LEAVEFN( "Reset" );
}
-UINT32 CWMVPayloadFormatPluginDevice::GetPreRollInMs() const
+UINT32 CWMVPayloadFormatPluginDevice::GetPreRollInMs(HXBOOL bNetworkAccess) const
{
MDFVIDEOLOG_ENTERFN( "GetPreRollInMs" );
MDFVIDEOLOG_LEAVEFN( "GetPreRollInMs" );
- return DEFAULT_WMV_PREROLL_IN_MS;
+ return (bNetworkAccess ? DEFAULT_WMV_PREROLL_IN_MS : DEFAULT_WMV_PREROLL_IN_MS_LOCAL);
}
const char* CWMVPayloadFormatPluginDevice::GetConfigString() const
Index: format/wmv/pub/mdfwmvpayloadformat.h
===================================================================
RCS file: /cvsroot/datatype/mdf/video/format/wmv/pub/mdfwmvpayloadformat.h,v
retrieving revision 1.1.2.3
diff -u -w -r1.1.2.3 mdfwmvpayloadformat.h
--- format/wmv/pub/mdfwmvpayloadformat.h 8 Apr 2008 21:15:22 -0000 1.1.2.3
+++ format/wmv/pub/mdfwmvpayloadformat.h 18 Jan 2010 19:45:15 -0000
@@ -86,7 +86,7 @@
virtual CMediaPacket* CreateAssembledPacket( IHXPacket* pPayloadData );
virtual HX_RESULT FillBuffer( TVideoInputBuffer& pVideoInputBuffer, const CMediaPacket* pMediaPacket ) const;
virtual void Reset( UINT32 ulBeginTime );
- virtual UINT32 GetPreRollInMs() const;
+ virtual UINT32 GetPreRollInMs(HXBOOL bNetworkAccess = FALSE) const;
virtual const char* GetConfigString() const;
virtual const TDesC8& GetVideoProfile() const;
Index: renderer/mdfvideoadapter.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/video/renderer/mdfvideoadapter.cpp,v
retrieving revision 1.3.2.103
diff -u -w -r1.3.2.103 mdfvideoadapter.cpp
--- renderer/mdfvideoadapter.cpp 6 Jan 2010 10:47:42 -0000 1.3.2.103
+++ renderer/mdfvideoadapter.cpp 18 Jan 2010 19:45:16 -0000
@@ -280,7 +280,8 @@
HX_RESULT CMdfVideoAdapter::Init( const char* pCurrentMimetype,
MMMFClockSource* pClockSource,
IHXValues* pHeader,
- IUnknown* pContext )
+ IUnknown* pContext,
+ HXBOOL bNetworkAccess )
{
MDFVIDEOLOG_ENTERFN2( "Init" );
HX_RESULT retVal( HXR_OK );
@@ -370,37 +371,7 @@
if( m_pPayloadFormatPluginDevice && error == KErrNone )
{
HXLOGL2(HXLOG_VIDE, " Payload id 0x%08x is successfully loaded, HW decoder:0x%08x, PostProcessor:0x%08x", formatId.iUid,hwDecoderId.iUid,hwPostProcessorId.iUid );
-
-
- UINT32 disableMinPrerollCheck( 0 );
-
- pHeader->GetPropertyULONG32( "DisableMinPrerollCheck", disableMinPrerollCheck );
-
- MDFVIDEOLOG_WRITE_FORMAT2( " DisableMinPrerollCheck is %d", disableMinPrerollCheck );
-
- if( !disableMinPrerollCheck )
- {
- UINT32 ulPreroll = 0;
- UINT32 ulMinPreroll = m_pPayloadFormatPluginDevice->GetPreRollInMs();
-
- pHeader->GetPropertyULONG32( "Preroll", ulPreroll);
-
- // Make sure Preroll is above lower bound
- if(ulPreroll < ulMinPreroll)
- {
- ulPreroll = ulMinPreroll;
- }
-
- // Limit the Preroll with upper bound
- if(ulPreroll > MDF_MAX_PREROLL_IN_MSEC)
- {
- ulPreroll = MDF_MAX_PREROLL_IN_MSEC;
- }
-
- pHeader->SetPropertyULONG32( "Preroll", ulPreroll );
- }
-
- retVal = HXR_OK;
+ retVal = SetHdrPreroll(pHeader,bNetworkAccess);
}
else
{
@@ -2970,3 +2941,45 @@
return FALSE;
}
}
+
+
+HX_RESULT CMdfVideoAdapter::SetHdrPreroll(IHXValues* pHeader, HXBOOL bNetworkAccess)
+{
+ UINT32 disableMinPrerollCheck = 0;
+
+ if (pHeader)
+ {
+ pHeader->GetPropertyULONG32( "DisableMinPrerollCheck", disableMinPrerollCheck );
+
+ HXLOGL3(HXLOG_VIDE,"CMdfVideoAdapter::SetHdrPreroll() DisableMinPrerollCheck %d", disableMinPrerollCheck );
+
+ if( !disableMinPrerollCheck)
+ {
+ UINT32 ulPreroll = 0;
+ UINT32 ulMinPreroll = m_pPayloadFormatPluginDevice->GetPreRollInMs(bNetworkAccess);
+ HXLOGL3(HXLOG_VIDE, "CMdfVideoAdapter::SetHdrPreroll() bNetworkAccess %d ulMinPreroll %d ", bNetworkAccess, ulMinPreroll );
+
+ pHeader->GetPropertyULONG32( "Preroll", ulPreroll);
+ HXLOGL3(HXLOG_VIDE, "CMdfVideoAdapter::SetHdrPreroll() initial header preroll %d", ulPreroll );
+
+ // Make sure Preroll is above lower bound
+ if(ulPreroll < ulMinPreroll)
+ {
+ ulPreroll = ulMinPreroll;
+ }
+
+ // Limit the Preroll with upper bound
+ if(ulPreroll > MDF_MAX_PREROLL_IN_MSEC)
+ {
+ ulPreroll = MDF_MAX_PREROLL_IN_MSEC;
+ }
+
+ pHeader->SetPropertyULONG32( "Preroll", ulPreroll );
+
+ HXLOGL2(HXLOG_VIDE, "CMdfVideoAdapter::SetHdrPreroll() set header ulPreroll %d", ulPreroll );
+ }
+ }
+
+ return HXR_OK;
+}
+
Index: renderer/mdfvidrend.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/video/renderer/mdfvidrend.cpp,v
retrieving revision 1.4.2.28
diff -u -w -r1.4.2.28 mdfvidrend.cpp
--- renderer/mdfvidrend.cpp 2 Dec 2008 21:08:40 -0000 1.4.2.28
+++ renderer/mdfvidrend.cpp 18 Jan 2010 19:45:16 -0000
@@ -525,16 +525,7 @@
if (!strncmp(pMimeTypeData,"video/X-HX-AVC1",sizeof("video/X-HX-AVC1")))
{
- IHXStreamSource* pStreamSource = NULL;
- if(m_pStream && SUCCEEDED(m_pStream->GetSource(pStreamSource)) && pStreamSource)
- {
- IHXFileFormatObject* pFFObject = NULL;
- retVal = pStreamSource->QueryInterface(IID_IHXFileFormatObject, (void**) &pFFObject);
- if (SUCCEEDED(retVal))
- {
- HX_RELEASE(pFFObject);
- }
- else
+ if(IsStreaming())
{
#ifdef HELIX_FEATURE_DTDR_THUMBNAIL
if (m_bUntimedRendering)
@@ -549,7 +540,9 @@
MDFVIDEOLOG_INOUTFN2( "Unsupported mimetype during streaming!" );
}
}
- HX_RELEASE(pStreamSource);
+ else
+ {
+ retVal = HXR_OK;
}
}
@@ -599,7 +592,7 @@
if( SUCCEEDED( retVal ) )
{
- retVal = m_pMdfVideoAdapter->Init( m_pCurrentMimetype, m_pClockSource, m_pHeader, m_pContext );
+ retVal = m_pMdfVideoAdapter->Init( m_pCurrentMimetype, m_pClockSource, m_pHeader, m_pContext, IsNetworkAccess());
m_pHeader->GetPropertyULONG32( "PreRoll", m_ulPreroll );
MDFVIDEOLOG_WRITE_FORMAT2("OnHeader PreRoll :: %lu", m_ulPreroll);
}
@@ -1293,6 +1286,90 @@
return bIsVideoOnlyPlayback;
}
+HXBOOL CMdfVideoRenderer::IsStreaming()
+{
+
+ HXBOOL bStreaming = FALSE;
+ IHXStreamSource* pStreamSource = NULL;
+ HX_RESULT retVal = HXR_FAIL;
+ if(m_pStream && SUCCEEDED(m_pStream->GetSource(pStreamSource)) && pStreamSource)
+ {
+ IHXFileFormatObject* pFFObject = NULL;
+ retVal = pStreamSource->QueryInterface(IID_IHXFileFormatObject, (void**) &pFFObject);
+ if (SUCCEEDED(retVal))
+ {
+ HX_RELEASE(pFFObject);
+ }
+ else
+ {
+ bStreaming = TRUE;
+ }
+ HX_RELEASE(pStreamSource);
+ }
+ HXLOGL2(HXLOG_VIDE, "CMdfVideoRenderer::IsStreaming() bStreaming %d", bStreaming );
+ return bStreaming;
+}
+
+HXBOOL CMdfVideoRenderer::IsNetworkAccess()
+{
+ HXBOOL bNetworkAccess = FALSE;
+ IHXAdvise* pFFAdvise = NULL;
+ HX_RESULT adviseStatus = HXR_FAIL;
+
+ IHXStreamSource* pStreamSource = NULL;
+ if(m_pStream && SUCCEEDED(m_pStream->GetSource(pStreamSource)) && pStreamSource)
+ {
+ // try IHXFileFormatObject first
+ IHXFileFormatObject* pFFObject = NULL;
+ pStreamSource->QueryInterface(IID_IHXFileFormatObject, (void**) &pFFObject);
+ HXLOGL2(HXLOG_VIDE, "CMdfVideoRenderer::IsNetworkAccess() pFFObject %p", pFFObject );
+
+ if (pFFObject)
+ {
+ if(SUCCEEDED(pFFObject->QueryInterface(IID_IHXAdvise,(void**)&pFFAdvise)))
+ {
+ adviseStatus = pFFAdvise->Advise(HX_FILERESPONSEADVISE_NETWORKACCESS);
+ HXLOGL2(HXLOG_VIDE, "CMdfVideoRenderer::IsNetworkAccess() pFFAdvise %p", pFFAdvise );
+ HX_RELEASE(pFFAdvise);
+ }
+ HX_RELEASE(pFFObject);
+ }
+ else
+ {
+ // HXNetSource is used
+ // so we can set the adviseStatus to HXR_OK
+ adviseStatus = HXR_OK;
+ }
+
+ // try IHXFileObject
+ if(FAILED(adviseStatus))
+ {
+ IHXFileObject* pFileObject = NULL;
+ pStreamSource->QueryInterface(IID_IHXFileObject, (void**) &pFileObject);
+ HXLOGL2(HXLOG_VIDE, "CMdfVideoRenderer::IsNetworkAccess() pFileObject %p", pFileObject );
+ if(pFileObject)
+ {
+ adviseStatus = pFileObject->Advise(HX_FILEADVISE_NETWORKACCESS);
+ HX_RELEASE(pFileObject);
+ }
+ }
+
+ if(adviseStatus == HXR_ADVISE_LOCAL_ACCESS)
+ {
+ bNetworkAccess = FALSE;
+ }
+ else if(SUCCEEDED(adviseStatus))
+ {
+ bNetworkAccess = TRUE;
+ }
+ // done with pStreamSource
+ HX_RELEASE(pStreamSource);
+ }
+
+ HXLOGL2(HXLOG_VIDE, "CMdfVideoRenderer::IsNetworkAccess() adviseStatus 0x%08x bNetworkAccess %d", adviseStatus, bNetworkAccess );
+ return bNetworkAccess;
+}
+
void CMdfVideoRenderer::CheckForBufferingStart()
{
UINT32 lTimeDelta = 0;
Index: renderer/pub/mdfvideoadapter.h
===================================================================
RCS file: /cvsroot/datatype/mdf/video/renderer/pub/mdfvideoadapter.h,v
retrieving revision 1.3.2.44
diff -u -w -r1.3.2.44 mdfvideoadapter.h
--- renderer/pub/mdfvideoadapter.h 30 Oct 2009 16:50:44 -0000 1.3.2.44
+++ renderer/pub/mdfvideoadapter.h 18 Jan 2010 19:45:16 -0000
@@ -136,7 +136,8 @@
HX_RESULT Init( const char* pCurrentMimetype,
MMMFClockSource* pClcokSource,
IHXValues* pHeader,
- IUnknown* pContext );
+ IUnknown* pContext,
+ HXBOOL bNetworkAccess = FALSE );
HX_RESULT VideoPause();
HX_RESULT VideoResume();
@@ -177,6 +178,7 @@
void HandleInitComplete();
TInt GetLoggingMode();
HXBOOL IsPAREnabled(TYuvFormat& aYuvFormat, TSize& aPictureSize);
+ HX_RESULT SetHdrPreroll(IHXValues* pHeader, HXBOOL bNetworkAccess = FALSE);
public:
// MMdfDevVideoClientObserver methods
virtual void FatalError(TInt KErrNone);
Index: renderer/pub/mdfvidrend.h
===================================================================
RCS file: /cvsroot/datatype/mdf/video/renderer/pub/mdfvidrend.h,v
retrieving revision 1.3.2.11
diff -u -w -r1.3.2.11 mdfvidrend.h
--- renderer/pub/mdfvidrend.h 20 Sep 2008 05:46:19 -0000 1.3.2.11
+++ renderer/pub/mdfvidrend.h 18 Jan 2010 19:45:16 -0000
@@ -263,6 +263,8 @@
UINT32 GetLateFrameRebufferingTolerance();
HXBOOL IsVideoOnlyPlayback();
+ HXBOOL IsStreaming();
+ HXBOOL IsNetworkAccess();
void CheckVideoRebufferPreference();
inline HXBOOL IsVideoRebufferEnabled() {return m_bVideoRebufferEnabled;}
From pbasic at real.com Mon Jan 18 12:44:28 2010
From: pbasic at real.com (Petar Basic)
Date: Mon Jan 18 20:07:52 2010
Subject: [datatype-dev] CR/CN: Implemented -xmlout program option,
added support for -xmlin pictures [GMPMetaEditor branch]
Message-ID: <9b8350411001181244n36ce569bua06568c3911187a0@mail.gmail.com>
Modified by: pbasic at real.com
Date: 2010/01/18
Project: GMPMetaEditor (meta3gp.exe)
Synopsis:
Implemented -xmlout program option, added support for -xmlin pictures
[GMPMetaEditor branch]
Details:
1.) -xmlout option writes extracted or injected metadata into the
specified XML file.
2.) Added support for XML input file elements:
"albums/album/image/fileName", "albums/album/image/fileName2".
Files Modified:
datatype/common/util/pub/metautil.h
datatype/common/util/metautil.cpp
datatype/tools/dtdriver/apps/meta3gp/HXXmlInputParser.h
datatype/tools/dtdriver/apps/meta3gp/HXXmlInputParser.cpp
datatype/tools/dtdriver/apps/meta3gp/main.cpp
Platforms and Profiles Affected:
All
Image Size and Heap Use impact:
None
Platforms and Profiles Build Verified:
system id: win32-i386-vc7, sunos-5.10-sparc-studio11
profile: helix-client-all-defines
Platforms and Profiles Functionality Verified:
x86 Windows XP SP2
Sparc SunOS 5.10
Branch:
GMPMetaEditor
Copyright assignment:
I am a RealNetworks employee or contractor.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_common_util.diff
Type: application/octet-stream
Size: 23810 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100118/e5abd156/datatype_common_util-0001.obj
-------------- next part --------------
A non-text attachment was scrubbed...
Name: datatype_tools_dtdriver_apps_meta3gp.diff
Type: application/octet-stream
Size: 63675 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/datatype-dev/attachments/20100118/e5abd156/datatype_tools_dtdriver_apps_meta3gp-0001.obj
From vkathuria at real.com Tue Jan 19 03:44:53 2010
From: vkathuria at real.com (Varun Kathuria)
Date: Tue Jan 19 11:08:10 2010
Subject: [datatype-dev] CR/CN:Changes to add fmp4 fourcc to play FFmpeg
MPEG-4 files.
Message-ID:
Skipped content of type multipart/alternative-------------- next part --------------
Index: avistrm.cpp
===================================================================
RCS file: /cvsroot/datatype/avi/fileformat/avistrm.cpp,v
retrieving revision 1.10.2.13
diff -u -r1.10.2.13 avistrm.cpp
--- avistrm.cpp 9 Oct 2009 03:16:47 -0000 1.10.2.13
+++ avistrm.cpp 19 Jan 2010 12:35:14 -0000
@@ -259,7 +259,8 @@
#define VIDEO_FORMAT_h264 HX_MAKE4CC('4', '6', '2', 'h')
#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')
+#define VIDEO_FORMAT_fmp4 HX_MAKE4CC('4', 'p', 'm', 'f')
#define AVI_LIST_OBJECT 0x4c495354 /* 'LIST' */
#define AVI_RECORD_TYPE 0x72656320 /* 'rec ' */
@@ -688,7 +689,9 @@
(m_header.ulHandler == VIDEO_FORMAT_dx50) ||
(m_header.ulHandler == VIDEO_FORMAT_DX50) ||
(m_header.ulHandler == VIDEO_FORMAT_XVID)||
- (m_header.ulHandler == VIDEO_FORMAT_xvid))
+ (m_header.ulHandler == VIDEO_FORMAT_xvid)||
+ (m_header.ulHandler == VIDEO_FORMAT_FMP4)||
+ (m_header.ulHandler == VIDEO_FORMAT_fmp4))
{
strcpy(szStreamName, "Video Track");
strcpy (szMimeType, "video/X-HX-DIVX");
From ehyche at real.com Tue Jan 19 06:53:48 2010
From: ehyche at real.com (Eric Hyche)
Date: Tue Jan 19 14:17:35 2010
Subject: [datatype-dev] Re: RESEND CR: ESLM-7YHD9L - Helix_wmv controller:
Conflict between
the list from SupportsMimeType and actually video type (mp4) for video
playback
In-Reply-To:
References:
<5701CE13-A77B-45A7-A614-3470F2637C85@real.com>
Message-ID: <61C65E33-DDBD-4A3D-9E04-C5B252B51331@real.com>
Looks ok to me.
On Jan 18, 2010, at 9:00 AM, wrote:
> Hi Eric,
>
> The following files in 420Brizo and HEAD require similar changes as was applied to 'installMMF.pcf' previously -
> \clientapps\symbianMmf\videocontroller\ng_installMMF.pcf
> \clientapps\symbianMmf\audiocontroller\ng_installMMF.pcf
>
> Attached are the diffs for the same. Since CVS appears to be down, I have attached the diffs from the recently downloaded files. Kindly review.
>
> "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: ext-shashi.merapala@nokia.com
>
> Reviewed by: ashish.as.gupta@nokia.com
>
> Date: 01/18/2010
>
> Project: SymbianMmf_wm
>
> Error Id: ESLM-7YHD9L
>
> Synopsis: Helix_wmv controller: Conflict between the list from SupportsMimeType and actually video type (mp4) for video playback
>
> Overview: The WMV Extension Controller needs to be rolled up into the rest of Helix so that the Helix audio/video controllers support the Windows Media content.
>
> Solution: Diffs attached
>
> Files removed: The folder ?wmvextcontroller? and its contents are removed from \clientapps\symbianMmf\
>
> Files added: None
>
> Files modified: \client\build\BIF\hxclient_2_1_0_cayennes.bif
> \client\build\BIF\hxclient_4_2_0_brizo.bif
> \common\build\BIF\helix.bif
> \clientapps\symbianMmf\videocontroller\installMMF.pcf
> \clientapps\symbianMmf\videocontroller\MmfSis
> \clientapps\symbianMmf\audiocontroller\installMMF.pcf
> \clientapps\symbianMmf\audiocontroller\controllersis
> \clientapps\symbianMmf\videocontroller\101F8513.rss
> \clientapps\symbianMmf\audiocontroller\10207B64.rss
> \datatype\tools\metadataeng\engine\platform\symbian\hxmetadata_dlls.txt
> \clientapps\symbianMmf\videocontroller\ng_installMMF.pcf
> \clientapps\symbianMmf\audiocontroller\ng_installMMF.pcf
>
> Image size and heap use impact: Approx. 289 kb of space saved on image creation
>
> Module release testing (STIF): Passed
>
> Test case(s) added: No
>
> Memory leak check performed: Yes. No new leaks introduced
>
> Platforms and profiles build verified: helix-client-s60-52-mmf-mdf-dsp
>
> Platforms and profiles functionality verified: armv5, winscw
>
> Branch: 210CayS, HEAD, 420Brizo
>
>
> -----Original Message-----
> From: Merapala Shashi (EXT-Sasken/Bangalore)
> Sent: Friday, January 15, 2010 5:26 PM
> To: 'ext Eric Hyche'
> Cc: client-dev@helixcommunity.org; common-dev@helixcommunity.org; clientapps-dev@helixcommunity.org; datatype-dev@helixcommunity.org; nokia-private-dev@helixcommunity.org
> Subject: RE: [Nokia-private-dev] RESEND CR: ESLM-7YHD9L - Helix_wmv controller: Conflict between the list from SupportsMimeType and actually video type (mp4) for video playback
>
> Thanks Eric. Checked into 210CayS, HEAD & 420Brizo.
>
> Thanks & Warm Regards,
> Shashi Kiran Merapala
>
>
> -----Original Message-----
> From: ext Eric Hyche [mailto:ehyche@real.com]
> Sent: Tuesday, January 12, 2010 8:47 PM
> To: Merapala Shashi (EXT-Sasken/Bangalore)
> Cc: client-dev@helixcommunity.org; common-dev@helixcommunity.org; clientapps-dev@helixcommunity.org; datatype-dev@helixcommunity.org; nokia-private-dev@helixcommunity.org
> Subject: Re: [Nokia-private-dev] RESEND CR: ESLM-7YHD9L - Helix_wmv controller: Conflict between the list from SupportsMimeType and actually video type (mp4) for video playback
>
> Looks good to me.
>
> On Jan 12, 2010, at 7:27 AM, wrote:
>
> > Sending the CR again with updated diffs. This time the diffs of hxclient_4_2_0_brizo.bif and helix.bif have also been attached (which I had missed previously).
> >
> > "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: ext-shashi.merapala@nokia.com
> >
> > Reviewed by: ashish.as.gupta@nokia.com
> >
> > Date: 01/12/2010
> >
> > Project: SymbianMmf_wm
> >
> > Error Id: ESLM-7YHD9L
> >
> > Synopsis: Helix_wmv controller: Conflict between the list from SupportsMimeType and actually video type (mp4) for video playback
> >
> > Overview: The WMV Extension Controller needs to be rolled up into the rest of Helix so that the Helix audio/video controllers support the Windows Media content.
> >
> > Solution: Diffs attached
> >
> > Files removed: The folder ?wmvextcontroller? and its contents are removed from \clientapps\symbianMmf\
> >
> > Files added: None
> >
> > Files modified: \client\build\BIF\hxclient_2_1_0_cayennes.bif
> > \client\build\BIF\hxclient_4_2_0_brizo.bif
> > \common\build\BIF\helix.bif
> > \clientapps\symbianMmf\videocontroller\installMMF.pcf
> > \clientapps\symbianMmf\videocontroller\MmfSis
> > \clientapps\symbianMmf\audiocontroller\installMMF.pcf
> > \clientapps\symbianMmf\audiocontroller\controllersis
> > \clientapps\symbianMmf\videocontroller\101F8513.rss
> > \clientapps\symbianMmf\audiocontroller\10207B64.rss
> > \datatype\tools\metadataeng\engine\platform\symbian\hxmetadata_dlls.txt
> >
> > Image size and heap use impact: Approx. 289 kb of space saved on image creation
> >
> > Module release testing (STIF): Passed
> >
> > Test case(s) added: No
> >
> > Memory leak check performed: Yes. No new leaks introduced
> >
> > Platforms and profiles build verified: helix-client-s60-52-mmf-mdf-dsp
> >
> > Platforms and profiles functionality verified: armv5, winscw
> >
> > Branch: 210CayS, HEAD, 420Brizo
> >
> >
> >
> >
>
> Eric Hyche (ehyche@real.com)
> Principal Engineer
> RealNetworks, Inc.
>
>
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From ehyche at real.com Tue Jan 19 06:56:04 2010
From: ehyche at real.com (Eric Hyche)
Date: Tue Jan 19 14:18:44 2010
Subject: [datatype-dev] Re: [Nokia-private-dev] CR needed: (Symbian) video
preroll reduction for local video playback
In-Reply-To:
References:
Message-ID:
Looks good.
On Jan 18, 2010, at 1:55 PM, wrote:
> "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@nokia.com
>
> Reviewed by:
>
> Date: 01/18/2010
>
> Project: SymbianMmf_wm
>
> ErrorId: TBD
>
> Synopsis: video preroll reduction for local video playback
>
> Overview: mdf video adapter sets min and max limits on video preroll for all the video formats. Currently min video preroll is 3500ms for most video formats and max video preroll is 12000ms. In an effort to reduce the time it takes to start video playback for local cases, the minimum video preroll is reduced to 1000s.
>
> Solution: Reduce mdf video min preroll for local video playback to 1000ms for each mdf PayloadFormatPluginDevice; leave min video preroll for networking cases as is. A new method CMdfVideoRenderer::IsNetworkAccess() is introduced to distinguish between local and networking cases, result of of which is passed to CMdfVideoAdapter::Init(). Consolidated code for setting video preroll in CMdfVideoAdapter::SetHdrPreroll() method. Added HXBOOL bNetworkAccess param to GetPrerollInMs() methods for all PayloadFormatPluginDevices to differentiate returned min video preroll value between local and streaming cases for each video format. To improve code readability, also introduced CMdfVideoRenderer::IsStreaming() method, which is called from CMdfVideoRenderer::OnHeader().
>
> Note that min video preroll is just a lower limit for the preroll value that can be set by a file format. Some file formats ( like Windows Media and Real Video) can set their video preroll higher than minimum (3000-5000ms) so the higher preroll takes effect, while others ( MPEG4, H.263, H.264) don?t set it, so the min preroll (1000ms) will be used.
>
> Files Added:
> None.
>
> Files Modified:
> /datatype/mdf/video/format/common/mdfpayloadformat.cpp
> /datatype/mdf/video/format/common/pub/mdfpayloadformat.h
> /datatype/mdf/video/format/flv/mdfflvpayloadformat.cpp
> /datatype/mdf/video/format/flv/pub/mdfflvpayloadformat.h
> /datatype/mdf/video/format/h263/mdfh263payloadformat.cpp
> /datatype/mdf/video/format/h263/pub/mdfh263payloadformat.h
> /datatype/mdf/video/format/h264/mdfh264payloadformat.cpp
> /datatype/mdf/video/format/h264/pub/mdfh264payloadformat.h
> /datatype/mdf/video/format/mp4/mdfmp4payloadformat.cpp
> /datatype/mdf/video/format/mp4/pub/mdfmp4payloadformat.h
> /datatype/mdf/video/format/rm/mdfrvxpayloadformat.cpp
> /datatype/mdf/video/format/rm/pub/mdfrvxpayloadformat.h
> /datatype/mdf/video/format/wmv/mdfwmvpayloadformat.cpp
> /datatype/mdf/video/format/wmv/pub/mdfwmvpayloadformat.h
> /datatype/mdf/video/renderer/mdfvideoadapter.cpp
> /datatype/mdf/video/renderer/mdfvidrend.cpp
> /datatype/mdf/video/renderer/pub/mdfvideoadapter.h
> /datatype/mdf/video/renderer/pub/mdfvidrend.h
>
>
> Image Size and Heap Use impact: minor
>
> Module Release testing (STIF) : MRT subset
>
> Test case(s) Added : No.
>
> Memory leak check performed : Yes. No new leaks introduced
>
> Platforms and Profiles Build Verified:
> helix-client-s60-52-mmf-mdf-dsp
>
> Platforms and Profiles Functionality verified: armv5, winscw
>
> Branch: Cays210
>
>
>
> BR
> Yury
>
>
>
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
From Yury.Ramanovich at nokia.com Tue Jan 19 10:45:15 2010
From: Yury.Ramanovich at nokia.com (Yury.Ramanovich@nokia.com)
Date: Tue Jan 19 18:08:04 2010
Subject: [datatype-dev] RE: [Nokia-private-dev] CR needed: (Symbian) video
preroll reduction for local video playback
In-Reply-To:
References:
Message-ID:
Thanks Eric, checked in to 210Cays for now.
BR
Yury
>-----Original Message-----
>From: ext Eric Hyche [mailto:ehyche@real.com]
>Sent: Tuesday, January 19, 2010 8:56 AM
>To: Ramanovich Yury (Nokia-D/Dallas)
>Cc: datatype-dev@helixcommunity.org; nokia-private-
>dev@helixcommunity.org
>Subject: Re: [Nokia-private-dev] CR needed: (Symbian) video preroll
>reduction for local video playback
>
>Looks good.
>
>On Jan 18, 2010, at 1:55 PM, wrote:
>
>> "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@nokia.com
>>
>> Reviewed by:
>>
>> Date: 01/18/2010
>>
>> Project: SymbianMmf_wm
>>
>> ErrorId: TBD
>>
>> Synopsis: video preroll reduction for local video playback
>>
>> Overview: mdf video adapter sets min and max limits on video preroll
>for all the video formats. Currently min video preroll is 3500ms for
>most video formats and max video preroll is 12000ms. In an effort to
>reduce the time it takes to start video playback for local cases, the
>minimum video preroll is reduced to 1000s.
>>
>> Solution: Reduce mdf video min preroll for local video playback to
>1000ms for each mdf PayloadFormatPluginDevice; leave min video preroll
>for networking cases as is. A new method
>CMdfVideoRenderer::IsNetworkAccess() is introduced to distinguish
>between local and networking cases, result of of which is passed to
>CMdfVideoAdapter::Init(). Consolidated code for setting video preroll in
>CMdfVideoAdapter::SetHdrPreroll() method. Added HXBOOL bNetworkAccess
>param to GetPrerollInMs() methods for all PayloadFormatPluginDevices to
>differentiate returned min video preroll value between local and
>streaming cases for each video format. To improve code readability, also
>introduced CMdfVideoRenderer::IsStreaming() method, which is called from
>CMdfVideoRenderer::OnHeader().
>>
>> Note that min video preroll is just a lower limit for the preroll
>value that can be set by a file format. Some file formats ( like Windows
>Media and Real Video) can set their video preroll higher than minimum
>(3000-5000ms) so the higher preroll takes effect, while others ( MPEG4,
>H.263, H.264) don't set it, so the min preroll (1000ms) will be used.
>>
>> Files Added:
>> None.
>>
>> Files Modified:
>> /datatype/mdf/video/format/common/mdfpayloadformat.cpp
>> /datatype/mdf/video/format/common/pub/mdfpayloadformat.h
>> /datatype/mdf/video/format/flv/mdfflvpayloadformat.cpp
>> /datatype/mdf/video/format/flv/pub/mdfflvpayloadformat.h
>> /datatype/mdf/video/format/h263/mdfh263payloadformat.cpp
>> /datatype/mdf/video/format/h263/pub/mdfh263payloadformat.h
>> /datatype/mdf/video/format/h264/mdfh264payloadformat.cpp
>> /datatype/mdf/video/format/h264/pub/mdfh264payloadformat.h
>> /datatype/mdf/video/format/mp4/mdfmp4payloadformat.cpp
>> /datatype/mdf/video/format/mp4/pub/mdfmp4payloadformat.h
>> /datatype/mdf/video/format/rm/mdfrvxpayloadformat.cpp
>> /datatype/mdf/video/format/rm/pub/mdfrvxpayloadformat.h
>> /datatype/mdf/video/format/wmv/mdfwmvpayloadformat.cpp
>> /datatype/mdf/video/format/wmv/pub/mdfwmvpayloadformat.h
>> /datatype/mdf/video/renderer/mdfvideoadapter.cpp
>> /datatype/mdf/video/renderer/mdfvidrend.cpp
>> /datatype/mdf/video/renderer/pub/mdfvideoadapter.h
>> /datatype/mdf/video/renderer/pub/mdfvidrend.h
>>
>>
>> Image Size and Heap Use impact: minor
>>
>> Module Release testing (STIF) : MRT subset
>>
>> Test case(s) Added : No.
>>
>> Memory leak check performed : Yes. No new leaks introduced
>>
>> Platforms and Profiles Build Verified:
>> helix-client-s60-52-mmf-mdf-dsp
>>
>> Platforms and Profiles Functionality verified: armv5, winscw
>>
>> Branch: Cays210
>>
>>
>>
>> BR
>> Yury
>>
>>
>>