XBMC Media Center

Revision: 9207
          http://svn.sourceforge.net/xbmc/?rev=9207&view=rev
Author:   vulkanr
Date:     2007-06-03 17:19:26 -0700 (Sun, 03 Jun 2007)

Log Message:
-----------
fixed problems with .so loading,
called avcodec register method on load,
fixed issues with ALSA sound,
dvdplayer plays sound. soon - it will play video too.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibDts.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibMad.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLiba52.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DllAvCodec.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DllPostProc.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DllAvFormat.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp

Removed Paths:
-------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/ffmpeg/inttypes.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/ffmpeg/stdint.h

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.cpp	2007-06-03 21:42:14 UTC (rev 9206)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.cpp	2007-06-04 00:19:26 UTC (rev 9207)
@@ -86,7 +86,7 @@
   nErr = snd_pcm_hw_params_set_period_size_near(m_pPlayHandle, hw_params, &m_maxFrames, 0);
   CHECK_ALSA_RETURN(LOGERROR,"hw_params_set_period_size",nErr);
 
-  snd_pcm_uframes_t buffer_size = m_maxFrames * (2 * iChannels) * 2; // buffer big enough for 2 periods
+  snd_pcm_uframes_t buffer_size = m_dwPacketSize * 20; // buffer big enough
   nErr = snd_pcm_hw_params_set_buffer_size_near(m_pPlayHandle, hw_params, &buffer_size);
   CHECK_ALSA_RETURN(LOGERROR,"hw_params_set_buffer_size",nErr);
 
@@ -212,20 +212,29 @@
   if (!m_pPlayHandle || snd_pcm_avail_update(m_pPlayHandle) < ( len / (2*m_uiChannels)) )
        return 0;
 
-  int framesToWrite = len / (2*m_uiChannels); 
-  int writeResult = snd_pcm_writei(m_pPlayHandle, data, framesToWrite);
+  unsigned char *pcmPtr = data;
+  while ( pcmPtr < data + len) {
+       int nPeriodSize = (m_maxFrames * 2 * m_uiChannels); // write a frame.
+       if ( pcmPtr + nPeriodSize >  data + len) {
+               nPeriodSize = data + len - pcmPtr;
+       }
 
-  if (  writeResult == -EPIPE  ) {
-       CLog::Log(LOGDEBUG, "PAPlayer::AddPacketsToStream - buffer underun (tried to write %d frames)",
-                  framesToWrite);
-       int err = snd_pcm_prepare(m_pPlayHandle);
-       CHECK_ALSA(LOGERROR,"prepare after EPIPE", err);
-  }
-  else if (writeResult != framesToWrite) {
-       CLog::Log(LOGERROR, "PAPlayer::AddPacketsToStream - failed to write %d frames. "
+       int framesToWrite = nPeriodSize / (2 * m_uiChannels);
+       int writeResult = snd_pcm_writei(m_pPlayHandle, pcmPtr, framesToWrite);
+       if (  writeResult == -EPIPE  ) {
+               CLog::Log(LOGDEBUG, "CALSADirectSound::AddPackets - buffer underun (tried to write %d frames)",
+                       framesToWrite);
+               int err = snd_pcm_prepare(m_pPlayHandle);
+               CHECK_ALSA(LOGERROR,"prepare after EPIPE", err);
+       }
+       else if (writeResult != framesToWrite) {
+               CLog::Log(LOGERROR, "CALSADirectSound::AddPackets - failed to write %d frames. "
                        "bad write (err: %d) - %s",
                        framesToWrite, writeResult, snd_strerror(writeResult));
-       return 0;
+               break;
+       }
+
+       pcmPtr += nPeriodSize;
   }
 
   return len;

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h	2007-06-03 21:42:14 UTC (rev 9206)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h	2007-06-04 00:19:26 UTC (rev 9207)
@@ -29,4 +29,5 @@
   
   DllAvCodec m_dllAvCodec;
   DllAvUtil m_dllAvUtil;
+
 };

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibDts.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibDts.h	2007-06-03 21:42:14 UTC (rev 9206)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibDts.h	2007-06-04 00:19:26 UTC (rev 9207)
@@ -33,7 +33,11 @@
 
 class DllLibDts : public DllDynamic, DllLibDtsInterface
 {
+#ifndef _LINUX
   DECLARE_DLL_WRAPPER(DllLibDts, Q:\\system\\players\\dvdplayer\\libdts.dll)
+#else
+  DECLARE_DLL_WRAPPER(DllLibDts, Q:\\system\\players\\dvdplayer\\libdts-i486-linux.so)
+#endif
   DEFINE_METHOD1(dts_state_t *, dts_init, (uint32_t p1))
   DEFINE_METHOD6(int, dts_syncinfo, (dts_state_t *p1, uint8_t * p2, int * p3, int * p4, int * p5, int *p6))
   DEFINE_METHOD5(int, dts_frame, (dts_state_t * p1, uint8_t * p2, int * p3, level_t * p4, sample_t p5))

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h	2007-06-03 21:42:14 UTC (rev 9206)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h	2007-06-04 00:19:26 UTC (rev 9207)
@@ -17,7 +17,11 @@
 
 class DllLibFaad : public DllDynamic, DllLibFaadInterface
 {
+#ifndef _LINUX
   DECLARE_DLL_WRAPPER(DllLibFaad, Q:\\system\\players\\dvdplayer\\libfaad.dll)
+#else
+  DECLARE_DLL_WRAPPER(DllLibFaad, Q:\\system\\players\\dvdplayer\\libfaad-i486-linux.so)
+#endif
   DEFINE_METHOD0(faacDecHandle, faacDecOpen)
   DEFINE_METHOD1(faacDecConfigurationPtr, faacDecGetCurrentConfiguration, (faacDecHandle p1))
   DEFINE_METHOD2(unsigned char, faacDecSetConfiguration, (faacDecHandle p1, faacDecConfigurationPtr p2))

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibMad.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibMad.h	2007-06-03 21:42:14 UTC (rev 9206)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibMad.h	2007-06-04 00:19:26 UTC (rev 9207)
@@ -17,7 +17,11 @@
 
 class DllLibMad : public DllDynamic, DllLibMadInterface
 {
+#ifndef _LINUX
   DECLARE_DLL_WRAPPER(DllLibMad, Q:\\system\\players\\dvdplayer\\libmad.dll)
+#else
+  DECLARE_DLL_WRAPPER(DllLibMad, Q:\\system\\players\\dvdplayer\\libmad-i486-linux.so)
+#endif
   DEFINE_METHOD1(void, mad_synth_init, (struct mad_synth * p1))
   DEFINE_METHOD1(void, mad_stream_init, (struct mad_stream * p1))
   DEFINE_METHOD1(void, mad_frame_init, (struct mad_frame * p1))

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLiba52.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLiba52.h	2007-06-03 21:42:14 UTC (rev 9206)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLiba52.h	2007-06-04 00:19:26 UTC (rev 9207)
@@ -23,7 +23,11 @@
 
 class DllLiba52 : public DllDynamic, DllLiba52Interface
 {
+#ifndef _LINUX
   DECLARE_DLL_WRAPPER(DllLiba52, Q:\\system\\players\\dvdplayer\\liba52.dll)
+#else
+  DECLARE_DLL_WRAPPER(DllLiba52, Q:\\system\\players\\dvdplayer\\liba52-i486-linux.so)
+#endif
   DEFINE_METHOD1(a52_state_t *, a52_init, (uint32_t p1))
   DEFINE_METHOD1(sample_t *, a52_samples, (a52_state_t *p1))
   DEFINE_METHOD4(int, a52_syncinfo, (uint8_t * p1, int * p2, int * p3, int * p4))

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DllAvCodec.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DllAvCodec.h	2007-06-03 21:42:14 UTC (rev 9206)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DllAvCodec.h	2007-06-04 00:19:26 UTC (rev 9207)
@@ -19,6 +19,7 @@
 class DllAvCodecInterface
 {
 public:
+  virtual void avcodec_register_all(void)=0;
   virtual void avcodec_flush_buffers(AVCodecContext *avctx)=0;
   virtual int avcodec_open(AVCodecContext *avctx, AVCodec *codec)=0;
   virtual AVCodec *avcodec_find_decoder(enum CodecID id)=0;
@@ -47,8 +48,8 @@
 
 class DllAvCodec : public DllDynamic, DllAvCodecInterface
 {
+#ifndef _LINUX
   DECLARE_DLL_WRAPPER(DllAvCodec, Q:\\system\\players\\dvdplayer\\avcodec-51.dll)
-#ifndef _LINUX
   DEFINE_FUNC_ALIGNED1(void, __cdecl, avcodec_flush_buffers, AVCodecContext*)
   DEFINE_FUNC_ALIGNED2(int, __cdecl, avcodec_open, AVCodecContext*, AVCodec *)
   DEFINE_FUNC_ALIGNED5(int, __cdecl, avcodec_decode_video, AVCodecContext*, AVFrame*, int*, uint8_t*, int)
@@ -59,6 +60,8 @@
   DEFINE_FUNC_ALIGNED8(int, __cdecl, av_parser_parse, AVCodecParserContext*,AVCodecContext*, uint8_t**, int*, const uint8_t*, int, int64_t, int64_t)
   DEFINE_FUNC_ALIGNED3(void, __cdecl, img_resample, ImgReSampleContext*, AVPicture*, const AVPicture*)
 #else
+
+  DECLARE_DLL_WRAPPER(DllAvCodec, Q:\\system\\players\\dvdplayer\\avcodec-51-i486-linux.so)
   DEFINE_METHOD1(void, avcodec_flush_buffers, (AVCodecContext* p1))
   DEFINE_METHOD2(int, avcodec_open, (AVCodecContext* p1, AVCodec *p2))
   DEFINE_METHOD5(int, avcodec_decode_video, (AVCodecContext* p1, AVFrame *p2, int *p3, uint8_t *p4, int p5))
@@ -70,6 +73,7 @@
   DEFINE_METHOD3(void, img_resample, (ImgReSampleContext* p1, AVPicture* p2, const AVPicture* p3))
 #endif
 
+  DEFINE_METHOD0(void, avcodec_register_all)
   DEFINE_METHOD1(AVCodec*, avcodec_find_decoder, (enum CodecID p1))
   DEFINE_METHOD1(int, avcodec_close, (AVCodecContext *p1))
   DEFINE_METHOD0(AVFrame*, avcodec_alloc_frame)
@@ -89,6 +93,7 @@
     RESOLVE_METHOD(avcodec_find_decoder)
     RESOLVE_METHOD(avcodec_close)
     RESOLVE_METHOD(avcodec_alloc_frame)
+    RESOLVE_METHOD(avcodec_register_all)
     RESOLVE_METHOD(avpicture_fill)
     RESOLVE_METHOD(avcodec_decode_video)
     RESOLVE_METHOD(avcodec_decode_audio)
@@ -107,6 +112,16 @@
     RESOLVE_METHOD(img_resample_close)
     RESOLVE_METHOD(av_set_string)
   END_METHOD_RESOLVE()
+
+public:
+  virtual bool Load() { 
+	bool bLoaded = DllDynamic::Load(); 
+	if (bLoaded) {
+		avcodec_register_all(); 
+		CLog::Log(LOGDEBUG,"DllAvCodec loaded"); 
+	}
+	return bLoaded;
+  }
 };
 
 // calback used for logging
@@ -128,7 +143,12 @@
 
 class DllAvUtilBase : public DllDynamic, DllAvUtilInterface
 {
+#ifndef _LINUX
   DECLARE_DLL_WRAPPER(DllAvUtilBase, Q:\\system\\players\\dvdplayer\\avutil-49.dll)
+#else
+  DECLARE_DLL_WRAPPER(DllAvUtilBase, Q:\\system\\players\\dvdplayer\\avutil-51-i486-linux.so)
+#endif
+
 #if LIBAVUTIL_VERSION_INT < (50<<16)
   DEFINE_METHOD1(void, av_log_set_callback, (void (*p1)(void*, int, const char*, va_list)))
 #else

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp	2007-06-03 21:42:14 UTC (rev 9206)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp	2007-06-04 00:19:26 UTC (rev 9207)
@@ -38,7 +38,7 @@
   pCodec = m_dllAvCodec.avcodec_find_decoder(hints.codec);
   if (!pCodec)
   {
-    CLog::Log(LOGDEBUG,"CDVDVideoCodecFFmpeg::Open() Unable to find codec");
+    CLog::Log(LOGDEBUG,"CDVDVideoCodecFFmpeg::Open() Unable to find codec %d", hints.codec);
     return false;
   }
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h	2007-06-03 21:42:14 UTC (rev 9206)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h	2007-06-04 00:19:26 UTC (rev 9207)
@@ -39,7 +39,11 @@
 
 class DllLibMpeg2 : public DllDynamic, DllLibMpeg2Interface
 {
+#ifndef _LINUX
   DECLARE_DLL_WRAPPER(DllLibMpeg2, Q:\\system\\players\\dvdplayer\\libmpeg2.dll)
+#else
+  DECLARE_DLL_WRAPPER(DllLibMpeg2, Q:\\system\\players\\dvdplayer\\libmpeg2-i486-linux.so)
+#endif
   DEFINE_METHOD1(uint32_t, mpeg2_accel, (uint32_t p1))
   DEFINE_METHOD0(mpeg2dec_t *, mpeg2_init)
   DEFINE_METHOD1(const mpeg2_info_t *, mpeg2_info, (mpeg2dec_t * p1))

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DllPostProc.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DllPostProc.h	2007-06-03 21:42:14 UTC (rev 9206)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DllPostProc.h	2007-06-04 00:19:26 UTC (rev 9207)
@@ -26,7 +26,12 @@
 
 class DllPostProc : public DllDynamic, DllAvCodecInterface
 {
+#ifndef _LINUX
   DECLARE_DLL_WRAPPER(DllPostProc, Q:\\system\\players\\dvdplayer\\postproc-51.dll)
+#else
+  DECLARE_DLL_WRAPPER(DllPostProc, Q:\\system\\players\\dvdplayer\\postproc-51-i486-linux.so)
+#endif
+
   DEFINE_METHOD11(void, pp_postprocess, (uint8_t* p1[3], int p2[3], uint8_t * p3[3], int p4[3],
                       int p5, int p6, QP_STORE_T *p7,  int p8,
                       pp_mode_t *p9, pp_context_t *p10, int p11))

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2007-06-03 21:42:14 UTC (rev 9206)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2007-06-04 00:19:26 UTC (rev 9207)
@@ -1,5 +1,6 @@
 
 #include "stdafx.h"
+#include "stdint.h"
 #include "DVDDemuxFFmpeg.h"
 #include "../DVDInputStreams/DVDInputStream.h"
 #include "DVDDemuxUtils.h"
@@ -137,7 +138,7 @@
 
   if (!pInput) return false;
 
-  if (!m_dllAvFormat.Load() || !m_dllAvCodec.Load() || !m_dllAvUtil.Load() ) return false;
+  if (!m_dllAvUtil.Load() || !m_dllAvCodec.Load() || !m_dllAvFormat.Load()) return false;
 
   // register codecs
   m_dllAvFormat.av_register_all();

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DllAvFormat.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DllAvFormat.h	2007-06-03 21:42:14 UTC (rev 9206)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DllAvFormat.h	2007-06-04 00:19:26 UTC (rev 9207)
@@ -48,7 +48,12 @@
 
 class DllAvFormat : public DllDynamic, DllAvFormatInterface
 {
+#ifndef _LINUX
   DECLARE_DLL_WRAPPER(DllAvFormat, Q:\\system\\players\\dvdplayer\\avformat-51.dll)
+#else
+  DECLARE_DLL_WRAPPER(DllAvFormat, Q:\\system\\players\\dvdplayer\\avformat-51-i486-linux.so)
+#endif
+
   DEFINE_METHOD0(void, av_register_all)
   DEFINE_METHOD1(AVInputFormat*, av_find_input_format, (const char *p1))
   DEFINE_METHOD1(int, url_feof, (ByteIOContext *p1))

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h	2007-06-03 21:42:14 UTC (rev 9206)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h	2007-06-04 00:19:26 UTC (rev 9207)
@@ -78,7 +78,12 @@
 
 class DllDvdNav : public DllDynamic, DllDvdNavInterface
 {
+#ifndef _LINUX
   DECLARE_DLL_WRAPPER(DllDvdNav, Q:\\system\\players\\dvdplayer\\libdvdnav.dll)
+#else
+  DECLARE_DLL_WRAPPER(DllDvdNav, Q:\\system\\players\\dvdplayer\\libdvdnav-i486-linux.so)
+#endif
+
   DEFINE_METHOD2(dvdnav_status_t, dvdnav_open, (dvdnav_t **p1, const char *p2))
   DEFINE_METHOD1(dvdnav_status_t, dvdnav_close, (dvdnav_t *p1))
   DEFINE_METHOD1(dvdnav_status_t, dvdnav_reset, (dvdnav_t *p1))

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp	2007-06-03 21:42:14 UTC (rev 9206)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp	2007-06-04 00:19:26 UTC (rev 9207)
@@ -436,7 +436,11 @@
     if( result & DECODE_FLAG_RESYNC )
     {
       m_pClock->Discontinuity(CLOCK_DISC_NORMAL, audioframe.pts, m_dvdAudio.GetDelay() - audioframe.duration);
+#ifndef _LINUX
       CLog::Log(LOGDEBUG, "CDVDPlayerAudio:: Resync - clock:%I64d, delay:%I64d", audioframe.pts, m_dvdAudio.GetDelay() - audioframe.duration);
+#else
+      CLog::Log(LOGDEBUG, "CDVDPlayerAudio:: Resync - clock:%lld, delay:%lld", audioframe.pts, m_dvdAudio.GetDelay() - audioframe.duration);
+#endif
     }
     
     // don't try to fix a desynced clock, until we played out the full audio buffer
@@ -452,7 +456,11 @@
     if( abs(error) > DVD_MSEC_TO_TIME(5) )
     {
       m_pClock->Discontinuity(CLOCK_DISC_NORMAL, clock+error, 0);      
+#ifndef _LINUX
       CLog::Log(LOGDEBUG, "CDVDPlayerAudio:: Discontinuty - was:%I64d, should be:%I64d, error:%I64d", clock, clock+error, error);
+#else
+      CLog::Log(LOGDEBUG, "CDVDPlayerAudio:: Discontinuty - was:%lld, should be:%lld, error:%lld", clock, clock+error, error);
+#endif
     }
   }
 }

Deleted: branches/linuxport/XBMC/xbmc/cores/dvdplayer/ffmpeg/inttypes.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/ffmpeg/inttypes.h	2007-06-03 21:42:14 UTC (rev 9206)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/ffmpeg/inttypes.h	2007-06-04 00:19:26 UTC (rev 9207)
@@ -1,301 +0,0 @@
-// ISO C9x  compliant inttypes.h for Miscrosoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
-// 
-//  Copyright (c) 2006 Alexander Chemeris
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-// 
-//   1. Redistributions of source code must retain the above copyright notice,
-//      this list of conditions and the following disclaimer.
-// 
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-// 
-//   3. The name of the author may be used to endorse or promote products
-//      derived from this software without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
-
-#ifndef _MSC_INTTYPES_H_ // [
-#define _MSC_INTTYPES_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-#include "stdint.h"
-
-// 7.8 Format conversion of integer types
-
-typedef struct {
-   intmax_t quot;
-   intmax_t rem;
-} imaxdiv_t;
-
-// 7.8.1 Macros for format specifiers
-
-// The fprintf macros for signed integers are:
-#define PRId8       "d"
-#define PRIi8       "i"
-#define PRIdLEAST8  "d"
-#define PRIiLEAST8  "i"
-#define PRIdFAST8   "d"
-#define PRIiFAST8   "i"
-
-#define PRId16       "hd"
-#define PRIi16       "hi"
-#define PRIdLEAST16  "hd"
-#define PRIiLEAST16  "hi"
-#define PRIdFAST16   "hd"
-#define PRIiFAST16   "hi"
-
-#define PRId32       "I32d"
-#define PRIi32       "I32i"
-#define PRIdLEAST32  "I32d"
-#define PRIiLEAST32  "I32i"
-#define PRIdFAST32   "I32d"
-#define PRIiFAST32   "I32i"
-
-#define PRId64       "I64d"
-#define PRIi64       "I64i"
-#define PRIdLEAST64  "I64d"
-#define PRIiLEAST64  "I64i"
-#define PRIdFAST64   "I64d"
-#define PRIiFAST64   "I64i"
-
-#define PRIdMAX     "I64d"
-#define PRIiMAX     "I64i"
-
-#define PRIdPTR     "Id"
-#define PRIiPTR     "Ii"
-
-// The fprintf macros for unsigned integers are:
-#define PRIo8       "o"
-#define PRIu8       "u"
-#define PRIx8       "x"
-#define PRIX8       "X"
-#define PRIoLEAST8  "o"
-#define PRIuLEAST8  "u"
-#define PRIxLEAST8  "x"
-#define PRIXLEAST8  "X"
-#define PRIoFAST8   "o"
-#define PRIuFAST8   "u"
-#define PRIxFAST8   "x"
-#define PRIXFAST8   "X"
-
-#define PRIo16       "ho"
-#define PRIu16       "hu"
-#define PRIx16       "hx"
-#define PRIX16       "hX"
-#define PRIoLEAST16  "ho"
-#define PRIuLEAST16  "hu"
-#define PRIxLEAST16  "hx"
-#define PRIXLEAST16  "hX"
-#define PRIoFAST16   "ho"
-#define PRIuFAST16   "hu"
-#define PRIxFAST16   "hx"
-#define PRIXFAST16   "hX"
-
-#define PRIo32       "I32o"
-#define PRIu32       "I32u"
-#define PRIx32       "I32x"
-#define PRIX32       "I32X"
-#define PRIoLEAST32  "I32o"
-#define PRIuLEAST32  "I32u"
-#define PRIxLEAST32  "I32x"
-#define PRIXLEAST32  "I32X"
-#define PRIoFAST32   "I32o"
-#define PRIuFAST32   "I32u"
-#define PRIxFAST32   "I32x"
-#define PRIXFAST32   "I32X"
-
-#define PRIo64       "I64o"
-#define PRIu64       "I64u"
-#define PRIx64       "I64x"
-#define PRIX64       "I64X"
-#define PRIoLEAST64  "I64o"
-#define PRIuLEAST64  "I64u"
-#define PRIxLEAST64  "I64x"
-#define PRIXLEAST64  "I64X"
-#define PRIoFAST64   "I64o"
-#define PRIuFAST64   "I64u"
-#define PRIxFAST64   "I64x"
-#define PRIXFAST64   "I64X"
-
-#define PRIoMAX     "I64o"
-#define PRIuMAX     "I64u"
-#define PRIxMAX     "I64x"
-#define PRIXMAX     "I64X"
-
-#define PRIoPTR     "Io"
-#define PRIuPTR     "Iu"
-#define PRIxPTR     "Ix"
-#define PRIXPTR     "IX"
-
-// The fscanf macros for signed integers are:
-#define SCNd8       "d"
-#define SCNi8       "i"
-#define SCNdLEAST8  "d"
-#define SCNiLEAST8  "i"
-#define SCNdFAST8   "d"
-#define SCNiFAST8   "i"
-
-#define SCNd16       "hd"
-#define SCNi16       "hi"
-#define SCNdLEAST16  "hd"
-#define SCNiLEAST16  "hi"
-#define SCNdFAST16   "hd"
-#define SCNiFAST16   "hi"
-
-#define SCNd32       "ld"
-#define SCNi32       "li"
-#define SCNdLEAST32  "ld"
-#define SCNiLEAST32  "li"
-#define SCNdFAST32   "ld"
-#define SCNiFAST32   "li"
-
-#define SCNd64       "I64d"
-#define SCNi64       "I64i"
-#define SCNdLEAST64  "I64d"
-#define SCNiLEAST64  "I64i"
-#define SCNdFAST64   "I64d"
-#define SCNiFAST64   "I64i"
-
-#define SCNdMAX     "I64d"
-#define SCNiMAX     "I64i"
-
-#ifdef _WIN64 // [
-#  define SCNdPTR     "I64d"
-#  define SCNiPTR     "I64i"
-#else  // _WIN64 ][
-#  define SCNdPTR     "ld"
-#  define SCNiPTR     "li"
-#endif  // _WIN64 ]
-
-// The fscanf macros for unsigned integers are:
-#define SCNo8       "o"
-#define SCNu8       "u"
-#define SCNx8       "x"
-#define SCNX8       "X"
-#define SCNoLEAST8  "o"
-#define SCNuLEAST8  "u"
-#define SCNxLEAST8  "x"
-#define SCNXLEAST8  "X"
-#define SCNoFAST8   "o"
-#define SCNuFAST8   "u"
-#define SCNxFAST8   "x"
-#define SCNXFAST8   "X"
-
-#define SCNo16       "ho"
-#define SCNu16       "hu"
-#define SCNx16       "hx"
-#define SCNX16       "hX"
-#define SCNoLEAST16  "ho"
-#define SCNuLEAST16  "hu"
-#define SCNxLEAST16  "hx"
-#define SCNXLEAST16  "hX"
-#define SCNoFAST16   "ho"
-#define SCNuFAST16   "hu"
-#define SCNxFAST16   "hx"
-#define SCNXFAST16   "hX"
-
-#define SCNo32       "lo"
-#define SCNu32       "lu"
-#define SCNx32       "lx"
-#define SCNX32       "lX"
-#define SCNoLEAST32  "lo"
-#define SCNuLEAST32  "lu"
-#define SCNxLEAST32  "lx"
-#define SCNXLEAST32  "lX"
-#define SCNoFAST32   "lo"
-#define SCNuFAST32   "lu"
-#define SCNxFAST32   "lx"
-#define SCNXFAST32   "lX"
-
-#define SCNo64       "I64o"
-#define SCNu64       "I64u"
-#define SCNx64       "I64x"
-#define SCNX64       "I64X"
-#define SCNoLEAST64  "I64o"
-#define SCNuLEAST64  "I64u"
-#define SCNxLEAST64  "I64x"
-#define SCNXLEAST64  "I64X"
-#define SCNoFAST64   "I64o"
-#define SCNuFAST64   "I64u"
-#define SCNxFAST64   "I64x"
-#define SCNXFAST64   "I64X"
-
-#define SCNoMAX     "I64o"
-#define SCNuMAX     "I64u"
-#define SCNxMAX     "I64x"
-#define SCNXMAX     "I64X"
-
-#ifdef _WIN64 // [
-#  define SCNoPTR     "I64o"
-#  define SCNuPTR     "I64u"
-#  define SCNxPTR     "I64x"
-#  define SCNXPTR     "I64X"
-#else  // _WIN64 ][
-#  define SCNoPTR     "lo"
-#  define SCNuPTR     "lu"
-#  define SCNxPTR     "lx"
-#  define SCNXPTR     "lX"
-#endif  // _WIN64 ]
-
-// 7.8.2 Functions for greatest-width integer types
-
-// 7.8.2.1 The imaxabs function
-#define imaxabs _abs64
-
-// 7.8.2.2 The imaxdiv function
-
-// This is modified version of div() function from Microsoft's div.c found
-// in %MSVC.NET%\crt\src\div.c
-#ifdef STATIC_IMAXDIV // [
-static
-#else // STATIC_IMAXDIV ][
-_inline
-#endif // STATIC_IMAXDIV ]
-imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
-{
-   imaxdiv_t result;
-
-   result.quot = numer / denom;
-   result.rem = numer % denom;
-
-   if (numer < 0 && result.rem > 0) {
-      // did division wrong; must fix up
-      ++result.quot;
-      result.rem -= denom;
-   }
-
-   return result;
-}
-
-// 7.8.2.3 The strtoimax and strtoumax functions
-#define strtoimax _strtoi64
-#define strtoumax _strtoui64
-
-// 7.8.2.4 The wcstoimax and wcstoumax functions
-#define wcstoimax _wcstoi64
-#define wcstoumax _wcstoui64
-
-
-#endif // _MSC_INTTYPES_H_ ]

Deleted: branches/linuxport/XBMC/xbmc/cores/dvdplayer/ffmpeg/stdint.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/ffmpeg/stdint.h	2007-06-03 21:42:14 UTC (rev 9206)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/ffmpeg/stdint.h	2007-06-04 00:19:26 UTC (rev 9207)
@@ -1,222 +0,0 @@
-// ISO C9x  compliant stdint.h for Miscrosoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
-// 
-//  Copyright (c) 2006 Alexander Chemeris
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-// 
-//   1. Redistributions of source code must retain the above copyright notice,
-//      this list of conditions and the following disclaimer.
-// 
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-// 
-//   3. The name of the author may be used to endorse or promote products
-//      derived from this software without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
-
-#ifndef _MSC_STDINT_H_ // [
-#define _MSC_STDINT_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-#include <limits.h>
-
-// For Visual Studio 6 in C++ mode wrap <wchar.h> include with 'extern "C++" {}'
-// or compiler give many errors like this:
-//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
-#if (_MSC_VER < 1300) && defined(__cplusplus)
-   extern "C++" {
-#endif 
-#     include <wchar.h>
-#if (_MSC_VER < 1300) && defined(__cplusplus)
-   }
-#endif
-
-// 7.18.1 Integer types
-
-// 7.18.1.1 Exact-width integer types
-typedef signed   __int8   int8_t;
-typedef signed   __int16  int16_t;
-typedef signed   __int32  int32_t;
-typedef signed   __int64  int64_t;
-typedef unsigned __int8   uint8_t;
-typedef unsigned __int16  uint16_t;
-typedef unsigned __int32  uint32_t;
-typedef unsigned __int64  uint64_t;
-
-// 7.18.1.2 Minimum-width integer types
-typedef int8_t    int_least8_t;
-typedef int16_t   int_least16_t;
-typedef int32_t   int_least32_t;
-typedef int64_t   int_least64_t;
-typedef uint8_t   uint_least8_t;
-typedef uint16_t  uint_least16_t;
-typedef uint32_t  uint_least32_t;
-typedef uint64_t  uint_least64_t;
-
-// 7.18.1.3 Fastest minimum-width integer types
-typedef int8_t    int_fast8_t;
-typedef int16_t   int_fast16_t;
-typedef int32_t   int_fast32_t;
-typedef int64_t   int_fast64_t;
-typedef uint8_t   uint_fast8_t;
-typedef uint16_t  uint_fast16_t;
-typedef uint32_t  uint_fast32_t;
-typedef uint64_t  uint_fast64_t;
-
-// 7.18.1.4 Integer types capable of holding object pointers
-#ifdef _WIN64 // [
-   typedef __int64           intptr_t;
-   typedef unsigned __int64  uintptr_t;
-#else // _WIN64 ][
-   typedef int               intptr_t;
-   typedef unsigned int      uintptr_t;
-#endif // _WIN64 ]
-
-// 7.18.1.5 Greatest-width integer types
-typedef int64_t   intmax_t;
-typedef uint64_t  uintmax_t;
-
-
-// 7.18.2 Limits of specified-width integer types
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
-
-// 7.18.2.1 Limits of exact-width integer types
-#define INT8_MIN     _I8_MIN
-#define INT8_MAX     _I8_MAX
-#define INT16_MIN    _I16_MIN
-#define INT16_MAX    _I16_MAX
-#define INT32_MIN    _I32_MIN
-#define INT32_MAX    _I32_MAX
-#define INT64_MIN    _I64_MIN
-#define INT64_MAX    _I64_MAX
-#define UINT8_MAX    _UI8_MAX
-#define UINT16_MAX   _UI16_MAX
-#define UINT32_MAX   _UI32_MAX
-#define UINT64_MAX   _UI64_MAX
-
-// 7.18.2.2 Limits of minimum-width integer types
-#define INT_LEAST8_MIN    INT8_MIN
-#define INT_LEAST8_MAX    INT8_MAX
-#define INT_LEAST16_MIN   INT16_MIN
-#define INT_LEAST16_MAX   INT16_MAX
-#define INT_LEAST32_MIN   INT32_MIN
-#define INT_LEAST32_MAX   INT32_MAX
-#define INT_LEAST64_MIN   INT64_MIN
-#define INT_LEAST64_MAX   INT64_MAX
-#define UINT_LEAST8_MAX   UINT8_MAX
-#define UINT_LEAST16_MAX  UINT16_MAX
-#define UINT_LEAST32_MAX  UINT32_MAX
-#define UINT_LEAST64_MAX  UINT64_MAX
-
-// 7.18.2.3 Limits of fastest minimum-width integer types
-#define INT_FAST8_MIN    INT8_MIN
-#define INT_FAST8_MAX    INT8_MAX
-#define INT_FAST16_MIN   INT16_MIN
-#define INT_FAST16_MAX   INT16_MAX
-#define INT_FAST32_MIN   INT32_MIN
-#define INT_FAST32_MAX   INT32_MAX
-#define INT_FAST64_MIN   INT64_MIN
-#define INT_FAST64_MAX   INT64_MAX
-#define UINT_FAST8_MAX   UINT8_MAX
-#define UINT_FAST16_MAX  UINT16_MAX
-#define UINT_FAST32_MAX  UINT32_MAX
-#define UINT_FAST64_MAX  UINT64_MAX
-
-// 7.18.2.4 Limits of integer types capable of holding object pointers
-#ifdef _WIN64 // [
-#  define INTPTR_MIN   INT64_MIN
-#  define INTPTR_MAX   INT64_MAX
-#  define UINTPTR_MAX  UINT64_MAX
-#else // _WIN64 ][
-#  define INTPTR_MIN   INT32_MIN
-#  define INTPTR_MAX   INT32_MAX
-#  define UINTPTR_MAX  UINT32_MAX
-#endif // _WIN64 ]
-
-// 7.18.2.5 Limits of greatest-width integer types
-#define INTMAX_MIN   INT64_MIN
-#define INTMAX_MAX   INT64_MAX
-#define UINTMAX_MAX  UINT64_MAX
-
-// 7.18.3 Limits of other integer types
-
-#ifdef _WIN64 // [
-#  define PTRDIFF_MIN  _I64_MIN
-#  define PTRDIFF_MAX  _I64_MAX
-#else  // _WIN64 ][
-#  define PTRDIFF_MIN  _I32_MIN
-#  define PTRDIFF_MAX  _I32_MAX
-#endif  // _WIN64 ]
-
-#define SIG_ATOMIC_MIN  INT_MIN
-#define SIG_ATOMIC_MAX  INT_MAX
-
-#ifndef SIZE_MAX // [
-#  ifdef _WIN64 // [
-#     define SIZE_MAX  _UI64_MAX
-#  else // _WIN64 ][
-#     define SIZE_MAX  _UI32_MAX
-#  endif // _WIN64 ]
-#endif // SIZE_MAX ]
-
-// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
-#ifndef WCHAR_MIN // [
-#  define WCHAR_MIN  0
-#endif  // WCHAR_MIN ]
-#ifndef WCHAR_MAX // [
-#  define WCHAR_MAX  _UI16_MAX
-#endif  // WCHAR_MAX ]
-
-#define WINT_MIN  0
-#define WINT_MAX  _UI16_MAX
-
-#endif // __STDC_LIMIT_MACROS ]
-
-
-// 7.18.4 Limits of other integer types
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
-
-// 7.18.4.1 Macros for minimum-width integer constants
-
-#define INT8_C(val)  val
-#define INT16_C(val) val
-#define INT32_C(val) val##L
-#define INT64_C(val) val##i64
-
-#define UINT8_C(val)  val
-#define UINT16_C(val) val
-#define UINT32_C(val) val##UL
-#define UINT64_C(val) val##Ui64
-
-// 7.18.4.2 Macros for greatest-width integer constants
-#define INTMAX_C   INT64_C
-#define UINTMAX_C  UINT64_C
-
-#endif // __STDC_CONSTANT_MACROS ]
-
-
-#endif // _MSC_STDINT_H_ ]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9534
          http://svn.sourceforge.net/xbmc/?rev=9534&view=rev
Author:   vulkanr
Date:     2007-07-10 06:18:22 -0700 (Tue, 10 Jul 2007)

Log Message:
-----------
-added volume control
-added code to handle case in which number of channels is changed in the middle of movie playback (e.g. from 2channels to 5.1).
-fixed pause/resume bugs in movie playback
-applied evetsso fix to alsa sound handler
-some member definitions order re-arrangement in some places - nothing that is really necessary...

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLiba52.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLiba52.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/liba52/a52.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.cpp	2007-07-10 13:08:30 UTC (rev 9533)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.cpp	2007-07-10 13:18:22 UTC (rev 9534)
@@ -49,6 +49,7 @@
   m_uiBitsPerSample = uiBitsPerSample;
 
   m_nCurrentVolume = g_stSettings.m_nVolumeLevel;
+  m_amp.SetVolume(m_nCurrentVolume);
 
   m_dwPacketSize = iChannels*(uiBitsPerSample/8)*512;
   m_BufferSize = m_dwPacketSize * 6; // buffer big enough - but not too big...
@@ -59,7 +60,7 @@
   /* Open the device */
   char* device = getenv("XBMC_AUDIODEV");
   if (device == NULL)
-  device = "default";
+    device = "default";
 
   int nErr = snd_pcm_open(&m_pPlayHandle, device, SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
   CHECK_ALSA_RETURN(LOGERROR,"pcm_open",nErr);
@@ -99,6 +100,25 @@
   nErr = snd_pcm_hw_params(m_pPlayHandle, hw_params);
   CHECK_ALSA_RETURN(LOGERROR,"snd_pcm_hw_params",nErr);
 
+  /* disable underrun reporting and play silence */
+  snd_pcm_uframes_t boundary;
+  snd_pcm_sw_params_t *swparams = NULL;
+  snd_pcm_sw_params_alloca(&swparams);
+  nErr = snd_pcm_sw_params_current(m_pPlayHandle, swparams);
+  CHECK_ALSA(LOGERROR,"sw_params_get_current",nErr);
+
+  nErr = snd_pcm_sw_params_get_boundary(swparams, &boundary);
+  CHECK_ALSA(LOGERROR,"get_boundary",nErr);
+
+  nErr = snd_pcm_sw_params_set_stop_threshold(m_pPlayHandle, swparams, boundary);
+  CHECK_ALSA(LOGERROR,"set_stop_threshold",nErr);
+
+  nErr = snd_pcm_sw_params_set_silence_size(m_pPlayHandle, swparams, boundary);
+  CHECK_ALSA(LOGERROR,"set_silence_size",nErr);
+
+  nErr = snd_pcm_sw_params(m_pPlayHandle, swparams);
+  CHECK_ALSA(LOGERROR,"sw_params",nErr);
+
   nErr = snd_pcm_prepare (m_pPlayHandle);
   CHECK_ALSA(LOGERROR,"snd_pcm_prepare",nErr);
 
@@ -131,6 +151,14 @@
   return S_OK;
 }
 
+void CALSADirectSound::Flush() {
+  int nErr = snd_pcm_drain(m_pPlayHandle);
+  CHECK_ALSA(LOGERROR,"flush-drain",nErr); 
+  nErr = snd_pcm_prepare(m_pPlayHandle);
+  CHECK_ALSA(LOGERROR,"flush-prepare",nErr);  
+  nErr = snd_pcm_start(m_pPlayHandle);
+  CHECK_ALSA(LOGERROR,"flush-start",nErr); 
+}
 
 //***********************************************************************************************
 HRESULT CALSADirectSound::Pause()
@@ -144,9 +172,12 @@
 //***********************************************************************************************
 HRESULT CALSADirectSound::Resume()
 {
-  if (!m_bPause) return S_OK;
+  // Resume is called not only after Pause but also at certain other points. like after stop when DVDPlayer is flushed.
   m_bPause = false;
   snd_pcm_pause(m_pPlayHandle,0);
+
+  Flush();
+
   return S_OK;
 }
 
@@ -180,14 +211,12 @@
 void CALSADirectSound::Mute(bool bMute)
 {
   if (!m_bIsAllocated) return;
-/*
+
   if (bMute)
-    m_pBuffer->SetVolume(GetMinimumVolume());
+    SetCurrentVolume(GetMinimumVolume());
   else
-    m_pBuffer->SetVolume(m_nCurrentVolume);
-*/
+    SetCurrentVolume(m_nCurrentVolume);
 
-#warning volume control not yet implemented for ALSA
 }
 
 //***********************************************************************************************
@@ -195,7 +224,7 @@
 {
   if (!m_bIsAllocated) return -1;
   m_nCurrentVolume = nVolume;
-#warning volume control not yet implemented for ALSA
+  m_amp.SetVolume(nVolume);
   return S_OK;
 }
 
@@ -203,39 +232,56 @@
 //***********************************************************************************************
 DWORD CALSADirectSound::GetSpace()
 {
-  return snd_pcm_avail_update(m_pPlayHandle);
+  int nSpace = snd_pcm_avail_update(m_pPlayHandle);
+  if (nSpace < 0) {
+     CLog::Log(LOGWARNING,"CALSADirectSound::GetSpace - get space failed. err: %d (%s)", nSpace, snd_strerror(nSpace));
+     nSpace = 0;
+  }
+  return nSpace;
 }
 
 //***********************************************************************************************
 DWORD CALSADirectSound::AddPackets(unsigned char *data, DWORD len)
 {
+  if (!m_pPlayHandle) {
+	CLog::Log(LOGERROR,"CALSADirectSound::AddPackets - sanity failed. no play handle!");
+	return len; 
+  }
 
-  if (!m_pPlayHandle || snd_pcm_avail_update(m_pPlayHandle) < ( len / (2*m_uiChannels)) || m_bPause)
+  // if there is no room in the buffer - even for one frame, return 
+  if ( GetSpace() < ( len / (2*m_uiChannels)) )
        return 0;
 
   unsigned char *pcmPtr = data;
-  while ( pcmPtr < data + len) {
-       int nPeriodSize = (m_maxFrames * 2 * m_uiChannels); // write a frame.
-       if ( pcmPtr + nPeriodSize >  data + len) {
-               nPeriodSize = data + len - pcmPtr;
-       }
 
-       int framesToWrite = nPeriodSize / (2 * m_uiChannels);
-       int writeResult = snd_pcm_writei(m_pPlayHandle, pcmPtr, framesToWrite);
-       if (  writeResult == -EPIPE  ) {
-               CLog::Log(LOGDEBUG, "CALSADirectSound::AddPackets - buffer underun (tried to write %d frames)",
-                       framesToWrite);
-               int err = snd_pcm_prepare(m_pPlayHandle);
-               CHECK_ALSA(LOGERROR,"prepare after EPIPE", err);
-       }
-       else if (writeResult != framesToWrite) {
-               CLog::Log(LOGERROR, "CALSADirectSound::AddPackets - failed to write %d frames. "
-                       "bad write (err: %d) - %s",
-                       framesToWrite, writeResult, snd_strerror(writeResult));
-               break;
-       }
+  while (pcmPtr < data + (int)len){  
+	int nPeriodSize = (m_maxFrames * 2 * m_uiChannels); // write max frames.
+	if ( pcmPtr + nPeriodSize >  data + (int)len) {
+		nPeriodSize = data + (int)len - pcmPtr;
+	}
+	
+	int framesToWrite = nPeriodSize / (2 * m_uiChannels);
+	
+	// handle volume de-amp 
+	m_amp.DeAmplify((short *)pcmPtr, framesToWrite * m_uiChannels);
+	
+	int writeResult = snd_pcm_writei(m_pPlayHandle, pcmPtr, framesToWrite);
+	if (  writeResult == -EPIPE  ) {
+		CLog::Log(LOGDEBUG, "CALSADirectSound::AddPackets - buffer underun (tried to write %d frames)",
+						framesToWrite);
+		int err = snd_pcm_prepare(m_pPlayHandle);
+		CHECK_ALSA(LOGERROR,"prepare after EPIPE", err);
+	}
+	else if (writeResult != framesToWrite) {
+		CLog::Log(LOGERROR, "CALSADirectSound::AddPackets - failed to write %d frames. "
+						"bad write (err: %d) - %s",
+						framesToWrite, writeResult, snd_strerror(writeResult));
+	}
 
-       pcmPtr += nPeriodSize;
+    if (writeResult>0)
+		pcmPtr += writeResult * 2 * m_uiChannels;
+	else
+		pcmPtr += framesToWrite * 2 * m_uiChannels;
   }
 
   return len;
@@ -245,7 +291,7 @@
 FLOAT CALSADirectSound::GetDelay()
 {
   long bytes = m_BufferSize - GetSpace();
-  double delay = (double)bytes / ( m_uiChannels * m_uiSamplesPerSec * (m_uiBitsPerSample / 8) );
+  double delay = (double)bytes / (double)( m_uiChannels * m_uiSamplesPerSec * (m_uiBitsPerSample / 8) );
 
   if (g_audioContext.IsAC3EncoderActive())
     delay += 0.049;

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.h	2007-07-10 13:08:30 UTC (rev 9533)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.h	2007-07-10 13:18:22 UTC (rev 9534)
@@ -36,6 +36,8 @@
 #define ALSA_PCM_NEW_HW_PARAMS_API
 #include <alsa/asoundlib.h>
 
+#include "../../utils/PCMAmplifier.h"
+
 extern void RegisterAudioCallback(IAudioCallback* pCallback);
 extern void UnRegisterAudioCallback();
 
@@ -66,12 +68,15 @@
   virtual void DoWork();
   virtual void SwitchChannels(int iAudioStream, bool bAudioOnAllSpeakers);
 
+  virtual void Flush();
+
 private:
   snd_pcm_t 		*m_pPlayHandle;
   snd_pcm_uframes_t 	m_maxFrames;
 
   IAudioCallback* m_pCallback;
 
+  CPCMAmplifier 	m_amp;
   LONG m_nCurrentVolume;
   DWORD m_dwPacketSize;
   DWORD m_dwNumPackets;

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.cpp	2007-07-10 13:08:30 UTC (rev 9533)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.cpp	2007-07-10 13:18:22 UTC (rev 9534)
@@ -124,7 +124,7 @@
   if (!m_bInitializedDecoder)
     return iBytesToCopy;
 
-  m_DecodedData = (BYTE*)m_dll.faacDecDecode(m_pHandle, &m_frameInfo, m_InputBuffer, m_InputBufferSize);
+  m_DecodedData = (short*)m_dll.faacDecDecode(m_pHandle, &m_frameInfo, m_InputBuffer, m_InputBufferSize);
   m_DecodedDataSize = m_frameInfo.samples * sizeof(short);
 
   if (m_frameInfo.error)
@@ -149,7 +149,7 @@
 
 int CDVDAudioCodecLibFaad::GetData(BYTE** dst)
 {
-  *dst = m_DecodedData;
+  *dst = (BYTE*)m_DecodedData;
   return m_DecodedDataSize;
 }
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.h	2007-07-10 13:08:30 UTC (rev 9533)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.h	2007-07-10 13:18:22 UTC (rev 9534)
@@ -40,7 +40,7 @@
   faacDecHandle m_pHandle;
   faacDecFrameInfo m_frameInfo;
 
-  BYTE* m_DecodedData;
+  short* m_DecodedData;
   int   m_DecodedDataSize;
   
   BYTE m_InputBuffer[LIBFAAD_INPUT_SIZE];

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLiba52.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLiba52.cpp	2007-07-10 13:08:30 UTC (rev 9533)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLiba52.cpp	2007-07-10 13:18:22 UTC (rev 9534)
@@ -74,7 +74,7 @@
 
   // output will be decided on when
   // we have decoded something
-  m_iOutputChannels = 0;
+  m_iOutputChannels = iChannels;
 
   return true;
 }
@@ -124,11 +124,12 @@
   if(channels == 5 || channels == 3)
     channels = 6;
 
-  if(!m_iOutputChannels)
-    m_iOutputChannels = channels;
-  else if(m_iOutputChannels != channels)
-    CLog::Log(LOGWARNING, "%s - Number of channels changed in stream from %d to %d, data might be truncated", __FUNCTION__, m_iOutputChannels, channels);
+  if(m_iOutputChannels > 0 && m_iOutputChannels != channels) {
+    CLog::Log(LOGINFO, "%s - Number of channels changed in stream from %d to %d, data might be truncated", __FUNCTION__, m_iOutputChannels, channels);
+  }
 
+  m_iOutputChannels = channels;
+
   // make sure map contains enough channels
   for(int i=0;i<m_iOutputChannels;i++)
   {
@@ -228,8 +229,8 @@
           m_decodedDataSize = 0;
           return -1;
         }
-
-        m_decodedDataSize += 2*resample_int16(m_fSamples, (int16_t*)(m_decodedData + m_decodedDataSize), m_iOutputMapping);
+ 
+        m_decodedDataSize += 2*resample_int16(m_fSamples, (int16_t*)(m_decodedData + m_decodedDataSize/2), m_iOutputMapping);
       }
 
       m_pInputBuffer = m_inputBuffer;
@@ -243,7 +244,7 @@
 
 int CDVDAudioCodecLiba52::GetData(BYTE** dst)
 {
-  *dst = m_decodedData;
+  *dst = (BYTE*)m_decodedData;
   return m_decodedDataSize;
 }
 
@@ -263,7 +264,7 @@
 
   SetDefault();
 
-  m_pState = m_dll.a52_init(0);
+  m_pState = m_dll.a52_init(MM_ACCEL_X86_MMX |MM_ACCEL_X86_MMXEXT); // MMX accel is not really important since liba52 doesnt yet implement this... but whatever...
   m_fSamples = m_dll.a52_samples(m_pState);
 }
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLiba52.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLiba52.h	2007-07-10 13:08:30 UTC (rev 9533)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLiba52.h	2007-07-10 13:18:22 UTC (rev 9534)
@@ -26,12 +26,6 @@
 
   a52_state_t* m_pState;
 
-  BYTE m_inputBuffer[4096];
-  BYTE* m_pInputBuffer;
-
-  BYTE m_decodedData[131072]; // could be a bit to big
-  int m_decodedDataSize;
-
   int m_iFrameSize;
   float* m_fSamples;
 
@@ -42,4 +36,10 @@
   int m_iOutputChannels;
   unsigned int m_iOutputMapping;
   DllLiba52 m_dll;
+
+  int m_decodedDataSize;
+  BYTE* m_pInputBuffer;
+
+  short m_decodedData[131072/2]; // could be a bit to big
+  BYTE m_inputBuffer[4096];
 };

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/liba52/a52.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/liba52/a52.h	2007-07-10 13:08:30 UTC (rev 9533)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/liba52/a52.h	2007-07-10 13:18:22 UTC (rev 9534)
@@ -53,6 +53,11 @@
 #define A52_LFE 16
 #define A52_ADJUST_LEVEL 32
 
+/* x86 accelerations */
+#define MM_ACCEL_X86_MMX        0x80000000
+#define MM_ACCEL_X86_3DNOW      0x40000000
+#define MM_ACCEL_X86_MMXEXT     0x20000000
+
 a52_state_t * a52_init (uint32_t mm_accel);
 sample_t * a52_samples (a52_state_t * state);
 int a52_syncinfo (uint8_t * buf, int * flags,

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp	2007-07-10 13:08:30 UTC (rev 9533)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp	2007-07-10 13:18:22 UTC (rev 9534)
@@ -160,7 +160,7 @@
   }
 
   if (len != iSize)
-    CLog::Log(LOGWARNING, "%s - avcodec_decode_video didn't consume the full packet", __FUNCTION__);
+    CLog::Log(LOGWARNING, "%s - avcodec_decode_video didn't consume the full packet. size: %d, consumed: %d", __FUNCTION__, iSize, len);
 
   if (!iGotPicture)
     return VC_BUFFER;

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h	2007-07-10 13:08:30 UTC (rev 9533)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h	2007-07-10 13:18:22 UTC (rev 9534)
@@ -69,7 +69,7 @@
   unsigned __int64 ConvertTimestamp(__int64 pts, int den, int num);
 
   CRITICAL_SECTION m_critSection;
-  // #define MAX_STREAMS 20 // from avformat.h
+  // #define MAX_STREAMS 42 // from avformat.h
   CDemuxStream* m_streams[MAX_STREAMS]; // maximum number of streams that ffmpeg can handle
 
   ByteIOContext m_ioContext;

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.cpp	2007-07-10 13:08:30 UTC (rev 9533)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.cpp	2007-07-10 13:18:22 UTC (rev 9534)
@@ -56,10 +56,12 @@
 {
   m_pPacket = pPacket;
   m_packetSize = packetSize;
+  m_bPacketFreed = false;
 }
 
 CDVDMsgDemuxerPacket::~CDVDMsgDemuxerPacket()
 {
+  m_bPacketFreed = true;
   if (m_pPacket)
   {
     CDVDDemuxUtils::FreeDemuxPacket(m_pPacket);

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.h	2007-07-10 13:08:30 UTC (rev 9533)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.h	2007-07-10 13:18:22 UTC (rev 9534)
@@ -229,6 +229,7 @@
 public: // XXX, test : should be private
   CDVDDemux::DemuxPacket* m_pPacket;
   unsigned int m_packetSize;
+  bool m_bPacketFreed;
 };
 
 class CDVDMsgDemuxerReset : public CDVDMsg

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp	2007-07-10 13:08:30 UTC (rev 9533)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp	2007-07-10 13:18:22 UTC (rev 9534)
@@ -173,7 +173,7 @@
 int CDVDPlayerAudio::DecodeFrame(DVDAudioFrame &audioframe, bool bDropPacket)
 {
   CDVDDemux::DemuxPacket* pPacket = pAudioPacket;
-  int n=48000*2*16/8, len;
+  int n=m_streaminfo.samplerate*m_streaminfo.channels*16/8, len;
 
   unsigned int bytesconsumed = 0;
   if(m_pAudioCodec)
@@ -210,7 +210,7 @@
       if (len < 0)
       {
         /* if error, we skip the packet */
-        CLog::Log(LOGERROR, "CDVDPlayerAudio::Process - Decode Error. Skipping audio packet");
+        CLog::Log(LOGERROR, "CDVDPlayerAudio::DecodeFrame - Decode Error. Skipping audio packet");
         audio_pkt_size=0;
         m_pAudioCodec->Reset();
         return DECODE_FLAG_ERROR;
@@ -225,6 +225,24 @@
         assert(0);
       }
 
+      // check to see if number of channels changed
+      if (m_bInitializedOutputDevice && m_pAudioCodec->GetChannels() != m_streaminfo.channels) {
+        CLog::Log(LOGINFO,"number of channels changed from %d to %d. re-creating output device", m_streaminfo.channels, m_pAudioCodec->GetChannels());
+  		
+		EnterCriticalSection(&m_critCodecSection);
+
+        m_dvdAudio.Destroy();
+        m_bInitializedOutputDevice = false;
+
+        m_streaminfo.channels = m_pAudioCodec->GetChannels();
+        m_streaminfo.samplerate = m_pAudioCodec->GetSampleRate();
+  		
+		InitializeOutputDevice();
+
+		LeaveCriticalSection(&m_critCodecSection);
+
+      }
+
       // get decoded data and the size of it
       audioframe.size = m_pAudioCodec->GetData(&audioframe.data);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10132
          http://xbmc.svn.sourceforge.net/xbmc/?rev=10132&view=rev
Author:   elupus
Date:     2007-08-30 19:37:02 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
changed: merge some stuff from trunk into linux branch

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDAudio.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessageQueue.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDOverlayRenderer.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDAudio.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDAudio.cpp	2007-08-31 02:36:37 UTC (rev 10131)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDAudio.cpp	2007-08-31 02:37:02 UTC (rev 10132)
@@ -192,18 +192,18 @@
   len -= copied;
 
   // if we have more data left, save it for the next call to this funtion
-  if (len > 0 && !m_bStop && m_pBuffer)
+  if (len > 0)
   {
-  	CSingleLock lock (m_critSection);
-	if(len > m_dwPacketSize)
-	  	CLog::Log(LOGERROR, "%s - More bytes left than can be stored in buffer", __FUNCTION__);
+    CSingleLock lock (m_critSection);
+    if(len > m_dwPacketSize)
+      CLog::Log(LOGERROR, "%s - More bytes left than can be stored in buffer", __FUNCTION__);
 
-	if (m_pBuffer) {
-		m_iBufferSize = min(len, m_dwPacketSize);
-		memcpy(m_pBuffer, data, m_iBufferSize);
-	}
+    if(m_pBuffer)
+    {
+      m_iBufferSize = min(len, m_dwPacketSize);
+      memcpy(m_pBuffer, data, m_iBufferSize);
+    }
   }
-
   return total - len;
 }
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp	2007-08-31 02:36:37 UTC (rev 10131)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp	2007-08-31 02:37:02 UTC (rev 10132)
@@ -3,9 +3,9 @@
 #include "DVDVideoCodecFFmpeg.h"
 #include "../../DVDDemuxers/DVDDemux.h"
 #include "../../DVDStreamInfo.h"
+#include "../../DVDClock.h"
 #include "../DVDCodecs.h"
 #include "../../../../utils/Win32Exception.h"
-#include "../../DVDClock.h"
 
 #define RINT(x) ((x) >= 0 ? ((int)((x) + 0.5)) : ((int)((x) - 0.5)))
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp	2007-08-31 02:36:37 UTC (rev 10131)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp	2007-08-31 02:37:02 UTC (rev 10132)
@@ -2,8 +2,6 @@
 #include "stdafx.h"
 #include "DVDInputStreamFFmpeg.h"
 
-#include "../../../Util.h"
-
 using namespace XFILE;
 
 CDVDInputStreamFFmpeg::CDVDInputStreamFFmpeg() 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp	2007-08-31 02:36:37 UTC (rev 10131)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp	2007-08-31 02:37:02 UTC (rev 10132)
@@ -2,8 +2,6 @@
 #include "stdafx.h"
 #include "DVDInputStreamFile.h"
 
-#include "../../../Util.h"
-
 using namespace XFILE;
 
 CDVDInputStreamFile::CDVDInputStreamFile() : CDVDInputStream(DVDSTREAM_TYPE_FILE)

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.cpp	2007-08-31 02:36:37 UTC (rev 10131)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.cpp	2007-08-31 02:37:02 UTC (rev 10132)
@@ -2,8 +2,6 @@
 #include "stdafx.h"
 #include "DVDInputStreamHttp.h"
 
-#include "../../../Util.h"
-
 using namespace XFILE;
 
 CDVDInputStreamHttp::CDVDInputStreamHttp() : CDVDInputStream(DVDSTREAM_TYPE_HTTP)

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.cpp	2007-08-31 02:36:37 UTC (rev 10131)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.cpp	2007-08-31 02:37:02 UTC (rev 10132)
@@ -2,8 +2,6 @@
 #include "stdafx.h"
 #include "DVDInputStreamMemory.h"
 
-#include "../../../Util.h"
-
 CDVDInputStreamMemory::CDVDInputStreamMemory() : CDVDInputStream(DVDSTREAM_TYPE_MEMORY)
 {
   m_pData = NULL;

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.cpp	2007-08-31 02:36:37 UTC (rev 10131)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.cpp	2007-08-31 02:37:02 UTC (rev 10132)
@@ -56,12 +56,10 @@
 {
   m_pPacket = pPacket;
   m_packetSize = packetSize;
-  m_bPacketFreed = false;
 }
 
 CDVDMsgDemuxerPacket::~CDVDMsgDemuxerPacket()
 {
-  m_bPacketFreed = true;
   if (m_pPacket)
   {
     CDVDDemuxUtils::FreeDemuxPacket(m_pPacket);

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.h	2007-08-31 02:36:37 UTC (rev 10131)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.h	2007-08-31 02:37:02 UTC (rev 10132)
@@ -231,7 +231,6 @@
 public: // XXX, test : should be private
   CDVDDemux::DemuxPacket* m_pPacket;
   unsigned int m_packetSize;
-  bool m_bPacketFreed;
 };
 
 class CDVDMsgDemuxerReset : public CDVDMsg

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessageQueue.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessageQueue.cpp	2007-08-31 02:36:37 UTC (rev 10131)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessageQueue.cpp	2007-08-31 02:37:02 UTC (rev 10132)
@@ -179,11 +179,7 @@
       LeaveCriticalSection(&m_critSection);
       
       // wait for a new message
-#ifndef _LINUX
-      if (WaitForSingleObjectEx(m_hEvent, iTimeoutInMilliSeconds, false) == WAIT_TIMEOUT)
-#else
       if (WaitForSingleObject(m_hEvent, iTimeoutInMilliSeconds) == WAIT_TIMEOUT)
-#endif
       {
         // just return here directly, we have already left critical section
         return MSGQ_TIMEOUT;

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDOverlayRenderer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDOverlayRenderer.cpp	2007-08-31 02:36:37 UTC (rev 10131)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDOverlayRenderer.cpp	2007-08-31 02:37:02 UTC (rev 10132)
@@ -24,11 +24,10 @@
       if (e->IsElementType(CDVDOverlayText::ELEMENT_TYPE_TEXT))
       {
         CDVDOverlayText::CElementText* t = (CDVDOverlayText::CElementText*)e;
-        CLog::Log(LOGDEBUG," - %S", t->m_text);
+        CLog::Log(LOGDEBUG, " - %s", t->m_text);
       }
       e = e->pNext;
     }
-    CLog::Log(LOGDEBUG,"");
   }
 }
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2007-08-31 02:36:37 UTC (rev 10131)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2007-08-31 02:37:02 UTC (rev 10132)
@@ -879,9 +879,6 @@
           m_dvd.state = DVDSTATE_NORMAL;
           m_dvd.iDVDStillStartTime = 0;
           m_dvd.iDVDStillTime = 0;
-          m_dvd.state = DVDSTATE_NORMAL;
-          m_dvd.iDVDStillStartTime = 0;
-          m_dvd.iDVDStillTime = 0;
         }
       }
       else if (pMsg->IsType(CDVDMsg::GENERAL_FLUSH))

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp	2007-08-31 02:36:37 UTC (rev 10131)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp	2007-08-31 02:37:02 UTC (rev 10132)
@@ -14,8 +14,6 @@
 }
 #endif
 
-#include "../../Util.h"
-
 CPTSQueue::CPTSQueue()
 {
   Flush();

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp	2007-08-31 02:36:37 UTC (rev 10131)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp	2007-08-31 02:37:02 UTC (rev 10132)
@@ -189,7 +189,6 @@
     }
     else if (ret == MSGQ_TIMEOUT)
     {
-      CLog::Log(LOGINFO, "Got MSGQ_TIMEOUT");
       //Okey, start rendering at stream fps now instead, we are likely in a stillframe
       if( !m_DetectedStill )
       {
@@ -657,7 +656,7 @@
   
 #ifdef HAS_VIDEO_PLAYBACK
   if (!g_renderManager.IsStarted()) {
-    CLog::Log(LOGERROR, "CDVDPlayerVideo::OutputPicture - renderer not started");
+    CLog::Log(LOGERROR, "%s - renderer not started", __FUNCTION__);
     return EOS_ABORT;
   }
 
@@ -676,10 +675,6 @@
     // post processing before FlipPage() is called.)
     g_renderManager.ReleaseImage(index);
   }
-  else { 
-     CLog::Log(LOGDEBUG, "CDVDPlayerVideo::OutputPicture - picture dropped");
-  }
-
 #else
   // no video renderer, let's mark it as dropped
   pPicture->iFlags |= DVP_FLAG_DROPPED;
@@ -746,10 +741,7 @@
   m_iFlipTimeStamp += pPicture->iDuration;
 
   if( (pPicture->iFlags & DVP_FLAG_DROPPED) ) 
-  {
-    CLog::Log(LOGNOTICE, "Frame has been dropped");
     return result | EOS_DROPPED;
-  }
 
   // set fieldsync if picture is interlaced
   EFIELDSYNC mDisplayField = FS_NONE;
@@ -764,12 +756,12 @@
   // present this image after the given delay
   __int64 delay = iCurrentClock + iSleepTime - m_pClock->GetAbsoluteClock();
 
-  if(delay<0) 
-  {
+#ifdef HAS_VIDEO_PLAYBACK
+  if(delay<0)
     g_renderManager.FlipPage( 0, -1, mDisplayField);
-  } else {
+  else
     g_renderManager.FlipPage( (DWORD)(delay * 1000 / DVD_TIME_BASE), -1, mDisplayField);
-  }
+#endif
 
   return result;
 }

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp	2007-08-31 02:36:37 UTC (rev 10131)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp	2007-08-31 02:37:02 UTC (rev 10132)
@@ -91,8 +91,8 @@
           g_charsetConverter.subtitleCharsetToW(line, strUTF16);
           g_charsetConverter.wToUTF8(strUTF16, strUTF8);
 
-      	  // add a new text element to our container
-      	  pOverlay->AddElement(new CDVDOverlayText::CElementText(strUTF8.c_str()));
+          // add a new text element to our container
+          pOverlay->AddElement(new CDVDOverlayText::CElementText(strUTF8.c_str()));
         }
         
         m_collection.Add(pOverlay);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10500
          http://xbmc.svn.sourceforge.net/xbmc/?rev=10500&view=rev
Author:   yuvalt
Date:     2007-10-10 12:07:55 -0700 (Wed, 10 Oct 2007)

Log Message:
-----------
fix: do not demplify the data when doing passthrough

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.h

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.cpp	2007-10-10 16:45:02 UTC (rev 10499)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.cpp	2007-10-10 19:07:55 UTC (rev 10500)
@@ -48,9 +48,11 @@
   m_uiChannels = iChannels;
   m_uiSamplesPerSec = uiSamplesPerSec;
   m_uiBitsPerSample = uiBitsPerSample;
+  m_bPassthrough = bPassthrough;
 
   m_nCurrentVolume = g_stSettings.m_nVolumeLevel;
-  m_amp.SetVolume(m_nCurrentVolume);
+  if (!m_bPassthrough)
+     m_amp.SetVolume(m_nCurrentVolume);
 
   m_dwPacketSize = iChannels*(uiBitsPerSample/8)*512;
   m_dwNumPackets = 16;
@@ -59,7 +61,7 @@
 
   /* Open the device */
   const char* device;
-  if (bPassthrough == false)
+  if (!m_bPassthrough)
     device = g_guiSettings.GetString("audiooutput.audiodevice").c_str();
   else
     device = g_guiSettings.GetString("audiooutput.passthroughdevice").c_str();
@@ -236,7 +238,7 @@
 //***********************************************************************************************
 HRESULT CALSADirectSound::SetCurrentVolume(LONG nVolume)
 {
-  if (!m_bIsAllocated) return -1;
+  if (!m_bIsAllocated || m_bPassthrough) return -1;
   m_nCurrentVolume = nVolume;
   m_amp.SetVolume(nVolume);
   return S_OK;
@@ -277,7 +279,8 @@
 	int framesToWrite = snd_pcm_bytes_to_frames(m_pPlayHandle,nPeriodSize);
 
 	// handle volume de-amp 
-	m_amp.DeAmplify((short *)pcmPtr, framesToWrite * m_uiChannels);
+	if (!m_bPassthrough)
+           m_amp.DeAmplify((short *)pcmPtr, framesToWrite * m_uiChannels);
 	
 	int writeResult = snd_pcm_writei(m_pPlayHandle, pcmPtr, framesToWrite);
 	if (  writeResult == -EPIPE  ) {

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.h	2007-10-10 16:45:02 UTC (rev 10499)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.h	2007-10-10 19:07:55 UTC (rev 10500)
@@ -88,6 +88,8 @@
   unsigned int m_uiChannels;
 
   snd_pcm_uframes_t m_BufferSize;
+
+  bool m_bPassthrough;
 };
 
 #endif 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10822
          http://xbmc.svn.sourceforge.net/xbmc/?rev=10822&view=rev
Author:   vulkanr
Date:     2007-11-22 14:44:07 -0800 (Thu, 22 Nov 2007)

Log Message:
-----------
temporary fix for playing the audio/video queues when the input file is over. before it used to hang waiting for audio to finish - and not accepting 
any commands. a more complete solution is required. possibly not terminating the main thread's loop until all is done.

fix for PCM audio files - some did not play well and even caused crashes due to improper alignment.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.cpp	2007-11-22 18:00:29 UTC (rev 10821)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.cpp	2007-11-22 22:44:07 UTC (rev 10822)
@@ -243,13 +243,13 @@
         return -1;
     }
     
-    m_decodedDataSize = (BYTE*)samples - m_decodedData;
+    m_decodedDataSize = (BYTE*)samples - (BYTE*)m_decodedData;
     return iSize;
 }
 
 int CDVDAudioCodecPcm::GetData(BYTE** dst)
 {
-  *dst = m_decodedData;
+  *dst = (BYTE*)m_decodedData;
   return m_decodedDataSize;
 }
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.h	2007-11-22 18:00:29 UTC (rev 10821)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.h	2007-11-22 22:44:07 UTC (rev 10822)
@@ -24,7 +24,7 @@
   BYTE m_inputBuffer[4096];
   BYTE* m_pInputBuffer;
 
-  BYTE m_decodedData[131072]; // could be a bit to big
+  short m_decodedData[131072]; // could be a bit to big
   int m_decodedDataSize;
 
   CodecID m_codecID;

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2007-11-22 18:00:29 UTC (rev 10821)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2007-11-22 22:44:07 UTC (rev 10822)
@@ -480,6 +480,16 @@
 
     UnlockStreams();
   }
+
+  while (!m_bAbortRequest && 
+         ((!m_dvdPlayerAudio.m_messageQueue.RecievedAbortRequest() && 
+         m_dvdPlayerAudio.m_messageQueue.GetDataSize() > 0) ||
+         (!m_dvdPlayerVideo.m_messageQueue.RecievedAbortRequest() && 
+         m_dvdPlayerVideo.m_messageQueue.GetDataSize() > 0) ))
+  {
+    HandleMessages();
+    Sleep(10);
+  }
 }
 
 void CDVDPlayer::ProcessAudioData(CDemuxStream* pStream, CDVDDemux::DemuxPacket* pPacket)
@@ -729,17 +739,17 @@
     if (m_CurrentAudio.id >= 0)
     {
       CLog::Log(LOGNOTICE, "DVDPlayer: closing audio stream");
-      CloseAudioStream(!m_bAbortRequest);
+      CloseAudioStream(false);
     }
     if (m_CurrentVideo.id >= 0)
     {
       CLog::Log(LOGNOTICE, "DVDPlayer: closing video stream");
-      CloseVideoStream(!m_bAbortRequest);
+      CloseVideoStream(false);
     }
     if (m_CurrentSubtitle.id >= 0)
     {
       CLog::Log(LOGNOTICE, "DVDPlayer: closing video stream");
-      CloseSubtitleStream(!m_bAbortRequest);
+      CloseSubtitleStream(false);
     }
     // destroy the demuxer
     if (m_pDemuxer)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10979
          http://xbmc.svn.sourceforge.net/xbmc/?rev=10979&view=rev
Author:   elupus
Date:     2007-12-12 12:55:45 -0800 (Wed, 12 Dec 2007)

Log Message:
-----------
changed: avoid flushing alsa device if hardware supports pause, and avoid calling pause if it doesn't

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.h

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.cpp	2007-12-12 15:46:26 UTC (rev 10978)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.cpp	2007-12-12 20:55:45 UTC (rev 10979)
@@ -54,6 +54,7 @@
   g_audioContext.SetActiveDevice(CAudioContext::DIRECTSOUND_DEVICE);
 
   m_bPause = false;
+  m_bCanPause = false;
   m_bIsAllocated = false;
   m_uiChannels = iChannels;
   m_uiSamplesPerSec = uiSamplesPerSec;
@@ -193,8 +194,10 @@
   nErr = snd_pcm_sw_params(m_pPlayHandle, sw_params);
   CHECK_ALSA_RETURN(LOGERROR,"snd_pcm_sw_params",nErr);
 
+  m_bCanPause = !!snd_pcm_hw_params_can_pause(hw_params);
+
   snd_pcm_hw_params_free (hw_params);
-  snd_pcm_sw_params_free (sw_params);
+  snd_pcm_sw_params_free (sw_params);  
 
   nErr = snd_pcm_prepare (m_pPlayHandle);
   CHECK_ALSA(LOGERROR,"snd_pcm_prepare",nErr);
@@ -234,9 +237,9 @@
      return;
 
   int nErr = snd_pcm_drop(m_pPlayHandle);
-  CHECK_ALSA(LOGERROR,"flush-drain",nErr); 
+  CHECK_ALSA(LOGERROR,"flush-drop",nErr);
   nErr = snd_pcm_prepare(m_pPlayHandle);
-  CHECK_ALSA(LOGERROR,"flush-prepare",nErr);  
+  CHECK_ALSA(LOGERROR,"flush-prepare",nErr);
   nErr = snd_pcm_start(m_pPlayHandle);
   CHECK_ALSA(LOGERROR,"flush-start",nErr); 
 }
@@ -246,7 +249,18 @@
 {
   if (m_bPause) return S_OK;
   m_bPause = true;
-  snd_pcm_pause(m_pPlayHandle,1); // this is not supported on all devices. 
+
+  if(m_bCanPause)
+  {
+    int nErr = snd_pcm_pause(m_pPlayHandle,1); // this is not supported on all devices.     
+    CHECK_ALSA(LOGERROR,"pcm_pause",nErr);
+    if(nErr<0)
+      m_bCanPause = false;
+  }
+
+  if(!m_bCanPause)
+    Flush();
+
   return S_OK;
 }
 
@@ -255,10 +269,9 @@
 {
   // Resume is called not only after Pause but also at certain other points. like after stop when DVDPlayer is flushed.
   m_bPause = false;
-  snd_pcm_pause(m_pPlayHandle,0);
+  if(m_bCanPause)
+    snd_pcm_pause(m_pPlayHandle,0);
 
-  Flush();
-
   return S_OK;
 }
 
@@ -267,7 +280,7 @@
 {
   if (m_bPause) 
      return S_OK;
-  
+
   if (m_pPlayHandle)
      snd_pcm_drop(m_pPlayHandle);
 
@@ -334,6 +347,10 @@
 	CLog::Log(LOGERROR,"CALSADirectSound::AddPackets - sanity failed. no play handle!");
 	return len; 
   }
+  // if we are paused we don't accept any data as pause doesn't always
+  // work, and then playback would start again
+  if(m_bPause)
+    return 0;
 
   DWORD nAvailSpace = GetSpace();
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.h	2007-12-12 15:46:26 UTC (rev 10978)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.h	2007-12-12 20:55:45 UTC (rev 10979)
@@ -82,6 +82,7 @@
   DWORD m_dwNumPackets;
   bool m_bPause;
   bool m_bIsAllocated;
+  bool m_bCanPause;
 
   unsigned int m_uiSamplesPerSec;
   unsigned int m_uiBitsPerSample;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10986
          http://xbmc.svn.sourceforge.net/xbmc/?rev=10986&view=rev
Author:   vulkanr
Date:     2007-12-13 03:03:49 -0800 (Thu, 13 Dec 2007)

Log Message:
-----------
initial work for getting the video auto-thumb functionality into dvdplayer.
still nothing calls this.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2007-12-13 10:10:13 UTC (rev 10985)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2007-12-13 11:03:49 UTC (rev 10986)
@@ -11,6 +11,7 @@
 #include "DVDDemuxers/DVDFactoryDemuxer.h"
 
 #include "DVDCodecs/DVDCodecs.h"
+#include "DVDCodecs/DVDFactoryCodec.h"
 
 #include "../../Util.h"
 #include "../../utils/GUIInfoManager.h"
@@ -18,6 +19,9 @@
 
 #include "../../FileSystem/cdioSupport.h"
 
+#include "../../Picture.h"
+#include "../ffmpeg/DllSwScale.h"
+
 CDVDPlayer::CDVDPlayer(IPlayerCallback& callback)
     : IPlayer(callback),
       CThread(),
@@ -174,6 +178,153 @@
   g_dvdPerformanceCounter.EnableMainPerformance(ThreadHandle());
 }
 
+bool CDVDPlayer::ExtractThumb(const CStdString &strPath, const CStdString &strTarget)
+{
+  CDVDInputStream *pInputStream = CDVDFactoryInputStream::CreateInputStream(NULL, strPath, "");
+  if (!pInputStream || !pInputStream->Open(strPath.c_str(), ""))
+  {
+    CLog::Log(LOGERROR, "InputStream: Error opening, %s", strPath.c_str());
+    if (pInputStream)
+      delete pInputStream;
+    return false;
+  }
+
+  if (pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD))
+  {
+    CLog::Log(LOGERROR, "InputStream: dvd streams not supported for thumb extraction, file: %s", strPath.c_str());
+    delete pInputStream;
+    return false;
+  }
+
+  CDVDDemux *pDemuxer = NULL;
+
+  try
+  {
+    pDemuxer = CDVDFactoryDemuxer::CreateDemuxer(pInputStream);
+    if(!pDemuxer)
+    {
+      delete pInputStream;
+      CLog::Log(LOGERROR, "%s - Error creating demuxer", __FUNCTION__);
+      return false;
+    }
+
+    if (!pDemuxer->Open(pInputStream))
+    {
+      CLog::Log(LOGERROR, "%s - Error opening demuxer", __FUNCTION__);
+      delete pDemuxer;
+      delete pInputStream;
+      return false;
+    }
+  }
+  catch(...)
+  {
+    CLog::Log(LOGERROR, "%s - Exception thrown when opeing demuxer", __FUNCTION__);
+    if (pDemuxer)
+      delete pDemuxer;
+    delete pInputStream;
+    return false;
+  }
+
+  CDemuxStream* pStream = NULL;
+  int nVideoStream = -1;
+  for (int i = 0; i < pDemuxer->GetNrOfStreams(); i++)
+  {
+    pStream = pDemuxer->GetStream(i);
+    if (pStream && pStream->type == STREAM_VIDEO)
+    {
+      nVideoStream = i;
+      break;
+    }
+  }
+
+  bool bOk = false;
+  if (nVideoStream != -1)
+  {
+    CDVDStreamInfo hint(*pStream, true);
+    CDVDVideoCodec *pVideoCodec = CDVDFactoryCodec::CreateVideoCodec( hint );
+    if (pVideoCodec)
+    {
+      int nSeekTo = 300*1000; // in millis
+      int nTotalLen = DVD_TIME_TO_MSEC(pInputStream->GetLength());
+      if (nSeekTo > nTotalLen / 2)
+        nSeekTo = nTotalLen / 2;
+
+      CLog::Log(LOGDEBUG,"%s - seeking to pos %dms (total: %dms) in %s", __FUNCTION__, nSeekTo, nTotalLen, strPath.c_str());
+      if (pDemuxer->Seek(nSeekTo))
+      {
+        CDVDDemux::DemuxPacket* pPacket = NULL;
+  
+        bool bHasFrame = false;
+        while (!bHasFrame)
+        {
+          do
+          {
+            pPacket = pDemuxer->Read();
+          }   while (pPacket && pPacket->iStreamId != nVideoStream);
+
+          if (pPacket)
+          {
+            int iDecoderState = pVideoCodec->Decode(pPacket->pData, pPacket->iSize, pPacket->pts);
+            if (iDecoderState & VC_PICTURE)
+            {
+              bHasFrame = true;
+              DVDVideoPicture picture;
+              memset(&picture, 0, sizeof(DVDVideoPicture));
+              if (pVideoCodec->GetPicture(&picture))
+              {
+                int nWidth = g_advancedSettings.m_thumbSize;
+                int nHeight = g_advancedSettings.m_thumbSize;
+ 
+                DllSwScale dllSwScale;
+                dllSwScale.Load();
+
+                BYTE *pOutBuf = (BYTE*)new int[nWidth * nHeight * 4];
+                struct SwsContext *context = dllSwScale.sws_getContext(picture.iWidth, picture.iHeight, 
+                      PIX_FMT_YUV420P, nWidth, nHeight, PIX_FMT_RGB32, SWS_BILINEAR, NULL, NULL, NULL);
+                uint8_t *src[] = { picture.data[0], picture.data[1], picture.data[2] };
+                int     srcStride[] = { picture.iLineSize[0], picture.iLineSize[1], picture.iLineSize[2] };
+                uint8_t *dst[] = { pOutBuf, 0, 0 };
+                int     dstStride[] = { nWidth*4, 0, 0 };
+
+                if (context)
+                {
+                  dllSwScale.sws_scale(context, src, srcStride, 0, picture.iHeight, dst, dstStride);  
+                  dllSwScale.sws_freeContext(context);
+
+                  CPicture out;
+                  out.CreateThumbnailFromSurface(pOutBuf, nWidth, nHeight, nWidth * 4, strTarget);
+                  bOk = true; 
+                }
+
+                dllSwScale.Unload();                
+                delete [] pOutBuf;
+              }
+              else 
+              {
+                CLog::Log(LOGDEBUG,"%s - coudln't get picture from decoder in  %s", __FUNCTION__, strPath.c_str());
+              }
+            }
+            else 
+            {
+              CLog::Log(LOGDEBUG,"%s - coudln't get frame from %s", __FUNCTION__, strPath.c_str());
+            }
+          }
+          else 
+          {
+            CLog::Log(LOGDEBUG,"%s - decode failed in %s", __FUNCTION__, strPath.c_str());
+            break;
+          }
+ 
+        }
+      }
+      delete pVideoCodec;
+    }
+  }
+
+  delete pInputStream;
+  return bOk;
+}
+
 void CDVDPlayer::Process()
 {
   int video_index = -1;

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h	2007-12-13 10:10:13 UTC (rev 10985)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h	2007-12-13 11:03:49 UTC (rev 10986)
@@ -128,7 +128,9 @@
   virtual int GetCacheLevel() const ; 
 
   virtual int OnDVDNavResult(void* pData, int iMessage);
-  
+
+  static bool ExtractThumb(const CStdString &strPath, const CStdString &strTarget);
+    
 private:
   void LockStreams()                                            { EnterCriticalSection(&m_critStreamSection); }
   void UnlockStreams()                                          { LeaveCriticalSection(&m_critStreamSection); }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11156
          http://xbmc.svn.sourceforge.net/xbmc/?rev=11156&view=rev
Author:   leafmuncher
Date:     2007-12-31 21:28:08 -0800 (Mon, 31 Dec 2007)

Log Message:
-----------
This is currently little more than a stub, but it shouldn't be hard to finish, using inspiration from the Portaudio paplayer.

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.h

Added: branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.cpp	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.cpp	2008-01-01 05:28:08 UTC (rev 11156)
@@ -0,0 +1,484 @@
+#ifdef __APPLE__
+/*
+* XBoxMediaPlayer
+* Copyright (c) 2002 d7o3g4q and RUNTiME
+* Portions Copyright (c) by the authors of ffmpeg and xvid
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#include <portaudio.h>
+
+#include "stdafx.h"
+#include "PortAudioDirectSound.h"
+#include "AudioContext.h"
+#include "Util.h"
+
+void PortAudioDirectSound::DoWork()
+{
+
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// History:
+//   12.14.07   ESF  Created.
+//
+//////////////////////////////////////////////////////////////////////////////
+PortAudioDirectSound::PortAudioDirectSound(IAudioCallback* pCallback, int iChannels, unsigned int uiSamplesPerSec, unsigned int uiBitsPerSample, bool bResample, char* strAudioCodec, bool bIsMusic, bool bPassthrough)
+{
+  CLog::Log(LOGDEBUG,"PortAudioDirectSound::PortAudioDirectSound - opening device");
+  
+  if (iChannels == 0)
+      iChannels = 2;
+
+  bool bAudioOnAllSpeakers = false;
+  
+  // This should be in the base class.
+  g_audioContext.SetupSpeakerConfig(iChannels, bAudioOnAllSpeakers, bIsMusic);
+  g_audioContext.SetActiveDevice(CAudioContext::DIRECTSOUND_DEVICE);
+
+  m_bPause = false;
+  m_bCanPause = false;
+  m_bIsAllocated = false;
+  m_uiChannels = iChannels;
+  m_uiSamplesPerSec = uiSamplesPerSec;
+  m_uiBitsPerSample = uiBitsPerSample;
+  m_bPassthrough = bPassthrough;
+
+  m_nCurrentVolume = g_stSettings.m_nVolumeLevel;
+  if (!m_bPassthrough)
+     m_amp.SetVolume(m_nCurrentVolume);
+
+  m_dwPacketSize = iChannels*(uiBitsPerSample/8)*512;
+  m_dwNumPackets = 16;
+
+  /* Open the device */
+  CStdString device, deviceuse;
+  if (!m_bPassthrough)
+    device = g_guiSettings.GetString("audiooutput.audiodevice");
+  else
+    device = g_guiSettings.GetString("audiooutput.passthroughdevice");
+
+  printf("Asked to open device: [%s]\n", device.c_str());
+
+  int nErr;
+
+#if 0
+  /* if this is first access to audio, global sound config might not be loaded */
+  if(!snd_config)
+    snd_config_update();
+
+  snd_config_t *config = snd_config;
+  deviceuse = device;
+
+  nErr = snd_config_copy(&config, snd_config);
+  CHECK_ALSA_RETURN(LOGERROR,"config_copy",nErr);
+
+  if(!m_bPassthrough)
+  {
+    // TODO - add an option to only downmix if user want's us
+    if(iChannels == 6)
+      deviceuse = "xbmc_51to2:'" + EscapeDevice(deviceuse) + "'";
+
+    // setup channel mapping to linux default
+    if (strstr(strAudioCodec, "AAC"))
+    {
+      if(iChannels == 6)
+        deviceuse = "xbmc_aac51:'" + EscapeDevice(deviceuse) + "'";
+      else if(iChannels == 5)
+        deviceuse = "xbmc_aac50:'" + EscapeDevice(deviceuse) + "'";
+    }
+    else if (strstr(strAudioCodec, "DMO") || strstr(strAudioCodec, "FLAC") || strstr(strAudioCodec, "PCM"))
+    {
+      if(iChannels == 6)
+        deviceuse = "xbmc_win51:'" + EscapeDevice(deviceuse) + "'";
+      else if(iChannels == 5)
+        deviceuse = "xbmc_win50:'" + EscapeDevice(deviceuse) + "'";
+    }
+    else if (strstr(strAudioCodec, "OggVorbis"))
+    {
+      if(iChannels == 6)
+        deviceuse = "xbmc_ogg51:'" + EscapeDevice(deviceuse) + "'";
+      else if(iChannels == 5)
+        deviceuse = "xbmc_ogg50:'" + EscapeDevice(deviceuse) + "'";
+    }
+
+
+    if(deviceuse != device)
+    {
+      snd_input_t* input;
+      nErr = snd_input_stdio_open(&input, _P("Q:\\system\\asound.conf").c_str(), "r");
+      if(nErr >= 0)
+      {
+        nErr = snd_config_load(config, input);
+        CHECK_ALSA_RETURN(LOGERROR,"config_load", nErr);
+
+        snd_input_close(input);
+        CHECK_ALSA_RETURN(LOGERROR,"input_close", nErr);
+      }
+      else
+      {
+        CLog::Log(LOGWARNING, "%s - Unable to load alsa configuration \"%s\" for device \"%s\" - %s", __FUNCTION__, _P("Q:\\system\\asound.conf").c_str(), deviceuse.c_str(), snd_strerror(nErr));
+        deviceuse = device;
+      }
+    }
+  }
+
+  CLog::Log(LOGDEBUG, "%s - using alsa device %s", __FUNCTION__, deviceuse.c_str());
+
+  nErr = snd_pcm_open_lconf(&m_pPlayHandle, deviceuse.c_str(), SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK, config);
+  CHECK_ALSA_RETURN(LOGERROR,"pcm_open_lconf",nErr);
+
+  snd_config_delete(config);
+
+  /* Allocate Hardware Parameters structures and fills it with config space for PCM */
+  snd_pcm_hw_params_malloc(&hw_params);
+
+  /* Allocate Software Parameters structures and fills it with config space for PCM */
+  snd_pcm_sw_params_malloc(&sw_params);
+
+  nErr = snd_pcm_hw_params_any(m_pPlayHandle, hw_params);
+  CHECK_ALSA_RETURN(LOGERROR,"hw_params_any",nErr);
+
+  nErr = snd_pcm_hw_params_set_access(m_pPlayHandle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED);
+  CHECK_ALSA_RETURN(LOGERROR,"hw_params_set_access",nErr);
+
+  // always use 16 bit samples
+  nErr = snd_pcm_hw_params_set_format(m_pPlayHandle, hw_params, SND_PCM_FORMAT_S16_LE);
+  CHECK_ALSA_RETURN(LOGERROR,"hw_params_set_format",nErr);
+
+  nErr = snd_pcm_hw_params_set_rate_near(m_pPlayHandle, hw_params, &m_uiSamplesPerSec, NULL);
+  CHECK_ALSA_RETURN(LOGERROR,"hw_params_set_rate",nErr);
+
+  nErr = snd_pcm_hw_params_set_channels(m_pPlayHandle, hw_params, iChannels);
+  CHECK_ALSA_RETURN(LOGERROR,"hw_params_set_channels",nErr);
+
+  m_maxFrames = m_dwPacketSize ;
+  nErr = snd_pcm_hw_params_set_period_size_near(m_pPlayHandle, hw_params, &m_maxFrames, 0);
+  CHECK_ALSA_RETURN(LOGERROR,"hw_params_set_period_size",nErr);
+
+  m_BufferSize = snd_pcm_bytes_to_frames(m_pPlayHandle,m_dwPacketSize * 10); // buffer big enough - but not too big...
+  nErr = snd_pcm_hw_params_set_buffer_size_near(m_pPlayHandle, hw_params, &m_BufferSize);
+  CHECK_ALSA_RETURN(LOGERROR,"hw_params_set_buffer_size",nErr);
+
+  unsigned int periodDuration = 0;
+  nErr = snd_pcm_hw_params_get_period_time(hw_params,&periodDuration, 0);
+  CHECK_ALSA(LOGERROR,"hw_params_get_period_time",nErr);
+
+  /* Assign them to the playback handle and free the parameters structure */
+  nErr = snd_pcm_hw_params(m_pPlayHandle, hw_params);
+  CHECK_ALSA_RETURN(LOGERROR,"snd_pcm_hw_params",nErr);
+
+  nErr = snd_pcm_sw_params_current(m_pPlayHandle, sw_params);
+  CHECK_ALSA_RETURN(LOGERROR,"sw_params_current",nErr);
+
+  nErr = snd_pcm_sw_params_set_start_threshold(m_pPlayHandle, sw_params, m_dwPacketSize);
+  CHECK_ALSA_RETURN(LOGERROR,"sw_params_set_start_threshold",nErr);
+
+  nErr = snd_pcm_sw_params(m_pPlayHandle, sw_params);
+  CHECK_ALSA_RETURN(LOGERROR,"snd_pcm_sw_params",nErr);
+
+  m_bCanPause = !!snd_pcm_hw_params_can_pause(hw_params);
+
+  snd_pcm_hw_params_free (hw_params);
+  snd_pcm_sw_params_free (sw_params);  
+
+  nErr = snd_pcm_prepare (m_pPlayHandle);
+  CHECK_ALSA(LOGERROR,"snd_pcm_prepare",nErr);
+
+  m_bIsAllocated = true;
+#endif
+}
+
+//***********************************************************************************************
+PortAudioDirectSound::~PortAudioDirectSound()
+{
+  CLog::Log(LOGDEBUG,"PortAudioDirectSound() dtor\n");
+  Deinitialize();
+}
+
+
+//***********************************************************************************************
+HRESULT PortAudioDirectSound::Deinitialize()
+{
+#if 0
+  CLog::Log(LOGDEBUG,"PortAudioDirectSound::Deinitialize\n");
+
+  m_bIsAllocated = false;
+  if (m_pPlayHandle)
+  {
+    snd_pcm_drop(m_pPlayHandle);
+    snd_pcm_close(m_pPlayHandle);
+  }
+
+  m_pPlayHandle=NULL;
+  	CLog::Log(LOGDEBUG,"PortAudioDirectSound::Deinitialize - set active\n");
+  g_audioContext.SetActiveDevice(CAudioContext::DEFAULT_DEVICE);
+#endif
+  return S_OK;
+}
+
+void PortAudioDirectSound::Flush() {
+#if 0
+  if (m_pPlayHandle == NULL)
+     return;
+
+  int nErr = snd_pcm_drop(m_pPlayHandle);
+  CHECK_ALSA(LOGERROR,"flush-drop",nErr);
+  nErr = snd_pcm_prepare(m_pPlayHandle);
+  CHECK_ALSA(LOGERROR,"flush-prepare",nErr);
+  nErr = snd_pcm_start(m_pPlayHandle);
+  CHECK_ALSA(LOGERROR,"flush-start",nErr); 
+#endif
+}
+
+//***********************************************************************************************
+HRESULT PortAudioDirectSound::Pause()
+{
+  if (m_bPause) return S_OK;
+  m_bPause = true;
+
+#if 0
+  if(m_bCanPause)
+  {
+    int nErr = snd_pcm_pause(m_pPlayHandle,1); // this is not supported on all devices.     
+    CHECK_ALSA(LOGERROR,"pcm_pause",nErr);
+    if(nErr<0)
+      m_bCanPause = false;
+  }
+#endif 
+
+  if(!m_bCanPause)
+    Flush();
+
+  return S_OK;
+}
+
+//***********************************************************************************************
+HRESULT PortAudioDirectSound::Resume()
+{
+#if 0
+  // Resume is called not only after Pause but also at certain other points. like after stop when DVDPlayer is flushed.  
+  if(m_bCanPause && m_bPause)
+    snd_pcm_pause(m_pPlayHandle,0);
+#endif
+
+  // If we are not pause, stream might not be prepared to start flush will do this for us
+  if(!m_bPause)
+    Flush();
+
+  m_bPause = false;
+
+  return S_OK;
+}
+
+//***********************************************************************************************
+HRESULT PortAudioDirectSound::Stop()
+{
+#if 0
+  if (m_pPlayHandle)
+     snd_pcm_drop(m_pPlayHandle);
+#endif
+
+  m_bPause = false;
+
+  return S_OK;
+}
+
+//***********************************************************************************************
+LONG PortAudioDirectSound::GetMinimumVolume() const
+{
+  return -60;
+}
+
+//***********************************************************************************************
+LONG PortAudioDirectSound::GetMaximumVolume() const
+{
+  return 60;
+}
+
+//***********************************************************************************************
+LONG PortAudioDirectSound::GetCurrentVolume() const
+{
+  return m_nCurrentVolume;
+}
+
+//***********************************************************************************************
+void PortAudioDirectSound::Mute(bool bMute)
+{
+  if (!m_bIsAllocated) return;
+
+  if (bMute)
+    SetCurrentVolume(GetMinimumVolume());
+  else
+    SetCurrentVolume(m_nCurrentVolume);
+
+}
+
+//***********************************************************************************************
+HRESULT PortAudioDirectSound::SetCurrentVolume(LONG nVolume)
+{
+  if (!m_bIsAllocated || m_bPassthrough) return -1;
+  m_nCurrentVolume = nVolume;
+  m_amp.SetVolume(nVolume);
+  return S_OK;
+}
+
+
+//***********************************************************************************************
+DWORD PortAudioDirectSound::GetSpace()
+{
+  if (!m_bIsAllocated) return 0;
+
+#if 0
+  int nSpace = snd_pcm_avail_update(m_pPlayHandle);
+  if (nSpace < 0) {
+     CLog::Log(LOGWARNING,"PortAudioDirectSound::GetSpace - get space failed. err: %d (%s)", nSpace, snd_strerror(nSpace));
+     nSpace = 0;
+  }
+
+  return nSpace;
+#endif
+  return 0;
+}
+
+//***********************************************************************************************
+DWORD PortAudioDirectSound::AddPackets(unsigned char *data, DWORD len)
+{
+#if 0
+  if (!m_pPlayHandle) {
+	CLog::Log(LOGERROR,"PortAudioDirectSound::AddPackets - sanity failed. no play handle!");
+	return len; 
+  }
+#endif
+  
+  // If we are paused we don't accept any data as pause doesn't always
+  // work, and then playback would start again
+  //
+  if(m_bPause)
+    return 0;
+
+  DWORD nAvailSpace = GetSpace();
+
+#if 0
+  // if there is no room in the buffer - even for one frame, return 
+  if ( snd_pcm_frames_to_bytes(m_pPlayHandle,nAvailSpace) < (int) len )
+  {
+    if (nAvailSpace <= m_maxFrames || (DWORD)snd_pcm_frames_to_bytes(m_pPlayHandle,nAvailSpace) <= m_dwPacketSize)
+       return 0;
+
+    len = snd_pcm_frames_to_bytes(m_pPlayHandle,nAvailSpace);
+  }
+
+  unsigned char *pcmPtr = data;
+
+  while (pcmPtr < data + (int)len){  
+	int nPeriodSize = snd_pcm_frames_to_bytes(m_pPlayHandle,m_maxFrames); // write max frames.
+	if ( pcmPtr + nPeriodSize > data + (int)len) {
+		nPeriodSize = data + (int)len - pcmPtr;
+	}
+	
+	int framesToWrite = snd_pcm_bytes_to_frames(m_pPlayHandle,nPeriodSize);
+
+	// handle volume de-amp 
+	if (!m_bPassthrough)
+           m_amp.DeAmplify((short *)pcmPtr, framesToWrite * m_uiChannels);
+	
+	int writeResult = snd_pcm_writei(m_pPlayHandle, pcmPtr, framesToWrite);
+	if (  writeResult == -EPIPE  ) {
+		CLog::Log(LOGDEBUG, "PortAudioDirectSound::AddPackets - buffer underun (tried to write %d frames)",
+						framesToWrite);
+		int err = snd_pcm_prepare(m_pPlayHandle);
+		CHECK_ALSA(LOGERROR,"prepare after EPIPE", err);
+	}
+	else if (writeResult != framesToWrite) {
+		CLog::Log(LOGERROR, "PortAudioDirectSound::AddPackets - failed to write %d frames. "
+						"bad write (err: %d) - %s",
+						framesToWrite, writeResult, snd_strerror(writeResult));
+	}
+
+    if (writeResult>0)
+		pcmPtr += snd_pcm_frames_to_bytes(m_pPlayHandle,writeResult);
+	else
+		pcmPtr += snd_pcm_frames_to_bytes(m_pPlayHandle,framesToWrite); 
+  }
+#endif
+
+  return len;
+}
+
+//***********************************************************************************************
+FLOAT PortAudioDirectSound::GetDelay()
+{
+  double delay = 0.0;
+
+#if 0
+  double fbps = (double)m_uiSamplesPerSec * 2.0 * (double)m_uiChannels;
+  snd_pcm_sframes_t frames = 0;
+    
+  int nErr = snd_pcm_delay(m_pPlayHandle, &frames);
+  CHECK_ALSA(LOGERROR,"snd_pcm_delay",nErr); 
+  if (nErr < 0)
+     return (double)snd_pcm_frames_to_bytes(m_pPlayHandle,m_BufferSize) / fbps;
+
+  if (frames < 0) {
+#if SND_LIB_VERSION >= 0x000901 /* snd_pcm_forward() exists since 0.9.0rc8 */
+    snd_pcm_forward(m_pPlayHandle, -frames);
+#endif
+    frames = 0;
+  }
+
+  int nBytes = snd_pcm_frames_to_bytes(m_pPlayHandle,frames);
+  delay = (double)nBytes / fbps;
+
+  if (g_audioContext.IsAC3EncoderActive())
+    delay += 0.049;
+  else
+    delay += 0.008;
+#endif
+  return delay;
+}
+
+//***********************************************************************************************
+DWORD PortAudioDirectSound::GetChunkLen()
+{
+  return m_dwPacketSize;
+}
+//***********************************************************************************************
+int PortAudioDirectSound::SetPlaySpeed(int iSpeed)
+{
+  return 0;
+}
+
+void PortAudioDirectSound::RegisterAudioCallback(IAudioCallback *pCallback)
+{
+  m_pCallback = pCallback;
+}
+
+void PortAudioDirectSound::UnRegisterAudioCallback()
+{
+  m_pCallback = NULL;
+}
+
+void PortAudioDirectSound::WaitCompletion()
+{
+
+}
+
+void PortAudioDirectSound::SwitchChannels(int iAudioStream, bool bAudioOnAllSpeakers)
+{
+    return ;
+}
+#endif
\ No newline at end of file

Added: branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.h	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.h	2008-01-01 05:28:08 UTC (rev 11156)
@@ -0,0 +1,92 @@
+/*
+* XBoxMediaPlayer
+* Copyright (c) 2002 d7o3g4q and RUNTiME
+* Portions Copyright (c) by the authors of ffmpeg and xvid
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+// AsyncAudioRenderer.h: interface for the CAsyncDirectSound class.
+//
+//////////////////////////////////////////////////////////////////////
+
+#ifndef __ALSA_DIRECT_SOUND_H__
+#define __ALSA_DIRECT_SOUND_H__
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include "../mplayer/IDirectSoundRenderer.h"
+#include "../mplayer/IAudioCallback.h"
+#include "../ssrc.h"
+#include "../../utils/PCMAmplifier.h"
+
+extern void RegisterAudioCallback(IAudioCallback* pCallback);
+extern void UnRegisterAudioCallback();
+
+class PortAudioDirectSound : public IDirectSoundRenderer
+{
+public:
+  virtual void UnRegisterAudioCallback();
+  virtual void RegisterAudioCallback(IAudioCallback* pCallback);
+  virtual DWORD GetChunkLen();
+  virtual FLOAT GetDelay();
+  PortAudioDirectSound(IAudioCallback* pCallback, int iChannels, unsigned int uiSamplesPerSec, unsigned int uiBitsPerSample, bool bResample, char* strAudioCodec = "", bool bIsMusic=false, bool bPassthrough = false);
+  virtual ~PortAudioDirectSound();
+
+  virtual DWORD AddPackets(unsigned char* data, DWORD len);
+  virtual DWORD GetSpace();
+  virtual HRESULT Deinitialize();
+  virtual HRESULT Pause();
+  virtual HRESULT Stop();
+  virtual HRESULT Resume();
+
+  virtual LONG GetMinimumVolume() const;
+  virtual LONG GetMaximumVolume() const;
+  virtual LONG GetCurrentVolume() const;
+  virtual void Mute(bool bMute);
+  virtual HRESULT SetCurrentVolume(LONG nVolume);
+  virtual int SetPlaySpeed(int iSpeed);
+  virtual void WaitCompletion();
+  virtual void DoWork();
+  virtual void SwitchChannels(int iAudioStream, bool bAudioOnAllSpeakers);
+  virtual void Flush();
+
+private:
+  //snd_pcm_t 		*m_pPlayHandle;
+  //snd_pcm_uframes_t 	m_maxFrames;
+
+  IAudioCallback* m_pCallback;
+
+  CPCMAmplifier 	m_amp;
+  LONG m_nCurrentVolume;
+  DWORD m_dwPacketSize;
+  DWORD m_dwNumPackets;
+  bool m_bPause;
+  bool m_bIsAllocated;
+  bool m_bCanPause;
+
+  unsigned int m_uiSamplesPerSec;
+  unsigned int m_uiBitsPerSample;
+  unsigned int m_uiChannels;
+
+  //snd_pcm_uframes_t m_BufferSize;
+
+  bool m_bPassthrough;
+};
+
+#endif 
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11457
          http://xbmc.svn.sourceforge.net/xbmc/?rev=11457&view=rev
Author:   leafmuncher
Date:     2008-01-28 22:04:38 -0800 (Mon, 28 Jan 2008)

Log Message:
-----------
Support for audio through Portaudio in the dvdplayer.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.h

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.cpp	2008-01-29 06:03:48 UTC (rev 11456)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.cpp	2008-01-29 06:04:38 UTC (rev 11457)
@@ -18,8 +18,7 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include <portaudio.h>
-
+#include "CPortAudio.h"
 #include "stdafx.h"
 #include "PortAudioDirectSound.h"
 #include "AudioContext.h"
@@ -73,133 +72,18 @@
 
   printf("Asked to open device: [%s]\n", device.c_str());
 
-  int nErr;
+  m_pStream = CPortAudio::CreateOutputStream(device,
+                                             m_uiChannels, 
+                                             m_uiSamplesPerSec, 
+                                             m_uiBitsPerSample,
+                                             m_bPassthrough,
+                                             m_dwPacketSize);
+  
+  // Start the stream.
+  SAFELY(Pa_StartStream(m_pStream));
 
-#if 0
-  /* if this is first access to audio, global sound config might not be loaded */
-  if(!snd_config)
-    snd_config_update();
-
-  snd_config_t *config = snd_config;
-  deviceuse = device;
-
-  nErr = snd_config_copy(&config, snd_config);
-  CHECK_ALSA_RETURN(LOGERROR,"config_copy",nErr);
-
-  if(!m_bPassthrough)
-  {
-    // TODO - add an option to only downmix if user want's us
-    if(iChannels == 6)
-      deviceuse = "xbmc_51to2:'" + EscapeDevice(deviceuse) + "'";
-
-    // setup channel mapping to linux default
-    if (strstr(strAudioCodec, "AAC"))
-    {
-      if(iChannels == 6)
-        deviceuse = "xbmc_aac51:'" + EscapeDevice(deviceuse) + "'";
-      else if(iChannels == 5)
-        deviceuse = "xbmc_aac50:'" + EscapeDevice(deviceuse) + "'";
-    }
-    else if (strstr(strAudioCodec, "DMO") || strstr(strAudioCodec, "FLAC") || strstr(strAudioCodec, "PCM"))
-    {
-      if(iChannels == 6)
-        deviceuse = "xbmc_win51:'" + EscapeDevice(deviceuse) + "'";
-      else if(iChannels == 5)
-        deviceuse = "xbmc_win50:'" + EscapeDevice(deviceuse) + "'";
-    }
-    else if (strstr(strAudioCodec, "OggVorbis"))
-    {
-      if(iChannels == 6)
-        deviceuse = "xbmc_ogg51:'" + EscapeDevice(deviceuse) + "'";
-      else if(iChannels == 5)
-        deviceuse = "xbmc_ogg50:'" + EscapeDevice(deviceuse) + "'";
-    }
-
-
-    if(deviceuse != device)
-    {
-      snd_input_t* input;
-      nErr = snd_input_stdio_open(&input, _P("Q:\\system\\asound.conf").c_str(), "r");
-      if(nErr >= 0)
-      {
-        nErr = snd_config_load(config, input);
-        CHECK_ALSA_RETURN(LOGERROR,"config_load", nErr);
-
-        snd_input_close(input);
-        CHECK_ALSA_RETURN(LOGERROR,"input_close", nErr);
-      }
-      else
-      {
-        CLog::Log(LOGWARNING, "%s - Unable to load alsa configuration \"%s\" for device \"%s\" - %s", __FUNCTION__, _P("Q:\\system\\asound.conf").c_str(), deviceuse.c_str(), snd_strerror(nErr));
-        deviceuse = device;
-      }
-    }
-  }
-
-  CLog::Log(LOGDEBUG, "%s - using alsa device %s", __FUNCTION__, deviceuse.c_str());
-
-  nErr = snd_pcm_open_lconf(&m_pPlayHandle, deviceuse.c_str(), SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK, config);
-  CHECK_ALSA_RETURN(LOGERROR,"pcm_open_lconf",nErr);
-
-  snd_config_delete(config);
-
-  /* Allocate Hardware Parameters structures and fills it with config space for PCM */
-  snd_pcm_hw_params_malloc(&hw_params);
-
-  /* Allocate Software Parameters structures and fills it with config space for PCM */
-  snd_pcm_sw_params_malloc(&sw_params);
-
-  nErr = snd_pcm_hw_params_any(m_pPlayHandle, hw_params);
-  CHECK_ALSA_RETURN(LOGERROR,"hw_params_any",nErr);
-
-  nErr = snd_pcm_hw_params_set_access(m_pPlayHandle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED);
-  CHECK_ALSA_RETURN(LOGERROR,"hw_params_set_access",nErr);
-
-  // always use 16 bit samples
-  nErr = snd_pcm_hw_params_set_format(m_pPlayHandle, hw_params, SND_PCM_FORMAT_S16_LE);
-  CHECK_ALSA_RETURN(LOGERROR,"hw_params_set_format",nErr);
-
-  nErr = snd_pcm_hw_params_set_rate_near(m_pPlayHandle, hw_params, &m_uiSamplesPerSec, NULL);
-  CHECK_ALSA_RETURN(LOGERROR,"hw_params_set_rate",nErr);
-
-  nErr = snd_pcm_hw_params_set_channels(m_pPlayHandle, hw_params, iChannels);
-  CHECK_ALSA_RETURN(LOGERROR,"hw_params_set_channels",nErr);
-
-  m_maxFrames = m_dwPacketSize ;
-  nErr = snd_pcm_hw_params_set_period_size_near(m_pPlayHandle, hw_params, &m_maxFrames, 0);
-  CHECK_ALSA_RETURN(LOGERROR,"hw_params_set_period_size",nErr);
-
-  m_BufferSize = snd_pcm_bytes_to_frames(m_pPlayHandle,m_dwPacketSize * 10); // buffer big enough - but not too big...
-  nErr = snd_pcm_hw_params_set_buffer_size_near(m_pPlayHandle, hw_params, &m_BufferSize);
-  CHECK_ALSA_RETURN(LOGERROR,"hw_params_set_buffer_size",nErr);
-
-  unsigned int periodDuration = 0;
-  nErr = snd_pcm_hw_params_get_period_time(hw_params,&periodDuration, 0);
-  CHECK_ALSA(LOGERROR,"hw_params_get_period_time",nErr);
-
-  /* Assign them to the playback handle and free the parameters structure */
-  nErr = snd_pcm_hw_params(m_pPlayHandle, hw_params);
-  CHECK_ALSA_RETURN(LOGERROR,"snd_pcm_hw_params",nErr);
-
-  nErr = snd_pcm_sw_params_current(m_pPlayHandle, sw_params);
-  CHECK_ALSA_RETURN(LOGERROR,"sw_params_current",nErr);
-
-  nErr = snd_pcm_sw_params_set_start_threshold(m_pPlayHandle, sw_params, m_dwPacketSize);
-  CHECK_ALSA_RETURN(LOGERROR,"sw_params_set_start_threshold",nErr);
-
-  nErr = snd_pcm_sw_params(m_pPlayHandle, sw_params);
-  CHECK_ALSA_RETURN(LOGERROR,"snd_pcm_sw_params",nErr);
-
-  m_bCanPause = !!snd_pcm_hw_params_can_pause(hw_params);
-
-  snd_pcm_hw_params_free (hw_params);
-  snd_pcm_sw_params_free (sw_params);  
-
-  nErr = snd_pcm_prepare (m_pPlayHandle);
-  CHECK_ALSA(LOGERROR,"snd_pcm_prepare",nErr);
-
+  m_bCanPause = false;
   m_bIsAllocated = true;
-#endif
 }
 
 //***********************************************************************************************
@@ -213,87 +97,63 @@
 //***********************************************************************************************
 HRESULT PortAudioDirectSound::Deinitialize()
 {
-#if 0
   CLog::Log(LOGDEBUG,"PortAudioDirectSound::Deinitialize\n");
-
-  m_bIsAllocated = false;
-  if (m_pPlayHandle)
+  
+  if (m_pStream)
   {
-    snd_pcm_drop(m_pPlayHandle);
-    snd_pcm_close(m_pPlayHandle);
+    SAFELY(Pa_StopStream(m_pStream));
+    SAFELY(Pa_CloseStream(m_pStream));
   }
-
-  m_pPlayHandle=NULL;
-  	CLog::Log(LOGDEBUG,"PortAudioDirectSound::Deinitialize - set active\n");
+  
+  m_bIsAllocated = false;
+  m_pStream = 0;
+  
+ 	CLog::Log(LOGDEBUG,"PortAudioDirectSound::Deinitialize - set active\n");
   g_audioContext.SetActiveDevice(CAudioContext::DEFAULT_DEVICE);
-#endif
+
   return S_OK;
 }
 
-void PortAudioDirectSound::Flush() {
-#if 0
-  if (m_pPlayHandle == NULL)
-     return;
-
-  int nErr = snd_pcm_drop(m_pPlayHandle);
-  CHECK_ALSA(LOGERROR,"flush-drop",nErr);
-  nErr = snd_pcm_prepare(m_pPlayHandle);
-  CHECK_ALSA(LOGERROR,"flush-prepare",nErr);
-  nErr = snd_pcm_start(m_pPlayHandle);
-  CHECK_ALSA(LOGERROR,"flush-start",nErr); 
-#endif
+//***********************************************************************************************
+void PortAudioDirectSound::Flush() 
+{
+  if (m_pStream)
+  {
+    SAFELY(Pa_AbortStream(m_pStream));
+    SAFELY(Pa_StartStream(m_pStream));
+  }
 }
 
 //***********************************************************************************************
 HRESULT PortAudioDirectSound::Pause()
 {
-  if (m_bPause) return S_OK;
+  if (m_bPause) 
+    return S_OK;
+  
   m_bPause = true;
+  Flush();
 
-#if 0
-  if(m_bCanPause)
-  {
-    int nErr = snd_pcm_pause(m_pPlayHandle,1); // this is not supported on all devices.     
-    CHECK_ALSA(LOGERROR,"pcm_pause",nErr);
-    if(nErr<0)
-      m_bCanPause = false;
-  }
-#endif 
-
-  if(!m_bCanPause)
-    Flush();
-
   return S_OK;
 }
 
 //***********************************************************************************************
 HRESULT PortAudioDirectSound::Resume()
 {
-#if 0
-  // Resume is called not only after Pause but also at certain other points. like after stop when DVDPlayer is flushed.  
-  if(m_bCanPause && m_bPause)
-    snd_pcm_pause(m_pPlayHandle,0);
-#endif
-
   // If we are not pause, stream might not be prepared to start flush will do this for us
-  if(!m_bPause)
+  if (!m_bPause)
     Flush();
 
   m_bPause = false;
-
   return S_OK;
 }
 
 //***********************************************************************************************
 HRESULT PortAudioDirectSound::Stop()
 {
-#if 0
-  if (m_pPlayHandle)
-     snd_pcm_drop(m_pPlayHandle);
-#endif
+  if (m_pStream)
+    SAFELY(Pa_StopStream(m_pStream));
 
   m_bPause = false;
-
   return S_OK;
 }
 
@@ -340,114 +200,55 @@
 //***********************************************************************************************
 DWORD PortAudioDirectSound::GetSpace()
 {
-  if (!m_bIsAllocated) return 0;
-
-#if 0
-  int nSpace = snd_pcm_avail_update(m_pPlayHandle);
-  if (nSpace < 0) {
-     CLog::Log(LOGWARNING,"PortAudioDirectSound::GetSpace - get space failed. err: %d (%s)", nSpace, snd_strerror(nSpace));
-     nSpace = 0;
-  }
-
-  return nSpace;
-#endif
-  return 0;
+  if (!m_bIsAllocated) 
+    return 0;
+  
+  // Figure out how much space is available.
+  DWORD numFrames = Pa_GetStreamWriteAvailable(m_pStream);
+  
+  printf("Returning %d bytes free\n", numFrames * (m_uiBitsPerSample/8));
+  return numFrames * (m_uiBitsPerSample/8);
 }
 
 //***********************************************************************************************
 DWORD PortAudioDirectSound::AddPackets(unsigned char *data, DWORD len)
 {
-#if 0
-  if (!m_pPlayHandle) {
-	CLog::Log(LOGERROR,"PortAudioDirectSound::AddPackets - sanity failed. no play handle!");
-	return len; 
+  if (!m_pStream) 
+  {
+    CLog::Log(LOGERROR,"PortAudioDirectSound::AddPackets - sanity failed. no play handle!");
+    return len; 
   }
-#endif
   
-  // If we are paused we don't accept any data as pause doesn't always
-  // work, and then playback would start again
-  //
-  if(m_bPause)
-    return 0;
+  // Find out how much space we have available.
+  DWORD framesPassedIn = len / (m_uiChannels * m_uiBitsPerSample/8);
+  DWORD framesToWrite  = MIN(Pa_GetStreamWriteAvailable(m_pStream), framesPassedIn);
+  
+  unsigned char* pcmPtr = data;
+  
+  // Handle volume de-amplification.
+  if (!m_bPassthrough)
+    m_amp.DeAmplify((short *)pcmPtr, framesToWrite * m_uiChannels);
+  
+  // Write data to the stream.
+  SAFELY(Pa_WriteStream(m_pStream, pcmPtr, framesToWrite));
 
-  DWORD nAvailSpace = GetSpace();
-
-#if 0
-  // if there is no room in the buffer - even for one frame, return 
-  if ( snd_pcm_frames_to_bytes(m_pPlayHandle,nAvailSpace) < (int) len )
-  {
-    if (nAvailSpace <= m_maxFrames || (DWORD)snd_pcm_frames_to_bytes(m_pPlayHandle,nAvailSpace) <= m_dwPacketSize)
-       return 0;
-
-    len = snd_pcm_frames_to_bytes(m_pPlayHandle,nAvailSpace);
-  }
-
-  unsigned char *pcmPtr = data;
-
-  while (pcmPtr < data + (int)len){  
-	int nPeriodSize = snd_pcm_frames_to_bytes(m_pPlayHandle,m_maxFrames); // write max frames.
-	if ( pcmPtr + nPeriodSize > data + (int)len) {
-		nPeriodSize = data + (int)len - pcmPtr;
-	}
-	
-	int framesToWrite = snd_pcm_bytes_to_frames(m_pPlayHandle,nPeriodSize);
-
-	// handle volume de-amp 
-	if (!m_bPassthrough)
-           m_amp.DeAmplify((short *)pcmPtr, framesToWrite * m_uiChannels);
-	
-	int writeResult = snd_pcm_writei(m_pPlayHandle, pcmPtr, framesToWrite);
-	if (  writeResult == -EPIPE  ) {
-		CLog::Log(LOGDEBUG, "PortAudioDirectSound::AddPackets - buffer underun (tried to write %d frames)",
-						framesToWrite);
-		int err = snd_pcm_prepare(m_pPlayHandle);
-		CHECK_ALSA(LOGERROR,"prepare after EPIPE", err);
-	}
-	else if (writeResult != framesToWrite) {
-		CLog::Log(LOGERROR, "PortAudioDirectSound::AddPackets - failed to write %d frames. "
-						"bad write (err: %d) - %s",
-						framesToWrite, writeResult, snd_strerror(writeResult));
-	}
-
-    if (writeResult>0)
-		pcmPtr += snd_pcm_frames_to_bytes(m_pPlayHandle,writeResult);
-	else
-		pcmPtr += snd_pcm_frames_to_bytes(m_pPlayHandle,framesToWrite); 
-  }
-#endif
-
-  return len;
+  return framesToWrite * m_uiChannels * (m_uiBitsPerSample/8);
 }
 
 //***********************************************************************************************
 FLOAT PortAudioDirectSound::GetDelay()
 {
-  double delay = 0.0;
+  if (m_pStream == 0)
+    return 0.0;
+  
+  const PaStreamInfo* streamInfo = Pa_GetStreamInfo(m_pStream);
+  FLOAT delay = (FLOAT)streamInfo->outputLatency;
 
-#if 0
-  double fbps = (double)m_uiSamplesPerSec * 2.0 * (double)m_uiChannels;
-  snd_pcm_sframes_t frames = 0;
-    
-  int nErr = snd_pcm_delay(m_pPlayHandle, &frames);
-  CHECK_ALSA(LOGERROR,"snd_pcm_delay",nErr); 
-  if (nErr < 0)
-     return (double)snd_pcm_frames_to_bytes(m_pPlayHandle,m_BufferSize) / fbps;
-
-  if (frames < 0) {
-#if SND_LIB_VERSION >= 0x000901 /* snd_pcm_forward() exists since 0.9.0rc8 */
-    snd_pcm_forward(m_pPlayHandle, -frames);
-#endif
-    frames = 0;
-  }
-
-  int nBytes = snd_pcm_frames_to_bytes(m_pPlayHandle,frames);
-  delay = (double)nBytes / fbps;
-
   if (g_audioContext.IsAC3EncoderActive())
     delay += 0.049;
   else
     delay += 0.008;
-#endif
+
   return delay;
 }
 
@@ -481,4 +282,4 @@
 {
     return ;
 }
-#endif
\ No newline at end of file
+#endif

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.h	2008-01-29 06:03:48 UTC (rev 11456)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.h	2008-01-29 06:04:38 UTC (rev 11457)
@@ -22,13 +22,10 @@
 //
 //////////////////////////////////////////////////////////////////////
 
-#ifndef __ALSA_DIRECT_SOUND_H__
-#define __ALSA_DIRECT_SOUND_H__
+#ifndef __PORTAUDIO_DIRECT_SOUND_H__
+#define __PORTAUDIO_DIRECT_SOUND_H__
 
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
+#include "portaudio.h"
 #include "../mplayer/IDirectSoundRenderer.h"
 #include "../mplayer/IAudioCallback.h"
 #include "../ssrc.h"
@@ -66,7 +63,7 @@
   virtual void Flush();
 
 private:
-  //snd_pcm_t 		*m_pPlayHandle;
+  PaStream*  m_pStream;
   //snd_pcm_uframes_t 	m_maxFrames;
 
   IAudioCallback* m_pCallback;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11464
          http://xbmc.svn.sourceforge.net/xbmc/?rev=11464&view=rev
Author:   leafmuncher
Date:     2008-01-28 22:22:47 -0800 (Mon, 28 Jan 2008)

Log Message:
-----------
Lock the queues, as in some cases (perhaps only when debug display was on?) this was causing crashes.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.h

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp	2008-01-29 06:20:12 UTC (rev 11463)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp	2008-01-29 06:22:47 UTC (rev 11464)
@@ -14,6 +14,8 @@
 
 void CPTSOutputQueue::Add(double pts, double delay, double duration)
 {
+  CSingleLock lock(m_sync);
+  
   TPTSItem item;
   item.pts = pts;
   item.timestamp = CDVDClock::GetAbsoluteClock() + delay;
@@ -26,6 +28,8 @@
 }
 void CPTSOutputQueue::Flush()
 {
+  CSingleLock lock(m_sync);
+  
   while( !m_queue.empty() ) m_queue.pop();
   m_current.pts = DVD_NOPTS_VALUE;
   m_current.timestamp = 0.0;
@@ -33,7 +37,9 @@
 }
 
 double CPTSOutputQueue::Current()
-{   
+{
+  CSingleLock lock(m_sync);
+  
   while( !m_queue.empty() && CDVDClock::GetAbsoluteClock() >= m_queue.front().timestamp )
   {
     m_current = m_queue.front();
@@ -47,15 +53,21 @@
 
 void CPTSInputQueue::Add(__int64 bytes, double pts)
 {
+  CSingleLock lock(m_sync);
+  
   m_list.insert(m_list.begin(), make_pair(bytes, pts));
 }
 
 void CPTSInputQueue::Flush()
 {
+  CSingleLock lock(m_sync);
+  
   m_list.clear();
 }
 double CPTSInputQueue::Get(__int64 bytes, bool consume)
 {
+  CSingleLock lock(m_sync);
+  
   IT it = m_list.begin();
   for(; it != m_list.end(); it++)
   {

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.h	2008-01-29 06:20:12 UTC (rev 11463)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.h	2008-01-29 06:22:47 UTC (rev 11464)
@@ -38,6 +38,7 @@
   typedef struct {double pts; double timestamp; double duration;} TPTSItem;
   TPTSItem m_current;
   std::queue<TPTSItem> m_queue;
+  CCriticalSection m_sync;
 
 public:
   CPTSOutputQueue();
@@ -51,6 +52,7 @@
 private:
   typedef std::list<std::pair<__int64, double> >::iterator IT;
   std::list<std::pair<__int64, double> > m_list;
+  CCriticalSection m_sync;
 public:
   void   Add(__int64 bytes, double pts);
   double Get(__int64 bytes, bool consume);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11481
          http://xbmc.svn.sourceforge.net/xbmc/?rev=11481&view=rev
Author:   leafmuncher
Date:     2008-01-30 00:42:01 -0800 (Wed, 30 Jan 2008)

Log Message:
-----------
Include the right files on OS X.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDAudio.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDAudio.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDAudio.h	2008-01-30 08:40:59 UTC (rev 11480)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDAudio.h	2008-01-30 08:42:01 UTC (rev 11481)
@@ -8,8 +8,12 @@
 #ifndef _LINUX
 enum CodecID;
 #else
+#ifdef __APPLE__
+#include "libffmpeg-OSX/avcodec.h"
+#else
 #include "ffmpeg/avcodec.h"
 #endif
+#endif
 typedef struct stDVDAudioFrame DVDAudioFrame;
 
 class CDVDAudio

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h	2008-01-30 08:40:59 UTC (rev 11480)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h	2008-01-30 08:42:01 UTC (rev 11481)
@@ -6,8 +6,12 @@
 #ifndef _LINUX
 enum CodecID;
 #else
+#ifdef __APPLE__
+#include "libffmpeg-OSX/avcodec.h"
+#else
 #include "../../ffmpeg/avcodec.h"
 #endif
+#endif
 enum AVDiscard;
 
 enum StreamType


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11556
          http://xbmc.svn.sourceforge.net/xbmc/?rev=11556&view=rev
Author:   elupus
Date:     2008-02-07 15:52:00 -0800 (Thu, 07 Feb 2008)

Log Message:
-----------
r11552: changing audiostream while dvdplayer is paused would lockup xbmc
r11553: audio switching in dvdplayer wasn't working correctly
r11554: avoid seeking back if dvdplayer demuxer failed to read probe data

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2008-02-07 23:49:30 UTC (rev 11555)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2008-02-07 23:52:00 UTC (rev 11556)
@@ -270,15 +270,15 @@
       pd.filename = strFile.c_str();
 
       // read data using avformat's buffers
-      pd.buf_size = m_dllAvFormat.get_buffer(m_ioContext, pd.buf, sizeof(probe_buffer));
-      m_dllAvFormat.url_fseek(m_ioContext , 0, SEEK_SET);
-      
+      pd.buf_size = m_dllAvFormat.get_buffer(m_ioContext, pd.buf, sizeof(probe_buffer));            
       if (pd.buf_size == 0)
       {
         CLog::Log(LOGERROR, "%s - error reading from input stream, %s", __FUNCTION__, strFile.c_str());
         return false;
       }
-      
+      // restore position again
+      m_dllAvFormat.url_fseek(m_ioContext , 0, SEEK_SET);
+
       iformat = m_dllAvFormat.av_probe_input_format(&pd, 1);
       if (!iformat)
       {

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-02-07 23:49:30 UTC (rev 11555)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-02-07 23:52:00 UTC (rev 11556)
@@ -1199,7 +1199,7 @@
       {
         CDVDMsgPlayerSetAudioStream* pMsg2 = (CDVDMsgPlayerSetAudioStream*)pMsg;        
 
-        SelectionStream& st = m_SelectionStreams.Get(STREAM_SUBTITLE, pMsg2->GetStreamId());
+        SelectionStream& st = m_SelectionStreams.Get(STREAM_AUDIO, pMsg2->GetStreamId());
         if(&st != NULL)
         {
           if(st.source == STREAM_SOURCE_NAV && m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD))

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp	2008-02-07 23:49:30 UTC (rev 11555)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp	2008-02-07 23:52:00 UTC (rev 11556)
@@ -139,7 +139,7 @@
 void CDVDPlayerAudio::CloseStream(bool bWaitForBuffers)
 {
   // wait until buffers are empty
-  if (bWaitForBuffers) m_messageQueue.WaitUntilEmpty();
+  if (bWaitForBuffers && m_speed > 0) m_messageQueue.WaitUntilEmpty();
 
   // send abort message to the audio queue
   m_messageQueue.Abort();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11564
          http://xbmc.svn.sourceforge.net/xbmc/?rev=11564&view=rev
Author:   leafmuncher
Date:     2008-02-07 18:21:40 -0800 (Thu, 07 Feb 2008)

Log Message:
-----------
Include the C externed OS X versions.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h	2008-02-08 02:20:44 UTC (rev 11563)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h	2008-02-08 02:21:40 UTC (rev 11564)
@@ -16,7 +16,11 @@
 #ifndef __GNUC__
 #pragma warning(disable:4244)
 #endif
+#ifdef __APPLE__
+#include "libffmpeg-OSX/avcodec.h"
+#else
 #include "../../ffmpeg/avcodec.h"
+#endif
 }
 
 // 0x100000 is the video starting range

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h	2008-02-08 02:20:44 UTC (rev 11563)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h	2008-02-08 02:21:40 UTC (rev 11564)
@@ -7,7 +7,9 @@
 enum CodecID;
 #else
 #ifdef __APPLE__
+extern "C" {
 #include "libffmpeg-OSX/avcodec.h"
+}
 #else
 #include "../../ffmpeg/avcodec.h"
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11565
          http://xbmc.svn.sourceforge.net/xbmc/?rev=11565&view=rev
Author:   leafmuncher
Date:     2008-02-07 18:22:15 -0800 (Thu, 07 Feb 2008)

Log Message:
-----------
Include the C externed OS X versions.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDStreamInfo.h

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.cpp	2008-02-08 02:21:40 UTC (rev 11564)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.cpp	2008-02-08 02:22:15 UTC (rev 11565)
@@ -1,7 +1,13 @@
 
 #include "stdafx.h"
 #include "DVDDemuxUtils.h"
+#ifdef __APPLE__
+extern "C" {
+#include "libffmpeg-OSX/avcodec.h"
+}
+#else
 #include "../../ffmpeg/avcodec.h"
+#endif
 
 void CDVDDemuxUtils::FreeDemuxPacket(DemuxPacket* pPacket)
 {

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDStreamInfo.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDStreamInfo.h	2008-02-08 02:21:40 UTC (rev 11564)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDStreamInfo.h	2008-02-08 02:22:15 UTC (rev 11565)
@@ -5,8 +5,14 @@
 enum CodecID;
 #else
 #include "DVDDemuxers/DVDDemux.h"
+#ifdef __APPLE__
+extern "C" { 
+#include "libffmpeg-OSX/avcodec.h"
+}
+#else
 #include "../ffmpeg/avcodec.h"
 #endif
+#endif
 
 class CDemuxStream;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11667
          http://xbmc.svn.sourceforge.net/xbmc/?rev=11667&view=rev
Author:   elupus
Date:     2008-02-13 16:35:33 -0800 (Wed, 13 Feb 2008)

Log Message:
-----------
fixed: dvdplayer must check that current stream is actually still of correct type, it can have changed

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-02-13 22:42:34 UTC (rev 11666)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-02-14 00:35:33 UTC (rev 11667)
@@ -487,7 +487,7 @@
   return false;
 }
 
-bool CDVDPlayer::IsValidStream(CCurrentStream& stream)
+bool CDVDPlayer::IsValidStream(CCurrentStream& stream, StreamType type)
 {
   if(stream.id<0)
     return true; // we consider non selected as valid
@@ -500,6 +500,8 @@
     CDemuxStream* st = m_pSubtitleDemuxer->GetStream(stream.id);
     if(st == NULL || st->disabled)
       return false;
+    if(st->type != type)
+      return false;
     return true;
   }
   if(source == STREAM_SOURCE_DEMUX)
@@ -507,6 +509,8 @@
     CDemuxStream* st = m_pDemuxer->GetStream(stream.id);
     if(st == NULL || st->disabled)
       return false;
+    if(st->type != type)
+      return false;
     return true;
   }
 
@@ -801,14 +805,14 @@
       }
 
       // check so that none of our streams has become invalid
-      if (!IsValidStream(m_CurrentAudio))    CloseAudioStream(false);
-      if (!IsValidStream(m_CurrentVideo))    CloseVideoStream(false);
-      if (!IsValidStream(m_CurrentSubtitle)) CloseSubtitleStream(false);
+      if (!IsValidStream(m_CurrentAudio,    STREAM_AUDIO))    CloseAudioStream(false);
+      if (!IsValidStream(m_CurrentVideo,    STREAM_VIDEO))    CloseVideoStream(false);
+      if (!IsValidStream(m_CurrentSubtitle, STREAM_SUBTITLE)) CloseSubtitleStream(false);
 
       // check if there is any better stream to use (normally for dvd's)
+      if (IsBetterStream(m_CurrentAudio,    STREAM_AUDIO,    pStream)) OpenAudioStream(pStream->iId, pStream->source);
+      if (IsBetterStream(m_CurrentVideo,    STREAM_VIDEO,    pStream)) OpenVideoStream(pStream->iId, pStream->source);
       if (IsBetterStream(m_CurrentSubtitle, STREAM_SUBTITLE, pStream)) OpenSubtitleStream(pStream->iId, pStream->source);
-      if (IsBetterStream(m_CurrentAudio,    STREAM_AUDIO,    pStream)) OpenAudioStream(pStream->iId, pStream->source);        
-      if (IsBetterStream(m_CurrentVideo,    STREAM_VIDEO,    pStream)) OpenVideoStream(pStream->iId, pStream->source);
     }
     catch (...)
     {

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h	2008-02-13 22:42:34 UTC (rev 11666)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h	2008-02-14 00:35:33 UTC (rev 11667)
@@ -212,7 +212,7 @@
   void CheckContinuity(DemuxPacket* pPacket, unsigned int source);
 
   bool ReadPacket(DemuxPacket*& packet, CDemuxStream*& stream);
-  bool IsValidStream(CCurrentStream& stream);
+  bool IsValidStream(CCurrentStream& stream, StreamType type);
   bool IsBetterStream(CCurrentStream& current, StreamType type, CDemuxStream* stream);
 
   bool OpenDemuxStream();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11698
          http://xbmc.svn.sourceforge.net/xbmc/?rev=11698&view=rev
Author:   elupus
Date:     2008-02-17 06:38:45 -0800 (Sun, 17 Feb 2008)

Log Message:
-----------
changed: DVDSTREAM_TYPE_MYTH to DVDSTREAM_TYPE_TV

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h	2008-02-17 14:05:01 UTC (rev 11697)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h	2008-02-17 14:38:45 UTC (rev 11698)
@@ -11,7 +11,7 @@
   DVDSTREAM_TYPE_HTTP   = 3,
   DVDSTREAM_TYPE_MEMORY = 4,
   DVDSTREAM_TYPE_FFMPEG = 5,
-  DVDSTREAM_TYPE_MYTH   = 6,
+  DVDSTREAM_TYPE_TV     = 6,
 };
 
 #define DVDSTREAM_BLOCK_SIZE_FILE (2048 * 16)

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp	2008-02-17 14:05:01 UTC (rev 11697)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp	2008-02-17 14:38:45 UTC (rev 11698)
@@ -6,7 +6,7 @@
 
 using namespace XFILE;
 
-CDVDInputStreamTV::CDVDInputStreamTV() : CDVDInputStream(DVDSTREAM_TYPE_MYTH)
+CDVDInputStreamTV::CDVDInputStreamTV() : CDVDInputStream(DVDSTREAM_TYPE_TV)
 {
   m_pFile = NULL;
   m_pLiveTV = NULL;

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-02-17 14:05:01 UTC (rev 11697)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-02-17 14:38:45 UTC (rev 11698)
@@ -638,7 +638,7 @@
     m_pDlgCache->SetMessage(g_localizeStrings.Get(10213));
 
   if(!m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD) 
-  && !m_pInputStream->IsStreamType(DVDSTREAM_TYPE_MYTH))
+  && !m_pInputStream->IsStreamType(DVDSTREAM_TYPE_TV))
   {
     m_clock.SetSpeed(DVD_PLAYSPEED_PAUSE);
     m_dvdPlayerAudio.SetSpeed(DVD_PLAYSPEED_PAUSE);
@@ -1363,7 +1363,7 @@
       } 
       else if (pMsg->IsType(CDVDMsg::PLAYER_CHANNEL_NEXT) || pMsg->IsType(CDVDMsg::PLAYER_CHANNEL_PREV))
       {
-        if( m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_MYTH) )
+        if( m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_TV) )
         {
           bool result;
           if(pMsg->IsType(CDVDMsg::PLAYER_CHANNEL_NEXT))
@@ -1675,7 +1675,7 @@
       return ((CDVDInputStreamNavigator*)m_pInputStream)->GetTime(); // we should take our buffers into account
   }
 
-  if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_MYTH))
+  if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_TV))
   {
     int msec;
     msec  = (__int64)(m_clock.GetClock() * 1000 / DVD_TIME_BASE);
@@ -1698,7 +1698,7 @@
       return ((CDVDInputStreamNavigator*)m_pInputStream)->GetTotalTime(); // we should take our buffers into account
   }
 
