/* */
unsigned i_header_size;
int i_type;
+ uint8_t i_chans_to_reorder;
+ uint8_t pi_chan_table[AOUT_CHAN_MAX];
};
#ifdef ENABLE_SOUT
* - frequency (4 bits)
* - bits per sample (2 bits)
* - unknown (6 bits)
+ *
+ * LPCM WIDI header
+ * refers http://www.dvdforum.org/images/Guideline1394V10R0_20020911.pdf
+ * - sub stream id (8 bits) = 0xa0
+ * - frame header count (8 bits) = 0x06
+ * [ 0b0000000 (7 bits)
+ * - audio emphasis (1 bit) ] (8 bits)
+ * [ qz word length (2 bits) 0x00 == 16bits
+ * - sampling freq (3 bits) 0b001 == 44.1K, 0b010 == 48K Hz
+ * - channels count(3 bits) ] (8 bits) 0b000 == dual mono, 0b001 == stereo
+ * follows: LPCM data (15360 bits/1920 bytes)
*/
#define LPCM_VOB_HEADER_LEN (6)
#define LPCM_AOB_HEADER_LEN (11)
#define LPCM_BD_HEADER_LEN (4)
+#define LPCM_WIDI_HEADER_LEN (4)
enum
{
LPCM_VOB,
LPCM_AOB,
LPCM_BD,
+ LPCM_WIDI,
};
typedef struct
const uint8_t *p_header );
static void AobExtract( block_t *, block_t *, unsigned i_bits, aob_group_t p_group[2] );
/* */
-static int BdHeader( unsigned *pi_rate,
+static int BdHeader( decoder_sys_t *p_sys,
+ unsigned *pi_rate,
unsigned *pi_channels,
unsigned *pi_channels_padding,
unsigned *pi_original_channels,
unsigned *pi_bits,
const uint8_t *p_header );
static void BdExtract( block_t *, block_t *, unsigned, unsigned, unsigned, unsigned );
-
+/* */
+static int WidiHeader( unsigned *pi_rate,
+ unsigned *pi_channels, unsigned *pi_original_channels,
+ unsigned *pi_bits,
+ const uint8_t *p_header );
/*****************************************************************************
* OpenCommon:
i_type = LPCM_BD;
i_header_size = LPCM_BD_HEADER_LEN;
break;
+ /* WIDI LPCM */
+ case VLC_CODEC_WIDI_LPCM:
+ i_type = LPCM_WIDI;
+ i_header_size = LPCM_WIDI_HEADER_LEN;
+ break;
default:
return VLC_EGENERIC;
}
date_Set( &p_sys->end_date, 0 );
p_sys->i_type = i_type;
p_sys->i_header_size = i_header_size;
+ p_sys->i_chans_to_reorder = 0;
/* Set output properties */
p_dec->fmt_out.i_cat = AUDIO_ES;
case LPCM_AOB:
p_dec->fmt_out.i_codec = VLC_CODEC_DVDA_LPCM;
break;
+ case LPCM_WIDI:
+ p_dec->fmt_out.i_codec = VLC_CODEC_WIDI_LPCM;
+ break;
default:
assert(0);
case LPCM_BD:
p_block->p_buffer );
break;
case LPCM_BD:
- i_ret = BdHeader( &i_rate, &i_channels, &i_channels_padding, &i_original_channels, &i_bits,
+ i_ret = BdHeader( p_sys, &i_rate, &i_channels, &i_channels_padding, &i_original_channels, &i_bits,
p_block->p_buffer );
break;
+ case LPCM_WIDI:
+ i_ret = WidiHeader( &i_rate, &i_channels, &i_original_channels, &i_bits,
+ p_block->p_buffer );
+ break;
default:
abort();
}
p_block->p_buffer += p_sys->i_header_size + i_padding;
p_block->i_buffer -= p_sys->i_header_size + i_padding;
+ if( p_sys->i_chans_to_reorder )
+ {
+ aout_ChannelReorder( p_block->p_buffer, p_block->i_buffer,
+ p_sys->i_chans_to_reorder, p_sys->pi_chan_table,
+ p_dec->fmt_out.i_codec );
+ }
+
switch( p_sys->i_type )
{
+ case LPCM_WIDI:
case LPCM_VOB:
VobExtract( p_aout_buffer, p_block, i_bits );
break;
return VLC_SUCCESS;
}
-static int BdHeader( unsigned *pi_rate,
+static const uint32_t pi_8channels_in[] =
+{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_CENTER,
+ AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
+ AOUT_CHAN_MIDDLERIGHT, AOUT_CHAN_LFE, 0 };
+
+static const uint32_t pi_7channels_in[] =
+{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_CENTER,
+ AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
+ AOUT_CHAN_MIDDLERIGHT, 0 };
+
+static const uint32_t pi_6channels_in[] =
+{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_CENTER,
+ AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_LFE, 0 };
+
+static const uint32_t pi_5channels_in[] =
+{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_CENTER,
+ AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, 0 };
+
+static const uint32_t pi_4channels_in[] =
+{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
+ AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, 0 };
+
+static const uint32_t pi_3channels_in[] =
+{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
+ AOUT_CHAN_CENTER, 0 };
+
+
+static int BdHeader( decoder_sys_t *p_sys,
+ unsigned *pi_rate,
unsigned *pi_channels,
unsigned *pi_channels_padding,
unsigned *pi_original_channels,
const uint8_t *p_header )
{
const uint32_t h = GetDWBE( p_header );
+ const uint32_t *pi_channels_in = NULL;
switch( ( h & 0xf000) >> 12 )
{
case 1:
case 4:
*pi_channels = 3;
*pi_original_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER;
+ pi_channels_in = pi_3channels_in;
break;
case 5:
*pi_channels = 3;
*pi_channels = 4;
*pi_original_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
+ pi_channels_in = pi_4channels_in;
break;
case 8:
*pi_channels = 5;
*pi_original_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER |
AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
+ pi_channels_in = pi_5channels_in;
break;
case 9:
*pi_channels = 6;
*pi_original_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER |
AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT |
AOUT_CHAN_LFE;
+ pi_channels_in = pi_6channels_in;
break;
case 10:
*pi_channels = 7;
*pi_original_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER |
AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT |
AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT;
+ pi_channels_in = pi_7channels_in;
break;
case 11:
*pi_channels = 8;
AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT |
AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT |
AOUT_CHAN_LFE;
+ pi_channels_in = pi_8channels_in;
break;
default:
default:
return -1;
}
+
+ if( pi_channels_in )
+ {
+ p_sys->i_chans_to_reorder =
+ aout_CheckChannelReorder( pi_channels_in, NULL,
+ *pi_original_channels,
+ p_sys->pi_chan_table );
+ }
+
+ return 0;
+}
+
+static int WidiHeader( unsigned *pi_rate,
+ unsigned *pi_channels, unsigned *pi_original_channels,
+ unsigned *pi_bits,
+ const uint8_t *p_header )
+{
+ if ( p_header[0] != 0xa0 || p_header[1] != 0x06 )
+ return -1;
+
+ switch( ( p_header[3] & 0x38 ) >> 3 )
+ {
+ case 0x01: //0b001
+ *pi_rate = 44100;
+ break;
+ case 0x02: //0b010
+ *pi_rate = 48000;
+ break;
+ default:
+ return -1;
+ }
+
+ if( p_header[3] >> 6 != 0 )
+ return -1;
+ else
+ *pi_bits = 16;
+
+ *pi_channels = (p_header[3] & 0x7) + 1;
+
+ *pi_original_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
+
return 0;
}
unsigned i_channels, unsigned i_channels_padding,
unsigned i_bits )
{
- if( i_channels_padding > 0 )
+ if( i_bits != 16 || i_channels_padding > 0 )
{
uint8_t *p_src = p_block->p_buffer;
uint8_t *p_dst = p_aout_buffer->p_buffer;
+ int dst_inc = ((i_bits == 16) ? 2 : 4) * i_channels;
+
while( i_frame_length > 0 )
{
#ifdef WORDS_BIGENDIAN
memcpy( p_dst, p_src, i_channels * i_bits / 8 );
#else
- swab( p_dst, p_src, i_channels * i_bits / 8 );
+ if (i_bits == 16) {
+ swab( p_src, p_dst, (i_channels + i_channels_padding) * i_bits / 8 );
+ } else {
+ for (unsigned i = 0; i < i_channels; ++i) {
+ p_dst[i * 4] = 0;
+ p_dst[1 + (i * 4)] = p_src[2 + (i * 3)];
+ p_dst[2 + (i * 4)] = p_src[1 + (i * 3)];
+ p_dst[3 + (i * 4)] = p_src[i * 3];
+ }
+ }
#endif
p_src += (i_channels + i_channels_padding) * i_bits / 8;
- p_dst += (i_channels + 0) * i_bits / 8;
+ p_dst += dst_inc;
i_frame_length--;
}
}
projects / vlc / blobdiff