generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Avoid encoding garbage when ivfenc encounters an unsupported Y4M file."

Browse Source
This commit is contained in:
John Koleszar
2010-06-16 11:54:39 -07:00
committed by Code Review
parent 1114183f1a e703af974d
commit d024d985db
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ivfenc.c
View File

@@ -299,12 +299,11 @@ static int read_frame(FILE *f, vpx_image_t *img, unsigned int file_type,
} }
unsigned int file_is_y4m(FILE *infile, unsigned int file_is_y4m(FILE *infile,
y4m_input *y4m, y4m_input *y4m,
char detect[4]) char detect[4])
{ {
if(memcmp(detect, "YUV4", 4) == 0 && if(memcmp(detect, "YUV4", 4) == 0)
y4m_input_open(y4m, infile, detect, 4) >= 0)
{ {
return 1; return 1;
} }
@@ -875,18 +874,26 @@ int main(int argc, const char **argv_)
if (file_is_y4m(infile, &y4m, detect.buf)) if (file_is_y4m(infile, &y4m, detect.buf))
{ {
file_type = FILE_TYPE_Y4M; if (y4m_input_open(&y4m, infile, detect.buf, 4) >= 0)
cfg.g_w = y4m.pic_w;
cfg.g_h = y4m.pic_h;
/* Use the frame rate from the file only if none was specified on the
* command-line.
*/
if (!arg_have_timebase)
{ {
cfg.g_timebase.num = y4m.fps_d; file_type = FILE_TYPE_Y4M;
cfg.g_timebase.den = y4m.fps_n; cfg.g_w = y4m.pic_w;
cfg.g_h = y4m.pic_h;
/* Use the frame rate from the file only if none was specified
* on the command-line.
*/
if (!arg_have_timebase)
{
cfg.g_timebase.num = y4m.fps_d;
cfg.g_timebase.den = y4m.fps_n;
}
arg_use_i420 = 0;
}
else
{
fprintf(stderr, "Unsupported Y4M stream.\n");
return EXIT_FAILURE;
} }
arg_use_i420 = 0;
} }
else if (file_is_ivf(infile, &fourcc, &cfg.g_w, &cfg.g_h, detect.buf)) else if (file_is_ivf(infile, &fourcc, &cfg.g_w, &cfg.g_h, detect.buf))
{ {