February 2010 - ffmpeg-cvslog

r22069 - trunk/libavcodec/h264.h
by subversion＠mplayerhq.hu 26 Feb '10

26 Feb '10

Author: michael Date: Fri Feb 26 02:38:12 2010 New Revision: 22069 Log: Remove useless check of the 2 left MBs of a pair being in the same slice. Modified: trunk/libavcodec/h264.h Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Fri Feb 26 01:51:26 2010 (r22068) +++ trunk/libavcodec/h264.h Fri Feb 26 02:38:12 2010 (r22069) @@ -860,8 +860,8 @@ static void fill_decode_caches(H264Conte h->left_samples_available&= 0xFF5F; } }else{ - int left_typei = h->slice_table[left_xy[0] + s->mb_stride ] == h->slice_num - ? s->current_picture.mb_type[left_xy[0] + s->mb_stride] : 0; + int left_typei = s->current_picture.mb_type[left_xy[0] + s->mb_stride]; + assert(left_xy[0] == left_xy[1]); if(!((left_typei & type_mask) && (left_type[0] & type_mask))){ h->topleft_samples_available&= 0xDF5F;

1 0

r22068 - trunk/libavcodec/avcodec.h
by subversion＠mplayerhq.hu 26 Feb '10

26 Feb '10

Author: michael Date: Fri Feb 26 01:51:26 2010 New Revision: 22068 Log: Clarify ref_index. Modified: trunk/libavcodec/avcodec.h Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h Fri Feb 26 01:10:35 2010 (r22067) +++ trunk/libavcodec/avcodec.h Fri Feb 26 01:51:26 2010 (r22068) @@ -894,6 +894,7 @@ typedef struct AVPanScan{ \ /**\ * motion referece frame index\ + * the order in which these are stored can depends on the codec.\ * - encoding: Set by user.\ * - decoding: Set by libavcodec.\ */\

1 0

r22067 - trunk/libavcodec/h264.h
by subversion＠mplayerhq.hu 26 Feb '10

26 Feb '10

Author: michael Date: Fri Feb 26 01:10:35 2010 New Revision: 22067 Log: Remove unneeded line of code from the neighbor setting code in h264. Modified: trunk/libavcodec/h264.h Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Fri Feb 26 01:08:27 2010 (r22066) +++ trunk/libavcodec/h264.h Fri Feb 26 01:10:35 2010 (r22067) @@ -795,7 +795,6 @@ static void fill_decode_neighbors(H264Co top_xy += s->mb_stride & (((s->current_picture.mb_type[top_xy ]>>7)&1)-1); } if (left_mb_field_flag != curr_mb_field_flag) { - left_xy[1] = left_xy[0] = mb_xy - 1; if (curr_mb_field_flag) { left_xy[1] += s->mb_stride; h->left_block = left_block_options[3];

1 0

r22066 - trunk/libavcodec/h264_mvpred.h
by subversion＠mplayerhq.hu 26 Feb '10

26 Feb '10

Author: michael Date: Fri Feb 26 01:08:27 2010 New Revision: 22066 Log: Simplify code in mv_pred. Not benchmarked as this is petty much just code removial. Modified: trunk/libavcodec/h264_mvpred.h Modified: trunk/libavcodec/h264_mvpred.h ============================================================================== --- trunk/libavcodec/h264_mvpred.h Fri Feb 26 00:44:42 2010 (r22065) +++ trunk/libavcodec/h264_mvpred.h Fri Feb 26 01:08:27 2010 (r22066) @@ -62,14 +62,14 @@ static inline int fetch_diagonal_mv(H264 *C = h->mv_cache[list][scan8[0]-2]; if(!MB_FIELD - && IS_INTERLACED(mb_types[h->left_mb_xy[0]])){ - SET_DIAG_MV(*2, >>1, h->left_mb_xy[0]+s->mb_stride, (s->mb_y&1)*2+(i>>4)-1); + && IS_INTERLACED(h->left_type[0])){ + SET_DIAG_MV(*2, >>1, h->left_mb_xy[0]+s->mb_stride, (s->mb_y&1)*2+(i>>5)); assert(h->left_mb_xy[0] == h->left_mb_xy[1]); } if(MB_FIELD - && !IS_INTERLACED(mb_types[h->left_mb_xy[0]])){ + && !IS_INTERLACED(h->left_type[0])){ // left shift will turn LIST_NOT_USED into PART_NOT_AVAILABLE, but that's OK. - SET_DIAG_MV(/2, <<1, h->left_mb_xy[i>=36], (- 1 + ((i-scan8[0])>>3)*2)&3); + SET_DIAG_MV(/2, <<1, h->left_mb_xy[i>=36], ((i>>2))&3); } } #undef SET_DIAG_MV

1 0

r22065 - in trunk/libavcodec: error_resilience.c h264.c h264.h h264_direct.c h264_mvpred.h mpegvideo.c
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: michael Date: Fri Feb 26 00:44:42 2010 New Revision: 22065 Log: Get rid of mb2b8_xy and b8_stride, change arrays organized based on b8_stride to ones based on mb_stride in h264. about 20 cpu cycles faster overall per MB Modified: trunk/libavcodec/error_resilience.c trunk/libavcodec/h264.c trunk/libavcodec/h264.h trunk/libavcodec/h264_direct.c trunk/libavcodec/h264_mvpred.h trunk/libavcodec/mpegvideo.c Modified: trunk/libavcodec/error_resilience.c ============================================================================== --- trunk/libavcodec/error_resilience.c Fri Feb 26 00:27:54 2010 (r22064) +++ trunk/libavcodec/error_resilience.c Fri Feb 26 00:44:42 2010 (r22065) @@ -692,7 +692,7 @@ void ff_er_frame_end(MpegEncContext *s){ av_log(s->avctx, AV_LOG_ERROR, "Warning MVs not available\n"); for(i=0; i<2; i++){ - pic->ref_index[i]= av_mallocz(size * sizeof(uint8_t)); + pic->ref_index[i]= av_mallocz(s->mb_stride * s->mb_height * 4 * sizeof(uint8_t)); pic->motion_val_base[i]= av_mallocz((size+4) * 2 * sizeof(uint16_t)); pic->motion_val[i]= pic->motion_val_base[i]+4; } Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c Fri Feb 26 00:27:54 2010 (r22064) +++ trunk/libavcodec/h264.c Fri Feb 26 00:44:42 2010 (r22065) @@ -661,7 +661,6 @@ static void free_tables(H264Context *h){ av_freep(&h->mb2b_xy); av_freep(&h->mb2br_xy); - av_freep(&h->mb2b8_xy); for(i = 0; i < MAX_THREADS; i++) { hx = h->thread_context[i]; @@ -764,16 +763,13 @@ int ff_h264_alloc_tables(H264Context *h) FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mb2b_xy , big_mb_num * sizeof(uint32_t), fail); FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mb2br_xy , big_mb_num * sizeof(uint32_t), fail); - FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mb2b8_xy , big_mb_num * sizeof(uint32_t), fail); for(y=0; y<s->mb_height; y++){ for(x=0; x<s->mb_width; x++){ const int mb_xy= x + y*s->mb_stride; const int b_xy = 4*x + 4*y*h->b_stride; - const int b8_xy= 2*x + 2*y*h->b8_stride; h->mb2b_xy [mb_xy]= b_xy; h->mb2br_xy[mb_xy]= 8*(FMO ? mb_xy : (mb_xy % (2*s->mb_stride))); - h->mb2b8_xy[mb_xy]= b8_xy; } } @@ -798,7 +794,6 @@ static void clone_tables(H264Context *ds dst->cbp_table = src->cbp_table; dst->mb2b_xy = src->mb2b_xy; dst->mb2br_xy = src->mb2br_xy; - dst->mb2b8_xy = src->mb2b8_xy; dst->chroma_pred_mode_table = src->chroma_pred_mode_table; dst->mvd_table[0] = src->mvd_table[0]; dst->mvd_table[1] = src->mvd_table[1]; @@ -1768,7 +1763,6 @@ static int decode_slice_header(H264Conte s->mb_height= h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag); h->b_stride= s->mb_width*4; - h->b8_stride= s->mb_width*2; s->width = 16*s->mb_width - 2*FFMIN(h->sps.crop_right, 7); if(h->sps.frame_mbs_only_flag) Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Fri Feb 26 00:27:54 2010 (r22064) +++ trunk/libavcodec/h264.h Fri Feb 26 00:44:42 2010 (r22065) @@ -347,9 +347,7 @@ typedef struct H264Context{ uint32_t *mb2b_xy; //FIXME are these 4 a good idea? uint32_t *mb2br_xy; - uint32_t *mb2b8_xy; int b_stride; //FIXME use s->b4_stride - int b8_stride; int mb_linesize; ///< may be equal to s->linesize or s->linesize*2, for mbaff int mb_uvlinesize; @@ -990,12 +988,11 @@ static void fill_decode_caches(H264Conte if(USES_LIST(top_type, list)){ const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride; - const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride; AV_COPY128(h->mv_cache[list][scan8[0] + 0 - 1*8], s->current_picture.motion_val[list][b_xy + 0]); h->ref_cache[list][scan8[0] + 0 - 1*8]= - h->ref_cache[list][scan8[0] + 1 - 1*8]= s->current_picture.ref_index[list][b8_xy + 0]; + h->ref_cache[list][scan8[0] + 1 - 1*8]= s->current_picture.ref_index[list][4*top_xy + 2]; h->ref_cache[list][scan8[0] + 2 - 1*8]= - h->ref_cache[list][scan8[0] + 3 - 1*8]= s->current_picture.ref_index[list][b8_xy + 1]; + h->ref_cache[list][scan8[0] + 3 - 1*8]= s->current_picture.ref_index[list][4*top_xy + 3]; }else{ AV_ZERO128(h->mv_cache[list][scan8[0] + 0 - 1*8]); AV_WN32A(&h->ref_cache[list][scan8[0] + 0 - 1*8], ((top_type ? LIST_NOT_USED : PART_NOT_AVAILABLE)&0xFF)*0x01010101); @@ -1005,11 +1002,11 @@ static void fill_decode_caches(H264Conte int cache_idx = scan8[0] - 1 + i*2*8; if(USES_LIST(left_type[i], list)){ const int b_xy= h->mb2b_xy[left_xy[i]] + 3; - const int b8_xy= h->mb2b8_xy[left_xy[i]] + 1; + const int b8_xy= 4*left_xy[i] + 1; AV_COPY32(h->mv_cache[list][cache_idx ], s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[0+i*2]]); AV_COPY32(h->mv_cache[list][cache_idx+8], s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[1+i*2]]); - h->ref_cache[list][cache_idx ]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[0+i*2]>>1)]; - h->ref_cache[list][cache_idx+8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[1+i*2]>>1)]; + h->ref_cache[list][cache_idx ]= s->current_picture.ref_index[list][b8_xy + (left_block[0+i*2]&~1)]; + h->ref_cache[list][cache_idx+8]= s->current_picture.ref_index[list][b8_xy + (left_block[1+i*2]&~1)]; }else{ AV_ZERO32(h->mv_cache [list][cache_idx ]); AV_ZERO32(h->mv_cache [list][cache_idx+8]); @@ -1020,7 +1017,7 @@ static void fill_decode_caches(H264Conte if(USES_LIST(topleft_type, list)){ const int b_xy = h->mb2b_xy [topleft_xy] + 3 + h->b_stride + (h->topleft_partition & 2*h->b_stride); - const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + (h->topleft_partition & h->b8_stride); + const int b8_xy= 4*topleft_xy + 1 + (h->topleft_partition & 2); AV_COPY32(h->mv_cache[list][scan8[0] - 1 - 1*8], s->current_picture.motion_val[list][b_xy]); h->ref_cache[list][scan8[0] - 1 - 1*8]= s->current_picture.ref_index[list][b8_xy]; }else{ @@ -1030,9 +1027,8 @@ static void fill_decode_caches(H264Conte if(USES_LIST(topright_type, list)){ const int b_xy= h->mb2b_xy[topright_xy] + 3*h->b_stride; - const int b8_xy= h->mb2b8_xy[topright_xy] + h->b8_stride; AV_COPY32(h->mv_cache[list][scan8[0] + 4 - 1*8], s->current_picture.motion_val[list][b_xy]); - h->ref_cache[list][scan8[0] + 4 - 1*8]= s->current_picture.ref_index[list][b8_xy]; + h->ref_cache[list][scan8[0] + 4 - 1*8]= s->current_picture.ref_index[list][4*topright_xy + 2]; }else{ AV_ZERO32(h->mv_cache [list][scan8[0] + 4 - 1*8]); h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; @@ -1241,12 +1237,12 @@ static int fill_filter_caches(H264Contex continue; } - ref = &s->current_picture.ref_index[list][h->mb2b8_xy[mb_xy]]; + ref = &s->current_picture.ref_index[list][4*mb_xy]; { int (*ref2frm)[64] = h->ref2frm[ h->slice_num&(MAX_SLICES-1) ][0] + (MB_MBAFF ? 20 : 2); AV_WN32A(&h->ref_cache[list][scan8[ 0]], (pack16to32(ref2frm[list][ref[0]],ref2frm[list][ref[1]])&0x00FF00FF)*0x0101); AV_WN32A(&h->ref_cache[list][scan8[ 2]], (pack16to32(ref2frm[list][ref[0]],ref2frm[list][ref[1]])&0x00FF00FF)*0x0101); - ref += h->b8_stride; + ref += 2; AV_WN32A(&h->ref_cache[list][scan8[ 8]], (pack16to32(ref2frm[list][ref[0]],ref2frm[list][ref[1]])&0x00FF00FF)*0x0101); AV_WN32A(&h->ref_cache[list][scan8[10]], (pack16to32(ref2frm[list][ref[0]],ref2frm[list][ref[1]])&0x00FF00FF)*0x0101); } @@ -1319,7 +1315,7 @@ static int fill_filter_caches(H264Contex for(list=0; list<h->list_count; list++){ if(USES_LIST(top_type, list)){ const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride; - const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride; + const int b8_xy= 4*top_xy + 2; int (*ref2frm)[64] = h->ref2frm[ h->slice_table[top_xy]&(MAX_SLICES-1) ][0] + (MB_MBAFF ? 20 : 2); AV_COPY128(h->mv_cache[list][scan8[0] + 0 - 1*8], s->current_picture.motion_val[list][b_xy + 0]); h->ref_cache[list][scan8[0] + 0 - 1*8]= @@ -1334,16 +1330,16 @@ static int fill_filter_caches(H264Contex if(!IS_INTERLACED(mb_type^left_type[0])){ if(USES_LIST(left_type[0], list)){ const int b_xy= h->mb2b_xy[left_xy[0]] + 3; - const int b8_xy= h->mb2b8_xy[left_xy[0]] + 1; + const int b8_xy= 4*left_xy[0] + 1; int (*ref2frm)[64] = h->ref2frm[ h->slice_table[left_xy[0]]&(MAX_SLICES-1) ][0] + (MB_MBAFF ? 20 : 2); AV_COPY32(h->mv_cache[list][scan8[0] - 1 + 0 ], s->current_picture.motion_val[list][b_xy + h->b_stride*0]); AV_COPY32(h->mv_cache[list][scan8[0] - 1 + 8 ], s->current_picture.motion_val[list][b_xy + h->b_stride*1]); AV_COPY32(h->mv_cache[list][scan8[0] - 1 +16 ], s->current_picture.motion_val[list][b_xy + h->b_stride*2]); AV_COPY32(h->mv_cache[list][scan8[0] - 1 +24 ], s->current_picture.motion_val[list][b_xy + h->b_stride*3]); h->ref_cache[list][scan8[0] - 1 + 0 ]= - h->ref_cache[list][scan8[0] - 1 + 8 ]= ref2frm[list][s->current_picture.ref_index[list][b8_xy + h->b8_stride*0]]; + h->ref_cache[list][scan8[0] - 1 + 8 ]= ref2frm[list][s->current_picture.ref_index[list][b8_xy + 2*0]]; h->ref_cache[list][scan8[0] - 1 +16 ]= - h->ref_cache[list][scan8[0] - 1 +24 ]= ref2frm[list][s->current_picture.ref_index[list][b8_xy + h->b8_stride*1]]; + h->ref_cache[list][scan8[0] - 1 +24 ]= ref2frm[list][s->current_picture.ref_index[list][b8_xy + 2*1]]; }else{ AV_ZERO32(h->mv_cache [list][scan8[0] - 1 + 0 ]); AV_ZERO32(h->mv_cache [list][scan8[0] - 1 + 8 ]); @@ -1388,12 +1384,12 @@ static inline void write_back_non_zero_c static inline void write_back_motion(H264Context *h, int mb_type){ MpegEncContext * const s = &h->s; - const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; - const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride; + const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; //try mb2b(8)_xy + const int b8_xy= 4*h->mb_xy; int list; if(!USES_LIST(mb_type, 0)) - fill_rectangle(&s->current_picture.ref_index[0][b8_xy], 2, 2, h->b8_stride, (uint8_t)LIST_NOT_USED, 1); + fill_rectangle(&s->current_picture.ref_index[0][b8_xy], 2, 2, 2, (uint8_t)LIST_NOT_USED, 1); for(list=0; list<h->list_count; list++){ int y, b_stride; @@ -1424,10 +1420,10 @@ static inline void write_back_motion(H26 { int8_t *ref_index = &s->current_picture.ref_index[list][b8_xy]; - ref_index[0+0*h->b8_stride]= h->ref_cache[list][scan8[0]]; - ref_index[1+0*h->b8_stride]= h->ref_cache[list][scan8[4]]; - ref_index[0+1*h->b8_stride]= h->ref_cache[list][scan8[8]]; - ref_index[1+1*h->b8_stride]= h->ref_cache[list][scan8[12]]; + ref_index[0+0*2]= h->ref_cache[list][scan8[0]]; + ref_index[1+0*2]= h->ref_cache[list][scan8[4]]; + ref_index[0+1*2]= h->ref_cache[list][scan8[8]]; + ref_index[1+1*2]= h->ref_cache[list][scan8[12]]; } } Modified: trunk/libavcodec/h264_direct.c ============================================================================== --- trunk/libavcodec/h264_direct.c Fri Feb 26 00:27:54 2010 (r22064) +++ trunk/libavcodec/h264_direct.c Fri Feb 26 00:44:42 2010 (r22065) @@ -142,7 +142,7 @@ void ff_h264_direct_ref_list_init(H264Co static void pred_spatial_direct_motion(H264Context * const h, int *mb_type){ MpegEncContext * const s = &h->s; - int b8_stride = h->b8_stride; + int b8_stride = 2; int b4_stride = h->b_stride; int mb_xy = h->mb_xy; int mb_type_col[2]; @@ -228,7 +228,7 @@ static void pred_spatial_direct_motion(H mb_xy= s->mb_x + (s->mb_y&~1)*s->mb_stride; mb_type_col[0] = h->ref_list[1][0].mb_type[mb_xy]; mb_type_col[1] = h->ref_list[1][0].mb_type[mb_xy + s->mb_stride]; - b8_stride *= 3; + b8_stride = 2+4*s->mb_stride; b4_stride *= 6; sub_mb_type |= MB_TYPE_16x16|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ @@ -262,12 +262,12 @@ single_col: l1mv0 = &h->ref_list[1][0].motion_val[0][h->mb2b_xy [mb_xy]]; l1mv1 = &h->ref_list[1][0].motion_val[1][h->mb2b_xy [mb_xy]]; - l1ref0 = &h->ref_list[1][0].ref_index [0][h->mb2b8_xy[mb_xy]]; - l1ref1 = &h->ref_list[1][0].ref_index [1][h->mb2b8_xy[mb_xy]]; + l1ref0 = &h->ref_list[1][0].ref_index [0][4*mb_xy]; + l1ref1 = &h->ref_list[1][0].ref_index [1][4*mb_xy]; if(!b8_stride){ if(s->mb_y&1){ - l1ref0 += h->b8_stride; - l1ref1 += h->b8_stride; + l1ref0 += 2; + l1ref1 += 2; l1mv0 += 2*b4_stride; l1mv1 += 2*b4_stride; } @@ -342,11 +342,12 @@ single_col: fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[0], 1); fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[1], 1); + assert(b8_stride==2); /* col_zero_flag */ - if(!IS_INTRA(mb_type_col[0]) && !h->ref_list[1][0].long_ref && ( l1ref0[x8 + y8*b8_stride] == 0 - || (l1ref0[x8 + y8*b8_stride] < 0 && l1ref1[x8 + y8*b8_stride] == 0 + if(!IS_INTRA(mb_type_col[0]) && !h->ref_list[1][0].long_ref && ( l1ref0[i8] == 0 + || (l1ref0[i8] < 0 && l1ref1[i8] == 0 && h->x264_build>33U))){ - const int16_t (*l1mv)[2]= l1ref0[x8 + y8*b8_stride] == 0 ? l1mv0 : l1mv1; + const int16_t (*l1mv)[2]= l1ref0[i8] == 0 ? l1mv0 : l1mv1; if(IS_SUB_8X8(sub_mb_type)){ const int16_t *mv_col = l1mv[x8*3 + y8*3*b4_stride]; if(FFABS(mv_col[0]) <= 1 && FFABS(mv_col[1]) <= 1){ @@ -381,7 +382,7 @@ single_col: static void pred_temp_direct_motion(H264Context * const h, int *mb_type){ MpegEncContext * const s = &h->s; - int b8_stride = h->b8_stride; + int b8_stride = 2; int b4_stride = h->b_stride; int mb_xy = h->mb_xy; int mb_type_col[2]; @@ -406,7 +407,7 @@ static void pred_temp_direct_motion(H264 mb_xy= s->mb_x + (s->mb_y&~1)*s->mb_stride; mb_type_col[0] = h->ref_list[1][0].mb_type[mb_xy]; mb_type_col[1] = h->ref_list[1][0].mb_type[mb_xy + s->mb_stride]; - b8_stride *= 3; + b8_stride = 2+4*s->mb_stride; b4_stride *= 6; sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ @@ -441,12 +442,12 @@ single_col: l1mv0 = &h->ref_list[1][0].motion_val[0][h->mb2b_xy [mb_xy]]; l1mv1 = &h->ref_list[1][0].motion_val[1][h->mb2b_xy [mb_xy]]; - l1ref0 = &h->ref_list[1][0].ref_index [0][h->mb2b8_xy[mb_xy]]; - l1ref1 = &h->ref_list[1][0].ref_index [1][h->mb2b8_xy[mb_xy]]; + l1ref0 = &h->ref_list[1][0].ref_index [0][4*mb_xy]; + l1ref1 = &h->ref_list[1][0].ref_index [1][4*mb_xy]; if(!b8_stride){ if(s->mb_y&1){ - l1ref0 += h->b8_stride; - l1ref1 += h->b8_stride; + l1ref0 += 2; + l1ref1 += 2; l1mv0 += 2*b4_stride; l1mv1 += 2*b4_stride; } @@ -549,11 +550,12 @@ single_col: continue; } - ref0 = l1ref0[x8 + y8*b8_stride]; + assert(b8_stride == 2); + ref0 = l1ref0[i8]; if(ref0 >= 0) ref0 = map_col_to_list0[0][ref0 + ref_offset]; else{ - ref0 = map_col_to_list0[1][l1ref1[x8 + y8*b8_stride] + ref_offset]; + ref0 = map_col_to_list0[1][l1ref1[i8] + ref_offset]; l1mv= l1mv1; } scale = dist_scale_factor[ref0]; Modified: trunk/libavcodec/h264_mvpred.h ============================================================================== --- trunk/libavcodec/h264_mvpred.h Fri Feb 26 00:27:54 2010 (r22064) +++ trunk/libavcodec/h264_mvpred.h Fri Feb 26 00:44:42 2010 (r22065) @@ -43,15 +43,15 @@ static inline int fetch_diagonal_mv(H264 * make mbaff happy, so we can't move all this logic to fill_caches */ if(FRAME_MBAFF){ -#define SET_DIAG_MV(MV_OP, REF_OP, X4, Y4)\ - const int x4 = X4, y4 = Y4;\ - const int mb_type = mb_types[(x4>>2)+(y4>>2)*s->mb_stride];\ +#define SET_DIAG_MV(MV_OP, REF_OP, XY, Y4)\ + const int xy = XY, y4 = Y4;\ + const int mb_type = mb_types[xy+(y4>>2)*s->mb_stride];\ if(!USES_LIST(mb_type,list))\ return LIST_NOT_USED;\ - mv = s->current_picture_ptr->motion_val[list][x4 + y4*h->b_stride];\ + mv = s->current_picture_ptr->motion_val[list][h->mb2b_xy[xy]+3 + y4*h->b_stride];\ h->mv_cache[list][scan8[0]-2][0] = mv[0];\ h->mv_cache[list][scan8[0]-2][1] = mv[1] MV_OP;\ - return s->current_picture_ptr->ref_index[list][(x4>>1) + (y4>>1)*h->b8_stride] REF_OP; + return s->current_picture_ptr->ref_index[list][4*xy+1 + (y4&~1)] REF_OP; if(topright_ref == PART_NOT_AVAILABLE && i >= scan8[0]+8 && (i&7)==4 @@ -63,12 +63,13 @@ static inline int fetch_diagonal_mv(H264 if(!MB_FIELD && IS_INTERLACED(mb_types[h->left_mb_xy[0]])){ - SET_DIAG_MV(*2, >>1, s->mb_x*4-1, (s->mb_y|1)*4+(s->mb_y&1)*2+(i>>4)-1); + SET_DIAG_MV(*2, >>1, h->left_mb_xy[0]+s->mb_stride, (s->mb_y&1)*2+(i>>4)-1); + assert(h->left_mb_xy[0] == h->left_mb_xy[1]); } if(MB_FIELD && !IS_INTERLACED(mb_types[h->left_mb_xy[0]])){ // left shift will turn LIST_NOT_USED into PART_NOT_AVAILABLE, but that's OK. - SET_DIAG_MV(/2, <<1, s->mb_x*4-1, (s->mb_y&~1)*4 - 1 + ((i-scan8[0])>>3)*2); + SET_DIAG_MV(/2, <<1, h->left_mb_xy[i>=36], (- 1 + ((i-scan8[0])>>3)*2)&3); } } #undef SET_DIAG_MV Modified: trunk/libavcodec/mpegvideo.c ============================================================================== --- trunk/libavcodec/mpegvideo.c Fri Feb 26 00:27:54 2010 (r22064) +++ trunk/libavcodec/mpegvideo.c Fri Feb 26 00:44:42 2010 (r22065) @@ -257,7 +257,7 @@ int ff_alloc_picture(MpegEncContext *s, for(i=0; i<2; i++){ FF_ALLOCZ_OR_GOTO(s->avctx, pic->motion_val_base[i], 2 * (b4_array_size+4) * sizeof(int16_t), fail) pic->motion_val[i]= pic->motion_val_base[i]+4; - FF_ALLOCZ_OR_GOTO(s->avctx, pic->ref_index[i], b8_array_size * sizeof(uint8_t), fail) + FF_ALLOCZ_OR_GOTO(s->avctx, pic->ref_index[i], 4*mb_array_size * sizeof(uint8_t), fail) } pic->motion_subsample_log2= 2; }else if(s->out_format == FMT_H263 || s->encoding || (s->avctx->debug&FF_DEBUG_MV) || (s->avctx->debug_mv)){

1 0

r30730 - trunk/libswscale/utils.c
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: stefano Date: Thu Feb 25 22:21:29 2010 New Revision: 30730 Log: Remove pointless empty line. Modified: trunk/libswscale/utils.c Modified: trunk/libswscale/utils.c ============================================================================== --- trunk/libswscale/utils.c Thu Feb 25 22:12:38 2010 (r30729) +++ trunk/libswscale/utils.c Thu Feb 25 22:21:29 2010 (r30730) @@ -787,7 +787,6 @@ SwsContext *sws_getContext(int srcW, int int dstW, int dstH, enum PixelFormat dstFormat, int flags, SwsFilter *srcFilter, SwsFilter *dstFilter, const double *param) { - SwsContext *c; int i; int usesVFilter, usesHFilter;

1 0

r30729 - trunk/libswscale/yuv2rgb.c
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: stefano Date: Thu Feb 25 22:12:38 2010 New Revision: 30729 Log: Apply consistency nit. Modified: trunk/libswscale/yuv2rgb.c Modified: trunk/libswscale/yuv2rgb.c ============================================================================== --- trunk/libswscale/yuv2rgb.c Thu Feb 25 14:20:56 2010 (r30728) +++ trunk/libswscale/yuv2rgb.c Thu Feb 25 22:12:38 2010 (r30729) @@ -49,7 +49,7 @@ const int32_t ff_yuv2rgb_coeffs[8][4] = {117579, 136230, 16907, 35559} /* SMPTE 240M (1987) */ }; -const int * sws_getCoefficients(int colorspace) +const int *sws_getCoefficients(int colorspace) { if (colorspace > 7 || colorspace < 0) colorspace = SWS_CS_DEFAULT;

1 0

r22063 - in trunk: doc/libavfilter.texi libavfilter/Makefile tools/graph2dot.c
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: stefano Date: Thu Feb 25 20:55:01 2010 New Revision: 22063 Log: Add the graph2dot tools and document it. Also link avfiltergraph.o and graphparser.o against libavfilter, as it uses them. Added: trunk/tools/graph2dot.c Modified: trunk/doc/libavfilter.texi trunk/libavfilter/Makefile Modified: trunk/doc/libavfilter.texi ============================================================================== --- trunk/doc/libavfilter.texi Thu Feb 25 20:38:54 2010 (r22062) +++ trunk/doc/libavfilter.texi Thu Feb 25 20:55:01 2010 (r22063) @@ -71,6 +71,34 @@ There exist so-called @var{source filter input, and we expect in the future some @var{sink filters} that will not have video output. + at chapter graph2dot + +The @file{graph2dot} program included in the FFmpeg @file{tools} +directory can be used to parse a filter graph description and issue a +corresponding textual representation in the dot language. + +Invoke the command: + at example +graph2dot -h + at end example + +to see how to use @file{graph2dot}. + +You can then pass the dot description to the @file{dot} program (from +the graphviz suite of programs) and obtain a graphical representation +of the filter graph. + +For example the sequence of commands: + at example +echo @var{GRAPH_DESCRIPTION} | \ +tools/graph2dot -o graph.tmp && \ +dot -Tpng graph.tmp -o graph.png && \ +display graph.png + at end example + +can be used to create and display an image representing the graph +described by the @var{GRAPH_DESCRIPTION} string. + @chapter Available video filters When you configure your FFmpeg build, you can disable any of the Modified: trunk/libavfilter/Makefile ============================================================================== --- trunk/libavfilter/Makefile Thu Feb 25 20:38:54 2010 (r22062) +++ trunk/libavfilter/Makefile Thu Feb 25 20:55:01 2010 (r22063) @@ -8,8 +8,10 @@ HEADERS = avfilter.h OBJS = allfilters.o \ avfilter.o \ + avfiltergraph.o \ defaults.o \ formats.o \ + graphparser.o \ parseutils.o \ OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o Added: trunk/tools/graph2dot.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/tools/graph2dot.c Thu Feb 25 20:55:01 2010 (r22063) @@ -0,0 +1,163 @@ +/* + * Copyright (c) 2008-2010 Stefano Sabatini + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <unistd.h> /* getopt */ + +#undef HAVE_AV_CONFIG_H +#include "libavutil/pixdesc.h" +#include "libavfilter/graphparser.h" + +static void usage(void) +{ + printf("Convert a libavfilter graph to a dot file\n"); + printf("Usage: graph2dot [OPTIONS]\n"); + printf("\n" + "Options:\n" + "-i INFILE set INFILE as input file, stdin if omitted\n" + "-o OUTFILE set OUTFILE as output file, stdout if omitted\n" + "-h print this help\n"); +} + +struct line { + char data[256]; + struct line *next; +}; + +static void print_digraph(FILE *outfile, AVFilterGraph *graph) +{ + int i, j; + + fprintf(outfile, "digraph G {\n"); + fprintf(outfile, "node [shape=box]\n"); + fprintf(outfile, "rankdir=LR\n"); + + for (i = 0; i < graph->filter_count; i++) { + char filter_ctx_label[128]; + const AVFilterContext *filter_ctx = graph->filters[i]; + + snprintf(filter_ctx_label, sizeof(filter_ctx_label), "%s (%s)", + filter_ctx->name, + filter_ctx->filter->name); + + for (j = 0; j < filter_ctx->output_count; j++) { + AVFilterLink *link = filter_ctx->outputs[j]; + if (link) { + char dst_filter_ctx_label[128]; + const AVFilterContext *dst_filter_ctx = link->dst; + + snprintf(dst_filter_ctx_label, sizeof(dst_filter_ctx_label), "%s (%s)", + dst_filter_ctx->name, + dst_filter_ctx->filter->name); + + fprintf(outfile, "\"%s\" -> \"%s\"", filter_ctx_label, dst_filter_ctx_label); + fprintf(outfile, " [ label= \"fmt:%s w:%d h:%d\"];\n", + av_pix_fmt_descriptors[link->format].name, link->w, link->h); + } + } + } + fprintf(outfile, "}\n"); +} + +int main(int argc, char **argv) +{ + const char *outfilename = NULL; + const char *infilename = NULL; + FILE *outfile = NULL; + FILE *infile = NULL; + char *graph_string = NULL; + AVFilterGraph *graph = av_mallocz(sizeof(AVFilterGraph)); + char c; + + av_log_set_level(AV_LOG_DEBUG); + + while ((c = getopt(argc, argv, "hi:o:")) != -1) { + switch(c) { + case 'h': + usage(); + return 0; + case 'i': + infilename = optarg; + break; + case 'o': + outfilename = optarg; + break; + case '?': + return 1; + } + } + + if (!infilename || !strcmp(infilename, "-")) + infilename = "/dev/stdin"; + infile = fopen(infilename, "r"); + if (!infile) { + fprintf(stderr, "Impossible to open input file '%s': %s\n", infilename, strerror(errno)); + return 1; + } + + if (!outfilename || !strcmp(outfilename, "-")) + outfilename = "/dev/stdout"; + outfile = fopen(outfilename, "w"); + if (!outfile) { + fprintf(stderr, "Impossible to open output file '%s': %s\n", outfilename, strerror(errno)); + return 1; + } + + /* read from infile and put it in a buffer */ + { + unsigned int count = 0; + struct line *line, *last_line, *first_line; + char *p; + last_line = first_line = av_malloc(sizeof(struct line)); + + while (fgets(last_line->data, sizeof(last_line->data), infile)) { + struct line *new_line = av_malloc(sizeof(struct line)); + count += strlen(last_line->data); + last_line->next = new_line; + last_line = new_line; + } + last_line->next = NULL; + + graph_string = av_malloc(count + 1); + p = graph_string; + for (line = first_line; line->next; line = line->next) { + unsigned int l = strlen(line->data); + memcpy(p, line->data, l); + p += l; + } + *p = '\0'; + } + + avfilter_register_all(); + + if (avfilter_graph_parse(graph, graph_string, NULL, NULL, NULL) < 0) { + fprintf(stderr, "Impossible to parse the graph description\n"); + return 1; + } + + if (avfilter_graph_check_validity(graph, NULL) || + avfilter_graph_config_formats(graph, NULL) || + avfilter_graph_config_links (graph, NULL)) + return 1; + + print_digraph(outfile, graph); + fflush(outfile); + + return 0; +}

1 0

r22062 - trunk/doc/faq.texi
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: stefano Date: Thu Feb 25 20:38:54 2010 New Revision: 22062 Log: Replace not anymore valid syntax "-title X" with "-metadata title=X". Modified: trunk/doc/faq.texi Modified: trunk/doc/faq.texi ============================================================================== --- trunk/doc/faq.texi Thu Feb 25 19:41:48 2010 (r22061) +++ trunk/doc/faq.texi Thu Feb 25 20:38:54 2010 (r22062) @@ -237,7 +237,7 @@ default. @item non-working stuff B-frames @item example command line -ffmpeg -i input -acodec libfaac -ab 128kb -vcodec mpeg4 -b 1200kb -mbd 2 -flags +4mv -trellis 2 -aic 2 -cmp 2 -subcmp 2 -s 320x180 -title X output.mp4 +ffmpeg -i input -acodec libfaac -ab 128kb -vcodec mpeg4 -b 1200kb -mbd 2 -flags +4mv -trellis 2 -aic 2 -cmp 2 -subcmp 2 -s 320x180 -metadata title=X output.mp4 @end table @section How do I encode videos which play on the PSP? @@ -250,7 +250,7 @@ ffmpeg -i input -acodec libfaac -ab 128k @item non-working stuff B-frames @item example command line -ffmpeg -i input -acodec libfaac -ab 128kb -vcodec mpeg4 -b 1200kb -ar 24000 -mbd 2 -flags +4mv -trellis 2 -aic 2 -cmp 2 -subcmp 2 -s 368x192 -r 30000/1001 -title X -f psp output.mp4 +ffmpeg -i input -acodec libfaac -ab 128kb -vcodec mpeg4 -b 1200kb -ar 24000 -mbd 2 -flags +4mv -trellis 2 -aic 2 -cmp 2 -subcmp 2 -s 368x192 -r 30000/1001 -metadata title=X -f psp output.mp4 @item needed stuff for H.264 -acodec libfaac -vcodec libx264 width*height<=76800 width%16=0? height%16=0? -ar 48000 -coder 1 -r 30000/1001 or 15000/1001 -f psp @item working stuff for H.264 @@ -258,7 +258,7 @@ title, loop filter @item non-working stuff for H.264 CAVLC @item example command line -ffmpeg -i input -acodec libfaac -ab 128kb -vcodec libx264 -b 1200kb -ar 48000 -mbd 2 -coder 1 -cmp 2 -subcmp 2 -s 368x192 -r 30000/1001 -title X -f psp -flags loop -trellis 2 -partitions parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 output.mp4 +ffmpeg -i input -acodec libfaac -ab 128kb -vcodec libx264 -b 1200kb -ar 48000 -mbd 2 -coder 1 -cmp 2 -subcmp 2 -s 368x192 -r 30000/1001 -metadata title=X -f psp -flags loop -trellis 2 -partitions parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 output.mp4 @item higher resolution for newer PSP firmwares, width<=480, height<=272 -vcodec libx264 -level 21 -coder 1 -f psp @item example command line

1 0

r22061 - trunk/libavcodec/svq3.c
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: michael Date: Thu Feb 25 19:41:48 2010 New Revision: 22061 Log: svq3 now in working condition, at least vissually, ill let fate tell us if the checksums match Modified: trunk/libavcodec/svq3.c Modified: trunk/libavcodec/svq3.c ============================================================================== --- trunk/libavcodec/svq3.c Thu Feb 25 19:39:01 2010 (r22060) +++ trunk/libavcodec/svq3.c Thu Feb 25 19:41:48 2010 (r22061) @@ -478,7 +478,7 @@ static int svq3_decode_mb(H264Context *h */ for (m = 0; m < 2; m++) { - if (s->mb_x > 0 && h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - 1]+6] != -1) { + if (s->mb_x > 0 && h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - 1]+6] != -1) { for (i = 0; i < 4; i++) { *(uint32_t *) h->mv_cache[m][scan8[0] - 1 + i*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - 1 + i*h->b_stride]; } @@ -489,18 +489,18 @@ static int svq3_decode_mb(H264Context *h } if (s->mb_y > 0) { memcpy(h->mv_cache[m][scan8[0] - 1*8], s->current_picture.motion_val[m][b_xy - h->b_stride], 4*2*sizeof(int16_t)); - memset(&h->ref_cache[m][scan8[0] - 1*8], (h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - s->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1, 4); + memset(&h->ref_cache[m][scan8[0] - 1*8], (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1, 4); if (s->mb_x < (s->mb_width - 1)) { *(uint32_t *) h->mv_cache[m][scan8[0] + 4 - 1*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - h->b_stride + 4]; h->ref_cache[m][scan8[0] + 4 - 1*8] = - (h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - s->mb_stride + 1]+6] == -1 || - h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - s->mb_stride ] ] == -1) ? PART_NOT_AVAILABLE : 1; + (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride + 1]+6] == -1 || + h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride ] ] == -1) ? PART_NOT_AVAILABLE : 1; }else h->ref_cache[m][scan8[0] + 4 - 1*8] = PART_NOT_AVAILABLE; if (s->mb_x > 0) { *(uint32_t *) h->mv_cache[m][scan8[0] - 1 - 1*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - h->b_stride - 1]; - h->ref_cache[m][scan8[0] - 1 - 1*8] = (h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - s->mb_stride - 1]+3] == -1) ? PART_NOT_AVAILABLE : 1; + h->ref_cache[m][scan8[0] - 1 - 1*8] = (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride - 1]+3] == -1) ? PART_NOT_AVAILABLE : 1; }else h->ref_cache[m][scan8[0] - 1 - 1*8] = PART_NOT_AVAILABLE; }else @@ -540,17 +540,17 @@ static int svq3_decode_mb(H264Context *h if (mb_type == 8) { if (s->mb_x > 0) { for (i = 0; i < 4; i++) { - h->intra4x4_pred_mode_cache[scan8[0] - 1 + i*8] = h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - 1]+6-i]; + h->intra4x4_pred_mode_cache[scan8[0] - 1 + i*8] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - 1]+6-i]; } if (h->intra4x4_pred_mode_cache[scan8[0] - 1] == -1) { h->left_samples_available = 0x5F5F; } } if (s->mb_y > 0) { - h->intra4x4_pred_mode_cache[4+8*0] = h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - s->mb_stride]+0]; - h->intra4x4_pred_mode_cache[5+8*0] = h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - s->mb_stride]+1]; - h->intra4x4_pred_mode_cache[6+8*0] = h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - s->mb_stride]+2]; - h->intra4x4_pred_mode_cache[7+8*0] = h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - s->mb_stride]+3]; + h->intra4x4_pred_mode_cache[4+8*0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride]+0]; + h->intra4x4_pred_mode_cache[5+8*0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride]+1]; + h->intra4x4_pred_mode_cache[6+8*0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride]+2]; + h->intra4x4_pred_mode_cache[7+8*0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride]+3]; if (h->intra4x4_pred_mode_cache[4+8*0] == -1) { h->top_samples_available = 0x33FF; @@ -624,7 +624,7 @@ static int svq3_decode_mb(H264Context *h } } if (!IS_INTRA4x4(mb_type)) { - memset(h->intra4x4_pred_mode+8*h->mb2br_xy[mb_xy], DC_PRED, 8); + memset(h->intra4x4_pred_mode+h->mb2br_xy[mb_xy], DC_PRED, 8); } if (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE) { memset(h->non_zero_count_cache + 8, 0, 4*9*sizeof(uint8_t)); @@ -774,14 +774,14 @@ static int svq3_decode_slice_header(H264 /* reset intra predictors and invalidate motion vector references */ if (s->mb_x > 0) { - memset(h->intra4x4_pred_mode+8*h->mb2br_xy[mb_xy - 1 ]+3, -1, 4*sizeof(int8_t)); - memset(h->intra4x4_pred_mode+8*h->mb2br_xy[mb_xy - s->mb_x] , -1, 8*sizeof(int8_t)*s->mb_x); + memset(h->intra4x4_pred_mode+h->mb2br_xy[mb_xy - 1 ]+3, -1, 4*sizeof(int8_t)); + memset(h->intra4x4_pred_mode+h->mb2br_xy[mb_xy - s->mb_x] , -1, 8*sizeof(int8_t)*s->mb_x); } if (s->mb_y > 0) { - memset(h->intra4x4_pred_mode+8*h->mb2br_xy[mb_xy - s->mb_stride], -1, 8*sizeof(int8_t)*(s->mb_width - s->mb_x)); + memset(h->intra4x4_pred_mode+h->mb2br_xy[mb_xy - s->mb_stride], -1, 8*sizeof(int8_t)*(s->mb_width - s->mb_x)); if (s->mb_x > 0) { - h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - s->mb_stride - 1]+3] = -1; + h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride - 1]+3] = -1; } }

