Changeset f5623dec1ca290e9adcbbc34ba4fe3f03a4c2e69

Show
Ignore:
Timestamp:
06/22/08 19:20:45 (3 months ago)
Author:
Antoine Cellerier <dionoea@videolan.org>
git-committer:
Antoine Cellerier <dionoea@videolan.org> 1214155245 +0200
git-parent:

[b4a4b564cda53b03aebf818dd2db65709602c68b]

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

Finish fixing audio rate changes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/stream_out/transcode.c

    rb4a4b56 rf5623de  
    11531153    id->p_encoder->fmt_in.audio.i_format = id->p_decoder->fmt_out.i_codec; 
    11541154 
    1155     id->p_encoder->fmt_in.audio.i_rate = id->p_encoder->fmt_out.audio.i_rate; 
     1155    id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate;//id->p_encoder->fmt_out.audio.i_rate; 
    11561156    id->p_encoder->fmt_in.audio.i_physical_channels = 
    11571157        id->p_encoder->fmt_out.audio.i_physical_channels; 
    …… 
    11891189    { 
    11901190        /* We'll have to go through fl32 first */ 
    1191         es_format_t fmt_out = id->p_encoder->fmt_in; 
    1192         fmt_out.i_codec = fmt_out.audio.i_format = VLC_FOURCC('f','l','3','2'); 
    1193         filter_chain_AppendFilter( id->p_f_chain, NULL, NULL, &fmt_last, &fmt_out ); 
    1194         fmt_last = fmt_out; 
     1191        fmt_last.i_codec = fmt_last.audio.i_format = VLC_FOURCC('f','l','3','2'); 
     1192        fmt_last.audio.i_bitspersample = aout_BitsPerSample( fmt_last.i_codec ); 
     1193        filter_chain_AppendFilter( id->p_f_chain, NULL, NULL, NULL, &fmt_last ); 
     1194        fmt_last = *filter_chain_GetFmtOut( id->p_f_chain ); 
    11951195    } 
    11961196