libaom: Pull from upstream
Current HEAD: bb35ba9148543f22ba7d8642e4fbd29ae301f5dc
git log from upstream:
bb35ba914 Release v2.0.0 Applejack
52fcf2055 Update changelog and authors for v2.0.0 Applejack
9d6b045fa Decouple library version and so version.
43f561e19 Remove surprises from aom_codec_control
560a39293 aom/aom.h: rm AOM_SET_DBG_* controls
e8f025a24 Doc update for control codes
8fdd9cece Full-sweep doc update for control codes
5e6df1a00 Remove post processing related code
01a51124c Remove the put_frame and put_slice callbacks
bd6e7b60f Minor cleanup related to external frame buffers
f10d035e0 Remove multi-resolution encoding from API
8ac85cca1 Move NELEMENTS macro to aom_dsp/aom_dsp_common.h
8119c64b9 Replace for loops with range-based for loops
8e88d2b4e Avoid the copy of non-existing u&v planes
028ad7dd2 Optimizations for denoise_and_encode()
8b6cece3c Reduce sub-pel precision for fast motion search
06f2c6289 Modularize intrabc motion vector costs in AV1_COMP
eb417c15c Facilitate LAP based single pass in VBR mode.
d7263967e AV1 RT: nonRD pick mode code cleanup
880406c5f Refactor inter preds in *variance*.c
<...>
Bug: 150780418
Test: walleye builds w/apex using libaom
Change-Id: I558248e2a0b4cfc4bc3d7c42c80505d82fb9804f
diff --git a/libaom/examples/lightfield_encoder.c b/libaom/examples/lightfield_encoder.c
index 4dd71ca..e80fe24 100644
--- a/libaom/examples/lightfield_encoder.c
+++ b/libaom/examples/lightfield_encoder.c
@@ -52,7 +52,7 @@
exit(EXIT_FAILURE);
}
-static int aom_img_size_bytes(aom_image_t *img) {
+static int img_size_bytes(aom_image_t *img) {
int image_size_bytes = 0;
int plane;
for (plane = 0; plane < 3; ++plane) {
@@ -117,7 +117,7 @@
static void get_raw_image(aom_image_t **frame_to_encode, aom_image_t *raw,
aom_image_t *raw_shift) {
- if (!CONFIG_LOWBITDEPTH) {
+ if (FORCE_HIGHBITDEPTH_DECODING) {
// Need to allocate larger buffer to use hbd internal.
int input_shift = 0;
aom_img_upshift(raw_shift, raw, input_shift);
@@ -134,7 +134,7 @@
aom_image_t *raw_shift) {
aom_codec_ctx_t codec;
int frame_count = 0;
- int image_size_bytes = aom_img_size_bytes(raw);
+ int image_size_bytes = img_size_bytes(raw);
int u_blocks, v_blocks;
int bu, bv;
aom_fixed_buf_t stats = { NULL, 0 };
@@ -242,7 +242,7 @@
AvxVideoWriter *writer = NULL;
aom_codec_ctx_t codec;
int frame_count = 0;
- int image_size_bytes = aom_img_size_bytes(raw);
+ int image_size_bytes = img_size_bytes(raw);
int bu, bv;
int u_blocks, v_blocks;
aom_image_t *frame_to_encode;
@@ -259,6 +259,11 @@
die_codec(&codec, "Failed to turn off auto altref");
if (aom_codec_control(&codec, AV1E_SET_FRAME_PARALLEL_DECODING, 0))
die_codec(&codec, "Failed to set frame parallel decoding");
+ if (aom_codec_control(&codec, AV1E_ENABLE_EXT_TILE_DEBUG, 1))
+ die_codec(&codec, "Failed to enable encoder ext_tile debug");
+ if (aom_codec_control(&codec, AOME_SET_CPUUSED, 1))
+ die_codec(&codec, "Failed to set cpu-used");
+
// Note: The superblock is a sequence parameter and has to be the same for 1
// sequence. In lightfield application, must choose the superblock size(either
// 64x64 or 128x128) before the encoding starts. Otherwise, the default is
@@ -272,8 +277,18 @@
v_blocks = (lf_height + lf_blocksize - 1) / lf_blocksize;
reference_image_num = u_blocks * v_blocks;
+ // Set the max gf group length so the references are guaranteed to be in
+ // a different gf group than any of the regular frames. This avoids using
+ // both vbr and constant quality mode in a single group. The number of
+ // references now cannot surpass 17 because of the enforced MAX_GF_INTERVAL of
+ // 16. If it is necessary to exceed this reference frame limit, one will have
+ // to do some additional handling to ensure references are in separate gf
+ // groups from the regular frames.
+ if (aom_codec_control(&codec, AV1E_SET_MAX_GF_INTERVAL,
+ reference_image_num - 1))
+ die_codec(&codec, "Failed to set max gf interval");
aom_img_fmt_t ref_fmt = AOM_IMG_FMT_I420;
- if (!CONFIG_LOWBITDEPTH) ref_fmt |= AOM_IMG_FMT_HIGHBITDEPTH;
+ if (FORCE_HIGHBITDEPTH_DECODING) ref_fmt |= AOM_IMG_FMT_HIGHBITDEPTH;
// Allocate memory with the border so that it can be used as a reference.
int border_in_pixels =
(codec.config.enc->rc_resize_mode || codec.config.enc->rc_superres_mode)
@@ -457,7 +472,7 @@
if (!aom_img_alloc(&raw, AOM_IMG_FMT_I420, w, h, 32)) {
die("Failed to allocate image.");
}
- if (!CONFIG_LOWBITDEPTH) {
+ if (FORCE_HIGHBITDEPTH_DECODING) {
// Need to allocate larger buffer to use hbd internal.
aom_img_alloc(&raw_shift, AOM_IMG_FMT_I420 | AOM_IMG_FMT_HIGHBITDEPTH, w, h,
32);
@@ -479,7 +494,7 @@
cfg.kf_mode = AOM_KF_DISABLED;
cfg.large_scale_tile = 0; // Only set it to 1 for camera frame encoding.
cfg.g_bit_depth = AOM_BITS_8;
- flags |= (cfg.g_bit_depth > AOM_BITS_8 || !CONFIG_LOWBITDEPTH)
+ flags |= (cfg.g_bit_depth > AOM_BITS_8 || FORCE_HIGHBITDEPTH_DECODING)
? AOM_CODEC_USE_HIGHBITDEPTH
: 0;
@@ -499,7 +514,7 @@
lf_blocksize, flags, &raw_shift);
free(stats.buf);
- if (!CONFIG_LOWBITDEPTH) aom_img_free(&raw_shift);
+ if (FORCE_HIGHBITDEPTH_DECODING) aom_img_free(&raw_shift);
aom_img_free(&raw);
fclose(infile);