1 0

r22060 - trunk/libavcodec/svq3.c
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: michael Date: Thu Feb 25 19:39:01 2010 New Revision: 22060 Log: fix compilation, sorry ive not checked cvslog for a while :((( svq3 decoder does not work yet though but i didnt want to keep compilation broken longer Modified: trunk/libavcodec/svq3.c Modified: trunk/libavcodec/svq3.c ============================================================================== --- trunk/libavcodec/svq3.c Thu Feb 25 17:59:55 2010 (r22059) +++ trunk/libavcodec/svq3.c Thu Feb 25 19:39:01 2010 (r22060) @@ -478,7 +478,7 @@ static int svq3_decode_mb(H264Context *h */ for (m = 0; m < 2; m++) { - if (s->mb_x > 0 && h->intra4x4_pred_mode[mb_xy - 1][0] != -1) { + if (s->mb_x > 0 && h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - 1]+6] != -1) { for (i = 0; i < 4; i++) { *(uint32_t *) h->mv_cache[m][scan8[0] - 1 + i*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - 1 + i*h->b_stride]; } @@ -489,18 +489,18 @@ static int svq3_decode_mb(H264Context *h } if (s->mb_y > 0) { memcpy(h->mv_cache[m][scan8[0] - 1*8], s->current_picture.motion_val[m][b_xy - h->b_stride], 4*2*sizeof(int16_t)); - memset(&h->ref_cache[m][scan8[0] - 1*8], (h->intra4x4_pred_mode[mb_xy - s->mb_stride][4] == -1) ? PART_NOT_AVAILABLE : 1, 4); + memset(&h->ref_cache[m][scan8[0] - 1*8], (h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - s->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1, 4); if (s->mb_x < (s->mb_width - 1)) { *(uint32_t *) h->mv_cache[m][scan8[0] + 4 - 1*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - h->b_stride + 4]; h->ref_cache[m][scan8[0] + 4 - 1*8] = - (h->intra4x4_pred_mode[mb_xy - s->mb_stride + 1][0] == -1 || - h->intra4x4_pred_mode[mb_xy - s->mb_stride ][4] == -1) ? PART_NOT_AVAILABLE : 1; + (h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - s->mb_stride + 1]+6] == -1 || + h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - s->mb_stride ] ] == -1) ? PART_NOT_AVAILABLE : 1; }else h->ref_cache[m][scan8[0] + 4 - 1*8] = PART_NOT_AVAILABLE; if (s->mb_x > 0) { *(uint32_t *) h->mv_cache[m][scan8[0] - 1 - 1*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - h->b_stride - 1]; - h->ref_cache[m][scan8[0] - 1 - 1*8] = (h->intra4x4_pred_mode[mb_xy - s->mb_stride - 1][3] == -1) ? PART_NOT_AVAILABLE : 1; + h->ref_cache[m][scan8[0] - 1 - 1*8] = (h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - s->mb_stride - 1]+3] == -1) ? PART_NOT_AVAILABLE : 1; }else h->ref_cache[m][scan8[0] - 1 - 1*8] = PART_NOT_AVAILABLE; }else @@ -540,17 +540,17 @@ static int svq3_decode_mb(H264Context *h if (mb_type == 8) { if (s->mb_x > 0) { for (i = 0; i < 4; i++) { - h->intra4x4_pred_mode_cache[scan8[0] - 1 + i*8] = h->intra4x4_pred_mode[mb_xy - 1][i]; + h->intra4x4_pred_mode_cache[scan8[0] - 1 + i*8] = h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - 1]+6-i]; } if (h->intra4x4_pred_mode_cache[scan8[0] - 1] == -1) { h->left_samples_available = 0x5F5F; } } if (s->mb_y > 0) { - h->intra4x4_pred_mode_cache[4+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][4]; - h->intra4x4_pred_mode_cache[5+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][5]; - h->intra4x4_pred_mode_cache[6+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][6]; - h->intra4x4_pred_mode_cache[7+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][3]; + h->intra4x4_pred_mode_cache[4+8*0] = h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - s->mb_stride]+0]; + h->intra4x4_pred_mode_cache[5+8*0] = h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - s->mb_stride]+1]; + h->intra4x4_pred_mode_cache[6+8*0] = h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - s->mb_stride]+2]; + h->intra4x4_pred_mode_cache[7+8*0] = h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - s->mb_stride]+3]; if (h->intra4x4_pred_mode_cache[4+8*0] == -1) { h->top_samples_available = 0x33FF; @@ -624,7 +624,7 @@ static int svq3_decode_mb(H264Context *h } } if (!IS_INTRA4x4(mb_type)) { - memset(h->intra4x4_pred_mode[mb_xy], DC_PRED, 8); + memset(h->intra4x4_pred_mode+8*h->mb2br_xy[mb_xy], DC_PRED, 8); } if (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE) { memset(h->non_zero_count_cache + 8, 0, 4*9*sizeof(uint8_t)); @@ -774,14 +774,14 @@ static int svq3_decode_slice_header(H264 /* reset intra predictors and invalidate motion vector references */ if (s->mb_x > 0) { - memset(h->intra4x4_pred_mode[mb_xy - 1], -1, 4*sizeof(int8_t)); - memset(h->intra4x4_pred_mode[mb_xy - s->mb_x], -1, 8*sizeof(int8_t)*s->mb_x); + memset(h->intra4x4_pred_mode+8*h->mb2br_xy[mb_xy - 1 ]+3, -1, 4*sizeof(int8_t)); + memset(h->intra4x4_pred_mode+8*h->mb2br_xy[mb_xy - s->mb_x] , -1, 8*sizeof(int8_t)*s->mb_x); } if (s->mb_y > 0) { - memset(h->intra4x4_pred_mode[mb_xy - s->mb_stride], -1, 8*sizeof(int8_t)*(s->mb_width - s->mb_x)); + memset(h->intra4x4_pred_mode+8*h->mb2br_xy[mb_xy - s->mb_stride], -1, 8*sizeof(int8_t)*(s->mb_width - s->mb_x)); if (s->mb_x > 0) { - h->intra4x4_pred_mode[mb_xy - s->mb_stride - 1][3] = -1; + h->intra4x4_pred_mode[8*h->mb2br_xy[mb_xy - s->mb_stride - 1]+3] = -1; } }

1 0

r22059 - trunk/libavformat/asfenc.c
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: benoit Date: Thu Feb 25 17:59:55 2010 New Revision: 22059 Log: asfenc: write tags in proper UTF-16. Patch by Anton Khirnov wyskas gmail com Modified: trunk/libavformat/asfenc.c Modified: trunk/libavformat/asfenc.c ============================================================================== --- trunk/libavformat/asfenc.c Thu Feb 25 17:50:26 2010 (r22058) +++ trunk/libavformat/asfenc.c Thu Feb 25 17:59:55 2010 (r22059) @@ -203,14 +203,36 @@ static void put_guid(ByteIOContext *s, c put_buffer(s, *g, sizeof(*g)); } -static void put_str16_nolen(ByteIOContext *s, const char *tag) +static int put_str16_nolen(ByteIOContext *s, const char *tag) { - int c; + const uint8_t *q = tag; + int ret = 0; - do{ - c = (uint8_t)*tag++; - put_le16(s, c); - }while(c); + while (*q) { + uint32_t ch; + uint16_t tmp; + + GET_UTF8(ch, *q++, break;) + PUT_UTF16(ch, tmp, put_le16(s, tmp);ret += 2;) + } + put_le16(s, 0); + ret += 2; + return ret; +} + +static void put_str16(ByteIOContext *s, const char *tag) +{ + int len; + uint8_t *pb; + ByteIOContext *dyn_buf; + if (url_open_dyn_buf(&dyn_buf) < 0) + return; + + put_str16_nolen(dyn_buf, tag); + len = url_close_dyn_buf(dyn_buf, &pb); + put_le16(s, len); + put_buffer(s, pb, len); + av_freep(&pb); } static int64_t put_header(ByteIOContext *pb, const ff_asf_guid *g) @@ -329,12 +351,22 @@ static int asf_write_header1(AVFormatCon /* title and other infos */ if (has_title) { + int len; + uint8_t *buf; + ByteIOContext *dyn_buf; + + if (url_open_dyn_buf(&dyn_buf) < 0) + return AVERROR(ENOMEM); + hpos = put_header(pb, &ff_asf_comment_header); - for (n = 0; n < FF_ARRAY_ELEMS(tags); n++) - put_le16(pb, tags[n] ? 2*(strlen(tags[n]->value) + 1) : 0); - for (n = 0; n < FF_ARRAY_ELEMS(tags); n++) - if (tags[n]) - put_str16_nolen(pb, tags[n]->value); + + for (n = 0; n < FF_ARRAY_ELEMS(tags); n++) { + len = tags[n] ? put_str16_nolen(dyn_buf, tags[n]->value) : 0; + put_le16(pb, len); + } + len = url_close_dyn_buf(dyn_buf, &buf); + put_buffer(pb, buf, len); + av_freep(&buf); end_header(pb, hpos); } if (metadata_count) { @@ -342,11 +374,9 @@ static int asf_write_header1(AVFormatCon hpos = put_header(pb, &ff_asf_extended_content_header); put_le16(pb, metadata_count); while ((tag = av_metadata_get(s->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX))) { - put_le16(pb, 2*(strlen(tag->key) + 1)); - put_str16_nolen(pb, tag->key); + put_str16(pb, tag->key); put_le16(pb, 0); - put_le16(pb, 2*(strlen(tag->value) + 1)); - put_str16_nolen(pb, tag->value); + put_str16(pb, tag->value); } end_header(pb, hpos); } @@ -437,6 +467,9 @@ static int asf_write_header1(AVFormatCon for(n=0;n<s->nb_streams;n++) { AVCodec *p; const char *desc; + int len; + uint8_t *buf; + ByteIOContext *dyn_buf; enc = s->streams[n]->codec; p = avcodec_find_encoder(enc->codec_id); @@ -452,8 +485,17 @@ static int asf_write_header1(AVFormatCon desc = "Windows Media Audio V8"; else desc = p ? p->name : enc->codec_name; - put_le16(pb, strlen(desc) + 1); // "number of characters" = length in bytes / 2 - put_str16_nolen(pb, desc); + + if ( url_open_dyn_buf(&dyn_buf) < 0) + return AVERROR(ENOMEM); + + put_str16_nolen(dyn_buf, desc); + len = url_close_dyn_buf(dyn_buf, &buf); + put_le16(pb, len / 2); // "number of characters" = length in bytes / 2 + + put_buffer(pb, buf, len); + av_freep(&buf); + put_le16(pb, 0); /* no parameters */

1 0

r22058 - trunk/libavformat/asfenc.c
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: benoit Date: Thu Feb 25 17:50:26 2010 New Revision: 22058 Log: asfenc: simplify writing of comment header. Patch by Anton Khirnov wyskas gmail com Modified: trunk/libavformat/asfenc.c Modified: trunk/libavformat/asfenc.c ============================================================================== --- trunk/libavformat/asfenc.c Thu Feb 25 17:38:23 2010 (r22057) +++ trunk/libavformat/asfenc.c Thu Feb 25 17:50:26 2010 (r22058) @@ -265,7 +265,7 @@ static int asf_write_header1(AVFormatCon { ASFContext *asf = s->priv_data; ByteIOContext *pb = s->pb; - AVMetadataTag *title, *author, *copyright, *comment; + AVMetadataTag *tags[5]; int header_size, n, extra_size, extra_size2, wav_extra_size, file_time; int has_title; int metadata_count; @@ -274,13 +274,14 @@ static int asf_write_header1(AVFormatCon int bit_rate; int64_t duration; - title = av_metadata_get(s->metadata, "title" , NULL, 0); - author = av_metadata_get(s->metadata, "author" , NULL, 0); - copyright = av_metadata_get(s->metadata, "copyright", NULL, 0); - comment = av_metadata_get(s->metadata, "comment" , NULL, 0); + tags[0] = av_metadata_get(s->metadata, "title" , NULL, 0); + tags[1] = av_metadata_get(s->metadata, "author" , NULL, 0); + tags[2] = av_metadata_get(s->metadata, "copyright", NULL, 0); + tags[3] = av_metadata_get(s->metadata, "comment" , NULL, 0); + tags[4] = av_metadata_get(s->metadata, "rating" , NULL, 0); duration = asf->duration + PREROLL_TIME * 10000; - has_title = title || author || copyright || comment; + has_title = tags[0] || tags[1] || tags[2] || tags[3] || tags[4]; metadata_count = s->metadata ? s->metadata->count : 0; bit_rate = 0; @@ -329,15 +330,11 @@ static int asf_write_header1(AVFormatCon /* title and other infos */ if (has_title) { hpos = put_header(pb, &ff_asf_comment_header); - put_le16(pb, title ? 2 * (strlen(title->value ) + 1) : 0); - put_le16(pb, author ? 2 * (strlen(author->value ) + 1) : 0); - put_le16(pb, copyright ? 2 * (strlen(copyright->value) + 1) : 0); - put_le16(pb, comment ? 2 * (strlen(comment->value ) + 1) : 0); - put_le16(pb, 0); - if (title ) put_str16_nolen(pb, title->value ); - if (author ) put_str16_nolen(pb, author->value ); - if (copyright) put_str16_nolen(pb, copyright->value); - if (comment ) put_str16_nolen(pb, comment->value ); + for (n = 0; n < FF_ARRAY_ELEMS(tags); n++) + put_le16(pb, tags[n] ? 2*(strlen(tags[n]->value) + 1) : 0); + for (n = 0; n < FF_ARRAY_ELEMS(tags); n++) + if (tags[n]) + put_str16_nolen(pb, tags[n]->value); end_header(pb, hpos); } if (metadata_count) {

1 0

r22057 - trunk/libavformat/asfdec.c
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: benoit Date: Thu Feb 25 17:38:23 2010 New Revision: 22057 Log: asfdec: don't strip the "WM/" prefix, this should be done during conversion. Patch by Anton Khirnov wyskas gmail com Modified: trunk/libavformat/asfdec.c Modified: trunk/libavformat/asfdec.c ============================================================================== --- trunk/libavformat/asfdec.c Thu Feb 25 16:29:12 2010 (r22056) +++ trunk/libavformat/asfdec.c Thu Feb 25 17:38:23 2010 (r22057) @@ -175,8 +175,6 @@ static void get_tag(AVFormatContext *s, av_log(s, AV_LOG_DEBUG, "Unsupported value type %d in tag %s.\n", type, key); return; } - if (!strncmp(key, "WM/", 3)) - key += 3; av_metadata_set2(&s->metadata, key, value, 0); av_freep(&value); }

1 0

r22056 - trunk/libavcodec/h264.c
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: michael Date: Thu Feb 25 16:29:12 2010 New Revision: 22056 Log: Dont allocate direct_table 8 times too large. Modified: trunk/libavcodec/h264.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c Thu Feb 25 16:27:55 2010 (r22055) +++ trunk/libavcodec/h264.c Thu Feb 25 16:29:12 2010 (r22056) @@ -756,7 +756,7 @@ int ff_h264_alloc_tables(H264Context *h) FF_ALLOCZ_OR_GOTO(h->s.avctx, h->chroma_pred_mode_table, big_mb_num * sizeof(uint8_t), fail) FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mvd_table[0], 16*big_mb_num * sizeof(uint8_t), fail); FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mvd_table[1], 16*big_mb_num * sizeof(uint8_t), fail); - FF_ALLOCZ_OR_GOTO(h->s.avctx, h->direct_table, 32*big_mb_num * sizeof(uint8_t) , fail); + FF_ALLOCZ_OR_GOTO(h->s.avctx, h->direct_table, 4*big_mb_num * sizeof(uint8_t) , fail); FF_ALLOCZ_OR_GOTO(h->s.avctx, h->list_counts, big_mb_num * sizeof(uint8_t), fail) memset(h->slice_table_base, -1, (big_mb_num+s->mb_stride) * sizeof(*h->slice_table_base));

1 0

r22055 - trunk/libavcodec/h264.h
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: michael Date: Thu Feb 25 16:27:55 2010 New Revision: 22055 Log: Store data in direct_table interleaved. seems 20cpu cycles faster Modified: trunk/libavcodec/h264.h Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Thu Feb 25 15:54:31 2010 (r22054) +++ trunk/libavcodec/h264.h Thu Feb 25 16:27:55 2010 (r22055) @@ -1088,9 +1088,9 @@ static void fill_decode_caches(H264Conte if(IS_DIRECT(top_type)){ AV_WN32A(&h->direct_cache[scan8[0] - 1*8], 0x01010101*(MB_TYPE_DIRECT2>>1)); }else if(IS_8X8(top_type)){ - int b8_xy = h->mb2b8_xy[top_xy] + h->b8_stride; - h->direct_cache[scan8[0] + 0 - 1*8]= h->direct_table[b8_xy]; - h->direct_cache[scan8[0] + 2 - 1*8]= h->direct_table[b8_xy + 1]; + int b8_xy = 4*top_xy; + h->direct_cache[scan8[0] + 0 - 1*8]= h->direct_table[b8_xy + 2]; + h->direct_cache[scan8[0] + 2 - 1*8]= h->direct_table[b8_xy + 3]; }else{ AV_WN32A(&h->direct_cache[scan8[0] - 1*8], 0x01010101*(MB_TYPE_16x16>>1)); } @@ -1098,14 +1098,14 @@ static void fill_decode_caches(H264Conte if(IS_DIRECT(left_type[0])) h->direct_cache[scan8[0] - 1 + 0*8]= MB_TYPE_DIRECT2>>1; else if(IS_8X8(left_type[0])) - h->direct_cache[scan8[0] - 1 + 0*8]= h->direct_table[h->mb2b8_xy[left_xy[0]] + 1 + h->b8_stride*(left_block[0]>>1)]; + h->direct_cache[scan8[0] - 1 + 0*8]= h->direct_table[4*left_xy[0] + 1 + (left_block[0]&~1)]; else h->direct_cache[scan8[0] - 1 + 0*8]= MB_TYPE_16x16>>1; if(IS_DIRECT(left_type[1])) h->direct_cache[scan8[0] - 1 + 2*8]= MB_TYPE_DIRECT2>>1; else if(IS_8X8(left_type[1])) - h->direct_cache[scan8[0] - 1 + 2*8]= h->direct_table[h->mb2b8_xy[left_xy[1]] + 1 + h->b8_stride*(left_block[2]>>1)]; + h->direct_cache[scan8[0] - 1 + 2*8]= h->direct_table[4*left_xy[1] + 1 + (left_block[2]&~1)]; else h->direct_cache[scan8[0] - 1 + 2*8]= MB_TYPE_16x16>>1; } @@ -1433,10 +1433,10 @@ static inline void write_back_motion(H26 if(h->slice_type_nos == FF_B_TYPE && CABAC){ if(IS_8X8(mb_type)){ - uint8_t *direct_table = &h->direct_table[b8_xy]; - direct_table[1+0*h->b8_stride] = h->sub_mb_type[1]>>1; - direct_table[0+1*h->b8_stride] = h->sub_mb_type[2]>>1; - direct_table[1+1*h->b8_stride] = h->sub_mb_type[3]>>1; + uint8_t *direct_table = &h->direct_table[4*h->mb_xy]; + direct_table[1] = h->sub_mb_type[1]>>1; + direct_table[2] = h->sub_mb_type[2]>>1; + direct_table[3] = h->sub_mb_type[3]>>1; } } }

1 0

r22054 - trunk/libavcodec/h264.h
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: michael Date: Thu Feb 25 15:54:31 2010 New Revision: 22054 Log: Simplify intra4x4_pred_mode_cache init. Modified: trunk/libavcodec/h264.h Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Thu Feb 25 15:26:12 2010 (r22053) +++ trunk/libavcodec/h264.h Thu Feb 25 15:54:31 2010 (r22054) @@ -888,16 +888,10 @@ static void fill_decode_caches(H264Conte if(IS_INTRA4x4(top_type)){ AV_COPY32(h->intra4x4_pred_mode_cache+4+8*0, h->intra4x4_pred_mode + h->mb2br_xy[top_xy]); }else{ - int pred; - if(!(top_type & type_mask)) - pred= -1; - else{ - pred= 2; - } h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode_cache[6+8*0]= - h->intra4x4_pred_mode_cache[7+8*0]= pred; + h->intra4x4_pred_mode_cache[7+8*0]= 2 - 3*!(top_type & type_mask); } for(i=0; i<2; i++){ if(IS_INTRA4x4(left_type[i])){ @@ -905,14 +899,8 @@ static void fill_decode_caches(H264Conte h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= mode[6-left_block[0+2*i]]; h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= mode[6-left_block[1+2*i]]; }else{ - int pred; - if(!(left_type[i] & type_mask)) - pred= -1; - else{ - pred= 2; - } h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= - h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred; + h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= 2 - 3*!(left_type[i] & type_mask); } } }

1 0

[propchange]: r22053 - svn:log
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: michael Revision: 22053 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,2 @@ Reorder intra4x4_pred_mode so that we can read/write 4 values at once. +3-7 cpu cycles faster

1 0

r22053 - in trunk/libavcodec: h264.c h264.h
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: michael Date: Thu Feb 25 15:26:12 2010 New Revision: 22053 Log: Reorder intra4x4_pred_mode so that we can read/write 4 values at once. Modified: trunk/libavcodec/h264.c trunk/libavcodec/h264.h Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c Thu Feb 25 15:02:39 2010 (r22052) +++ trunk/libavcodec/h264.c Thu Feb 25 15:26:12 2010 (r22053) @@ -54,13 +54,10 @@ static const uint8_t div6[52]={ void ff_h264_write_back_intra_pred_mode(H264Context *h){ int8_t *mode= h->intra4x4_pred_mode + h->mb2br_xy[h->mb_xy]; - mode[0]= h->intra4x4_pred_mode_cache[7+8*1]; - mode[1]= h->intra4x4_pred_mode_cache[7+8*2]; - mode[2]= h->intra4x4_pred_mode_cache[7+8*3]; - mode[3]= h->intra4x4_pred_mode_cache[7+8*4]; - mode[4]= h->intra4x4_pred_mode_cache[4+8*4]; - mode[5]= h->intra4x4_pred_mode_cache[5+8*4]; - mode[6]= h->intra4x4_pred_mode_cache[6+8*4]; + AV_COPY32(mode, h->intra4x4_pred_mode_cache + 4 + 8*4); + mode[4]= h->intra4x4_pred_mode_cache[7+8*3]; + mode[5]= h->intra4x4_pred_mode_cache[7+8*2]; + mode[6]= h->intra4x4_pred_mode_cache[7+8*1]; } /** Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Thu Feb 25 15:02:39 2010 (r22052) +++ trunk/libavcodec/h264.h Thu Feb 25 15:26:12 2010 (r22053) @@ -886,11 +886,7 @@ static void fill_decode_caches(H264Conte if(IS_INTRA4x4(mb_type)){ if(IS_INTRA4x4(top_type)){ - int8_t *mode= h->intra4x4_pred_mode + h->mb2br_xy[top_xy]; - h->intra4x4_pred_mode_cache[4+8*0]= mode[4]; - h->intra4x4_pred_mode_cache[5+8*0]= mode[5]; - h->intra4x4_pred_mode_cache[6+8*0]= mode[6]; - h->intra4x4_pred_mode_cache[7+8*0]= mode[3]; + AV_COPY32(h->intra4x4_pred_mode_cache+4+8*0, h->intra4x4_pred_mode + h->mb2br_xy[top_xy]); }else{ int pred; if(!(top_type & type_mask)) @@ -906,8 +902,8 @@ static void fill_decode_caches(H264Conte for(i=0; i<2; i++){ if(IS_INTRA4x4(left_type[i])){ int8_t *mode= h->intra4x4_pred_mode + h->mb2br_xy[left_xy[i]]; - h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= mode[left_block[0+2*i]]; - h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= mode[left_block[1+2*i]]; + h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= mode[6-left_block[0+2*i]]; + h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= mode[6-left_block[1+2*i]]; }else{ int pred; if(!(left_type[i] & type_mask))

1 0

r22051 - trunk/libavcodec/h264.h
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: michael Date: Thu Feb 25 13:51:32 2010 New Revision: 22051 Log: unroll tiny and trivial loop. Same speed but clearer. Modified: trunk/libavcodec/h264.h Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Thu Feb 25 10:10:37 2010 (r22050) +++ trunk/libavcodec/h264.h Thu Feb 25 13:51:32 2010 (r22051) @@ -1430,9 +1430,9 @@ static inline void write_back_motion(H26 AV_ZERO128(mvd_dst); else{ AV_COPY64(mvd_dst, mvd_src + 8*3); - for(y=0; y<3; y++){ - AV_COPY16(mvd_dst + 3 + 3 - y, mvd_src + 3 + 8*y); - } + AV_COPY16(mvd_dst + 3 + 3, mvd_src + 3 + 8*0); + AV_COPY16(mvd_dst + 3 + 2, mvd_src + 3 + 8*1); + AV_COPY16(mvd_dst + 3 + 1, mvd_src + 3 + 8*2); } }

1 0

r22050 - trunk/libavformat/asf.c
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: benoit Date: Thu Feb 25 10:10:37 2010 New Revision: 22050 Log: asf: indent. Patch from Anton Khirnov wyskas gmail com Modified: trunk/libavformat/asf.c Modified: trunk/libavformat/asf.c ============================================================================== --- trunk/libavformat/asf.c Thu Feb 25 10:09:39 2010 (r22049) +++ trunk/libavformat/asf.c Thu Feb 25 10:10:37 2010 (r22050) @@ -130,9 +130,9 @@ const ff_asf_guid ff_asf_digital_signatu /* List of official tags at http://msdn.microsoft.com/en-us/library/dd743066(VS.85).aspx */ const AVMetadataConv ff_asf_metadata_conv[] = { - { "WM/AlbumArtist", "album_artist"}, - { "WM/AlbumTitle" , "album" }, - { "Author" , "artist" }, + { "WM/AlbumArtist" , "album_artist"}, + { "WM/AlbumTitle" , "album " }, + { "Author" , "artist" }, { "Description" , "comment" }, { "WM/Composer" , "composer" }, { "WM/EncodedBy" , "encoded_by" }, @@ -143,8 +143,8 @@ const AVMetadataConv ff_asf_metadata_con { "WM/PartOfSet" , "disc" }, { "WM/Publisher" , "publisher" }, { "WM/Tool" , "encoder" }, - { "WM/TrackNumber", "track" }, + { "WM/TrackNumber" , "track" }, { "WM/Track" , "track" }, -// { "Year" , "date" }, TODO: conversion year<->date +// { "Year" , "date" }, TODO: conversion year<->date { 0 } };

1 0

r22049 - trunk/libavformat/asf.c
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: benoit Date: Thu Feb 25 10:09:39 2010 New Revision: 22049 Log: asf: add more entries to metadata conv table. Patch from Anton Khirnov wyskas gmail com Modified: trunk/libavformat/asf.c Modified: trunk/libavformat/asf.c ============================================================================== --- trunk/libavformat/asf.c Thu Feb 25 05:11:33 2010 (r22048) +++ trunk/libavformat/asf.c Thu Feb 25 10:09:39 2010 (r22049) @@ -128,11 +128,23 @@ const ff_asf_guid ff_asf_digital_signatu 0xfc, 0xb3, 0x11, 0x22, 0x23, 0xbd, 0xd2, 0x11, 0xb4, 0xb7, 0x00, 0xa0, 0xc9, 0x55, 0xfc, 0x6e }; +/* List of official tags at http://msdn.microsoft.com/en-us/library/dd743066(VS.85).aspx */ const AVMetadataConv ff_asf_metadata_conv[] = { { "WM/AlbumArtist", "album_artist"}, { "WM/AlbumTitle" , "album" }, { "Author" , "artist" }, + { "Description" , "comment" }, + { "WM/Composer" , "composer" }, + { "WM/EncodedBy" , "encoded_by" }, + { "WM/EncodingSettings", "encoder" }, + { "WM/Genre" , "genre" }, + { "WM/Language" , "language" }, + { "WM/OriginalFilename", "filename" }, + { "WM/PartOfSet" , "disc" }, + { "WM/Publisher" , "publisher" }, + { "WM/Tool" , "encoder" }, { "WM/TrackNumber", "track" }, + { "WM/Track" , "track" }, // { "Year" , "date" }, TODO: conversion year<->date { 0 } };

1 0

r21850 - in trunk/libavformat: avi.c avienc.c metadata.c metadata.h mp3.c utils.c
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: rbultje Date: Tue Feb 16 17:32:25 2010 New Revision: 21850 Log: Set lavf identification string globally in av_write_header(), rather than inside the muxers. Remove special handling of "encoder" tags from AVI and MP3 muxers. Patch by Anton Khirnov <wyskas gmail com>. Modified: trunk/libavformat/avi.c trunk/libavformat/avienc.c trunk/libavformat/metadata.c trunk/libavformat/metadata.h trunk/libavformat/mp3.c trunk/libavformat/utils.c Modified: trunk/libavformat/avi.c ============================================================================== --- trunk/libavformat/avi.c Tue Feb 16 15:48:01 2010 (r21849) +++ trunk/libavformat/avi.c Tue Feb 16 17:32:25 2010 (r21850) @@ -40,6 +40,6 @@ const AVMetadataConv ff_avi_metadata_con const char ff_avi_tags[][5] = { "IARL", "IART", "ICMS", "ICMT", "ICOP", "ICRD", "ICRP", "IDIM", "IDPI", "IENG", "IGNR", "IKEY", "ILGT", "ILNG", "IMED", "INAM", "IPLT", "IPRD", - "IPRT", "ISBJ",/*"ISFT"*/"ISHP", "ISRC", "ISRF", "ITCH", + "IPRT", "ISBJ", "ISFT", "ISHP", "ISRC", "ISRF", "ITCH", {0} }; Modified: trunk/libavformat/avienc.c ============================================================================== --- trunk/libavformat/avienc.c Tue Feb 16 15:48:01 2010 (r21849) +++ trunk/libavformat/avienc.c Tue Feb 16 17:32:25 2010 (r21850) @@ -376,8 +376,6 @@ static int avi_write_header(AVFormatCont if ((t = av_metadata_get(s->metadata, ff_avi_tags[i], NULL, AV_METADATA_MATCH_CASE))) avi_write_info_tag(s->pb, t->key, t->value); } - if(!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) - avi_write_info_tag(pb, "ISFT", LIBAVFORMAT_IDENT); ff_end_tag(pb, list2); /* some padding for easier tag editing */ Modified: trunk/libavformat/metadata.c ============================================================================== --- trunk/libavformat/metadata.c Tue Feb 16 15:48:01 2010 (r21849) +++ trunk/libavformat/metadata.c Tue Feb 16 17:32:25 2010 (r21850) @@ -105,7 +105,7 @@ void av_metadata_free(AVMetadata **pm) av_freep(pm); } -static void metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv, +void metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv, const AVMetadataConv *s_conv) { /* TODO: use binary search to look up the two conversion tables Modified: trunk/libavformat/metadata.h ============================================================================== --- trunk/libavformat/metadata.h Tue Feb 16 15:48:01 2010 (r21849) +++ trunk/libavformat/metadata.h Tue Feb 16 17:32:25 2010 (r21850) @@ -45,4 +45,7 @@ void ff_metadata_demux_compat(AVFormatCo void ff_metadata_mux_compat(AVFormatContext *s); #endif +void metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv, + const AVMetadataConv *s_conv); + #endif /* AVFORMAT_METADATA_H */ Modified: trunk/libavformat/mp3.c ============================================================================== --- trunk/libavformat/mp3.c Tue Feb 16 15:48:01 2010 (r21849) +++ trunk/libavformat/mp3.c Tue Feb 16 17:32:25 2010 (r21850) @@ -313,7 +313,7 @@ static int mp3_write_header(struct AVFor while ((t = av_metadata_get(s->metadata, "", t, AV_METADATA_IGNORE_SUFFIX))) { uint32_t tag = 0; - if (t->key[0] == 'T' && strcmp(t->key, "TSSE")) { + if (t->key[0] == 'T' && strlen(t->key) == 4) { int i; for (i = 0; *ff_id3v2_tags[i]; i++) if (AV_RB32(t->key) == AV_RB32(ff_id3v2_tags[i])) { @@ -338,11 +338,6 @@ static int mp3_write_header(struct AVFor av_free(buf); } } - if(!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) { - totlen += strlen(LIBAVFORMAT_IDENT) + ID3v2_HEADER_SIZE + 2; - id3v2_put_ttag(s, LIBAVFORMAT_IDENT, strlen(LIBAVFORMAT_IDENT) + 1, - MKBETAG('T', 'S', 'S', 'E')); - } cur_pos = url_ftell(s->pb); url_fseek(s->pb, size_pos, SEEK_SET); Modified: trunk/libavformat/utils.c ============================================================================== --- trunk/libavformat/utils.c Tue Feb 16 15:48:01 2010 (r21849) +++ trunk/libavformat/utils.c Tue Feb 16 17:32:25 2010 (r21850) @@ -2583,6 +2583,20 @@ int av_write_header(AVFormatContext *s) ff_metadata_mux_compat(s); #endif + /* set muxer identification string */ + if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) { + AVMetadata *m; + AVMetadataTag *t; + + if (!(m = av_mallocz(sizeof(AVMetadata)))) + return AVERROR(ENOMEM); + av_metadata_set2(&m, "encoder", LIBAVFORMAT_IDENT, 0); + metadata_conv(&m, s->oformat->metadata_conv, NULL); + if ((t = av_metadata_get(m, "", NULL, AV_METADATA_IGNORE_SUFFIX))) + av_metadata_set2(&s->metadata, t->key, t->value, 0); + av_metadata_free(&m); + } + if(s->oformat->write_header){ ret = s->oformat->write_header(s); if (ret < 0)

7 6

r22048 - in trunk/libavcodec: h264.c h264.h
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: michael Date: Thu Feb 25 05:11:33 2010 New Revision: 22048 Log: Cut the size of mvd_table by yet another factor of 2. The code read/write code itself was 1 cycle faster, overall its likely more due to cache effects Modified: trunk/libavcodec/h264.c trunk/libavcodec/h264.h Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c Thu Feb 25 03:42:25 2010 (r22047) +++ trunk/libavcodec/h264.c Thu Feb 25 05:11:33 2010 (r22048) @@ -757,8 +757,8 @@ int ff_h264_alloc_tables(H264Context *h) FF_ALLOCZ_OR_GOTO(h->s.avctx, h->cbp_table, big_mb_num * sizeof(uint16_t), fail) FF_ALLOCZ_OR_GOTO(h->s.avctx, h->chroma_pred_mode_table, big_mb_num * sizeof(uint8_t), fail) - FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mvd_table[0], 32*big_mb_num * sizeof(uint8_t), fail); - FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mvd_table[1], 32*big_mb_num * sizeof(uint8_t), fail); + FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mvd_table[0], 16*big_mb_num * sizeof(uint8_t), fail); + FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mvd_table[1], 16*big_mb_num * sizeof(uint8_t), fail); FF_ALLOCZ_OR_GOTO(h->s.avctx, h->direct_table, 32*big_mb_num * sizeof(uint8_t) , fail); FF_ALLOCZ_OR_GOTO(h->s.avctx, h->list_counts, big_mb_num * sizeof(uint8_t), fail) @@ -775,7 +775,7 @@ int ff_h264_alloc_tables(H264Context *h) const int b8_xy= 2*x + 2*y*h->b8_stride; h->mb2b_xy [mb_xy]= b_xy; - h->mb2br_xy[mb_xy]= FMO ? b_xy : (b_xy % (8*h->b_stride)); + h->mb2br_xy[mb_xy]= 8*(FMO ? mb_xy : (mb_xy % (2*s->mb_stride))); h->mb2b8_xy[mb_xy]= b8_xy; } } Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Thu Feb 25 03:42:25 2010 (r22047) +++ trunk/libavcodec/h264.h Thu Feb 25 05:11:33 2010 (r22048) @@ -1070,23 +1070,23 @@ static void fill_decode_caches(H264Conte if( CABAC ) { /* XXX beurk, Load mvd */ if(USES_LIST(top_type, list)){ - const int b_xy= h->mb2br_xy[top_xy] + 3*h->b_stride; + const int b_xy= h->mb2br_xy[top_xy]; AV_COPY64(h->mvd_cache[list][scan8[0] + 0 - 1*8], h->mvd_table[list][b_xy + 0]); }else{ AV_ZERO64(h->mvd_cache[list][scan8[0] + 0 - 1*8]); } if(USES_LIST(left_type[0], list)){ - const int b_xy= h->mb2br_xy[left_xy[0]] + 3; - AV_COPY16(h->mvd_cache[list][scan8[0] - 1 + 0*8], h->mvd_table[list][b_xy + h->b_stride*left_block[0]]); - AV_COPY16(h->mvd_cache[list][scan8[0] - 1 + 1*8], h->mvd_table[list][b_xy + h->b_stride*left_block[1]]); + const int b_xy= h->mb2br_xy[left_xy[0]] + 6; + AV_COPY16(h->mvd_cache[list][scan8[0] - 1 + 0*8], h->mvd_table[list][b_xy - left_block[0]]); + AV_COPY16(h->mvd_cache[list][scan8[0] - 1 + 1*8], h->mvd_table[list][b_xy - left_block[1]]); }else{ AV_ZERO16(h->mvd_cache [list][scan8[0] - 1 + 0*8]); AV_ZERO16(h->mvd_cache [list][scan8[0] - 1 + 1*8]); } if(USES_LIST(left_type[1], list)){ - const int b_xy= h->mb2br_xy[left_xy[1]] + 3; - AV_COPY16(h->mvd_cache[list][scan8[0] - 1 + 2*8], h->mvd_table[list][b_xy + h->b_stride*left_block[2]]); - AV_COPY16(h->mvd_cache[list][scan8[0] - 1 + 3*8], h->mvd_table[list][b_xy + h->b_stride*left_block[3]]); + const int b_xy= h->mb2br_xy[left_xy[1]] + 6; + AV_COPY16(h->mvd_cache[list][scan8[0] - 1 + 2*8], h->mvd_table[list][b_xy - left_block[2]]); + AV_COPY16(h->mvd_cache[list][scan8[0] - 1 + 3*8], h->mvd_table[list][b_xy - left_block[3]]); }else{ AV_ZERO16(h->mvd_cache [list][scan8[0] - 1 + 2*8]); AV_ZERO16(h->mvd_cache [list][scan8[0] - 1 + 3*8]); @@ -1424,13 +1424,15 @@ static inline void write_back_motion(H26 AV_COPY128(mv_dst + y*b_stride, mv_src + 8*y); } if( CABAC ) { - uint8_t (*mvd_dst)[2] = &h->mvd_table[list][FMO ? b_xy : h->mb2br_xy[h->mb_xy]]; + uint8_t (*mvd_dst)[2] = &h->mvd_table[list][FMO ? 8*h->mb_xy : h->mb2br_xy[h->mb_xy]]; uint8_t (*mvd_src)[2] = &h->mvd_cache[list][scan8[0]]; if(IS_SKIP(mb_type)) - fill_rectangle(mvd_dst, 4, 4, h->b_stride, 0, 2); - else - for(y=0; y<4; y++){ - AV_COPY64(mvd_dst + y*b_stride, mvd_src + 8*y); + AV_ZERO128(mvd_dst); + else{ + AV_COPY64(mvd_dst, mvd_src + 8*3); + for(y=0; y<3; y++){ + AV_COPY16(mvd_dst + 3 + 3 - y, mvd_src + 3 + 8*y); + } } }

1 0

r22047 - in trunk/libavcodec: h264.c h264.h
by subversion＠mplayerhq.hu 25 Feb '10

25 Feb '10

Author: michael Date: Thu Feb 25 03:42:25 2010 New Revision: 22047 Log: Keep mvd_table values of only 2 mb rows. Modified: trunk/libavcodec/h264.c trunk/libavcodec/h264.h Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c Thu Feb 25 01:16:43 2010 (r22046) +++ trunk/libavcodec/h264.c Thu Feb 25 03:42:25 2010 (r22047) @@ -663,6 +663,7 @@ static void free_tables(H264Context *h){ av_freep(&h->list_counts); av_freep(&h->mb2b_xy); + av_freep(&h->mb2br_xy); av_freep(&h->mb2b8_xy); for(i = 0; i < MAX_THREADS; i++) { @@ -765,6 +766,7 @@ int ff_h264_alloc_tables(H264Context *h) h->slice_table= h->slice_table_base + s->mb_stride*2 + 1; FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mb2b_xy , big_mb_num * sizeof(uint32_t), fail); + FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mb2br_xy , big_mb_num * sizeof(uint32_t), fail); FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mb2b8_xy , big_mb_num * sizeof(uint32_t), fail); for(y=0; y<s->mb_height; y++){ for(x=0; x<s->mb_width; x++){ @@ -773,6 +775,7 @@ int ff_h264_alloc_tables(H264Context *h) const int b8_xy= 2*x + 2*y*h->b8_stride; h->mb2b_xy [mb_xy]= b_xy; + h->mb2br_xy[mb_xy]= FMO ? b_xy : (b_xy % (8*h->b_stride)); h->mb2b8_xy[mb_xy]= b8_xy; } } @@ -797,6 +800,7 @@ static void clone_tables(H264Context *ds dst->slice_table = src->slice_table; dst->cbp_table = src->cbp_table; dst->mb2b_xy = src->mb2b_xy; + dst->mb2br_xy = src->mb2br_xy; dst->mb2b8_xy = src->mb2b8_xy; dst->chroma_pred_mode_table = src->chroma_pred_mode_table; dst->mvd_table[0] = src->mvd_table[0]; Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Thu Feb 25 01:16:43 2010 (r22046) +++ trunk/libavcodec/h264.h Thu Feb 25 03:42:25 2010 (r22047) @@ -61,6 +61,8 @@ #define ALLOW_NOCHROMA +#define FMO 0 + /** * The maximum number of slices supported by the decoder. * must be a power of 2 @@ -344,6 +346,7 @@ typedef struct H264Context{ int block_offset[2*(16+8)]; uint32_t *mb2b_xy; //FIXME are these 4 a good idea? + uint32_t *mb2br_xy; uint32_t *mb2b8_xy; int b_stride; //FIXME use s->b4_stride int b8_stride; @@ -1067,13 +1070,13 @@ static void fill_decode_caches(H264Conte if( CABAC ) { /* XXX beurk, Load mvd */ if(USES_LIST(top_type, list)){ - const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride; + const int b_xy= h->mb2br_xy[top_xy] + 3*h->b_stride; AV_COPY64(h->mvd_cache[list][scan8[0] + 0 - 1*8], h->mvd_table[list][b_xy + 0]); }else{ AV_ZERO64(h->mvd_cache[list][scan8[0] + 0 - 1*8]); } if(USES_LIST(left_type[0], list)){ - const int b_xy= h->mb2b_xy[left_xy[0]] + 3; + const int b_xy= h->mb2br_xy[left_xy[0]] + 3; AV_COPY16(h->mvd_cache[list][scan8[0] - 1 + 0*8], h->mvd_table[list][b_xy + h->b_stride*left_block[0]]); AV_COPY16(h->mvd_cache[list][scan8[0] - 1 + 1*8], h->mvd_table[list][b_xy + h->b_stride*left_block[1]]); }else{ @@ -1081,7 +1084,7 @@ static void fill_decode_caches(H264Conte AV_ZERO16(h->mvd_cache [list][scan8[0] - 1 + 1*8]); } if(USES_LIST(left_type[1], list)){ - const int b_xy= h->mb2b_xy[left_xy[1]] + 3; + const int b_xy= h->mb2br_xy[left_xy[1]] + 3; AV_COPY16(h->mvd_cache[list][scan8[0] - 1 + 2*8], h->mvd_table[list][b_xy + h->b_stride*left_block[2]]); AV_COPY16(h->mvd_cache[list][scan8[0] - 1 + 3*8], h->mvd_table[list][b_xy + h->b_stride*left_block[3]]); }else{ @@ -1421,7 +1424,7 @@ static inline void write_back_motion(H26 AV_COPY128(mv_dst + y*b_stride, mv_src + 8*y); } if( CABAC ) { - uint8_t (*mvd_dst)[2] = &h->mvd_table[list][b_xy]; + uint8_t (*mvd_dst)[2] = &h->mvd_table[list][FMO ? b_xy : h->mb2br_xy[h->mb_xy]]; uint8_t (*mvd_src)[2] = &h->mvd_cache[list][scan8[0]]; if(IS_SKIP(mb_type)) fill_rectangle(mvd_dst, 4, 4, h->b_stride, 0, 2);

1 0