Mercurial > libavcodec.hg

comparison h264.c @ 10907:2d82b73b12ef libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Split fill_caches() between filter and decoder.
author michael
date Sun, 17 Jan 2010 21:43:08 +0000
parents 1b5fba731e24
children 7cecaa3a6b38
comparison
equal deleted inserted replaced
10906:1b5fba731e24 10907:2d82b73b12ef
1285 if(h->cbp || IS_INTRA(mb_type)) 1285 if(h->cbp || IS_INTRA(mb_type))
1286 s->dsp.clear_blocks(h->mb); 1286 s->dsp.clear_blocks(h->mb);
1287 1287
1288 if(h->deblocking_filter && 0) { 1288 if(h->deblocking_filter && 0) {
1289 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, simple); 1289 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, simple);
1290 fill_caches(h, mb_type, 1); //FIXME don't fill stuff which isn't used by filter_mb 1290 fill_filter_caches(h, mb_type); //FIXME don't fill stuff which isn't used by filter_mb
1291 h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy]); 1291 h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy]);
1292 h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.qscale_table[mb_xy]); 1292 h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.qscale_table[mb_xy]);
1293 if (!simple && FRAME_MBAFF) { 1293 if (!simple && FRAME_MBAFF) {
1294 ff_h264_filter_mb (h, mb_x, mb_y, dest_y, dest_cb, dest_cr, linesize, uvlinesize); 1294 ff_h264_filter_mb (h, mb_x, mb_y, dest_y, dest_cb, dest_cr, linesize, uvlinesize);
1295 } else { 1295 } else {
2182 } else { 2182 } else {
2183 linesize = h->mb_linesize = s->linesize; 2183 linesize = h->mb_linesize = s->linesize;
2184 uvlinesize = h->mb_uvlinesize = s->uvlinesize; 2184 uvlinesize = h->mb_uvlinesize = s->uvlinesize;
2185 } 2185 }
2186 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, !is_complex); 2186 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, !is_complex);
2187 fill_caches(h, mb_type, 1); //FIXME don't fill stuff which isn't used by filter_mb 2187 fill_filter_caches(h, mb_type); //FIXME don't fill stuff which isn't used by filter_mb
2188 h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy]); 2188 h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy]);
2189 h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.qscale_table[mb_xy]); 2189 h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.qscale_table[mb_xy]);
2190 2190
2191 if (is_complex && FRAME_MBAFF) { 2191 if (is_complex && FRAME_MBAFF) {
2192 ff_h264_filter_mb (h, mb_x, mb_y, dest_y, dest_cb, dest_cr, linesize, uvlinesize); 2192 ff_h264_filter_mb (h, mb_x, mb_y, dest_y, dest_cb, dest_cr, linesize, uvlinesize);