aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-09-12 22:26:26 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-09-12 22:26:26 +0000
commitc3922c65b596b1f55ff3c2778843590b5974ea4d (patch)
treecdc2c953cd1e3385c331bdabb1e388310049e932
parentaaac6c29d215dc4f36d7bec8e88466f83a234b5e (diff)
downloadffmpeg-c3922c65b596b1f55ff3c2778843590b5974ea4d.tar.gz
make intra dc prediction less contradictory
Originally committed as revision 10482 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--doc/snow.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/snow.txt b/doc/snow.txt
index a734776e25..ccea56e618 100644
--- a/doc/snow.txt
+++ b/doc/snow.txt
@@ -96,9 +96,9 @@ prediction:
block(0)
block(level):
+ mvx_diff=mvy_diff=y_diff=cb_diff=cr_diff=0
if(keyframe){
intra=1
- y_diff=cb_diff=cr_diff=0
}else{
if(level!=max_block_depth){
s_context= 2*left->level + 2*top->level + topleft->level + topright->level
@@ -333,9 +333,9 @@ the luma and chroma values of the left block are used as predictors
the used luma and chroma is the sum of the predictor and y_diff, cb_diff, cr_diff
to reverse this in the decoder apply the following:
-block[y][x].dc[0] += block[y][x-1].dc[0];
-block[y][x].dc[1] += block[y][x-1].dc[1];
-block[y][x].dc[2] += block[y][x-1].dc[2];
+block[y][x].dc[0] = block[y][x-1].dc[0] + y_diff;
+block[y][x].dc[1] = block[y][x-1].dc[1] + cb_diff;
+block[y][x].dc[2] = block[y][x-1].dc[2] + cr_diff;
block[*][-1].dc[*]= 128;