From b8df135c97a854c2ff9b4394b016649c601177fa Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 19 Oct 2018 23:00:02 -0500 Subject: Update libaom to rev b25610052a1398032320008d69b51d2da94f5928 --- .../aom/examples/lightfield_bitstream_parsing.c | 78 +++++++++++----------- 1 file changed, 40 insertions(+), 38 deletions(-) (limited to 'third_party/aom/examples/lightfield_bitstream_parsing.c') diff --git a/third_party/aom/examples/lightfield_bitstream_parsing.c b/third_party/aom/examples/lightfield_bitstream_parsing.c index d13f3f172..71d4dec77 100644 --- a/third_party/aom/examples/lightfield_bitstream_parsing.c +++ b/third_party/aom/examples/lightfield_bitstream_parsing.c @@ -12,15 +12,14 @@ // Lightfield Bitstream Parsing // ============================ // -// This is an lightfield bitstream parsing example. It takes an input file +// This is a lightfield bitstream parsing example. It takes an input file // containing the whole compressed lightfield bitstream(ivf file), and parses it // and constructs and outputs a new bitstream that can be decoded by an AV1 -// decoder. The output bitstream contains tile list OBUs. The lf_width and -// lf_height arguments are the number of lightfield images in each dimension. -// The lf_blocksize determines the number of reference images used. +// decoder. The output bitstream contains reference frames(i.e. anchor frames), +// camera frame header, and tile list OBUs. num_references is the number of +// anchor frames coded at the beginning of the light field file. // After running the lightfield encoder, run lightfield bitstream parsing: -// examples/lightfield_bitstream_parsing vase10x10.ivf vase_tile_list.ivf 10 10 -// 5 +// examples/lightfield_bitstream_parsing vase10x10.ivf vase_tile_list.ivf 4 #include #include @@ -35,13 +34,13 @@ #include "common/video_reader.h" #include "common/video_writer.h" +#define MAX_TILES 512 + static const char *exec_name; void usage_exit(void) { - fprintf( - stderr, - "Usage: %s \n", - exec_name); + fprintf(stderr, "Usage: %s \n", + exec_name); exit(EXIT_FAILURE); } @@ -95,39 +94,36 @@ const TILE_LIST_INFO tile_list[2][9] = { { 50, 2, 5, 4 } }, }; +static int get_image_bps(aom_img_fmt_t fmt) { + switch (fmt) { + case AOM_IMG_FMT_I420: return 12; + case AOM_IMG_FMT_I422: return 16; + case AOM_IMG_FMT_I444: return 24; + case AOM_IMG_FMT_I42016: return 24; + case AOM_IMG_FMT_I42216: return 32; + case AOM_IMG_FMT_I44416: return 48; + default: die("Invalid image format"); + } +} + int main(int argc, char **argv) { aom_codec_ctx_t codec; AvxVideoReader *reader = NULL; AvxVideoWriter *writer = NULL; const AvxInterface *decoder = NULL; const AvxVideoInfo *info = NULL; - const char *lf_width_arg; - const char *lf_height_arg; - const char *lf_blocksize_arg; - int width, height; - int lf_width, lf_height; - int lf_blocksize; - int u_blocks, v_blocks; + int num_references; int n, i; aom_codec_pts_t pts; exec_name = argv[0]; - if (argc != 6) die("Invalid number of arguments."); + if (argc != 4) die("Invalid number of arguments."); reader = aom_video_reader_open(argv[1]); if (!reader) die("Failed to open %s for reading.", argv[1]); - lf_width_arg = argv[3]; - lf_height_arg = argv[4]; - lf_blocksize_arg = argv[5]; - - lf_width = (int)strtol(lf_width_arg, NULL, 0); - lf_height = (int)strtol(lf_height_arg, NULL, 0); - lf_blocksize = (int)strtol(lf_blocksize_arg, NULL, 0); - + num_references = (int)strtol(argv[3], NULL, 0); info = aom_video_reader_get_info(reader); - width = info->frame_width; - height = info->frame_height; // The writer to write out ivf file in tile list OBU, which can be decoded by // AV1 decoder. @@ -144,11 +140,6 @@ int main(int argc, char **argv) { // Decode anchor frames. aom_codec_control_(&codec, AV1_SET_TILE_MODE, 0); - // How many anchor frames we have. - u_blocks = (lf_width + lf_blocksize - 1) / lf_blocksize; - v_blocks = (lf_height + lf_blocksize - 1) / lf_blocksize; - - int num_references = v_blocks * u_blocks; for (i = 0; i < num_references; ++i) { aom_video_reader_read_frame(reader); @@ -223,10 +214,20 @@ int main(int argc, char **argv) { die_codec(&codec, "Failed to copy compressed camera frame header."); } - // Allocate a buffer to store tile list bitstream. Image format - // AOM_IMG_FMT_I420. - size_t data_sz = - ALIGN_POWER_OF_TWO(width, 5) * ALIGN_POWER_OF_TWO(height, 5) * 12 / 8; + // Read out the image format. + aom_img_fmt_t ref_fmt = 0; + if (aom_codec_control(&codec, AV1D_GET_IMG_FORMAT, &ref_fmt)) + die_codec(&codec, "Failed to get the image format"); + const int bps = get_image_bps(ref_fmt); + // read out the tile size. + unsigned int tile_size = 0; + if (aom_codec_control(&codec, AV1D_GET_TILE_SIZE, &tile_size)) + die_codec(&codec, "Failed to get the tile size"); + const unsigned int tile_width = tile_size >> 16; + const unsigned int tile_height = tile_size & 65535; + // Allocate a buffer to store tile list bitstream. + const size_t data_sz = MAX_TILES * ALIGN_POWER_OF_TWO(tile_width, 5) * + ALIGN_POWER_OF_TWO(tile_height, 5) * bps / 8; unsigned char *tl_buf = (unsigned char *)malloc(data_sz); if (tl_buf == NULL) die_codec(&codec, "Failed to allocate tile list buffer."); @@ -251,7 +252,8 @@ int main(int argc, char **argv) { // Write the OBU size using a fixed length_field_size of 4 bytes. saved_obu_size_loc = tl; - aom_wb_write_literal(&wb, 0, 32); + // aom_wb_write_unsigned_literal(&wb, data, bits) requires that bits <= 32. + aom_wb_write_unsigned_literal(&wb, 0, 32); tl += 4; tile_list_obu_header_size += 4; -- cgit v1.2.3