Commit af3201fb authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove useless AOUT_PHYSMASK masking in some codecs

parent a0000ece
......@@ -352,7 +352,7 @@ static block_t *Parse( decoder_t *p_dec, int *pi_frame_length, int *pi_bits,
p_dec->fmt_out.audio.i_channels = i_channels;
p_dec->fmt_out.audio.i_original_channels = pi_original_channels[i_channels/2-1];
p_dec->fmt_out.audio.i_physical_channels = pi_original_channels[i_channels/2-1] & AOUT_CHAN_PHYSMASK;
p_dec->fmt_out.audio.i_physical_channels = pi_original_channels[i_channels/2-1];
*pi_frame_length = (p_block->i_buffer - AES3_HEADER_LEN) / ( (4+i_bits) * i_channels / 8 );
*pi_bits = i_bits;
......
......@@ -357,7 +357,7 @@ static block_t *DecodeFrame( decoder_t *p_dec, block_t **pp_block )
p_dec->fmt_out.audio.i_rate = i_rate;
p_dec->fmt_out.audio.i_channels = i_channels;
p_dec->fmt_out.audio.i_original_channels = i_original_channels;
p_dec->fmt_out.audio.i_physical_channels = i_original_channels & AOUT_CHAN_PHYSMASK;
p_dec->fmt_out.audio.i_physical_channels = i_original_channels;
i_frame_length = (p_block->i_buffer - p_sys->i_header_size - i_padding) /
(i_channels + i_channels_padding) * 8 / i_bits;
......
......@@ -301,7 +301,7 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
p_dec->fmt_out.audio.i_rate = p_sys->mlp.i_rate;
p_dec->fmt_out.audio.i_channels = p_sys->mlp.i_channels;
p_dec->fmt_out.audio.i_original_channels = p_sys->mlp.i_channels_conf;
p_dec->fmt_out.audio.i_physical_channels = p_sys->mlp.i_channels_conf & AOUT_CHAN_PHYSMASK;
p_dec->fmt_out.audio.i_physical_channels = p_sys->mlp.i_channels_conf;
p_out_buffer->i_pts = p_out_buffer->i_dts = date_Get( &p_sys->end_date );
......
......@@ -1211,8 +1211,7 @@ static void SetupOutput( decoder_t *p_dec, block_t *p_block )
#if 0
p_dec->fmt_out.audio.i_original_channels = p_sys->i_channels_conf;
p_dec->fmt_out.audio.i_physical_channels =
p_sys->i_channels_conf & AOUT_CHAN_PHYSMASK;
p_dec->fmt_out.audio.i_physical_channels = p_sys->i_channels_conf;
#endif
p_block->i_pts = p_block->i_dts = date_Get( &p_sys->end_date );
......
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