Skip to content

Commit 488267b

Browse files
committed
Add a test that reproduces bug aomedia:3348
Based on the libavif avifchangedimensiontest AOMDecreasing/ChangeDimensionTest.EncodeDecode/0 in AOMediaCodec/libavif#1069 by Yuan Tong. Test: test_libaom --gtest_filter=*DimensionDecreasing \ --gtest_also_run_disabled_tests Bug: aomedia:3348 Change-Id: I8be3c092234f99402c02aa03340c916f629ce0f2
1 parent cfab3a0 commit 488267b

File tree

2 files changed

+109
-81
lines changed

2 files changed

+109
-81
lines changed

test/avif_progressive_test.cc

Lines changed: 0 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -273,85 +273,4 @@ TEST(AVIFProgressiveTest, DimensionChangeLargeImageMultiThread) {
273273
EXPECT_EQ(AOM_CODEC_OK, aom_codec_destroy(&enc));
274274
}
275275

276-
TEST(AVIFProgressiveTest, DimensionDecreasing) {
277-
constexpr int kWidth = 128;
278-
constexpr int kHeight = 128;
279-
// Dummy buffer of neutral gray samples.
280-
constexpr size_t kBufferSize = 3 * kWidth * kHeight;
281-
std::vector<unsigned char> buffer(kBufferSize,
282-
static_cast<unsigned char>(128));
283-
284-
aom_image_t img;
285-
EXPECT_EQ(&img, aom_img_wrap(&img, AOM_IMG_FMT_I420, kWidth, kHeight, 1,
286-
buffer.data()));
287-
img.cp = AOM_CICP_CP_UNSPECIFIED;
288-
img.tc = AOM_CICP_TC_UNSPECIFIED;
289-
img.mc = AOM_CICP_MC_UNSPECIFIED;
290-
img.range = AOM_CR_FULL_RANGE;
291-
292-
aom_codec_iface_t *iface = aom_codec_av1_cx();
293-
aom_codec_enc_cfg_t cfg;
294-
EXPECT_EQ(AOM_CODEC_OK,
295-
aom_codec_enc_config_default(iface, &cfg, AOM_USAGE_GOOD_QUALITY));
296-
cfg.rc_end_usage = AOM_Q;
297-
cfg.g_profile = 0;
298-
cfg.g_bit_depth = AOM_BITS_8;
299-
cfg.g_input_bit_depth = 8;
300-
cfg.g_w = 128;
301-
cfg.g_h = 128;
302-
cfg.g_forced_max_frame_width = 128;
303-
cfg.g_forced_max_frame_height = 128;
304-
cfg.g_lag_in_frames = 1;
305-
static_assert(AOM_Q == 3, "");
306-
cfg.rc_end_usage = AOM_Q;
307-
cfg.rc_min_quantizer = 20;
308-
cfg.rc_max_quantizer = 40;
309-
aom_codec_ctx_t enc;
310-
EXPECT_EQ(AOM_CODEC_OK, aom_codec_enc_init(&enc, iface, &cfg, 0));
311-
EXPECT_EQ(AOM_CODEC_OK, aom_codec_control(&enc, AOME_SET_CQ_LEVEL, 30));
312-
EXPECT_EQ(AOM_CODEC_OK,
313-
aom_codec_control(&enc, AOME_SET_CPUUSED, 6));
314-
EXPECT_EQ(AOM_CODEC_OK,
315-
aom_codec_control(&enc, AV1E_SET_COLOR_RANGE, AOM_CR_FULL_RANGE));
316-
EXPECT_EQ(AOM_CODEC_OK,
317-
aom_codec_set_option(&enc, "cq-level", "30"));
318-
EXPECT_EQ(AOM_CODEC_OK,
319-
aom_codec_set_option(&enc, "tune", "ssim"));
320-
321-
// First frame
322-
EXPECT_EQ(AOM_CODEC_OK, aom_codec_encode(&enc, &img, 0, 1, 0));
323-
aom_codec_iter_t iter = nullptr;
324-
const aom_codec_cx_pkt_t *pkt = aom_codec_get_cx_data(&enc, &iter);
325-
EXPECT_NE(pkt, nullptr);
326-
EXPECT_EQ(pkt->kind, AOM_CODEC_CX_FRAME_PKT);
327-
// pkt->data.frame.flags is 0x1f0011.
328-
EXPECT_EQ(pkt->data.frame.flags & AOM_FRAME_IS_KEY, AOM_FRAME_IS_KEY);
329-
pkt = aom_codec_get_cx_data(&enc, &iter);
330-
EXPECT_EQ(pkt, nullptr);
331-
332-
// Second frame
333-
EXPECT_EQ(&img, aom_img_wrap(&img, AOM_IMG_FMT_I420, 64, 64, 1,
334-
buffer.data()));
335-
cfg.g_w = 64;
336-
cfg.g_h = 64;
337-
EXPECT_EQ(AOM_CODEC_OK, aom_codec_enc_config_set(&enc, &cfg));
338-
EXPECT_EQ(AOM_CODEC_OK, aom_codec_encode(&enc, &img, 0, 1, 0));
339-
iter = nullptr;
340-
pkt = aom_codec_get_cx_data(&enc, &iter);
341-
EXPECT_NE(pkt, nullptr);
342-
EXPECT_EQ(pkt->kind, AOM_CODEC_CX_FRAME_PKT);
343-
// pkt->data.frame.flags is 0.
344-
EXPECT_EQ(pkt->data.frame.flags & AOM_FRAME_IS_KEY, 0u);
345-
pkt = aom_codec_get_cx_data(&enc, &iter);
346-
EXPECT_EQ(pkt, nullptr);
347-
348-
// Flush encoder
349-
EXPECT_EQ(AOM_CODEC_OK, aom_codec_encode(&enc, nullptr, 0, 1, 0));
350-
iter = nullptr;
351-
pkt = aom_codec_get_cx_data(&enc, &iter);
352-
EXPECT_EQ(pkt, nullptr);
353-
354-
EXPECT_EQ(AOM_CODEC_OK, aom_codec_destroy(&enc));
355-
}
356-
357276
} // namespace

