Changeset 42c786943d19801bea0cb30fd3c87405f5a1cbda

Show
Ignore:
Timestamp:
15/11/02 01:41:00 (6 years ago)
Author:
Gildas Bazin <gbazin@videolan.org>
git-committer:
Gildas Bazin <gbazin@videolan.org> 1037320860 +0000
git-parent:

[fc6ea05000777594b7895069f693ffe6265328f7]

git-author:
Gildas Bazin <gbazin@videolan.org> 1037320860 +0000
Message:

* modules/codec/vorbis.c, modules/audio_filter/resampler/linear.c: adapted to

the new changes in aout3.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/audio_filter/resampler/linear.c

    rc0e8ae0 r42c7869  
    33 ***************************************************************************** 
    44 * Copyright (C) 2002 VideoLAN 
    5  * $Id: linear.c,v 1.4 2002/11/11 22:27:01 gbazin Exp $ 
     5 * $Id: linear.c,v 1.5 2002/11/15 00:41:00 gbazin Exp $ 
    66 * 
    77 * Authors: Gildas Bazin <gbazin@netcourrier.com> 
    …… 
    7171    if ( p_filter->input.i_rate == p_filter->output.i_rate 
    7272          || p_filter->input.i_format != p_filter->output.i_format 
    73           || p_filter->input.i_channels != p_filter->output.i_channels 
     73          || p_filter->input.i_physical_channels 
     74              != p_filter->output.i_physical_channels 
     75          || p_filter->input.i_original_channels 
     76              != p_filter->output.i_original_channels 
    7477          || p_filter->input.i_format != VLC_FOURCC('f','l','3','2') ) 
    7578    { 
    …… 
    8487        return VLC_ENOMEM; 
    8588    } 
    86     p_filter->p_sys->p_prev_sample = malloc( p_filter->input.i_channels 
    87                         * sizeof(int32_t) ); 
     89    p_filter->p_sys->p_prev_sample = malloc( 
     90        p_filter->input.i_physical_channels * sizeof(int32_t) ); 
    8891    if( p_filter->p_sys->p_prev_sample == NULL ) 
    8992    { 

  • modules/codec/vorbis.c

    r8928554 r42c7869  
    33 ***************************************************************************** 
    44 * Copyright (C) 1999-2001 VideoLAN 
    5  * $Id: vorbis.c,v 1.5 2002/11/14 22:38:47 massiot Exp $ 
     5 * $Id: vorbis.c,v 1.6 2002/11/15 00:41:00 gbazin Exp $ 
    66 * 
    77 * Authors: Gildas Bazin <gbazin@netcourrier.com> 
    …… 
    8080    AOUT_CHAN_CENTER,   AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT, 
    8181    AOUT_CHAN_CENTER | AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT, 
    82     AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT, 
     82    AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT 
     83     | AOUT_CHAN_REARRIGHT, 
    8384    AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER 
    8485     | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT 
    …… 
    185186 
    186187    p_dec->output_format.i_format = VLC_FOURCC('f','l','3','2'); 
    187     p_dec->output_format.i_channels = pi_channels_maps[p_dec->vi.channels]; 
     188    p_dec->output_format.i_physical_channels = 
     189        p_dec->output_format.i_original_channels = 
     190            pi_channels_maps[p_dec->vi.channels]; 
    188191    p_dec->output_format.i_rate = p_dec->vi.rate; 
    189192