[Gnash-commit] gnash ChangeLog libmedia/ffmpeg/AudioDecoderFfm...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/06/05 09:40:35

Modified files:
        .              : ChangeLog 
        libmedia/ffmpeg: AudioDecoderFfmpeg.cpp VideoDecoderFfmpeg.cpp 

Log message:
        Be more verbose about codecs initialization failure.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6825&r2=1.6826
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6825
retrieving revision 1.6826
diff -u -b -r1.6825 -r1.6826
--- ChangeLog   5 Jun 2008 07:19:01 -0000       1.6825
+++ ChangeLog   5 Jun 2008 09:40:33 -0000       1.6826
@@ -1,5 +1,10 @@
 2008-06-05 Sandro Santilli <address@hidden>
 
+       * libmedia/ffmpeg/: AudioDecoderFfmpeg.cpp, VideoDecoderFfmpeg.cpp:
+         Be more verbose about codecs initialization failure.
+
+2008-06-05 Sandro Santilli <address@hidden>
+
        * libmedia/ffmpeg/MediaHandlerFfmpeg.cpp: construct VideoDecoder
          by VideoInfo (to support non-FLASH codecs).
        * libmedia/ffmpeg/VideoDecoderFfmpeg.{cpp,h}: add constructor

Index: libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libmedia/ffmpeg/AudioDecoderFfmpeg.cpp      4 Jun 2008 20:12:33 -0000       
1.5
+++ libmedia/ffmpeg/AudioDecoderFfmpeg.cpp      5 Jun 2008 09:40:35 -0000       
1.6
@@ -87,7 +87,7 @@
                //avcodec_close(_audioCodecCtx);
                av_free(_audioCodecCtx);
                _audioCodecCtx=0;
-               log_error(_("libavcodec failed to initialize codec"));
+               log_error(_("AudioDecoderFfmpeg::setup: avcodec_open: failed to 
initialize FFMPEG codec %d"), (int)codec_id);
                return false;
        }
 
@@ -106,8 +106,9 @@
        avcodec_init();
        avcodec_register_all();// change this to only register need codec?
 
+       enum CodecID codec_id = CODEC_ID_NONE;
+
        if (info->type == FLASH) {
-               enum CodecID codec_id;
 
                switch(info->codec)
                {
@@ -158,7 +159,7 @@
                //avcodec_close(_audioCodecCtx);
                av_free(_audioCodecCtx);
                _audioCodecCtx = 0;
-               log_error(_("libavcodec failed to initialize codec"));
+               log_error(_("AudioDecoderFfmpeg::setup: avcodec_open: failed to 
initialize FFMPEG codec %d"), (int)codec_id);
                return false;
        }
 

Index: libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- libmedia/ffmpeg/VideoDecoderFfmpeg.cpp      5 Jun 2008 07:19:02 -0000       
1.12
+++ libmedia/ffmpeg/VideoDecoderFfmpeg.cpp      5 Jun 2008 09:40:35 -0000       
1.13
@@ -86,7 +86,7 @@
 
   int ret = avcodec_open(_videoCodecCtx, _videoCodec);
   if (ret < 0) {
-    log_error(_("libavcodec failed to initialize codec"));
+    log_error(_("VideoDecoderFfmpeg::init: avcodec_open: failed to initialize 
FFMPEG codec %d"), (int)codecId);
     av_free(_videoCodecCtx);
     _videoCodecCtx=0;
     return;