[FFmpeg-soc] [soc]: r690 - dirac/libavcodec/dirac.c
marco
subversion at mplayerhq.hu
Sat Aug 11 20:49:12 CEST 2007
Author: marco
Date: Sat Aug 11 20:49:12 2007
New Revision: 690
Log:
merge two loops back in, the generic code can handle these
Modified:
dirac/libavcodec/dirac.c
Modified: dirac/libavcodec/dirac.c
==============================================================================
--- dirac/libavcodec/dirac.c (original)
+++ dirac/libavcodec/dirac.c Sat Aug 11 20:49:12 2007
@@ -1696,10 +1696,7 @@ static int dirac_subband_idwt_53(AVCodec
/* Horizontal synthesis. */
for (y = 0; y < synth_height; y++) {
/* Lifting stage 1. */
- synth[POS(0, y)] -= ( synth[POS(1, y)]
- + synth[POS(1, y)]
- + 2) >> 2;
- for (x = 1; x < width - 1; x++) {
+ for (x = 1; x < width; x++) {
synth[POS(2*x, y)] -= ( synth[POS(2*x - 1, y)]
+ synth[POS(2*x + 1, y)]
+ 2) >> 2;
@@ -1708,11 +1705,8 @@ static int dirac_subband_idwt_53(AVCodec
+ synth[POS(synth_width - 1, y)]
+ 2) >> 2;
- synth[POS(1, y)] += ( synth[HSYNTH_ODD_POS(0, y)]
- + synth[POS(2, y)]
- + 1) >> 1;
/* Lifting stage 2. */
- for (x = 1; x < width - 1; x++) {
+ for (x = 1; x < width; x++) {
synth[POS(2*x + 1, y)] += ( synth[POS(2*x, y)]
+ synth[POS(2*x + 2, y)]
+ 1) >> 1;
More information about the FFmpeg-soc
mailing list