summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/demuxers/demux_qt.c27
-rw-r--r--src/libxineadec/xine_lpcm_decoder.c66
-rw-r--r--src/xine-engine/buffer_types.c1
3 files changed, 69 insertions, 25 deletions
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index d446cc17b..7c6f7efe3 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -90,6 +90,7 @@ typedef unsigned int qt_atom;
#define WAVE_ATOM QT_ATOM('w', 'a', 'v', 'e')
#define FRMA_ATOM QT_ATOM('f', 'r', 'm', 'a')
#define AVCC_ATOM QT_ATOM('a', 'v', 'c', 'C')
+#define ENDA_ATOM QT_ATOM('e', 'n', 'd', 'a')
#define IMA4_FOURCC ME_FOURCC('i', 'm', 'a', '4')
#define MAC3_FOURCC ME_FOURCC('M', 'A', 'C', '3')
@@ -103,6 +104,8 @@ typedef unsigned int qt_atom;
#define TWOS_FOURCC ME_FOURCC('t', 'w', 'o', 's')
#define SOWT_FOURCC ME_FOURCC('s', 'o', 'w', 't')
#define RAW_FOURCC ME_FOURCC('r', 'a', 'w', ' ')
+#define IN24_FOURCC ME_FOURCC('i', 'n', '2', '4')
+#define NI42_FOURCC ME_FOURCC('4', '2', 'n', 'i')
#define AVC1_FOURCC ME_FOURCC('a', 'v', 'c', '1')
#define UDTA_ATOM QT_ATOM('u', 'd', 't', 'a')
@@ -1250,6 +1253,13 @@ static qt_error parse_trak_atom (qt_trak *trak,
trak->stsd_atoms[k].audio.channels = trak_atom[atom_pos + 0x15];
trak->stsd_atoms[k].audio.bits = trak_atom[atom_pos + 0x17];
+ /* 24-bit audio doesn't always declare itself properly, and can be big- or little-endian */
+ if (trak->stsd_atoms[k].audio.codec_fourcc == IN24_FOURCC) {
+ trak->stsd_atoms[k].audio.bits = 24;
+ if (_X_BE_32(&trak_atom[atom_pos + 0x48]) == ENDA_ATOM && trak_atom[atom_pos + 0x4D])
+ trak->stsd_atoms[k].audio.codec_fourcc = NI42_FOURCC;
+ }
+
/* assume uncompressed audio parameters */
trak->stsd_atoms[k].audio.bytes_per_sample =
trak->stsd_atoms[k].audio.bits / 8;
@@ -1312,11 +1322,13 @@ static qt_error parse_trak_atom (qt_trak *trak,
* appears to be a handler for uncompressed data; if there are an
* extra 0x10 bytes, there are some more useful decoding params;
* further, do not do load these parameters if the audio is just
- * PCM ('raw ', 'twos', or 'sowt') */
+ * PCM ('raw ', 'twos', 'sowt' or 'in24') */
if ((current_stsd_atom_size > 0x24) &&
(trak->stsd_atoms[k].audio.codec_fourcc != TWOS_FOURCC) &&
(trak->stsd_atoms[k].audio.codec_fourcc != SOWT_FOURCC) &&
- (trak->stsd_atoms[k].audio.codec_fourcc != RAW_FOURCC)) {
+ (trak->stsd_atoms[k].audio.codec_fourcc != RAW_FOURCC) &&
+ (trak->stsd_atoms[k].audio.codec_fourcc != IN24_FOURCC) &&
+ (trak->stsd_atoms[k].audio.codec_fourcc != NI42_FOURCC)) {
if (_X_BE_32(&trak_atom[atom_pos + 0x20]))
trak->stsd_atoms[k].audio.samples_per_packet =
@@ -2400,6 +2412,7 @@ static int demux_qt_send_chunk(demux_plugin_t *this_gen) {
buf_element_t *buf = NULL;
unsigned int i, j;
unsigned int remaining_sample_bytes;
+ unsigned int frame_aligned_buf_size;
int frame_duration;
int first_buf;
qt_trak *video_trak = NULL;
@@ -2655,8 +2668,14 @@ static int demux_qt_send_chunk(demux_plugin_t *this_gen) {
buf->pts = audio_trak->frames[i].pts;
}
- if (remaining_sample_bytes > buf->max_size)
- buf->size = buf->max_size;
+ /* 24-bit audio doesn't fit evenly into the default 8192-byte buffers */
+ if (audio_trak->properties->audio.bits == 24)
+ frame_aligned_buf_size = 8184;
+ else
+ frame_aligned_buf_size = buf->max_size;
+
+ if (remaining_sample_bytes > frame_aligned_buf_size)
+ buf->size = frame_aligned_buf_size;
else
buf->size = remaining_sample_bytes;
remaining_sample_bytes -= buf->size;
diff --git a/src/libxineadec/xine_lpcm_decoder.c b/src/libxineadec/xine_lpcm_decoder.c
index 6f4e71003..17db68550 100644
--- a/src/libxineadec/xine_lpcm_decoder.c
+++ b/src/libxineadec/xine_lpcm_decoder.c
@@ -94,6 +94,7 @@ static void lpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
int stream_be;
audio_buffer_t *audio_buffer;
int format_changed = 0;
+ int special_dvd_audio = 0;
/* Drop preview data */
if (buf->decoder_flags & BUF_FLAG_PREVIEW)
@@ -116,7 +117,7 @@ static void lpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
switch ((buf->decoder_info[2] >> (24+6)) & 0x03) {
case 1: bits_per_sample = 16; break;
case 2: bits_per_sample = 20; break;
- case 3: bits_per_sample = 24; break;
+ case 3: bits_per_sample = 24; special_dvd_audio = 1; break;
default: bits_per_sample = 0; break;
}
switch ((buf->decoder_info[2] >> 16) & 0x0f) {
@@ -152,7 +153,7 @@ static void lpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
switch ((buf->decoder_info[2]>>6) & 3) {
case 0: bits_per_sample = 16; break;
case 1: bits_per_sample = 20; break;
- case 2: bits_per_sample = 24; break;
+ case 2: bits_per_sample = 24; special_dvd_audio = 1; break;
}
}
@@ -270,35 +271,58 @@ static void lpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
int n = buf_size;
if ( stream_be ) {
- while (n >= 12) {
+ if (special_dvd_audio)
+ while (n >= 12) {
+ if ( stream_be == this->cpu_be ) {
+ *d++ = s[0];
+ *d++ = s[1];
+ *d++ = s[2];
+ *d++ = s[3];
+ *d++ = s[4];
+ *d++ = s[5];
+ *d++ = s[6];
+ *d++ = s[7];
+ } else {
+ *d++ = s[1];
+ *d++ = s[0];
+ *d++ = s[3];
+ *d++ = s[2];
+ *d++ = s[5];
+ *d++ = s[4];
+ *d++ = s[7];
+ *d++ = s[6];
+ }
+ s += 12;
+ n -= 12;
+ }
+ else
+ while (n >= 3) {
+ if ( stream_be == this->cpu_be ) {
+ *d++ = s[0];
+ *d++ = s[1];
+ } else {
+ *d++ = s[1];
+ *d++ = s[0];
+ }
+ s += 3;
+ n -= 3;
+ }
+ } else {
+ while (n >= 3) {
if ( stream_be == this->cpu_be ) {
- *d++ = s[0];
*d++ = s[1];
*d++ = s[2];
- *d++ = s[3];
- *d++ = s[4];
- *d++ = s[5];
- *d++ = s[6];
- *d++ = s[7];
} else {
- *d++ = s[1];
- *d++ = s[0];
- *d++ = s[3];
*d++ = s[2];
- *d++ = s[5];
- *d++ = s[4];
- *d++ = s[7];
- *d++ = s[6];
+ *d++ = s[1];
}
- s += 12;
- n -= 12;
+ s += 3;
+ n -= 3;
}
- } else {
- xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "lpcm_decoder: I don't know what should decode lpcm 24bit little endian byte stream");
}
if ( (d - (uint8_t*)audio_buffer->mem)/2*3 < buf_size )
- xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "lpcm_decoder: lost %i bytes\n", (int)(buf_size - (d - (uint8_t*)audio_buffer->mem))/2*3);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "lpcm_decoder: lost %i bytes of %i in the buffer\n", (int)(buf_size - (d - (uint8_t*)audio_buffer->mem)/2*3), buf_size);
} else {
memcpy (audio_buffer->mem, sample_buffer, buf_size);
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index 1db073851..e6b846d64 100644
--- a/src/xine-engine/buffer_types.c
+++ b/src/xine-engine/buffer_types.c
@@ -836,6 +836,7 @@ static const audio_db_t audio_db[] = {
0x01,
ME_FOURCC('r','a','w',' '),
ME_FOURCC('s','o','w','t'),
+ ME_FOURCC('4','2','n','i'),
0
},
BUF_AUDIO_LPCM_LE,
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 05:27:28 +0000