-  if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_MYTH))
+  if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_TV))
   {
     int msec = ((CDVDInputStreamTV*)m_pInputStream)->GetTotalTime();
     if (msec > 0)
@@ -2282,7 +2282,7 @@
     }
   }
 
-  if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_MYTH))
+  if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_TV))
   {
     switch (action.wID)
     {
@@ -2438,7 +2438,7 @@
 
 void CDVDPlayer::UpdateApplication()
 {
-  if (m_pInputStream->IsStreamType(DVDSTREAM_TYPE_MYTH))
+  if (m_pInputStream->IsStreamType(DVDSTREAM_TYPE_TV))
   {
     CDVDInputStreamTV* pStream = static_cast<CDVDInputStreamTV*>(m_pInputStream);
     CVideoInfoTag *tag = pStream->GetVideoInfoTag();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11791
          http://xbmc.svn.sourceforge.net/xbmc/?rev=11791&view=rev
Author:   vulkanr
Date:     2008-02-25 05:42:08 -0800 (Mon, 25 Feb 2008)

Log Message:
-----------
fixed: do not assume EOF on invalid packets from stream.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2008-02-25 12:30:03 UTC (rev 11790)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2008-02-25 13:42:08 UTC (rev 11791)
@@ -474,6 +474,9 @@
 {
   AVPacket pkt;
   DemuxPacket* pPacket = NULL;
+  // on some cases where the received packet is invalid we will need to return an empty packet (0 length) otherwise the main loop (in CDVDPlayer) 
+  // would consider this the end of stream and stop.
+  bool bReturnEmpty = false;
   Lock();
   if (m_pFormatContext)
   {
@@ -499,13 +502,7 @@
     if (result == AVERROR(EINTR) || result == AVERROR(EAGAIN))
     {
       // timeout, probably no real error, return empty packet
-      pPacket = CDVDDemuxUtils::AllocateDemuxPacket(0);
-      if(pPacket)
-      {
-        pPacket->dts = DVD_NOPTS_VALUE;
-        pPacket->pts = DVD_NOPTS_VALUE;
-        pPacket->iStreamId = -1;
-      }
+      bReturnEmpty = true;
     }
     else if (result < 0)
     {
@@ -517,6 +514,7 @@
       if (pkt.size < 0 || pkt.stream_index >= MAX_STREAMS)
       {
         CLog::Log(LOGERROR, "CDVDDemuxFFmpeg::Read() no valid packet");
+        bReturnEmpty = true;
       }
       else
       {
@@ -533,6 +531,9 @@
               break;
             }
           }
+
+          if (!pPacket)
+            bReturnEmpty = true;
         }
         else
           pPacket = CDVDDemuxUtils::AllocateDemuxPacket(pkt.size);
@@ -582,6 +583,17 @@
   }
   Unlock();
 
+  if (bReturnEmpty && !pPacket)
+  {
+      pPacket = CDVDDemuxUtils::AllocateDemuxPacket(0);
+      if(pPacket)
+      {
+        pPacket->dts = DVD_NOPTS_VALUE;
+        pPacket->pts = DVD_NOPTS_VALUE;
+        pPacket->iStreamId = -1;
+      }
+  }
+
   if (!pPacket) return NULL;
 
   // check streams, can we make this a bit more simple?

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-02-25 12:30:03 UTC (rev 11790)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-02-25 13:42:08 UTC (rev 11791)
@@ -455,8 +455,6 @@
       if (!stream)
       {
         CLog::Log(LOGERROR, "%s - Error demux packet doesn't belong to any stream", __FUNCTION__);
-        CDVDDemuxUtils::FreeDemuxPacket(packet);
-        packet = NULL;
         return false;
       }
       if(stream->source == STREAM_SOURCE_NONE)
@@ -478,8 +476,6 @@
     if (!stream) 
     {
       CLog::Log(LOGERROR, "%s - Error demux packet doesn't belong to any stream", __FUNCTION__);
-      CDVDDemuxUtils::FreeDemuxPacket(packet);
-      packet = NULL;
       return false;
     }
     if(stream->source == STREAM_SOURCE_NONE)
@@ -733,6 +729,11 @@
     DemuxPacket* pPacket = NULL;
     CDemuxStream *pStream = NULL;
     ReadPacket(pPacket, pStream);
+    if (pPacket &&  pPacket->iStreamId == -1)
+    {
+      CDVDDemuxUtils::FreeDemuxPacket(pPacket); 
+      continue;
+    }
 
     if (!pPacket)
     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11937
          http://xbmc.svn.sourceforge.net/xbmc/?rev=11937&view=rev
Author:   leafmuncher
Date:     2008-03-07 23:12:56 -0800 (Fri, 07 Mar 2008)

Log Message:
-----------
fixed: [OS X] fast video when we couldn't open channels, and crash when playing audio.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDAudio.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDAudio.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.h

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDAudio.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDAudio.cpp	2008-03-08 06:30:12 UTC (rev 11936)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDAudio.cpp	2008-03-08 07:12:56 UTC (rev 11937)
@@ -76,7 +76,14 @@
     m_pAudioDecoder = new CASyncDirectSound(m_pCallback, audioframe.channels, audioframe.sample_rate, audioframe.bits_per_sample, codecstring);
 #elif __APPLE__
 
-  m_pAudioDecoder = new PortAudioDirectSound(m_pCallback, audioframe.channels, audioframe.sample_rate, audioframe.bits_per_sample, false, codecstring, false, audioframe.passthrough);
+  PortAudioDirectSound* paDecoder = new PortAudioDirectSound(m_pCallback, audioframe.channels, audioframe.sample_rate, audioframe.bits_per_sample, false, codecstring, false, audioframe.passthrough);
+  if (paDecoder->IsValid() == false)
+  {
+    delete paDecoder;
+    paDecoder = 0;
+  }
+  
+  m_pAudioDecoder = paDecoder;
 
 #elif _LINUX
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDAudio.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDAudio.h	2008-03-08 06:30:12 UTC (rev 11936)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDAudio.h	2008-03-08 07:12:56 UTC (rev 11937)
@@ -10,6 +10,7 @@
 #else
 #ifdef __APPLE__
 extern "C" {
+#include "libffmpeg-OSX/log.h"
 #include "libffmpeg-OSX/avcodec.h"
 }
 #else

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.cpp	2008-03-08 06:30:12 UTC (rev 11936)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.cpp	2008-03-08 07:12:56 UTC (rev 11937)
@@ -70,7 +70,7 @@
   else
     device = g_guiSettings.GetString("audiooutput.passthroughdevice");
 
-  printf("Asked to open device: [%s]\n", device.c_str());
+  CLog::Log(LOGINFO, "Asked to open device: [%s]\n", device.c_str());
 
   m_pStream = CPortAudio::CreateOutputStream(device,
                                              m_uiChannels, 
@@ -89,7 +89,7 @@
 //***********************************************************************************************
 PortAudioDirectSound::~PortAudioDirectSound()
 {
-  CLog::Log(LOGDEBUG,"PortAudioDirectSound() dtor\n");
+  CLog::Log(LOGDEBUG,"PortAudioDirectSound() dtor");
   Deinitialize();
 }
 
@@ -97,7 +97,7 @@
 //***********************************************************************************************
 HRESULT PortAudioDirectSound::Deinitialize()
 {
-  CLog::Log(LOGDEBUG,"PortAudioDirectSound::Deinitialize\n");
+  CLog::Log(LOGDEBUG,"PortAudioDirectSound::Deinitialize");
   
   if (m_pStream)
   {
@@ -108,7 +108,7 @@
   m_bIsAllocated = false;
   m_pStream = 0;
   
- 	CLog::Log(LOGDEBUG,"PortAudioDirectSound::Deinitialize - set active\n");
+ 	CLog::Log(LOGDEBUG,"PortAudioDirectSound::Deinitialize - set active");
   g_audioContext.SetActiveDevice(CAudioContext::DEFAULT_DEVICE);
 
   return S_OK;
@@ -200,13 +200,11 @@
 //***********************************************************************************************
 DWORD PortAudioDirectSound::GetSpace()
 {
-  if (!m_bIsAllocated) 
+  if (!m_pStream)
     return 0;
   
   // Figure out how much space is available.
   DWORD numFrames = Pa_GetStreamWriteAvailable(m_pStream);
-  
-  printf("Returning %d bytes free\n", numFrames * (m_uiBitsPerSample/8));
   return numFrames * (m_uiBitsPerSample/8);
 }
 
@@ -221,8 +219,15 @@
   
   // Find out how much space we have available.
   DWORD framesPassedIn = len / (m_uiChannels * m_uiBitsPerSample/8);
-  DWORD framesToWrite  = MIN(Pa_GetStreamWriteAvailable(m_pStream), framesPassedIn);
+  DWORD framesToWrite  = Pa_GetStreamWriteAvailable(m_pStream);
   
+  // Clip to the amount we got passed in. I was using MIN above, but that
+  // was a very bad idea since Pa_GetStreamWriteAvailable would get called
+  // twice and could return different answers!
+  //
+  if (framesToWrite > framesPassedIn)
+    framesToWrite = framesPassedIn;
+  
   unsigned char* pcmPtr = data;
   
   // Handle volume de-amplification.

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.h	2008-03-08 06:30:12 UTC (rev 11936)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.h	2008-03-08 07:12:56 UTC (rev 11937)
@@ -62,6 +62,8 @@
   virtual void SwitchChannels(int iAudioStream, bool bAudioOnAllSpeakers);
   virtual void Flush();
 
+  bool IsValid() { return m_pStream != 0; }
+  
 private:
   PaStream*  m_pStream;
   //snd_pcm_uframes_t 	m_maxFrames;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11983
          http://xbmc.svn.sourceforge.net/xbmc/?rev=11983&view=rev
Author:   elupus
Date:     2008-03-10 14:42:11 -0700 (Mon, 10 Mar 2008)

Log Message:
-----------
changed: don't return IsStalled when a stream i just opned
changed: increase time untill video player is considered stalled to 10 frames

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.h

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp	2008-03-10 21:15:45 UTC (rev 11982)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp	2008-03-10 21:42:11 UTC (rev 11983)
@@ -110,6 +110,7 @@
   m_droptime = 0;
   m_speed = DVD_PLAYSPEED_NORMAL;
   m_stalled = false;
+  m_started = false;
 
   InitializeCriticalSection(&m_critCodecSection);
   m_messageQueue.SetMaxDataSize(30 * 16 * 1024);
@@ -143,6 +144,7 @@
   m_droptime = 0;
   m_audioClock = 0;
   m_stalled = false;
+  m_started = false;
 
   CLog::Log(LOGNOTICE, "Creating audio thread");
   Create();
@@ -310,7 +312,8 @@
     
     if (ret == MSGQ_TIMEOUT) 
     {
-      m_stalled = true;
+      if(m_started)
+        m_stalled = true;
       continue;
     }
 
@@ -320,6 +323,7 @@
     if (pMsg->IsType(CDVDMsg::DEMUXER_PACKET))
     {
       m_stalled = false;
+      m_started = true;
       m_decode.Attach((CDVDMsgDemuxerPacket*)pMsg);
       m_ptsInput.Add( m_decode.size, m_decode.dts );
     }

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.h	2008-03-10 21:15:45 UTC (rev 11982)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.h	2008-03-10 21:42:11 UTC (rev 11983)
@@ -146,6 +146,7 @@
   int     m_speed;
   double  m_droptime;
   bool    m_stalled;
+  bool    m_started;
   CRITICAL_SECTION m_critCodecSection;
 };
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp	2008-03-10 21:15:45 UTC (rev 11982)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp	2008-03-10 21:42:11 UTC (rev 11983)
@@ -28,7 +28,8 @@
   m_speed = DVD_PLAYSPEED_NORMAL;
   
   m_bRenderSubs = false;
-  m_DetectedStill = false;
+  m_stalled = false;
+  m_started = false;
   m_iVideoDelay = 0;
   m_iSubtitleDelay = 0;
   m_fForcedAspectRatio = 0;
@@ -105,6 +106,9 @@
     return false;
   }
 
+  m_stalled = false;
+  m_started = false;
+
   m_messageQueue.Init();
 
   CLog::Log(LOGNOTICE, "Creating video thread");
@@ -149,7 +153,6 @@
   
   m_iCurrentPts = DVD_NOPTS_VALUE;
   m_FlipTimeStamp = m_pClock->GetAbsoluteClock();
-  m_DetectedStill = false;
   
   memset(&m_output, 0, sizeof(m_output));
 #ifdef HAS_VIDEO_PLAYBACK
@@ -179,7 +182,7 @@
   {
     while (!m_bStop && m_speed == DVD_PLAYSPEED_PAUSE && !m_messageQueue.RecievedAbortRequest() && m_iNrOfPicturesNotToSkip==0) Sleep(5);
 
-    int iQueueTimeOut = (int)(m_DetectedStill ? frametime / 4 : frametime * 4) / 1000;
+    int iQueueTimeOut = (int)(m_stalled ? frametime / 4 : frametime * 10) / 1000;
     
     CDVDMsg* pMsg;
     MsgQueueReturnCode ret = m_messageQueue.Get(&pMsg, iQueueTimeOut);
@@ -192,10 +195,10 @@
     else if (ret == MSGQ_TIMEOUT)
     {
       //Okey, start rendering at stream fps now instead, we are likely in a stillframe
-      if( !m_DetectedStill )
+      if( !m_stalled && m_started )
       {
         CLog::Log(LOGINFO, "CDVDPlayerVideo - Stillframe detected, switching to forced %f fps", m_fFrameRate);
-        m_DetectedStill = true;
+        m_stalled = true;
         pts+= frametime*4;
       }
 
@@ -271,10 +274,11 @@
       DemuxPacket* pPacket = ((CDVDMsgDemuxerPacket*)pMsg)->GetPacket();
       bool bPacketDrop     = ((CDVDMsgDemuxerPacket*)pMsg)->GetPacketDrop();
 
-      if (m_DetectedStill)
+      m_started = true;
+      if (m_stalled)
       {
         CLog::Log(LOGINFO, "CDVDPlayerVideo - Stillframe left, switching to normal playback");      
-        m_DetectedStill = false;
+        m_stalled = false;
 
         //don't allow the first frames after a still to be dropped
         //sometimes we get multiple stills (long duration frames) after each other
@@ -696,7 +700,7 @@
   iClockSleep = min(iClockSleep, DVD_MSEC_TO_TIME(500));
   iFrameSleep = min(iFrameSleep, DVD_MSEC_TO_TIME(500));
 
-  if( m_DetectedStill )
+  if( m_stalled )
   { // when we render a still, we can't sync to clock anyway
     iSleepTime = iFrameSleep;
   }
@@ -715,7 +719,7 @@
 
   // present the current pts of this frame to user, and include the actual
   // presentation delay, to allow him to adjust for it
-  if( !m_DetectedStill )
+  if( !m_stalled )
     m_iCurrentPts = pts - max(0.0, iSleepTime);
 
   // timestamp when we think next picture should be displayed based on current duration

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.h	2008-03-10 21:15:45 UTC (rev 11982)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.h	2008-03-10 21:42:11 UTC (rev 11983)
@@ -64,7 +64,7 @@
   double GetSubtitleDelay()                                { return m_iSubtitleDelay; }
   void SetSubtitleDelay(double delay)                      { m_iSubtitleDelay = delay; }
 
-  bool IsStalled()                                  { return m_DetectedStill;  }
+  bool IsStalled()                                  { return m_stalled;  }
   int GetNrOfDroppedFrames()                        { return m_iDroppedFrames; }
 
   bool InitializedOutputDevice();
@@ -128,7 +128,8 @@
   double m_droptime;
   double m_dropbase;
 
-  bool m_DetectedStill;
+  bool m_stalled;
+  bool m_started;
 
   /* autosync decides on how much of clock we should use when deciding sleep time */
   /* the value is the same as 63% timeconstant, ie that the step response of */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12257
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12257&view=rev
Author:   elupus
Date:     2008-03-23 08:48:21 -0700 (Sun, 23 Mar 2008)

Log Message:
-----------
added: support for fps based subtitle formats in dvdplayer
added: microdvd subtitle parser (thx cptspiff)

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParser.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/Makefile

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.h

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-03-23 15:39:08 UTC (rev 12256)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-03-23 15:48:21 UTC (rev 12257)
@@ -1954,6 +1954,10 @@
     if(index < 0)
       return false;
     filename = m_SelectionStreams.Get(STREAM_SUBTITLE, index).filename;
+
+    hint.Clear();
+    hint.fpsscale = m_CurrentVideo.hint.fpsscale;
+    hint.fpsrate  = m_CurrentVideo.hint.fpsrate;
   }
   else
   {

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp	2008-03-23 15:39:08 UTC (rev 12256)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp	2008-03-23 15:48:21 UTC (rev 12257)
@@ -135,7 +135,7 @@
       return false;
     }
 
-    if (!m_pSubtitleFileParser->Init())
+    if (!m_pSubtitleFileParser->Open(hints))
     {
       CLog::Log(LOGERROR, "%s - Unable to init subtitle parser", __FUNCTION__);
       CloseStream(false);

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.cpp	2008-03-23 15:39:08 UTC (rev 12256)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.cpp	2008-03-23 15:48:21 UTC (rev 12257)
@@ -4,6 +4,7 @@
 
 //#include "DVDSubtitleParserSpu.h"
 #include "DVDSubtitleParserSubrip.h"
+#include "DVDSubtitleParserMicroDVD.h"
 #include "Util.h"
 
 using namespace std;
@@ -57,15 +58,13 @@
   {
     if (pStream->ReadLine(line, sizeof(line)))
     {
-      // from xine
-      //if ((sscanf (line, "{%d}{}", &i)==1) ||
-      //    (sscanf (line, "{%d}{%d}", &i, &i)==2)) 
-      //{
-       // pParser = new CDVDSubtitleParserMicroDVD(pStream, strFile.c_str());
-      //}
-
-      if (sscanf(line, "%d:%d:%d,%d --> %d:%d:%d,%d", &i, &i, &i, &i, &i, &i, &i, &i) == 8)
+      if ((sscanf (line, "{%d}{}", &i)==1) ||
+          (sscanf (line, "{%d}{%d}", &i, &i)==2)) 
       {
+        pParser = new CDVDSubtitleParserMicroDVD(pStream, strFile.c_str());
+      }
+      else if (sscanf(line, "%d:%d:%d,%d --> %d:%d:%d,%d", &i, &i, &i, &i, &i, &i, &i, &i) == 8)
+      {
         pParser = new CDVDSubtitleParserSubrip(pStream, strFile.c_str());
       }
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParser.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParser.h	2008-03-23 15:39:08 UTC (rev 12256)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParser.h	2008-03-23 15:48:21 UTC (rev 12257)
@@ -4,6 +4,8 @@
 #include "../DVDCodecs/Overlay/DVDOverlay.h"
 #include "DVDSubtitleStream.h"
 
+class CDVDStreamInfo;
+
 class CDVDSubtitleParser
 {
 public:
@@ -17,8 +19,8 @@
   {
   }
   
-  virtual bool Init() = 0;
-  virtual void DeInit() = 0;
+  virtual bool Open(CDVDStreamInfo &hints) = 0;
+  virtual void Dispose() = 0;
   virtual void Reset() = 0;
   
   virtual CDVDOverlay* Parse(double iPts) = 0;

Added: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.cpp	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.cpp	2008-03-23 15:48:21 UTC (rev 12257)
@@ -0,0 +1,94 @@
+
+#include "stdafx.h"
+#include "DVDSubtitleParserMicroDVD.h"
+#include "../DVDCodecs/Overlay/DVDOverlayText.h"
+#include "../DVDClock.h"
+#include "utils/RegExp.h"
+#include "DVDStreamInfo.h"
+
+using namespace std;
+
+CDVDSubtitleParserMicroDVD::CDVDSubtitleParserMicroDVD(CDVDSubtitleStream* stream, const string& filename)
+    : CDVDSubtitleParser(stream, filename)
+{
+
+}
+
+CDVDSubtitleParserMicroDVD::~CDVDSubtitleParserMicroDVD()
+{
+  Dispose();
+}
+
+bool CDVDSubtitleParserMicroDVD::Open(CDVDStreamInfo &hints)
+{
+  if (!m_pStream->Open(m_strFileName))
+    return false;
+
+  CLog::Log(LOGERROR, "%s - framerate %d:%d", __FUNCTION__, hints.fpsrate, hints.fpsscale);
+  if(hints.fpsscale > 0 && hints.fpsrate > 0)
+    m_framerate = DVD_TIME_BASE * hints.fpsscale / hints.fpsrate;
+  else
+    m_framerate = DVD_TIME_BASE / 25.0;
+
+  char line[1024];
+
+  CRegExp reg;
+  if (!reg.RegComp("\\{([0-9]+)\\}\\{([0-9]+)\\}([^|]*?)(\\|([^|]*?))?$"))//(\\|([^|]*?))?$"))
+    assert(0);
+
+  while (m_pStream->ReadLine(line, sizeof(line)))
+  {
+    if (reg.RegFind(line) > -1)
+    {
+      char* startFrame = reg.GetReplaceString("\\1");
+      char* endFrame   = reg.GetReplaceString("\\2");
+      char* lines[3];
+      lines[0] = reg.GetReplaceString("\\3");
+      lines[1] = reg.GetReplaceString("\\5");
+      lines[2] = reg.GetReplaceString("\\7");
+      CDVDOverlayText* pOverlay = new CDVDOverlayText();
+      pOverlay->Acquire(); // increase ref count with one so that we can hold a handle to this overlay
+
+      pOverlay->iPTSStartTime = m_framerate * atoi(startFrame);
+      pOverlay->iPTSStopTime  = m_framerate * atoi(endFrame);
+
+      for(int i=0;i<3 && lines[i];i++)
+      {
+        CStdStringW strUTF16;
+        CStdStringA strUTF8;
+        g_charsetConverter.subtitleCharsetToW(lines[i], strUTF16);
+        g_charsetConverter.wToUTF8(strUTF16, strUTF8);
+        if (strUTF8.IsEmpty())
+          continue;
+CLog::Log(LOGDEBUG, strUTF8);
+        // add a new text element to our container
+        pOverlay->AddElement(new CDVDOverlayText::CElementText(strUTF8.c_str()));
+      }
+      free(lines[0]);
+      free(lines[1]);
+      free(lines[2]);
+      free(startFrame);
+      free(endFrame);
+
+      m_collection.Add(pOverlay);
+    }
+  }
+  return true;
+}
+
+void CDVDSubtitleParserMicroDVD::Dispose()
+{
+  m_collection.Clear();
+}
+
+void CDVDSubtitleParserMicroDVD::Reset()
+{
+  m_collection.Reset();
+}
+
+// parse exactly one subtitle
+CDVDOverlay* CDVDSubtitleParserMicroDVD::Parse(double iPts)
+{
+  return  m_collection.Get(iPts);;
+}
+

Added: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.h	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.h	2008-03-23 15:48:21 UTC (rev 12257)
@@ -0,0 +1,23 @@
+
+#pragma once
+
+#include "DVDSubtitleParser.h"
+#include "DVDSubtitleLineCollection.h"
+
+class CDVDSubtitleParserMicroDVD : public CDVDSubtitleParser
+{
+public:
+  CDVDSubtitleParserMicroDVD(CDVDSubtitleStream* pStream, const std::string& strFile);
+  virtual ~CDVDSubtitleParserMicroDVD();
+  
+  virtual bool Open(CDVDStreamInfo &hints);
+  virtual void Dispose();
+  virtual void Reset();
+  
+  virtual CDVDOverlay* Parse(double iPts);
+
+private:
+  int ParseFile();
+  double m_framerate;
+  CDVDSubtitleLineCollection m_collection;
+};

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp	2008-03-23 15:39:08 UTC (rev 12256)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp	2008-03-23 15:48:21 UTC (rev 12257)
@@ -9,15 +9,14 @@
 CDVDSubtitleParserSubrip::CDVDSubtitleParserSubrip(CDVDSubtitleStream* pStream, const string& strFile)
     : CDVDSubtitleParser(pStream, strFile)
 {
-
 }
 
 CDVDSubtitleParserSubrip::~CDVDSubtitleParserSubrip()
 {
-  DeInit();
+  Dispose();
 }
 
-bool CDVDSubtitleParserSubrip::Init()
+bool CDVDSubtitleParserSubrip::Open(CDVDStreamInfo &hints)
 {
   if (m_pStream->Open(m_strFileName))
   {
@@ -30,7 +29,7 @@
   return false;
 }
 
-void CDVDSubtitleParserSubrip::DeInit()
+void CDVDSubtitleParserSubrip::Dispose()
 {
   //m_pStream->Close();
   m_collection.Clear();

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.h	2008-03-23 15:39:08 UTC (rev 12256)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.h	2008-03-23 15:48:21 UTC (rev 12257)
@@ -10,8 +10,8 @@
   CDVDSubtitleParserSubrip(CDVDSubtitleStream* pStream, const std::string& strFile);
   virtual ~CDVDSubtitleParserSubrip();
   
-  virtual bool Init();
-  virtual void DeInit();
+  virtual bool Open(CDVDStreamInfo &hints);
+  virtual void Dispose();
   virtual void Reset();
   
   virtual CDVDOverlay* Parse(double iPts);

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/Makefile	2008-03-23 15:39:08 UTC (rev 12256)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/Makefile	2008-03-23 15:48:21 UTC (rev 12257)
@@ -1,6 +1,6 @@
 INCLUDES=-I. -I../ -I../../../ -I../../../linux -I../../../../guilib
 
-SRCS=DVDFactorySubtitle.cpp DVDSubtitleLineCollection.cpp DVDSubtitleParserSubrip.cpp DVDSubtitleStream.cpp
+SRCS=DVDFactorySubtitle.cpp DVDSubtitleLineCollection.cpp DVDSubtitleParserSubrip.cpp DVDSubtitleStream.cpp DVDSubtitleParserMicroDVD.cpp
 
 LIB=dvdinputstream.a
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12358
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12358&view=rev
Author:   elupus
Date:     2008-03-28 13:38:54 -0700 (Fri, 28 Mar 2008)

Log Message:
-----------
changed: don't reinit output device just because dvdplayer closes and openes video streams

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.h

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp	2008-03-28 18:49:47 UTC (rev 12357)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp	2008-03-28 20:38:54 UTC (rev 12358)
@@ -43,6 +43,7 @@
   m_bDropFrames = true;
   m_fFrameRate = 25;
   m_bAllowFullscreen = false;
+  memset(&m_output, 0, sizeof(m_output));
 }
 
 CDVDPlayerVideo::~CDVDPlayerVideo()
@@ -50,6 +51,14 @@
   StopThread();
   g_dvdPerformanceCounter.DisableVideoQueue();
   DeleteCriticalSection(&m_critCodecSection);
+
+#ifdef HAS_VIDEO_PLAYBACK
+  if(m_output.inited)
+  {
+    CLog::Log(LOGNOTICE, "%s - uninitting video device", __FUNCTION__);
+    g_renderManager.UnInit();
+  }
+#endif
 }
 
 double CDVDPlayerVideo::GetOutputDelay()
@@ -153,10 +162,13 @@
   
   m_iCurrentPts = DVD_NOPTS_VALUE;
   m_FlipTimeStamp = m_pClock->GetAbsoluteClock();
-  
-  memset(&m_output, 0, sizeof(m_output));
+
 #ifdef HAS_VIDEO_PLAYBACK
-  g_renderManager.PreInit();
+  if(!m_output.inited)
+  {
+    g_renderManager.PreInit();
+    m_output.inited = true;
+  }
 #endif
   g_dvdPerformanceCounter.EnableVideoDecodePerformance(ThreadHandle());
 }
@@ -458,11 +470,6 @@
 void CDVDPlayerVideo::OnExit()
 {
   g_dvdPerformanceCounter.DisableVideoDecodePerformance();
-  
-  CLog::Log(LOGNOTICE, "uninitting video device");
-#ifdef HAS_VIDEO_PLAYBACK
-  g_renderManager.UnInit();
-#endif
 
   if (m_pOverlayCodecCC)
   {

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.h	2008-03-28 18:49:47 UTC (rev 12357)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.h	2008-03-28 20:38:54 UTC (rev 12358)
@@ -114,7 +114,8 @@
     unsigned int dheight;
     unsigned int color_matrix : 4;
     unsigned int color_range  : 1;
-    float framerate;
+    float        framerate;
+    bool         inited;
   } m_output; //holds currently configured output
 
   bool m_bAllowFullscreen;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12404
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12404&view=rev
Author:   elupus
Date:     2008-03-30 14:00:09 -0700 (Sun, 30 Mar 2008)

Log Message:
-----------
changed: better method of handling end of input stream to allow seeks while buffers are playing out and channel changes while attempting to open 
demuxer in dvdplayer.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-03-30 20:26:48 UTC (rev 12403)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-03-30 21:00:09 UTC (rev 12404)
@@ -237,10 +237,10 @@
 
 
   m_bAbortRequest = false;
-  
+  m_errorCount = 0;
   m_playSpeed = DVD_PLAYSPEED_NORMAL;
   m_caching = false;
- 
+
   m_pDlgCache = NULL;
 
 #ifdef DVDDEBUG_MESSAGE_TRACKER
@@ -406,18 +406,7 @@
 
   try
   {
-    int attempts = 10;
-    while(!m_bStop && attempts-- > 0)
-    {
-      m_pDemuxer = CDVDFactoryDemuxer::CreateDemuxer(m_pInputStream);
-      if(!m_pDemuxer && m_pInputStream->NextStream())
-      {
-        CLog::Log(LOGDEBUG, "%s - New stream available from input, retry open", __FUNCTION__);
-        continue;
-      }
-      break;
-    }
-
+    m_pDemuxer = CDVDFactoryDemuxer::CreateDemuxer(m_pInputStream);
     if(!m_pDemuxer)
     {
       CLog::Log(LOGERROR, "%s - Error creating demuxer", __FUNCTION__);
@@ -646,93 +635,62 @@
 
   if(!m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD) 
   && !m_pInputStream->IsStreamType(DVDSTREAM_TYPE_TV))
-  {
-    m_clock.SetSpeed(DVD_PLAYSPEED_PAUSE);
-    m_dvdPlayerAudio.SetSpeed(DVD_PLAYSPEED_PAUSE);
-    m_dvdPlayerVideo.SetSpeed(DVD_PLAYSPEED_PAUSE);
-    m_caching = true;
-  }
+    SetCaching(true);
 
   while (!m_bAbortRequest)
   {
     // if the queues are full, no need to read more
     while (!m_bAbortRequest && (!m_dvdPlayerAudio.AcceptsData() || !m_dvdPlayerVideo.AcceptsData()))
     {
+      HandlePlaySpeed();
       HandleMessages();
       Sleep(10);
 
       if (m_caching)
-      {
-        // check here if we should stop caching
-        // TODO - we could continue to wait, if filesystem can cache further
-
-        m_clock.SetSpeed(m_playSpeed);
-        m_dvdPlayerAudio.SetSpeed(m_playSpeed);
-        m_dvdPlayerVideo.SetSpeed(m_playSpeed);
-        m_caching = false;
-      }
+        SetCaching(false);
     }
 
     if (m_bAbortRequest)
       break;
-    
-    if(GetPlaySpeed() != DVD_PLAYSPEED_NORMAL && GetPlaySpeed() != DVD_PLAYSPEED_PAUSE)
-    {
-      if (IsInMenu())
-      {
-        // this can't be done in menu
-        SetPlaySpeed(DVD_PLAYSPEED_NORMAL);
 
-      }
-      else if (m_CurrentVideo.id >= 0 
-            &&  m_CurrentVideo.inited == true
-            &&  m_dvdPlayerVideo.GetCurrentPts() != m_lastpts)
-      {
-        m_lastpts = m_dvdPlayerVideo.GetCurrentPts();
-        // check how much off clock video is when ff/rw:ing
-        // a problem here is that seeking isn't very accurate
-        // and since the clock will be resynced after seek
-        // we might actually not really be playing at the wanted
-        // speed. we'd need to have some way to not resync the clock
-        // after a seek to remember timing. still need to handle
-        // discontinuities somehow
+    // handle eventual seeks due tp playspeed
+    HandlePlaySpeed();
 
-        // when seeking, give the player a headstart to make sure 
-        // the time it takes to seek doesn't make a difference.
-        double iError;
-        iError = m_clock.GetClock() - m_lastpts;
-        iError = iError * GetPlaySpeed() / abs(GetPlaySpeed());
-
-        if(iError > DVD_MSEC_TO_TIME(1000))
-        {
-          CLog::Log(LOGDEBUG, "CDVDPlayer::Process - Seeking to catch up");
-          __int64 iTime = (__int64)(GetTime() + 500.0 * GetPlaySpeed() / DVD_PLAYSPEED_NORMAL);
-          m_messenger.Put(new CDVDMsgPlayerSeek(iTime, (GetPlaySpeed() < 0), true, false));
-        }
-      }
-    }
-
     // handle messages send to this thread, like seek or demuxer reset requests
     HandleMessages();
 
     if(m_bAbortRequest)
       break;
 
+    // should we open a new demuxer?
+    if(!m_pDemuxer)
+    {
+      if (m_pInputStream->NextStream() == false)
+        break;
+
+      if (m_pInputStream->IsEOF())
+        break;
+
+      if (OpenDemuxStream() == false)
+      {
+        m_errorCount++;
+        if(m_errorCount > 10)
+          break;
+
+        continue;
+      }
+
+      UpdateApplication();
+    }
+
     // check if we are too slow and need to recache
     if(!m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD))
     {
       if (m_dvdPlayerAudio.IsStalled() && m_CurrentAudio.inited && m_CurrentAudio.id >= 0
       ||  m_dvdPlayerVideo.IsStalled() && m_CurrentVideo.inited && m_CurrentVideo.id >= 0)
-      {
-        if(!m_caching)
-        {
-          m_clock.SetSpeed(DVD_PLAYSPEED_PAUSE);
-          m_dvdPlayerAudio.SetSpeed(DVD_PLAYSPEED_PAUSE);
-          m_dvdPlayerVideo.SetSpeed(DVD_PLAYSPEED_PAUSE);
-          m_caching = true;
-        }
-      }
+        SetCaching(true);
     }
+
     DemuxPacket* pPacket = NULL;
     CDemuxStream *pStream = NULL;
     ReadPacket(pPacket, pStream);
@@ -749,17 +707,14 @@
       if (m_playSpeed == DVD_PLAYSPEED_PAUSE)
         continue;
 
+      // if there is another stream available, let 
+      // player reopen demuxer
       if(m_pInputStream->NextStream())
       {
-        if(!OpenDemuxStream())
-          break;
-        UpdateApplication();
+        SAFE_DELETE(m_pDemuxer);
         continue;
       }
 
-      if (m_pInputStream->IsEOF()) 
-        break;
-
       if (m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD))
       {
         CDVDInputStreamNavigator* pStream = static_cast<CDVDInputStreamNavigator*>(m_pInputStream);
@@ -789,8 +744,16 @@
         continue;
       }
 
+      // while players are still playing, keep going to allow seekbacks
+      if(m_dvdPlayerAudio.m_messageQueue.GetDataSize() > 0 
+      || m_dvdPlayerVideo.m_messageQueue.GetDataSize() > 0)
+      {
+        Sleep(100);
+        continue;
+      }
+
       // any demuxer supporting non blocking reads, should return empty packates
-      CLog::Log(LOGINFO, "%s - EOF reading from demuxer", __FUNCTION__);
+      CLog::Log(LOGINFO, "%s - eof reading from demuxer", __FUNCTION__);
       break;
     }
 
@@ -804,8 +767,9 @@
         pPacket->pts -= pInput->GetTimeStampCorrection();
     }
 
-    // it's a valid data packet, add some more information too it
-    
+    // it's a valid data packet, reset error counter
+    m_errorCount = 0;
+
     // this groupId stuff is getting a bit messy, need to find a better way
     // currently it is used to determine if a menu overlay is associated with a picture
     // for dvd's we use as a group id, the current cell and the current title
@@ -867,11 +831,10 @@
     {
       if (m_pDlgCache->IsCanceled())
       {
-        m_caching = false;
         m_bAbortRequest = true;
         break;
       }
-     
+
       if (m_caching)
       {
         m_pDlgCache->ShowProgressBar(true);
@@ -888,12 +851,7 @@
 
   // if we are caching, start playing it agian
   if (m_caching && !m_bAbortRequest)
-  {
-    m_clock.SetSpeed(m_playSpeed);
-    m_dvdPlayerAudio.SetSpeed(m_playSpeed);
-    m_dvdPlayerVideo.SetSpeed(m_playSpeed);
-    m_caching = false;
-  }
+    SetCaching(false);
 
   // playback ended, make sure anything buffered is displayed
   if (m_pDlgCache)
@@ -908,6 +866,7 @@
          (!m_dvdPlayerVideo.m_messageQueue.RecievedAbortRequest() && 
          m_dvdPlayerVideo.m_messageQueue.GetDataSize() > 0) ))
   {
+    HandlePlaySpeed();
     HandleMessages();
     Sleep(10);
   }
@@ -1004,6 +963,45 @@
     m_dvdPlayerSubtitle.UpdateOverlayInfo((CDVDInputStreamNavigator*)m_pInputStream, LIBDVDNAV_BUTTON_NORMAL);
 }
 
+void CDVDPlayer::HandlePlaySpeed()
+{
+  if(GetPlaySpeed() != DVD_PLAYSPEED_NORMAL && GetPlaySpeed() != DVD_PLAYSPEED_PAUSE)
+  {
+    if (IsInMenu())
+    {
+      // this can't be done in menu
+      SetPlaySpeed(DVD_PLAYSPEED_NORMAL);
+
+    }
+    else if (m_CurrentVideo.id >= 0 
+          &&  m_CurrentVideo.inited == true
+          &&  m_dvdPlayerVideo.GetCurrentPts() != m_lastpts)
+    {
+      m_lastpts = m_dvdPlayerVideo.GetCurrentPts();
+      // check how much off clock video is when ff/rw:ing
+      // a problem here is that seeking isn't very accurate
+      // and since the clock will be resynced after seek
+      // we might actually not really be playing at the wanted
+      // speed. we'd need to have some way to not resync the clock
+      // after a seek to remember timing. still need to handle
+      // discontinuities somehow
+
+      // when seeking, give the player a headstart to make sure 
+      // the time it takes to seek doesn't make a difference.
+      double iError;
+      iError = m_clock.GetClock() - m_lastpts;
+      iError = iError * GetPlaySpeed() / abs(GetPlaySpeed());
+
+      if(iError > DVD_MSEC_TO_TIME(1000))
+      {
+        CLog::Log(LOGDEBUG, "CDVDPlayer::Process - Seeking to catch up");
+        __int64 iTime = (__int64)(GetTime() + 500.0 * GetPlaySpeed() / DVD_PLAYSPEED_NORMAL);
+        m_messenger.Put(new CDVDMsgPlayerSeek(iTime, (GetPlaySpeed() < 0), true, false));
+      }
+    }
+  }
+}
+
 void CDVDPlayer::CheckPlayerInit(CCurrentStream& current, unsigned int source, bool& drop)
 {
   drop = false;
@@ -1220,16 +1218,8 @@
 
     // set event to inform openfile something went wrong in case openfile is still waiting for this event
     SetEvent(m_hReadyEvent);
+    SetCaching(false);
 
-    // if we are caching, start playing it agian
-    if (m_caching && !m_bAbortRequest)
-    {
-      m_clock.SetSpeed(m_playSpeed);
-      m_dvdPlayerAudio.SetSpeed(m_playSpeed);
-      m_dvdPlayerVideo.SetSpeed(m_playSpeed);
-      m_caching = false;
-    }
-
     // close each stream
     if (!m_bAbortRequest) CLog::Log(LOGNOTICE, "DVDPlayer: eof, waiting for queues to empty");
     if (m_CurrentAudio.id >= 0)
@@ -1397,10 +1387,7 @@
         m_dvdPlayerVideo.EnableSubtitle(pValue->m_value);
 
         if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD))
-        {
-          CDVDInputStreamNavigator* pStream = (CDVDInputStreamNavigator*)m_pInputStream;
-          pStream->EnableSubtitleStream(pValue->m_value);
-        }
+          static_cast<CDVDInputStreamNavigator*>(m_pInputStream)->EnableSubtitleStream(pValue->m_value);
       }
       else if (pMsg->IsType(CDVDMsg::PLAYER_SET_STATE))
       {
@@ -1417,7 +1404,7 @@
       }
       else if (pMsg->IsType(CDVDMsg::PLAYER_SET_RECORD))
       {
-        if (m_pInputStream->IsStreamType(DVDSTREAM_TYPE_TV))
+        if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_TV))
           static_cast<CDVDInputStreamTV*>(m_pInputStream)->Record(*(CDVDMsgBool*)pMsg);
       }
       else if (pMsg->IsType(CDVDMsg::GENERAL_FLUSH))
@@ -1457,13 +1444,10 @@
           if(result)
           {
             FlushBuffers(false);
-
             CloseVideoStream(false);
             CloseAudioStream(false);
             CloseSubtitleStream(false);
-
-            OpenDemuxStream();
-            UpdateApplication();
+            SAFE_DELETE(m_pDemuxer);
           }
         }
       }
@@ -1480,6 +1464,27 @@
   }
 }
 
