CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/01/21 17:34:28
Modified files:
. : ChangeLog
server/swf : tag_loaders.cpp
Log message:
warn only once about different stream/playback info (yes, was annoying).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5446&r2=1.5447
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.178&r2=1.179
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5446
retrieving revision 1.5447
diff -u -b -r1.5446 -r1.5447
--- ChangeLog 21 Jan 2008 16:48:22 -0000 1.5446
+++ ChangeLog 21 Jan 2008 17:34:27 -0000 1.5447
@@ -1,5 +1,7 @@
2008-01-21 Sandro Santilli <[EMAIL PROTECTED]>
+ * server/swf/tag_loaders.cpp: warn only once about different
+ stream/playback info (yes, was annoying).
* testsuite/misc-ming.all/NetStream-SquareTest.c: altought the test
shows gst is unable to load the FLV, we seem to support the
'currentFps' property now..
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -b -r1.178 -r1.179
--- server/swf/tag_loaders.cpp 16 Jan 2008 11:31:08 -0000 1.178
+++ server/swf/tag_loaders.cpp 21 Jan 2008 17:34:28 -0000 1.179
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: tag_loaders.cpp,v 1.178 2008/01/16 11:31:08 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.179 2008/01/21 17:34:28 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1325,18 +1325,36 @@
if ( playbackSoundRate != streamSoundRate )
{
- log_unimpl("Different stream/playback sound rate (%d/%d)",
+ static bool warned = false;
+ if ( ! warned )
+ {
+ log_unimpl("Different stream/playback sound rate (%d/%d)."
+ " This seems common in SWF files, so we'll warn only
once.",
streamSoundRate,playbackSoundRate);
+ warned=true;
+ }
}
if ( playbackSound16bit != streamSound16bit )
{
- log_unimpl("Different stream/playback sample size (%d/%d)",
+ static bool warned = false;
+ if ( ! warned )
+ {
+ log_unimpl("Different stream/playback sample size (%d/%d)."
+ " This seems common in SWF files, so we'll warn only
once.",
streamSound16bit?16:32, playbackSound16bit?16:32 );
+ warned=true;
+ }
}
if ( playbackSoundStereo != streamSoundStereo )
{
- log_unimpl("Different stream/playback channels (%s/%s)",
+ static bool warned = false;
+ if ( ! warned )
+ {
+ log_unimpl("Different stream/playback channels (%s/%s)."
+ " This seems common in SWF files, so we'll warn only
once.",
streamSoundStereo?"stereo":"mono",
playbackSoundStereo?"stereo":"mono" );
+ warned=true;
+ }
}
// checks if this is a new streams header or just one in the row
@@ -1347,6 +1365,8 @@
if ( ! sampleCount )
{
+ // this seems common too, we'd need to reproduce with a custom
+ // testcase to really tell if it's a problem or not...
log_error("No samples advertised for sound stream");
}
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
