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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/27 15:36:47

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

Log message:
        #ifdef USE_FFMPEG.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1420&r2=1.1421
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.h?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1420
retrieving revision 1.1421
diff -u -b -r1.1420 -r1.1421
--- ChangeLog   27 Oct 2006 15:21:53 -0000      1.1420
+++ ChangeLog   27 Oct 2006 15:36:47 -0000      1.1421
@@ -1,6 +1,6 @@
 2006-10-27 Markus Gothe <address@hidden>
 
-       * server/asobj/NetStream.h: Uint8 -> uint8_t.
+       * server/asobj/NetStream.{h,cpp}: Uint8 -> uint8_t. #ifdef USE_FFMPEG.
 
 2006-10-27 Vitaly Alexeev <address@hidden>
 

Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/asobj/NetStream.cpp  27 Oct 2006 15:21:53 -0000      1.3
+++ server/asobj/NetStream.cpp  27 Oct 2006 15:36:47 -0000      1.4
@@ -36,7 +36,7 @@
 //
 //
 
-/* $Id: NetStream.cpp,v 1.3 2006/10/27 15:21:53 nihilus Exp $ */
+/* $Id: NetStream.cpp,v 1.4 2006/10/27 15:36:47 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -131,6 +131,7 @@
 void
 NetStream::play(const char* c_url)
 {
+#ifdef USE_FFMPEG
 /*     URL url(c_url);
 
        tu_file* in = globals::streamProvider.getStream(url);
@@ -273,16 +274,18 @@
 
 //     m_thread = SDL_CreateThread(NetStream::av_streamer, this);
        pthread_create(&m_thread, NULL, NetStream::av_streamer, this);
+#endif
 }
 
 // decoder thread
 void* NetStream::av_streamer(void* arg)
 {
+#ifdef USE_FFMPEG
        NetStream* ns = static_cast<NetStream*>(arg);
        raw_videodata_t* unqueued_data = NULL;
 
        ns->m_go = true;
-       uint32 last_ticks = 0;
+       uint32_t last_ticks = 0;
        while (ns->m_go)
        {
                uint32_t ticks = tu_timer::get_ticks();
@@ -306,11 +309,13 @@
   pthread_testcancel();
 
        return 0;
+#endif
 }
 
 // audio callback is running in sound handler thread
-void NetStream::audio_streamer(Uint8 *stream, int len)
+void NetStream::audio_streamer(uint8_t *stream, int len)
 {
+#ifdef USE_FFMPEG
        while (len > 0 && m_qaudio.size() > 0)
        {
                raw_videodata_t* samples = m_qaudio.front();
@@ -335,10 +340,12 @@
                        samples->m_size -= n;
                }
        }
+#endif
 }
 
 void NetStream::advance(float delta_time)
 {
+#ifdef USE_FFMPEG
        m_time_remainder += delta_time;
        if (m_time_remainder >= m_frame_time)
        {
@@ -352,8 +359,10 @@
                }
                m_time_remainder = fmod(m_time_remainder, m_frame_time);
        }
+#endif
 }
 
+#ifdef USE_FFMPEG
 raw_videodata_t* NetStream::read_frame(raw_videodata_t* unqueued_data)
 {
        raw_videodata_t* ret = NULL;
@@ -448,6 +457,7 @@
 
        return ret;
 }
+#endif
 
 YUV_video* NetStream::get_video()
 {

Index: server/asobj/NetStream.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/asobj/NetStream.h    27 Oct 2006 15:21:53 -0000      1.5
+++ server/asobj/NetStream.h    27 Oct 2006 15:36:47 -0000      1.6
@@ -36,7 +36,7 @@
 //
 //
 
-/*  $Id: NetStream.h,v 1.5 2006/10/27 15:21:53 nihilus Exp $ */
+/*  $Id: NetStream.h,v 1.6 2006/10/27 15:36:47 nihilus Exp $ */
 
 #ifndef __NETSTREAM_H__
 #define __NETSTREAM_H__
@@ -49,7 +49,9 @@
 #include <pthread.h>
 #include "impl.h"
 #include "video_stream_instance.h"
-#include "ffmpeg/avformat.h"
+#ifdef USE_FFMPEG
+#include <ffmpeg/avformat.h>
+#endif
 
 namespace gnash {
   
@@ -187,11 +189,12 @@
     bool _currentFps;
     bool _onStatus;
     bool _time;
-
+#ifdef USE_FFMPEG
                AVFormatContext *m_FormatCtx;
                AVCodecContext* m_VCodecCtx;    // video
                AVCodecContext *m_ACodecCtx;    // audio
                AVFrame* m_Frame;
+#endif
                YUV_video* m_yuv;
 
                pthread_t m_thread;