Mercurial > libavcodec.hg
comparison mpeg12.c @ 8743:92f032e1f9e1 libavcodec
convert mpeg1_decode_block_intra() to inline global
| author | pross |
|---|---|
| date | Thu, 05 Feb 2009 07:57:11 +0000 |
| parents | e9d9d946f213 |
| children | 9e7d7122a421 |
comparison
equal
deleted
inserted
replaced
| 8742:ecabe55b66bb | 8743:92f032e1f9e1 |
|---|---|
| 47 #define MB_BTYPE_VLC_BITS 6 | 47 #define MB_BTYPE_VLC_BITS 6 |
| 48 | 48 |
| 49 static inline int mpeg1_decode_block_inter(MpegEncContext *s, | 49 static inline int mpeg1_decode_block_inter(MpegEncContext *s, |
| 50 DCTELEM *block, | 50 DCTELEM *block, |
| 51 int n); | 51 int n); |
| 52 static inline int mpeg1_decode_block_intra(MpegEncContext *s, | |
| 53 DCTELEM *block, | |
| 54 int n); | |
| 55 static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n); | 52 static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n); |
| 56 static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, | 53 static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, |
| 57 DCTELEM *block, | 54 DCTELEM *block, |
| 58 int n); | 55 int n); |
| 59 static inline int mpeg2_decode_block_intra(MpegEncContext *s, | 56 static inline int mpeg2_decode_block_intra(MpegEncContext *s, |
| 325 return -1; | 322 return -1; |
| 326 } | 323 } |
| 327 } | 324 } |
| 328 } else { | 325 } else { |
| 329 for(i=0;i<6;i++) { | 326 for(i=0;i<6;i++) { |
| 330 if (mpeg1_decode_block_intra(s, s->pblocks[i], i) < 0) | 327 if (ff_mpeg1_decode_block_intra(s, s->pblocks[i], i) < 0) |
| 331 return -1; | 328 return -1; |
| 332 } | 329 } |
| 333 } | 330 } |
| 334 } else { | 331 } else { |
| 335 if (mb_type & MB_TYPE_ZERO_MV){ | 332 if (mb_type & MB_TYPE_ZERO_MV){ |
| 612 l= INT_BIT - 5 - shift; | 609 l= INT_BIT - 5 - shift; |
| 613 val = (val<<l)>>l; | 610 val = (val<<l)>>l; |
| 614 return val; | 611 return val; |
| 615 } | 612 } |
| 616 | 613 |
| 617 static inline int mpeg1_decode_block_intra(MpegEncContext *s, | 614 inline int ff_mpeg1_decode_block_intra(MpegEncContext *s, |
| 618 DCTELEM *block, | 615 DCTELEM *block, |
| 619 int n) | 616 int n) |
| 620 { | 617 { |
| 621 int level, dc, diff, i, j, run; | 618 int level, dc, diff, i, j, run; |
| 622 int component; | 619 int component; |