diff options
Diffstat (limited to 'ffmpeg/libavcodec/h263.c')
| -rw-r--r-- | ffmpeg/libavcodec/h263.c | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/ffmpeg/libavcodec/h263.c b/ffmpeg/libavcodec/h263.c index e60e58e..dafc4ec 100644 --- a/ffmpeg/libavcodec/h263.c +++ b/ffmpeg/libavcodec/h263.c @@ -27,7 +27,6 @@ * h263/mpeg4 codec. */ -//#define DEBUG #include <limits.h> #include "avcodec.h" @@ -39,8 +38,6 @@ #include "flv.h" #include "mpeg4video.h" -//#undef NDEBUG -//#include <assert.h> uint8_t ff_h263_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3]; @@ -155,8 +152,8 @@ void ff_h263_loop_filter(MpegEncContext * s){ */ if (!IS_SKIP(s->current_picture.mb_type[xy])) { qp_c= s->qscale; - s->dsp.h263_v_loop_filter(dest_y+8*linesize , linesize, qp_c); - s->dsp.h263_v_loop_filter(dest_y+8*linesize+8, linesize, qp_c); + s->h263dsp.h263_v_loop_filter(dest_y + 8 * linesize, linesize, qp_c); + s->h263dsp.h263_v_loop_filter(dest_y + 8 * linesize + 8, linesize, qp_c); }else qp_c= 0; @@ -175,15 +172,15 @@ void ff_h263_loop_filter(MpegEncContext * s){ if(qp_tc){ const int chroma_qp= s->chroma_qscale_table[qp_tc]; - s->dsp.h263_v_loop_filter(dest_y , linesize, qp_tc); - s->dsp.h263_v_loop_filter(dest_y+8, linesize, qp_tc); + s->h263dsp.h263_v_loop_filter(dest_y, linesize, qp_tc); + s->h263dsp.h263_v_loop_filter(dest_y + 8, linesize, qp_tc); - s->dsp.h263_v_loop_filter(dest_cb , uvlinesize, chroma_qp); - s->dsp.h263_v_loop_filter(dest_cr , uvlinesize, chroma_qp); + s->h263dsp.h263_v_loop_filter(dest_cb, uvlinesize, chroma_qp); + s->h263dsp.h263_v_loop_filter(dest_cr, uvlinesize, chroma_qp); } if(qp_tt) - s->dsp.h263_h_loop_filter(dest_y-8*linesize+8 , linesize, qp_tt); + s->h263dsp.h263_h_loop_filter(dest_y - 8 * linesize + 8, linesize, qp_tt); if(s->mb_x){ if (qp_tt || IS_SKIP(s->current_picture.mb_type[xy - 1 - s->mb_stride])) @@ -193,17 +190,17 @@ void ff_h263_loop_filter(MpegEncContext * s){ if(qp_dt){ const int chroma_qp= s->chroma_qscale_table[qp_dt]; - s->dsp.h263_h_loop_filter(dest_y -8*linesize , linesize, qp_dt); - s->dsp.h263_h_loop_filter(dest_cb-8*uvlinesize, uvlinesize, chroma_qp); - s->dsp.h263_h_loop_filter(dest_cr-8*uvlinesize, uvlinesize, chroma_qp); + s->h263dsp.h263_h_loop_filter(dest_y - 8 * linesize, linesize, qp_dt); + s->h263dsp.h263_h_loop_filter(dest_cb - 8 * uvlinesize, uvlinesize, chroma_qp); + s->h263dsp.h263_h_loop_filter(dest_cr - 8 * uvlinesize, uvlinesize, chroma_qp); } } } if(qp_c){ - s->dsp.h263_h_loop_filter(dest_y +8, linesize, qp_c); + s->h263dsp.h263_h_loop_filter(dest_y + 8, linesize, qp_c); if(s->mb_y + 1 == s->mb_height) - s->dsp.h263_h_loop_filter(dest_y+8*linesize+8, linesize, qp_c); + s->h263dsp.h263_h_loop_filter(dest_y + 8 * linesize + 8, linesize, qp_c); } if(s->mb_x){ @@ -214,12 +211,12 @@ void ff_h263_loop_filter(MpegEncContext * s){ qp_lc = s->current_picture.qscale_table[xy - 1]; if(qp_lc){ - s->dsp.h263_h_loop_filter(dest_y, linesize, qp_lc); + s->h263dsp.h263_h_loop_filter(dest_y, linesize, qp_lc); if(s->mb_y + 1 == s->mb_height){ const int chroma_qp= s->chroma_qscale_table[qp_lc]; - s->dsp.h263_h_loop_filter(dest_y +8* linesize, linesize, qp_lc); - s->dsp.h263_h_loop_filter(dest_cb , uvlinesize, chroma_qp); - s->dsp.h263_h_loop_filter(dest_cr , uvlinesize, chroma_qp); + s->h263dsp.h263_h_loop_filter(dest_y + 8 * linesize, linesize, qp_lc); + s->h263dsp.h263_h_loop_filter(dest_cb, uvlinesize, chroma_qp); + s->h263dsp.h263_h_loop_filter(dest_cr, uvlinesize, chroma_qp); } } } |