Limited maximum number of reference frames to 15

This now complies with the specification (when using only L0 reference list)
This commit is contained in:
Marko Viitanen 2014-02-20 11:02:51 +02:00
parent 18c3d9c72d
commit bb1ae0da62
3 changed files with 4 additions and 4 deletions

View file

@ -23,7 +23,7 @@ meant to be user configurable later.
0: only first picture is intra 0: only first picture is intra
1: all pictures are intra 1: all pictures are intra
2-N: every Nth picture is intra 2-N: every Nth picture is intra
-r, --ref <integer> : Reference frames, range 1..16 [3] -r, --ref <integer> : Reference frames, range 1..15 [3]
--no-deblock : Disable deblocking filter --no-deblock : Disable deblocking filter
--deblock <beta:tc> : Deblocking filter parameters --deblock <beta:tc> : Deblocking filter parameters
beta and tc range is -6..6 [0:0] beta and tc range is -6..6 [0:0]

View file

@ -186,8 +186,8 @@ static int config_parse(config *cfg, const char *name, const char *value)
cfg->intra_period = atoi(value); cfg->intra_period = atoi(value);
OPT("ref") { OPT("ref") {
cfg->ref_frames = atoi(value); cfg->ref_frames = atoi(value);
if (cfg->ref_frames < 1 || cfg->ref_frames > MAX_REF_PIC_COUNT) { if (cfg->ref_frames < 1 || cfg->ref_frames >= MAX_REF_PIC_COUNT) {
fprintf(stderr, "--ref out of range [1..16], set to 3\n"); fprintf(stderr, "--ref out of range [1..15], set to 3\n");
cfg->ref_frames = 3; cfg->ref_frames = 3;
} }
} }

View file

@ -98,7 +98,7 @@ int main(int argc, char *argv[])
" 0: only first picture is intra\n" " 0: only first picture is intra\n"
" 1: all pictures are intra\n" " 1: all pictures are intra\n"
" 2-N: every Nth picture is intra\n" " 2-N: every Nth picture is intra\n"
" -r, --ref <integer> : Reference frames, range 1..16 [3]\n" " -r, --ref <integer> : Reference frames, range 1..15 [3]\n"
" --no-deblock : Disable deblocking filter\n" " --no-deblock : Disable deblocking filter\n"
" --deblock <beta:tc> : Deblocking filter parameters\n" " --deblock <beta:tc> : Deblocking filter parameters\n"
" beta and tc range is -6..6 [0:0]\n" " beta and tc range is -6..6 [0:0]\n"