RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixing chroma MC 

minor cleanup
postprocessing support

Originally committed as revision 2128 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2003-08-20 07:35:23 +00:00
parent a2f11b3c3a
commit b928ec649c
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libavcodec/vp3.c
View File

@ -288,6 +288,7 @@ typedef struct Vp3DecodeContext {
int last_coded_c_fragment; int last_coded_c_fragment;
uint8_t edge_emu_buffer[9*2048]; //FIXME dynamic alloc uint8_t edge_emu_buffer[9*2048]; //FIXME dynamic alloc
uint8_t qscale_table[2048]; //FIXME dynamic alloc (width+15)/16
} Vp3DecodeContext; } Vp3DecodeContext;
/************************************************************************ /************************************************************************
@ -1187,6 +1188,8 @@ static void init_dequantizer(Vp3DecodeContext *s)
s->inter_dequant[j] *= SCALER; 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 */ /* print debug information as requested */
debug_dequantizers("intra Y dequantizers:\n"); debug_dequantizers("intra Y dequantizers:\n");
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
@ -2403,29 +2406,22 @@ static void render_fragments(Vp3DecodeContext *s,
int src_x, src_y; int src_x, src_y;
motion_x = s->all_fragments[i].motion_x; motion_x = s->all_fragments[i].motion_x;
motion_y = s->all_fragments[i].motion_y; 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_x= (motion_x>>1) + x;
src_y= (motion_y>>1) + y; src_y= (motion_y>>1) + y;
if ((motion_x == 0xbeef) || (motion_y == 0xbeef)) if ((motion_x == 0xbeef) || (motion_y == 0xbeef))
printf (" help! got beefy vector! (%X, %X)\n", motion_x, motion_y); printf (" help! got beefy vector! (%X, %X)\n", motion_x, motion_y);
if (motion_x >= 0) { motion_halfpel_index = motion_x & 0x01;
motion_halfpel_index = motion_x & 0x01; motion_source += (motion_x >> 1);
motion_source += (motion_x >> 1);
} else {
motion_x = -motion_x;
motion_halfpel_index = motion_x & 0x01;
motion_source -= ((motion_x + 1) >> 1);
}
// motion_y = -motion_y; // motion_y = -motion_y;
if (motion_y >= 0) { motion_halfpel_index |= (motion_y & 0x01) << 1;
motion_halfpel_index |= (motion_y & 0x01) << 1; motion_source += ((motion_y >> 1) * stride);
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);
}
if(src_x<0 || src_y<0 || src_x + 9 >= width || src_y + 9 >= height){ if(src_x<0 || src_y<0 || src_x + 9 >= width || src_y + 9 >= height){
uint8_t *temp= s->edge_emu_buffer; 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); init_frame(s, &gb);
#if KEYFRAMES_ONLY #if KEYFRAMES_ONLY