From ae57a6300677788caeb8dd2b008258b91fe16c47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Mon, 30 Jan 2012 17:48:40 +0000 Subject: Compile failure in osd.c with sys-libs/zlib-1.2.6 --- src/xine-engine/osd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c index 1d22ea303..6914f6386 100644 --- a/src/xine-engine/osd.c +++ b/src/xine-engine/osd.c @@ -650,7 +650,7 @@ static void osd_set_position (osd_object_t *osd, int x, int y) { osd->display_y = y; } -static uint16_t gzread_i16(gzFile *fp) { +static uint16_t gzread_i16(gzFile fp) { uint16_t ret; ret = gzgetc(fp); ret |= (gzgetc(fp)<<8); @@ -663,7 +663,7 @@ static uint16_t gzread_i16(gzFile *fp) { static int osd_renderer_load_font(osd_renderer_t *this, char *filename) { - gzFile *fp; + gzFile fp; osd_font_t *font = NULL; int i, ret = 0; -- cgit v1.2.3 From 01062a87c0acfe71f6f5be14dbeb9e0ab66ca7f0 Mon Sep 17 00:00:00 2001 From: Edgar Hucek Date: Tue, 31 Jan 2012 14:10:23 +0100 Subject: frame garbage collector in ff_reset --- src/combined/ffmpeg/ff_video_decoder.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src') diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index 90eeadffe..ecfa0a88a 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -1647,8 +1647,22 @@ static void ff_reset (video_decoder_t *this_gen) { this->size = 0; if(this->context && this->decoder_ok) + { + xine_list_iterator_t it; + AVFrame *av_frame; + avcodec_flush_buffers(this->context); + /* frame garbage collector here - workaround for buggy ffmpeg codecs that + * don't release their DR1 frames */ + while( (it = xine_list_front(this->dr1_frames)) != NULL ) + { + av_frame = (AVFrame *)xine_list_get_value(this->dr1_frames, it); + release_buffer(this->context, av_frame); + } + xine_list_clear(this->dr1_frames); + } + if (this->is_mpeg12) mpeg_parser_reset(this->mpeg_parser); -- cgit v1.2.3 From 15029f2439781c5da7ffcdf18e39ea8ea92b17e9 Mon Sep 17 00:00:00 2001 From: David Flater Date: Wed, 1 Feb 2012 03:45:20 +0100 Subject: Remove ALSA resampler bypass In 2005, xine-lib 1.1.1 added the following change: xine-lib (1.1.1) 2005-11-15 * Improve sound quality when using alsa 1.0.9 or above. When playing a 44.1khz stream on a 48khz only capable sound card. It bypasses alsa-lib resampler and uses xine's That made sense when Alsa's resampling was the worst thing ever. But now, if one installs alsa-plugins-1.0.25 and puts this in ~/.asoundrc: defaults.pcm.rate_converter "samplerate_best" Alsa then does markedly better resampling (using libsamplerate) than xine-lib (using its own algorithm). The bypass added in 2005 is therefore preventing the use of a higher-quality algorithm and blocking the ability to tune that algorithm in ~/.asoundrc, and no longer seems to have any redeeming value. --HG-- extra : transplant_source : %AE%96zte%B0%ED%B6C%BC%89%02%1F%05%21%BD%ED%D6%8C6 --- src/audio_out/audio_alsa_out.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index af8b4c351..b8cc1a8ca 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -458,7 +458,7 @@ static int ao_alsa_open(ao_driver_t *this_gen, uint32_t bits, uint32_t rate, int this->num_channels, err, snd_strerror(err)); goto close; } -#if SND_LIB_VERSION >= 0x010009 +#if 0 /* Restrict a configuration space to contain only real hardware rates */ err = snd_pcm_hw_params_set_rate_resample(this->audio_fd, params, 0); #endif -- cgit v1.2.3