[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog packaging/redhat/gnash.spec ser...
|
From: |
Tomas Groth |
|
Subject: |
[Gnash-commit] gnash ChangeLog packaging/redhat/gnash.spec ser... |
|
Date: |
Sat, 07 Apr 2007 11:55:51 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Tomas Groth <tgc> 07/04/07 11:55:50
Modified files:
. : ChangeLog
packaging/redhat: gnash.spec
server : video_stream_instance.cpp
server/asobj : NetConnection.cpp NetStream.h
NetStreamFfmpeg.cpp NetStreamFfmpeg.h
NetStreamGst.cpp NetStreamGst.h
Log message:
* packaging/redhat/gnash.spec: Use --enable-media instead of
--enable-sound.
* server/video_stream_instance.cpp: Delete the image once
displayed.
* server/asobj/NetStream.h: Removed the obsolete getter/setters
for onStatus.
* server/asobj/NetStreamFfmpeg.{h,cpp}: Removed the obsolete
getter/setters for onStatus. Made get_video() threadsafe.
Removed \n from log/error messages.
* server/asobj/NetStreamGst.{cpp,h}: Removed the obsolete
getter/setters for onStatus. Made get_video() threadsafe.
Removed \n from log/error messages.
* server/asobj/NetConnection.cpp: Removed \n from log/error
messages.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2805&r2=1.2806
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/redhat/gnash.spec?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.h?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.h?cvsroot=gnash&r1=1.11&r2=1.12
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2805
retrieving revision 1.2806
diff -u -b -r1.2805 -r1.2806
--- ChangeLog 7 Apr 2007 11:32:35 -0000 1.2805
+++ ChangeLog 7 Apr 2007 11:55:50 -0000 1.2806
@@ -1,3 +1,18 @@
+2007-04-07 Tomas Groth Christensen <address@hidden>
+
+ * packaging/redhat/gnash.spec: Use --enable-media instead of
+ --enable-sound.
+ * server/video_stream_instance.cpp: Delete the image once displayed.
+ * server/asobj/NetStream.h: Removed the obsolete getter/setters
+ for onStatus.
+ * server/asobj/NetStreamFfmpeg.{h,cpp}: Removed the obsolete
+ getter/setters for onStatus. Made get_video() threadsafe.
+ Removed \n from log/error messages.
+ * server/asobj/NetStreamGst.{cpp,h}: Removed the obsolete
+ getter/setters for onStatus. Made get_video() threadsafe.
+ Removed \n from log/error messages.
+ * server/asobj/NetConnection.cpp: Removed \n from log/error messages.
+
2007-04-07 Sandro Santilli <address@hidden>
* server/vm/ASHandlers.cpp (ActionCallMethod): stop warning
Index: packaging/redhat/gnash.spec
===================================================================
RCS file: /sources/gnash/gnash/packaging/redhat/gnash.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- packaging/redhat/gnash.spec 29 Mar 2007 23:55:49 -0000 1.15
+++ packaging/redhat/gnash.spec 7 Apr 2007 11:55:50 -0000 1.16
@@ -115,22 +115,22 @@
CROSS_OPTS="--build=%{_host} --host=$RPM_TARGET --target=$RPM_TARGET"
RENDERER="--enable-renderer=agg" # could be opengl
%ifarch arm
- SOUND="--disable-sound --disable-plugin --disable-klash"
+ SOUND="--disable-media --disable-plugin --disable-klash"
%else
- SOUND="--enable-sound=gst" # could also be sdl
+ SOUND="--enable-media=gst" # could also be sdl
%endif
# The OLPC is a weird case, it's basically an i386-linux toolchain
# targeted towards Fedora Core 6. The machine itself is too limited to
# build RPMs on, so we do it this way.
%if olpc
CROSS_OPTS="$CROSS_OPTS --disable-klash --disable-menus"
- SOUND="--enable-sound=sdl --with-mp3-decoder=mad --disable-static"
+ SOUND="--enable-media=mad --disable-static"
RENDERER="$RENDERER --with-pixelformat=RGB565"
%endif
%else
# Native RPM build
CROSS_OPTS="--enable-ghelp --enable-docbook"
- SOUND="--enable-sound=sdl --with-mp3-decoder=ffmpeg"
+ SOUND="--enable-media=ffmpeg"
RENDERER=""
%endif
Index: server/video_stream_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/video_stream_instance.cpp 23 Mar 2007 00:30:10 -0000 1.17
+++ server/video_stream_instance.cpp 7 Apr 2007 11:55:50 -0000 1.18
@@ -15,7 +15,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: video_stream_instance.cpp,v 1.17 2007/03/23 00:30:10 tgc Exp $
+// $Id: video_stream_instance.cpp,v 1.18 2007/04/07 11:55:50 tgc Exp $
#include "sprite_instance.h"
#include "video_stream_instance.h"
@@ -109,6 +109,7 @@
if (i)
{
gnash::render::drawVideoFrame(i, &m, &bounds);
+ delete i;
} else {
log_warning("An error occured while decoding video
frame.");
}
Index: server/asobj/NetConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/asobj/NetConnection.cpp 30 Mar 2007 13:57:27 -0000 1.35
+++ server/asobj/NetConnection.cpp 7 Apr 2007 11:55:50 -0000 1.36
@@ -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: NetConnection.cpp,v 1.35 2007/03/30 13:57:27 tgc Exp $ */
+/* $Id: NetConnection.cpp,v 1.36 2007/04/07 11:55:50 tgc Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -108,7 +108,7 @@
return false;
}
- log_msg("Connection etablished to movie: %s\n", _url.c_str());
+ log_msg("Connection etablished to movie: %s", _url.c_str());
return true;
}
Index: server/asobj/NetStream.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/asobj/NetStream.h 30 Mar 2007 13:57:27 -0000 1.25
+++ server/asobj/NetStream.h 7 Apr 2007 11:55:50 -0000 1.26
@@ -18,7 +18,7 @@
//
//
-/* $Id: NetStream.h,v 1.25 2007/03/30 13:57:27 tgc Exp $ */
+/* $Id: NetStream.h,v 1.26 2007/04/07 11:55:50 tgc Exp $ */
#ifndef __NETSTREAM_H__
#define __NETSTREAM_H__
@@ -89,10 +89,6 @@
virtual bool newFrameReady() { return false; }
- virtual as_function* getStatusHandler() { return NULL; }
-
- virtual void setStatusHandler(as_function*) { }
-
virtual void setEnvironment(as_environment* /*env*/) { };
};
Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/asobj/NetStreamFfmpeg.cpp 6 Apr 2007 22:16:36 -0000 1.30
+++ server/asobj/NetStreamFfmpeg.cpp 7 Apr 2007 11:55:50 -0000 1.31
@@ -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.30 2007/04/06 22:16:36 bjacques Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.31 2007/04/07 11:55:50 tgc Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -561,6 +561,7 @@
if (clock >= video_clock)
{
+ boost::mutex::scoped_lock lock(ns->image_mutex);
int videoFrameFormat =
gnash::render::videoFrameFormat();
if (videoFrameFormat == render::YUV) {
static_cast<image::yuv*>(ns->m_imageframe)->update(video->m_data);
@@ -643,7 +644,7 @@
}
else
{
- log_warning("read_frame: not audio & video stream\n");
+ log_warning("read_frame: not audio & video stream");
}
return true;
}
@@ -838,7 +839,22 @@
image::image_base* NetStreamFfmpeg::get_video()
{
- return m_imageframe;
+ boost::mutex::scoped_lock lock(image_mutex);
+
+ if (!m_imageframe) return NULL;
+
+ image::image_base* ret_image;
+ int videoFrameFormat = gnash::render::videoFrameFormat();
+ if (videoFrameFormat == render::YUV) {
+ ret_image = new image::yuv(m_VCodecCtx->width,
m_VCodecCtx->height);
+ } else if (videoFrameFormat == render::RGB) {
+ ret_image = new image::rgb(m_VCodecCtx->width,
m_VCodecCtx->height);
+ } else {
+ return NULL;
+ }
+
+ ret_image->update(m_imageframe->m_data);
+ return ret_image;
}
void
@@ -995,19 +1011,6 @@
}
}
-as_function*
-NetStreamFfmpeg::getStatusHandler()
-{
- return m_statusHandler.get();
-}
-
-void
-NetStreamFfmpeg::setStatusHandler(as_function* handler)
-{
- m_statusHandler = handler;
-}
-
-
} // gnash namespcae
#endif // USE_FFMPEG
Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/asobj/NetStreamFfmpeg.h 6 Apr 2007 22:16:36 -0000 1.17
+++ server/asobj/NetStreamFfmpeg.h 7 Apr 2007 11:55:50 -0000 1.18
@@ -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.h,v 1.17 2007/04/06 22:16:36 bjacques Exp $ */
+/* $Id: NetStreamFfmpeg.h,v 1.18 2007/04/07 11:55:50 tgc Exp $ */
#ifndef __NETSTREAMFFMPEG_H__
#define __NETSTREAMFFMPEG_H__
@@ -154,9 +154,8 @@
long bytesTotal();
void advance();
bool newFrameReady();
- as_function* getStatusHandler();
- void setStatusHandler(as_function*);
void setEnvironment(as_environment* env);
+
// Used for ffmpeg data read and seek callbacks
static int readPacket(void* opaque, uint8_t* buf, int buf_size);
static offset_t seekMedia(void *opaque, offset_t offset, int whence);
@@ -211,6 +210,7 @@
boost::thread *m_thread;
boost::thread *startThread;
boost::mutex decoding_mutex;
+ boost::mutex image_mutex;
// Are the playing loop running or not
volatile bool m_go;
Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/asobj/NetStreamGst.cpp 6 Apr 2007 19:56:16 -0000 1.21
+++ server/asobj/NetStreamGst.cpp 7 Apr 2007 11:55:50 -0000 1.22
@@ -227,6 +227,8 @@
NetStreamGst* ns = static_cast<NetStreamGst*>(user_data);
+ boost::mutex::scoped_lock lock(ns->image_mutex);
+
// If the video size has not yet been detected, detect them
if (ns->videowidth == 0 && ns->videoheight == 0) {
GstPad* videopad = gst_element_get_pad (ns->colorspace, "src");
@@ -372,7 +374,7 @@
// Check if the creation of the gstreamer pipeline and audiosink was a
succes
if (!ns->pipeline) {
- gnash::log_error("The gstreamer pipeline element could not be
created\n");
+ gnash::log_error("The gstreamer pipeline element could not be
created");
return;
}
@@ -391,7 +393,7 @@
if (!ns->audiosink) ns->audiosink = gst_element_factory_make
("esdsink", NULL);
if (!ns->audiosink) {
- gnash::log_error("The gstreamer audiosink element could
not be created\n");
+ gnash::log_error("The gstreamer audiosink element could
not be created");
return;
}
} else {
@@ -405,7 +407,7 @@
ns->volume = gst_element_factory_make ("volume", NULL);
if (!ns->audioconv || !ns->volume) {
- gnash::log_error("Gstreamer audio element(s) for movie handling
could not be created\n");
+ gnash::log_error("Gstreamer audio element(s) for movie handling
could not be created");
return;
}
@@ -605,7 +607,22 @@
image::image_base* NetStreamGst::get_video()
{
- return m_imageframe;
+ boost::mutex::scoped_lock lock(image_mutex);
+
+ if (!m_imageframe) return NULL;
+
+ image::image_base* ret_image;
+ int videoFrameFormat = gnash::render::videoFrameFormat();
+ if (videoFrameFormat == render::YUV) {
+ ret_image = new image::yuv(m_VCodecCtx->width,
m_VCodecCtx->height);
+ } else if (videoFrameFormat == render::RGB) {
+ ret_image = new image::rgb(m_VCodecCtx->width,
m_VCodecCtx->height);
+ } else {
+ return NULL;
+ }
+
+ ret_image->update(m_imageframe->m_data);
+ return ret_image;
}
void
@@ -756,18 +773,6 @@
}
}
-as_function*
-NetStreamGst::getStatusHandler()
-{
- return m_statusHandler.get();
-}
-
-void
-NetStreamGst::setStatusHandler(as_function* handler)
-{
- m_statusHandler = handler;
-}
-
// Gstreamer callback function
int
NetStreamGst::readPacket(void* opaque, char* buf, int buf_size){
Index: server/asobj/NetStreamGst.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/asobj/NetStreamGst.h 30 Mar 2007 13:57:27 -0000 1.11
+++ server/asobj/NetStreamGst.h 7 Apr 2007 11:55:50 -0000 1.12
@@ -53,8 +53,6 @@
long bytesTotal();
void advance();
bool newFrameReady();
- as_function* getStatusHandler();
- void setStatusHandler(as_function*);
void setEnvironment(as_environment* env);
// Used for gstreamer data read and seek callbacks
@@ -112,6 +110,7 @@
image::image_base* m_imageframe;
boost::thread *startThread;
+ boost::mutex image_mutex;
bool m_pause;
long inputPos;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog packaging/redhat/gnash.spec ser...,
Tomas Groth <=