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

Some initial code to support wpp and slices

Browse source
This commit is contained in:
Laurent Fasnacht 2014-05-08 10:14:39 +02:00
parent b3d1754cc3
commit 27f694e3e8
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/encoder.c
View file

@ -1154,6 +1154,16 @@ static void encoder_state_encode_leaf(encoder_state * const encoder_state) {
sao_luma->merge_left_flag = sao_luma->merge_left_flag & sao_chroma->merge_left_flag; sao_luma->merge_left_flag = sao_luma->merge_left_flag & sao_chroma->merge_left_flag;
sao_luma->merge_up_flag = sao_luma->merge_up_flag & sao_chroma->merge_up_flag; sao_luma->merge_up_flag = sao_luma->merge_up_flag & sao_chroma->merge_up_flag;
} }
if (encoder_state->type == ENCODER_STATE_TYPE_WAVEFRONT_ROW && i == 1) {
int j;
//Find next encoder (next row)
for (j=0; encoder_state->parent->children[j].encoder_control; ++j) {
if (encoder_state->parent->children[j].wfrow->lcu_offset_y == encoder_state->wfrow->lcu_offset_y + 1) {
context_copy(&encoder_state->parent->children[j], encoder_state);
}
}
}
} }
if (encoder->sao_enable) { if (encoder->sao_enable) {
@ -1220,6 +1230,8 @@ static void encoder_state_encode(encoder_state * const main_state) {
} else { } else {
switch (main_state->type) { switch (main_state->type) {
case ENCODER_STATE_TYPE_TILE: case ENCODER_STATE_TYPE_TILE:
case ENCODER_STATE_TYPE_SLICE:
case ENCODER_STATE_TYPE_WAVEFRONT_ROW:
encoder_state_encode_leaf(main_state); encoder_state_encode_leaf(main_state);
break; break;
default: default:
@ -1340,6 +1352,11 @@ static void encoder_state_write_bitstream_leaf(encoder_state * const encoder_sta
assert(encoder_state->is_leaf); assert(encoder_state->is_leaf);
if (encoder_state->type == ENCODER_STATE_TYPE_SLICE) {
encode_slice_header(encoder_state);
bitstream_align(&encoder_state->stream);
}
for (i = 0; i < encoder_state->lcu_order_count; ++i) { for (i = 0; i < encoder_state->lcu_order_count; ++i) {
const lcu_order_element * const lcu = &encoder_state->lcu_order[i]; const lcu_order_element * const lcu = &encoder_state->lcu_order[i];
int at_slice_end = lcu_at_slice_end(encoder, lcu->id + encoder_state->tile->lcu_offset_in_ts); int at_slice_end = lcu_at_slice_end(encoder, lcu->id + encoder_state->tile->lcu_offset_in_ts);
@ -1615,7 +1632,8 @@ void encode_pic_parameter_set(encoder_state * const encoder_state)
//WRITE_U(stream, 0, 1, "dependent_slices_enabled_flag"); //WRITE_U(stream, 0, 1, "dependent_slices_enabled_flag");
WRITE_U(stream, 0, 1, "transquant_bypass_enable_flag"); WRITE_U(stream, 0, 1, "transquant_bypass_enable_flag");
WRITE_U(stream, encoder->tiles_enable, 1, "tiles_enabled_flag"); WRITE_U(stream, encoder->tiles_enable, 1, "tiles_enabled_flag");
WRITE_U(stream, 0, 1, "entropy_coding_sync_enabled_flag"); //wavefronts
WRITE_U(stream, encoder->wpp, 1, "entropy_coding_sync_enabled_flag");
if (encoder->tiles_enable) { if (encoder->tiles_enable) {
WRITE_UE(stream, encoder->tiles_num_tile_columns - 1, "num_tile_columns_minus1"); WRITE_UE(stream, encoder->tiles_num_tile_columns - 1, "num_tile_columns_minus1");
@ -2035,8 +2053,7 @@ void encode_slice_header(encoder_state * const encoder_state)
#ifdef _DEBUG #ifdef _DEBUG
printf("=========== Slice ===========\n"); printf("=========== Slice ===========\n");
#endif #endif
WRITE_U(stream, (encoder_state->slice->start_in_rs == 0), 1, "first_slice_segment_in_pic_flag");
WRITE_U(stream, 1, 1, "first_slice_segment_in_pic_flag");
if (encoder_state->global->pictype >= NAL_BLA_W_LP if (encoder_state->global->pictype >= NAL_BLA_W_LP
&& encoder_state->global->pictype <= NAL_RSV_IRAP_VCL23) { && encoder_state->global->pictype <= NAL_RSV_IRAP_VCL23) {
@ -2044,8 +2061,11 @@ void encode_slice_header(encoder_state * const encoder_state)
} }
WRITE_UE(stream, 0, "slice_pic_parameter_set_id"); WRITE_UE(stream, 0, "slice_pic_parameter_set_id");
if (encoder_state->slice->start_in_rs > 0) {
//WRITE_U(stream, 0, 1, "dependent_slice_segment_flag"); //For now, we don't support dependent slice segments
//WRITE_U(stream, 0, 1, "dependent_slice_segment_flag");
WRITE_UE(stream, encoder_state->slice->start_in_rs, "slice_segment_address");
}
WRITE_UE(stream, encoder_state->global->slicetype, "slice_type"); WRITE_UE(stream, encoder_state->global->slicetype, "slice_type");