hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-23 18:14:06 +00:00
Code Issues Actions Projects Releases Wiki Activity

Increased maximum ref frame count to 16 and set default to 3

Browse source
This commit is contained in:
Marko Viitanen 2014-02-19 15:09:17 +02:00
parent c230a73155
commit db689227f4
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
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..5 [5] -r, --ref <integer> : Reference frames, range 1..16 [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]

6
src/config.c
View file

@ -75,7 +75,7 @@ int config_init(config *cfg)
cfg->vui.chroma_loc = 0; /* left center */ cfg->vui.chroma_loc = 0; /* left center */
cfg->aud_enable = 0; cfg->aud_enable = 0;
cfg->cqmfile = NULL; cfg->cqmfile = NULL;
cfg->ref_frames = 5; cfg->ref_frames = DEFAULT_REF_PIC_COUNT;
return 1; return 1;
} }
@ -187,8 +187,8 @@ static int config_parse(config *cfg, const char *name, const char *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..5], set to 5\n"); fprintf(stderr, "--ref out of range [1..16], set to 3\n");
cfg->ref_frames = 5; cfg->ref_frames = 3;
} }
} }
OPT("deblock") { OPT("deblock") {

2
src/encmain.c
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..5 [5]\n" " -r, --ref <integer> : Reference frames, range 1..16 [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"

3
src/global.h
View file

@ -85,7 +85,8 @@ typedef int16_t coefficient;
#define LCU_LUMA_SIZE (LCU_WIDTH * LCU_WIDTH) #define LCU_LUMA_SIZE (LCU_WIDTH * LCU_WIDTH)
#define LCU_CHROMA_SIZE (LCU_WIDTH * LCU_WIDTH >> 2) #define LCU_CHROMA_SIZE (LCU_WIDTH * LCU_WIDTH >> 2)
#define MAX_REF_PIC_COUNT 5 #define MAX_REF_PIC_COUNT 16
#define DEFAULT_REF_PIC_COUNT 3
#define AMVP_MAX_NUM_CANDS 2 #define AMVP_MAX_NUM_CANDS 2
#define AMVP_MAX_NUM_CANDS_MEM 3 #define AMVP_MAX_NUM_CANDS_MEM 3