highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mpegvideodec: use avpriv_find_start_code in mpegvideo_probe()

Browse Source 
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
zhaoxiu.zeng
2015-03-15 16:46:22 +08:00
committed by Michael Niedermayer
parent 213ddcb029
commit 84d8b4fb81
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libavformat/mpegvideodec.c
View File

@@ -24,6 +24,7 @@
#include "rawdec.h" #include "rawdec.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavcodec/internal.h"
#define SEQ_START_CODE 0x000001b3 #define SEQ_START_CODE 0x000001b3
#define GOP_START_CODE 0x000001b8 #define GOP_START_CODE 0x000001b8
@@ -37,26 +38,27 @@ static int mpegvideo_probe(AVProbeData *p)
{ {
uint32_t code= -1; uint32_t code= -1;
int pic=0, seq=0, slice=0, pspack=0, vpes=0, apes=0, res=0, sicle=0; int pic=0, seq=0, slice=0, pspack=0, vpes=0, apes=0, res=0, sicle=0;
int i, j; const uint8_t *ptr = p->buf, *end = ptr + p->buf_size;
uint32_t last = 0; uint32_t last = 0;
int j;
for(i=0; i<p->buf_size; i++){ while (ptr < end) {
code = (code<<8) + p->buf[i]; ptr = avpriv_find_start_code(ptr, end, &code);
if ((code & 0xffffff00) == 0x100) { if ((code & 0xffffff00) == 0x100) {
switch(code){ switch(code){
case SEQ_START_CODE: case SEQ_START_CODE:
if (!(p->buf[i+1+3+1+2] & 0x20)) if (!(ptr[3 + 1 + 2] & 0x20))
break; break;
j = i; j = -1;
if (p->buf[j+8] & 2) if (ptr[j + 8] & 2)
j+= 64; j+= 64;
if (j >= p->buf_size) if (ptr + j >= end)
break; break;
if (p->buf[j+8] & 1) if (ptr[j + 8] & 1)
j+= 64; j+= 64;
if (j >= p->buf_size) if (ptr + j >= end)
break; break;
if (AV_RB24(p->buf + j + 9) & 0xFFFFFE) if (AV_RB24(ptr + j + 9) & 0xFFFFFE)
break; break;
seq++; seq++;
break; break;