diff vp56.c @ 11053:c57e72227d7d libavcodec

Make VP5 and VP6 decoders output a qscale table to allow for more automatic post-processing, and add a new FF_QSCALE_TYPE_VP56 for this.
author reimar
date Fri, 29 Jan 2010 19:11:47 +0000
parents 170c9ce34d14
children 8d23ea397dda
line wrap: on
line diff
--- a/vp56.c	Fri Jan 29 16:49:06 2010 +0000
+++ b/vp56.c	Fri Jan 29 19:11:47 2010 +0000
@@ -33,6 +33,7 @@
     s->quantizer = quantizer;
     s->dequant_dc = vp56_dc_dequant[quantizer] << 2;
     s->dequant_ac = vp56_ac_dequant[quantizer] << 2;
+    memset(s->qscale_table, quantizer, s->mb_width);
 }
 
 static int vp56_get_vectors_predictors(VP56Context *s, int row, int col,
@@ -481,6 +482,7 @@
         return -1;
     }
 
+    s->qscale_table = av_realloc(s->qscale_table, s->mb_width);
     s->above_blocks = av_realloc(s->above_blocks,
                                  (4*s->mb_width+6) * sizeof(*s->above_blocks));
     s->macroblocks = av_realloc(s->macroblocks,
@@ -643,6 +645,9 @@
     FFSWAP(AVFrame *, s->framep[VP56_FRAME_CURRENT],
                       s->framep[VP56_FRAME_PREVIOUS]);
 
+    p->qstride = 0;
+    p->qscale_table = s->qscale_table;
+    p->qscale_type = FF_QSCALE_TYPE_VP56;
     *(AVFrame*)data = *p;
     *data_size = sizeof(AVFrame);
 
@@ -691,6 +696,7 @@
 {
     VP56Context *s = avctx->priv_data;
 
+    av_freep(&s->qscale_table);
     av_freep(&s->above_blocks);
     av_freep(&s->macroblocks);
     av_freep(&s->edge_emu_buffer_alloc);