[vlc-commits] Remove useless AOUT_PHYSMASK masking in some codecs

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Apr 21 18:51:24 2012 +0300| [af3201fb8c689fe52bfba771caf6556bda83728d] | committer: Rémi Denis-Courmont

Remove useless AOUT_PHYSMASK masking in some codecs

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=af3201fb8c689fe52bfba771caf6556bda83728d
---

 modules/codec/aes3.c            |    2 +-
 modules/codec/lpcm.c            |    2 +-
 modules/packetizer/mlp.c        |    2 +-
 modules/packetizer/mpeg4audio.c |    3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/codec/aes3.c b/modules/codec/aes3.c
index c8a1942..5a395a7 100644
--- a/modules/codec/aes3.c
+++ b/modules/codec/aes3.c
@@ -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;
diff --git a/modules/codec/lpcm.c b/modules/codec/lpcm.c
index 5d91ee1..a374530 100644
--- a/modules/codec/lpcm.c
+++ b/modules/codec/lpcm.c
@@ -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;
diff --git a/modules/packetizer/mlp.c b/modules/packetizer/mlp.c
index 0335020..0227d74 100644
--- a/modules/packetizer/mlp.c
+++ b/modules/packetizer/mlp.c
@@ -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 );
 
diff --git a/modules/packetizer/mpeg4audio.c b/modules/packetizer/mpeg4audio.c
index 29c441b..6928967 100644
--- a/modules/packetizer/mpeg4audio.c
+++ b/modules/packetizer/mpeg4audio.c
@@ -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 );