[WIP] Add column-based tiling. This patch adds column-based tiling. The idea is to make each tile independently decodable (after reading the common frame header) and also independendly encodable (minus within-frame cost adjustments in the RD loop) to speed-up hardware & software en/decoders if they used multi-threading. Column-based tiling has the added advantage (over other tiling methods) that it minimizes realtime use-case latency, since all threads can start encoding data as soon as the first SB-row worth of data is available to the encoder. There is some test code that does random tile ordering in the decoder, to confirm that each tile is indeed independently decodable from other tiles in the same frame. At tile edges, all contexts assume default values (i.e. 0, 0 motion vector, no coefficients, DC intra4x4 mode), and motion vector search and ordering do not cross tiles in the same frame. t log Tile independence is not maintained between frames ATM, i.e. tile 0 of frame 1 is free to use motion vectors that point into any tile of frame 0. We support 1 (i.e. no tiling), 2 or 4 column-tiles. The loopfilter crosses tile boundaries. I discussed this briefly with Aki and he says that's OK. An in-loop loopfilter would need to do some sync between tile threads, but that shouldn't be a big issue. Resuls: with tiling disabled, we go up slightly because of improved edge use in the intra4x4 prediction. With 2 tiles, we lose about ~1% on derf, ~0.35% on HD and ~0.55% on STD/HD. With 4 tiles, we lose another ~1.5% on derf ~0.77% on HD and ~0.85% on STD/HD. Most of this loss is concentrated in the low-bitrate end of clips, and most of it is because of the loss of edges at tile boundaries and the resulting loss of intra predictors. TODO: - more tiles (perhaps allow row-based tiling also, and max. 8 tiles)? - maybe optionally (for EC purposes), motion vectors themselves should not cross tile edges, or we should emulate such borders as if they were off-frame, to limit error propagation to within one tile only. This doesn't have to be the default behaviour but could be an optional bitstream flag. Change-Id: I5951c3a0742a767b20bc9fb5af685d9892c2c96f
diff --git a/test/md5_helper.h b/test/md5_helper.h new file mode 100644 index 0000000..fc1a974 --- /dev/null +++ b/test/md5_helper.h
@@ -0,0 +1,64 @@ +/* + * Copyright (c) 2012 The WebM project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#ifndef LIBVPX_TEST_MD5_HELPER_H_ +#define LIBVPX_TEST_MD5_HELPER_H_ + +extern "C" { +#include "./md5_utils.h" +#include "vpx/vpx_decoder.h" +} + +namespace libvpx_test { +class MD5 { + public: + MD5() { + MD5Init(&md5_); + } + + void Add(const vpx_image_t *img) { + for (int plane = 0; plane < 3; ++plane) { + uint8_t *buf = img->planes[plane]; + const int h = plane ? (img->d_h + 1) >> 1 : img->d_h; + const int w = plane ? (img->d_w + 1) >> 1 : img->d_w; + + for (int y = 0; y < h; ++y) { + MD5Update(&md5_, buf, w); + buf += img->stride[plane]; + } + } + } + + const char *Get(void) { + static const char hex[16] = { + '0', '1', '2', '3', '4', '5', '6', '7', + '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', + }; + uint8_t tmp[16]; + MD5Context ctx_tmp = md5_; + + MD5Final(tmp, &ctx_tmp); + for (int i = 0; i < 16; i++) { + res_[i * 2 + 0] = hex[tmp[i] >> 4]; + res_[i * 2 + 1] = hex[tmp[i] & 0xf]; + } + res_[32] = 0; + + return res_; + } + + protected: + char res_[33]; + MD5Context md5_; +}; + +} // namespace libvpx_test + +#endif // LIBVPX_TEST_MD5_HELPER_H_
diff --git a/test/test.mk b/test/test.mk index 2ad9f1b..d95a911 100644 --- a/test/test.mk +++ b/test/test.mk
@@ -1,6 +1,7 @@ LIBVPX_TEST_SRCS-yes += register_state_check.h LIBVPX_TEST_SRCS-yes += test.mk LIBVPX_TEST_SRCS-yes += acm_random.h +LIBVPX_TEST_SRCS-yes += md5_helper.h LIBVPX_TEST_SRCS-yes += codec_factory.h LIBVPX_TEST_SRCS-yes += test_libvpx.cc LIBVPX_TEST_SRCS-yes += util.h @@ -66,6 +67,7 @@ # IDCT test currently depends on FDCT function LIBVPX_TEST_SRCS-yes += idct8x8_test.cc +LIBVPX_TEST_SRCS-yes += tile_independence_test.cc endif LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += fdct4x4_test.cc
diff --git a/test/test_vector_test.cc b/test/test_vector_test.cc index 7401a4a..e0d99b5 100644 --- a/test/test_vector_test.cc +++ b/test/test_vector_test.cc
@@ -16,15 +16,11 @@ #include "test/decode_test_driver.h" #include "test/ivf_video_source.h" #include "test/util.h" +#include "test/md5_helper.h" extern "C" { -#include "./md5_utils.h" #include "vpx_mem/vpx_mem.h" } -#if defined(_MSC_VER) -#define snprintf sprintf_s -#endif - namespace { // There are 61 test vectors in total. const char *kTestVectors[] = { @@ -87,30 +83,9 @@ ASSERT_NE(res, EOF) << "Read md5 data failed"; expected_md5[32] = '\0'; - MD5Context md5; - MD5Init(&md5); - - // Compute and update md5 for each raw in decompressed data. - for (int plane = 0; plane < 3; ++plane) { - uint8_t *buf = img.planes[plane]; - - for (unsigned int y = 0; y < (plane ? (img.d_h + 1) >> 1 : img.d_h); - ++y) { - MD5Update(&md5, buf, (plane ? (img.d_w + 1) >> 1 : img.d_w)); - buf += img.stride[plane]; - } - } - - uint8_t md5_sum[16]; - MD5Final(md5_sum, &md5); - - char actual_md5[33]; - // Convert to get the actual md5. - for (int i = 0; i < 16; i++) { - snprintf(&actual_md5[i * 2], sizeof(actual_md5) - i * 2, "%02x", - md5_sum[i]); - } - actual_md5[32] = '\0'; + ::libvpx_test::MD5 md5_res; + md5_res.Add(&img); + const char *actual_md5 = md5_res.Get(); // Check md5 match. ASSERT_STREQ(expected_md5, actual_md5)
diff --git a/test/tile_independence_test.cc b/test/tile_independence_test.cc new file mode 100644 index 0000000..e9d2ca8 --- /dev/null +++ b/test/tile_independence_test.cc
@@ -0,0 +1,103 @@ +/* + Copyright (c) 2012 The WebM project authors. All Rights Reserved. + + Use of this source code is governed by a BSD-style license + that can be found in the LICENSE file in the root of the source + tree. An additional intellectual property rights grant can be found + in the file PATENTS. All contributing project authors may + be found in the AUTHORS file in the root of the source tree. + */ + +#include <cstdio> +#include <cstdlib> +#include <string> +#include "third_party/googletest/src/include/gtest/gtest.h" +#include "test/codec_factory.h" +#include "test/encode_test_driver.h" +#include "test/i420_video_source.h" +#include "test/util.h" +#include "test/md5_helper.h" +extern "C" { +#include "vpx_mem/vpx_mem.h" +} + +namespace { +class TileIndependenceTest : public ::libvpx_test::EncoderTest, + public ::libvpx_test::CodecTestWithParam<int> { + protected: + TileIndependenceTest() : EncoderTest(GET_PARAM(0)), n_tiles_(GET_PARAM(1)), + md5_fw_order_(), md5_inv_order_() { + init_flags_ = VPX_CODEC_USE_PSNR; + vpx_codec_dec_cfg_t cfg; + cfg.w = 352; + cfg.h = 288; + cfg.threads = 1; + cfg.inv_tile_order = 0; + fw_dec_ = codec_->CreateDecoder(cfg, 0); + cfg.inv_tile_order = 1; + inv_dec_ = codec_->CreateDecoder(cfg, 0); + } + + virtual ~TileIndependenceTest() { + delete fw_dec_; + delete inv_dec_; + } + + virtual void SetUp() { + InitializeConfig(); + } + + virtual void PreEncodeFrameHook(libvpx_test::VideoSource *video, + libvpx_test::Encoder *encoder) { + if (video->frame() == 1) { + encoder->Control(VP9E_SET_TILE_COLUMNS, n_tiles_); + } + } + + void UpdateMD5(::libvpx_test::Decoder *dec, const vpx_codec_cx_pkt_t *pkt, + ::libvpx_test::MD5 *md5) { + dec->DecodeFrame((uint8_t *) pkt->data.frame.buf, pkt->data.frame.sz); + const vpx_image_t *img = dec->GetDxData().Next(); + md5->Add(img); + } + + virtual void FramePktHook(const vpx_codec_cx_pkt_t *pkt) { + UpdateMD5(fw_dec_, pkt, &md5_fw_order_); + UpdateMD5(inv_dec_, pkt, &md5_inv_order_); + } + + private: + int n_tiles_; + protected: + ::libvpx_test::MD5 md5_fw_order_, md5_inv_order_; + ::libvpx_test::Decoder *fw_dec_, *inv_dec_; +}; + +// run an encode with 2 or 4 tiles, and do the decode both in normal and +// inverted tile ordering. Ensure that the MD5 of the output in both cases +// is identical. If so, tiles are considered independent and the test passes. +TEST_P(TileIndependenceTest, MD5Match) { + const vpx_rational timebase = { 33333333, 1000000000 }; + cfg_.g_timebase = timebase; + cfg_.rc_target_bitrate = 500; + cfg_.g_lag_in_frames = 25; + cfg_.rc_end_usage = VPX_VBR; + + libvpx_test::I420VideoSource video("hantro_collage_w352h288.yuv", 352, 288, + timebase.den, timebase.num, 0, 30); + ASSERT_NO_FATAL_FAILURE(RunLoop(&video)); + + const char *md5_fw_str = md5_fw_order_.Get(); + const char *md5_inv_str = md5_inv_order_.Get(); + + // could use ASSERT_EQ(!memcmp(.., .., 16) here, but this gives nicer + // output if it fails. Not sure if it's helpful since it's really just + // a MD5... + ASSERT_STREQ(md5_fw_str, md5_inv_str); +} + +VP9_INSTANTIATE_TEST_CASE(TileIndependenceTest, + ::testing::Values(VP8_TWO_TILE_COLUMNS, + VP8_FOUR_TILE_COLUMNS)); + +} // namespace