Skip to content

F
ffmpeg-mt
Commit 4b3a14d4 authored by michael's avatar michael
Browse files
Options

H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org) 

3 more streams of the conformance suite decode to the
end instead of failing on an assert (CABACI3_Sony_B.jsv,
CABAST3_Sony_E.jsv and CABASTBR3_Sony_B.jsv), they are still false since
the first B slice probably because of deblocking in B slices not yet
implemented.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@3932 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 7687e27e
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 20 deletions
libavcodec/h264.c
View file @ 4b3a14d4
...@@ -3477,23 +3477,30 @@ static int decode_slice_header(H264Context *h){ ...@@ -3477,23 +3477,30 @@ static int decode_slice_header(H264Context *h){
int first_mb_in_slice, pps_id; int first_mb_in_slice, pps_id;
int num_ref_idx_active_override_flag; int num_ref_idx_active_override_flag;
static const uint8_t slice_type_map[5]= {P_TYPE, B_TYPE, I_TYPE, SP_TYPE, SI_TYPE}; static const uint8_t slice_type_map[5]= {P_TYPE, B_TYPE, I_TYPE, SP_TYPE, SI_TYPE};
int slice_type;
int default_ref_list_done = 0;
s->current_picture.reference= h->nal_ref_idc != 0; s->current_picture.reference= h->nal_ref_idc != 0;
first_mb_in_slice= get_ue_golomb(&s->gb); first_mb_in_slice= get_ue_golomb(&s->gb);
h->slice_type= get_ue_golomb(&s->gb); slice_type= get_ue_golomb(&s->gb);
if(h->slice_type > 9){ if(slice_type > 9){
av_log(h->s.avctx, AV_LOG_ERROR, "slice type too large (%d) at %d %d\n", h->slice_type, s->mb_x, s->mb_y); av_log(h->s.avctx, AV_LOG_ERROR, "slice type too large (%d) at %d %d\n", h->slice_type, s->mb_x, s->mb_y);
return -1; return -1;
} }
if(h->slice_type > 4){ if(slice_type > 4){
h->slice_type -= 5; slice_type -= 5;
h->slice_type_fixed=1; h->slice_type_fixed=1;
}else }else
h->slice_type_fixed=0; h->slice_type_fixed=0;
h->slice_type= slice_type_map[ h->slice_type ]; slice_type= slice_type_map[ slice_type ];
if (slice_type == I_TYPE
|| (h->slice_num != 0 && slice_type == h->slice_type) ) {
default_ref_list_done = 1;
}
h->slice_type= slice_type;
s->pict_type= h->slice_type; // to make a few old func happy, its wrong though s->pict_type= h->slice_type; // to make a few old func happy, its wrong though
...@@ -3623,7 +3630,7 @@ static int decode_slice_header(H264Context *h){ ...@@ -3623,7 +3630,7 @@ static int decode_slice_header(H264Context *h){
} }
} }
if(h->slice_num == 0){ if(!default_ref_list_done){
fill_default_ref_list(h); fill_default_ref_list(h);
} }
...@@ -4342,10 +4349,12 @@ static int decode_cabac_intra_mb_type(H264Context *h, int ctx_base, int intra_sl ...@@ -4342,10 +4349,12 @@ static int decode_cabac_intra_mb_type(H264Context *h, int ctx_base, int intra_sl
if(intra_slice){ if(intra_slice){
MpegEncContext * const s = &h->s; MpegEncContext * const s = &h->s;
const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
const int mba_xy = mb_xy - 1;
const int mbb_xy = mb_xy - s->mb_stride;
int ctx=0; int ctx=0;
if( s->mb_x > 0 && !IS_INTRA4x4( s->current_picture.mb_type[mb_xy-1] ) ) if( h->slice_table[mba_xy] == h->slice_num && !IS_INTRA4x4( s->current_picture.mb_type[mba_xy] ) )
ctx++; ctx++;
if( s->mb_y > 0 && !IS_INTRA4x4( s->current_picture.mb_type[mb_xy-s->mb_stride] ) ) if( h->slice_table[mbb_xy] == h->slice_num && !IS_INTRA4x4( s->current_picture.mb_type[mbb_xy] ) )
ctx++; ctx++;
if( get_cabac( &h->cabac, &state[ctx] ) == 0 ) if( get_cabac( &h->cabac, &state[ctx] ) == 0 )
return 0; /* I4x4 */ return 0; /* I4x4 */
...@@ -4399,14 +4408,16 @@ static int decode_cabac_mb_type( H264Context *h ) { ...@@ -4399,14 +4408,16 @@ static int decode_cabac_mb_type( H264Context *h ) {
} }
} else if( h->slice_type == B_TYPE ) { } else if( h->slice_type == B_TYPE ) {
const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
const int mba_xy = mb_xy - 1;
const int mbb_xy = mb_xy - s->mb_stride;
int ctx = 0; int ctx = 0;
int bits; int bits;
if( s->mb_x > 0 && !IS_SKIP( s->current_picture.mb_type[mb_xy-1] ) if( h->slice_table[mba_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mba_xy] )
&& !IS_DIRECT( s->current_picture.mb_type[mb_xy-1] ) ) && !IS_DIRECT( s->current_picture.mb_type[mba_xy] ) )
ctx++; ctx++;
if( s->mb_y > 0 && !IS_SKIP( s->current_picture.mb_type[mb_xy-s->mb_stride] ) if( h->slice_table[mbb_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mbb_xy] )
&& !IS_DIRECT( s->current_picture.mb_type[mb_xy-s->mb_stride] ) ) && !IS_DIRECT( s->current_picture.mb_type[mbb_xy] ) )
ctx++; ctx++;
if( !get_cabac( &h->cabac, &h->cabac_state[27+ctx] ) ) if( !get_cabac( &h->cabac, &h->cabac_state[27+ctx] ) )
...@@ -4444,9 +4455,9 @@ static int decode_cabac_mb_skip( H264Context *h) { ...@@ -4444,9 +4455,9 @@ static int decode_cabac_mb_skip( H264Context *h) {
const int mbb_xy = mb_xy - s->mb_stride; const int mbb_xy = mb_xy - s->mb_stride;
int ctx = 0; int ctx = 0;
if( s->mb_x > 0 && !IS_SKIP( s->current_picture.mb_type[mba_xy] ) ) if( h->slice_table[mba_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mba_xy] ))
ctx++; ctx++;
if( s->mb_y > 0 && !IS_SKIP( s->current_picture.mb_type[mbb_xy] ) ) if( h->slice_table[mbb_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mbb_xy] ))
ctx++; ctx++;
if( h->slice_type == P_TYPE || h->slice_type == SP_TYPE) if( h->slice_type == P_TYPE || h->slice_type == SP_TYPE)
...@@ -4482,10 +4493,10 @@ static int decode_cabac_mb_chroma_pre_mode( H264Context *h) { ...@@ -4482,10 +4493,10 @@ static int decode_cabac_mb_chroma_pre_mode( H264Context *h) {
int ctx = 0; int ctx = 0;
/* No need to test for IS_INTRA4x4 and IS_INTRA16x16, as we set chroma_pred_mode_table to 0 */ /* No need to test for IS_INTRA4x4 and IS_INTRA16x16, as we set chroma_pred_mode_table to 0 */
if( s->mb_x > 0 && h->chroma_pred_mode_table[mba_xy] != 0 ) if( h->slice_table[mba_xy] == h->slice_num && h->chroma_pred_mode_table[mba_xy] != 0 )
ctx++; ctx++;
if( s->mb_y > 0 && h->chroma_pred_mode_table[mbb_xy] != 0 ) if( h->slice_table[mbb_xy] == h->slice_num && h->chroma_pred_mode_table[mbb_xy] != 0 )
ctx++; ctx++;
if( get_cabac( &h->cabac, &h->cabac_state[64+ctx] ) == 0 ) if( get_cabac( &h->cabac, &h->cabac_state[64+ctx] ) == 0 )
...@@ -4532,13 +4543,21 @@ static int decode_cabac_mb_cbp_luma( H264Context *h) { ...@@ -4532,13 +4543,21 @@ static int decode_cabac_mb_cbp_luma( H264Context *h) {
if( x > 0 ) if( x > 0 )
mba_xy = mb_xy; mba_xy = mb_xy;
else if( s->mb_x > 0 ) else if( s->mb_x > 0 ) {
mba_xy = mb_xy - 1; mba_xy = mb_xy - 1;
if (h->slice_table[mba_xy] != h->slice_num) {
mba_xy = -1;
}
}
if( y > 0 ) if( y > 0 )
mbb_xy = mb_xy; mbb_xy = mb_xy;
else if( s->mb_y > 0 ) else if( s->mb_y > 0 ) {
mbb_xy = mb_xy - s->mb_stride; mbb_xy = mb_xy - s->mb_stride;
if (h->slice_table[mbb_xy] != h->slice_num) {
mbb_xy = -1;
}
}
/* No need to test for skip as we put 0 for skip block */ /* No need to test for skip as we put 0 for skip block */
if( mba_xy >= 0 ) { if( mba_xy >= 0 ) {
...@@ -4589,7 +4608,7 @@ static int decode_cabac_mb_dqp( H264Context *h) { ...@@ -4589,7 +4608,7 @@ static int decode_cabac_mb_dqp( H264Context *h) {
else else
mbn_xy = s->mb_width - 1 + (s->mb_y-1)*s->mb_stride; mbn_xy = s->mb_width - 1 + (s->mb_y-1)*s->mb_stride;
if( mbn_xy >= 0 && h->last_qscale_diff != 0 && ( IS_INTRA16x16(s->current_picture.mb_type[mbn_xy] ) || (h->cbp_table[mbn_xy]&0x3f) ) ) if( h->last_qscale_diff != 0 && ( IS_INTRA16x16(s->current_picture.mb_type[mbn_xy] ) || (h->cbp_table[mbn_xy]&0x3f) ) )
ctx++; ctx++;
while( get_cabac( &h->cabac, &h->cabac_state[60 + ctx] ) ) { while( get_cabac( &h->cabac, &h->cabac_state[60 + ctx] ) ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment