On Tue, May 17, 2011 at 03:54:46PM +0100, Måns Rullgård wrote: > Diego Biurrun <[email protected]> writes: > > > On Tue, May 17, 2011 at 02:45:42PM +0100, Mans Rullgard wrote: > >> This adds a _fixed suffix to the fixed-point versions of things > >> with both float and fixed-point variants. This makes it more > >> consistent with other dual-implementation things, e.g. fft. > >> > >> --- a/libavcodec/mpc.c > >> +++ b/libavcodec/mpc.c > >> @@ -51,8 +51,8 @@ static void mpc_synth(MPCContext *c, int16_t *out, int > >> channels) > >> for(i = 0; i < SAMPLES_PER_BAND; i++) { > >> - ff_mpa_synth_filter(c->synth_buf[ch], > >> &(c->synth_buf_offset[ch]), > >> - ff_mpa_synth_window, &dither_state, > >> + ff_mpa_synth_filter_fixed(c->synth_buf[ch], > >> &(c->synth_buf_offset[ch]), > >> + ff_mpa_synth_window_fixed, &dither_state, > >> samples_ptr, channels, > >> c->sb_samples[ch][i]); > >> samples_ptr += 32 * channels; > >> --- a/libavcodec/mpegaudio.h > >> +++ b/libavcodec/mpegaudio.h > >> @@ -158,9 +158,9 @@ typedef struct HuffTable { > >> > >> int ff_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int > >> *sample_rate, int *channels, int *frame_size, int *bitrate); > >> -extern MPA_INT ff_mpa_synth_window[]; > >> -void ff_mpa_synth_init(MPA_INT *window); > >> -void ff_mpa_synth_filter(MPA_INT *synth_buf_ptr, int *synth_buf_offset, > >> +extern MPA_INT ff_mpa_synth_window_fixed[]; > >> +void ff_mpa_synth_init_fixed(MPA_INT *window); > >> +void ff_mpa_synth_filter_fixed(MPA_INT *synth_buf_ptr, int > >> *synth_buf_offset, > >> MPA_INT *window, int *dither_state, > >> OUT_INT *samples, int incr, > >> INTFLOAT sb_samples[SBLIMIT]); > >> --- a/libavcodec/mpegaudiodec.c > >> +++ b/libavcodec/mpegaudiodec.c > >> @@ -621,7 +621,7 @@ static void apply_window_mp3_c(MPA_INT *synth_buf, > >> MPA_INT *window, > >> #if !CONFIG_FLOAT > >> -void ff_mpa_synth_filter(MPA_INT *synth_buf_ptr, int *synth_buf_offset, > >> +void ff_mpa_synth_filter_fixed(MPA_INT *synth_buf_ptr, int > >> *synth_buf_offset, > >> MPA_INT *window, int *dither_state, > >> OUT_INT *samples, int incr, > >> INTFLOAT sb_samples[SBLIMIT]) > >> --- a/libavcodec/qdm2.c > >> +++ b/libavcodec/qdm2.c > >> @@ -1616,8 +1616,8 @@ static void qdm2_synthesis_filter (QDM2Context *q, > >> int index) > >> > >> for (i = 0; i < 8; i++) { > >> - ff_mpa_synth_filter(q->synth_buf[ch], > >> &(q->synth_buf_offset[ch]), > >> - ff_mpa_synth_window, &dither_state, > >> + ff_mpa_synth_filter_fixed(q->synth_buf[ch], > >> &(q->synth_buf_offset[ch]), > >> + ff_mpa_synth_window_fixed, &dither_state, > >> samples_ptr, q->nb_channels, > >> q->sb_samples[ch][(8 * index) + i]); > >> samples_ptr += 32 * q->nb_channels; > > > > This leaves behind messed-up indentation. I would suggest fixing it in > > one go. > > I'll be making more changes here shortly and didn't think it worthwhile > to fix it up between each. The indentation isn't really wrong, just a > bit inconsistent.
OK in that case - I just don't want it to be forgotten and left in this state. Diego _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
