From b928ec649c6f836858dedd3a62909a31af20430a Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 20 Aug 2003 07:35:23 +0000
Subject: [PATCH] fixing chroma MC minor cleanup postprocessing support
Originally committed as revision 2128 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/vp3.c | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 573e9180688..5ff6f9e279b 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -288,6 +288,7 @@ typedef struct Vp3DecodeContext {
int last_coded_c_fragment;
uint8_t edge_emu_buffer[9*2048]; //FIXME dynamic alloc
+ uint8_t qscale_table[2048]; //FIXME dynamic alloc (width+15)/16
} Vp3DecodeContext;
/************************************************************************
@@ -1186,6 +1187,8 @@ static void init_dequantizer(Vp3DecodeContext *s)
s->inter_dequant[j] = MIN_DEQUANT_VAL * 2;
s->inter_dequant[j] *= SCALER;
}
+
+ memset(s->qscale_table, (FFMAX(s->intra_y_dequant[1], s->intra_c_dequant[1])+8)/16, 512); //FIXME finetune
/* print debug information as requested */
debug_dequantizers("intra Y dequantizers:\n");
@@ -2403,29 +2406,22 @@ static void render_fragments(Vp3DecodeContext *s,
int src_x, src_y;
motion_x = s->all_fragments[i].motion_x;
motion_y = s->all_fragments[i].motion_y;
+ if(plane){
+ motion_x= (motion_x>>1) | (motion_x&1);
+ motion_y= (motion_y>>1) | (motion_y&1);
+ }
+
src_x= (motion_x>>1) + x;
src_y= (motion_y>>1) + y;
if ((motion_x == 0xbeef) || (motion_y == 0xbeef))
printf (" help! got beefy vector! (%X, %X)\n", motion_x, motion_y);
- if (motion_x >= 0) {
- motion_halfpel_index = motion_x & 0x01;
- motion_source += (motion_x >> 1);
- } else {
- motion_x = -motion_x;
- motion_halfpel_index = motion_x & 0x01;
- motion_source -= ((motion_x + 1) >> 1);
- }
+ motion_halfpel_index = motion_x & 0x01;
+ motion_source += (motion_x >> 1);
// motion_y = -motion_y;
- if (motion_y >= 0) {
- motion_halfpel_index |= (motion_y & 0x01) << 1;
- motion_source += ((motion_y >> 1) * stride);
- } else {
- motion_y = -motion_y;
- motion_halfpel_index |= (motion_y & 0x01) << 1;
- motion_source -= (((motion_y + 1) >> 1) * stride);
- }
+ motion_halfpel_index |= (motion_y & 0x01) << 1;
+ motion_source += ((motion_y >> 1) * stride);
if(src_x<0 || src_y<0 || src_x + 9 >= width || src_y + 9 >= height){
uint8_t *temp= s->edge_emu_buffer;
@@ -2735,6 +2731,9 @@ static int vp3_decode_frame(AVCodecContext *avctx,
}
}
+ s->current_frame.qscale_table= s->qscale_table; //FIXME allocate individual tables per AVFrame
+ s->current_frame.qstride= 0;
+
init_frame(s, &gb);
#if KEYFRAMES_ONLY
--
GitLab