[Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp b...

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/01/18 11:53:37

Modified files:
        .              : ChangeLog 
        backend        : sound_handler_sdl.cpp sound_handler_sdl.h 
        libbase        : gstgnashsrc.c gstgnashsrc.h 
        server/asobj   : NetConnection.cpp NetConnection.h 
                         NetStreamFfmpeg.cpp NetStreamFfmpeg.h 

Log message:
                * backend/sound_handler_sdl.cpp: Fixed a bug for 8=>16 bit 
conversion.
                * server/asobj/NetConnection.cpp: Removed a printf.
                * server/asobj/NetStreamFfmpeg.cpp: Stop the decoding thread 
properly,
                  hopefully fixes bug #18571.
                * misc: Tried adding some cvs id tags (again)...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2129&r2=1.2130
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.h?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/gstgnashsrc.c?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/gstgnashsrc.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2129
retrieving revision 1.2130
diff -u -b -r1.2129 -r1.2130
--- ChangeLog   17 Jan 2007 23:06:24 -0000      1.2129
+++ ChangeLog   18 Jan 2007 11:53:36 -0000      1.2130
@@ -1,3 +1,11 @@
+2007-01-18 Tomas Groth Christensen <address@hidden>
+
+       * backend/sound_handler_sdl.cpp: Fixed a bug for 8=>16 bit conversion.
+       * server/asobj/NetConnection.cpp: Removed a printf.
+       * server/asobj/NetStreamFfmpeg.cpp: Stop the decoding thread properly,
+         hopefully fixes bug #18571.
+       * misc: Tried adding some cvs id tags (again)...
+
 2007-01-18 Sandro Santilli <address@hidden>
 
        * server/asobj/xml.cpp: use fn_call interface for

Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- backend/sound_handler_sdl.cpp       21 Dec 2006 16:56:47 -0000      1.42
+++ backend/sound_handler_sdl.cpp       18 Jan 2007 11:53:37 -0000      1.43
@@ -18,6 +18,8 @@
 // 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.43 2007/01/18 11:53:37 tgc Exp $
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -592,7 +594,7 @@
        {
                // Expand from 8 bit to 16 bit.
                uint8_t*        in = (uint8_t*) data;
-               for (int i = 0; i < output_sample_count; i++)
+               for (int i = 0; i < output_sample_count; i += dup)
                {
                        uint8_t val = *in;
                        for (int j = 0; j < dup; j++)

Index: backend/sound_handler_sdl.h
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- backend/sound_handler_sdl.h 30 Nov 2006 19:54:55 -0000      1.13
+++ backend/sound_handler_sdl.h 18 Jan 2007 11:53:37 -0000      1.14
@@ -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: sound_handler_sdl.h,v 1.14 2007/01/18 11:53:37 tgc Exp $
+
 #ifndef SOUND_HANDLER_SDL_H
 #define SOUND_HANDLER_SDL_H
 

Index: libbase/gstgnashsrc.c
===================================================================
RCS file: /sources/gnash/gnash/libbase/gstgnashsrc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libbase/gstgnashsrc.c       15 Jan 2007 20:58:53 -0000      1.3
+++ libbase/gstgnashsrc.c       18 Jan 2007 11:53:37 -0000      1.4
@@ -17,7 +17,7 @@
 // Based on the filesrc and fdsrc element in Gstreamer-core.
 //
 
-/* $id$ */
+/* $Id: gstgnashsrc.c,v 1.4 2007/01/18 11:53:37 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

Index: libbase/gstgnashsrc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/gstgnashsrc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libbase/gstgnashsrc.h       15 Jan 2007 20:58:53 -0000      1.3
+++ libbase/gstgnashsrc.h       18 Jan 2007 11:53:37 -0000      1.4
@@ -17,7 +17,7 @@
 // Based on the filesrc and fdsrc element in Gstreamer-core
 //
 
-/* $id$ */
+/* $Id: gstgnashsrc.h,v 1.4 2007/01/18 11:53:37 tgc Exp $ */
 
 #ifndef __GST_GNASH_SRC_H__
 #define __GST_GNASH_SRC_H__

Index: server/asobj/NetConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/asobj/NetConnection.cpp      13 Jan 2007 20:09:25 -0000      1.15
+++ server/asobj/NetConnection.cpp      18 Jan 2007 11:53:37 -0000      1.16
@@ -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$ */
+/* $Id: NetConnection.cpp,v 1.16 2007/01/18 11:53:37 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -60,7 +60,7 @@
 /*static private*/
 int
 NetConnection::progress_callback(void *clientp, double dltotal, 
-               double dlnow, double /*ultotal*/, double /*ulnow*/)
+               double /*dlnow*/, double /*ultotal*/, double /*ulnow*/)
 {
 
        NetConnection* stream = (NetConnection*)clientp;
@@ -69,7 +69,6 @@
                stream->netStreamObj->startPlayback();
                stream->callback = false;
        }*/
-       printf("\tprogress callback, cached: %lf, totalsize: %lf\n", dlnow, 
dltotal);
        return 0;
 }
 

Index: server/asobj/NetConnection.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/asobj/NetConnection.h        13 Jan 2007 20:09:25 -0000      1.11
+++ server/asobj/NetConnection.h        18 Jan 2007 11:53:37 -0000      1.12
@@ -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$ */
+/* $Id: NetConnection.h,v 1.12 2007/01/18 11:53:37 tgc Exp $ */
 
 #ifndef __NETCONNECTION_H__
 #define __NETCONNECTION_H__

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/asobj/NetStreamFfmpeg.cpp    13 Jan 2007 20:06:17 -0000      1.5
+++ server/asobj/NetStreamFfmpeg.cpp    18 Jan 2007 11:53:37 -0000      1.6
@@ -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.5 2007/01/13 20:06:17 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.6 2007/01/18 11:53:37 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -448,8 +448,8 @@
                        }
                }
        }
-
        ns->set_status("NetStream.Play.Stop");
+       pthread_exit(0);
        return 0;
 }
 
@@ -576,7 +576,7 @@
                                video->m_stream_index = m_video_index;
 
                                // set presentation timestamp
-                               if (packet.dts != static_cast<unsigned 
long>(AV_NOPTS_VALUE))
+                               if (packet.dts != static_cast<signed 
long>(AV_NOPTS_VALUE))
                                {
                                        video->m_pts = 
as_double(m_video_stream->time_base) * packet.dts;
                                }

Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asobj/NetStreamFfmpeg.h      13 Jan 2007 20:06:17 -0000      1.2
+++ server/asobj/NetStreamFfmpeg.h      18 Jan 2007 11:53:37 -0000      1.3
@@ -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: */
+/* $Id: NetStreamFfmpeg.h,v 1.3 2007/01/18 11:53:37 tgc Exp $ */
 
 #ifndef __NETSTREAMFFMPEG_H__
 #define __NETSTREAMFFMPEG_H__