Mercurial > libavcodec.hg
comparison h264_cabac.c @ 11182:0c93bb2b3cb0 libavcodec
Simplify decode_cabac_mb_intra4x4_pred_mode().
same speed
| author | michael |
|---|---|
| date | Mon, 15 Feb 2010 19:22:09 +0000 |
| parents | 63f55748173c |
| children | d1a855cb0a0c |
comparison
equal
deleted
inserted
replaced
| 11181:63f55748173c | 11182:0c93bb2b3cb0 |
|---|---|
| 794 | 794 |
| 795 mode += 1 * get_cabac( &h->cabac, &h->cabac_state[69] ); | 795 mode += 1 * get_cabac( &h->cabac, &h->cabac_state[69] ); |
| 796 mode += 2 * get_cabac( &h->cabac, &h->cabac_state[69] ); | 796 mode += 2 * get_cabac( &h->cabac, &h->cabac_state[69] ); |
| 797 mode += 4 * get_cabac( &h->cabac, &h->cabac_state[69] ); | 797 mode += 4 * get_cabac( &h->cabac, &h->cabac_state[69] ); |
| 798 | 798 |
| 799 if( mode >= pred_mode ) | 799 return mode + ( mode >= pred_mode ); |
| 800 return mode + 1; | |
| 801 else | |
| 802 return mode; | |
| 803 } | 800 } |
| 804 | 801 |
| 805 static int decode_cabac_mb_chroma_pre_mode( H264Context *h) { | 802 static int decode_cabac_mb_chroma_pre_mode( H264Context *h) { |
| 806 const int mba_xy = h->left_mb_xy[0]; | 803 const int mba_xy = h->left_mb_xy[0]; |
| 807 const int mbb_xy = h->top_mb_xy; | 804 const int mbb_xy = h->top_mb_xy; |