[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libmedia/AudioDecoder.h libmedi...
|
From: |
Tomas Groth |
|
Subject: |
[Gnash-commit] gnash ChangeLog libmedia/AudioDecoder.h libmedi... |
|
Date: |
Fri, 28 Sep 2007 10:49:11 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Tomas Groth <tgc> 07/09/28 10:49:11
Modified files:
. : ChangeLog
libmedia : AudioDecoder.h AudioDecoderNellymoser.cpp
AudioDecoderNellymoser.h AudioDecoderSimple.h
MediaBuffer.h MediaDecoder.h MediaParser.h
VideoDecoder.h
libmedia/gst : VideoDecoderGst.h gstappbuffer.c gstappbuffer.h
gstappsink.c gstappsink.h gstappsrc.c
gstappsrc.h sound_handler_gst.h
libmedia/sdl : AudioDecoderFfmpeg.cpp AudioDecoderFfmpeg.h
AudioDecoderMad.cpp AudioDecoderMad.h
MediaDecoderSdl.cpp MediaDecoderSdl.h
MediaParserFfmpeg.cpp MediaParserFfmpeg.h
VideoDecoderFfmpeg.cpp VideoDecoderFfmpeg.h
sound_handler_sdl.cpp sound_handler_sdl.h
Log message:
* libmedia/AudioDecoder.h,
libmedia/AudioDecoderNellymoser.{cpp,h},
libmedia/AudioDecoderSimple.h, libmedia/MediaBuffer.h,
libmedia/MediaDecoder.h, libmedia/MediaParser.h
libmedia/VideoDecoder.h,
libmedia/gst/VideoDecoderGst.h,
libmedia/gst/gstappbuffer.{c,h},
libmedia/gst/gstappsink.{c,h}, libmedia/gst/gstappsrc.{c,h},
libmedia/gst/sound_handler_gst.h,
libmedia/sdl/AudioDecoderFfmpeg.{cpp,h},
libmedia/sdl/AudioDecoderMad.{h,cpp},
libmedia/sdl/MediaDecoderSdl.{h,cpp},
libmedia/sdl/MediaParserFfmpeg.{h,cpp},
libmedia/sdl/sound_handler_sdl.h,
libmedia/sdl/VideoDecoderFfmpeg.h: Update docs.
* libmedia/sdl/VideoDecoderFfmpeg.cpp: Fix memleak. Fixes bug
#21180.
* libmedia/sdl/sound_handler_sdl.cpp: Use the internal ADPCM
decoder.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4462&r2=1.4463
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoder.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoderNellymoser.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoderNellymoser.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoderSimple.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/MediaBuffer.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/MediaDecoder.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/MediaParser.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/VideoDecoder.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/VideoDecoderGst.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/gstappbuffer.c?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/gstappbuffer.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/gstappsink.c?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/gstappsink.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/gstappsrc.c?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/gstappsrc.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/sound_handler_gst.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/AudioDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/AudioDecoderFfmpeg.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/AudioDecoderMad.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/AudioDecoderMad.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/MediaDecoderSdl.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/MediaDecoderSdl.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/MediaParserFfmpeg.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/MediaParserFfmpeg.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/VideoDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/VideoDecoderFfmpeg.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/sound_handler_sdl.h?cvsroot=gnash&r1=1.1&r2=1.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4462
retrieving revision 1.4463
diff -u -b -r1.4462 -r1.4463
--- ChangeLog 28 Sep 2007 10:10:36 -0000 1.4462
+++ ChangeLog 28 Sep 2007 10:49:09 -0000 1.4463
@@ -1,3 +1,17 @@
+2007-09-28 Tomas Groth Christensen <address@hidden>
+
+ * libmedia/AudioDecoder.h, libmedia/AudioDecoderNellymoser.{cpp,h},
+ libmedia/AudioDecoderSimple.h, libmedia/MediaBuffer.h,
+ libmedia/MediaDecoder.h, libmedia/MediaParser.h
libmedia/VideoDecoder.h,
+ libmedia/gst/VideoDecoderGst.h, libmedia/gst/gstappbuffer.{c,h},
+ libmedia/gst/gstappsink.{c,h}, libmedia/gst/gstappsrc.{c,h},
+ libmedia/gst/sound_handler_gst.h,
libmedia/sdl/AudioDecoderFfmpeg.{cpp,h},
+ libmedia/sdl/AudioDecoderMad.{h,cpp},
libmedia/sdl/MediaDecoderSdl.{h,cpp},
+ libmedia/sdl/MediaParserFfmpeg.{h,cpp},
libmedia/sdl/sound_handler_sdl.h,
+ libmedia/sdl/VideoDecoderFfmpeg.h: Update docs.
+ * libmedia/sdl/VideoDecoderFfmpeg.cpp: Fix memleak. Fixes bug #21180.
+ * libmedia/sdl/sound_handler_sdl.cpp: Use the internal ADPCM decoder.
+
2007-09-28 Sandro Santilli <address@hidden>
* server/as_function.{cpp,h}: Add a constructor
Index: libmedia/AudioDecoder.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoder.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/AudioDecoder.h 27 Sep 2007 23:59:52 -0000 1.1
+++ libmedia/AudioDecoder.h 28 Sep 2007 10:49:10 -0000 1.2
@@ -1,3 +1,4 @@
+// AudioDecoder.h: Audio decoding base class.
//
// Copyright (C) 2007 Free Software Foundation, Inc.
//
@@ -25,14 +26,54 @@
namespace gnash {
+/// Audio decoding base class.
class AudioDecoder {
public:
AudioDecoder() {}
~AudioDecoder() {}
+ /// Sets up the decoder.
+ //
+ /// @param info
+ /// AudioInfo class with all the info needed to decode
+ /// the sound correctly.
+ ///
+ /// @return true if succesfull else false
+ ///
virtual bool setup(AudioInfo* /*info*/) { return false; }
+
+ /// Sets up the decoder.
+ //
+ /// @param info
+ /// SoundInfo class with all the info needed to decode
+ /// the audio correctly.
+ ///
+ /// @return true if succesfull else false
+ ///
virtual bool setup(SoundInfo* /*info*/) { return false; }
+
+ /// Decodes a frame and returns a pointer to the data
+ //
+ /// @param input
+ /// The audio data
+ ///
+ /// @param inputSize
+ /// The size of the video data
+ ///
+ /// @param outputSize
+ /// The output size of the video data, is passed by reference.
+ ///
+ /// @param decodedData
+ /// The amount of bytes that has been decoded when decoding is done,
+ /// is passed by reference.
+ ///
+ /// @param parse
+ /// Should we parse the audio? Needed for embedded MP3 sounds.
+ ///
+ /// @return a pointer to the decoded data, or NULL if decoding fails.
+ /// The caller owns the decoded data.
+ ///
virtual uint8_t* decode(uint8_t* /*input*/, uint32_t /*inputSize*/,
uint32_t& /*outputSize*/, uint32_t& /*decodedData*/, bool /*parse*/) { return
NULL; }
};
Index: libmedia/AudioDecoderNellymoser.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoderNellymoser.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/AudioDecoderNellymoser.cpp 27 Sep 2007 23:59:52 -0000 1.1
+++ libmedia/AudioDecoderNellymoser.cpp 28 Sep 2007 10:49:10 -0000 1.2
@@ -17,7 +17,11 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// Original copyright notice:
+// Id:
+
+// This file incorporates work covered by the following copyright and
permission
+// notice:
+
/*
* Copyright (c) 2007 a840bda5870ba11f19698ff6eb9581dfb0f95fa5,
Index: libmedia/AudioDecoderNellymoser.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoderNellymoser.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/AudioDecoderNellymoser.h 27 Sep 2007 23:59:52 -0000 1.1
+++ libmedia/AudioDecoderNellymoser.h 28 Sep 2007 10:49:10 -0000 1.2
@@ -18,7 +18,8 @@
// $Id:
-// Original copyright notice:
+// This file incorporates work covered by the following copyright and
permission
+// notice:
/*
* Copyright (c) 2007 a840bda5870ba11f19698ff6eb9581dfb0f95fa5,
@@ -67,6 +68,7 @@
namespace gnash {
+/// Audio decoding using internal Nellymoser decoder.
class AudioDecoderNellymoser : public AudioDecoder {
public:
Index: libmedia/AudioDecoderSimple.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoderSimple.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/AudioDecoderSimple.h 27 Sep 2007 23:59:53 -0000 1.1
+++ libmedia/AudioDecoderSimple.h 28 Sep 2007 10:49:10 -0000 1.2
@@ -30,6 +30,7 @@
namespace gnash {
+/// Audio decoding using "simple" internal decoders.
class AudioDecoderSimple : public AudioDecoder {
public:
Index: libmedia/MediaBuffer.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/MediaBuffer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/MediaBuffer.h 27 Sep 2007 23:59:53 -0000 1.1
+++ libmedia/MediaBuffer.h 28 Sep 2007 10:49:10 -0000 1.2
@@ -1,3 +1,4 @@
+// MediaBuffer.h: Buffer where decoded audio and video data is stored.
//
// Copyright (C) 2007 Free Software Foundation, Inc.
//
@@ -25,6 +26,9 @@
namespace gnash {
+
+/// This class is used to store decoded video or audio data
+/// while it is in the MediaBuffer.
class raw_mediadata_t
{
public:
@@ -42,11 +46,20 @@
if (m_data) delete [] m_data;
}
- int m_stream_index;
+// int m_stream_index;
+
+ /// Size of the data stored
uint32_t m_size;
+
+ /// Pointer to the data. The data is owned by this class.
uint8_t* m_data;
+
+ /// Pointer to where the data should be used from. Used with audio,
since we
+ /// don't always use all the data.
uint8_t* m_ptr;
- uint32_t m_pts; // presentation timestamp in millisec
+
+ /// Timestamp in millisec
+ uint32_t m_pts;
};
/// Threadsafe elements-owning queue
Index: libmedia/MediaDecoder.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/MediaDecoder.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/MediaDecoder.h 27 Sep 2007 23:59:53 -0000 1.1
+++ libmedia/MediaDecoder.h 28 Sep 2007 10:49:10 -0000 1.2
@@ -1,3 +1,4 @@
+// MediaDecoder.h: Media decoding base class.
//
// Copyright (C) 2007 Free Software Foundation, Inc.
//
Index: libmedia/MediaParser.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/MediaParser.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/MediaParser.h 27 Sep 2007 23:59:53 -0000 1.1
+++ libmedia/MediaParser.h 28 Sep 2007 10:49:10 -0000 1.2
@@ -1,3 +1,4 @@
+// MediaParser.h: Base class for media parsers
//
// Copyright (C) 2007 Free Software Foundation, Inc.
//
@@ -31,35 +32,67 @@
#endif
namespace gnash {
+/// The type of the codec id passed in the AudioInfo or VideoInfo class
enum codecType
{
+ /// The internal flash codec ids
FLASH,
+
+ /// Ffmpegs codecs ids
FFMPEG
};
+/// Video codec ids as defined in flash
enum videoCodecType
{
- VIDEO_CODEC_H263 = 2, // H263/SVQ3 video codec
- VIDEO_CODEC_SCREENVIDEO = 3, // Screenvideo codec
- VIDEO_CODEC_VP6 = 4, // On2 VP6 video codec
- VIDEO_CODEC_VP6A = 5, // On2 VP6 Alpha video codec
- VIDEO_CODEC_SCREENVIDEO2 = 6 // Screenvideo2 codec
+ /// H263/SVQ3 video codec
+ VIDEO_CODEC_H263 = 2,
+
+ /// Screenvideo codec
+ VIDEO_CODEC_SCREENVIDEO = 3,
+
+ /// On2 VP6 video codec
+ VIDEO_CODEC_VP6 = 4,
+
+ /// On2 VP6 Alpha video codec
+ VIDEO_CODEC_VP6A = 5,
+
+ /// Screenvideo2 codec
+ VIDEO_CODEC_SCREENVIDEO2 = 6
};
+/// Audio codec ids as defined in flash
enum audioCodecType
{
- AUDIO_CODEC_RAW = 0, // unspecified format. Useful for
8-bit sounds???
- AUDIO_CODEC_ADPCM = 1, // gnash doesn't pass this through; it
uncompresses and sends FORMAT_NATIVE16
+ /// Raw format. Useful for 8-bit sounds???
+ AUDIO_CODEC_RAW = 0,
+
+ /// ADPCM format, flash's ADPCM is a bit different for normal ADPCM
+ AUDIO_CODEC_ADPCM = 1,
+
+ /// Mp3 format
AUDIO_CODEC_MP3 = 2,
- AUDIO_CODEC_UNCOMPRESSED = 3, // 16 bits/sample, little-endian
- AUDIO_CODEC_NELLYMOSER_8HZ_MONO = 5, // According to ffmpeg
- AUDIO_CODEC_NELLYMOSER = 6 // Mystery proprietary format; see
nellymoser.com
+
+ /// 16 bits/sample, little-endian
+ AUDIO_CODEC_UNCOMPRESSED = 3,
+
+ /// Proprietary simple format
+ AUDIO_CODEC_NELLYMOSER_8HZ_MONO = 5,
+
+ /// Proprietary simple format
+ AUDIO_CODEC_NELLYMOSER = 6
};
+/// Type of frame in FLVs. Also type of the frame contained in the MediaFrame
class.
enum tagType
{
+ /// Audio frame
AUDIO_TAG = 0x08,
+
+ /// Video frame
VIDEO_TAG = 0x09,
+
+ /// Meta frame
META_TAG = 0x12
};
Index: libmedia/VideoDecoder.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/VideoDecoder.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/VideoDecoder.h 27 Sep 2007 23:59:53 -0000 1.1
+++ libmedia/VideoDecoder.h 28 Sep 2007 10:49:10 -0000 1.2
@@ -1,3 +1,4 @@
+// VideoDecoder.h: Video decoding base class.
//
// Copyright (C) 2007 Free Software Foundation, Inc.
//
@@ -25,6 +26,7 @@
namespace gnash {
+/// Video decoding base class.
class VideoDecoder {
public:
Index: libmedia/gst/VideoDecoderGst.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/VideoDecoderGst.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libmedia/gst/VideoDecoderGst.h 28 Sep 2007 00:33:30 -0000 1.2
+++ libmedia/gst/VideoDecoderGst.h 28 Sep 2007 10:49:10 -0000 1.3
@@ -36,7 +36,7 @@
namespace gnash {
-
+/// Video decoding using Gstreamer.
class VideoDecoderGst : public VideoDecoder {
public:
Index: libmedia/gst/gstappbuffer.c
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/gstappbuffer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/gst/gstappbuffer.c 27 Sep 2007 23:59:54 -0000 1.1
+++ libmedia/gst/gstappbuffer.c 28 Sep 2007 10:49:10 -0000 1.2
@@ -17,6 +17,8 @@
* Boston, MA 02111-1307, USA.
*/
+/* Id: */
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: libmedia/gst/gstappbuffer.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/gstappbuffer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/gst/gstappbuffer.h 27 Sep 2007 23:59:54 -0000 1.1
+++ libmedia/gst/gstappbuffer.h 28 Sep 2007 10:49:10 -0000 1.2
@@ -17,6 +17,8 @@
* Boston, MA 02111-1307, USA.
*/
+/* Id: */
+
#ifndef _GST_APP_BUFFER_H_
#define _GST_APP_BUFFER_H_
Index: libmedia/gst/gstappsink.c
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/gstappsink.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/gst/gstappsink.c 27 Sep 2007 23:59:54 -0000 1.1
+++ libmedia/gst/gstappsink.c 28 Sep 2007 10:49:10 -0000 1.2
@@ -17,6 +17,8 @@
* Boston, MA 02111-1307, USA.
*/
+/* Id: */
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: libmedia/gst/gstappsink.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/gstappsink.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/gst/gstappsink.h 27 Sep 2007 23:59:54 -0000 1.1
+++ libmedia/gst/gstappsink.h 28 Sep 2007 10:49:10 -0000 1.2
@@ -17,6 +17,8 @@
* Boston, MA 02111-1307, USA.
*/
+/* Id: */
+
#ifndef _GST_APP_SINK_H_
#define _GST_APP_SINK_H_
Index: libmedia/gst/gstappsrc.c
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/gstappsrc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/gst/gstappsrc.c 27 Sep 2007 23:59:54 -0000 1.1
+++ libmedia/gst/gstappsrc.c 28 Sep 2007 10:49:10 -0000 1.2
@@ -17,6 +17,8 @@
* Boston, MA 02111-1307, USA.
*/
+/* Id: */
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: libmedia/gst/gstappsrc.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/gstappsrc.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/gst/gstappsrc.h 27 Sep 2007 23:59:54 -0000 1.1
+++ libmedia/gst/gstappsrc.h 28 Sep 2007 10:49:10 -0000 1.2
@@ -17,6 +17,8 @@
* Boston, MA 02111-1307, USA.
*/
+// Id:
+
#ifndef _GST_APP_SRC_H_
#define _GST_APP_SRC_H_
Index: libmedia/gst/sound_handler_gst.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/sound_handler_gst.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/gst/sound_handler_gst.h 27 Sep 2007 23:59:54 -0000 1.1
+++ libmedia/gst/sound_handler_gst.h 28 Sep 2007 10:49:10 -0000 1.2
@@ -14,6 +14,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// Id:
+
#ifndef SOUND_HANDLER_GST_H
#define SOUND_HANDLER_GST_H
Index: libmedia/sdl/AudioDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/AudioDecoderFfmpeg.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/sdl/AudioDecoderFfmpeg.cpp 27 Sep 2007 23:59:55 -0000 1.1
+++ libmedia/sdl/AudioDecoderFfmpeg.cpp 28 Sep 2007 10:49:10 -0000 1.2
@@ -17,6 +17,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+// Id:
+
#include "AudioDecoderFfmpeg.h"
namespace gnash {
Index: libmedia/sdl/AudioDecoderFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/AudioDecoderFfmpeg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Index: libmedia/sdl/AudioDecoderMad.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/AudioDecoderMad.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/sdl/AudioDecoderMad.cpp 27 Sep 2007 23:59:55 -0000 1.1
+++ libmedia/sdl/AudioDecoderMad.cpp 28 Sep 2007 10:49:11 -0000 1.2
@@ -17,6 +17,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+// $Id:
+
#include "AudioDecoderMad.h"
#include "utility.h"
#ifdef USE_FFMPEG
Index: libmedia/sdl/AudioDecoderMad.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/AudioDecoderMad.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Index: libmedia/sdl/MediaDecoderSdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/MediaDecoderSdl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/sdl/MediaDecoderSdl.cpp 27 Sep 2007 23:59:55 -0000 1.1
+++ libmedia/sdl/MediaDecoderSdl.cpp 28 Sep 2007 10:49:11 -0000 1.2
@@ -1,3 +1,4 @@
+// MediaDecoderSdl.cpp: Media decoding using libs, used with sdl soundhandler.
//
// Copyright (C) 2007 Free Software Foundation, Inc.
//
Index: libmedia/sdl/MediaDecoderSdl.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/MediaDecoderSdl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/sdl/MediaDecoderSdl.h 27 Sep 2007 23:59:55 -0000 1.1
+++ libmedia/sdl/MediaDecoderSdl.h 28 Sep 2007 10:49:11 -0000 1.2
@@ -1,3 +1,4 @@
+// MediaDecoderSdl.h: Media decoding using libs, used with sdl soundhandler.
//
// Copyright (C) 2007 Free Software Foundation, Inc.
//
@@ -37,6 +38,7 @@
namespace gnash {
+/// Media decoding using libs, used with sdl soundhandler.
class MediaDecoderSdl: public MediaDecoder {
public:
MediaDecoderSdl(tu_file* stream, MediaBuffer* buffer, uint16_t
swfVersion, int format);
Index: libmedia/sdl/MediaParserFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/MediaParserFfmpeg.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/sdl/MediaParserFfmpeg.cpp 27 Sep 2007 23:59:55 -0000 1.1
+++ libmedia/sdl/MediaParserFfmpeg.cpp 28 Sep 2007 10:49:11 -0000 1.2
@@ -1,3 +1,4 @@
+// MediaParserFfmpeg.cpp: Media parser using ffmpeg
//
// Copyright (C) 2007 Free Software Foundation, Inc.
//
Index: libmedia/sdl/MediaParserFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/MediaParserFfmpeg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/sdl/MediaParserFfmpeg.h 27 Sep 2007 23:59:55 -0000 1.1
+++ libmedia/sdl/MediaParserFfmpeg.h 28 Sep 2007 10:49:11 -0000 1.2
@@ -1,3 +1,4 @@
+// MediaParserFfmpeg.h: Media parser using ffmpeg
//
// Copyright (C) 2007 Free Software Foundation, Inc.
//
Index: libmedia/sdl/VideoDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/VideoDecoderFfmpeg.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/sdl/VideoDecoderFfmpeg.cpp 27 Sep 2007 23:59:55 -0000 1.1
+++ libmedia/sdl/VideoDecoderFfmpeg.cpp 28 Sep 2007 10:49:11 -0000 1.2
@@ -17,6 +17,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+// $Id:
+
#include "VideoDecoderFfmpeg.h"
#ifdef HAVE_SWSCALE_H
@@ -323,6 +325,7 @@
std::auto_ptr<image::image_base> ret;
ret.reset(new image::rgb(_videoCodecCtx->width,
_videoCodecCtx->height));
ret->update(decodedData);
+ delete [] decodedData;
return ret;
}
Index: libmedia/sdl/VideoDecoderFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/VideoDecoderFfmpeg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Index: libmedia/sdl/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/sound_handler_sdl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/sdl/sound_handler_sdl.cpp 27 Sep 2007 23:59:55 -0000 1.1
+++ libmedia/sdl/sound_handler_sdl.cpp 28 Sep 2007 10:49:11 -0000 1.2
@@ -1,3 +1,5 @@
+// sound_handler_sdl.cpp: Sound handling using standard SDL
+//
// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
@@ -18,7 +20,7 @@
// Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
// which has been donated to the Public Domain.
-// $Id: sound_handler_sdl.cpp,v 1.1 2007/09/27 23:59:55 tgc Exp $
+// $Id: sound_handler_sdl.cpp,v 1.2 2007/09/28 10:49:11 tgc Exp $
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -221,7 +223,6 @@
break;
#endif
- case AUDIO_CODEC_ADPCM:
#ifdef USE_FFMPEG
sound->decoder = new AudioDecoderFfmpeg();
@@ -233,6 +234,7 @@
break;
#endif
+ case AUDIO_CODEC_ADPCM:
default:
sound->decoder = new AudioDecoderSimple();
Index: libmedia/sdl/sound_handler_sdl.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/sound_handler_sdl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/sdl/sound_handler_sdl.h 27 Sep 2007 23:59:55 -0000 1.1
+++ libmedia/sdl/sound_handler_sdl.h 28 Sep 2007 10:49:11 -0000 1.2
@@ -1,3 +1,5 @@
+// sound_handler_sdl.h: Sound handling using standard SDL
+//
// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
@@ -14,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: sound_handler_sdl.h,v 1.1 2007/09/27 23:59:55 tgc Exp $
+// $Id: sound_handler_sdl.h,v 1.2 2007/09/28 10:49:11 tgc Exp $
#ifndef SOUND_HANDLER_SDL_H
#define SOUND_HANDLER_SDL_H
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog libmedia/AudioDecoder.h libmedi...,
Tomas Groth <=