[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libmedia/ffmpeg/sound_handler_s...
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog libmedia/ffmpeg/sound_handler_s... |
Date: |
Mon, 16 Jun 2008 16:58:49 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/06/16 16:58:49
Modified files:
. : ChangeLog
libmedia/ffmpeg: sound_handler_sdl.cpp sound_handler_sdl.h
Log message:
* libmedia/ffmpeg/sound_handler_sdl.{cpp,h}: don't fail to initialize
audio spec in the constructor not taking an audio file.
Fixes timeout running NetStream-SquareTestRunner with ffmpeg
media handler.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6947&r2=1.6948
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/sound_handler_sdl.h?cvsroot=gnash&r1=1.15&r2=1.16
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6947
retrieving revision 1.6948
diff -u -b -r1.6947 -r1.6948
--- ChangeLog 16 Jun 2008 16:30:49 -0000 1.6947
+++ ChangeLog 16 Jun 2008 16:58:48 -0000 1.6948
@@ -1,5 +1,12 @@
2008-06-16 Sandro Santilli <address@hidden>
+ * libmedia/ffmpeg/sound_handler_sdl.{cpp,h}: don't fail to initialize
+ audio spec in the constructor not taking an audio file.
+ Fixes timeout running NetStream-SquareTestRunner with ffmpeg
+ media handler.
+
+2008-06-16 Sandro Santilli <address@hidden>
+
* server/asobj/NetStreamFfmpeg.cpp (pushDecodedAudioFrames): don't
consume *all* of the audio queue if there's no sound handler..
* libmedia/MediaParser.cpp: members initialization order, debugging
Index: libmedia/ffmpeg/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/sound_handler_sdl.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libmedia/ffmpeg/sound_handler_sdl.cpp 11 Jun 2008 18:52:03 -0000
1.14
+++ libmedia/ffmpeg/sound_handler_sdl.cpp 16 Jun 2008 16:58:49 -0000
1.15
@@ -74,10 +74,9 @@
namespace gnash {
namespace media {
-SDL_sound_handler::SDL_sound_handler(const std::string& wavefile)
- : soundOpened(false),
- soundsPlaying(0),
- muted(false)
+
+void
+SDL_sound_handler::initAudioSpec()
{
// This is our sound settings
audioSpec.freq = 44100;
@@ -86,6 +85,15 @@
audioSpec.callback = SDL_sound_handler::sdl_audio_callback;
audioSpec.userdata = this;
audioSpec.samples = 2048; //512 - not enough for
videostream
+}
+
+
+SDL_sound_handler::SDL_sound_handler(const std::string& wavefile)
+ : soundOpened(false),
+ soundsPlaying(0),
+ muted(false)
+{
+ initAudioSpec();
if (! wavefile.empty() ) {
file_stream.open(wavefile.c_str());
@@ -107,6 +115,7 @@
soundsPlaying(0),
muted(false)
{
+ initAudioSpec();
}
void
Index: libmedia/ffmpeg/sound_handler_sdl.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/sound_handler_sdl.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- libmedia/ffmpeg/sound_handler_sdl.h 12 Jun 2008 19:49:36 -0000 1.15
+++ libmedia/ffmpeg/sound_handler_sdl.h 16 Jun 2008 16:58:49 -0000 1.16
@@ -321,6 +321,8 @@
/// The SDL_audio specs
SDL_AudioSpec audioSpec;
+ void initAudioSpec();
+
/// Keeps track of numbers of playing sounds
int soundsPlaying;
- [Gnash-commit] gnash ChangeLog libmedia/ffmpeg/sound_handler_s...,
Sandro Santilli <=