Simple cleanup of the lightfield decoder examples Move the enum type definition before variable and function definitions. Mark internal constants and functions as static. Change-Id: If3e6f6013bc2a54e117dbe4a3c8fc98048cb84e3
diff --git a/examples/lightfield_decoder.c b/examples/lightfield_decoder.c index b757a3c..83a32b2 100644 --- a/examples/lightfield_decoder.c +++ b/examples/lightfield_decoder.c
@@ -46,14 +46,14 @@ #include "common/tools_common.h" #include "common/video_reader.h" -static const char *exec_name; - enum { YUV1D, // 1D tile output for conformance test. YUV, // Tile output in YUV format. NV12, // Tile output in NV12 format. } UENUM1BYTE(OUTPUT_FORMAT); +static const char *exec_name; + void usage_exit(void) { fprintf(stderr, "Usage: %s <infile> <outfile> <num_references> <tile_list> <output " @@ -63,8 +63,8 @@ } // Output frame size -const int output_frame_width = 512; -const int output_frame_height = 512; +static const int output_frame_width = 512; +static const int output_frame_height = 512; static void aom_img_copy_tile(const aom_image_t *src, const aom_image_t *dst, int dst_row_offset, int dst_col_offset) { @@ -96,11 +96,11 @@ } } -void decode_tile(aom_codec_ctx_t *codec, const unsigned char *frame, - size_t frame_size, int tr, int tc, int ref_idx, - aom_image_t *reference_images, aom_image_t *output, - int *tile_idx, unsigned int *output_bit_depth, - aom_image_t **img_ptr, int output_format) { +static void decode_tile(aom_codec_ctx_t *codec, const unsigned char *frame, + size_t frame_size, int tr, int tc, int ref_idx, + aom_image_t *reference_images, aom_image_t *output, + int *tile_idx, unsigned int *output_bit_depth, + aom_image_t **img_ptr, int output_format) { AOM_CODEC_CONTROL_TYPECHECKED(codec, AV1_SET_TILE_MODE, 1); AOM_CODEC_CONTROL_TYPECHECKED(codec, AV1D_EXT_TILE_DEBUG, 1); AOM_CODEC_CONTROL_TYPECHECKED(codec, AV1_SET_DECODE_TILE_ROW, tr);
diff --git a/examples/lightfield_tile_list_decoder.c b/examples/lightfield_tile_list_decoder.c index 9e333a8..5b15ae0 100644 --- a/examples/lightfield_tile_list_decoder.c +++ b/examples/lightfield_tile_list_decoder.c
@@ -37,14 +37,14 @@ #include "common/tools_common.h" #include "common/video_reader.h" -static const char *exec_name; - enum { YUV1D, // 1D tile output for conformance test. YUV, // Tile output in YUV format. NV12, // Tile output in NV12 format. } UENUM1BYTE(OUTPUT_FORMAT); +static const char *exec_name; + void usage_exit(void) { fprintf(stderr, "Usage: %s <infile> <outfile> <num_references> <num_tile_lists> "