+void CDVDPlayer::SetCaching(bool enabled)
+{
+  if(m_caching == enabled)
+    return;
+
+  if(enabled)
+  {
+    m_clock.SetSpeed(DVD_PLAYSPEED_PAUSE);
+    m_dvdPlayerAudio.SetSpeed(DVD_PLAYSPEED_PAUSE);
+    m_dvdPlayerVideo.SetSpeed(DVD_PLAYSPEED_PAUSE);
+    m_caching = true;
+  }
+  else
+  {
+    m_clock.SetSpeed(m_playSpeed);
+    m_dvdPlayerAudio.SetSpeed(m_playSpeed);
+    m_dvdPlayerVideo.SetSpeed(m_playSpeed);
+    m_caching = false;
+  }
+}
+
 void CDVDPlayer::SetPlaySpeed(int speed)
 {
   m_messenger.Put(new CDVDMsgInt(CDVDMsg::PLAYER_SETSPEED, speed));
@@ -1488,9 +1493,17 @@
 
 void CDVDPlayer::Pause()
 {
+  if(m_playSpeed != DVD_PLAYSPEED_PAUSE && m_caching)
+  {
+    SetCaching(false);
+    return;
+  }
+
   // return to normal speed if it was paused before, pause otherwise
-  if (m_playSpeed == DVD_PLAYSPEED_PAUSE || m_caching) SetPlaySpeed(DVD_PLAYSPEED_NORMAL);
-  else SetPlaySpeed(DVD_PLAYSPEED_PAUSE);
+  if (m_playSpeed == DVD_PLAYSPEED_PAUSE) 
+    SetPlaySpeed(DVD_PLAYSPEED_NORMAL);
+  else 
+    SetPlaySpeed(DVD_PLAYSPEED_PAUSE);
 }
 
 bool CDVDPlayer::IsPaused() const

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h	2008-03-30 20:26:48 UTC (rev 12403)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h	2008-03-30 21:00:09 UTC (rev 12404)
@@ -216,11 +216,13 @@
    */
   void SetPlaySpeed(int iSpeed);
   int GetPlaySpeed()                                                { return m_playSpeed; }
-  
+  void SetCaching(bool enabled);
+
   __int64 GetTotalTimeInMsec();
   void FlushBuffers(bool queued);
 
   void HandleMessages();
+  void HandlePlaySpeed();
   bool IsInMenu() const;
 
   void SyncronizePlayers(DWORD sources, double pts = DVD_NOPTS_VALUE);
@@ -251,7 +253,7 @@
   int m_playSpeed;
   time_t m_tmLastSeek;
   double m_lastpts;  // holds last display pts during ff/rw operations
-  
+  int m_errorCount;
   // classes
   CDVDPlayerVideo m_dvdPlayerVideo; // video part
   CDVDPlayerAudio m_dvdPlayerAudio; // audio part


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12518
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12518&view=rev
Author:   leafmuncher
Date:     2008-04-05 12:41:22 -0700 (Sat, 05 Apr 2008)

Log Message:
-----------
fixed: [OS X] const a char pointer.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.h

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.cpp	2008-04-05 19:39:38 UTC (rev 12517)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.cpp	2008-04-05 19:41:22 UTC (rev 12518)
@@ -35,7 +35,7 @@
 //   12.14.07   ESF  Created.
 //
 //////////////////////////////////////////////////////////////////////////////
-PortAudioDirectSound::PortAudioDirectSound(IAudioCallback* pCallback, int iChannels, unsigned int uiSamplesPerSec, unsigned int uiBitsPerSample, bool bResample, char* strAudioCodec, bool bIsMusic, bool bPassthrough)
+PortAudioDirectSound::PortAudioDirectSound(IAudioCallback* pCallback, int iChannels, unsigned int uiSamplesPerSec, unsigned int uiBitsPerSample, bool bResample, const char* strAudioCodec, bool bIsMusic, bool bPassthrough)
 {
   CLog::Log(LOGDEBUG,"PortAudioDirectSound::PortAudioDirectSound - opening device");
   

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.h	2008-04-05 19:39:38 UTC (rev 12517)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.h	2008-04-05 19:41:22 UTC (rev 12518)
@@ -41,7 +41,7 @@
   virtual void RegisterAudioCallback(IAudioCallback* pCallback);
   virtual DWORD GetChunkLen();
   virtual FLOAT GetDelay();
-  PortAudioDirectSound(IAudioCallback* pCallback, int iChannels, unsigned int uiSamplesPerSec, unsigned int uiBitsPerSample, bool bResample, char* strAudioCodec = "", bool bIsMusic=false, bool bPassthrough = false);
+  PortAudioDirectSound(IAudioCallback* pCallback, int iChannels, unsigned int uiSamplesPerSec, unsigned int uiBitsPerSample, bool bResample, const char* strAudioCodec = "", bool bIsMusic=false, bool bPassthrough = false);
   virtual ~PortAudioDirectSound();
 
   virtual DWORD AddPackets(unsigned char* data, DWORD len);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12688
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12688&view=rev
Author:   leafmuncher
Date:     2008-04-16 12:58:49 -0700 (Wed, 16 Apr 2008)

Log Message:
-----------
Fixed: Made the maximum percentage displayed 99% so as to avoid jumping information on the screen.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp	2008-04-16 19:52:32 UTC (rev 12687)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp	2008-04-16 19:58:49 UTC (rev 12688)
@@ -522,7 +522,7 @@
 string CDVDPlayerAudio::GetPlayerInfo()
 {
   std::ostringstream s;
-  s << "aq:" << std::setw(3) << std::left << min(100,100 * m_messageQueue.GetDataSize() / m_messageQueue.GetMaxDataSize()) << "%";
+  s << "aq:" << std::setw(3) << min(99,100 * m_messageQueue.GetDataSize() / m_messageQueue.GetMaxDataSize()) << "%";
   s << ", ";
   s << "cpu: " << (int)(100 * CThread::GetRelativeUsage()) << "%, ";
   s << "bitrate: " << std::setprecision(6) << (double)GetAudioBitrate() / 1024.0 << " KBit/s";

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp	2008-04-16 19:52:32 UTC (rev 12687)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp	2008-04-16 19:58:49 UTC (rev 12688)
@@ -833,7 +833,7 @@
 std::string CDVDPlayerVideo::GetPlayerInfo()
 {
   std::ostringstream s;
-  s << "vq:" << std::setw(3) << std::left << min(100,100 * m_messageQueue.GetDataSize() / m_messageQueue.GetMaxDataSize()) << "%";
+  s << "vq:" << std::setw(3) << min(99,100 * m_messageQueue.GetDataSize() / m_messageQueue.GetMaxDataSize()) << "%";
   s << ", ";
   s << "cpu: " << (int)(100 * CThread::GetRelativeUsage()) << "%, ";
   s << "bitrate: " << std::setprecision(4) << (double)GetVideoBitrate() / (1024.0*1024.0) << " MBit/s";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13141
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13141&view=rev
Author:   wiso
Date:     2008-05-19 15:04:29 -0700 (Mon, 19 May 2008)

Log Message:
-----------
[win32]: use drive letter instead of device name for libdvdcss.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp	2008-05-19 22:03:12 UTC (rev 13140)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp	2008-05-19 22:04:29 UTC (rev 13141)
@@ -34,7 +34,11 @@
 {
   CFileItem item(file.c_str(), false);
   if (item.IsDVDFile(false, true) || item.IsDVDImage() ||
-      file.compare(MEDIA_DETECT::CCdIoSupport::GetDeviceFileName()) == 0 )
+#ifdef _WIN32PC
+    file.compare(MEDIA_DETECT::CCdIoSupport::GetDeviceFileName()+4) == 0 )
+#else
+    file.compare(MEDIA_DETECT::CCdIoSupport::GetDeviceFileName()) == 0 )
+#endif
   {
     return (new CDVDInputStreamNavigator(pPlayer));
   }

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-05-19 22:03:12 UTC (rev 13140)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-05-19 22:04:29 UTC (rev 13141)
@@ -320,8 +320,10 @@
         strFile.CompareNoCase("d:\\video_ts\\video_ts.ifo") == 0 ||
         strFile.CompareNoCase("iso9660://video_ts/video_ts.ifo") == 0)
     {
-#ifndef HAS_XBOX_HARDWARE
+#ifdef _LINUX
       m_filename = MEDIA_DETECT::CCdIoSupport::GetDeviceFileName();
+#elif defined(_WIN32PC)
+      m_filename = MEDIA_DETECT::CCdIoSupport::GetDeviceFileName()+4;
 #else
       m_filename = "\\Device\\Cdrom0";
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13230
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13230&view=rev
Author:   elupus
Date:     2008-05-25 13:59:23 -0700 (Sun, 25 May 2008)

Log Message:
-----------
changed: no need to render transparent pixels when rendering ass subtitles
changed: reenable the timeout code for reads. (speeds up aborts in dvdplayer)
changed: cosmetic fixes for ass code and fixes too not segfault if it fails to load 
library

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDOverlayRenderer.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDOverlayRenderer.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.h

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp	2008-05-25 20:53:32 UTC (rev 13229)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp	2008-05-25 20:59:23 UTC (rev 13230)
@@ -24,6 +24,7 @@
 #include "DVDFactoryCodec.h"
 #include "Video/DVDVideoCodec.h"
 #include "Audio/DVDAudioCodec.h"
+#include "Overlay/DVDOverlayCodec.h"
 
 #include "Video/DVDVideoCodecFFmpeg.h"
 #include "Video/DVDVideoCodecLibMpeg2.h"
@@ -35,6 +36,9 @@
 #include "Audio/DVDAudioCodecPcm.h"
 #include "Audio/DVDAudioCodecLPcm.h"
 #include "Audio/DVDAudioCodecPassthrough.h"
+#include "Overlay/DVDOverlayCodecSSA.h"
+#include "Overlay/DVDOverlayCodecText.h"
+#include "Overlay/DVDOverlayCodecFFmpeg.h"
 
 #include "DVDStreamInfo.h"
 
@@ -83,6 +87,29 @@
   return NULL;
 }
 
+CDVDOverlayCodec* CDVDFactoryCodec::OpenCodec(CDVDOverlayCodec* pCodec, CDVDStreamInfo &hints, CDVDCodecOptions &options )
+{  
+  try
+  {
+    CLog::Log(LOGDEBUG, "FactoryCodec - Overlay: %s - Opening", pCodec->GetName());
+    if( pCodec->Open( hints, options ) )
+    {
+      CLog::Log(LOGDEBUG, "FactoryCodec - Overlay: %s - Opened", pCodec->GetName());
+      return pCodec;
+    }
+
+    CLog::Log(LOGDEBUG, "FactoryCodec - Overlay: %s - Failed", pCodec->GetName());
+    pCodec->Dispose();
+    delete pCodec;
+  }
+  catch(...)
+  {
+    CLog::Log(LOGERROR, "FactoryCodec - Audio: Failed with exception");
+  }
+  return NULL;
+}
+
+
 CDVDVideoCodec* CDVDFactoryCodec::CreateVideoCodec( CDVDStreamInfo &hint )
 {
   CDVDVideoCodec* pCodec = NULL;
@@ -192,3 +219,29 @@
 
   return NULL;
 }
+
+CDVDOverlayCodec* CDVDFactoryCodec::CreateOverlayCodec( CDVDStreamInfo &hint )
+{
+  CDVDOverlayCodec* pCodec = NULL;
+  CDVDCodecOptions options;
+
+  switch (hint.codec)
+  {
+    case CODEC_ID_TEXT:
+      pCodec = OpenCodec(new CDVDOverlayCodecText(), hint, options);
+      if( pCodec ) return pCodec;
+
+    case CODEC_ID_SSA:
+      pCodec = OpenCodec(new CDVDOverlayCodecSSA(), hint, options);
+      if( pCodec ) return pCodec;
+
+      pCodec = OpenCodec(new CDVDOverlayCodecText(), hint, options);
+      if( pCodec ) return pCodec;
+
+    default:
+      pCodec = OpenCodec(new CDVDOverlayCodecFFmpeg(), hint, options);
+      if( pCodec ) return pCodec;
+  }
+
+  return NULL;
+}

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.h	2008-05-25 20:53:32 UTC (rev 13229)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.h	2008-05-25 20:59:23 UTC (rev 13230)
@@ -23,6 +23,7 @@
 
 class CDVDVideoCodec;
 class CDVDAudioCodec;
+class CDVDOverlayCodec;
 
 class CDemuxStreamVideo;
 class CDVDStreamInfo;
@@ -34,8 +35,10 @@
 public:
   static CDVDVideoCodec* CreateVideoCodec(CDVDStreamInfo &hint );
   static CDVDAudioCodec* CreateAudioCodec(CDVDStreamInfo &hint );
+  static CDVDOverlayCodec* CreateOverlayCodec(CDVDStreamInfo &hint );
 
   static CDVDAudioCodec* OpenCodec(CDVDAudioCodec* pCodec, CDVDStreamInfo &hint, CDVDCodecOptions &options );
   static CDVDVideoCodec* OpenCodec(CDVDVideoCodec* pCodec, CDVDStreamInfo &hint, CDVDCodecOptions &options );
+  static CDVDOverlayCodec* OpenCodec(CDVDOverlayCodec* pCodec, CDVDStreamInfo &hint, CDVDCodecOptions &options );
 };
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp	2008-05-25 20:53:32 UTC (rev 13229)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp	2008-05-25 20:59:23 UTC (rev 13230)
@@ -24,11 +24,12 @@
 #include "DVDOverlayCodecSSA.h"
 #include "DVDOverlaySSA.h"
 #include "DVDStreamInfo.h"
-#include "cores/ffmpeg/avcodec.h"
+#include "DVDCodecs/DVDCodecs.h"
 
 CDVDOverlayCodecSSA::CDVDOverlayCodecSSA() : CDVDOverlayCodec("SSA Subtitle Decoder")
 {
   m_pOverlay = NULL;
+  m_libass = NULL;
 }
 
 CDVDOverlayCodecSSA::~CDVDOverlayCodecSSA()
@@ -46,9 +47,7 @@
     return false;
 
   m_libass = new CDVDSubtitlesLibass();
-  m_libass->DecodeHeader((char *)hints.extradata, hints.extrasize);
-
-  return true;
+  return m_libass->DecodeHeader((char *)hints.extradata, hints.extrasize);
 }
 
 void CDVDOverlayCodecSSA::Dispose()
