Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
3b5afc1e
Commit
3b5afc1e
authored
Dec 15, 2017
by
Cyril Concolato
Browse files
Moving tile_info upwards in the frame header
Change-Id: Idce7902ed4f0a283d8ae6643402a450f3e5caf9a
parent
b0e70bea
Changes
4
Hide whitespace changes
Inline
Side-by-side
av1/decoder/decodeframe.c
View file @
3b5afc1e
...
...
@@ -2957,6 +2957,10 @@ static size_t read_uncompressed_header(AV1Decoder *pbi,
}
#endif // CONFIG_INTRABC
#if CONFIG_TILE_INFO_FIRST
read_tile_info
(
pbi
,
rb
);
#endif
setup_loopfilter
(
cm
,
rb
);
setup_quantization
(
cm
,
rb
);
xd
->
bd
=
(
int
)
cm
->
bit_depth
;
...
...
@@ -3100,7 +3104,9 @@ static size_t read_uncompressed_header(AV1Decoder *pbi,
if
(
!
frame_is_intra_only
(
cm
))
read_global_motion
(
cm
,
rb
);
#if !CONFIG_TILE_INFO_FIRST
read_tile_info
(
pbi
,
rb
);
#endif
size_t
sz
;
if
(
use_compressed_header
(
cm
))
{
...
...
av1/encoder/bitstream.c
View file @
3b5afc1e
...
...
@@ -2808,6 +2808,11 @@ static void write_tile_info(const AV1_COMMON *const cm,
aom_wb_write_bit
(
wb
,
cm
->
loop_filter_across_tiles_enabled
);
#endif // CONFIG_LOOPFILTERING_ACROSS_TILES_EXT
#endif // CONFIG_LOOPFILTERING_ACROSS_TILES
#if CONFIG_TILE_INFO_FIRST
// write the tile length code (Always 4 bytes for now)
aom_wb_write_literal
(
wb
,
3
,
2
);
#endif
}
#if USE_GF16_MULTI_LAYER
...
...
@@ -3796,6 +3801,11 @@ static void write_uncompressed_header_frame(AV1_COMP *cpi,
#if !CONFIG_NO_FRAME_CONTEXT_SIGNALING
aom_wb_write_literal
(
wb
,
cm
->
frame_context_idx
,
FRAME_CONTEXTS_LOG2
);
#endif
#if CONFIG_TILE_INFO_FIRST
write_tile_info
(
cm
,
wb
);
#endif
encode_loopfilter
(
cm
,
wb
);
encode_quantization
(
cm
,
wb
);
encode_segmentation
(
cm
,
xd
,
wb
);
...
...
@@ -3865,7 +3875,9 @@ static void write_uncompressed_header_frame(AV1_COMP *cpi,
if
(
!
frame_is_intra_only
(
cm
))
write_global_motion
(
cpi
,
wb
);
#if !CONFIG_TILE_INFO_FIRST
write_tile_info
(
cm
,
wb
);
#endif
}
#else
...
...
@@ -4143,6 +4155,9 @@ static void write_uncompressed_header_obu(AV1_COMP *cpi,
}
#if !CONFIG_NO_FRAME_CONTEXT_SIGNALING
aom_wb_write_literal
(
wb
,
cm
->
frame_context_idx
,
FRAME_CONTEXTS_LOG2
);
#endif
#if CONFIG_TILE_INFO_FIRST
write_tile_info
(
cm
,
wb
);
#endif
encode_loopfilter
(
cm
,
wb
);
encode_quantization
(
cm
,
wb
);
...
...
@@ -4217,7 +4232,9 @@ static void write_uncompressed_header_obu(AV1_COMP *cpi,
if
(
!
frame_is_intra_only
(
cm
))
write_global_motion
(
cpi
,
wb
);
#if !CONFIG_TILE_INFO_FIRST
write_tile_info
(
cm
,
wb
);
#endif
}
#endif // CONFIG_OBU
...
...
@@ -4436,8 +4453,10 @@ static uint32_t write_frame_header_obu(AV1_COMP *cpi, uint8_t *const dst) {
return
total_size
;
}
#if !CONFIG_TILE_INFO_FIRST
// write the tile length code (Always 4 bytes for now)
aom_wb_write_literal
(
&
wb
,
3
,
2
);
#endif
if
(
!
use_compressed_header
(
cm
))
{
uncompressed_hdr_size
=
aom_wb_bytes_written
(
&
wb
);
...
...
build/cmake/aom_config_defaults.cmake
View file @
3b5afc1e
...
...
@@ -187,6 +187,7 @@ set(CONFIG_SIMPLIFY_TX_MODE 1 CACHE NUMBER "AV1 experiment flag.")
set
(
CONFIG_SPATIAL_SEGMENTATION 0 CACHE NUMBER
"AV1 experiment flag."
)
set
(
CONFIG_STRIPED_LOOP_RESTORATION 1 CACHE NUMBER
"AV1 experiment flag."
)
set
(
CONFIG_TEMPMV_SIGNALING 1 CACHE NUMBER
"AV1 experiment flag."
)
set
(
CONFIG_TILE_INFO_FIRST 0 CACHE NUMBER
"AV1 experiment flag."
)
set
(
CONFIG_TMV 1 CACHE NUMBER
"AV1 experiment flag."
)
set
(
CONFIG_TX64X64 1 CACHE NUMBER
"AV1 experiment flag."
)
set
(
CONFIG_TXK_SEL 0 CACHE NUMBER
"AV1 experiment flag."
)
...
...
configure
View file @
3b5afc1e
...
...
@@ -332,6 +332,7 @@ EXPERIMENT_LIST="
spatial_segmentation
segment_pred_last
obu_no_ivf
tile_info_first
"
CONFIG_LIST
=
"
dependency_tracking
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment