virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

setting intra prediction modes to default values

Browse Source 
in inter macroblocks is now in its own inline
function

Originally committed as revision 9515 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefan Gehrer
2007-07-07 06:27:44 +00:00
parent 25c899471d
commit 8a35c8e71a
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/cavs.c
View File

@ -352,9 +352,6 @@ static void inter_pred(AVSContext *h, enum mb_t mb_type) {
h->s.dsp.avg_cavs_qpel_pixels_tab[1], h->s.dsp.avg_cavs_qpel_pixels_tab[1],
h->s.dsp.avg_h264_chroma_pixels_tab[1],&h->mv[MV_FWD_X3]); h->s.dsp.avg_h264_chroma_pixels_tab[1],&h->mv[MV_FWD_X3]);
} }
/* set intra prediction modes to default values */
h->pred_mode_Y[3] = h->pred_mode_Y[6] = INTRA_L_LP;
h->top_pred_Y[h->mbx*2+0] = h->top_pred_Y[h->mbx*2+1] = INTRA_L_LP;
} }
/***************************************************************************** /*****************************************************************************
@ -696,6 +693,7 @@ static void decode_mb_p(AVSContext *h, enum mb_t mb_type) {
mv_pred(h, MV_FWD_X3, MV_FWD_X0, MV_PRED_MEDIAN, BLK_8X8, ref[3]); mv_pred(h, MV_FWD_X3, MV_FWD_X0, MV_PRED_MEDIAN, BLK_8X8, ref[3]);
} }
inter_pred(h, mb_type); inter_pred(h, mb_type);
set_intra_mode_default(h);
store_mvs(h); store_mvs(h);
if(mb_type != P_SKIP) if(mb_type != P_SKIP)
decode_residual_inter(h); decode_residual_inter(h);
@ -805,6 +803,7 @@ static void decode_mb_b(AVSContext *h, enum mb_t mb_type) {
} }
} }
inter_pred(h, mb_type); inter_pred(h, mb_type);
set_intra_mode_default(h);
if(mb_type != B_SKIP) if(mb_type != B_SKIP)
decode_residual_inter(h); decode_residual_inter(h);
filter_mb(h,mb_type); filter_mb(h,mb_type);

5
libavcodec/cavs.h
View File

@ -325,6 +325,11 @@ static inline void modify_mb_i(AVSContext *h, int *pred_mode_uv) {
} }
} }
static inline void set_intra_mode_default(AVSContext *h) {
h->pred_mode_Y[3] = h->pred_mode_Y[6] = INTRA_L_LP;
h->top_pred_Y[h->mbx*2+0] = h->top_pred_Y[h->mbx*2+1] = INTRA_L_LP;
}
static inline void set_mvs(vector_t *mv, enum block_t size) { static inline void set_mvs(vector_t *mv, enum block_t size) {
switch(size) { switch(size) {
case BLK_16X16: case BLK_16X16: