|
List Info
Thread: CR-Client: improve FLV performance
|
|
| CR-Client: improve FLV performance |
  United States |
2007-10-16 16:37:13 |
Description
--------------------------------------------
The player team uses dtdrplin to generate thumbnails.
They have observed slow performance on generating FLV
thumbnails. So after some investigation, there were two
fixes that should fairly dramatically improve their
performance:
a) There was a nasty bug in the FLV fileformat which,
although it still returned the correct packets,
it continued to read the file after StreamDone()
was returned on both streams. So this bug was
observed
in long long shutdown times for the internal dtdrive
thread. The reason for the bug was that we
improperly
determined when a stream was pending;
b) We added a HELIX_FEATURE_xxx define to turn off the
check for the presence of the Flash ActiveX player.
If this feature is defined, then it is assumed that
the Flash ActiveX player is present.
Files Modified
--------------------------------------------
datatype/flash/flv/fileformat/flv_file_format.cpp
datatype/flash/flashhost/platform/win32/flash_guest_player_a
x.cpp
datatype/flash/flashhost/flashhostlib_win32.pcf - 204cay
only
Branches
--------------------------------------------
HEAD, 150cay, 203cay, 204cay, 310Atlas
(flashhostlib_win32.pcf on 204cay only)
Index: flv_file_format.cpp
============================================================
=======
RCS file:
/cvsroot/datatype/flash/flv/fileformat/flv_file_format.cpp,v
retrieving revision 1.6.2.1.2.7
diff -u -w -r1.6.2.1.2.7 flv_file_format.cpp
--- flv_file_format.cpp 7 Sep 2007 19:44:44 -0000
1.6.2.1.2.7
+++ flv_file_format.cpp 16 Oct 2007 21:20:05 -0000
 -550,6
