CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 07/12/03 16:50:26
Modified files:
. : ChangeLog
libmedia/sdl : MediaDecoderSdl.cpp
Log message:
* libmedia/sdl/MediaDecoderSdl.cpp: make gotAudio() and
gotVideo()
return false when decoder setup failed. With any luck, we'll
just play the decodable stream.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5069&r2=1.5070
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/MediaDecoderSdl.cpp?cvsroot=gnash&r1=1.5&r2=1.6
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5069
retrieving revision 1.5070
diff -u -b -r1.5069 -r1.5070
--- ChangeLog 3 Dec 2007 16:17:48 -0000 1.5069
+++ ChangeLog 3 Dec 2007 16:50:25 -0000 1.5070
@@ -1,3 +1,9 @@
+2007-12-03 Benjamin Wolsey <[EMAIL PROTECTED]>
+
+ * libmedia/sdl/MediaDecoderSdl.cpp: make gotAudio() and gotVideo()
+ return false when decoder setup failed. With any luck, we'll
+ just play the decodable stream.
+
2007-12-03 Sandro Santilli <[EMAIL PROTECTED]>
* server/DynamicShape.cpp (clear): set current path to NULL
Index: libmedia/sdl/MediaDecoderSdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/MediaDecoderSdl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libmedia/sdl/MediaDecoderSdl.cpp 30 Nov 2007 00:13:02 -0000 1.5
+++ libmedia/sdl/MediaDecoderSdl.cpp 3 Dec 2007 16:50:25 -0000 1.6
@@ -16,7 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-// $Id: MediaDecoderSdl.cpp,v 1.5 2007/11/30 00:13:02 tgc Exp $
+// $Id: MediaDecoderSdl.cpp,v 1.6 2007/12/03 16:50:25 bwy Exp $
#include "MediaDecoderSdl.h"
#include "AudioDecoderNellymoser.h"
@@ -69,10 +69,18 @@
if (_videoDecoder.get() != NULL) {
if (!_videoDecoder->setup(vInfo.get())) {
_videoDecoder.reset(NULL); // Delete the
videoDecoder if it is of no use
- log_error("No video decoder could be created,
since no decoder for this format is available.");
- }
+ log_error("No video decoder could be created, "
+ "since no decoder for this format "
+ "is available.");
+ }
+ else
+ {
+ // Video decoder setup succeeded
_video = true;
- } else {
+ }
+ }
+ else
+ {
log_error("No video decoder could be created, since no
decoder is enabled.");
}
}
@@ -92,12 +100,21 @@
if (_audioDecoder.get() == NULL) _audioDecoder.reset(new
AudioDecoderFfmpeg());
#endif
if (_audioDecoder.get() != NULL) {
- if (!_audioDecoder->setup(aInfo.get())) {
+ if (!_audioDecoder->setup(aInfo.get()))
+ {
_audioDecoder.reset(NULL); // Delete the
audioDecoder if it is of no use
- log_error("No audio decoder could be created,
since no decoder for this format is available.");
- }
+ log_error("No audio decoder could be created, "
+ "since no decoder for this"
+ " format is available.");
+ }
+ else
+ {
+ // Audio decoder setup succeeded
_audio = true;
- } else {
+ }
+ }
+ else
+ {
log_error("No audio decoder could be created, since no
decoder is enabled.");
}
}
@@ -108,7 +125,7 @@
bool MediaDecoderSdl::setupParser()
{
- // Buffer a bit to make sure the stream is accessable
+ // Buffer a bit to make sure the stream is accessible
if (_stream->set_position(512) != 0) {
_error = streamError;
pushOnStatus(streamNotFound);
@@ -132,6 +149,7 @@
_parser.reset(new MediaParserFfmpeg(_stream));
#endif
}
+
return _parser->setupParser();
}
@@ -155,7 +173,6 @@
if (!decoder->_running) return;
// Setup the decoder and parser
-
if (decoder->setupParser()) {
if (!decoder->setupDecoding()) {
decoder->pushOnStatus(streamNotFound);
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
