Changeset ac58629e0db818d81d2be1aafca8b784286efa43

Show
Ignore:
Timestamp:
22/06/08 18:11:25 (6 months ago)
Author:
Antoine Cellerier <dionoea@videolan.org>
git-committer:
Antoine Cellerier <dionoea@videolan.org> 1214151085 +0200
git-parent:

[55f1d3272f61f46068e58c41690111e879082188]

git-author:
Antoine Cellerier <dionoea@videolan.org> 1214151085 +0200
Message:

Remove duplicate function.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/stream_out/transcode.c

    r0da3eb6 rac58629  
    10941094 ****************************************************************************/ 
    10951095 
    1096 static int audio_BitsPerSample( vlc_fourcc_t i_format ) 
    1097 { 
    1098     switch( i_format ) 
    1099     { 
    1100     case VLC_FOURCC('u','8',' ',' '): 
    1101     case VLC_FOURCC('s','8',' ',' '): 
    1102         return 8; 
    1103  
    1104     case VLC_FOURCC('u','1','6','l'): 
    1105     case VLC_FOURCC('s','1','6','l'): 
    1106     case VLC_FOURCC('u','1','6','b'): 
    1107     case VLC_FOURCC('s','1','6','b'): 
    1108         return 16; 
    1109  
    1110     case VLC_FOURCC('u','2','4','l'): 
    1111     case VLC_FOURCC('s','2','4','l'): 
    1112     case VLC_FOURCC('u','2','4','b'): 
    1113     case VLC_FOURCC('s','2','4','b'): 
    1114         return 24; 
    1115  
    1116     case VLC_FOURCC('u','3','2','l'): 
    1117     case VLC_FOURCC('s','3','2','l'): 
    1118     case VLC_FOURCC('u','3','2','b'): 
    1119     case VLC_FOURCC('s','3','2','b'): 
    1120     case VLC_FOURCC('f','l','3','2'): 
    1121     case VLC_FOURCC('f','i','3','2'): 
    1122         return 32; 
    1123  
    1124     case VLC_FOURCC('f','l','6','4'): 
    1125         return 64; 
    1126     } 
    1127  
    1128     return 0; 
    1129 } 
    1130  
    11311096static block_t *transcode_audio_alloc( filter_t *p_filter, int size ) 
    11321097{ 
    …… 
    11701135    } 
    11711136    id->p_decoder->fmt_out.audio.i_bitspersample = 
    1172         audio_BitsPerSample( id->p_decoder->fmt_out.i_codec ); 
     1137        aout_BitsPerSample( id->p_decoder->fmt_out.i_codec ); 
    11731138    fmt_last = id->p_decoder->fmt_out; 
    11741139    /* Fix AAC SBR changing number of channels and sampling rate */ 
    …… 
    11991164        id->p_encoder->fmt_out.audio.i_channels; 
    12001165    id->p_encoder->fmt_in.audio.i_bitspersample = 
    1201         audio_BitsPerSample( id->p_encoder->fmt_in.i_codec ); 
     1166        aout_BitsPerSample( id->p_encoder->fmt_in.i_codec ); 
    12021167 
    12031168    id->p_encoder->p_cfg = p_stream->p_sys->p_audio_cfg; 
    …… 
    12151180    id->p_encoder->fmt_in.audio.i_format = id->p_encoder->fmt_in.i_codec; 
    12161181    id->p_encoder->fmt_in.audio.i_bitspersample = 
    1217         audio_BitsPerSample( id->p_encoder->fmt_in.i_codec ); 
     1182        aout_BitsPerSample( id->p_encoder->fmt_in.i_codec ); 
    12181183 
    12191184    /* Init filter chain */ 
    …… 
    13241289        id->p_encoder->fmt_in.audio.i_format = id->p_encoder->fmt_in.i_codec; 
    13251290        id->p_encoder->fmt_in.audio.i_bitspersample = 
    1326             audio_BitsPerSample( id->p_encoder->fmt_in.i_codec ); 
     1291            aout_BitsPerSample( id->p_encoder->fmt_in.i_codec ); 
    13271292#else 
    13281293        msg_Err( p_stream, "no audio filter found for mixing from"