diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-04-10 13:18:38 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-04-10 13:18:38 +0000 |
| commit | 7bc9090a4176de2bc834e2a7df131047b944f3b5 (patch) | |
| tree | 1d57ac078ac227d652202cc1077ac565b8e36122 /libavcodec/h264data.h | |
| parent | 84876d36774b6633c2950291fbfb3db5922273fb (diff) | |
| download | ffmpeg-7bc9090a4176de2bc834e2a7df131047b944f3b5.tar.gz | |
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
more direct use of the new mb_type stuff instead of codec specific stuff
runtime mb_type debug output h264/h263 variants/mpeg1/2/4
error concealment /resilience for mpeg1/2
various minor optimizations
Originally committed as revision 1746 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264data.h')
| -rw-r--r-- | libavcodec/h264data.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h index b3737c8249..8fce4d240d 100644 --- a/libavcodec/h264data.h +++ b/libavcodec/h264data.h @@ -306,6 +306,9 @@ static const uint8_t chroma_dc_scan[4]={ (0+1*2)*16, (1+1*2)*16, //FIXME }; +#define MB_TYPE_REF0 0x40000000 +#define IS_REF0(a) ((a)&MB_TYPE_REF0) + typedef struct IMbInfo{ uint16_t type; uint8_t pred_mode; @@ -362,7 +365,7 @@ static const PMbInfo p_sub_mb_type_info[4]={ }; static const PMbInfo b_mb_type_info[23]={ -{MB_TYPE_DIRECT , 1, }, +{MB_TYPE_DIRECT2 , 1, }, {MB_TYPE_16x16|MB_TYPE_P0L0 , 1, }, {MB_TYPE_16x16 |MB_TYPE_P0L1 , 1, }, {MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1 , 1, }, @@ -388,7 +391,7 @@ static const PMbInfo b_mb_type_info[23]={ }; static const PMbInfo b_sub_mb_type_info[13]={ -{MB_TYPE_DIRECT , 1, }, +{MB_TYPE_DIRECT2 , 1, }, {MB_TYPE_16x16|MB_TYPE_P0L0 , 1, }, {MB_TYPE_16x16 |MB_TYPE_P0L1 , 1, }, {MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1 , 1, }, |