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

avformat/m4vdec: Fix detection of raw MPEG-4 ES Studio

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2018-04-29 23:56:14 +02:00
parent cae6f806a6
commit 34dbdcfc20
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/m4vdec.c
View File

@@ -24,11 +24,14 @@
#define VISUAL_OBJECT_START_CODE 0x000001b5 #define VISUAL_OBJECT_START_CODE 0x000001b5
#define VOP_START_CODE 0x000001b6 #define VOP_START_CODE 0x000001b6
#define SLICE_STARTCODE 0x1B7
#define EXT_STARTCODE 0x1B8
static int mpeg4video_probe(AVProbeData *probe_packet) static int mpeg4video_probe(AVProbeData *probe_packet)
{ {
uint32_t temp_buffer = -1; uint32_t temp_buffer = -1;
int VO = 0, VOL = 0, VOP = 0, VISO = 0, res = 0; int VO = 0, VOL = 0, VOP = 0, VISO = 0, res = 0;
int res_main = 0;
int i; int i;
for (i = 0; i < probe_packet->buf_size; i++) { for (i = 0; i < probe_packet->buf_size; i++) {
@@ -46,11 +49,19 @@ static int mpeg4video_probe(AVProbeData *probe_packet)
VO++; VO++;
else if (temp_buffer >= 0x120 && temp_buffer < 0x130) else if (temp_buffer >= 0x120 && temp_buffer < 0x130)
VOL++; VOL++;
else if (temp_buffer == SLICE_STARTCODE || temp_buffer == EXT_STARTCODE)
res_main++;
else if (!(0x1AF < temp_buffer && temp_buffer < 0x1B7) && else if (!(0x1AF < temp_buffer && temp_buffer < 0x1B7) &&
!(0x1B9 < temp_buffer && temp_buffer < 0x1C4)) !(0x1B9 < temp_buffer && temp_buffer < 0x1C4))
res++; res++;
} }
// res_main repesents the reserved codes within the "main" profile, they are
// added to the reserved ones if it appears that this is a "main" profile
// stream
if (res_main && 2*res_main < VOP)
res += res_main;
if (VOP >= VISO && VOP >= VOL && VO >= VOL && VOL > 0 && res == 0) if (VOP >= VISO && VOP >= VOL && VO >= VOL && VOL > 0 && res == 0)
return VOP+VO > 4 ? AVPROBE_SCORE_EXTENSION : AVPROBE_SCORE_EXTENSION/2; return VOP+VO > 4 ? AVPROBE_SCORE_EXTENSION : AVPROBE_SCORE_EXTENSION/2;