[FFmpeg-cvslog] r14331 - in trunk/libavcodec: h264.c h264.h
michael
subversion
Tue Jul 22 00:19:06 CEST 2008
Author: michael
Date: Tue Jul 22 00:19:06 2008
New Revision: 14331
Log:
Loop filtering with multiple slice types fix.
Fixes at least:
CABAST3_Sony_E.jsv
CABASTBR3_Sony_A.jsv
CABASTBR3_Sony_B.jsv
Modified:
trunk/libavcodec/h264.c
trunk/libavcodec/h264.h
Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c (original)
+++ trunk/libavcodec/h264.c Tue Jul 22 00:19:06 2008
@@ -4161,15 +4161,6 @@ static int decode_slice_header(H264Conte
if(FRAME_MBAFF)
fill_mbaff_ref_list(h);
- h->ref2frm[1][0]= h->ref2frm[1][1]= -1;
- for(j=0; j<2; j++){
- h->ref2frm[j][ 0]=
- h->ref2frm[j][ 1]= -1;
- for(i=0; i<48; i++)
- h->ref2frm[j][i+2]= 4*h->ref_list[j][i].frame_num
- +(h->ref_list[j][i].reference&3);
- }
-
if( h->slice_type_nos != FF_I_TYPE && h->pps.cabac ){
tmp = get_ue_golomb(&s->gb);
if(tmp > 2){
@@ -4245,6 +4236,15 @@ static int decode_slice_header(H264Conte
h0->last_slice_type = slice_type;
h->slice_num = ++h0->current_slice;
+ for(j=0; j<2; j++){
+ int *ref2frm= h->ref2frm[h->slice_num&15][j];
+ ref2frm[0]=
+ ref2frm[1]= -1;
+ for(i=0; i<48; i++)
+ ref2frm[i+2]= 4*h->ref_list[j][i].frame_num
+ +(h->ref_list[j][i].reference&3);
+ }
+
h->emu_edge_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16;
h->emu_edge_height= (FRAME_MBAFF || FIELD_PICTURE) ? 0 : h->emu_edge_width;
@@ -6627,6 +6627,8 @@ static void filter_mb( H264Context *h, i
int edge;
const int mbm_xy = dir == 0 ? mb_xy -1 : h->top_mb_xy;
const int mbm_type = s->current_picture.mb_type[mbm_xy];
+ int (*ref2frm) [48+2] = h->ref2frm[ h->slice_num &15 ];
+ int (*ref2frmm)[48+2] = h->ref2frm[ h->slice_table[mbm_xy]&15 ];
int start = h->slice_table[mbm_xy] == 255 ? 1 : 0;
const int edges = (mb_type & (MB_TYPE_16x16|MB_TYPE_SKIP))
@@ -6695,6 +6697,7 @@ static void filter_mb( H264Context *h, i
/* mbn_xy: neighbor macroblock */
const int mbn_xy = edge > 0 ? mb_xy : mbm_xy;
const int mbn_type = s->current_picture.mb_type[mbn_xy];
+ int (*ref2frmn)[48+2] = edge > 0 ? ref2frm : ref2frmm;
int16_t bS[4];
int qp;
@@ -6732,11 +6735,11 @@ static void filter_mb( H264Context *h, i
int b_idx= 8 + 4 + edge * (dir ? 8:1);
int bn_idx= b_idx - (dir ? 8:1);
int v = 0;
- int xn= h->slice_type_nos == FF_B_TYPE && h->ref2frm[0][h->ref_cache[0][b_idx]+2] != h->ref2frm[0][h->ref_cache[0][bn_idx]+2];
+ int xn= h->slice_type_nos == FF_B_TYPE && ref2frm[0][h->ref_cache[0][b_idx]+2] != ref2frmn[0][h->ref_cache[0][bn_idx]+2];
for( l = 0; !v && l < 1 + (h->slice_type_nos == FF_B_TYPE); l++ ) {
int ln= l^xn;
- v |= h->ref2frm[l][h->ref_cache[l][b_idx]+2] != h->ref2frm[ln][h->ref_cache[ln][bn_idx]+2] ||
+ v |= ref2frm[l][h->ref_cache[l][b_idx]+2] != ref2frmn[ln][h->ref_cache[ln][bn_idx]+2] ||
FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[ln][bn_idx][0] ) >= 4 ||
FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[ln][bn_idx][1] ) >= mvy_limit;
}
@@ -6758,11 +6761,11 @@ static void filter_mb( H264Context *h, i
}
else if(!mv_done)
{
- int xn= h->slice_type_nos == FF_B_TYPE && h->ref2frm[0][h->ref_cache[0][b_idx]+2] != h->ref2frm[0][h->ref_cache[0][bn_idx]+2];
+ int xn= h->slice_type_nos == FF_B_TYPE && ref2frm[0][h->ref_cache[0][b_idx]+2] != ref2frmn[0][h->ref_cache[0][bn_idx]+2];
bS[i] = 0;
for( l = 0; l < 1 + (h->slice_type_nos == FF_B_TYPE); l++ ) {
int ln= l^xn;
- if( h->ref2frm[l][h->ref_cache[l][b_idx]+2] != h->ref2frm[ln][h->ref_cache[ln][bn_idx]+2] ||
+ if( ref2frm[l][h->ref_cache[l][b_idx]+2] != ref2frmn[ln][h->ref_cache[ln][bn_idx]+2] ||
FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[ln][bn_idx][0] ) >= 4 ||
FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[ln][bn_idx][1] ) >= mvy_limit ) {
bS[i] = 1;
Modified: trunk/libavcodec/h264.h
==============================================================================
--- trunk/libavcodec/h264.h (original)
+++ trunk/libavcodec/h264.h Tue Jul 22 00:19:06 2008
@@ -337,7 +337,7 @@ typedef struct H264Context{
Picture ref_list[2][48]; /**< 0..15: frame refs, 16..47: mbaff field refs.
Reordered version of default_ref_list
according to picture reordering in slice header */
- int ref2frm[2][48+2]; ///< reference to frame number lists, used in the loop filter, the first 2 are for -2,-1
+ int ref2frm[16][2][48+2]; ///< reference to frame number lists, used in the loop filter, the first 2 are for -2,-1
Picture *delayed_pic[MAX_DELAYED_PIC_COUNT+2]; //FIXME size?
int outputed_poc;
More information about the ffmpeg-cvslog
mailing list