Save coded block patterns for future loop filtering.

Originally committed as revision 11554 to svn://svn.ffmpeg.org/ffmpeg/trunk

2 files changed, 10 insertions, 0 deletions

diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index ac67fb9c20..dbbe445c96 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -1012,6 +1012,8 @@ static int rv34_decode_macroblock(RV34DecContext *r, int8_t *intra_types)
 
     s->qscale = r->si.quant;
     cbp = cbp2 = rv34_decode_mb_header(r, intra_types);
+    r->cbp_luma  [s->mb_x + s->mb_y * s->mb_stride] = cbp;
+    r->cbp_chroma[s->mb_x + s->mb_y * s->mb_stride] = cbp >> 16;
 
     if(cbp == -1)
         return -1;
@@ -1101,6 +1103,8 @@ static int rv34_decode_slice(RV34DecContext *r, int end, uint8_t* buf, int buf_s
             r->intra_types_hist = av_realloc(r->intra_types_hist, s->b4_stride * 4 * 2 * sizeof(*r->intra_types_hist));
             r->intra_types = r->intra_types_hist + s->b4_stride * 4;
             r->mb_type = av_realloc(r->mb_type, r->s.mb_stride * r->s.mb_height * sizeof(*r->mb_type));
+            r->cbp_luma   = av_realloc(r->cbp_luma,   r->s.mb_stride * r->s.mb_height * sizeof(*r->cbp_luma));
+            r->cbp_chroma = av_realloc(r->cbp_chroma, r->s.mb_stride * r->s.mb_height * sizeof(*r->cbp_chroma));
         }
         s->pict_type = r->si.type ? r->si.type : I_TYPE;
         if(MPV_frame_start(s, s->avctx) < 0)
@@ -1188,6 +1192,9 @@ int ff_rv34_decode_init(AVCodecContext *avctx)
 
     r->mb_type = av_mallocz(r->s.mb_stride * r->s.mb_height * sizeof(*r->mb_type));
 
+    r->cbp_luma   = av_malloc(r->s.mb_stride * r->s.mb_height * sizeof(*r->cbp_luma));
+    r->cbp_chroma = av_malloc(r->s.mb_stride * r->s.mb_height * sizeof(*r->cbp_chroma));
+
     if(!intra_vlcs[0].cbppattern[0].bits)
         rv34_init_tables();
 
diff --git a/libavcodec/rv34.h b/libavcodec/rv34.h
index 0aa5911d5c..0cb76de707 100644
--- a/libavcodec/rv34.h
+++ b/libavcodec/rv34.h
@@ -99,6 +99,9 @@ typedef struct RV34DecContext{
     int rv30;                ///< indicates which RV variasnt is currently decoded
     int rpr;                 ///< one field size in RV30 slice header
 
+    uint16_t *cbp_luma;      ///< CBP values for luma subblocks
+    uint8_t  *cbp_chroma;    ///< CBP values for chroma subblocks
+
     /** 8x8 block available flags (for MV prediction) */
     DECLARE_ALIGNED_8(uint32_t, avail_cache[3*4]);