+550,7 
retVal = SearchIndexTable(ulFoundTime,
ulDataOffset);
if (SUCCEEDED(retVal))
{
+ HXLOGL4(HXLOG_FLVF,
"tCHXFLVFileFormat[%p]::Seek(%lu) - seek table found
offset=%lu", this, ulSeekTime,
ulDataOffset);
// The index table returned a value to start
the
// fine-grained search from, so use it.
//
 -558,6
+559,8 
}
else
{
+ HXLOGL4(HXLOG_FLVF,
"tCHXFLVFileFormat[%p]::Seek(%lu) - seek table could
NOT find offset, starting scan
at offset=%lu",
+ this, ulSeekTime,
m_cHeader.GetDataOffset());
// We have to start back at the first packet
// in the file and scan forward from there.
//
 -1619,6
+1622,7 
// Are we past the seek time?
if (m_cTagHeader.GetTimeStamp()
>= m_ulSeekTime)
{
+ HXLOGL4(HXLOG_FLVF,
"Finished seek scan up to seek time");
// We just hit the first packet
past the seek time
// so set the flag saying we
are done scanning
bDone = TRUE;
 -2584,7
+2588,8 
{
for (UINT32 i = 0; i < m_ulStreamCount; i++)
{
- if (m_pStreamInfo[i].m_bPacketRequested)
+ if (m_pStreamInfo[i].m_bPacketRequested
&&
+ !m_pStreamInfo[i].m_bStreamDone)
{
bRet = TRUE;
break;
 -2603,8
+2608,8 
{
for (UINT32 i = 0; i < m_ulStreamCount; i++)
{
- if (!m_pStreamInfo[i].m_bPacketRequested
&&
- !m_pStreamInfo[i].m_bStreamDone)
+ if (!m_pStreamInfo[i].m_bPacketRequested ||
+ m_pStreamInfo[i].m_bStreamDone)
{
bRet = FALSE;
break;
Index: flashhostlib_win32.pcf
============================================================
=======
RCS file:
/cvsroot/datatype/flash/flashhost/flashhostlib_win32.pcf,v
retrieving revision 1.2
diff -u -w -r1.2 flashhostlib_win32.pcf
--- flashhostlib_win32.pcf 12 Apr 2007 16:22:53 -0000
1.2
+++ flashhostlib_win32.pcf 16 Oct 2007 21:34:38 -0000
 -35,6
+35,8 
# ***** END LICENSE BLOCK *****
#
+project.AddDefines("HELIX_FEATURE_FLASHHOST_ASSUME_ACT
IVEX_PRESENT")
+
project.AddIncludes("pub/platform/win32")
project.AddSources("platform/win32/get_debug_string.cp
p",
"platform/win32/hxurlmoniker.cpp",
Index: platform/win32/flash_guest_player_ax.cpp
============================================================
=======
RCS file:
/cvsroot/datatype/flash/flashhost/platform/win32/flash_guest
_player_ax.cpp,v
retrieving revision 1.10.2.2.2.6
diff -u -w -r1.10.2.2.2.6 flash_guest_player_ax.cpp
--- platform/win32/flash_guest_player_ax.cpp 20 Sep 2007
16:37:17 -0000 1.10.2.2.2.6
+++ platform/win32/flash_guest_player_ax.cpp 16 Oct 2007
21:34:39 -0000
 -1299,6
+1299,9 
HXBOOL
CFlashGuestPlayerAX::IsFlashPlayerControlAvailable()
{
+#if
defined(HELIX_FEATURE_FLASHHOST_ASSUME_ACTIVEX_PRESENT)
+ HXBOOL bAvailable = TRUE;
+#else /* #if
defined(HELIX_FEATURE_FLASHHOST_ASSUME_ACTIVEX_PRESENT) */
// Initialize the ATL control hosting code
AtlAxWinInit();
 -1323,6
+1326,7 
}
CoUninitialize();
}
+#endif /* #if
defined(HELIX_FEATURE_FLASHHOST_ASSUME_ACTIVEX_PRESENT) */
return bAvailable;
}
=====================================
Eric Hyche, Technical Lead
RealNetworks, Inc.
ehyche real.com
_______________________________________________
Datatype-dev mailing list
Datatype-dev helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/da
tatype-dev
|
|
| Re: CR-Client: improve FLV performance |
  United States |
2007-10-16 18:09:31 |
Looks good, but the define in flashhostlib_win32.pcf should
be taken
out, or the file not checked in.
+project.AddDefines("HELIX_FEATURE_FLASHHOST_ASSUME_ACT
IVEX_PRESENT")
+
--christina
At 02:37 PM 10/16/2007, Eric Hyche wrote:
>Description
>--------------------------------------------
>The player team uses dtdrplin to generate thumbnails.
>They have observed slow performance on generating FLV
>thumbnails. So after some investigation, there were two
>fixes that should fairly dramatically improve their
>performance:
> a) There was a nasty bug in the FLV fileformat
which,
> although it still returned the correct packets,
> it continued to read the file after
StreamDone()
> was returned on both streams. So this bug was
observed
> in long long shutdown times for the internal
dtdrive
> thread. The reason for the bug was that we
improperly
> determined when a stream was pending;
> b) We added a HELIX_FEATURE_xxx define to turn off
the
> check for the presence of the Flash ActiveX
player.
> If this feature is defined, then it is assumed
that
> the Flash ActiveX player is present.
>
>Files Modified
>--------------------------------------------
>datatype/flash/flv/fileformat/flv_file_format.cpp
>datatype/flash/flashhost/platform/win32/flash_guest_play
er_ax.cpp
>datatype/flash/flashhost/flashhostlib_win32.pcf - 204cay
only
>
>Branches
>--------------------------------------------
>HEAD, 150cay, 203cay, 204cay, 310Atlas
>(flashhostlib_win32.pcf on 204cay only)
>
>
>Index: flv_file_format.cpp
>========================================================
===========
>RCS file:
/cvsroot/datatype/flash/flv/fileformat/flv_file_format.cpp,v
>retrieving revision 1.6.2.1.2.7
>diff -u -w -r1.6.2.1.2.7 flv_file_format.cpp
>--- flv_file_format.cpp 7 Sep 2007 19:44:44 -0000
1.6.2.1.2.7
>+++ flv_file_format.cpp 16 Oct 2007 21:20:05 -0000
> -550,6 +550,7 
> retVal = SearchIndexTable(ulFoundTime,
ulDataOffset);
> if (SUCCEEDED(retVal))
> {
>+ HXLOGL4(HXLOG_FLVF,
"tCHXFLVFileFormat[%p]::Seek(%lu)
>- seek table found offset=%lu", this, ulSeekTime,
>ulDataOffset);
> // The index table returned a value to
start the
> // fine-grained search from, so use it.
> //
> -558,6 +559,8 
> }
> else
> {
>+ HXLOGL4(HXLOG_FLVF,
"tCHXFLVFileFormat[%p]::Seek(%lu)
>- seek table could NOT find offset, starting scan
>at offset=%lu",
>+ this, ulSeekTime,
m_cHeader.GetDataOffset());
> // We have to start back at the first
packet
> // in the file and scan forward from
there.
> //
> -1619,6 +1622,7 
> // Are we past the seek time?
> if
(m_cTagHeader.GetTimeStamp() >= m_ulSeekTime)
> {
>+ HXLOGL4(HXLOG_FLVF,
"Finished seek scan
>up to seek time");
> // We just hit the first
packet past
> the seek time
> // so set the flag saying
we are done scanning
> bDone = TRUE;
> -2584,7 +2588,8 
> {
> for (UINT32 i = 0; i < m_ulStreamCount;
i++)
> {
>- if (m_pStreamInfo[i].m_bPacketRequested)
>+ if (m_pStreamInfo[i].m_bPacketRequested
&&
>+ !m_pStreamInfo[i].m_bStreamDone)
> {
> bRet = TRUE;
> break;
> -2603,8 +2608,8 
> {
> for (UINT32 i = 0; i < m_ulStreamCount;
i++)
> {
>- if (!m_pStreamInfo[i].m_bPacketRequested
&&
>- !m_pStreamInfo[i].m_bStreamDone)
>+ if (!m_pStreamInfo[i].m_bPacketRequested
||
>+ m_pStreamInfo[i].m_bStreamDone)
> {
> bRet = FALSE;
> break;
>
>Index: flashhostlib_win32.pcf
>========================================================
===========
>RCS file:
/cvsroot/datatype/flash/flashhost/flashhostlib_win32.pcf,v
>retrieving revision 1.2
>diff -u -w -r1.2 flashhostlib_win32.pcf
>--- flashhostlib_win32.pcf 12 Apr 2007 16:22:53
-0000 1.2
>+++ flashhostlib_win32.pcf 16 Oct 2007 21:34:38
-0000
> -35,6 +35,8 
> # ***** END LICENSE BLOCK *****
> #
>
>+project.AddDefines("HELIX_FEATURE_FLASHHOST_ASSUME
_ACTIVEX_PRESENT")
>+
> project.AddIncludes("pub/platform/win32")
>
project.AddSources("platform/win32/get_debug_string.cpp
",
>
"platform/win32/hxurlmoniker.cpp",
>
>Index: platform/win32/flash_guest_player_ax.cpp
>========================================================
===========
>RCS file:
>/cvsroot/datatype/flash/flashhost/platform/win32/flash_g
uest_player_ax.cpp,v
>retrieving revision 1.10.2.2.2.6
>diff -u -w -r1.10.2.2.2.6 flash_guest_player_ax.cpp
>--- platform/win32/flash_guest_player_ax.cpp 20 Sep
2007 16:37:17
>-0000 1.10.2.2.2.6
>+++ platform/win32/flash_guest_player_ax.cpp 16 Oct
2007 21:34:39 -0000
> -1299,6 +1299,9 
> HXBOOL
> CFlashGuestPlayerAX::IsFlashPlayerControlAvailable()
> {
>+#if
defined(HELIX_FEATURE_FLASHHOST_ASSUME_ACTIVEX_PRESENT)
>+ HXBOOL bAvailable = TRUE;
>+#else /* #if
defined(HELIX_FEATURE_FLASHHOST_ASSUME_ACTIVEX_PRESENT) */
> // Initialize the ATL control hosting code
> AtlAxWinInit();
>
> -1323,6 +1326,7 
> }
> CoUninitialize();
> }
>+#endif /* #if
defined(HELIX_FEATURE_FLASHHOST_ASSUME_ACTIVEX_PRESENT) */
>
> return bAvailable;
> }
>
>=====================================
>Eric Hyche, Technical Lead
>RealNetworks, Inc.
>ehyche real.com
>
>
>_______________________________________________
>Datatype-dev mailing list
>Datatype-dev helixcommunity.org
>http://lists.helixcommunity.org/mailman/listinfo/da
tatype-dev
_______________________________________________
Datatype-dev mailing list
Datatype-dev helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/da
tatype-dev
|
|
| RE: CR-Client: improve FLV performance |
  United States |
2007-10-16 22:23:32 |
As mentioned in the CR, the .pcf change
will only be checked in on 204Cay. So this
will only affect RP11 builds (where we know
that the ActiveX Flash player is always present,
since this is enforced by the RP11 installer).
This was easier than forcing the player team
to come up with their own profile.
Eric
=============================================
Eric Hyche (ehyche real.com)
Technical Lead
RealNetworks, Inc.
> -----Original Message-----
> From: Christina Dunn [mailto:cdunn real.com]
> Sent: Tuesday, October 16, 2007 7:10 PM
> To: ehyche real.com; datatype-dev lists.helixcommunity.org
> Subject: Re: [datatype-dev] CR-Client: improve FLV
performance
>
> Looks good, but the define in flashhostlib_win32.pcf
should be taken
> out, or the file not checked in.
>
>
+project.AddDefines("HELIX_FEATURE_FLASHHOST_ASSUME_ACT
IVEX_PRESENT")
> +
>
> --christina
>
> At 02:37 PM 10/16/2007, Eric Hyche wrote:
>
> >Description
> >--------------------------------------------
> >The player team uses dtdrplin to generate
thumbnails.
> >They have observed slow performance on generating
FLV
> >thumbnails. So after some investigation, there were
two
> >fixes that should fairly dramatically improve
their
> >performance:
> > a) There was a nasty bug in the FLV fileformat
which,
> > although it still returned the correct
packets,
> > it continued to read the file after
StreamDone()
> > was returned on both streams. So this bug
was observed
> > in long long shutdown times for the
internal dtdrive
> > thread. The reason for the bug was that we
improperly
> > determined when a stream was pending;
> > b) We added a HELIX_FEATURE_xxx define to turn
off the
> > check for the presence of the Flash ActiveX
player.
> > If this feature is defined, then it is
assumed that
> > the Flash ActiveX player is present.
> >
> >Files Modified
> >--------------------------------------------
> >datatype/flash/flv/fileformat/flv_file_format.cpp
>
>datatype/flash/flashhost/platform/win32/flash_guest_play
er_ax.cpp
> >datatype/flash/flashhost/flashhostlib_win32.pcf -
204cay only
> >
> >Branches
> >--------------------------------------------
> >HEAD, 150cay, 203cay, 204cay, 310Atlas
> >(flashhostlib_win32.pcf on 204cay only)
> >
> >
> >Index: flv_file_format.cpp
>
>========================================================
===========
> >RCS file:
>
/cvsroot/datatype/flash/flv/fileformat/flv_file_format.cpp,v
> >retrieving revision 1.6.2.1.2.7
> >diff -u -w -r1.6.2.1.2.7 flv_file_format.cpp
> >--- flv_file_format.cpp 7 Sep 2007 19:44:44 -0000
1.6.2.1.2.7
> >+++ flv_file_format.cpp 16 Oct 2007 21:20:05 -0000
> > -550,6 +550,7 
> > retVal = SearchIndexTable(ulFoundTime,
ulDataOffset);
> > if (SUCCEEDED(retVal))
> > {
> >+ HXLOGL4(HXLOG_FLVF,
"tCHXFLVFileFormat[%p]::Seek(%lu)
> >- seek table found offset=%lu", this,
ulSeekTime,
> >ulDataOffset);
> > // The index table returned a value
to start the
> > // fine-grained search from, so use
it.
> > //
> > -558,6 +559,8 
> > }
> > else
> > {
> >+ HXLOGL4(HXLOG_FLVF,
"tCHXFLVFileFormat[%p]::Seek(%lu)
> >- seek table could NOT find offset, starting scan
> >at offset=%lu",
> >+ this, ulSeekTime,
m_cHeader.GetDataOffset());
> > // We have to start back at the first
packet
> > // in the file and scan forward from
there.
> > //
> > -1619,6 +1622,7 
> > // Are we past the seek
time?
> > if
(m_cTagHeader.GetTimeStamp() >=
> m_ulSeekTime)
> > {
> >+ HXLOGL4(HXLOG_FLVF,
"Finished seek scan
> >up to seek time");
> > // We just hit the
first packet past
> > the seek time
> > // so set the flag
saying we
> are done scanning
> > bDone = TRUE;
> > -2584,7 +2588,8 
> > {
> > for (UINT32 i = 0; i <
m_ulStreamCount; i++)
> > {
> >- if
(m_pStreamInfo[i].m_bPacketRequested)
> >+ if
(m_pStreamInfo[i].m_bPacketRequested &&
> >+ !m_pStreamInfo[i].m_bStreamDone)
> > {
> > bRet = TRUE;
> > break;
> > -2603,8 +2608,8 
> > {
> > for (UINT32 i = 0; i <
m_ulStreamCount; i++)
> > {
> >- if
(!m_pStreamInfo[i].m_bPacketRequested &&
> >- !m_pStreamInfo[i].m_bStreamDone)
> >+ if
(!m_pStreamInfo[i].m_bPacketRequested ||
> >+ m_pStreamInfo[i].m_bStreamDone)
> > {
> > bRet = FALSE;
> > break;
> >
> >Index: flashhostlib_win32.pcf
>
>========================================================
===========
> >RCS file:
/cvsroot/datatype/flash/flashhost/flashhostlib_win32.pcf,v
> >retrieving revision 1.2
> >diff -u -w -r1.2 flashhostlib_win32.pcf
> >--- flashhostlib_win32.pcf 12 Apr 2007
16:22:53 -0000 1.2
> >+++ flashhostlib_win32.pcf 16 Oct 2007
21:34:38 -0000
> > -35,6 +35,8 
> > # ***** END LICENSE BLOCK *****
> > #
> >
>
>+project.AddDefines("HELIX_FEATURE_FLASHHOST_ASSUME
_ACTIVEX_PRESENT")
> >+
> >
project.AddIncludes("pub/platform/win32")
> >
project.AddSources("platform/win32/get_debug_string.cpp
",
> >
"platform/win32/hxurlmoniker.cpp",
> >
> >Index: platform/win32/flash_guest_player_ax.cpp
>
>========================================================
===========
> >RCS file:
>
>/cvsroot/datatype/flash/flashhost/platform/win32/flash_g
uest_
> player_ax.cpp,v
> >retrieving revision 1.10.2.2.2.6
> >diff -u -w -r1.10.2.2.2.6
flash_guest_player_ax.cpp
> >--- platform/win32/flash_guest_player_ax.cpp 20
Sep 2007 16:37:17
> >-0000 1.10.2.2.2.6
> >+++ platform/win32/flash_guest_player_ax.cpp 16
Oct 2007
> 21:34:39 -0000
> > -1299,6 +1299,9 
> > HXBOOL
> >
CFlashGuestPlayerAX::IsFlashPlayerControlAvailable()
> > {
> >+#if
defined(HELIX_FEATURE_FLASHHOST_ASSUME_ACTIVEX_PRESENT)
> >+ HXBOOL bAvailable = TRUE;
> >+#else /* #if
> defined(HELIX_FEATURE_FLASHHOST_ASSUME_ACTIVEX_PRESENT)
*/
> > // Initialize the ATL control hosting code
> > AtlAxWinInit();
> >
> > -1323,6 +1326,7 
> > }
> > CoUninitialize();
> > }
> >+#endif /* #if
> defined(HELIX_FEATURE_FLASHHOST_ASSUME_ACTIVEX_PRESENT)
*/
> >
> > return bAvailable;
> > }
> >
> >=====================================
> >Eric Hyche, Technical Lead
> >RealNetworks, Inc.
> >ehyche real.com
> >
> >
> >_______________________________________________
> >Datatype-dev mailing list
> >Datatype-dev helixcommunity.org
> >http://lists.helixcommunity.org/mailman/listinfo/da
tatype-dev
>
>
_______________________________________________
Datatype-dev mailing list
Datatype-dev helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/da
tatype-dev
|
|
| CN-Client: improve FLV performance |
  United States |
2007-10-17 09:19:04 |
Thanks, Christina.
datatype/flash/flashhost/platform/win32/flash_guest_player_a
x.cpp
and datatype/flash/flashhost/flashhostlib_win32.pcf changes
are now checked into 204Cay only.
datatype/flash/flv/fileformat/flv_file_format.cpp changes
are
now checked into HEAD, 150Cay, 203Cay, 204Cay, and
310Atlas.
Eric
=============================================
Eric Hyche (ehyche real.com)
Technical Lead
RealNetworks, Inc.
> -----Original Message-----
> From: datatype-dev-bounces helixcommunity.org
> [mailto:datatype-dev-bounces helixcommunity.org] On
Behalf Of
> Eric Hyche
> Sent: Tuesday, October 16, 2007 11:24 PM
> To: 'Christina Dunn'; datatype-dev lists.helixcommunity.org
> Subject: RE: [datatype-dev] CR-Client: improve FLV
performance
>
>
> As mentioned in the CR, the .pcf change
> will only be checked in on 204Cay. So this
> will only affect RP11 builds (where we know
> that the ActiveX Flash player is always present,
> since this is enforced by the RP11 installer).
>
> This was easier than forcing the player team
> to come up with their own profile.
>
> Eric
>
> =============================================
> Eric Hyche (ehyche real.com)
> Technical Lead
> RealNetworks, Inc.
>
> > -----Original Message-----
> > From: Christina Dunn [mailto:cdunn real.com]
> > Sent: Tuesday, October 16, 2007 7:10 PM
> > To: ehyche real.com; datatype-dev lists.helixcommunity.org
> > Subject: Re: [datatype-dev] CR-Client: improve FLV
performance
> >
> > Looks good, but the define in
flashhostlib_win32.pcf should
> be taken
> > out, or the file not checked in.
> >
> >
>
+project.AddDefines("HELIX_FEATURE_FLASHHOST_ASSUME_ACT
IVEX_PRESENT")
> > +
> >
> > --christina
> >
> > At 02:37 PM 10/16/2007, Eric Hyche wrote:
> >
> > >Description
> > >--------------------------------------------
> > >The player team uses dtdrplin to generate
thumbnails.
> > >They have observed slow performance on
generating FLV
> > >thumbnails. So after some investigation, there
were two
> > >fixes that should fairly dramatically improve
their
> > >performance:
> > > a) There was a nasty bug in the FLV
fileformat which,
> > > although it still returned the correct
packets,
> > > it continued to read the file after
StreamDone()
> > > was returned on both streams. So this
bug was observed
> > > in long long shutdown times for the
internal dtdrive
> > > thread. The reason for the bug was
that we improperly
> > > determined when a stream was pending;
> > > b) We added a HELIX_FEATURE_xxx define to
turn off the
> > > check for the presence of the Flash
ActiveX player.
> > > If this feature is defined, then it is
assumed that
> > > the Flash ActiveX player is present.
> > >
> > >Files Modified
> > >--------------------------------------------
> >
>datatype/flash/flv/fileformat/flv_file_format.cpp
> >
>datatype/flash/flashhost/platform/win32/flash_guest_play
er_ax.cpp
> >
>datatype/flash/flashhost/flashhostlib_win32.pcf - 204cay
only
> > >
> > >Branches
> > >--------------------------------------------
> > >HEAD, 150cay, 203cay, 204cay, 310Atlas
> > >(flashhostlib_win32.pcf on 204cay only)
> > >
> > >
> > >Index: flv_file_format.cpp
> >
>========================================================
===========
> > >RCS file:
> >
/cvsroot/datatype/flash/flv/fileformat/flv_file_format.cpp,v
> > >retrieving revision 1.6.2.1.2.7
> > >diff -u -w -r1.6.2.1.2.7 flv_file_format.cpp
> > >--- flv_file_format.cpp 7 Sep 2007 19:44:44
-0000 1.6.2.1.2.7
> > >+++ flv_file_format.cpp 16 Oct 2007 21:20:05
-0000
> > > -550,6 +550,7 
> > > retVal =
SearchIndexTable(ulFoundTime, ulDataOffset);
> > > if (SUCCEEDED(retVal))
> > > {
> > >+ HXLOGL4(HXLOG_FLVF,
> "tCHXFLVFileFormat[%p]::Seek(%lu)
> > >- seek table found offset=%lu", this,
ulSeekTime,
> > >ulDataOffset);
> > > // The index table returned a
value to start the
> > > // fine-grained search from, so
use it.
> > > //
> > > -558,6 +559,8 
> > > }
> > > else
> > > {
> > >+ HXLOGL4(HXLOG_FLVF,
> "tCHXFLVFileFormat[%p]::Seek(%lu)
> > >- seek table could NOT find offset, starting
scan
> > >at offset=%lu",
> > >+ this, ulSeekTime,
m_cHeader.GetDataOffset());
> > > // We have to start back at the
first packet
> > > // in the file and scan forward
from there.
> > > //
> > > -1619,6 +1622,7 
> > > // Are we past the
seek time?
> > > if
(m_cTagHeader.GetTimeStamp() >=
> > m_ulSeekTime)
> > > {
> > >+
HXLOGL4(HXLOG_FLVF, "Finished
> seek scan
> > >up to seek time");
> > > // We just hit
the first packet past
> > > the seek time
> > > // so set the
flag saying we
> > are done scanning
> > > bDone = TRUE;
> > > -2584,7 +2588,8 
> > > {
> > > for (UINT32 i = 0; i <
m_ulStreamCount; i++)
> > > {
> > >- if
(m_pStreamInfo[i].m_bPacketRequested)
> > >+ if
(m_pStreamInfo[i].m_bPacketRequested &&
> > >+
!m_pStreamInfo[i].m_bStreamDone)
> > > {
> > > bRet = TRUE;
> > > break;
> > > -2603,8 +2608,8 
> > > {
> > > for (UINT32 i = 0; i <
m_ulStreamCount; i++)
> > > {
> > >- if
(!m_pStreamInfo[i].m_bPacketRequested &&
> > >-
!m_pStreamInfo[i].m_bStreamDone)
> > >+ if
(!m_pStreamInfo[i].m_bPacketRequested ||
> > >+
m_pStreamInfo[i].m_bStreamDone)
> > > {
> > > bRet = FALSE;
> > > break;
> > >
> > >Index: flashhostlib_win32.pcf
> >
>========================================================
===========
> > >RCS file:
>
/cvsroot/datatype/flash/flashhost/flashhostlib_win32.pcf,v
> > >retrieving revision 1.2
> > >diff -u -w -r1.2 flashhostlib_win32.pcf
> > >--- flashhostlib_win32.pcf 12 Apr 2007
16:22:53 -0000 1.2
> > >+++ flashhostlib_win32.pcf 16 Oct 2007
21:34:38 -0000
> > > -35,6 +35,8 
> > > # ***** END LICENSE BLOCK *****
> > > #
> > >
> >
>
>+project.AddDefines("HELIX_FEATURE_FLASHHOST_ASSUME
_ACTIVEX_PRESENT")
> > >+
> > >
project.AddIncludes("pub/platform/win32")
> > >
project.AddSources("platform/win32/get_debug_string.cpp
",
> > >
"platform/win32/hxurlmoniker.cpp",
> > >
> > >Index:
platform/win32/flash_guest_player_ax.cpp
> >
>========================================================
===========
> > >RCS file:
> >
>/cvsroot/datatype/flash/flashhost/platform/win32/flash_g
uest_
> > player_ax.cpp,v
> > >retrieving revision 1.10.2.2.2.6
> > >diff -u -w -r1.10.2.2.2.6
flash_guest_player_ax.cpp
> > >--- platform/win32/flash_guest_player_ax.cpp
20 Sep
> 2007 16:37:17
> > >-0000 1.10.2.2.2.6
> > >+++ platform/win32/flash_guest_player_ax.cpp
16 Oct 2007
> > 21:34:39 -0000
> > > -1299,6 +1299,9 
> > > HXBOOL
> > >
CFlashGuestPlayerAX::IsFlashPlayerControlAvailable()
> > > {
> > >+#if
defined(HELIX_FEATURE_FLASHHOST_ASSUME_ACTIVEX_PRESENT)
> > >+ HXBOOL bAvailable = TRUE;
> > >+#else /* #if
> >
defined(HELIX_FEATURE_FLASHHOST_ASSUME_ACTIVEX_PRESENT) */
> > > // Initialize the ATL control hosting
code
> > > AtlAxWinInit();
> > >
> > > -1323,6 +1326,7 
> > > }
> > > CoUninitialize();
> > > }
> > >+#endif /* #if
> >
defined(HELIX_FEATURE_FLASHHOST_ASSUME_ACTIVEX_PRESENT) */
> > >
> > > return bAvailable;
> > > }
> > >
> > >=====================================
> > >Eric Hyche, Technical Lead
> > >RealNetworks, Inc.
> > >ehyche real.com
> > >
> > >
> >
>_______________________________________________
> > >Datatype-dev mailing list
> > >Datatype-dev helixcommunity.org
> > >http://lists.helixcommunity.org/mailman/listinfo/da
tatype-dev
> >
> >
>
>
> _______________________________________________
> Datatype-dev mailing list
> Datatype-dev helixcommunity.org
> http://lists.helixcommunity.org/mailman/listinfo/da
tatype-dev
>
_______________________________________________
Datatype-dev mailing list
Datatype-dev helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/da
tatype-dev
|
|
[1-4]
|
|