@@ -63,13 +62,9 @@
   if(m_pOverlay)
     SAFE_RELEASE(m_pOverlay);
 
-  printf("[%s] at %.1f for %.1f\n", (char* )data, pts, duration);
+  if(m_libass->DecodeDemuxPkt((char *)data, size, pts, duration))
+    m_pOverlay = new CDVDOverlaySSA(m_libass);
 
-  m_libass->DecodeDemuxPkt((char *)data, size, pts, duration);
-
-  CDVDOverlaySSA* ssaOverlay = new CDVDOverlaySSA(m_libass);
-  m_pOverlay = ssaOverlay;
-
   return OC_OVERLAY;
 }
 void CDVDOverlayCodecSSA::Reset()

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp	2008-05-25 20:53:32 UTC (rev 13229)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp	2008-05-25 20:59:23 UTC (rev 13230)
@@ -23,8 +23,7 @@
 #include "DVDOverlayCodecText.h"
 #include "DVDOverlayText.h"
 #include "DVDStreamInfo.h"
-#include "cores/ffmpeg/DllAvCodec.h"
-#include "AutoPtrHandle.h"
+#include "DVDCodecs/DVDCodecs.h"
 
 CDVDOverlayCodecText::CDVDOverlayCodecText() : CDVDOverlayCodec("Text Subtitle Decoder")
 {

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2008-05-25 20:53:32 UTC (rev 13229)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2008-05-25 20:59:23 UTC (rev 13230)
@@ -131,8 +131,8 @@
 
 static int dvd_file_read(URLContext *h, BYTE* buf, int size)
 {
-  //if (g_urltimeout && GetTickCount() > g_urltimeout)
-  //  return -1;
+  if (g_urltimeout && GetTickCount() > g_urltimeout)
+    return -1;
 
   CDVDInputStream* pInputStream = (CDVDInputStream*)h->priv_data;
   return pInputStream->Read(buf, size);
@@ -145,8 +145,8 @@
 */
 static offset_t dvd_file_seek(URLContext *h, offset_t pos, int whence)
 {
-  //if (g_urltimeout && GetTickCount() > g_urltimeout)
-  //  return -1;
+  if (g_urltimeout && GetTickCount() > g_urltimeout)
+    return -1;
 
   CDVDInputStream* pInputStream = (CDVDInputStream*)h->priv_data;
   if(whence == AVSEEK_SIZE)
@@ -381,15 +381,21 @@
   UpdateCurrentPTS();
 
   // add the ffmpeg streams to our own stream array
-  m_program = 0;
   if (m_pFormatContext->nb_programs)
   {
-    // discard nonselected programs
+    m_program = UINT_MAX;
+    // look for first non empty stream and discard nonselected programs
     for (unsigned int i = 0; i < m_pFormatContext->nb_programs; i++)
     {
+      if(m_program == UINT_MAX && m_pFormatContext->programs[i]->nb_stream_indexes > 0)
+        m_program = i;
+
       if(i != m_program)
-        m_pFormatContext->programs[m_program]->discard = AVDISCARD_ALL;
+        m_pFormatContext->programs[i]->discard = AVDISCARD_ALL;
     }
+    if(m_program == UINT_MAX)
+      m_program = 0;
+
     // add streams from selected program
     for (unsigned int i = 0; i < m_pFormatContext->programs[m_program]->nb_stream_indexes; i++)
       AddStream(m_pFormatContext->programs[m_program]->stream_index[i]);
@@ -535,8 +541,7 @@
       m_pFormatContext->pb->eof_reached = 0;
 
     // timeout reads after 100ms
-    g_urltimeout = GetTickCount() + 100;
-    //g_urltimeout = 0;
+    g_urltimeout = GetTickCount() + 20000;
     int result = 0;
     try
     {

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp	2008-05-25 20:53:32 UTC (rev 13229)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp	2008-05-25 20:59:23 UTC (rev 13230)
@@ -31,7 +31,6 @@
   m_pFile = NULL;
   m_pRecordable = NULL;
   m_pLiveTV = NULL;
-  m_pRecordable = NULL;
   m_eof = true;
 }
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.h	2008-05-25 20:53:32 UTC (rev 13229)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessage.h	2008-05-25 20:59:23 UTC (rev 13230)
@@ -248,8 +248,7 @@
 class CDVDMsgPlayerSeek : public CDVDMsg
 {
 public:
-  CDVDMsgPlayerSeek(int time, bool backward, bool flush = true,
-      bool accurate = true)
+  CDVDMsgPlayerSeek(int time, bool backward, bool flush = true, bool accurate = true)
     : CDVDMsg(PLAYER_SEEK)
     , m_time(time)
     , m_backward(backward)

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDOverlayRenderer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDOverlayRenderer.cpp	2008-05-25 20:53:32 UTC (rev 13229)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDOverlayRenderer.cpp	2008-05-25 20:59:23 UTC (rev 13230)
@@ -76,7 +76,14 @@
   while(img)
   {
     DWORD color = img->color;
+    BYTE alpha = (BYTE)(color &0xff);
 
+    if(alpha == 255)
+    {
+      img = img->next;
+      continue;
+    }
+
     //ass_image colors are RGBA
     double b = ((color >> 24) & 0xff) / 255.0;
     double g = ((color >> 16) & 0xff) / 255.0;
@@ -85,7 +92,6 @@
     BYTE luma  = (BYTE)(255 * CLAMP(0.299 * r + 0.587 * g + 0.114 * b, 0.0, 1.0));
     BYTE u     = (BYTE)(127.5 + 255 * CLAMP( 0.500 * r - 0.419 * g - 0.081 * b, -0.5, 0.5));
     BYTE v     = (BYTE)(127.5 + 255 * CLAMP(-0.169 * r - 0.331 * g + 0.500 * b, -0.5, 0.5));
-    BYTE alpha = (BYTE)(color &0xff);
 
     int y = std::max(0,std::min(img->dst_y, pPicture->height-img->h));
     int x = std::max(0,std::min(img->dst_x, pPicture->width-img->w));

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDOverlayRenderer.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDOverlayRenderer.h	2008-05-25 20:53:32 UTC (rev 13229)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDOverlayRenderer.h	2008-05-25 20:59:23 UTC (rev 13230)
@@ -23,7 +23,6 @@
 
 #include "DVDCodecs/Video/DVDVideoCodec.h"
 #include "DVDCodecs/Overlay/DVDOverlay.h"
-#include "DVDSubtitles/DVDSubtitlesLibass.h"
 
 #ifdef HAS_VIDEO_PLAYBACK
 #include "cores/VideoRenderers/RenderManager.h"

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-05-25 20:53:32 UTC (rev 13229)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-05-25 20:59:23 UTC (rev 13230)
@@ -422,7 +422,18 @@
 
   try
   {
-    m_pDemuxer = CDVDFactoryDemuxer::CreateDemuxer(m_pInputStream);
+    int attempts = 10;
+    while(!m_bStop && attempts-- > 0)
+    {
+      m_pDemuxer = CDVDFactoryDemuxer::CreateDemuxer(m_pInputStream);
+      if(!m_pDemuxer && m_pInputStream->NextStream())
+      {
+        CLog::Log(LOGDEBUG, "%s - New stream available from input, retry open", __FUNCTION__);
+        continue;
+      }
+      break;
+    }
+
     if(!m_pDemuxer)
     {
       CLog::Log(LOGERROR, "%s - Error creating demuxer", __FUNCTION__);
@@ -778,7 +789,7 @@
       CDVDDemuxUtils::FreeDemuxPacket(pPacket); 
       continue;
     }
-    
+
     if (!pPacket)
     {
       // when paused, demuxer could be be returning empty

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp	2008-05-25 20:53:32 UTC (rev 13229)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp	2008-05-25 20:59:23 UTC (rev 13230)
@@ -24,15 +24,14 @@
 #include "DVDCodecs/Overlay/DVDOverlay.h"
 #include "DVDCodecs/Overlay/DVDOverlaySpu.h"
 #include "DVDCodecs/Overlay/DVDOverlayText.h"
-#include "DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.h"
-#include "DVDCodecs/Overlay/DVDOverlayCodecText.h"
-#include "DVDCodecs/Overlay/DVDOverlayCodecSSA.h"
+#include "DVDCodecs/Overlay/DVDOverlayCodec.h"
 #include "DVDClock.h"
 #include "DVDInputStreams/DVDFactoryInputStream.h"
 #include "DVDInputStreams/DVDInputStream.h"
 #include "DVDInputStreams/DVDInputStreamNavigator.h"
 #include "DVDSubtitles/DVDSubtitleParser.h"
 #include "DVDCodecs/DVDCodecs.h"
+#include "DVDCodecs/DVDFactoryCodec.h"
 #include "DVDDemuxers/DVDDemuxUtils.h"
 
 using namespace std;
@@ -168,20 +167,12 @@
   if(hints.codec == CODEC_ID_DVD_SUBTITLE && filename == "dvd")
     return true;
 
-  if(hints.codec == CODEC_ID_TEXT)
-    m_pOverlayCodec = new CDVDOverlayCodecText();
-  else if(hints.codec == CODEC_ID_SSA)
-    m_pOverlayCodec = new CDVDOverlayCodecSSA();
-  else
-    m_pOverlayCodec = new CDVDOverlayCodecFFmpeg();
+  m_pOverlayCodec = CDVDFactoryCodec::CreateOverlayCodec(hints);
+  if(m_pOverlayCodec)
+    return true;
 
-  CDVDCodecOptions options;
-  if(!m_pOverlayCodec->Open(hints, options))
-    CloseStream(false);
-    return false;
-
   CLog::Log(LOGERROR, "%s - Unable to init overlay codec", __FUNCTION__);
-  return true;
+  return false;
 }
 
 void CDVDPlayerSubtitle::CloseStream(bool flush)

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp	2008-05-25 20:53:32 UTC (rev 13229)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp	2008-05-25 20:59:23 UTC (rev 13230)
@@ -588,7 +588,8 @@
   // then do all the rendering on that temp picture and finaly copy it to video memory.
   // In almost all cases this is 5 or more times faster!.
   bool bHasSpecialOverlay = m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SPU) 
-                         || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_IMAGE);
+                         || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_IMAGE)
+                         || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SSA);
   
   if (bHasSpecialOverlay)
   {

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp	2008-05-25 20:53:32 UTC (rev 13229)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp	2008-05-25 20:59:23 UTC (rev 13230)
@@ -20,12 +20,10 @@
  */
 
 #include "stdafx.h"
-#include "AutoPtrHandle.h"
 #include "DVDSubtitleParserSSA.h"
-#include "DVDOverlaySSA.h"
+#include "DVDCodecs/Overlay/DVDOverlaySSA.h"
 #include "DVDClock.h"
 #include "Util.h"
-#include "File.h"
 
 using namespace std;
 
@@ -55,14 +53,14 @@
     ass_event_t* curEvent =  (assEvent+i);
     if (curEvent)
     {
-      CDVDOverlaySSA* ssaOverlay = new CDVDOverlaySSA(m_libass);
-      ssaOverlay->Acquire(); // increase ref count with one so that we can hold a handle to this overlay
+      CDVDOverlaySSA* overlay = new CDVDOverlaySSA(m_libass);
+      overlay->Acquire(); // increase ref count with one so that we can hold a handle to this overlay
 
-      ssaOverlay->iPTSStartTime = curEvent->Start * (DVD_TIME_BASE / 1000);
-      ssaOverlay->iPTSStopTime  = (curEvent->Start + curEvent->Duration) * (DVD_TIME_BASE / 1000);
+      overlay->iPTSStartTime = (double)curEvent->Start * (DVD_TIME_BASE / 1000);
+      overlay->iPTSStopTime  = (double)(curEvent->Start + curEvent->Duration) * (DVD_TIME_BASE / 1000);
 
-      ssaOverlay->replace = true;
-      m_collection.Add(ssaOverlay);
+      overlay->replace = true;
+      m_collection.Add(overlay);
     }
   }
   return true;
@@ -86,6 +84,5 @@
 
 CDVDOverlay* CDVDSubtitleParserSSA::Parse(double iPts)
 {
-  CDVDOverlay* pOverlay = m_collection.Get(iPts);
-  return pOverlay;
+  return m_collection.Get(iPts);
 }

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp	2008-05-25 20:53:32 UTC (rev 13229)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp	2008-05-25 20:59:23 UTC (rev 13230)
@@ -21,16 +21,15 @@
 
 #include "stdafx.h"
 #include "DVDSubtitlesLibass.h"
-#include "Util.h"
-#include "File.h"
+#include "DVDClock.h"
 
 using namespace std;
 
 CDVDSubtitlesLibass::CDVDSubtitlesLibass()
 {
 
-  m_track = 0;
-  hasHeader = false;
+  m_track = NULL;
+  m_library = NULL;
   m_references = 1;
 
   if(!m_dll.Load())
@@ -103,13 +102,13 @@
 
 bool CDVDSubtitlesLibass::DecodeDemuxPkt(char* data, int size, double start, double duration)
 {
-  if(!hasHeader)
+  if(!m_track)
   {
     CLog::Log(LOGERROR, "CDVDSubtitlesLibass: No SSA header found.");
     return false;
   }
 
-  m_dll.ass_process_chunk(m_track, data, size, (long long)(start/1000), (long long)(duration/1000));
+  m_dll.ass_process_chunk(m_track, data, size, DVD_TIME_TO_MSEC(start), DVD_TIME_TO_MSEC(duration));
   return true;
 }
 
@@ -131,6 +130,9 @@
   CLog::Log(LOGINFO, "SSA Parser: Creating m_track from SSA file:  %s", fileName.c_str());
 
   m_track = m_dll.ass_read_file(m_library, (char* )fileName.c_str(), 0);
+  if(m_track == NULL)
+    return false;
+
   return true;
 }
 
@@ -164,8 +166,7 @@
   }
 
   m_dll.ass_set_frame_size(m_renderer, imageWidth, imageHeight);
-  ass_image_t* img = m_dll.ass_render_frame(m_renderer, m_track,(long long)(pts/1000), NULL);
-  return img;
+  return m_dll.ass_render_frame(m_renderer, m_track, DVD_TIME_TO_MSEC(pts), NULL);
 }
 
 ass_event_t* CDVDSubtitlesLibass::GetEvents()

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.h	2008-05-25 20:53:32 UTC (rev 13229)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.h	2008-05-25 20:59:23 UTC (rev 13230)
@@ -49,7 +49,6 @@
   long Release();
 
 private:
-  bool hasHeader;
   DllLibass m_dll;
   long m_references;
   ass_library_t* m_library;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13232
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13232&view=rev
Author:   malloc64
Date:     2008-05-25 16:30:51 -0700 (Sun, 25 May 2008)

Log Message:
-----------
SF patch 1748855 part 4 (skipped 2, already done  3).  We shouldn't have been defining uintXX_t. That's what stdint is for.  If this breaks win32, check trunk/XBMC/xbmc/stdint.h

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc/cc_decoder.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/config.h

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc/cc_decoder.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc/cc_decoder.h	2008-05-25 21:23:23 UTC (rev 13231)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc/cc_decoder.h	2008-05-25 23:30:51 UTC (rev 13232)
@@ -1,7 +1,7 @@
-
+#ifndef _LINUX
 #define EMULATE_INTTYPES
+#endif /* _LINUX */
 
-
 #ifndef EMULATE_INTTYPES
 #   include <inttypes.h>
 #else

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h	2008-05-25 21:23:23 UTC (rev 13231)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h	2008-05-25 23:30:51 UTC (rev 13232)
@@ -23,20 +23,6 @@
 
 #include "DynamicDll.h"
 
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed int int32_t;
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-#if __WORDSIZE == 64
-typedef signed long int64_t;
-typedef unsigned long uint64_t;
-#else /* __WORDSIZE != 64 */
-typedef signed __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#endif /* __WORDSIZE == 64 */
-
 #ifdef __cplusplus
 extern "C"
 {

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/config.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/config.h	2008-05-25 21:23:23 UTC (rev 13231)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/config.h	2008-05-25 23:30:51 UTC (rev 13232)
@@ -88,26 +88,3 @@
 #ifndef S_ISCHR
 #define S_ISCHR(m) 0
 #endif
-
-/* Fallback types (very x86-centric, sorry) */
-typedef unsigned char       uint8_t;
-typedef signed char         int8_t;
-typedef unsigned short      uint16_t;
-typedef signed short        int16_t;
-typedef unsigned int        uint32_t;
-typedef signed int          int32_t;
-#if __WORDSIZE == 64
-typedef unsigned long       uint64_t;
-typedef signed long         int64_t;
-#else /* __WORDSIZE != 64 */
-typedef unsigned __int64    uint64_t;
-typedef signed __int64      int64_t;
-#endif
-#ifndef __APPLE__
-#if __WORDSIZE == 64
-typedef unsigned long       uintptr_t;
-#else /* __WORDSIZE != 64 */
-typedef unsigned int        uintptr_t;
-#endif /* __WORDSIZE == 64 */
-#endif /* !__APPLE__ */
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13237
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13237&view=rev
Author:   elupus
Date:     2008-05-26 09:53:31 -0700 (Mon, 26 May 2008)

Log Message:
-----------
merged: r13234,r13235 from trunk.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp	2008-05-26 16:47:03 UTC (rev 13236)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp	2008-05-26 16:53:31 UTC (rev 13237)
@@ -66,20 +66,44 @@
 
 bool CDVDCodecUtils::CopyPicture(DVDVideoPicture* pDst, DVDVideoPicture* pSrc)
 {
-  if (pDst->iWidth != pSrc->iWidth || pDst->iHeight != pSrc->iHeight) return false;
+  BYTE *s, *d;
+  int w = pSrc->iWidth;
+  int h = pSrc->iHeight;
 
-  int size_y = (pSrc->iWidth * pSrc->iHeight);
-  int size_u = pSrc->iWidth / 2 * pSrc->iHeight / 2;
-  int size_v = size_u;
+  s = pSrc->data[0];
+  d = pDst->data[0];
 
-  memcpy(pDst->data[0], pSrc->data[0], size_y);
-  memcpy(pDst->data[1], pSrc->data[1], size_u);
-  memcpy(pDst->data[2], pSrc->data[2], size_v);
+  for (int y = 0; y < h; y++)
+  {
+    memcpy(d, s, w);
+    s += pSrc->iLineSize[0];
+    d += pDst->iLineSize[0];
+  }
 
+  w >>= 1;
+  h >>= 1;
+
+  s = pSrc->data[1];
+  d = pDst->data[1];
+  for (int y = 0; y < h; y++)
+  {
+    memcpy(d, s, w);
+    s += pSrc->iLineSize[1];
+    d += pDst->iLineSize[1];
+  }
+
+  s = pSrc->data[2];
+  d = pDst->data[2];
+  for (int y = 0; y < h; y++)
+  {
+    memcpy(d, s, w);
+    s += pSrc->iLineSize[2];
+    d += pDst->iLineSize[2];
+  }
   return true;
 }
 
-bool CDVDCodecUtils::CopyPictureToOverlay(YV12Image* pImage, DVDVideoPicture *pSrc)
+bool CDVDCodecUtils::CopyPicture(YV12Image* pImage, DVDVideoPicture *pSrc)
 {
   BYTE *s = pSrc->data[0];
   BYTE *d = pImage->plane[0];

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.h	2008-05-26 16:47:03 UTC (rev 13236)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.h	2008-05-26 16:53:31 UTC (rev 13237)
@@ -31,6 +31,6 @@
   static DVDVideoPicture* AllocatePicture(int iWidth, int iHeight);
   static void FreePicture(DVDVideoPicture* pPicture);
   static bool CopyPicture(DVDVideoPicture* pDst, DVDVideoPicture* pSrc);
-  static bool CopyPictureToOverlay(YV12Image* pImage, DVDVideoPicture *pSrc);
+  static bool CopyPicture(YV12Image* pDst, DVDVideoPicture *pSrc);
 };
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp	2008-05-26 16:47:03 UTC (rev 13236)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp	2008-05-26 16:53:31 UTC (rev 13237)
@@ -602,8 +602,10 @@
     if (!m_pTempOverlayPicture) m_pTempOverlayPicture = CDVDCodecUtils::AllocatePicture(pSource->iWidth, pSource->iHeight);
   }
 
-  if (bHasSpecialOverlay && m_pTempOverlayPicture) CDVDCodecUtils::CopyPicture(m_pTempOverlayPicture, pSource);
-  else CDVDCodecUtils::CopyPictureToOverlay(pDest, pSource);
+  if (bHasSpecialOverlay && m_pTempOverlayPicture) 
+    CDVDCodecUtils::CopyPicture(m_pTempOverlayPicture, pSource);
+  else 
+    CDVDCodecUtils::CopyPicture(pDest, pSource);
   
   m_pOverlayContainer->Lock();
 
@@ -635,9 +637,7 @@
   m_pOverlayContainer->Unlock();
   
   if (bHasSpecialOverlay && m_pTempOverlayPicture)
-  {
-    CDVDCodecUtils::CopyPictureToOverlay(pDest, m_pTempOverlayPicture);
-  }
+    CDVDCodecUtils::CopyPicture(pDest, m_pTempOverlayPicture);
 }
 
 int CDVDPlayerVideo::OutputPicture(DVDVideoPicture* pPicture, double pts)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13371
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13371&view=rev
Author:   robrudd
Date:     2008-06-02 14:07:04 -0700 (Mon, 02 Jun 2008)

Log Message:
-----------
added: extraction of mkv embedded fonts.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2008-06-02 20:03:16 UTC (rev 13370)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2008-06-02 21:07:04 UTC (rev 13371)
@@ -36,7 +36,8 @@
 #include "DVDClock.h" // for DVD_TIME_BASE
 #include "utils/Win32Exception.h"
 #include "Settings.h"
-#include "FileSystem/IFile.h"
+#include "FileSystem/File.h"
+#include "Util.h"
 
 void CDemuxStreamAudioFFmpeg::GetStreamInfo(std::string& strInfo)
 {
@@ -887,6 +888,23 @@
           st->identifier = pStream->codec->sub_id;
         break;
       }
+    case CODEC_TYPE_ATTACHMENT:
+      { //mkv attachments. Only bothering with fonts for now.
+        if(pStream->codec->codec_id == CODEC_ID_TTF)
+        {
+          XFILE::CFile file;
+          std::string fileName = "Z:\\";
+          fileName = _P(fileName + pStream->filename);
+          if(file.OpenForWrite(fileName) && pStream->codec->extradata)
+          {
+            file.Write(pStream->codec->extradata, pStream->codec->extradata_size);
+            file.Close();
+          }
+        }
+        m_streams[iId] = new CDemuxStream();
+        m_streams[iId]->type = STREAM_NONE;
+        break;
+      }
     default:
       {
         m_streams[iId] = new CDemuxStream();

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp	2008-06-02 20:03:16 UTC (rev 13370)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp	2008-06-02 21:07:04 UTC (rev 13371)
@@ -39,9 +39,8 @@
     return;
   }
 
-  //Setting a Default Font
-  string strFont = "Arial.ttf";
-  string strPath = "";
+  //Setting the font directory to the temp dir(where mkv fonts are extracted to)
+  string strPath = _P("Z:\\");
 
   CLog::Log(LOGINFO, "CDVDSubtitlesLibass: Creating ASS library structure");
   m_library  = m_dll.ass_library_init();
@@ -49,27 +48,24 @@
     return;
 
   CLog::Log(LOGINFO, "CDVDSubtitlesLibass: Initializing ASS library font settings");
-  strPath = _P("Q:\\media\\Fonts\\");
   m_dll.ass_set_fonts_dir(m_library,  strPath.c_str());
-  strPath += strFont;
-
-#ifdef _LINUX
-  strPath = PTH_IC(strPath);
-#endif
-
-  m_dll.ass_set_extract_fonts(m_library, 0);
+  m_dll.ass_set_extract_fonts(m_library, 1);
   m_dll.ass_set_style_overrides(m_library, NULL);
 
   CLog::Log(LOGINFO, "CDVDSubtitlesLibass: Initializing ASS Renderer");
 
   m_renderer = m_dll.ass_renderer_init(m_library);
+
   if(!m_renderer)
     return;
+
+  //Setting default font to the Arial in \media\fonts (used if FontConfig fails)
+  strPath = _P("Q:\\media\\Fonts\\Arial.ttf");
+
   m_dll.ass_set_margins(m_renderer, 0, 0, 0, 0);
   m_dll.ass_set_use_margins(m_renderer, 0);
   m_dll.ass_set_font_scale(m_renderer, 1);
   m_dll.ass_set_fonts(m_renderer, strPath.c_str(), "");
-
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14007
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14007&view=rev
Author:   elupus
Date:     2008-07-11 05:42:12 -0700 (Fri, 11 Jul 2008)

Log Message:
-----------
fixed: dvdplayer wouldn't stop playback even if dvd told it to stop

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp	2008-07-11 09:58:49 UTC (rev 14006)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp	2008-07-11 12:42:12 UTC (rev 14007)
@@ -211,7 +211,7 @@
 
 int CDVDInputStreamNavigator::Read(BYTE* buf, int buf_size)
 {
-  if (!m_dvdnav || m_bEOF) return -1;
+  if (!m_dvdnav || m_bEOF) return 0;
   if (buf_size < DVD_VIDEO_BLOCKSIZE)
   {
     CLog::Log(LOGERROR, "CDVDInputStreamNavigator: buffer size is to small, %d bytes, should be 2048 bytes", buf_size);

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-07-11 09:58:49 UTC (rev 14006)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-07-11 12:42:12 UTC (rev 14007)
@@ -818,7 +818,10 @@
 
         // stream is holding back data untill demuxer has flushed
         if(pStream->IsHeld())
+        {
           pStream->SkipHold();
+          continue;
+        }
 
         // stills will be skipped
         if(m_dvd.state == DVDSTATE_STILL)
@@ -835,10 +838,8 @@
             }
           }
           Sleep(100);
+          continue;
         }
-
-        // we don't consider dvd's ended untill navigator tells us so
-        continue;
       }
 
       // if we are caching, start playing it agian


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.