a3x/mediatools
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

more validation corner cases

Browse source
This commit is contained in:
byte[] 2020-05-16 13:24:32 -04:00
parent ab87da1ce6
commit d3e5a4ce84
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/validation.c
View file

@ -70,10 +70,10 @@ int mediatools_validate_video(AVFormatContext *format)
case AV_CODEC_ID_GIF: case AV_CODEC_ID_GIF:
; ;
} }
} else if (strcmp(iformat->name, "image2") == 0) { } else if (strcmp(iformat->name, "image2") == 0 || strcmp(iformat->name, "jpeg_pipe") == 0) {
switch (vpar->codec_id) { switch (vpar->codec_id) {
default: default:
printf("Bad video codec for image2 container (must be JPEG)\n"); printf("Bad video codec for JPEG container (must be JPEG)\n");
return false; return false;
case AV_CODEC_ID_MJPEG: case AV_CODEC_ID_MJPEG:
; ;
@ -100,13 +100,13 @@ int mediatools_validate_video(AVFormatContext *format)
return false; return false;
} }
if (vpar->width < 1 || vpar->width > 32767) { if (vpar->width < 1 || vpar->width > 16255) {
printf("Bad width %d (must be 1..32767)\n", vpar->width); printf("Invalid width %d (must be 1..16255)\n", vpar->width);
return false; return false;
} }
if (vpar->height < 1 || vpar->height > 32767) { if (vpar->height < 1 || vpar->height > 16255) {
printf("Bad height %d (must be 1..32767)\n", vpar->height); printf("Invalid height %d (must be 1..16255)\n", vpar->height);
return false; return false;
} }
@ -116,7 +116,7 @@ int mediatools_validate_video(AVFormatContext *format)
int mediatools_validate_duration(AVRational dur) int mediatools_validate_duration(AVRational dur)
{ {
if (av_cmp_q(dur, t_0h) < 0 || av_cmp_q(dur, t_1h) > 0) { if (av_cmp_q(dur, t_0h) < 0 || av_cmp_q(dur, t_1h) > 0) {
printf("Bad duration (must be 0..1 hour)\n"); printf("Invalid duration (must be 0..1 hour)\n");
return false; return false;
} }