diff --git a/packages/mediacenter/xbmc-pvr/patches/changeset_r27569-r27594.diff b/packages/mediacenter/xbmc-pvr/patches/changeset_r27569-r27601.diff
similarity index 73%
rename from packages/mediacenter/xbmc-pvr/patches/changeset_r27569-r27594.diff
rename to packages/mediacenter/xbmc-pvr/patches/changeset_r27569-r27601.diff
index 0f8cdc04b3..790ac81cba 100644
--- a/packages/mediacenter/xbmc-pvr/patches/changeset_r27569-r27594.diff
+++ b/packages/mediacenter/xbmc-pvr/patches/changeset_r27569-r27601.diff
@@ -1,6 +1,6 @@
-diff -Naur xbmc-pvr-27594.orig/language/Chinese (Simple)/strings.xml xbmc-pvr-27594.patch/language/Chinese (Simple)/strings.xml
---- xbmc-pvr-27594.orig/language/Chinese (Simple)/strings.xml 2010-02-08 18:51:27.000000000 +0100
-+++ xbmc-pvr-27594.patch/language/Chinese (Simple)/strings.xml 2010-02-09 07:31:57.947899745 +0100
+diff -Naur xbmc-pvr-27594/language/Chinese (Simple)/strings.xml xbmc-pvr-27594.patch/language/Chinese (Simple)/strings.xml
+--- xbmc-pvr-27594/language/Chinese (Simple)/strings.xml 2010-02-09 07:10:24.000000000 +0100
++++ xbmc-pvr-27594.patch/language/Chinese (Simple)/strings.xml 2010-02-09 20:08:42.332222055 +0100
@@ -1,6 +1,6 @@
@@ -27,9 +27,9 @@ diff -Naur xbmc-pvr-27594.orig/language/Chinese (Simple)/strings.xml xbmc-pvr-27
排序：%s
名称
-diff -Naur xbmc-pvr-27594.orig/language/Chinese (Simple)/strings.xml.orig xbmc-pvr-27594.patch/language/Chinese (Simple)/strings.xml.orig
---- xbmc-pvr-27594.orig/language/Chinese (Simple)/strings.xml.orig 1970-01-01 01:00:00.000000000 +0100
-+++ xbmc-pvr-27594.patch/language/Chinese (Simple)/strings.xml.orig 2010-02-09 07:31:57.957899336 +0100
+diff -Naur xbmc-pvr-27594/language/Chinese (Simple)/strings.xml.orig xbmc-pvr-27594.patch/language/Chinese (Simple)/strings.xml.orig
+--- xbmc-pvr-27594/language/Chinese (Simple)/strings.xml.orig 1970-01-01 01:00:00.000000000 +0100
++++ xbmc-pvr-27594.patch/language/Chinese (Simple)/strings.xml.orig 2010-02-09 20:08:42.335222414 +0100
@@ -0,0 +1,2205 @@
+
+
@@ -2236,9 +2236,9 @@ diff -Naur xbmc-pvr-27594.orig/language/Chinese (Simple)/strings.xml.orig xbmc-p
+ 7.1
+
+
-diff -Naur xbmc-pvr-27594.orig/lib/xbmc-dll-symbols/DllAvFormat.c xbmc-pvr-27594.patch/lib/xbmc-dll-symbols/DllAvFormat.c
---- xbmc-pvr-27594.orig/lib/xbmc-dll-symbols/DllAvFormat.c 1970-01-01 01:00:00.000000000 +0100
-+++ xbmc-pvr-27594.patch/lib/xbmc-dll-symbols/DllAvFormat.c 2010-02-09 07:33:38.777898025 +0100
+diff -Naur xbmc-pvr-27594/lib/xbmc-dll-symbols/DllAvFormat.c xbmc-pvr-27594.patch/lib/xbmc-dll-symbols/DllAvFormat.c
+--- xbmc-pvr-27594/lib/xbmc-dll-symbols/DllAvFormat.c 1970-01-01 01:00:00.000000000 +0100
++++ xbmc-pvr-27594.patch/lib/xbmc-dll-symbols/DllAvFormat.c 2010-02-09 20:08:42.337192623 +0100
@@ -0,0 +1,83 @@
+/*
+ * various utility functions used within FFmpeg
@@ -2323,9 +2323,9 @@ diff -Naur xbmc-pvr-27594.orig/lib/xbmc-dll-symbols/DllAvFormat.c xbmc-pvr-27594
+ }
+}
+#endif /* (defined USE_EXTERNAL_FFMPEG) */
-diff -Naur xbmc-pvr-27594.orig/lib/xbmc-dll-symbols/Makefile xbmc-pvr-27594.patch/lib/xbmc-dll-symbols/Makefile
---- xbmc-pvr-27594.orig/lib/xbmc-dll-symbols/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ xbmc-pvr-27594.patch/lib/xbmc-dll-symbols/Makefile 2010-02-09 07:33:38.778906804 +0100
+diff -Naur xbmc-pvr-27594/lib/xbmc-dll-symbols/Makefile xbmc-pvr-27594.patch/lib/xbmc-dll-symbols/Makefile
+--- xbmc-pvr-27594/lib/xbmc-dll-symbols/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ xbmc-pvr-27594.patch/lib/xbmc-dll-symbols/Makefile 2010-02-09 20:08:42.337192623 +0100
@@ -0,0 +1,6 @@
+SRCS = DllAvFormat.c
+
@@ -2333,9 +2333,9 @@ diff -Naur xbmc-pvr-27594.orig/lib/xbmc-dll-symbols/Makefile xbmc-pvr-27594.patc
+
+include ../../Makefile.include
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
-diff -Naur xbmc-pvr-27594.orig/Makefile.in xbmc-pvr-27594.patch/Makefile.in
---- xbmc-pvr-27594.orig/Makefile.in 2010-02-08 19:09:44.000000000 +0100
-+++ xbmc-pvr-27594.patch/Makefile.in 2010-02-09 07:33:38.769772192 +0100
+diff -Naur xbmc-pvr-27594/Makefile.in xbmc-pvr-27594.patch/Makefile.in
+--- xbmc-pvr-27594/Makefile.in 2010-02-09 07:10:19.000000000 +0100
++++ xbmc-pvr-27594.patch/Makefile.in 2010-02-09 20:08:42.338193023 +0100
@@ -98,7 +98,8 @@
xbmc/lib/libid3tag \
xbmc/lib/libapetag \
@@ -2364,10 +2364,21 @@ diff -Naur xbmc-pvr-27594.orig/Makefile.in xbmc-pvr-27594.patch/Makefile.in
xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC)
ifeq ($(findstring osx,$(ARCH)), osx)
$(CXX) $(CXXFLAGS) -o xbmc.bin -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(OBJSXBMC) $(LIBS) $(LDFLAGS) -rdynamic
-diff -Naur xbmc-pvr-27594.orig/Makefile.in.orig xbmc-pvr-27594.patch/Makefile.in.orig
-diff -Naur xbmc-pvr-27594.orig/xbmc/ButtonTranslator.cpp xbmc-pvr-27594.patch/xbmc/ButtonTranslator.cpp
---- xbmc-pvr-27594.orig/xbmc/ButtonTranslator.cpp 2010-02-08 18:53:42.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/ButtonTranslator.cpp 2010-02-09 07:31:57.960897391 +0100
+diff -Naur xbmc-pvr-27594/xbmc/ApplicationMessenger.h xbmc-pvr-27594.patch/xbmc/ApplicationMessenger.h
+--- xbmc-pvr-27594/xbmc/ApplicationMessenger.h 2010-02-09 07:11:38.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/ApplicationMessenger.h 2010-02-09 20:10:37.367067700 +0100
+@@ -140,7 +140,7 @@
+
+ void DoModal(CGUIDialog *pDialog, int iWindowID, const CStdString ¶m = "");
+ void Show(CGUIDialog *pDialog);
+- void Close(CGUIDialog *pDialog, bool forceClose, bool waitResult=false);
++ void Close(CGUIDialog *pDialog, bool forceClose, bool waitResult=true);
+ void WindowManagerProcess(bool renderOnly = false); // will call g_windowManager.Process on the rendering thread
+ void Render(); // will call g_windowManager.Render on the rendering thread
+ void ActivateWindow(int windowID, const std::vector ¶ms, bool swappingWindows);
+diff -Naur xbmc-pvr-27594/xbmc/ButtonTranslator.cpp xbmc-pvr-27594.patch/xbmc/ButtonTranslator.cpp
+--- xbmc-pvr-27594/xbmc/ButtonTranslator.cpp 2010-02-09 07:11:39.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/ButtonTranslator.cpp 2010-02-09 20:08:42.343192714 +0100
@@ -948,6 +948,7 @@
else if (strWindow.Equals("karaokelargeselector")) windowID = WINDOW_DIALOG_KARAOKE_SELECTOR;
else if (strWindow.Equals("sliderdialog")) windowID = WINDOW_DIALOG_SLIDER;
@@ -2376,9 +2387,9 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/ButtonTranslator.cpp xbmc-pvr-27594.patch/xb
else
CLog::Log(LOGERROR, "Window Translator: Can't find window %s", strWindow.c_str());
-diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h
---- xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h 2010-02-08 18:53:23.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h 2010-02-09 07:33:32.412911808 +0100
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h
+--- xbmc-pvr-27594/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h 2010-02-09 07:15:03.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h 2010-02-09 20:08:42.349192247 +0100
@@ -89,7 +89,7 @@
void * const out[6], const int out_stride[6],
const void * const in[6], const int in_stride[6], int len)=0;
@@ -2415,9 +2426,9 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h xbmc-pvr
// DLL faking.
virtual bool ResolveExports() { return true; }
-diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/Codecs/DllAvFormat.h xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/Codecs/DllAvFormat.h
---- xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/Codecs/DllAvFormat.h 2010-02-08 18:53:23.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/Codecs/DllAvFormat.h 2010-02-09 07:33:38.777898025 +0100
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/Codecs/DllAvFormat.h xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/Codecs/DllAvFormat.h
+--- xbmc-pvr-27594/xbmc/cores/dvdplayer/Codecs/DllAvFormat.h 2010-02-09 07:14:33.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/Codecs/DllAvFormat.h 2010-02-09 20:10:23.112067215 +0100
@@ -18,11 +18,13 @@
#if (defined USE_EXTERNAL_FFMPEG)
#if (defined HAVE_LIBAVFORMAT_AVFORMAT_H)
@@ -2445,7 +2456,16 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/Codecs/DllAvFormat.h xbmc-pv
virtual int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp, int flags)=0;
#if (!defined USE_EXTERNAL_FFMPEG)
virtual int av_find_stream_info_dont_call(AVFormatContext *ic)=0;
-@@ -101,6 +103,7 @@
+@@ -92,7 +94,7 @@
+ virtual void av_register_all()
+ {
+ CSingleLock lock(DllAvCodec::m_critSection);
+- ::av_register_all();
++ return ::av_register_all();
+ }
+ virtual void av_register_all_dont_call() { *(int* )0x0 = 0; }
+ virtual AVInputFormat *av_find_input_format(const char *short_name) { return ::av_find_input_format(short_name); }
+@@ -101,10 +103,15 @@
virtual void av_close_input_file(AVFormatContext *s) { ::av_close_input_file(s); }
virtual void av_close_input_stream(AVFormatContext *s) { ::av_close_input_stream(s); }
virtual int av_read_frame(AVFormatContext *s, AVPacket *pkt) { return ::av_read_frame(s, pkt); }
@@ -2453,9 +2473,18 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/Codecs/DllAvFormat.h xbmc-pv
virtual int av_read_play(AVFormatContext *s) { return ::av_read_play(s); }
virtual int av_read_pause(AVFormatContext *s) { return ::av_read_pause(s); }
virtual int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) { return ::av_seek_frame(s, stream_index, timestamp, flags); }
-diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.cpp
---- xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.cpp 2010-02-08 18:53:24.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.cpp 2010-02-09 07:31:57.961900793 +0100
+- virtual int av_find_stream_info(AVFormatContext *ic) { return ::av_find_stream_info(ic); }
++ virtual int av_find_stream_info(AVFormatContext *ic)
++ {
++ CSingleLock lock(DllAvCodec::m_critSection);
++ return ::av_find_stream_info(ic);
++ }
+ virtual int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, AVInputFormat *fmt, int buf_size, AVFormatParameters *ap) { return ::av_open_input_file(ic_ptr, filename, fmt, buf_size, ap); }
+ virtual void url_set_interrupt_cb(URLInterruptCB *interrupt_cb) { ::url_set_interrupt_cb(interrupt_cb); }
+ virtual int av_open_input_stream(AVFormatContext **ic_ptr, ByteIOContext *pb, const char *filename, AVInputFormat *fmt, AVFormatParameters *ap) { return ::av_open_input_stream(ic_ptr, pb, filename, fmt, ap); }
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.cpp
+--- xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.cpp 2010-02-09 07:15:07.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.cpp 2010-02-09 20:08:42.351201217 +0100
@@ -105,21 +105,25 @@
enum PCMChannels* CDVDAudioCodecLibFaad::GetChannelMap()
@@ -2493,9 +2522,9 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCode
return m_pChannelMap;
}
-diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD/CrystalHD.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD/CrystalHD.cpp
---- xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD/CrystalHD.cpp 2010-02-08 18:53:24.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD/CrystalHD.cpp 2010-02-09 07:33:28.840898772 +0100
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD/CrystalHD.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD/CrystalHD.cpp
+--- xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD/CrystalHD.cpp 2010-02-09 07:15:08.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD/CrystalHD.cpp 2010-02-09 20:08:42.352217121 +0100
@@ -1597,6 +1597,14 @@
return false;
}
@@ -2511,9 +2540,9 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD/Cr
int CCrystalHD::GetReadyCount(void)
{
if (m_pOutputThread)
-diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD/CrystalHD.h xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD/CrystalHD.h
---- xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD/CrystalHD.h 2010-02-08 18:53:24.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD/CrystalHD.h 2010-02-09 07:33:28.837804757 +0100
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD/CrystalHD.h xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD/CrystalHD.h
+--- xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD/CrystalHD.h 2010-02-09 07:15:08.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD/CrystalHD.h 2010-02-09 20:08:42.353193006 +0100
@@ -127,6 +127,7 @@
void Reset(void);
bool AddInput(unsigned char *pData, size_t size, double pts);
@@ -2522,10 +2551,34 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD/Cr
int GetReadyCount(void);
void BusyListPop(void);
-diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecCrystalHD.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecCrystalHD.cpp
---- xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecCrystalHD.cpp 2010-02-08 18:53:24.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecCrystalHD.cpp 2010-02-09 07:33:28.841899451 +0100
-@@ -165,15 +165,17 @@
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecCrystalHD.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecCrystalHD.cpp
+--- xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecCrystalHD.cpp 2010-02-09 07:15:07.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecCrystalHD.cpp 2010-02-09 20:08:59.037068203 +0100
+@@ -143,37 +143,24 @@
+ }
+ else
+ {
+- // always use pts for video content with re-ordered frames.
+- if(!m_force_dts && pts != DVD_NOPTS_VALUE)
+- m_pts = pts;
+- else
+- {
+- // if dts is invalid but pts is not, use pts.
+- if (dts == DVD_NOPTS_VALUE && pts != DVD_NOPTS_VALUE)
+- m_pts = pts;
+- else
+- {
+- // not a clue so use dts, some avi's will toggle
+- // pts valid/invalid and mess up timing, so force
+- // dts for all packets if we ever drop into here.
+- m_force_dts = true;
+- m_pts = dts;
+- }
+- }
++ // always use pts for video content as we might have re-ordered frames.
++ m_pts = pts;
+ }
+
// Handle Input, add demuxer packet to input queue, we must accept it or
// it will be discarded as DVDPlayerVideo has no concept of "try again".
if ( m_Device->AddInput(pData, iSize, m_pts) )
@@ -2546,7 +2599,7 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCode
// Fake a decoding delay of 1/2 the frame duration, this helps keep DVDPlayerVideo from
// draining the demuxer queue. DVDPlayerVideo expects one picture frame for each demuxer
-@@ -199,6 +201,8 @@
+@@ -199,6 +186,8 @@
ret |= VC_PICTURE;
}
}
@@ -2555,9 +2608,9 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCode
return ret;
}
-diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h
---- xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h 2010-02-08 18:53:24.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h 2010-02-09 07:33:01.061899743 +0100
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h
+--- xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h 2010-02-09 07:15:07.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h 2010-02-09 20:08:42.355192827 +0100
@@ -89,7 +89,6 @@
#define DVP_FLAG_NOSKIP 0x00000010 // indicate this picture should never be dropped
@@ -2566,9 +2619,9 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCode
// DVP_FLAG 0x00000100 - 0x00000f00 is in use by libmpeg2!
-diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
---- xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp 2010-01-24 11:49:29.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp 2010-02-09 07:33:19.948774751 +0100
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
+--- xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp 2010-02-09 07:15:08.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp 2010-02-09 20:08:42.356192598 +0100
@@ -1209,7 +1209,6 @@
if(m_mixerstep)
{
@@ -2577,1269 +2630,34 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp xb
if(m_mixerstep > 1)
picture->pts = DVD_NOPTS_VALUE;
}
-diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp.orig xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp.orig
---- xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp.orig 1970-01-01 01:00:00.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp.orig 2010-02-09 07:33:32.409807037 +0100
-@@ -0,0 +1,1256 @@
-+/*
-+ * Copyright (C) 2005-2008 Team XBMC
-+ * http://www.xbmc.org
-+ *
-+ * 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, 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 XBMC; see the file COPYING. If not, write to
-+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * http://www.gnu.org/copyleft/gpl.html
-+ *
-+ */
-+
-+#if (defined HAVE_CONFIG_H) && (!defined WIN32)
-+ #include "config.h"
-+#endif
-+#include "system.h"
-+#ifndef __STDC_CONSTANT_MACROS
-+#define __STDC_CONSTANT_MACROS
-+#endif
-+#ifndef __STDC_LIMIT_MACROS
-+#define __STDC_LIMIT_MACROS
-+#endif
-+#ifdef _LINUX
-+#include "stdint.h"
-+#else
-+#define INT64_C __int64
-+#endif
-+#include "DVDDemuxFFmpeg.h"
-+#include "DVDInputStreams/DVDInputStream.h"
-+#include "DVDInputStreams/DVDInputStreamNavigator.h"
-+#ifdef HAS_FILESYSTEM_MMS
-+#include "DVDInputStreams/DVDInputStreamMMS.h"
-+#endif
-+#include "DVDInputStreams/DVDInputStreamRTMP.h"
-+#include "DVDDemuxUtils.h"
-+#include "DVDClock.h" // for DVD_TIME_BASE
-+#include "utils/Win32Exception.h"
-+#include "AdvancedSettings.h"
-+#include "GUISettings.h"
-+#include "FileSystem/File.h"
-+#include "FileSystem/Directory.h"
-+#include "utils/log.h"
-+#include "Thread.h"
-+#include "utils/TimeUtils.h"
-+
-+void CDemuxStreamAudioFFmpeg::GetStreamInfo(std::string& strInfo)
-+{
-+ if(!m_stream) return;
-+ char temp[128];
-+ m_parent->m_dllAvCodec.avcodec_string(temp, 128, m_stream->codec, 0);
-+ strInfo = temp;
-+}
-+
-+void CDemuxStreamAudioFFmpeg::GetStreamName(std::string& strInfo)
-+{
-+ if(!m_stream) return;
-+ if(!m_description.empty())
-+ strInfo = m_description;
-+ else
-+ CDemuxStream::GetStreamName(strInfo);
-+}
-+
-+void CDemuxStreamSubtitleFFmpeg::GetStreamName(std::string& strInfo)
-+{
-+ if(!m_stream) return;
-+ if(!m_description.empty())
-+ strInfo = m_description;
-+ else
-+ CDemuxStream::GetStreamName(strInfo);
-+}
-+
-+void CDemuxStreamVideoFFmpeg::GetStreamInfo(std::string& strInfo)
-+{
-+ if(!m_stream) return;
-+ char temp[128];
-+ m_parent->m_dllAvCodec.avcodec_string(temp, 128, m_stream->codec, 0);
-+ strInfo = temp;
-+}
-+
-+void CDemuxStreamSubtitleFFmpeg::GetStreamInfo(std::string& strInfo)
-+{
-+ if(!m_stream) return;
-+ char temp[128];
-+ m_parent->m_dllAvCodec.avcodec_string(temp, 128, m_stream->codec, 0);
-+ strInfo = temp;
-+}
-+
-+// these need to be put somewhere that are compiled, we should have some better place for it
-+
-+CCriticalSection DllAvCodec::m_critSection;
-+std::map g_logbuffer;
-+
-+void ff_avutil_log(void* ptr, int level, const char* format, va_list va)
-+{
-+ CSingleLock lock(DllAvCodec::m_critSection);
-+ uintptr_t threadId = (uintptr_t)CThread::GetCurrentThreadId();
-+ CStdString &buffer = g_logbuffer[threadId];
-+
-+ AVClass* avc= ptr ? *(AVClass**)ptr : NULL;
-+
-+ if(level >= AV_LOG_DEBUG && g_advancedSettings.m_logLevel <= LOG_LEVEL_DEBUG_SAMBA)
-+ return;
-+ else if(g_advancedSettings.m_logLevel <= LOG_LEVEL_NORMAL)
-+ return;
-+
-+ int type;
-+ switch(level)
-+ {
-+ case AV_LOG_INFO : type = LOGINFO; break;
-+ case AV_LOG_ERROR : type = LOGERROR; break;
-+ case AV_LOG_DEBUG :
-+ default : type = LOGDEBUG; break;
-+ }
-+
-+ CStdString message, prefix;
-+ message.FormatV(format, va);
-+
-+ prefix.Format("ffmpeg[%X]: ", threadId);
-+ if(avc)
-+ {
-+ if(avc->item_name)
-+ prefix += CStdString("[") + avc->item_name(ptr) + "] ";
-+ else if(avc->class_name)
-+ prefix += CStdString("[") + avc->class_name + "] ";
-+ }
-+
-+ buffer += message;
-+ int pos, start = 0;
-+ while( (pos = buffer.find_first_of('\n', start)) >= 0 )
-+ {
-+ if(pos>start)
-+ CLog::Log(type, "%s%s", prefix.c_str(), buffer.substr(start, pos-start).c_str());
-+ start = pos+1;
-+ }
-+ buffer.erase(0, start);
-+}
-+
-+static void ff_flush_avutil_log_buffers(void)
-+{
-+ CSingleLock lock(DllAvCodec::m_critSection);
-+
-+ /* Loop through the logbuffer list and remove any blank buffers
-+ If the thread using the buffer is still active, it will just
-+ add a new buffer next time it writes to the log */
-+ std::map::iterator it;
-+ for (it = g_logbuffer.begin(); it != g_logbuffer.end(); )
-+ if ((*it).second.IsEmpty())
-+ g_logbuffer.erase(it++);
-+ else
-+ ++it;
-+}
-+
-+#ifdef _MSC_VER
-+static __declspec(thread) CDVDDemuxFFmpeg* g_demuxer = 0;
-+#else
-+static TLS g_tls;
-+#define g_demuxer (*((CDVDDemuxFFmpeg**)g_tls.Get()))
-+#endif
-+
-+static int interrupt_cb(void)
-+{
-+ if(g_demuxer && g_demuxer->Aborted())
-+ return 1;
-+ return 0;
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////////////////////
-+////////////////////////////////////////////////////////////////////////////////////////////////
-+/*
-+static int dvd_file_open(URLContext *h, const char *filename, int flags)
-+{
-+ return -1;
-+}
-+*/
-+
-+static int dvd_file_read(URLContext *h, BYTE* buf, int size)
-+{
-+ if(interrupt_cb())
-+ return -1;
-+
-+ CDVDInputStream* pInputStream = (CDVDInputStream*)h->priv_data;
-+ return pInputStream->Read(buf, size);
-+}
-+/*
-+static int dvd_file_write(URLContext *h, BYTE* buf, int size)
-+{
-+ return -1;
-+}
-+*/
-+static offset_t dvd_file_seek(URLContext *h, offset_t pos, int whence)
-+{
-+ if(interrupt_cb())
-+ return -1;
-+
-+ CDVDInputStream* pInputStream = (CDVDInputStream*)h->priv_data;
-+ if(whence == AVSEEK_SIZE)
-+ return pInputStream->GetLength();
-+ else
-+ return pInputStream->Seek(pos, whence);
-+}
-+
-+static int dvd_file_close(URLContext *h)
-+{
-+ return 0;
-+}
-+
-+URLProtocol dvd_file_protocol = {
-+ "CDVDInputStream",
-+ NULL, /*url_open*/
-+ dvd_file_read, /*url_read*/
-+ NULL, /*url_write*/
-+ dvd_file_seek, /*url_seek*/
-+ dvd_file_close, /*url_close*/
-+ NULL, /*URLProtocol*/
-+ NULL, /*url_read_pause*/
-+ NULL /*url_read_seek*/
-+ };
-+
-+////////////////////////////////////////////////////////////////////////////////////////////////
-+////////////////////////////////////////////////////////////////////////////////////////////////
-+
-+CDVDDemuxFFmpeg::CDVDDemuxFFmpeg() : CDVDDemux()
-+{
-+ m_pFormatContext = NULL;
-+ m_pInput = NULL;
-+ m_ioContext = NULL;
-+ InitializeCriticalSection(&m_critSection);
-+ for (int i = 0; i < MAX_STREAMS; i++) m_streams[i] = NULL;
-+ m_iCurrentPts = DVD_NOPTS_VALUE;
-+}
-+
-+CDVDDemuxFFmpeg::~CDVDDemuxFFmpeg()
-+{
-+ Dispose();
-+ DeleteCriticalSection(&m_critSection);
-+ ff_flush_avutil_log_buffers();
-+}
-+
-+bool CDVDDemuxFFmpeg::Aborted()
-+{
-+ if(!m_timeout)
-+ return false;
-+
-+ if(CTimeUtils::GetTimeMS() > m_timeout)
-+ return true;
-+
-+ return false;
-+}
-+
-+bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput)
-+{
-+ AVInputFormat* iformat = NULL;
-+ std::string strFile;
-+ m_iCurrentPts = DVD_NOPTS_VALUE;
-+ m_speed = DVD_PLAYSPEED_NORMAL;
-+ g_demuxer = this;
-+
-+ if (!pInput) return false;
-+
-+ if (!m_dllAvUtil.Load() || !m_dllAvCodec.Load() || !m_dllAvFormat.Load()) {
-+ CLog::Log(LOGERROR,"CDVDDemuxFFmpeg::Open - failed to load ffmpeg libraries");
-+ return false;
-+ }
-+
-+ // register codecs
-+ m_dllAvFormat.av_register_all();
-+ m_dllAvFormat.url_set_interrupt_cb(interrupt_cb);
-+
-+ // could be used for interupting ffmpeg while opening a file (eg internet streams)
-+ // url_set_interrupt_cb(NULL);
-+
-+ m_pInput = pInput;
-+ strFile = m_pInput->GetFileName();
-+
-+ bool streaminfo = true; /* set to true if we want to look for streams before playback*/
-+
-+ if( m_pInput->GetContent().length() > 0 )
-+ {
-+ std::string content = m_pInput->GetContent();
-+
-+ /* check if we can get a hint from content */
-+ if( content.compare("audio/aacp") == 0 )
-+ iformat = m_dllAvFormat.av_find_input_format("aac");
-+ else if( content.compare("audio/aac") == 0 )
-+ iformat = m_dllAvFormat.av_find_input_format("aac");
-+ else if( content.compare("video/x-vobsub") == 0 )
-+ iformat = m_dllAvFormat.av_find_input_format("mpeg");
-+ else if( content.compare("video/x-dvd-mpeg") == 0 )
-+ iformat = m_dllAvFormat.av_find_input_format("mpeg");
-+ else if( content.compare("video/flv") == 0 )
-+ iformat = m_dllAvFormat.av_find_input_format("flv");
-+ else if( content.compare("video/x-flv") == 0 )
-+ iformat = m_dllAvFormat.av_find_input_format("flv");
-+
-+ /* these are likely pure streams, and as such we don't */
-+ /* want to try to look for streaminfo before playback */
-+ if( iformat )
-+ streaminfo = false;
-+ }
-+
-+ if( m_pInput->IsStreamType(DVDSTREAM_TYPE_FFMPEG) )
-+ {
-+ m_timeout = CTimeUtils::GetTimeMS() + 10000;
-+
-+ // special stream type that makes avformat handle file opening
-+ // allows internal ffmpeg protocols to be used
-+ if( m_dllAvFormat.av_open_input_file(&m_pFormatContext, strFile.c_str(), iformat, FFMPEG_FILE_BUFFER_SIZE, NULL) < 0 )
-+ {
-+ CLog::Log(LOGDEBUG, "Error, could not open file %s", strFile.c_str());
-+ Dispose();
-+ return false;
-+ }
-+ }
-+ else
-+ {
-+ m_timeout = 0;
-+
-+ // initialize url context to be used as filedevice
-+ URLContext* context = (URLContext*)m_dllAvUtil.av_mallocz(sizeof(struct URLContext) + strFile.length() + 1);
-+ context->prot = &dvd_file_protocol;
-+ context->priv_data = (void*)m_pInput;
-+ context->max_packet_size = FFMPEG_FILE_BUFFER_SIZE;
-+
-+ if (m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD))
-+ {
-+ context->max_packet_size = FFMPEG_DVDNAV_BUFFER_SIZE;
-+ context->is_streamed = 1;
-+ }
-+ else if ((m_pInput->IsStreamType(DVDSTREAM_TYPE_TV)) ||
-+ (m_pInput->IsStreamType(DVDSTREAM_TYPE_PVRMANAGER)))
-+ {
-+ if(m_pInput->Seek(0, SEEK_POSSIBLE) == 0)
-+ context->is_streamed = 1;
-+
-+ // this actually speeds up channel changes by almost a second
-+ // however, it alsa makes player not buffer anything, this
-+ // leads to buffer underruns in audio renderer
-+ //if(context->is_streamed)
-+ // streaminfo = false;
-+ }
-+ else
-+ {
-+ if(m_pInput->Seek(0, SEEK_POSSIBLE) == 0)
-+ context->is_streamed = 1;
-+ }
-+
-+#if LIBAVFORMAT_VERSION_INT >= (52<<16)
-+ context->filename = (char *) &context[1];
-+#endif
-+
-+ strcpy(context->filename, strFile.c_str());
-+
-+ // open our virtual file device
-+ if(m_dllAvFormat.url_fdopen(&m_ioContext, context) < 0)
-+ {
-+ CLog::Log(LOGERROR, "%s - Unable to init io context", __FUNCTION__);
-+ m_dllAvUtil.av_free(context);
-+ Dispose();
-+ return false;
-+ }
-+
-+ if( iformat == NULL )
-+ {
-+ // let ffmpeg decide which demuxer we have to open
-+ AVProbeData pd;
-+ BYTE probe_buffer[FFMPEG_FILE_BUFFER_SIZE + AVPROBE_PADDING_SIZE];
-+
-+ // init probe data
-+ pd.buf = probe_buffer;
-+ pd.filename = strFile.c_str();
-+
-+ // read data using avformat's buffers
-+ if(context->is_streamed)
-+ pd.buf_size = m_dllAvFormat.get_partial_buffer(m_ioContext, pd.buf, context->max_packet_size);
-+ else
-+ pd.buf_size = m_dllAvFormat.get_buffer(m_ioContext, pd.buf, context->max_packet_size);
-+
-+ if (pd.buf_size <= 0)
-+ {
-+ CLog::Log(LOGERROR, "%s - error reading from input stream, %s", __FUNCTION__, strFile.c_str());
-+ return false;
-+ }
-+ memset(pd.buf+pd.buf_size, 0, AVPROBE_PADDING_SIZE);
-+
-+ // restore position again
-+ m_dllAvFormat.url_fseek(m_ioContext , 0, SEEK_SET);
-+
-+ iformat = m_dllAvFormat.av_probe_input_format(&pd, 1);
-+ if (!iformat)
-+ {
-+ // av_probe_input_format failed, re-probe the ffmpeg/ffplay method.
-+ // av_open_input_file uses av_probe_input_format2 for probing format,
-+ // starting at 2048, up to max buffer size of 1048576. We just probe to
-+ // the buffer size allocated above so as to avoid seeks on content that
-+ // might not be seekable.
-+ int max_buf_size = pd.buf_size;
-+ for (int probe_size=std::min(2048, pd.buf_size); probe_size <= max_buf_size && !iformat; probe_size<<=1)
-+ {
-+ CLog::Log(LOGDEBUG, "%s - probing failed, re-probing with probe size [%d]", __FUNCTION__, probe_size);
-+ int score= probe_size < max_buf_size ? AVPROBE_SCORE_MAX/4 : 0;
-+ pd.buf_size = probe_size;
-+ iformat = m_dllAvFormat.av_probe_input_format2(&pd, 1, &score);
-+ }
-+ }
-+ if (!iformat)
-+ {
-+ CLog::Log(LOGERROR, "%s - error probing input format, %s", __FUNCTION__, strFile.c_str());
-+ return false;
-+ }
-+ else
-+ {
-+ if (iformat->name)
-+ CLog::Log(LOGDEBUG, "%s - probing detected format [%s]", __FUNCTION__, iformat->name);
-+ else
-+ CLog::Log(LOGDEBUG, "%s - probing detected unnamed format", __FUNCTION__);
-+ }
-+ }
-+
-+
-+ // open the demuxer
-+ if (m_dllAvFormat.av_open_input_stream(&m_pFormatContext, m_ioContext, strFile.c_str(), iformat, NULL) < 0)
-+ {
-+ CLog::Log(LOGERROR, "%s - Error, could not open file %s", __FUNCTION__, strFile.c_str());
-+ Dispose();
-+ return false;
-+ }
-+ }
-+
-+ // we need to know if this is matroska later
-+ m_bMatroska = strcmp(m_pFormatContext->iformat->name, "matroska") == 0;
-+
-+ // in combination with libdvdnav seek, av_find_stream_info wont work
-+ // so we do this for files only
-+ if (streaminfo)
-+ {
-+ /* too speed up live sources, only analyse very short */
-+ if(m_pInput->Seek(0, SEEK_POSSIBLE) == 0)
-+ m_pFormatContext->max_analyze_duration = 500000;
-+
-+
-+ CLog::Log(LOGDEBUG, "%s - av_find_stream_info starting", __FUNCTION__);
-+ int iErr = m_dllAvFormat.av_find_stream_info(m_pFormatContext);
-+ if (iErr < 0)
-+ {
-+ CLog::Log(LOGWARNING,"could not find codec parameters for %s", strFile.c_str());
-+ if (m_pFormatContext->nb_streams == 1 && m_pFormatContext->streams[0]->codec->codec_id == CODEC_ID_AC3)
-+ {
-+ // special case, our codecs can still handle it.
-+ }
-+ else
-+ {
-+ Dispose();
-+ return false;
-+ }
-+ }
-+ CLog::Log(LOGDEBUG, "%s - av_find_stream_info finished", __FUNCTION__);
-+ }
-+ // reset any timeout
-+ m_timeout = 0;
-+
-+ // if format can be nonblocking, let's use that
-+ m_pFormatContext->flags |= AVFMT_FLAG_NONBLOCK;
-+
-+ // print some extra information
-+ m_dllAvFormat.dump_format(m_pFormatContext, 0, strFile.c_str(), 0);
-+
-+ UpdateCurrentPTS();
-+
-+ if (m_pInput->IsStreamType(DVDSTREAM_TYPE_MMS)) // HACK: until we figure out how to detect which mms streams are active
-+ return true;
-+
-+ // add the ffmpeg streams to our own stream array
-+ if (m_pFormatContext->nb_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[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]);
-+ }
-+ else
-+ {
-+ for (unsigned int i = 0; i < m_pFormatContext->nb_streams; i++)
-+ AddStream(i);
-+ }
-+
-+ return true;
-+}
-+
-+void CDVDDemuxFFmpeg::Dispose()
-+{
-+ g_demuxer = this;
-+
-+ if (m_pFormatContext)
-+ {
-+ if (m_ioContext)
-+ {
-+ if(m_pFormatContext->pb && m_pFormatContext->pb != m_ioContext)
-+ {
-+ CLog::Log(LOGWARNING, "CDVDDemuxFFmpeg::Dispose - demuxer changed our byte context behind our back, possible memleak");
-+ m_ioContext = m_pFormatContext->pb;
-+ }
-+ m_dllAvFormat.av_close_input_stream(m_pFormatContext);
-+ m_dllAvFormat.url_fclose(m_ioContext);
-+ }
-+ else
-+ m_dllAvFormat.av_close_input_file(m_pFormatContext);
-+ }
-+ m_ioContext = NULL;
-+ m_pFormatContext = NULL;
-+ m_speed = DVD_PLAYSPEED_NORMAL;
-+
-+ for (int i = 0; i < MAX_STREAMS; i++)
-+ {
-+ if (m_streams[i])
-+ {
-+ if (m_streams[i]->ExtraData)
-+ delete[] (BYTE*)(m_streams[i]->ExtraData);
-+ delete m_streams[i];
-+ }
-+ m_streams[i] = NULL;
-+ }
-+ m_pInput = NULL;
-+
-+ m_dllAvFormat.Unload();
-+ m_dllAvCodec.Unload();
-+ m_dllAvUtil.Unload();
-+}
-+
-+void CDVDDemuxFFmpeg::Reset()
-+{
-+ CDVDInputStream* pInputStream = m_pInput;
-+ Dispose();
-+ Open(pInputStream);
-+}
-+
-+void CDVDDemuxFFmpeg::Flush()
-+{
-+ g_demuxer = this;
-+
-+#if (!defined USE_EXTERNAL_FFMPEG)
-+ if (m_pFormatContext)
-+ m_dllAvFormat.av_read_frame_flush(m_pFormatContext);
-+#endif
-+
-+ m_iCurrentPts = DVD_NOPTS_VALUE;
-+}
-+
-+void CDVDDemuxFFmpeg::Abort()
-+{
-+ m_timeout = 1;
-+}
-+
-+void CDVDDemuxFFmpeg::SetSpeed(int iSpeed)
-+{
-+ g_demuxer = this;
-+
-+ if(!m_pFormatContext)
-+ return;
-+
-+ if(m_speed != DVD_PLAYSPEED_PAUSE && iSpeed == DVD_PLAYSPEED_PAUSE)
-+ {
-+ m_pInput->Pause((double)m_iCurrentPts);
-+ m_dllAvFormat.av_read_pause(m_pFormatContext);
-+ }
-+ else if(m_speed == DVD_PLAYSPEED_PAUSE && iSpeed != DVD_PLAYSPEED_PAUSE)
-+ {
-+ m_pInput->Pause((double)m_iCurrentPts);
-+ m_dllAvFormat.av_read_play(m_pFormatContext);
-+ }
-+ m_speed = iSpeed;
-+
-+ AVDiscard discard = AVDISCARD_NONE;
-+ if(m_speed > 4*DVD_PLAYSPEED_NORMAL)
-+ discard = AVDISCARD_NONKEY;
-+ else if(m_speed > 2*DVD_PLAYSPEED_NORMAL)
-+ discard = AVDISCARD_BIDIR;
-+ else if(m_speed < DVD_PLAYSPEED_PAUSE)
-+ discard = AVDISCARD_NONKEY;
-+
-+
-+ for(unsigned int i = 0; i < m_pFormatContext->nb_streams; i++)
-+ {
-+ if(m_pFormatContext->streams[i])
-+ {
-+ if(m_pFormatContext->streams[i]->discard != AVDISCARD_ALL)
-+ m_pFormatContext->streams[i]->discard = discard;
-+ }
-+ }
-+}
-+
-+double CDVDDemuxFFmpeg::ConvertTimestamp(int64_t pts, int den, int num)
-+{
-+ if (pts == (int64_t)AV_NOPTS_VALUE)
-+ return DVD_NOPTS_VALUE;
-+
-+ // do calculations in floats as they can easily overflow otherwise
-+ // we don't care for having a completly exact timestamp anyway
-+ double timestamp = (double)pts * num / den;
-+ double starttime = 0.0f;
-+
-+ if (m_pFormatContext->start_time != (int64_t)AV_NOPTS_VALUE)
-+ starttime = (double)m_pFormatContext->start_time / AV_TIME_BASE;
-+
-+ if(timestamp > starttime)
-+ timestamp -= starttime;
-+ else if( timestamp + 0.1f > starttime )
-+ timestamp = 0;
-+
-+ return timestamp*DVD_TIME_BASE;
-+}
-+
-+DemuxPacket* CDVDDemuxFFmpeg::Read()
-+{
-+ g_demuxer = this;
-+
-+ 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)
-+ {
-+ // assume we are not eof
-+ if(m_pFormatContext->pb)
-+ m_pFormatContext->pb->eof_reached = 0;
-+
-+ // keep track if ffmpeg doesn't always set these
-+ pkt.size = 0;
-+ pkt.data = NULL;
-+ pkt.stream_index = MAX_STREAMS;
-+
-+ // timeout reads after 100ms
-+ m_timeout = CTimeUtils::GetTimeMS() + 20000;
-+ int result = 0;
-+ try
-+ {
-+ result = m_dllAvFormat.av_read_frame(m_pFormatContext, &pkt);
-+ }
-+ catch(const win32_exception &e)
-+ {
-+ e.writelog(__FUNCTION__);
-+ result = AVERROR(EFAULT);
-+ }
-+ m_timeout = 0;
-+
-+ if (result == AVERROR(EINTR) || result == AVERROR(EAGAIN))
-+ {
-+ // timeout, probably no real error, return empty packet
-+ bReturnEmpty = true;
-+ }
-+ else if (result < 0)
-+ {
-+ Flush();
-+ }
-+ else if (pkt.size < 0 || pkt.stream_index >= MAX_STREAMS)
-+ {
-+ // XXX, in some cases ffmpeg returns a negative packet size
-+ if(m_pFormatContext->pb && !m_pFormatContext->pb->eof_reached)
-+ {
-+ CLog::Log(LOGERROR, "CDVDDemuxFFmpeg::Read() no valid packet");
-+ bReturnEmpty = true;
-+ Flush();
-+ }
-+ else
-+ CLog::Log(LOGERROR, "CDVDDemuxFFmpeg::Read() returned invalid packet and eof reached");
-+
-+ m_dllAvCodec.av_free_packet(&pkt);
-+ }
-+ else
-+ {
-+ AVStream *stream = m_pFormatContext->streams[pkt.stream_index];
-+
-+ if (m_pFormatContext->nb_programs)
-+ {
-+ /* check so packet belongs to selected program */
-+ for (unsigned int i = 0; i < m_pFormatContext->programs[m_program]->nb_stream_indexes; i++)
-+ {
-+ if(pkt.stream_index == (int)m_pFormatContext->programs[m_program]->stream_index[i])
-+ {
-+ pPacket = CDVDDemuxUtils::AllocateDemuxPacket(pkt.size);
-+ break;
-+ }
-+ }
-+
-+ if (!pPacket)
-+ bReturnEmpty = true;
-+ }
-+ else
-+ pPacket = CDVDDemuxUtils::AllocateDemuxPacket(pkt.size);
-+
-+ if (pPacket)
-+ {
-+ // lavf sometimes bugs out and gives 0 dts/pts instead of no dts/pts
-+ // since this could only happens on initial frame under normal
-+ // circomstances, let's assume it is wrong all the time
-+ if(pkt.dts == 0)
-+ pkt.dts = AV_NOPTS_VALUE;
-+ if(pkt.pts == 0)
-+ pkt.pts = AV_NOPTS_VALUE;
-+
-+ if(m_bMatroska && stream->codec && stream->codec->codec_type == CODEC_TYPE_VIDEO)
-+ { // matroska can store different timestamps
-+ // for different formats, for native stored
-+ // stuff it is pts, but for ms compatibility
-+ // tracks, it is really dts. sadly ffmpeg
-+ // sets these two timestamps equal all the
-+ // time, so we select it here instead
-+ if(stream->codec->codec_tag == 0)
-+ pkt.dts = AV_NOPTS_VALUE;
-+ else
-+ pkt.pts = AV_NOPTS_VALUE;
-+ }
-+
-+ // we need to get duration slightly different for matroska embedded text subtitels
-+ if(m_bMatroska && stream->codec->codec_id == CODEC_ID_TEXT && pkt.convergence_duration != 0)
-+ pkt.duration = pkt.convergence_duration;
-+
-+ // copy contents into our own packet
-+ pPacket->iSize = pkt.size;
-+
-+ // maybe we can avoid a memcpy here by detecting where pkt.destruct is pointing too?
-+ if (pkt.data)
-+ memcpy(pPacket->pData, pkt.data, pPacket->iSize);
-+
-+ pPacket->pts = ConvertTimestamp(pkt.pts, stream->time_base.den, stream->time_base.num);
-+ pPacket->dts = ConvertTimestamp(pkt.dts, stream->time_base.den, stream->time_base.num);
-+ pPacket->duration = DVD_SEC_TO_TIME((double)pkt.duration * stream->time_base.num / stream->time_base.den);
-+
-+ // used to guess streamlength
-+ if (pPacket->dts != DVD_NOPTS_VALUE && (pPacket->dts > m_iCurrentPts || m_iCurrentPts == DVD_NOPTS_VALUE))
-+ m_iCurrentPts = pPacket->dts;
-+
-+
-+ // check if stream has passed full duration, needed for live streams
-+ if(pkt.dts != (int64_t)AV_NOPTS_VALUE)
-+ {
-+ int64_t duration;
-+ duration = pkt.dts;
-+ if(stream->start_time != (int64_t)AV_NOPTS_VALUE)
-+ duration -= stream->start_time;
-+
-+ if(duration > stream->duration)
-+ {
-+ stream->duration = duration;
-+ duration = m_dllAvUtil.av_rescale_rnd(stream->duration, stream->time_base.num * AV_TIME_BASE, stream->time_base.den, AV_ROUND_NEAR_INF);
-+ if ((m_pFormatContext->duration == (int64_t)AV_NOPTS_VALUE && m_pFormatContext->file_size > 0)
-+ || (m_pFormatContext->duration != (int64_t)AV_NOPTS_VALUE && duration > m_pFormatContext->duration))
-+ m_pFormatContext->duration = duration;
-+ }
-+ }
-+
-+ // check if stream seem to have grown since start
-+ if(m_pFormatContext->file_size > 0 && m_pFormatContext->pb)
-+ {
-+ if(m_pFormatContext->pb->pos > m_pFormatContext->file_size)
-+ m_pFormatContext->file_size = m_pFormatContext->pb->pos;
-+ }
-+
-+ pPacket->iStreamId = pkt.stream_index; // XXX just for now
-+ }
-+ m_dllAvCodec.av_free_packet(&pkt);
-+ }
-+ }
-+ Unlock();
-+
-+ if (bReturnEmpty && !pPacket)
-+ pPacket = CDVDDemuxUtils::AllocateDemuxPacket(0);
-+
-+ if (!pPacket) return NULL;
-+
-+ // check streams, can we make this a bit more simple?
-+ if (pPacket && pPacket->iStreamId >= 0 && pPacket->iStreamId <= MAX_STREAMS)
-+ {
-+ if (!m_streams[pPacket->iStreamId] ||
-+ m_streams[pPacket->iStreamId]->pPrivate != m_pFormatContext->streams[pPacket->iStreamId] ||
-+ m_streams[pPacket->iStreamId]->codec != m_pFormatContext->streams[pPacket->iStreamId]->codec->codec_id)
-+ {
-+ // content has changed, or stream did not yet exist
-+ AddStream(pPacket->iStreamId);
-+ }
-+ // we already check for a valid m_streams[pPacket->iStreamId] above
-+ else if (m_streams[pPacket->iStreamId]->type == STREAM_AUDIO)
-+ {
-+ if (((CDemuxStreamAudio*)m_streams[pPacket->iStreamId])->iChannels != m_pFormatContext->streams[pPacket->iStreamId]->codec->channels ||
-+ ((CDemuxStreamAudio*)m_streams[pPacket->iStreamId])->iSampleRate != m_pFormatContext->streams[pPacket->iStreamId]->codec->sample_rate)
-+ {
-+ // content has changed
-+ AddStream(pPacket->iStreamId);
-+ }
-+ }
-+ else if (m_streams[pPacket->iStreamId]->type == STREAM_VIDEO)
-+ {
-+ if (((CDemuxStreamVideo*)m_streams[pPacket->iStreamId])->iWidth != m_pFormatContext->streams[pPacket->iStreamId]->codec->width ||
-+ ((CDemuxStreamVideo*)m_streams[pPacket->iStreamId])->iHeight != m_pFormatContext->streams[pPacket->iStreamId]->codec->height)
-+ {
-+ // content has changed
-+ AddStream(pPacket->iStreamId);
-+ }
-+ }
-+ }
-+ return pPacket;
-+}
-+
-+bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts)
-+{
-+ g_demuxer = this;
-+
-+ if(time < 0)
-+ time = 0;
-+
-+ if (m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD))
-+ {
-+ CLog::Log(LOGDEBUG, "%s - seeking using navigator", __FUNCTION__);
-+ if (!((CDVDInputStreamNavigator*)m_pInput)->SeekTime(time))
-+ return false;
-+
-+ if(startpts)
-+ *startpts = DVD_NOPTS_VALUE;
-+
-+ Flush();
-+ return true;
-+ }
-+
-+#ifdef HAS_FILESYSTEM_MMS
-+ if (m_pInput->IsStreamType(DVDSTREAM_TYPE_MMS))
-+ {
-+ if (!((CDVDInputStreamMMS*)m_pInput)->SeekTime(time))
-+ return false;
-+
-+ Flush();
-+ return true;
-+ }
-+#endif
-+
-+ if (m_pInput->IsStreamType(DVDSTREAM_TYPE_RTMP))
-+ {
-+ if (!((CDVDInputStreamRTMP*)m_pInput)->SeekTime(time))
-+ return false;
-+
-+ Flush();
-+ return true;
-+ }
-+
-+ if(!m_pInput->Seek(0, SEEK_POSSIBLE)
-+ && !m_pInput->IsStreamType(DVDSTREAM_TYPE_FFMPEG))
-+ {
-+ CLog::Log(LOGDEBUG, "%s - input stream reports it is not seekable", __FUNCTION__);
-+ return false;
-+ }
-+
-+ __int64 seek_pts = (__int64)time * (AV_TIME_BASE / 1000);
-+ if (m_pFormatContext->start_time != (int64_t)AV_NOPTS_VALUE)
-+ seek_pts += m_pFormatContext->start_time;
-+
-+ Lock();
-+ int ret = m_dllAvFormat.av_seek_frame(m_pFormatContext, -1, seek_pts, backwords ? AVSEEK_FLAG_BACKWARD : 0);
-+
-+ if(ret >= 0)
-+ UpdateCurrentPTS();
-+ Unlock();
-+
-+ if(m_iCurrentPts == DVD_NOPTS_VALUE)
-+ CLog::Log(LOGDEBUG, "%s - unknown position after seek", __FUNCTION__);
-+ else
-+ CLog::Log(LOGDEBUG, "%s - seek ended up on time %d", __FUNCTION__, (int)(m_iCurrentPts / DVD_TIME_BASE * 1000));
-+
-+ // in this case the start time is requested time
-+ if(startpts)
-+ *startpts = DVD_MSEC_TO_TIME(time);
-+
-+ // demuxer will return failure, if you seek to eof
-+ if (m_pInput->IsEOF() && ret <= 0)
-+ return true;
-+
-+ return (ret >= 0);
-+}
-+
-+bool CDVDDemuxFFmpeg::SeekByte(__int64 pos)
-+{
-+ g_demuxer = this;
-+
-+ Lock();
-+ int ret = m_dllAvFormat.av_seek_frame(m_pFormatContext, -1, pos, AVSEEK_FLAG_BYTE);
-+
-+ if(ret >= 0)
-+ UpdateCurrentPTS();
-+
-+ Unlock();
-+ return (ret >= 0);
-+}
-+
-+void CDVDDemuxFFmpeg::UpdateCurrentPTS()
-+{
-+ m_iCurrentPts = DVD_NOPTS_VALUE;
-+ for(unsigned int i = 0; i < m_pFormatContext->nb_streams; i++)
-+ {
-+ AVStream *stream = m_pFormatContext->streams[i];
-+ if(stream && stream->cur_dts != (int64_t)AV_NOPTS_VALUE)
-+ {
-+ double ts = ConvertTimestamp(stream->cur_dts, stream->time_base.den, stream->time_base.num);
-+ if(m_iCurrentPts == DVD_NOPTS_VALUE || m_iCurrentPts > ts )
-+ m_iCurrentPts = ts;
-+ }
-+ }
-+}
-+
-+int CDVDDemuxFFmpeg::GetStreamLength()
-+{
-+ if (!m_pFormatContext)
-+ return 0;
-+
-+ /* apperently ffmpeg messes up sometimes, so check for negative value too */
-+ if (m_pFormatContext->duration == (int64_t)AV_NOPTS_VALUE || m_pFormatContext->duration < 0LL)
-+ {
-+ // no duration is available for us
-+ // try to calculate it
-+ int iLength = 0;
-+ if (m_iCurrentPts != DVD_NOPTS_VALUE && m_pFormatContext->file_size > 0 && m_pFormatContext->pb && m_pFormatContext->pb->pos > 0)
-+ {
-+ iLength = (int)(((m_iCurrentPts * m_pFormatContext->file_size) / m_pFormatContext->pb->pos) / 1000) & 0xFFFFFFFF;
-+ }
-+ return iLength;
-+ }
-+
-+ return (int)(m_pFormatContext->duration / (AV_TIME_BASE / 1000));
-+}
-+
-+CDemuxStream* CDVDDemuxFFmpeg::GetStream(int iStreamId)
-+{
-+ if (iStreamId < 0 || iStreamId >= MAX_STREAMS) return NULL;
-+ return m_streams[iStreamId];
-+}
-+
-+int CDVDDemuxFFmpeg::GetNrOfStreams()
-+{
-+ int i = 0;
-+ while (i < MAX_STREAMS && m_streams[i]) i++;
-+ return i;
-+}
-+
-+void CDVDDemuxFFmpeg::AddStream(int iId)
-+{
-+ AVStream* pStream = m_pFormatContext->streams[iId];
-+ if (pStream)
-+ {
-+ if (m_streams[iId])
-+ {
-+ if( m_streams[iId]->ExtraData ) delete[] (BYTE*)(m_streams[iId]->ExtraData);
-+ delete m_streams[iId];
-+ }
-+
-+ switch (pStream->codec->codec_type)
-+ {
-+ case CODEC_TYPE_AUDIO:
-+ {
-+ CDemuxStreamAudioFFmpeg* st = new CDemuxStreamAudioFFmpeg(this, pStream);
-+ m_streams[iId] = st;
-+ st->iChannels = pStream->codec->channels;
-+ st->iSampleRate = pStream->codec->sample_rate;
-+ st->iBlockAlign = pStream->codec->block_align;
-+ st->iBitRate = pStream->codec->bit_rate;
-+ st->iBitsPerSample = pStream->codec->bits_per_coded_sample;
-+
-+ if(m_bMatroska && m_dllAvFormat.av_metadata_get(pStream->metadata, "description", NULL, 0))
-+ st->m_description = m_dllAvFormat.av_metadata_get(pStream->metadata, "description", NULL, 0)->value;
-+
-+ break;
-+ }
-+ case CODEC_TYPE_VIDEO:
-+ {
-+ CDemuxStreamVideoFFmpeg* st = new CDemuxStreamVideoFFmpeg(this, pStream);
-+ m_streams[iId] = st;
-+ if(strcmp(m_pFormatContext->iformat->name, "flv") == 0)
-+ st->bVFR = true;
-+ else
-+ st->bVFR = false;
-+
-+ if(pStream->r_frame_rate.den && pStream->r_frame_rate.num)
-+ {
-+ st->iFpsRate = pStream->r_frame_rate.num;
-+ st->iFpsScale = pStream->r_frame_rate.den;
-+ }
-+ else
-+ {
-+ st->iFpsRate = 0;
-+ st->iFpsScale = 0;
-+ }
-+ st->iWidth = pStream->codec->width;
-+ st->iHeight = pStream->codec->height;
-+ if (pStream->sample_aspect_ratio.num == 0)
-+ st->fAspect = 0.0;
-+ else
-+ st->fAspect = av_q2d(pStream->sample_aspect_ratio) * pStream->codec->width / pStream->codec->height;
-+
-+ break;
-+ }
-+ case CODEC_TYPE_DATA:
-+ {
-+ m_streams[iId] = new CDemuxStream();
-+ m_streams[iId]->type = STREAM_DATA;
-+ break;
-+ }
-+ case CODEC_TYPE_SUBTITLE:
-+ {
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,38,1)
-+ if (pStream->codec->codec_id == CODEC_ID_DVB_TELETEXT && g_guiSettings.GetBool("videoplayer.teletextenabled"))
-+ {
-+ CDemuxStreamTeletext* st = new CDemuxStreamTeletext();
-+ m_streams[iId] = st;
-+ m_streams[iId]->type = STREAM_TELETEXT;
-+ break;
-+ }
-+ else
-+#endif
-+ {
-+ CDemuxStreamSubtitleFFmpeg* st = new CDemuxStreamSubtitleFFmpeg(this, pStream);
-+ m_streams[iId] = st;
-+ if(pStream->codec)
-+ st->identifier = pStream->codec->sub_id;
-+
-+ if(m_bMatroska && m_dllAvFormat.av_metadata_get(pStream->metadata, "description", NULL, 0))
-+ st->m_description = m_dllAvFormat.av_metadata_get(pStream->metadata, "description", NULL, 0)->value;
-+
-+ break;
-+ }
-+ }
-+ case CODEC_TYPE_ATTACHMENT:
-+ { //mkv attachments. Only bothering with fonts for now.
-+ if(pStream->codec->codec_id == CODEC_ID_TTF)
-+ {
-+ std::string fileName = "special://temp/fonts/";
-+ XFILE::CDirectory::Create(fileName);
-+ fileName += pStream->filename;
-+ XFILE::CFile file;
-+ if(pStream->codec->extradata && file.OpenForWrite(fileName))
-+ {
-+ 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();
-+ m_streams[iId]->type = STREAM_NONE;
-+ break;
-+ }
-+ }
-+
-+ // generic stuff
-+ if (pStream->duration != (int64_t)AV_NOPTS_VALUE) m_streams[iId]->iDuration = (int)((pStream->duration / AV_TIME_BASE) & 0xFFFFFFFF);
-+
-+ m_streams[iId]->codec = pStream->codec->codec_id;
-+ m_streams[iId]->codec_fourcc = pStream->codec->codec_tag;
-+ m_streams[iId]->iId = iId;
-+ m_streams[iId]->source = STREAM_SOURCE_DEMUX;
-+ m_streams[iId]->pPrivate = pStream;
-+
-+ strcpy( m_streams[iId]->language, pStream->language );
-+
-+ if( pStream->codec->extradata && pStream->codec->extradata_size > 0 )
-+ {
-+ m_streams[iId]->ExtraSize = pStream->codec->extradata_size;
-+ m_streams[iId]->ExtraData = new BYTE[pStream->codec->extradata_size];
-+ memcpy(m_streams[iId]->ExtraData, pStream->codec->extradata, pStream->codec->extradata_size);
-+ }
-+
-+ //FFMPEG has an error doesn't set type properly for DTS
-+ if( m_streams[iId]->codec == CODEC_ID_AC3 && (pStream->id >= 136 && pStream->id <= 143) )
-+ m_streams[iId]->codec = CODEC_ID_DTS;
-+
-+ if( m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD) )
-+ {
-+ // this stuff is really only valid for dvd's.
-+ // this is so that the physicalid matches the
-+ // id's reported from libdvdnav
-+ switch(m_streams[iId]->codec)
-+ {
-+ case CODEC_ID_AC3:
-+ m_streams[iId]->iPhysicalId = pStream->id - 128;
-+ break;
-+ case CODEC_ID_DTS:
-+ m_streams[iId]->iPhysicalId = pStream->id - 136;
-+ break;
-+ case CODEC_ID_MP2:
-+ m_streams[iId]->iPhysicalId = pStream->id - 448;
-+ break;
-+ case CODEC_ID_PCM_S16BE:
-+ m_streams[iId]->iPhysicalId = pStream->id - 160;
-+ break;
-+ case CODEC_ID_DVD_SUBTITLE:
-+ m_streams[iId]->iPhysicalId = pStream->id - 0x20;
-+ break;
-+ default:
-+ m_streams[iId]->iPhysicalId = pStream->id & 0x1f;
-+ break;
-+ }
-+ }
-+ else
-+ m_streams[iId]->iPhysicalId = pStream->id;
-+ }
-+}
-+
-+std::string CDVDDemuxFFmpeg::GetFileName()
-+{
-+ if(m_pInput && m_pInput)
-+ return m_pInput->GetFileName();
-+ else
-+ return "";
-+}
-+
-+int CDVDDemuxFFmpeg::GetChapterCount()
-+{
-+ if(m_pInput && m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD))
-+ return ((CDVDInputStreamNavigator*)m_pInput)->GetChapterCount();
-+
-+ if(m_pFormatContext == NULL)
-+ return 0;
-+ #if (LIBAVFORMAT_VERSION_MAJOR == 52) && (LIBAVFORMAT_VERSION_MINOR >= 14)
-+ return m_pFormatContext->nb_chapters;
-+ #else
-+ return 0;
-+ #endif
-+}
-+
-+int CDVDDemuxFFmpeg::GetChapter()
-+{
-+ if(m_pInput && m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD))
-+ return ((CDVDInputStreamNavigator*)m_pInput)->GetChapter();
-+
-+ if(m_pFormatContext == NULL
-+ || m_iCurrentPts == DVD_NOPTS_VALUE)
-+ return 0;
-+
-+ #if (LIBAVFORMAT_VERSION_MAJOR == 52) && (LIBAVFORMAT_VERSION_MINOR >= 14)
-+ for(unsigned i = 0; i < m_pFormatContext->nb_chapters; i++)
-+ {
-+ AVChapter *chapter = m_pFormatContext->chapters[i];
-+ if(m_iCurrentPts >= ConvertTimestamp(chapter->start, chapter->time_base.den, chapter->time_base.num)
-+ && m_iCurrentPts < ConvertTimestamp(chapter->end, chapter->time_base.den, chapter->time_base.num))
-+ return i + 1;
-+ }
-+ #endif
-+ return 0;
-+}
-+
-+void CDVDDemuxFFmpeg::GetChapterName(std::string& strChapterName)
-+{
-+ if(m_pInput && m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD))
-+ return;
-+ else
-+ {
-+ #if (LIBAVFORMAT_VERSION_MAJOR == 52) && (LIBAVFORMAT_VERSION_MINOR >= 14)
-+ int chapterIdx = GetChapter();
-+ if(chapterIdx > 0 && m_pFormatContext->chapters[chapterIdx-1]->title)
-+ strChapterName = m_pFormatContext->chapters[chapterIdx-1]->title;
-+ #endif
-+ }
-+}
-+
-+bool CDVDDemuxFFmpeg::SeekChapter(int chapter, double* startpts)
-+{
-+ if(chapter < 1)
-+ chapter = 1;
-+
-+ if(m_pInput && m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD))
-+ {
-+ CLog::Log(LOGDEBUG, "%s - chapter seeking using navigator", __FUNCTION__);
-+ if(!((CDVDInputStreamNavigator*)m_pInput)->SeekChapter(chapter))
-+ return false;
-+
-+ if(startpts)
-+ *startpts = DVD_NOPTS_VALUE;
-+
-+ Flush();
-+ return true;
-+ }
-+
-+ if(m_pFormatContext == NULL)
-+ return false;
-+
-+ #if (LIBAVFORMAT_VERSION_MAJOR == 52) && (LIBAVFORMAT_VERSION_MINOR >= 14)
-+ if(chapter < 1 || chapter > (int)m_pFormatContext->nb_chapters)
-+ return false;
-+
-+ AVChapter *ch = m_pFormatContext->chapters[chapter-1];
-+ double dts = ConvertTimestamp(ch->start, ch->time_base.den, ch->time_base.num);
-+ return SeekTime(DVD_TIME_TO_MSEC(dts), false, startpts);
-+ #else
-+ return false;
-+ #endif
-+}
-+
-+void CDVDDemuxFFmpeg::GetStreamCodecName(int iStreamId, CStdString &strName)
-+{
-+ CDemuxStream *stream = GetStream(iStreamId);
-+ if (stream)
-+ {
-+ unsigned int in = stream->codec_fourcc;
-+ // FourCC codes are only valid on video streams, audio codecs in AVI/WAV
-+ // are 2 bytes and audio codecs in transport streams have subtle variation
-+ // e.g AC-3 instead of ac3
-+ if (stream->type == STREAM_VIDEO && in != 0)
-+ {
-+ char fourcc[5];
-+#if defined(__powerpc__)
-+ fourcc[0] = in & 0xff;
-+ fourcc[1] = (in >> 8) & 0xff;
-+ fourcc[2] = (in >> 16) & 0xff;
-+ fourcc[3] = (in >> 24) & 0xff;
-+#else
-+ memcpy(fourcc, &in, 4);
-+#endif
-+ fourcc[4] = 0;
-+ // fourccs have to be 4 characters
-+ if (strlen(fourcc) == 4)
-+ {
-+ strName = fourcc;
-+ strName.MakeLower();
-+ return;
-+ }
-+ }
-+
-+ if (m_dllAvCodec.IsLoaded())
-+ {
-+ AVCodec *codec = m_dllAvCodec.avcodec_find_decoder(stream->codec);
-+ if (codec)
-+ strName = codec->name;
-+ }
-+ }
-+}
-diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
---- xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp 2010-02-08 18:53:24.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp 2010-02-09 07:32:53.966806838 +0100
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+--- xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2010-02-09 07:14:30.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2010-02-09 20:13:08.799192438 +0100
+@@ -441,7 +441,7 @@
+ {
+ /* too speed up live sources, only analyse very short */
+ if(m_pInput->Seek(0, SEEK_POSSIBLE) == 0)
+- m_pFormatContext->max_analyze_duration = 500000;
++ m_pFormatContext->max_analyze_duration = 50000;
+
+
+ CLog::Log(LOGDEBUG, "%s - av_find_stream_info starting", __FUNCTION__);
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp.orig xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp.orig
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDMessageQueue.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDMessageQueue.cpp
+--- xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDMessageQueue.cpp 2010-02-09 07:15:09.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDMessageQueue.cpp 2010-02-09 20:13:20.908067634 +0100
+@@ -186,7 +186,7 @@
+
+ if(m_iDataSize == 0)
+ {
+- if(!m_bEmptied && (m_owner != "teletext" && (m_owner != "audio" && !g_PVRManager.IsPlayingTV()))) // Prevent log flooding
++ if(!m_bEmptied && m_owner != "teletext") // Prevent log flooding
+ CLog::Log(LOGWARNING, "CDVDMessageQueue(%s)::Get - retrieved last data packet of queue", m_owner.c_str());
+ m_bEmptied = true;
+ }
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
+--- xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp 2010-02-09 07:14:32.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp 2010-02-09 20:08:42.360192659 +0100
@@ -356,7 +356,7 @@
if (m_messageQueue.ReceivedAbortRequest()) return DECODE_FLAG_ABORT;
@@ -3849,9 +2667,39 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp xbmc-pvr-
int timeout;
if(m_duration > 0)
-diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
---- xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp 2010-02-08 18:53:24.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp 2010-02-09 07:33:01.060899554 +0100
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDPlayer.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDPlayer.cpp
+--- xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDPlayer.cpp 2010-02-09 07:15:09.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDPlayer.cpp 2010-02-09 20:13:26.891067776 +0100
+@@ -940,6 +940,8 @@
+ if(channel > 0 && pStream->SelectChannel(channel))
+ {
+ FlushBuffers(false);
++ CloseAudioStream(true);
++ CloseVideoStream(true);
+ SAFE_DELETE(m_pDemuxer);
+ continue;
+ }
+@@ -1989,6 +1991,8 @@
+ if(input && input->SelectChannel(static_cast(pMsg)->m_value))
+ {
+ FlushBuffers(false);
++ CloseAudioStream(true);
++ CloseVideoStream(true);
+ SAFE_DELETE(m_pDemuxer);
+ }
+ }
+@@ -2022,6 +2026,8 @@
+ {
+ m_ChannelEntryTimeOut = 0;
+ FlushBuffers(false);
++ CloseAudioStream(true);
++ CloseVideoStream(true);
+ SAFE_DELETE(m_pDemuxer);
+ }
+ }
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
+--- xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp 2010-02-09 07:15:09.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp 2010-02-09 20:08:42.363192460 +0100
@@ -158,15 +158,9 @@
{
@@ -3918,9 +2766,9 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp xbmc-pvr-
#ifdef PROFILE /* during profiling, try to play as fast as possible */
iSleepTime = 0;
-diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.cpp
---- xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.cpp 2010-01-14 06:15:47.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.cpp 2010-02-09 07:31:57.962897211 +0100
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.cpp
+--- xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.cpp 2010-02-09 07:14:29.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.cpp 2010-02-09 20:08:42.364192440 +0100
@@ -58,6 +58,25 @@
m_iSize++;
}
@@ -3947,9 +2795,9 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLine
CDVDOverlay* CDVDSubtitleLineCollection::Get(double iPts)
{
CDVDOverlay* pOverlay = NULL;
-diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.h xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.h
---- xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.h 2010-01-14 06:15:47.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.h 2010-02-09 07:31:57.962897211 +0100
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.h xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.h
+--- xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.h 2010-02-09 07:14:29.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.h 2010-02-09 20:08:42.364192440 +0100
@@ -40,6 +40,7 @@
//void Unlock() { LeaveCriticalSection(&m_critSection); }
@@ -3958,9 +2806,9 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLine
CDVDOverlay* Get(double iPts = 0LL); // get the first overlay in this fifo
-diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp
---- xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp 2010-01-14 06:15:47.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp 2010-02-09 07:31:57.963904804 +0100
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp
+--- xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp 2010-02-09 07:14:30.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp 2010-02-09 20:08:42.365199404 +0100
@@ -82,7 +82,7 @@
if(pOverlay)
TagConv.ConvertLine(pOverlay, text, strlen(text));
@@ -3970,9 +2818,9 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlePars
return true;
}
-diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp
---- xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp 2010-01-14 06:15:47.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp 2010-02-09 07:31:57.963904804 +0100
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp
+--- xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp 2010-02-09 07:14:29.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp 2010-02-09 20:08:42.365199404 +0100
@@ -64,6 +64,7 @@
m_collection.Add(overlay);
}
@@ -3981,9 +2829,9 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlePars
return true;
}
-diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp
---- xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp 2010-01-14 06:15:47.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp 2010-02-09 07:31:57.964897381 +0100
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp
+--- xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp 2010-02-09 07:14:29.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp 2010-02-09 20:08:42.366067875 +0100
@@ -98,7 +98,7 @@
}
}
@@ -3993,9 +2841,9 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlePars
return true;
}
-diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDTSCorrection.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDTSCorrection.cpp
---- xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDTSCorrection.cpp 2010-01-14 06:16:15.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDTSCorrection.cpp 2010-02-09 07:33:15.293899500 +0100
+diff -Naur xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDTSCorrection.cpp xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDTSCorrection.cpp
+--- xbmc-pvr-27594/xbmc/cores/dvdplayer/DVDTSCorrection.cpp 2010-02-09 07:15:09.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/cores/dvdplayer/DVDTSCorrection.cpp 2010-02-09 20:08:42.366067875 +0100
@@ -77,6 +77,9 @@
if (!CheckPattern(pattern))
{
@@ -4038,9 +2886,41 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/cores/dvdplayer/DVDTSCorrection.cpp xbmc-pvr
return true;
}
-diff -Naur xbmc-pvr-27594.orig/xbmc/GUIWindowMusicBase.cpp xbmc-pvr-27594.patch/xbmc/GUIWindowMusicBase.cpp
---- xbmc-pvr-27594.orig/xbmc/GUIWindowMusicBase.cpp 2010-02-08 18:53:42.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/GUIWindowMusicBase.cpp 2010-02-09 07:32:42.283806859 +0100
+diff -Naur xbmc-pvr-27594/xbmc/GUIDialogVideoScan.cpp xbmc-pvr-27594.patch/xbmc/GUIDialogVideoScan.cpp
+--- xbmc-pvr-27594/xbmc/GUIDialogVideoScan.cpp 2010-02-09 07:11:33.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/GUIDialogVideoScan.cpp 2010-02-09 20:10:37.367067700 +0100
+@@ -25,6 +25,7 @@
+ #include "Util.h"
+ #include "GUIWindowManager.h"
+ #include "GUISettings.h"
++#include "Application.h"
+ #include "utils/SingleLock.h"
+ #include "utils/log.h"
+
+@@ -158,7 +159,7 @@
+
+ if (!g_guiSettings.GetBool("videolibrary.backgroundupdate"))
+ {
+- Close();
++ g_application.getApplicationMessenger().Close(this,false,false);
+ }
+ }
+
+diff -Naur xbmc-pvr-27594/xbmc/GUIWindowFullScreen.cpp xbmc-pvr-27594.patch/xbmc/GUIWindowFullScreen.cpp
+--- xbmc-pvr-27594/xbmc/GUIWindowFullScreen.cpp 2010-02-09 07:14:17.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/GUIWindowFullScreen.cpp 2010-02-09 20:13:32.071067672 +0100
+@@ -1070,7 +1070,7 @@
+ if (data)
+ intdata=*(int*)data;
+
+- if (!data || (intdata != ACTION_ZOOM_OUT && intdata != ACTION_ZOOM_IN &&
++ if (!data || (intdata != ACTION_ZOOM_OUT && intdata != ACTION_ZOOM_IN &&
+ intdata != ACTION_INCREASE_PAR && intdata != ACTION_DECREASE_PAR))
+ slider->SetTextValue(CGUIDialogAudioSubtitleSettings::FormatDelay(slider->GetFloatValue(), 0.025f));
+ else
+diff -Naur xbmc-pvr-27594/xbmc/GUIWindowMusicBase.cpp xbmc-pvr-27594.patch/xbmc/GUIWindowMusicBase.cpp
+--- xbmc-pvr-27594/xbmc/GUIWindowMusicBase.cpp 2010-02-09 07:14:26.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/GUIWindowMusicBase.cpp 2010-02-09 20:08:42.370067796 +0100
@@ -711,10 +711,7 @@
FormatAndSort(items);
SetupFanart(items);
@@ -4063,9 +2943,39 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/GUIWindowMusicBase.cpp xbmc-pvr-27594.patch/
}
}
}
-diff -Naur xbmc-pvr-27594.orig/xbmc/utils/Makefile xbmc-pvr-27594.patch/xbmc/utils/Makefile
---- xbmc-pvr-27594.orig/xbmc/utils/Makefile 2010-02-08 18:53:42.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/utils/Makefile 2010-02-09 07:31:57.964897381 +0100
+diff -Naur xbmc-pvr-27594/xbmc/lib/libapetag/apetaglib.c xbmc-pvr-27594.patch/xbmc/lib/libapetag/apetaglib.c
+--- xbmc-pvr-27594/xbmc/lib/libapetag/apetaglib.c 2010-02-09 07:13:43.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/lib/libapetag/apetaglib.c 2010-02-09 20:10:33.669067469 +0100
+@@ -259,10 +259,11 @@
+ int n = sizeValue;
+
+ if (value != NULL && value[0] != '\0' && apefrm_getstr (mem_cnt, name) == NULL) {
+- while (value[--n] == ' ' || value[n] == '\0' || value[n] == '\n') {
++ while (n > 0 && (value[--n] == ' ' || value[n] == '\0' || value[n] == '\n')) {
+ value[n] = '\0';
+ }
+- return libapetag_maloc_cont (mem_cnt, flags, sizeName, name, n + 1, value);
++ if (n > 0)
++ return libapetag_maloc_cont (mem_cnt, flags, sizeName, name, n + 1, value);
+ }
+
+ return 0;
+diff -Naur xbmc-pvr-27594/xbmc/Settings.cpp xbmc-pvr-27594.patch/xbmc/Settings.cpp
+--- xbmc-pvr-27594/xbmc/Settings.cpp 2010-02-09 07:14:04.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/Settings.cpp 2010-02-09 20:10:27.413192693 +0100
+@@ -787,7 +787,7 @@
+ if (pElement)
+ {
+ GetInteger(pElement, "systemtotaluptime", m_iSystemTimeTotalUp, 0, 0, INT_MAX);
+- GetInteger(pElement, "httpapibroadcastlevel", m_HttpApiBroadcastLevel, 0, 0,5);
++ GetInteger(pElement, "httpapibroadcastlevel", m_HttpApiBroadcastLevel, 0, 0, 255);
+ GetInteger(pElement, "httpapibroadcastport", m_HttpApiBroadcastPort, 8278, 1, 65535);
+ }
+
+diff -Naur xbmc-pvr-27594/xbmc/Settings.cpp.orig xbmc-pvr-27594.patch/xbmc/Settings.cpp.orig
+diff -Naur xbmc-pvr-27594/xbmc/utils/Makefile xbmc-pvr-27594.patch/xbmc/utils/Makefile
+--- xbmc-pvr-27594/xbmc/utils/Makefile 2010-02-09 07:14:18.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/utils/Makefile 2010-02-09 20:08:42.371067357 +0100
@@ -73,7 +73,8 @@
Semaphore.cpp \
FileOperationJob.cpp \
@@ -4076,9 +2986,9 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/utils/Makefile xbmc-pvr-27594.patch/xbmc/uti
LIB=utils.a
-diff -Naur xbmc-pvr-27594.orig/xbmc/utils/PCMLimiter.cpp xbmc-pvr-27594.patch/xbmc/utils/PCMLimiter.cpp
---- xbmc-pvr-27594.orig/xbmc/utils/PCMLimiter.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/utils/PCMLimiter.cpp 2010-02-09 07:31:57.965897221 +0100
+diff -Naur xbmc-pvr-27594/xbmc/utils/PCMLimiter.cpp xbmc-pvr-27594.patch/xbmc/utils/PCMLimiter.cpp
+--- xbmc-pvr-27594/xbmc/utils/PCMLimiter.cpp 1970-01-01 01:00:00.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/utils/PCMLimiter.cpp 2010-02-09 20:08:42.372067338 +0100
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2005-2008 Team XBMC
@@ -4199,9 +3109,9 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/utils/PCMLimiter.cpp xbmc-pvr-27594.patch/xb
+ }
+}
+
-diff -Naur xbmc-pvr-27594.orig/xbmc/utils/PCMLimiter.h xbmc-pvr-27594.patch/xbmc/utils/PCMLimiter.h
---- xbmc-pvr-27594.orig/xbmc/utils/PCMLimiter.h 1970-01-01 01:00:00.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/utils/PCMLimiter.h 2010-02-09 07:31:57.966906769 +0100
+diff -Naur xbmc-pvr-27594/xbmc/utils/PCMLimiter.h xbmc-pvr-27594.patch/xbmc/utils/PCMLimiter.h
+--- xbmc-pvr-27594/xbmc/utils/PCMLimiter.h 1970-01-01 01:00:00.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/utils/PCMLimiter.h 2010-02-09 20:08:42.373068295 +0100
@@ -0,0 +1,53 @@
+#pragma once
+/*
@@ -4256,9 +3166,9 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/utils/PCMLimiter.h xbmc-pvr-27594.patch/xbmc
+ float m_attenlp;
+ float m_delta;
+};
-diff -Naur xbmc-pvr-27594.orig/xbmc/utils/PCMRemap.cpp xbmc-pvr-27594.patch/xbmc/utils/PCMRemap.cpp
---- xbmc-pvr-27594.orig/xbmc/utils/PCMRemap.cpp 2010-02-08 18:53:42.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/utils/PCMRemap.cpp 2010-02-09 07:32:57.658786358 +0100
+diff -Naur xbmc-pvr-27594/xbmc/utils/PCMRemap.cpp xbmc-pvr-27594.patch/xbmc/utils/PCMRemap.cpp
+--- xbmc-pvr-27594/xbmc/utils/PCMRemap.cpp 2010-02-09 07:14:23.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/utils/PCMRemap.cpp 2010-02-09 20:08:42.374067717 +0100
@@ -48,42 +48,6 @@
/* 7.1 */ {PCM_FRONT_LEFT, PCM_FRONT_RIGHT, PCM_FRONT_CENTER, PCM_SIDE_LEFT, PCM_SIDE_RIGHT, PCM_BACK_LEFT, PCM_BACK_RIGHT, PCM_LOW_FREQUENCY, PCM_INVALID}
};
@@ -4523,9 +3433,9 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/utils/PCMRemap.cpp xbmc-pvr-27594.patch/xbmc
+ return namestr;
+}
+
-diff -Naur xbmc-pvr-27594.orig/xbmc/utils/PCMRemap.h xbmc-pvr-27594.patch/xbmc/utils/PCMRemap.h
---- xbmc-pvr-27594.orig/xbmc/utils/PCMRemap.h 2010-02-08 18:53:42.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/utils/PCMRemap.h 2010-02-09 07:32:57.656929012 +0100
+diff -Naur xbmc-pvr-27594/xbmc/utils/PCMRemap.h xbmc-pvr-27594.patch/xbmc/utils/PCMRemap.h
+--- xbmc-pvr-27594/xbmc/utils/PCMRemap.h 2010-02-09 07:14:18.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/utils/PCMRemap.h 2010-02-09 20:08:42.374067717 +0100
@@ -81,7 +81,9 @@
enum PCMLayout m_channelLayout;
unsigned int m_inChannels, m_outChannels;
@@ -4546,9 +3456,9 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/utils/PCMRemap.h xbmc-pvr-27594.patch/xbmc/u
public:
CPCMRemap();
-diff -Naur xbmc-pvr-27594.orig/xbmc/utils/RingBuffer.cpp xbmc-pvr-27594.patch/xbmc/utils/RingBuffer.cpp
---- xbmc-pvr-27594.orig/xbmc/utils/RingBuffer.cpp 2010-02-08 18:53:42.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/utils/RingBuffer.cpp 2010-02-09 07:32:34.316928213 +0100
+diff -Naur xbmc-pvr-27594/xbmc/utils/RingBuffer.cpp xbmc-pvr-27594.patch/xbmc/utils/RingBuffer.cpp
+--- xbmc-pvr-27594/xbmc/utils/RingBuffer.cpp 2010-02-09 07:14:18.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/utils/RingBuffer.cpp 2010-02-09 20:08:42.375067558 +0100
@@ -20,6 +20,8 @@
*/
@@ -4743,9 +3653,9 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/utils/RingBuffer.cpp xbmc-pvr-27594.patch/xb
+ CSingleLock lock(m_critSection);
return m_size - m_fillCount;
}
-diff -Naur xbmc-pvr-27594.orig/xbmc/utils/RingBuffer.h xbmc-pvr-27594.patch/xbmc/utils/RingBuffer.h
---- xbmc-pvr-27594.orig/xbmc/utils/RingBuffer.h 2010-01-24 11:50:44.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/utils/RingBuffer.h 2010-02-09 07:32:34.316928213 +0100
+diff -Naur xbmc-pvr-27594/xbmc/utils/RingBuffer.h xbmc-pvr-27594.patch/xbmc/utils/RingBuffer.h
+--- xbmc-pvr-27594/xbmc/utils/RingBuffer.h 2010-02-09 07:14:23.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/utils/RingBuffer.h 2010-02-09 20:08:42.376068097 +0100
@@ -24,7 +24,7 @@
class CRingBuffer
@@ -4755,9 +3665,9 @@ diff -Naur xbmc-pvr-27594.orig/xbmc/utils/RingBuffer.h xbmc-pvr-27594.patch/xbmc
char *m_buffer;
unsigned int m_size;
unsigned int m_readPtr;
-diff -Naur xbmc-pvr-27594.orig/xbmc/VideoDatabase.cpp xbmc-pvr-27594.patch/xbmc/VideoDatabase.cpp
---- xbmc-pvr-27594.orig/xbmc/VideoDatabase.cpp 2010-02-08 18:53:42.000000000 +0100
-+++ xbmc-pvr-27594.patch/xbmc/VideoDatabase.cpp 2010-02-09 07:31:57.984772386 +0100
+diff -Naur xbmc-pvr-27594/xbmc/VideoDatabase.cpp xbmc-pvr-27594.patch/xbmc/VideoDatabase.cpp
+--- xbmc-pvr-27594/xbmc/VideoDatabase.cpp 2010-02-09 07:11:36.000000000 +0100
++++ xbmc-pvr-27594.patch/xbmc/VideoDatabase.cpp 2010-02-09 20:08:42.380068227 +0100
@@ -7035,7 +7035,7 @@
CStdString strFanart;
CUtil::ReplaceExtension(item.GetTBNFile(), "-fanart.jpg", strFanart);