[Gnash-commit] gnash ChangeLog libbase/embedVideoDecoder.h lib...

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/02/08 14:40:20

Modified files:
        .              : ChangeLog 
        libbase        : embedVideoDecoder.h embedVideoDecoderFfmpeg.cpp 
        server/asobj   : NetStreamFfmpeg.cpp NetStreamGst.cpp 
        server/parser  : video_stream_def.cpp 
        testsuite/actionscript.all: rtmp.as 

Log message:
        * libbase/embedVideoDecoder.h, libbase/embedVideoDecoderFfmpeg.cpp:
          Added more video codecs.
        * server/asobj/NetStreamFfmpeg.cpp: Check if url is readable.
        * server/asobj/NetStreamGst.cpp: Check if a NetConnection object exists.
        * server/parser/video_stream_def.cpp: Fixed a warning.
        * testsuite/actionscript.all/rtmp.as: Made it actually test something.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2274&r2=1.2275
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/embedVideoDecoder.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/embedVideoDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/rtmp.as?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2274
retrieving revision 1.2275
diff -u -b -r1.2274 -r1.2275
--- ChangeLog   8 Feb 2007 13:25:41 -0000       1.2274
+++ ChangeLog   8 Feb 2007 14:40:19 -0000       1.2275
@@ -1,5 +1,14 @@
 2007-02-08 Tomas Groth Christensen <address@hidden>
 
+       * libbase/embedVideoDecoder.h, libbase/embedVideoDecoderFfmpeg.cpp:
+         Added more video codecs.
+       * server/asobj/NetStreamFfmpeg.cpp: Check if url is readable.
+       * server/asobj/NetStreamGst.cpp: Check if a NetConnection object exists.
+       * server/parser/video_stream_def.cpp: Fixed a warning.
+       * testsuite/actionscript.all/rtmp.as: Made it actually test something.
+
+2007-02-08 Tomas Groth Christensen <address@hidden>
+
        * libbase/Makefile.am: Added embedVideoDecoder.h, 
          embedVideoDecoderFfmpeg.{h,cpp}
        * libbase/embedVideoDecoderFfmpeg.{h,cpp} Added. Decoder for embedded 
video

Index: libbase/embedVideoDecoder.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/embedVideoDecoder.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libbase/embedVideoDecoder.h 8 Feb 2007 13:25:41 -0000       1.1
+++ libbase/embedVideoDecoder.h 8 Feb 2007 14:40:20 -0000       1.2
@@ -18,7 +18,7 @@
 //
 //
 
-//  $Id: embedVideoDecoder.h,v 1.1 2007/02/08 13:25:41 tgc Exp $
+//  $Id: embedVideoDecoder.h,v 1.2 2007/02/08 14:40:20 tgc Exp $
 
 #ifndef __EMBEDVIDEODECODER_H__
 #define __EMBEDVIDEODECODER_H__
@@ -49,6 +49,8 @@
                CODEC_H263 = 2, // H263/SVQ3 video codec
                CODEC_SCREENVIDEO = 3,  // Screenvideo codec
                CODEC_VP6 = 4,          // On2 VP6 video codec
+               CODEC_VP6A = 5,         // On2 VP6 Alpha video codec
+               CODEC_SCREENVIDEO2 = 6, // Screenvideo2 codec
        };
 
        // Assign handles however you like.

Index: libbase/embedVideoDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/embedVideoDecoderFfmpeg.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libbase/embedVideoDecoderFfmpeg.cpp 8 Feb 2007 13:25:41 -0000       1.1
+++ libbase/embedVideoDecoderFfmpeg.cpp 8 Feb 2007 14:40:20 -0000       1.2
@@ -14,7 +14,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: embedVideoDecoderFfmpeg.cpp,v 1.1 2007/02/08 13:25:41 tgc Exp $
+// $Id: embedVideoDecoderFfmpeg.cpp,v 1.2 2007/02/08 14:40:20 tgc Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -47,8 +47,8 @@
        if (format == CODEC_H263) {
                codec = avcodec_find_decoder(CODEC_ID_FLV1);
        } else if (format == CODEC_VP6) {
-               codec = avcodec_find_decoder(CODEC_ID_VP6);
-       } else if (format == CODEC_SCREENVIDEO) {
+               codec = avcodec_find_decoder(CODEC_ID_VP6F);
+       } else {
                return;
        }
 

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/asobj/NetStreamFfmpeg.cpp    8 Feb 2007 13:25:41 -0000       1.14
+++ server/asobj/NetStreamFfmpeg.cpp    8 Feb 2007 14:40:20 -0000       1.15
@@ -14,7 +14,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: NetStreamFfmpeg.cpp,v 1.14 2007/02/08 13:25:41 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.15 2007/02/08 14:40:20 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -265,7 +265,12 @@
        pd->filename = "";
        pd->buf = new uint8_t[2048];
        pd->buf_size = 2048;
-       readPacket(ns, pd->buf, pd->buf_size);
+
+       if (readPacket(ns, pd->buf, pd->buf_size) < 1){
+               log_warning("Gnash could not read from movie url: %s", 
ns->url.c_str());
+               delete[] pd->buf;
+               return;
+       }
 
        AVInputFormat* inputFmt = av_probe_input_format(pd, 1);
 

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/asobj/NetStreamGst.cpp       5 Feb 2007 22:22:32 -0000       1.10
+++ server/asobj/NetStreamGst.cpp       8 Feb 2007 14:40:20 -0000       1.11
@@ -122,6 +122,15 @@
                return 0;
        }
 
+       // Does it have an associated NetConnectoin ?
+       if ( ! _netCon )
+       {
+               IF_VERBOSE_ASCODING_ERRORS(
+               log_aserror("No NetConnection associated with this NetStream, 
won't play");
+               );
+               return 0;
+       }
+
        url += c_url;
        // Remove any "mp3:" prefix. Maybe should use this to mark as audio-only
        if (url.compare(0, 4, std::string("mp3:")) == 0) {

Index: server/parser/video_stream_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/parser/video_stream_def.cpp  8 Feb 2007 13:25:42 -0000       1.2
+++ server/parser/video_stream_def.cpp  8 Feb 2007 14:40:20 -0000       1.3
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: video_stream_def.cpp,v 1.2 2007/02/08 13:25:42 tgc Exp $
+// $Id: video_stream_def.cpp,v 1.3 2007/02/08 14:40:20 tgc Exp $
 
 #include "embedVideoDecoderFfmpeg.h"
 #include "video_stream_def.h"
@@ -61,7 +61,7 @@
        }
        else if (tag == SWF::VIDEOFRAME)
        {
-               int frameNum = in->read_u16();
+               in->skip_bytes(2); //int frameNum = in->read_u16();
                int size = in->get_tag_end_position() - in->get_position();
                uint8_t* data = new uint8_t[size];
                for (int i = 0; i < size; i++)

Index: testsuite/actionscript.all/rtmp.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/rtmp.as,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/actionscript.all/rtmp.as  17 Nov 2006 08:06:24 -0000      1.3
+++ testsuite/actionscript.all/rtmp.as  8 Feb 2007 14:40:20 -0000       1.4
@@ -19,19 +19,20 @@
 //
 
 
-rcsid='$Id: rtmp.as,v 1.3 2006/11/17 08:06:24 strk Exp $';
+rcsid='$Id: rtmp.as,v 1.4 2007/02/08 14:40:20 tgc Exp $';
 
 #include "dejagnu.as"
 #include "utils.as"
 
-note("Staring...");
+note("Starting...");
 
 client_nc = new NetConnection();
 //client_nc.connect("rtmp://localhost/software/gnash/tests/1153948634.flv", 
"userx");
-client_nc.connect("rtmpt://localhost:8080/software/gnash/tests/1153948634.flv",
 "userx");
+//client_nc.connect("rtmpt://localhost:8080/software/gnash/tests/1153948634.flv",
 "userx");
+client_nc.connect("rtmpt://localhost:8080/software/gnash/tests/");
 
-var myStream = new NetStream(myConnection);
-myStream.play("fooby");
+var myStream = new NetStream(client_nc);
+myStream.play("1153948634.flv");
 
 var myVideo = new Video();
 MyVideo.attachVideo(NewStream);