cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix playback of 24-bit FLAC files. From Brad. ok ajacoutot@

Browse Source 
(ports is not fully open)
This commit is contained in:
sthen 2010-03-03 08:29:18 +00:00
parent 6fdf400298
commit 311c7b0eb6
3 changed files with 105 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
multimedia/xine-lib/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.59 2010/01/05 11:48:51 sthen Exp $
# $OpenBSD: Makefile,v 1.60 2010/03/03 08:29:18 sthen Exp $
SHARED_ONLY= Yes
@ -6,6 +6,7 @@ COMMENT= multimedia decoding library
V= 1.1.17
DISTNAME= xine-lib-${V}
PKGNAME= ${DISTNAME}p0
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
EXTRACT_SUFX= .tar.bz2

70
multimedia/xine-lib/patches/patch-src_combined_decoder_flac_c
View File

@ -1,7 +1,69 @@
$OpenBSD: patch-src_combined_decoder_flac_c,v 1.1 2010/01/05 11:50:18 sthen Exp $
--- src/combined/decoder_flac.c.orig Fri Dec 4 18:57:51 2009
+++ src/combined/decoder_flac.c Fri Dec 4 18:58:15 2009
@@ -426,7 +426,7 @@ static uint32_t audio_types[] = {
$OpenBSD: patch-src_combined_decoder_flac_c,v 1.2 2010/03/03 08:29:18 sthen Exp $
--- src/combined/decoder_flac.c.orig Mon Nov 30 15:55:46 2009
+++ src/combined/decoder_flac.c Sat Jan 16 23:12:37 2010
@@ -122,7 +122,7 @@ flac_write_callback (const FLAC__StreamDecoder *decode
flac_decoder_t *this = (flac_decoder_t *)client_data;
audio_buffer_t *audio_buffer = NULL;
int samples_left = frame->header.blocksize;
- int bytes_per_sample = (frame->header.bits_per_sample == 8)?1:2;
+ int bytes_per_sample = (frame->header.bits_per_sample <= 8) ? 1 : 2;
int buf_samples;
int8_t *data8;
int16_t *data16;
@@ -139,21 +139,31 @@ flac_write_callback (const FLAC__StreamDecoder *decode
else
buf_samples = samples_left;
-
- if( frame->header.bits_per_sample == 8 ) {
+ switch (frame->header.bits_per_sample) {
+ case 8:
data8 = (int8_t *)audio_buffer->mem;
for( j=0; j < buf_samples; j++ )
for( i=0; i < frame->header.channels; i++ )
*data8++ = buffer[i][j];
+ break;
- } else {
-
+ case 16:
data16 = (int16_t *)audio_buffer->mem;
for( j=0; j < buf_samples; j++ )
for( i=0; i < frame->header.channels; i++ )
*data16++ = buffer[i][j];
+ break;
+
+ case 24:
+ data16 = (int16_t *)audio_buffer->mem;
+
+ for( j=0; j < buf_samples; j++ )
+ for( i=0; i < frame->header.channels; i++ )
+ *data16++ = buffer[i][j] >> 8;
+ break;
+
}
audio_buffer->num_frames = buf_samples;
@@ -261,14 +271,13 @@ flac_decode_data (audio_decoder_t *this_gen, buf_eleme
if (!this->output_open)
{
+ const int bits = this->bits_per_sample;
this->output_open = (this->stream->audio_out->open) (
this->stream->audio_out,
this->stream,
- this->bits_per_sample,
+ bits > 16 ? 16 : bits,
this->sample_rate,
mode);
-
-
}
this->buf_pos = 0;
} else if (this->output_open)
@@ -426,7 +435,7 @@ static uint32_t audio_types[] = {
static const decoder_info_t dec_info_audio = {
audio_types, /* supported types */

37
multimedia/xine-lib/patches/patch-src_demuxers_demux_flac_c Normal file
View File

@ -0,0 +1,37 @@
$OpenBSD: patch-src_demuxers_demux_flac_c,v 1.3 2010/03/03 08:29:18 sthen Exp $
--- src/demuxers/demux_flac.c.orig Sat Jan 16 23:08:41 2010
+++ src/demuxers/demux_flac.c Sat Jan 16 23:10:40 2010
@@ -352,6 +352,7 @@ static void demux_flac_send_headers(demux_plugin_t *th
demux_flac_t *this = (demux_flac_t *) this_gen;
buf_element_t *buf;
xine_waveformatex wave;
+ int bits;
this->audio_fifo = this->stream->audio_fifo;
@@ -364,12 +365,15 @@ static void demux_flac_send_headers(demux_plugin_t *th
return;
}
+ /* lie about 24bps */
+ bits = this->bits_per_sample > 16 ? 16 : this->bits_per_sample;
+
buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
buf->type = BUF_AUDIO_FLAC;
buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
buf->decoder_info[0] = 0;
buf->decoder_info[1] = this->sample_rate;
- buf->decoder_info[2] = this->bits_per_sample;
+ buf->decoder_info[2] = bits;
buf->decoder_info[3] = this->channels;
/* copy the faux WAV header */
buf->size = sizeof(xine_waveformatex) + FLAC_STREAMINFO_SIZE;
@@ -386,7 +390,7 @@ static void demux_flac_send_headers(demux_plugin_t *th
_x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE,
this->sample_rate);
_x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS,
- this->bits_per_sample);
+ bits);
this->status = DEMUX_OK;
}