mirror of
https://github.com/ultravideo/uvg266.git
synced 2024-11-27 19:24:06 +00:00
Fix POCs when using --gop=8
When using --gop=8 with an intra period greater than one, a single POC would be skipped before every intra frame. This commit fixes the problem by turning the intra frames into BLA frames with leading pictures when using --gop=8.
This commit is contained in:
Arttu Ylä-Outinen
parent
6e00f63469
commit
20aea8df63
|
|
@ -942,9 +942,7 @@ static void encoder_state_write_slice_header(
|
|||
encoder_state_t * state,
|
||||
bool independent)
|
||||
{
|
||||
uint8_t nal_type = (state->frame->is_idr_frame ? KVZ_NAL_IDR_W_RADL : KVZ_NAL_TRAIL_R);
|
||||
|
||||
kvz_nal_write(stream, nal_type, 0, state->frame->first_nal);
|
||||
kvz_nal_write(stream, state->frame->pictype, 0, state->frame->first_nal);
|
||||
state->frame->first_nal = false;
|
||||
|
||||
kvz_encoder_state_write_bitstream_slice_header(stream, state, independent);
|
||||
|
|
|
|||
|
|
@ -741,7 +741,7 @@ static void encoder_state_encode_leaf(encoder_state_t * const state)
|
|||
state->previous_encoder_state != state)
|
||||
{
|
||||
// For LP-gop, depend on the state of the first reference.
|
||||
int ref_neg = cfg->gop[(state->frame->poc - 1) % cfg->gop_len].ref_neg[0];
|
||||
int ref_neg = cfg->gop[state->frame->gop_offset].ref_neg[0];
|
||||
if (ref_neg > cfg->owf) {
|
||||
// If frame is not within OWF range, it's already done.
|
||||
ref_state = NULL;
|
||||
|
|
@ -901,7 +901,7 @@ static void encoder_state_encode(encoder_state_t * const main_state) {
|
|||
kvz_threadqueue_job_create(encoder_state_worker_encode_children, &main_state->children[i]);
|
||||
if (main_state->children[i].previous_encoder_state != &main_state->children[i] &&
|
||||
main_state->children[i].previous_encoder_state->tqj_recon_done &&
|
||||
!main_state->children[i].frame->is_idr_frame)
|
||||
!main_state->children[i].frame->is_irap)
|
||||
{
|
||||
#if 0
|
||||
// Disabled due to non-determinism.
|
||||
|
|
@ -1036,6 +1036,13 @@ static void encoder_state_remove_refs(encoder_state_t *state) {
|
|||
}
|
||||
}
|
||||
|
||||
if (ref_poc < state->frame->irap_poc &&
|
||||
state->frame->irap_poc < state->frame->poc)
|
||||
{
|
||||
// Trailing frames cannot refer to leading frames.
|
||||
is_referenced = false;
|
||||
}
|
||||
|
||||
if (!is_referenced) {
|
||||
// This reference is not referred to by this frame, it must be removed.
|
||||
kvz_image_list_rem(state->frame->ref, ref);
|
||||
|
|
@ -1129,22 +1136,21 @@ 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) {
|
||||
state->frame->is_idr_frame = true;
|
||||
state->frame->is_irap = true;
|
||||
} else if (cfg->intra_period == 1) {
|
||||
state->frame->is_irap = state->frame->num % 2 == 0;
|
||||
} else if (cfg->intra_period > 1) {
|
||||
if (cfg->gop_len > 0 && !cfg->gop_lowdelay) {
|
||||
state->frame->is_irap = (state->frame->num - 1) % cfg->intra_period == 0;
|
||||
} else {
|
||||
state->frame->is_irap = state->frame->num % cfg->intra_period == 0;
|
||||
}
|
||||
} else {
|
||||
bool is_i_idr = (cfg->intra_period == 1 && state->frame->num % 2 == 0);
|
||||
bool is_p_idr = (cfg->intra_period > 1 && (state->frame->num % cfg->intra_period) == 0);
|
||||
state->frame->is_idr_frame = is_i_idr || is_p_idr;
|
||||
}
|
||||
|
||||
// Set pictype.
|
||||
if (state->frame->is_idr_frame) {
|
||||
state->frame->pictype = KVZ_NAL_IDR_W_RADL;
|
||||
} else {
|
||||
state->frame->pictype = KVZ_NAL_TRAIL_R;
|
||||
state->frame->is_irap = false;
|
||||
}
|
||||
|
||||
// Set slicetype.
|
||||
if (state->frame->is_idr_frame || cfg->intra_period == 1) {
|
||||
if (state->frame->is_irap || cfg->intra_period == 1) {
|
||||
state->frame->slicetype = KVZ_SLICE_I;
|
||||
} else if (cfg->gop_len > 0 && !cfg->gop_lowdelay) {
|
||||
state->frame->slicetype = KVZ_SLICE_B;
|
||||
|
|
@ -1153,20 +1159,40 @@ static void encoder_state_init_new_frame(encoder_state_t * const state, kvz_pict
|
|||
}
|
||||
|
||||
// Set POC.
|
||||
if (state->frame->is_idr_frame) {
|
||||
encoder_state_reset_poc(state);
|
||||
} else if (cfg->intra_period != 1 && cfg->gop_len > 0) {
|
||||
if (cfg->intra_period != 1 &&
|
||||
cfg->gop_len > 0 &&
|
||||
!cfg->gop_lowdelay &&
|
||||
state->frame->num > 0)
|
||||
{
|
||||
// Calculate POC according to the global frame counter and GOP
|
||||
// structure.
|
||||
int32_t poc;
|
||||
if (cfg->intra_period > 0) {
|
||||
poc = state->frame->num % cfg->intra_period - 1;
|
||||
int32_t poc = (state->frame->num - 1) % cfg->intra_period;
|
||||
int poc_offset = cfg->gop[state->frame->gop_offset].poc_offset - 1;
|
||||
state->frame->poc = poc - poc % cfg->gop_len + poc_offset;
|
||||
} else {
|
||||
poc = state->frame->num - 1;
|
||||
int32_t poc = state->frame->num;
|
||||
int poc_offset = cfg->gop[state->frame->gop_offset].poc_offset - 1;
|
||||
state->frame->poc = poc - (poc - 1) % cfg->gop_len + poc_offset;
|
||||
}
|
||||
int32_t poc_offset = cfg->gop[state->frame->gop_offset].poc_offset;
|
||||
state->frame->poc = poc - poc % cfg->gop_len + poc_offset;
|
||||
kvz_videoframe_set_poc(state->tile->frame, state->frame->poc);
|
||||
} else if (state->frame->is_irap) {
|
||||
encoder_state_reset_poc(state);
|
||||
}
|
||||
|
||||
// Set pictype.
|
||||
if (state->frame->is_irap) {
|
||||
if (cfg->gop_len > 0 && !cfg->gop_lowdelay && state->frame->num > 0) {
|
||||
state->frame->pictype = KVZ_NAL_BLA_W_RADL;
|
||||
} else {
|
||||
state->frame->pictype = KVZ_NAL_IDR_W_RADL;
|
||||
}
|
||||
state->frame->irap_poc = state->frame->poc;
|
||||
|
||||
} else if (state->frame->poc < state->frame->irap_poc) {
|
||||
state->frame->pictype = KVZ_NAL_RADL_R;
|
||||
} else {
|
||||
state->frame->pictype = KVZ_NAL_TRAIL_R;
|
||||
}
|
||||
|
||||
encoder_state_remove_refs(state);
|
||||
|
|
@ -1233,7 +1259,8 @@ void kvz_encoder_prepare(encoder_state_t *state)
|
|||
if (state->frame->num == -1) {
|
||||
// We're at the first frame, so don't care about all this stuff.
|
||||
state->frame->num = 0;
|
||||
state->frame->poc = 0;
|
||||
state->frame->poc = 0;
|
||||
state->frame->irap_poc = 0;
|
||||
assert(!state->tile->frame->source);
|
||||
assert(!state->tile->frame->rec);
|
||||
assert(!state->tile->frame->cu_array);
|
||||
|
|
@ -1283,7 +1310,8 @@ void kvz_encoder_prepare(encoder_state_t *state)
|
|||
|
||||
// Update POC and frame count.
|
||||
state->frame->num = prev_state->frame->num + 1;
|
||||
state->frame->poc = prev_state->frame->poc + 1;
|
||||
state->frame->poc = prev_state->frame->poc + 1;
|
||||
state->frame->irap_poc = prev_state->frame->irap_poc;
|
||||
|
||||
state->frame->prepared = 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -81,6 +81,7 @@ typedef struct encoder_state_config_frame_t {
|
|||
int32_t num; /*!< \brief Frame number */
|
||||
int32_t poc; /*!< \brief Picture order count */
|
||||
int8_t gop_offset; /*!< \brief Offset in the gop structure */
|
||||
int32_t irap_poc; /*!< \brief POC of the associated IRAP picture */
|
||||
|
||||
/**
|
||||
* \brief Frame-level quantization parameter
|
||||
|
|
@ -99,8 +100,8 @@ typedef struct encoder_state_config_frame_t {
|
|||
uint8_t ref_LX[2][16];
|
||||
//! L0 reference index list size
|
||||
uint8_t ref_LX_size[2];
|
||||
|
||||
bool is_idr_frame;
|
||||
|
||||
bool is_irap;
|
||||
uint8_t pictype;
|
||||
enum kvz_slice_type slicetype;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue