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

Merge branch 'open-gop'

Browse source
This commit is contained in:
Marko Viitanen 2018-10-04 14:47:19 +03:00
parent 8bef85e056 077b6ba2f7
commit 780e5ef86b
7 changed files with 49 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -117,6 +117,7 @@ Video structure:
- 8: B-frame pyramid of length 8
- lp-<string>: Low-delay P-frame GOP
(e.g. lp-g8d4t2, see README)
--(no-)open-gop : Use open GOP configuration. [enabled]
--cqmfile <filename> : Read custom quantization matrices from a file.
--bitrate <integer> : Target bitrate [0]
- 0: Disable rate control.

5
doc/kvazaar.1
View file

@ -1,4 +1,4 @@
.TH KVAZAAR "1" "August 2018" "kvazaar v1.2.0" "User Commands"
.TH KVAZAAR "1" "October 2018" "kvazaar v1.2.0" "User Commands"
.SH NAME
kvazaar \- open source HEVC encoder
.SH SYNOPSIS
@ -121,6 +121,9 @@ GOP structure [8]
\- lp\-<string>: Low\-delay P\-frame GOP
(e.g. lp\-g8d4t2, see README)
.TP
\fB\-\-(no\-)open\-gop
Use open GOP configuration. [enabled]
.TP
\fB\-\-cqmfile <filename>
Read custom quantization matrices from a file.
.TP

4
src/cfg.c
View file

@ -117,6 +117,7 @@ int kvz_config_init(kvz_config *cfg)
cfg->gop_lp_definition.d = 3;
cfg->gop_lp_definition.t = 1;
cfg->open_gop = true;
cfg->roi.width = 0;
cfg->roi.height = 0;
@ -939,6 +940,9 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value)
return 0;
}
}
else if OPT("open-gop") {
cfg->open_gop = (bool)atobool(value);
}
else if OPT("bipred")
cfg->bipred = atobool(value);
else if OPT("bitrate")

3
src/cli.c
View file

@ -131,6 +131,8 @@ static const struct option long_options[] = {
{ "me-steps", required_argument, NULL, 0 },
{ "fast-residual-cost", required_argument, NULL, 0 },
{ "set-qp-in-cu", no_argument, NULL, 0 },
{ "open-gop", no_argument, NULL, 0 },
{ "no-open-gop", no_argument, NULL, 0 },
{0, 0, 0, 0}
};
@ -395,6 +397,7 @@ void print_help(void)
" - 8: B-frame pyramid of length 8\n"
" - lp-<string>: Low-delay P-frame GOP\n"
" (e.g. lp-g8d4t2, see README)\n"
" --(no-)open-gop : Use open GOP configuration. [enabled]\n"
" --cqmfile <filename> : Read custom quantization matrices from a file.\n"
" --bitrate <integer> : Target bitrate [0]\n"
" - 0: Disable rate control.\n"

34
src/encoderstate.c
View file

@ -1185,10 +1185,29 @@ static void encoder_state_init_new_frame(encoder_state_t * const state, kvz_pict
if (state->frame->num == 0) {
state->frame->poc = 0;
} else if (cfg->gop_len && !cfg->gop_lowdelay) {
// Calculate POC according to the global frame counter and GOP structure
int32_t poc = state->frame->num - 1;
int32_t poc_offset = cfg->gop[state->frame->gop_offset].poc_offset;
state->frame->poc = poc - poc % cfg->gop_len + poc_offset;
int32_t framenum = state->frame->num - 1;
// Handle closed GOP
// Closed GOP structure has an extra IDR between the GOPs
if (cfg->intra_period > 0 && !cfg->open_gop) {
if (((state->frame->num - 1) % (cfg->intra_period + 1)) == cfg->intra_period) {
// Insert IDR before each new GOP after intra period in closed GOP configuration
state->frame->poc = 0;
} else {
// Calculate gop_offset again here with the new frame number
framenum = framenum % (cfg->intra_period + 1);
state->frame->gop_offset = (framenum + cfg->gop_len) % cfg->gop_len;
int32_t poc_offset = cfg->gop[state->frame->gop_offset].poc_offset;
state->frame->poc = framenum - framenum % cfg->gop_len + poc_offset;
// This should not be an irap picture in closed GOP
state->frame->is_irap = false;
}
} else { // Open GOP
// Calculate POC according to the global frame counter and GOP structure
int32_t poc_offset = cfg->gop[state->frame->gop_offset].poc_offset;
state->frame->poc = framenum - framenum % cfg->gop_len + poc_offset;
}
kvz_videoframe_set_poc(state->tile->frame, state->frame->poc);
} else if (cfg->intra_period > 0) {
state->frame->poc = state->frame->num % cfg->intra_period;
@ -1197,9 +1216,9 @@ static void encoder_state_init_new_frame(encoder_state_t * const state, kvz_pict
}
// Check whether the frame is a keyframe or not.
if (state->frame->num == 0) {
if (state->frame->num == 0 || state->frame->poc == 0) {
state->frame->is_irap = true;
} else {
} else if(cfg->open_gop) { // In closed-GOP IDR frames are poc==0 so skip this check
state->frame->is_irap =
cfg->intra_period > 0 &&
(state->frame->poc % cfg->intra_period) == 0;
@ -1213,7 +1232,8 @@ static void encoder_state_init_new_frame(encoder_state_t * const state, kvz_pict
if (state->frame->num == 0 ||
cfg->intra_period == 1 ||
cfg->gop_len == 0 ||
cfg->gop_lowdelay)
cfg->gop_lowdelay ||
!cfg->open_gop) // Closed GOP uses IDR pictures
{
state->frame->pictype = KVZ_NAL_IDR_W_RADL;
} else {

3
src/kvazaar.h
View file

@ -372,6 +372,9 @@ typedef struct kvz_config
/** \brief Set QP at CU level keeping pic_init_qp_minus26 in PPS zero */
int8_t set_qp_in_cu;
/** \brief Flag to enable/disable open GOP configuration */
int8_t open_gop;
} kvz_config;
/**

7
tests/test_gop.sh
View file

@ -11,3 +11,10 @@ valgrind_test 264x130 10 $common_args --gop=8 -p0 --owf=4
valgrind_test 264x130 20 $common_args --gop=8 -p16 --owf=0
valgrind_test 264x130 10 $common_args --gop=8 -p1 --owf=4
valgrind_test 264x130 10 $common_args --gop=lp-g4d3t1 -p5 --owf=4
valgrind_test 264x130 10 $common_args --gop=8 -p8 --owf=4 --no-open-gop
# Do more extensive tests in a private gitlab CI runner
[ ! -z "$GITLAB_CI" ] && valgrind_test 264x130 20 $common_args --gop=8 -p8 --owf=0 --no-open-gop
[ ! -z "$GITLAB_CI" ] && valgrind_test 264x130 40 $common_args --gop=8 -p32 --owf=4 --no-open-gop
[ ! -z "$GITLAB_CI" ] && valgrind_test 264x130 70 $common_args --gop=8 -p64 --owf=4 --no-open-gop
[ ! -z "$GITLAB_CI" ] && valgrind_test 264x130 50 $common_args --gop=8 -p40 --owf=4 --no-open-gop
[ ! -z "$GITLAB_CI" ] && valgrind_test 264x130 10 $common_args --gop=8 -p8 --owf=0 --no-open-gop --bipred