Skip to content

M
mpd
Commit 52b77f6e authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

input/cdio_paranoia: pass byte order swapping to the PCM "decoder"

Send another "magic" MIME type when the byte order must be reversed. This also fixes byte order issues when big-endian was involved (input data or host byte order) - that was completely broken.
parent 4c9782ee
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 32 deletions
src/input/cdio_paranoia_input_plugin.c
View file @ 52b77f6e
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include "input_internal.h" #include "input_internal.h"
#include "input_plugin.h" #include "input_plugin.h"
#include "refcount.h" #include "refcount.h"
#include "pcm_buffer.h"
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
...@@ -46,8 +45,6 @@ struct input_cdio_paranoia { ...@@ -46,8 +45,6 @@ struct input_cdio_paranoia {
CdIo_t *cdio; CdIo_t *cdio;
cdrom_paranoia_t *para; cdrom_paranoia_t *para;
int endian;
lsn_t lsn_from, lsn_to; lsn_t lsn_from, lsn_to;
int lsn_relofs; int lsn_relofs;
...@@ -55,8 +52,6 @@ struct input_cdio_paranoia { ...@@ -55,8 +52,6 @@ struct input_cdio_paranoia {
char buffer[CDIO_CD_FRAMESIZE_RAW]; char buffer[CDIO_CD_FRAMESIZE_RAW];
int buffer_lsn; int buffer_lsn;
struct pcm_buffer conv_buffer;
}; };
static inline GQuark static inline GQuark
...@@ -70,8 +65,6 @@ input_cdio_close(struct input_stream *is) ...@@ -70,8 +65,6 @@ input_cdio_close(struct input_stream *is)
{ {
struct input_cdio_paranoia *i = (struct input_cdio_paranoia *)is; struct input_cdio_paranoia *i = (struct input_cdio_paranoia *)is;
pcm_buffer_deinit(&i->conv_buffer);
if (i->para) if (i->para)
cdio_paranoia_free(i->para); cdio_paranoia_free(i->para);
if (i->drv) if (i->drv)
...@@ -168,7 +161,6 @@ input_cdio_open(const char *uri, ...@@ -168,7 +161,6 @@ input_cdio_open(const char *uri,
i->cdio = NULL; i->cdio = NULL;
i->para = NULL; i->para = NULL;
i->trackno = parsed_uri.track; i->trackno = parsed_uri.track;
pcm_buffer_init(&i->conv_buffer);
/* get list of CD's supporting CD-DA */ /* get list of CD's supporting CD-DA */
char *device = parsed_uri.device[0] != 0 char *device = parsed_uri.device[0] != 0
...@@ -202,21 +194,24 @@ input_cdio_open(const char *uri, ...@@ -202,21 +194,24 @@ input_cdio_open(const char *uri,
return NULL; return NULL;
} }
i->endian = data_bigendianp(i->drv); bool reverse_endian;
switch (i->endian) { switch (data_bigendianp(i->drv)) {
case -1: case -1:
g_debug("cdda: drive returns unknown audio data, assuming Little Endian"); g_debug("cdda: drive returns unknown audio data");
i->endian = 0; reverse_endian = false;
break; break;
case 0: case 0:
g_debug("cdda: drive returns audio data Little Endian."); g_debug("cdda: drive returns audio data Little Endian.");
reverse_endian = G_BYTE_ORDER == G_BIG_ENDIAN;
break; break;
case 1: case 1:
g_debug("cdda: drive returns audio data Big Endian."); g_debug("cdda: drive returns audio data Big Endian.");
reverse_endian = G_BYTE_ORDER == G_LITTLE_ENDIAN;
break; break;
default: default:
g_set_error(error_r, cdio_quark(), 0, g_set_error(error_r, cdio_quark(), 0,
"Drive returns unknown data type %d", i->endian); "Drive returns unknown data type %d",
data_bigendianp(i->drv));
input_cdio_close(&i->base); input_cdio_close(&i->base);
return NULL; return NULL;
} }
...@@ -244,7 +239,9 @@ input_cdio_open(const char *uri, ...@@ -244,7 +239,9 @@ input_cdio_open(const char *uri,
i->base.size = (i->lsn_to - i->lsn_from + 1) * CDIO_CD_FRAMESIZE_RAW; i->base.size = (i->lsn_to - i->lsn_from + 1) * CDIO_CD_FRAMESIZE_RAW;
/* hack to make MPD select the "pcm" decoder plugin */ /* hack to make MPD select the "pcm" decoder plugin */
i->base.mime = g_strdup("audio/x-mpd-cdda-pcm"); i->base.mime = g_strdup(reverse_endian
? "audio/x-mpd-cdda-pcm-reverse"
: "audio/x-mpd-cdda-pcm");
return &i->base; return &i->base;
} }
...@@ -287,17 +284,6 @@ input_cdio_seek(struct input_stream *is, ...@@ -287,17 +284,6 @@ input_cdio_seek(struct input_stream *is,
return true; return true;
} }
static inline size_t
pcm16_to_wave(uint16_t *dst16, const uint16_t *src16, size_t length)
{
size_t cnt = length >> 1;
while (cnt > 0) {
*dst16++ = GUINT16_TO_LE(*src16++);
cnt--;
}
return length;
}
static size_t static size_t
input_cdio_read(struct input_stream *is, void *ptr, size_t length, input_cdio_read(struct input_stream *is, void *ptr, size_t length,
GError **error_r) GError **error_r)
...@@ -335,13 +321,6 @@ input_cdio_read(struct input_stream *is, void *ptr, size_t length, ...@@ -335,13 +321,6 @@ input_cdio_read(struct input_stream *is, void *ptr, size_t length,
"paranoia read error. Stopping."); "paranoia read error. Stopping.");
return 0; return 0;
} }
//do the swapping if nessesary
if (cis->endian != 0) {
uint16_t *conv_buffer = pcm_buffer_get(&cis->conv_buffer, CDIO_CD_FRAMESIZE_RAW );
/* do endian conversion ! */
pcm16_to_wave( conv_buffer, (uint16_t*) rbuf, CDIO_CD_FRAMESIZE_RAW);
rbuf = (int16_t *)conv_buffer;
}
//store current buffer //store current buffer
memcpy(cis->buffer, rbuf, CDIO_CD_FRAMESIZE_RAW); memcpy(cis->buffer, rbuf, CDIO_CD_FRAMESIZE_RAW);
cis->buffer_lsn = cis->lsn_relofs; cis->buffer_lsn = cis->lsn_relofs;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment