Change avifenc to start in automatic tiling mode
Bug: b:328995727
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5ebeca..e7f786a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
* Allow lowercase GUIDs in XMP when reading JPEG files.
* Update aom.cmd/LocalAom.cmake: v3.12.0-4-g65ddc22823. This fixes an encode &
decode issue on PowerPC (ppc64le).
+* Change avifenc to start in automatic tiling mode.
## [1.2.1] - 2025-03-17
diff --git a/apps/avifenc.c b/apps/avifenc.c
index 6c532d6..95a71e8 100644
--- a/apps/avifenc.c
+++ b/apps/avifenc.c
@@ -284,7 +284,7 @@
printf(" If specified, switch to manual tiling.\n");
printf(" --autotiling : Set --tilerowslog2 and --tilecolslog2 automatically\n");
printf(" If specified, switch to automatic tiling.\n");
- printf(" avifenc starts in manual tiling mode.\n");
+ printf(" avifenc starts in automatic tiling mode.\n");
printf(" --min QP : Deprecated, use -q 0..100 instead\n");
printf(" --max QP : Deprecated, use -q 0..100 instead\n");
printf(" --minalpha QP : Deprecated, use --qalpha 0..100 instead\n");
@@ -2213,7 +2213,7 @@
}
if (!fileSettings->autoTiling.set) {
- fileSettings->autoTiling = boolSettingsEntryOf(AVIF_FALSE);
+ fileSettings->autoTiling = boolSettingsEntryOf(AVIF_TRUE);
}
if (!fileSettings->tileRowsLog2.set) {
fileSettings->tileRowsLog2 = intSettingsEntryOf(0);
diff --git a/doc/avifenc.1.md b/doc/avifenc.1.md
index 765bd07..c983760 100644
--- a/doc/avifenc.1.md
+++ b/doc/avifenc.1.md
@@ -1,6 +1,6 @@
% AVIFENC(1) | General Commands Manual
%
-% 2022-04-30
+% 2025-04-11
<!--
This man page is written in pandoc's Markdown.
@@ -189,7 +189,7 @@
**\--autotiling**
: Set \--tilerowslog2 and \--tilecolslog2 automatically.
If specified, switch to automatic tiling.
- avifenc starts in manual tiling mode.
+ avifenc starts in automatic tiling mode.
**\--scaling-mode** _N_[/_D_]
: EXPERIMENTAL: Set frame (layer) scaling mode as given fraction. If omitted, the denominator defaults to 1. (Default: 1/1).
diff --git a/tests/data/goldens/kodim03_23_animation.avif.xml b/tests/data/goldens/kodim03_23_animation.avif.xml
index 9ebb1a9..5fbdfc1 100644
--- a/tests/data/goldens/kodim03_23_animation.avif.xml
+++ b/tests/data/goldens/kodim03_23_animation.avif.xml
@@ -125,14 +125,16 @@
<OBUSamples>
<Sample number="1" DTS="0" CTS="0" size="REDACTED" RAP="1" >
<OBU size="REDACTED" type="seq_header" header_size="2" has_size_field="1" has_ext="0" temporalID="0" spatialID="0" sequence_width="768" sequence_height="512" still_picture="0" OperatingPointIdc="0" profile="0" level="4" bit_depth="8" monochrome="0" color_description_present_flag="1" color_primaries="1" transfer_characteristics="13" matrix_coefficients="6" color_range="1" chroma_subsampling_x="1" chroma_subsampling_y="1" chroma_sample_position="0" film_grain_params_present="0" />
- <OBU size="REDACTED" type="frame" header_size="4" has_size_field="1" has_ext="0" temporalID="0" spatialID="0" uncompressed_header_bytes="12" frame_type="key" refresh_frame_flags="255" show_frame="1" width="768" height="512" nb_tiles="1" >
- <Tile number="0" start="16" size="REDACTED"/>
+ <OBU size="REDACTED" type="frame" header_size="4" has_size_field="1" has_ext="0" temporalID="0" spatialID="0" uncompressed_header_bytes="12" frame_type="key" refresh_frame_flags="255" show_frame="1" width="768" height="512" nb_tiles="2" >
+ <Tile number="0" start="19" size="REDACTED"/>
+ <Tile number="1" start="12994" size="REDACTED"/>
</OBU>
</Sample>
<Sample number="2" DTS="1" CTS="1" size="REDACTED" RAP="0" >
- <OBU size="REDACTED" type="frame" header_size="4" has_size_field="1" has_ext="0" temporalID="0" spatialID="0" uncompressed_header_bytes="18" frame_type="inter" refresh_frame_flags="2" show_frame="1" width="768" height="512" nb_tiles="1" >
- <Tile number="0" start="22" size="REDACTED"/>
+ <OBU size="REDACTED" type="frame" header_size="4" has_size_field="1" has_ext="0" temporalID="0" spatialID="0" uncompressed_header_bytes="18" frame_type="inter" refresh_frame_flags="2" show_frame="1" width="768" height="512" nb_tiles="2" >
+ <Tile number="0" start="25" size="REDACTED"/>
+ <Tile number="1" start="9888" size="REDACTED"/>
</OBU>
</Sample>
diff --git a/tests/data/goldens/kodim03_23_animation_keyframes.avif.xml b/tests/data/goldens/kodim03_23_animation_keyframes.avif.xml
index 016eb1e..882bc55 100644
--- a/tests/data/goldens/kodim03_23_animation_keyframes.avif.xml
+++ b/tests/data/goldens/kodim03_23_animation_keyframes.avif.xml
@@ -123,15 +123,17 @@
<OBUSamples>
<Sample number="1" DTS="0" CTS="0" size="REDACTED" RAP="1" >
<OBU size="REDACTED" type="seq_header" header_size="2" has_size_field="1" has_ext="0" temporalID="0" spatialID="0" sequence_width="768" sequence_height="512" still_picture="0" OperatingPointIdc="0" profile="0" level="4" bit_depth="8" monochrome="0" color_description_present_flag="1" color_primaries="1" transfer_characteristics="13" matrix_coefficients="6" color_range="1" chroma_subsampling_x="1" chroma_subsampling_y="1" chroma_sample_position="0" film_grain_params_present="0" />
- <OBU size="REDACTED" type="frame" header_size="4" has_size_field="1" has_ext="0" temporalID="0" spatialID="0" uncompressed_header_bytes="12" frame_type="key" refresh_frame_flags="255" show_frame="1" width="768" height="512" nb_tiles="1" >
- <Tile number="0" start="16" size="REDACTED"/>
+ <OBU size="REDACTED" type="frame" header_size="4" has_size_field="1" has_ext="0" temporalID="0" spatialID="0" uncompressed_header_bytes="12" frame_type="key" refresh_frame_flags="255" show_frame="1" width="768" height="512" nb_tiles="2" >
+ <Tile number="0" start="19" size="REDACTED"/>
+ <Tile number="1" start="12994" size="REDACTED"/>
</OBU>
</Sample>
<Sample number="2" DTS="1" CTS="1" size="REDACTED" RAP="1" >
<OBU size="REDACTED" type="seq_header" header_size="2" has_size_field="1" has_ext="0" temporalID="0" spatialID="0" sequence_width="768" sequence_height="512" still_picture="0" OperatingPointIdc="0" profile="0" level="4" bit_depth="8" monochrome="0" color_description_present_flag="1" color_primaries="1" transfer_characteristics="13" matrix_coefficients="6" color_range="1" chroma_subsampling_x="1" chroma_subsampling_y="1" chroma_sample_position="0" film_grain_params_present="0" />
- <OBU size="REDACTED" type="frame" header_size="4" has_size_field="1" has_ext="0" temporalID="0" spatialID="0" uncompressed_header_bytes="12" frame_type="key" refresh_frame_flags="255" show_frame="1" width="768" height="512" nb_tiles="1" >
- <Tile number="0" start="16" size="REDACTED"/>
+ <OBU size="REDACTED" type="frame" header_size="4" has_size_field="1" has_ext="0" temporalID="0" spatialID="0" uncompressed_header_bytes="12" frame_type="key" refresh_frame_flags="255" show_frame="1" width="768" height="512" nb_tiles="2" >
+ <Tile number="0" start="19" size="REDACTED"/>
+ <Tile number="1" start="8808" size="REDACTED"/>
</OBU>
</Sample>
diff --git a/tests/test_cmd.sh b/tests/test_cmd.sh
index dd78a2e..2c92707 100755
--- a/tests/test_cmd.sh
+++ b/tests/test_cmd.sh
@@ -125,7 +125,7 @@
# Test tiling options.
echo "Testing tiling options"
"${AVIFENC}" -s 10 "${INPUT_Y4M}" "${ENCODED_FILE}" > "${OUT_MSG}"
- grep " tileRowsLog2 \[0\], tileColsLog2 \[0\]," "${OUT_MSG}"
+ grep " automatic tiling," "${OUT_MSG}"
"${AVIFENC}" -s 10 --tilerowslog2 1 "${INPUT_Y4M}" "${ENCODED_FILE}" > "${OUT_MSG}"
grep " tileRowsLog2 \[1\], tileColsLog2 \[0\]," "${OUT_MSG}"
"${AVIFENC}" -s 10 --tilecolslog2 2 "${INPUT_Y4M}" "${ENCODED_FILE}" > "${OUT_MSG}"
diff --git a/tests/test_cmd_animation.sh b/tests/test_cmd_animation.sh
index e673711..1bdc194 100755
--- a/tests/test_cmd_animation.sh
+++ b/tests/test_cmd_animation.sh
@@ -85,7 +85,7 @@
# Test updating of tiling options.
out=$("${AVIFENC}" -s 10 "${INPUT_Y4M_0}" --tilerowslog2:u 1 "${INPUT_Y4M_1}" --tilecolslog2:u 2 "${INPUT_Y4M_0}" --autotiling:u "${INPUT_Y4M_1}" --tilecolslog2:u 1 "${INPUT_Y4M_0}" -o "${ENCODED_FILE}")
- findstr "Encoding frame 0 [1/25 ts] color quality [60 (Medium)], alpha quality [60 (Medium)], tileRowsLog2 [0], tileColsLog2 [0]" "${out}"
+ findstr "Encoding frame 0 [1/25 ts] color quality [60 (Medium)], alpha quality [60 (Medium)], automatic tiling" "${out}"
findstr "Encoding frame 1 [1/25 ts] color quality [60 (Medium)], alpha quality [60 (Medium)], tileRowsLog2 [1], tileColsLog2 [0]" "${out}"
findstr "Encoding frame 2 [1/25 ts] color quality [60 (Medium)], alpha quality [60 (Medium)], tileRowsLog2 [1], tileColsLog2 [2]" "${out}"
findstr "Encoding frame 3 [1/25 ts] color quality [60 (Medium)], alpha quality [60 (Medium)], automatic tiling" "${out}"
