[Gnash-commit] gnash ChangeLog libmedia/Makefile.am libmedia/M...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   07/11/29 20:45:01

Modified files:
        .              : ChangeLog 
        libmedia       : Makefile.am MediaBuffer.h 

Log message:
        libmedia/Makefile.am,MediaBuffer.h: build and link FFMPEG part of 
libmedia.
        
        Libmedia is still not widely used, but it does more or less work as it 
is. The
        main obstacle to implementing it in NetStream, where it would improve 
performance
        in a number of ways, is that it requires a tu_file (rather than a 
LoadingThread)
        from NetConnection. That's obviously not hard to hack up for test 
purposes, but
        isn't in the least safe as long as the tu_file in question is still 
'owned' by
        the loading thread, which other stuff relies on (not to mention 
NetStreamGst).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5018&r2=1.5019
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/Makefile.am?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/MediaBuffer.h?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5018
retrieving revision 1.5019
diff -u -b -r1.5018 -r1.5019
--- ChangeLog   29 Nov 2007 17:02:28 -0000      1.5018
+++ ChangeLog   29 Nov 2007 20:45:00 -0000      1.5019
@@ -1,3 +1,8 @@
+2007-11-29  Benjamin Wolsey <address@hidden>
+
+       * libmedia/Makefile.am,MediaBuffer.h: build and link FFMPEG part of
+         libmedia.
+
 2007-11-29  Rob Savoye  <address@hidden>
 
        * gui/am-frag/qtopia.am: Use HAVE_QT_2 instead of HAVE_QTOPIA_2.

Index: libmedia/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libmedia/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libmedia/Makefile.am        1 Oct 2007 12:39:23 -0000       1.4
+++ libmedia/Makefile.am        29 Nov 2007 20:45:01 -0000      1.5
@@ -74,11 +74,13 @@
        $(NULL)
 
 libgnashmedia_la_SOURCES = \
+       FLVParser.cpp \
        AudioDecoderNellymoser.cpp \
        AudioDecoderSimple.cpp \
        $(NULL)
 
 noinst_HEADERS = \
+       FLVParser.h \
        MediaBuffer.h \
        MediaDecoder.h \
        AudioDecoder.h \
@@ -101,10 +103,9 @@
 endif
 
 if USE_FFMPEG_ENGINE
-#libgnashmedia_la_SOURCES += sdl/MediaDecoderSdl.cpp 
sdl/AudioDecoderFfmpeg.cpp sdl/VideoDecoderFfmpeg.cpp sdl/MediaParserFfmpeg.cpp 
sdl/sound_handler_sdl.cpp
-libgnashmedia_la_SOURCES += sdl/VideoDecoderFfmpeg.cpp 
sdl/AudioDecoderFfmpeg.cpp sdl/sound_handler_sdl.cpp
+libgnashmedia_la_SOURCES += sdl/MediaDecoderSdl.cpp sdl/AudioDecoderFfmpeg.cpp 
sdl/VideoDecoderFfmpeg.cpp sdl/MediaParserFfmpeg.cpp sdl/sound_handler_sdl.cpp
 #noinst_HEADERS += sdl/MediaDecoderSdl.h sdl/AudioDecoderFfmpeg.h 
sdl/VideoDecoderFfmpeg.h sdl/MediaParserFfmpeg.h sdl/sound_handler_sdl.h
-noinst_HEADERS += sdl/AudioDecoderFfmpeg.h sdl/VideoDecoderFfmpeg.h 
sdl/sound_handler_sdl.h
+noinst_HEADERS += sdl/AudioDecoderFfmpeg.h sdl/VideoDecoderFfmpeg.h 
sdl/sound_handler_sdl.h sdl/MediaDecoderSdl.h sdl/MediaParserFfmpeg.h
 libgnashmedia_la_LIBADD += $(FFMPEG_LIBS)
 libgnashmedia_la_CPPFLAGS += $(FFMPEG_CFLAGS)
 endif

Index: libmedia/MediaBuffer.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/MediaBuffer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libmedia/MediaBuffer.h      24 Nov 2007 17:21:42 -0000      1.4
+++ libmedia/MediaBuffer.h      29 Nov 2007 20:45:01 -0000      1.5
@@ -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: MediaBuffer.h,v 1.4 2007/11/24 17:21:42 strk Exp $
+// $Id: MediaBuffer.h,v 1.5 2007/11/29 20:45:01 bwy Exp $
 
 #ifndef __MEDIABUFFER_H__
 #define __MEDIABUFFER_H__
@@ -34,7 +34,7 @@
 {
 public:
        raw_mediadata_t():
-       m_stream_index(-1),
+       //m_stream_index(-1),
        m_size(0),
        m_data(NULL),
        m_ptr(NULL),