Author: conrad Date: Mon Nov 10 04:11:47 2008 New Revision: 3787 Log: This is a 9,7 wavelet not a 9,5 Modified: dirac/libavcodec/dirac_wavelet.c dirac/libavcodec/dirac_wavelet.h dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/dirac_wavelet.c ============================================================================== --- dirac/libavcodec/dirac_wavelet.c (original) +++ dirac/libavcodec/dirac_wavelet.c Mon Nov 10 04:11:47 2008 @@ -337,13 +337,13 @@ STOP_TIMER("dwt53") /** - * IDWT transform (9,5) for a specific subband + * IDWT transform (9,7) for a specific subband * * @param data coefficients to transform * @param level level of the current transform * @return 0 when successful, otherwise -1 is returned */ -int dirac_subband_idwt_95(AVCodecContext *avctx, int width, int height, +int dirac_subband_idwt_97(AVCodecContext *avctx, int width, int height, int padded_width, int16_t *data, int16_t *synth, int level) { int16_t *synthline; @@ -466,13 +466,13 @@ STOP_TIMER("idwt95") } /** - * DWT transform (9,5) for a specific subband + * DWT transform (9,7) for a specific subband * * @param data coefficients to transform * @param level level of the current transform * @return 0 when successful, otherwise -1 is returned */ -int dirac_subband_dwt_95(AVCodecContext *avctx, int width, int height, +int dirac_subband_dwt_97(AVCodecContext *avctx, int width, int height, int padded_width, int16_t *data, int level) { int16_t *synth, *synthline, *dataline; Modified: dirac/libavcodec/dirac_wavelet.h ============================================================================== --- dirac/libavcodec/dirac_wavelet.h (original) +++ dirac/libavcodec/dirac_wavelet.h Mon Nov 10 04:11:47 2008 @@ -34,14 +34,14 @@ int dirac_subband_idwt_53(AVCodecContext int padded_width, int16_t *data, int16_t *synth, int level); -int dirac_subband_idwt_95(AVCodecContext *avctx, int width, int height, +int dirac_subband_idwt_97(AVCodecContext *avctx, int width, int height, int padded_width, int16_t *data, int16_t *synth, int level); int dirac_subband_dwt_53(AVCodecContext *avctx, int width, int height, int padded_width, int16_t *data, int level); -int dirac_subband_dwt_95(AVCodecContext *avctx, int width, int height, +int dirac_subband_dwt_97(AVCodecContext *avctx, int width, int height, int padded_width, int16_t *data, int level); #endif /* AVCODEC_DIRACWAVELET_H */ Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c (original) +++ dirac/libavcodec/diracdec.c Mon Nov 10 04:11:47 2008 @@ -794,8 +794,8 @@ int dirac_idwt(DiracContext *s, int16_t switch(s->wavelet_idx) { case 0: - dprintf(s->avctx, "Deslauriers-Debuc (9,5) IDWT\n"); - dirac_subband_idwt_95(s->avctx, width, height, s->padded_width, + dprintf(s->avctx, "Deslauriers-Debuc (9,7) IDWT\n"); + dirac_subband_idwt_97(s->avctx, width, height, s->padded_width, coeffs, synth, level); break; case 1: