vpxenc: require width and height for raw streams

Defaulting to 320x240 for raw streams is arbitrary and error-prone.
Instead, require that the width and height be set manually if they
can't be parsed from the input file.

Change-Id: Ic61979857e372eed0779c2677247e894f9fd6160
This commit is contained in:
John Koleszar 2010-11-03 13:58:40 -04:00
Родитель 4b9dc57260
Коммит 77e6b4504b
1 изменённых файлов: 14 добавлений и 0 удалений

Просмотреть файл

@ -1190,6 +1190,12 @@ int main(int argc, const char **argv_)
*/ */
cfg.g_timebase.den = 1000; cfg.g_timebase.den = 1000;
/* Never use the library's default resolution, require it be parsed
* from the file or set on the command line.
*/
cfg.g_w = 0;
cfg.g_h = 0;
/* Now parse the remainder of the parameters. */ /* Now parse the remainder of the parameters. */
for (argi = argj = argv; (*argj = *argi); argi += arg.argv_step) for (argi = argj = argv; (*argj = *argi); argi += arg.argv_step)
{ {
@ -1399,6 +1405,14 @@ int main(int argc, const char **argv_)
file_type = FILE_TYPE_RAW; file_type = FILE_TYPE_RAW;
detect.valid = 1; detect.valid = 1;
} }
if(!cfg.g_w || !cfg.g_h)
{
fprintf(stderr, "Specify stream dimensions with --width (-w) "
" and --height (-h).\n");
return EXIT_FAILURE;
}
#define SHOW(field) fprintf(stderr, " %-28s = %d\n", #field, cfg.field) #define SHOW(field) fprintf(stderr, " %-28s = %d\n", #field, cfg.field)
if (verbose && pass == 0) if (verbose && pass == 0)