]> git.sesse.net Git - vlc/commitdiff
aout: remove 24-bits support left-overs
authorRémi Denis-Courmont <remi@remlab.net>
Thu, 20 Dec 2012 19:02:58 +0000 (21:02 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Thu, 20 Dec 2012 19:02:58 +0000 (21:02 +0200)
src/audio_output/common.c

index f5a0fc1e175dee4e7bd42313d88b151afb15e6ab..7552a2df3ec0282329f8c95e33e4c133dbcef70c 100644 (file)
@@ -338,22 +338,6 @@ void aout_ChannelReorder( void *ptr, size_t bytes, unsigned channels,
             }
             break;
         }
-
-        case 24:
-        {
-            uint8_t *buf = ptr;
-
-            for( size_t i = 0; i < samples; i++ )
-            {
-                uint8_t tmp[3 * AOUT_CHAN_MAX];
-
-                for( size_t j = 0; j < channels; j++ )
-                    memcpy( tmp + (3 * chans_table[j]), buf + (3 * j), 3 );
-
-                memcpy( buf, tmp, 3 * channels );
-                buf += 3 * channels;
-            }
-        }
     }
 }
 
@@ -386,8 +370,6 @@ void aout_ChannelExtract( void *p_dst, int i_dst_channels,
         ExtractChannel( p_dst, i_dst_channels, p_src, i_src_channels, i_sample_count, pi_selection, 1 );
     else  if( i_bits_per_sample == 16 )
         ExtractChannel( p_dst, i_dst_channels, p_src, i_src_channels, i_sample_count, pi_selection, 2 );
-    else  if( i_bits_per_sample == 24 )
-        ExtractChannel( p_dst, i_dst_channels, p_src, i_src_channels, i_sample_count, pi_selection, 3 );
     else  if( i_bits_per_sample == 32 )
         ExtractChannel( p_dst, i_dst_channels, p_src, i_src_channels, i_sample_count, pi_selection, 4 );
     else  if( i_bits_per_sample == 64 )