Changeset 1ad2022a9d5d65173ad85c9b28d1f7237a8a8d79

Show
Ignore:
Timestamp:
11/12/05 22:11:46 (3 years ago)
Author:
Boris Dorès <babal@videolan.org>
git-committer:
Boris Dorès <babal@videolan.org> 1134335506 +0000
git-parent:

[3fbfb3d4a2960ba8833db55e80711c5279ba45a6]

git-author:
Boris Dorès <babal@videolan.org> 1134335506 +0000
Message:

- correct calculation of the size of the overflow buffer

(fixes a crash with mono streams)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • AUTHORS

    r53e8222 r1ad2022  
    151151D: Win32 network input 
    152152D: Win32 interface 
    153 D: Headphone channel mixer 
     153D: Headphone channel mixer, Dolby Surround decoder 
     154D: Audio output core enhancements 
    154155S: France 
    155156 

  • modules/audio_filter/channel_mixer/headphone.c

    r989a7bd r1ad2022  
    316316    { 
    317317        if ( p_data->i_overflow_buffer_size 
    318                 < p_data->p_atomic_operations[i].i_delay * i_nb_channels 
    319                 * sizeof (float) ) 
     318                < p_data->p_atomic_operations[i].i_delay * 2 * sizeof (float) ) 
    320319        { 
    321320            p_data->i_overflow_buffer_size 
    322                 = p_data->p_atomic_operations[i].i_delay * i_nb_channels 
    323                 * sizeof (float); 
     321                = p_data->p_atomic_operations[i].i_delay * 2 * sizeof (float); 
    324322        } 
    325323    } 
    …… 
    403401                , aout_FormatNbChannels ( &p_filter->input ) 
    404402                , p_filter->input.i_physical_channels 
    405                 , p_filter->input.i_rate ) < 0 ) 
     403                , p_filter->input.i_rate ) < 0 ) 
    406404    { 
    407405        return VLC_EGENERIC;