test/forced_max_frame_width_height_test.cc

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
// encode two frames of increasing sizes. The second aom_codec_encode() should
1616
// not crash or have memory errors.
1717

18+
#include <algorithm>
1819
#include <memory>
20+
#include <vector>
1921

2022
#include "aom/aomcx.h"
2123
#include "aom/aom_encoder.h"
@@ -89,6 +91,113 @@ TEST(EncodeForcedMaxFrameWidthHeight, GoodQualityLag1TuneSSIM) {
8991
RunTest(AOM_USAGE_GOOD_QUALITY, /*lag_in_frames=*/1, "ssim");
9092
}
9193

94+
void FillImageGradient(aom_image_t *image, int bit_depth) {
95+
assert(image->range == AOM_CR_FULL_RANGE);
96+
for (int plane = 0; plane < 3; plane++) {
97+
const int plane_width = aom_img_plane_width(image, plane);
98+
const int plane_height = aom_img_plane_height(image, plane);
99+
unsigned char *row = image->planes[plane];
100+
const int stride = image->stride[plane];
101+
for (int y = 0; y < plane_height; ++y) {
102+
for (int x = 0; x < plane_width; ++x) {
103+
const int value = (x + y) * ((1 << bit_depth) - 1) /
104+
std::max(1, plane_width + plane_height - 2);
105+
if (bit_depth > 8) {
106+
reinterpret_cast<uint16_t *>(row)[x] = static_cast<uint16_t>(value);
107+
} else {
108+
row[x] = static_cast<unsigned char>(value);
109+
}
110+
}
111+
row += stride;
112+
}
113+
}
114+
}
115+
116+
// A test that reproduces bug aomedia:3348: Assertion
117+
// `ms_params->ms_buffers.ref->stride == ms_params->search_sites->stride'
118+
// failed.
119+
TEST(EncodeForcedMaxFrameWidthHeight, DISABLED_DimensionDecreasing) {
120+
constexpr int kWidth = 128;
121+
constexpr int kHeight = 128;
122+
constexpr size_t kBufferSize = 3 * kWidth * kHeight;
123+
std::vector<unsigned char> buffer(kBufferSize);
124+
125+
aom_image_t img;
126+
EXPECT_EQ(&img, aom_img_wrap(&img, AOM_IMG_FMT_I420, kWidth, kHeight, 1,
127+
buffer.data()));
128+
img.cp = AOM_CICP_CP_UNSPECIFIED;
129+
img.tc = AOM_CICP_TC_UNSPECIFIED;
130+
img.mc = AOM_CICP_MC_UNSPECIFIED;
131+
img.range = AOM_CR_FULL_RANGE;
132+
FillImageGradient(&img, 8);
133+
134+
aom_codec_iface_t *iface = aom_codec_av1_cx();
135+
aom_codec_enc_cfg_t cfg;
136+
EXPECT_EQ(AOM_CODEC_OK,
137+
aom_codec_enc_config_default(iface, &cfg, AOM_USAGE_GOOD_QUALITY));
138+
cfg.rc_end_usage = AOM_Q;
139+
cfg.g_profile = 0;
140+
cfg.g_bit_depth = AOM_BITS_8;
141+
cfg.g_input_bit_depth = 8;
142+
cfg.g_w = kWidth;
143+
cfg.g_h = kHeight;
144+
cfg.g_forced_max_frame_width = kWidth;
145+
cfg.g_forced_max_frame_height = kHeight;
146+
cfg.g_lag_in_frames = 1;
147+
cfg.rc_min_quantizer = 20;
148+
cfg.rc_max_quantizer = 40;
149+
aom_codec_ctx_t enc;
150+
EXPECT_EQ(AOM_CODEC_OK, aom_codec_enc_init(&enc, iface, &cfg, 0));
151+
EXPECT_EQ(AOM_CODEC_OK, aom_codec_control(&enc, AOME_SET_CQ_LEVEL, 30));
152+
EXPECT_EQ(AOM_CODEC_OK, aom_codec_control(&enc, AOME_SET_CPUUSED, 6));
153+
EXPECT_EQ(AOM_CODEC_OK,
154+
aom_codec_control(&enc, AV1E_SET_COLOR_RANGE, AOM_CR_FULL_RANGE));
155+
EXPECT_EQ(AOM_CODEC_OK,
156+
aom_codec_control(&enc, AOME_SET_TUNING, AOM_TUNE_SSIM));
157+
158+
// First frame
159+
EXPECT_EQ(AOM_CODEC_OK, aom_codec_encode(&enc, &img, 0, 1, 0));
160+
aom_codec_iter_t iter = nullptr;
161+
const aom_codec_cx_pkt_t *pkt = aom_codec_get_cx_data(&enc, &iter);
162+
EXPECT_NE(pkt, nullptr);
163+
EXPECT_EQ(pkt->kind, AOM_CODEC_CX_FRAME_PKT);
164+
// pkt->data.frame.flags is 0x1f0011.
165+
EXPECT_EQ(pkt->data.frame.flags & AOM_FRAME_IS_KEY, AOM_FRAME_IS_KEY);
166+
pkt = aom_codec_get_cx_data(&enc, &iter);
167+
EXPECT_EQ(pkt, nullptr);
168+
169+
// Second frame
170+
constexpr int kWidthSmall = 64;
171+
constexpr int kHeightSmall = 64;
172+
EXPECT_EQ(&img, aom_img_wrap(&img, AOM_IMG_FMT_I420, kWidthSmall,
173+
kHeightSmall, 1, buffer.data()));
174+
img.cp = AOM_CICP_CP_UNSPECIFIED;
175+
img.tc = AOM_CICP_TC_UNSPECIFIED;
176+
img.mc = AOM_CICP_MC_UNSPECIFIED;
177+
img.range = AOM_CR_FULL_RANGE;
178+
FillImageGradient(&img, 8);
179+
cfg.g_w = kWidthSmall;
180+
cfg.g_h = kHeightSmall;
181+
EXPECT_EQ(AOM_CODEC_OK, aom_codec_enc_config_set(&enc, &cfg));
182+
EXPECT_EQ(AOM_CODEC_OK, aom_codec_encode(&enc, &img, 0, 1, 0));
183+
iter = nullptr;
184+
pkt = aom_codec_get_cx_data(&enc, &iter);
185+
EXPECT_NE(pkt, nullptr);
186+
EXPECT_EQ(pkt->kind, AOM_CODEC_CX_FRAME_PKT);
187+
// pkt->data.frame.flags is 0.
188+
EXPECT_EQ(pkt->data.frame.flags & AOM_FRAME_IS_KEY, 0u);
189+
pkt = aom_codec_get_cx_data(&enc, &iter);
190+
EXPECT_EQ(pkt, nullptr);
191+
192+
// Flush encoder
193+
EXPECT_EQ(AOM_CODEC_OK, aom_codec_encode(&enc, nullptr, 0, 1, 0));
194+
iter = nullptr;
195+
pkt = aom_codec_get_cx_data(&enc, &iter);
196+
EXPECT_EQ(pkt, nullptr);
197+
198+
EXPECT_EQ(AOM_CODEC_OK, aom_codec_destroy(&enc));
199+
}
200+
92201
#endif // !CONFIG_REALTIME_ONLY
93202

94203
TEST(EncodeForcedMaxFrameWidthHeight, RealtimeLag0TunePSNR) {

0 commit comments

Comments
 (0)