diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-21 11:09:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-21 11:09:41 +0200 |
| commit | de493809f31a91a57e37c570b538e47647d51b29 (patch) | |
| tree | 0fbce2c7f5b9023faa94a625373be23cf14bfd1f /libavformat/h264dec.c | |
| parent | f35b2fa8c9b8fea87448bf585020e93198ae47fd (diff) | |
| parent | 01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9 (diff) | |
| download | ffmpeg-de493809f31a91a57e37c570b538e47647d51b29.tar.gz | |
Merge commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9'
* commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9':
h264dec: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/h264dec.c')
| -rw-r--r-- | libavformat/h264dec.c | 54 |
1 files changed, 31 insertions, 23 deletions
diff --git a/libavformat/h264dec.c b/libavformat/h264dec.c index 5de582be66..f89fd4e8e4 100644 --- a/libavformat/h264dec.c +++ b/libavformat/h264dec.c @@ -24,47 +24,55 @@ static int h264_probe(AVProbeData *p) { - uint32_t code= -1; - int sps=0, pps=0, idr=0, res=0, sli=0; + uint32_t code = -1; + int sps = 0, pps = 0, idr = 0, res = 0, sli = 0; int i; - for(i=0; i<p->buf_size; i++){ - code = (code<<8) + p->buf[i]; + for (i = 0; i < p->buf_size; i++) { + code = (code << 8) + p->buf[i]; if ((code & 0xffffff00) == 0x100) { - int ref_idc= (code>>5)&3; - int type = code & 0x1F; - static const int8_t ref_zero[32]={ - 2, 0, 0, 0, 0,-1, 1,-1, - -1, 1, 1, 1, 1,-1, 2, 2, - 2, 2, 2, 0, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2 + int ref_idc = (code >> 5) & 3; + int type = code & 0x1F; + static const int8_t ref_zero[] = { + 2, 0, 0, 0, 0, -1, 1, -1, + -1, 1, 1, 1, 1, -1, 2, 2, + 2, 2, 2, 0, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2 }; - if(code & 0x80) //forbidden bit + if (code & 0x80) // forbidden_bit return 0; - if(ref_zero[type] == 1 && ref_idc) + if (ref_zero[type] == 1 && ref_idc) return 0; - if(ref_zero[type] ==-1 && !ref_idc) + if (ref_zero[type] == -1 && !ref_idc) return 0; - if(ref_zero[type] == 2) + if (ref_zero[type] == 2) res++; - switch(type){ - case 1: sli++; break; - case 5: idr++; break; - case 7: + switch (type) { + case 1: + sli++; + break; + case 5: + idr++; + break; + case 7: if (p->buf[i + 2] & 0x03) return 0; sps++; break; - case 8: pps++; break; + case 8: + pps++; + break; } } } - if(sps && pps && (idr||sli>3) && res<(sps+pps+idr)) - return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg + + if (sps && pps && (idr || sli > 3) && res < (sps + pps + idr)) + return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg + return 0; } -FF_DEF_RAWVIDEO_DEMUXER(h264 , "raw H.264 video", h264_probe, "h26l,h264,264", AV_CODEC_ID_H264) +FF_DEF_RAWVIDEO_DEMUXER(h264, "raw H.264 video", h264_probe, "h26l,h264,264", AV_CODEC_ID_H264) |