From 7dcb309c14e356571452986aece22ddffa8a3cf2 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Thu, 2 Feb 2012 09:46:31 +0200 Subject: vo_opengl: quick-fix to enable OSD when using fragment shader for YUV conversion. Proper (HW-accelerated) implementation would use OpenGL texture to blend the OSD directly to RGB video texture. --- src/video_out/video_out_opengl.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index 3f3000523..ef0e83530 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -1480,6 +1480,20 @@ static void opengl_overlay_blend (vo_driver_t *this_gen, XUnlockDisplay (this->display); } } else { + + if (!frame->rgb_dst) { + if (frame->format == XINE_IMGFMT_YV12) { + _x_blend_yuv(frame->vo_frame.base, overlay, + frame->width, frame->height, frame->vo_frame.pitches, + &this->alphablend_extra_data); + } else { + _x_blend_yuy2(frame->vo_frame.base[0], overlay, + frame->width, frame->height, frame->vo_frame.pitches[0], + &this->alphablend_extra_data); + } + return; + } + if (!overlay->rgb_clut || !overlay->hili_rgb_clut) opengl_overlay_clut_yuv2rgb (this, overlay, frame); -- cgit v1.2.3 From 43bbb26f64916171fbe14aeecd8a8d72741c0dfe Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 4 Feb 2012 18:52:01 +0000 Subject: Remove unnecessary dev package dependencies. libc6-dev is required anyway, and the other -dev packages aren't referenced by our exported header files. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index de6b6a2b1..cc449f0cf 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Standards-Version: 3.7.2 Package: libxine-dev Architecture: any Section: libdevel -Depends: libxine1 (= ${Source-Version}), libc6-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev, libfreetype6-dev, pkg-config +Depends: libxine1 (= ${Source-Version}), pkg-config Conflicts: xine-ui (<< 0.9.10), libxine2-dev Description: the xine video player library, development packages This contains development files (headers, documentation and the like) -- cgit v1.2.3 From ebbd60ff7043826886cd7c35fde9e06bfe3b5093 Mon Sep 17 00:00:00 2001 From: Edgar Hucek Date: Sun, 29 Jan 2012 22:39:38 +0100 Subject: fix compile against recent ffmpeg --- src/combined/ffmpeg/ff_video_decoder.c | 14 ++++++++++++-- src/combined/ffmpeg/ffmpeg_compat.h | 4 ++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index ecfa0a88a..2ec18c55f 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -130,7 +130,9 @@ struct ff_video_decoder_s { yuv_planes_t yuv; +#ifdef AVPaletteControl AVPaletteControl palette_control; +#endif #ifdef LOG enum PixelFormat debug_fmt; @@ -218,7 +220,9 @@ static int get_buffer(AVCodecContext *context, AVFrame *av_frame){ /* We should really keep track of the ages of xine frames (see * avcodec_default_get_buffer in libavcodec/utils.c) * For the moment tell ffmpeg that every frame is new (age = bignumber) */ +#ifdef AVFRAMEAGE av_frame->age = 256*256*256*64; +#endif av_frame->type= FF_BUFFER_TYPE_USER; @@ -1028,7 +1032,9 @@ static void ff_handle_special_buffer (ff_video_decoder_t *this, buf_element_t *b memcpy(this->context->extradata, buf->decoder_info_ptr[2], buf->decoder_info[2]); - } else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) { + } +#ifdef AVPaletteControl + else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) { unsigned int i; palette_entry_t *demuxer_palette; @@ -1047,7 +1053,9 @@ static void ff_handle_special_buffer (ff_video_decoder_t *this, buf_element_t *b } decoder_palette->palette_changed = 1; - } else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) { + } +#endif + else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) { int i; lprintf("BUF_SPECIAL_RV_CHUNK_TABLE\n"); @@ -1794,7 +1802,9 @@ static video_decoder_t *ff_video_open_plugin (video_decoder_class_t *class_gen, this->av_frame = avcodec_alloc_frame(); this->context = avcodec_alloc_context(); this->context->opaque = this; +#ifdef AVPaletteControl this->context->palctrl = NULL; +#endif this->decoder_ok = 0; this->decoder_init_mode = 1; diff --git a/src/combined/ffmpeg/ffmpeg_compat.h b/src/combined/ffmpeg/ffmpeg_compat.h index 371b5ccdb..69b9aa30e 100644 --- a/src/combined/ffmpeg/ffmpeg_compat.h +++ b/src/combined/ffmpeg/ffmpeg_compat.h @@ -91,5 +91,9 @@ # define AVAUDIO 2 #endif +/* AVFrame.age */ +#if !(LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MAJOR >= 28 && LIBAVCODEC_VERSION_MICRO >= 1) +# define AVFRAMEAGE 1 +#endif #endif /* XINE_AVCODEC_COMPAT_H */ -- cgit v1.2.3 From f2623c09650d451d7e33fec957cacdaa8ef9eb5a Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 5 Feb 2012 01:45:39 +0000 Subject: Fix musepack decoder compilation if libmpcdec headers aren't available. --HG-- branch : 1.2.1-branch --- ChangeLog | 3 +++ src/audio_dec/xine_musepack_decoder.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 902690b35..de991c9cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +xine-lib (1.2.1.1) 2012-??-?? + * Fix musepack decoder compilation if libmpcdec headers aren't available. + xine-lib (1.2.1) 2012-02-04 * The "I'm at Tyneside LUG" release. * Enable PulseAudio, JACK and VDPAU on the Hurd. diff --git a/src/audio_dec/xine_musepack_decoder.c b/src/audio_dec/xine_musepack_decoder.c index 84aee9387..758ca9726 100644 --- a/src/audio_dec/xine_musepack_decoder.c +++ b/src/audio_dec/xine_musepack_decoder.c @@ -53,7 +53,7 @@ #elif defined(HAVE_MPC_MPCDEC_H) # include #else -# include "musepack/musepack.h" +# include "mpcdec/mpcdec.h" #endif #define MPC_DECODER_MEMSIZE 65536 -- cgit v1.2.3 From 52f388580cc4bd1261003785206c64585565b5b8 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 5 Feb 2012 18:22:57 +0000 Subject: Fix xinerama & libcdio/libvcdinfo tests: didn't soft-fail properly. --HG-- branch : 1.2.1-branch --- ChangeLog | 1 + m4/input.m4 | 14 +++++++++++--- m4/video_out.m4 | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index de991c9cf..6611710b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ xine-lib (1.2.1.1) 2012-??-?? * Fix musepack decoder compilation if libmpcdec headers aren't available. + * Configure tests for xinerama & VideoCD support now soft-fail properly. xine-lib (1.2.1) 2012-02-04 * The "I'm at Tyneside LUG" release. diff --git a/m4/input.m4 b/m4/input.m4 index c337162c7..21d7e216f 100644 --- a/m4/input.m4 +++ b/m4/input.m4 @@ -140,9 +140,17 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ dnl XXX: This could be cleaned up so that code does not have it ifdef so much XINE_ARG_ENABLE([vcd], [Enable VCD (VideoCD) support]) if test x"$enable_vcd" != x"no"; then - PKG_CHECK_MODULES([LIBCDIO], [libcdio >= 0.71]) - PKG_CHECK_MODULES([LIBVCDINFO], [libvcdinfo >= 0.7.23]) - AC_DEFINE([HAVE_VCDNAV], 1, [Define this if you use external libcdio/libvcdinfo]) + no_vcd=no + PKG_CHECK_MODULES([LIBCDIO], [libcdio >= 0.71], + [PKG_CHECK_MODULES([LIBVCDINFO], [libvcdinfo >= 0.7.23], [], [no_vcd=yes])], + [if test x"$hard_enable_vcd" = 'xyes'; then + AC_MSG_ERROR([$LIBCDIO_PKG_ERRORS]) + fi + no_vcd=yes] + ) + if test "$no_vcd" = 'no'; then + AC_DEFINE([HAVE_VCDNAV], 1, [Define this if you use external libcdio/libvcdinfo]) + fi fi enable_vcdo=no diff --git a/m4/video_out.m4 b/m4/video_out.m4 index 2ac257fec..a7fec05c5 100644 --- a/m4/video_out.m4 +++ b/m4/video_out.m4 @@ -315,7 +315,7 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [ [XINERAMA_LIBS="-lXinerama" have_xinerama="yes"], [], [$X_LIBS])]) fi - if test x"$enable_xinerama" = x"yes" && test x"$have_xinerama" != x"yes"; then + if test x"$hard_enable_xinerama" = x"yes" && test x"$have_xinerama" != x"yes"; then AC_MSG_ERROR([Xinerama support requested, but Xinerama not found or X disabled]) elif test x"$have_xinerama" = x"yes"; then AC_DEFINE([HAVE_XINERAMA], 1, [Define this if you have libXinerama installed]) -- cgit v1.2.3 From a5be135136fe669714ad4ac9c22519f06a8b2a25 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 8 Feb 2012 22:12:23 +0000 Subject: Fix DVB CRC checking (was wrong endianness). --HG-- branch : 1.2.1-branch --- ChangeLog | 1 + src/input/input_dvb.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6611710b6..b540b62f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ xine-lib (1.2.1.1) 2012-??-?? * Fix musepack decoder compilation if libmpcdec headers aren't available. * Configure tests for xinerama & VideoCD support now soft-fail properly. + * The DVB plugin is working again. xine-lib (1.2.1) 2012-02-04 * The "I'm at Tyneside LUG" release. diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index 14fac6eec..74365cc44 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -2470,10 +2470,10 @@ static void ts_rewrite_packets (dvb_input_plugin_t *this, unsigned char * origin crc = av_crc(this->class->av_crc, 0xffffffff, originalPkt+1, 12); - originalPkt[13]=(crc>>24) & 0xff; - originalPkt[14]=(crc>>16) & 0xff; - originalPkt[15]=(crc>>8) & 0xff; - originalPkt[16]=crc & 0xff; + originalPkt[13]=(crc ) & 0xff; + originalPkt[14]=(crc>> 8) & 0xff; + originalPkt[15]=(crc>>16) & 0xff; + originalPkt[16]=(crc>>24) & 0xff; memset(originalPkt+17,0xFF,PKT_SIZE-21); /* stuff the remainder */ } -- cgit v1.2.3