[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libbase/Makefile.am libmedia/gs...
From: |
Tomas Groth |
Subject: |
[Gnash-commit] gnash ChangeLog libbase/Makefile.am libmedia/gs... |
Date: |
Fri, 28 Sep 2007 00:33:30 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Tomas Groth <tgc> 07/09/28 00:33:30
Modified files:
. : ChangeLog
libbase : Makefile.am
libmedia/gst : VideoDecoderGst.cpp VideoDecoderGst.h
libmedia/sdl : VideoDecoderFfmpeg.h
server/asobj : NetStreamFfmpeg.cpp
Log message:
* libbase/Makefile.am, libmedia/sdl/VideoDecoderFfmpeg.h,
server/asobj/NetStreamFfmpeg.cpp: Fix building with libmedia.
* libmedia/gst/VideoDecoderGst.{cpp,h}: Small comment update.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4455&r2=1.4456
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/VideoDecoderGst.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/VideoDecoderGst.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/VideoDecoderFfmpeg.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.92&r2=1.93
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4455
retrieving revision 1.4456
diff -u -b -r1.4455 -r1.4456
--- ChangeLog 27 Sep 2007 23:59:50 -0000 1.4455
+++ ChangeLog 28 Sep 2007 00:33:29 -0000 1.4456
@@ -1,4 +1,10 @@
-2007-09-27 Tomas Groth Christensen <address@hidden>
+2007-09-28 Tomas Groth Christensen <address@hidden>
+
+ * libbase/Makefile.am, libmedia/sdl/VideoDecoderFfmpeg.h,
+ server/asobj/NetStreamFfmpeg.cpp: Fix building with libmedia.
+ * libmedia/gst/VideoDecoderGst.{cpp,h}: Small comment update.
+
+2007-09-28 Tomas Groth Christensen <address@hidden>
* libmedia/, libmedia/sdl/, libmedia/gst/,
(in libmedia:) AudioDecoder.h, AudioDecoderSimple.{h,cpp},
Makefile.am,
Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- libbase/Makefile.am 25 Sep 2007 14:17:19 -0000 1.85
+++ libbase/Makefile.am 28 Sep 2007 00:33:30 -0000 1.86
@@ -116,7 +116,6 @@
demo.h \
dlmalloc.h \
extension.h \
- embedVideoDecoder.h \
GnashException.h \
gettext.h \
grid_index.h \
@@ -157,22 +156,6 @@
GC.h \
$(NULL)
-
-
-if USE_SOUND_GST
-libgnashbase_la_SOURCES += gstgnashsrc.c embedVideoDecoderGst.cpp
-noinst_HEADERS += gstgnashsrc.h embedVideoDecoderGst.h
-libgnashbase_la_CPPFLAGS += $(GSTREAMER_CFLAGS)
-libgnashbase_la_LIBADD += $(GSTREAMER_LIBS) -lgstbase-0.10
-endif
-
-if USE_FFMPEG_ENGINE
-libgnashbase_la_SOURCES += embedVideoDecoderFfmpeg.cpp
-noinst_HEADERS += embedVideoDecoderFfmpeg.h
-libgnashbase_la_LIBADD += $(FFMPEG_LIBS)
-libgnashbase_la_CPPFLAGS += $(FFMPEG_CFLAGS)
-endif
-
libgnashbase_la_LDFLAGS = -release $(VERSION)
libltdlc_la_CPPFLAGS = $(LTDLINCL)
Index: libmedia/gst/VideoDecoderGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/VideoDecoderGst.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/gst/VideoDecoderGst.cpp 27 Sep 2007 23:59:54 -0000 1.1
+++ libmedia/gst/VideoDecoderGst.cpp 28 Sep 2007 00:33:30 -0000 1.2
@@ -1,3 +1,4 @@
+// VideoDecoderGst.cpp: Video decoding using Gstreamer.
//
// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
//
@@ -15,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: VideoDecoderGst.cpp,v 1.1 2007/09/27 23:59:54 tgc Exp $
+// $Id: VideoDecoderGst.cpp,v 1.2 2007/09/28 00:33:30 tgc Exp $
#ifdef HAVE_CONFIG_H
#include "config.h"
Index: libmedia/gst/VideoDecoderGst.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/VideoDecoderGst.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/gst/VideoDecoderGst.h 27 Sep 2007 23:59:54 -0000 1.1
+++ libmedia/gst/VideoDecoderGst.h 28 Sep 2007 00:33:30 -0000 1.2
@@ -1,4 +1,4 @@
-// VideoDecoderGst.h: Video decoding using the FFMPEG library.
+// VideoDecoderGst.h: Video decoding using Gstreamer.
//
// Copyright (C) 2007 Free Software Foundation, Inc.
//
@@ -48,7 +48,7 @@
int /*height*/,
int /*deblocking*/,
bool /*smoothing*/,
- videoCodecType /*format*/, // should this argument be of
codecType type ?
+ videoCodecType /*format*/,
int /*outputFormat*/);
// uint8_t* decode(uint8_t* input, uint32_t inputSize, uint32_t&
outputSize);
Index: libmedia/sdl/VideoDecoderFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/VideoDecoderFfmpeg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/sdl/VideoDecoderFfmpeg.h 27 Sep 2007 23:59:55 -0000 1.1
+++ libmedia/sdl/VideoDecoderFfmpeg.h 28 Sep 2007 00:33:30 -0000 1.2
@@ -49,15 +49,16 @@
int /*height*/,
int /*deblocking*/,
bool /*smoothing*/,
- videoCodecType /*format*/, // should this argument be of
codecType type ?
+ videoCodecType /*format*/,
int /*outputFormat*/);
uint8_t* decode(uint8_t* input, uint32_t inputSize, uint32_t&
outputSize);
std::auto_ptr<image::image_base> decodeToImage(uint8_t* /*input*/,
uint32_t /*inputSize*/);
-private:
- uint8_t* convertRGB24(AVCodecContext* srcCtx, AVFrame* srcFrame);
+ static uint8_t* convertRGB24(AVCodecContext* srcCtx, AVFrame* srcFrame);
+
+private:
AVCodec* _videoCodec;
AVCodecContext* _videoCodecCtx;
Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- server/asobj/NetStreamFfmpeg.cpp 13 Sep 2007 09:47:32 -0000 1.92
+++ server/asobj/NetStreamFfmpeg.cpp 28 Sep 2007 00:33:30 -0000 1.93
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: NetStreamFfmpeg.cpp,v 1.92 2007/09/13 09:47:32 strk Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.93 2007/09/28 00:33:30 tgc Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -33,7 +33,7 @@
#include "movie_root.h"
#include "NetConnection.h"
#include "sound_handler.h"
-#include "embedVideoDecoderFfmpeg.h"
+#include "VideoDecoderFfmpeg.h"
#include <boost/scoped_array.hpp>
@@ -855,7 +855,7 @@
// Don't use depreceted img_convert, use sws_scale
} else if (m_videoFrameFormat == render::RGB &&
m_VCodecCtx->pix_fmt != PIX_FMT_RGB24) {
-
buffer.reset(embedVideoDecoderFfmpeg::convertRGB24(m_VCodecCtx, m_Frame));
+
buffer.reset(VideoDecoderFfmpeg::convertRGB24(m_VCodecCtx, m_Frame));
}
raw_mediadata_t* video = new raw_mediadata_t;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog libbase/Makefile.am libmedia/gs...,
Tomas Groth <=