[Gnash-commit] gnash ChangeLog server/asobj/NetStream.h server...

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/01/23 21:37:16

Modified files:
        .              : ChangeLog 
        server/asobj   : NetStream.h NetStreamFfmpeg.cpp 
                         NetStreamFfmpeg.h NetStreamGst.cpp 
                         NetStreamGst.h 

Log message:
        * server/asobj/NetStream.{h,cpp}, server/asobj/NetStreamFfmpeg.{cpp.h}:
          Use int64_t instead of long.
        * server/asobj/NetStreamGst.{cpp,h}: Use int64_t instead of long.
          Switched to use gst_element_seek() for seeking, which is supported by
          older version of gstreamer.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2162&r2=1.2163
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.h?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2162
retrieving revision 1.2163
diff -u -b -r1.2162 -r1.2163
--- ChangeLog   23 Jan 2007 19:29:35 -0000      1.2162
+++ ChangeLog   23 Jan 2007 21:37:15 -0000      1.2163
@@ -1,3 +1,11 @@
+2007-01-23 Tomas Groth Christensen <address@hidden>
+
+       * server/asobj/NetStream.{h,cpp}, server/asobj/NetStreamFfmpeg.{cpp.h}:
+         Use int64_t instead of long.
+       * server/asobj/NetStreamGst.{cpp,h}: Use int64_t instead of long.
+         Switched to use gst_element_seek() for seeking, which is supported by
+         older version of gstreamer.
+
 2007-01-23 Sandro Santilli <address@hidden>
 
        * server/as_object.cpp ({get,set}_member_default):

Index: server/asobj/NetStream.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/asobj/NetStream.h    23 Jan 2007 16:41:28 -0000      1.18
+++ server/asobj/NetStream.h    23 Jan 2007 21:37:16 -0000      1.19
@@ -18,7 +18,7 @@
 //
 //
 
-/*  $Id: NetStream.h,v 1.18 2007/01/23 16:41:28 tgc Exp $ */
+/*  $Id: NetStream.h,v 1.19 2007/01/23 21:37:16 tgc Exp $ */
 
 #ifndef __NETSTREAM_H__
 #define __NETSTREAM_H__
@@ -50,7 +50,7 @@
        void set_status(const char* /*code*/){}
        void setNetCon(as_object* /*nc*/) {}
        image::image_base* get_video(){ return NULL; }
-       long time() { return 0; }
+       int64_t time() { return 0; }
 
        inline void set_parent(netstream_as_object* /*ns*/)
        {

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/asobj/NetStreamFfmpeg.cpp    23 Jan 2007 16:41:28 -0000      1.8
+++ server/asobj/NetStreamFfmpeg.cpp    23 Jan 2007 21:37:16 -0000      1.9
@@ -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.8 2007/01/23 16:41:28 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.9 2007/01/23 21:37:16 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -728,12 +728,12 @@
     log_msg("%s:unimplemented \n", __FUNCTION__);
 }
 
-long
+int64_t
 NetStreamFfmpeg::time()
 {
        if (m_FormatCtx && m_FormatCtx->nb_streams > 0) {
                double time = (double)m_FormatCtx->streams[0]->time_base.num / 
(double)m_FormatCtx->streams[0]->time_base.den * 
(double)m_FormatCtx->streams[0]->cur_dts;
-       return (long) time;
+       return static_cast<int64_t>(time);
        } else {
                return 0;
        }

Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/asobj/NetStreamFfmpeg.h      23 Jan 2007 16:41:28 -0000      1.4
+++ server/asobj/NetStreamFfmpeg.h      23 Jan 2007 21:37:16 -0000      1.5
@@ -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.4 2007/01/23 16:41:28 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.h,v 1.5 2007/01/23 21:37:16 tgc Exp $ */
 
 #ifndef __NETSTREAMFFMPEG_H__
 #define __NETSTREAMFFMPEG_H__
@@ -161,7 +161,7 @@
        void setBufferTime();
        void set_status(const char* code);
        void setNetCon(as_object* nc);
-       long time();
+       int64_t time();
 
        // Used for ffmpeg data read and seek callbacks
        static int readPacket(void* opaque, uint8_t* buf, int buf_size);

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/asobj/NetStreamGst.cpp       23 Jan 2007 16:41:28 -0000      1.5
+++ server/asobj/NetStreamGst.cpp       23 Jan 2007 21:37:16 -0000      1.6
@@ -357,8 +357,10 @@
 NetStreamGst::seek(double pos)
 {
 
-       if (!gst_element_seek_simple(pipeline, GST_FORMAT_TIME, 
GST_SEEK_FLAG_KEY_UNIT, GST_SECOND * static_cast<long>(pos))) {
-               log_warning("seek failed");
+       if (!gst_element_seek (pipeline, 1.0, GST_FORMAT_TIME, 
GST_SEEK_FLAG_FLUSH,
+               GST_SEEK_TYPE_SET, GST_SECOND * static_cast<long>(pos),
+               GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE)) {
+               log_warning("Seek failed");
        }
 }
 
@@ -368,21 +370,18 @@
     log_msg("%s:unimplemented \n", __FUNCTION__);
 }
 
-long
+int64_t
 NetStreamGst::time()
 {
 
        if (!pipeline) return 0;
 
        GstFormat fmt = GST_FORMAT_TIME;
-       long pos;
+       int64_t pos;
        GstStateChangeReturn ret;
        GstState current, pending;
 
        ret = gst_element_get_state (GST_ELEMENT (pipeline), &current, 
&pending, 0);
-//     fail_unless (ret == GST_STATE_CHANGE_ASYNC, "not changing state async");
-//     fail_unless (current == GST_STATE_READY, "bad current state");
-//     fail_unless (pending == GST_STATE_PLAYING, "bad pending state");
 
        if (current != GST_STATE_NULL && gst_element_query_position (pipeline, 
&fmt, &pos)) {
                return pos;

Index: server/asobj/NetStreamGst.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/asobj/NetStreamGst.h 23 Jan 2007 16:41:28 -0000      1.4
+++ server/asobj/NetStreamGst.h 23 Jan 2007 21:37:16 -0000      1.5
@@ -46,7 +46,7 @@
        void setBufferTime();
        void set_status(const char* code);
        void setNetCon(as_object* nc);
-       long time();
+       int64_t time();
 
        // Used for gstreamer data read and seek callbacks
        static int readPacket(void* opaque, char* buf, int buf_size);