lightfield_tile_list decoder: allow obu format
BUG=aomedia:2022
Change-Id: Ie9df62ace3a33ff57a5c81e9e394af8f22a1420b
diff --git a/common/video_common.h b/common/video_common.h
index f96af4b..965038d 100644
--- a/common/video_common.h
+++ b/common/video_common.h
@@ -19,6 +19,7 @@
int frame_width;
int frame_height;
struct AvxRational time_base;
+ unsigned int is_annexb;
} AvxVideoInfo;
#endif // VIDEO_COMMON_H_
diff --git a/common/video_reader.c b/common/video_reader.c
index f5327c9..b54c250 100644
--- a/common/video_reader.c
+++ b/common/video_reader.c
@@ -8,19 +8,20 @@
* Media Patent License 1.0 was not distributed with this source code in the
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
-#include "common/video_reader.h"
-
#include <stdlib.h>
#include <string.h>
+#include <assert.h>
#include "aom_ports/mem_ops.h"
#include "common/ivfdec.h"
-
-static const char *const kIVFSignature = "DKIF";
+#include "common/obudec.h"
+#include "common/tools_common.h"
+#include "common/video_reader.h"
struct AvxVideoReaderStruct {
AvxVideoInfo info;
- FILE *file;
+ struct AvxInputContext input_ctx;
+ struct ObuDecInputContext obu_ctx;
uint8_t *buffer;
size_t buffer_size;
size_t frame_size;
@@ -28,42 +29,64 @@
};
AvxVideoReader *aom_video_reader_open(const char *filename) {
- char header[32];
AvxVideoReader *reader = NULL;
FILE *const file = fopen(filename, "rb");
if (!file) return NULL; // Can't open file
- if (fread(header, 1, 32, file) != 32) return NULL; // Can't read file header
-
- if (memcmp(kIVFSignature, header, 4) != 0)
- return NULL; // Wrong IVF signature
-
- if (mem_get_le16(header + 4) != 0) return NULL; // Wrong IVF version
-
reader = (AvxVideoReader *)calloc(1, sizeof(*reader));
- if (!reader) return NULL; // Can't allocate AvxVideoReader
+ if (!reader) {
+ fclose(file);
+ return NULL; // Can't allocate AvxVideoReader
+ }
- reader->file = file;
- reader->info.codec_fourcc = mem_get_le32(header + 8);
- reader->info.frame_width = mem_get_le16(header + 12);
- reader->info.frame_height = mem_get_le16(header + 14);
- reader->info.time_base.numerator = mem_get_le32(header + 16);
- reader->info.time_base.denominator = mem_get_le32(header + 20);
+ reader->input_ctx.filename = filename;
+ reader->input_ctx.file = file;
+ reader->obu_ctx.avx_ctx = &reader->input_ctx;
+ reader->obu_ctx.is_annexb = 1;
+
+ if (file_is_ivf(&reader->input_ctx)) {
+ reader->input_ctx.file_type = FILE_TYPE_IVF;
+ reader->info.codec_fourcc = reader->input_ctx.fourcc;
+ reader->info.frame_width = reader->input_ctx.width;
+ reader->info.frame_height = reader->input_ctx.height;
+ } else if (file_is_obu(&reader->obu_ctx)) {
+ reader->input_ctx.file_type = FILE_TYPE_OBU;
+ // assume AV1
+ reader->info.codec_fourcc = AV1_FOURCC;
+ reader->info.is_annexb = reader->obu_ctx.is_annexb;
+ } else {
+ fclose(file);
+ free(reader);
+ return NULL; // Unknown file type
+ }
return reader;
}
void aom_video_reader_close(AvxVideoReader *reader) {
if (reader) {
- fclose(reader->file);
+ fclose(reader->input_ctx.file);
+ if (reader->input_ctx.file_type == FILE_TYPE_OBU) {
+ obudec_free(&reader->obu_ctx);
+ }
free(reader->buffer);
free(reader);
}
}
int aom_video_reader_read_frame(AvxVideoReader *reader) {
- return !ivf_read_frame(reader->file, &reader->buffer, &reader->frame_size,
- &reader->buffer_size, &reader->pts);
+ if (reader->input_ctx.file_type == FILE_TYPE_IVF) {
+ return !ivf_read_frame(reader->input_ctx.file, &reader->buffer,
+ &reader->frame_size, &reader->buffer_size,
+ &reader->pts);
+ } else if (reader->input_ctx.file_type == FILE_TYPE_OBU) {
+ return !obudec_read_temporal_unit(&reader->obu_ctx, &reader->buffer,
+ &reader->frame_size,
+ &reader->buffer_size);
+ } else {
+ assert(0);
+ return 0;
+ }
}
const uint8_t *aom_video_reader_get_frame(AvxVideoReader *reader,
@@ -77,7 +100,9 @@
return (int64_t)reader->pts;
}
-FILE *aom_video_reader_get_file(AvxVideoReader *reader) { return reader->file; }
+FILE *aom_video_reader_get_file(AvxVideoReader *reader) {
+ return reader->input_ctx.file;
+}
const AvxVideoInfo *aom_video_reader_get_info(AvxVideoReader *reader) {
return &reader->info;
diff --git a/examples/lightfield_decoder.c b/examples/lightfield_decoder.c
index 4200ae7..5da4684 100644
--- a/examples/lightfield_decoder.c
+++ b/examples/lightfield_decoder.c
@@ -79,7 +79,6 @@
const AvxInterface *decoder = NULL;
const AvxVideoInfo *info = NULL;
int num_references;
- int width, height;
aom_image_t reference_images[MAX_EXTERNAL_REFERENCES];
size_t frame_size = 0;
const unsigned char *frame = NULL;
@@ -97,8 +96,6 @@
num_references = (int)strtol(argv[3], NULL, 0);
info = aom_video_reader_get_info(reader);
- width = info->frame_width;
- height = info->frame_height;
decoder = get_aom_decoder_by_fourcc(info->codec_fourcc);
if (!decoder) die("Unknown input codec.");
@@ -107,6 +104,10 @@
if (aom_codec_dec_init(&codec, decoder->codec_interface(), NULL, 0))
die_codec(&codec, "Failed to initialize decoder.");
+ if (aom_codec_control(&codec, AV1D_SET_IS_ANNEXB, info->is_annexb)) {
+ die("Failed to set annex b status");
+ }
+
// Decode anchor frames.
aom_codec_control_(&codec, AV1_SET_TILE_MODE, 0);
for (i = 0; i < num_references; ++i) {
@@ -120,12 +121,17 @@
if (aom_codec_control(&codec, AV1D_GET_IMG_FORMAT, &ref_fmt))
die_codec(&codec, "Failed to get the image format");
+ int frame_res[2];
+ if (aom_codec_control(&codec, AV1D_GET_FRAME_SIZE, frame_res))
+ die_codec(&codec, "Failed to get the image frame size");
+
// Allocate memory to store decoded references. Allocate memory with the
// border so that it can be used as a reference.
for (j = 0; j < num_references; j++) {
unsigned int border = AOM_BORDER_IN_PIXELS;
- if (!aom_img_alloc_with_border(&reference_images[j], ref_fmt, width,
- height, 32, 8, border)) {
+ if (!aom_img_alloc_with_border(&reference_images[j], ref_fmt,
+ frame_res[0], frame_res[1], 32, 8,
+ border)) {
die("Failed to allocate references.");
}
}
diff --git a/examples/lightfield_encoder.c b/examples/lightfield_encoder.c
index 22daf62..f8c37fb 100644
--- a/examples/lightfield_encoder.c
+++ b/examples/lightfield_encoder.c
@@ -240,7 +240,8 @@
AvxVideoInfo info = { encoder->fourcc,
cfg->g_w,
cfg->g_h,
- { cfg->g_timebase.num, cfg->g_timebase.den } };
+ { cfg->g_timebase.num, cfg->g_timebase.den },
+ 0 };
AvxVideoWriter *writer = NULL;
aom_codec_ctx_t codec;
int frame_count = 0;
diff --git a/examples/lightfield_tile_list_decoder.c b/examples/lightfield_tile_list_decoder.c
index 48e42b0..2e4f389 100644
--- a/examples/lightfield_tile_list_decoder.c
+++ b/examples/lightfield_tile_list_decoder.c
@@ -51,7 +51,6 @@
AvxVideoReader *reader = NULL;
const AvxInterface *decoder = NULL;
const AvxVideoInfo *info = NULL;
- int width, height;
int num_references;
int num_tile_lists;
aom_image_t reference_images[MAX_EXTERNAL_REFERENCES];
@@ -73,8 +72,6 @@
num_tile_lists = (int)strtol(argv[4], NULL, 0);
info = aom_video_reader_get_info(reader);
- width = info->frame_width;
- height = info->frame_height;
decoder = get_aom_decoder_by_fourcc(info->codec_fourcc);
if (!decoder) die("Unknown input codec.");
@@ -83,9 +80,12 @@
if (aom_codec_dec_init(&codec, decoder->codec_interface(), NULL, 0))
die_codec(&codec, "Failed to initialize decoder.");
+ if (aom_codec_control(&codec, AV1D_SET_IS_ANNEXB, info->is_annexb)) {
+ die("Failed to set annex b status");
+ }
+
// Decode anchor frames.
aom_codec_control_(&codec, AV1_SET_TILE_MODE, 0);
-
for (i = 0; i < num_references; ++i) {
aom_video_reader_read_frame(reader);
frame = aom_video_reader_get_frame(reader, &frame_size);
@@ -97,12 +97,17 @@
if (aom_codec_control(&codec, AV1D_GET_IMG_FORMAT, &ref_fmt))
die_codec(&codec, "Failed to get the image format");
+ int frame_res[2];
+ if (aom_codec_control(&codec, AV1D_GET_FRAME_SIZE, frame_res))
+ die_codec(&codec, "Failed to get the image frame size");
+
// Allocate memory to store decoded references. Allocate memory with the
// border so that it can be used as a reference.
for (j = 0; j < num_references; j++) {
unsigned int border = AOM_BORDER_IN_PIXELS;
- if (!aom_img_alloc_with_border(&reference_images[j], ref_fmt, width,
- height, 32, 8, border)) {
+ if (!aom_img_alloc_with_border(&reference_images[j], ref_fmt,
+ frame_res[0], frame_res[1], 32, 8,
+ border)) {
die("Failed to allocate references.");
}
}
@@ -130,13 +135,11 @@
// Set external references.
av1_ext_ref_frame_t set_ext_ref = { &reference_images[0], num_references };
aom_codec_control_(&codec, AV1D_SET_EXT_REF_PTR, &set_ext_ref);
-
// Must decode the camera frame header first.
aom_video_reader_read_frame(reader);
frame = aom_video_reader_get_frame(reader, &frame_size);
if (aom_codec_decode(&codec, frame, frame_size, NULL))
die_codec(&codec, "Failed to decode the frame.");
-
// Decode tile lists one by one.
for (n = 0; n < num_tile_lists; n++) {
aom_video_reader_read_frame(reader);
diff --git a/examples/twopass_encoder.c b/examples/twopass_encoder.c
index 1b134cc..a03bc6c 100644
--- a/examples/twopass_encoder.c
+++ b/examples/twopass_encoder.c
@@ -148,7 +148,8 @@
AvxVideoInfo info = { encoder->fourcc,
cfg->g_w,
cfg->g_h,
- { cfg->g_timebase.num, cfg->g_timebase.den } };
+ { cfg->g_timebase.num, cfg->g_timebase.den },
+ 0 };
AvxVideoWriter *writer = NULL;
aom_codec_ctx_t codec;
int frame_count = 0;
