commit 31a7aa505ad8a689ee81375d36b40079895aa844
author Urvang Joshi <urvang@google.com> Tue Mar 31 13:09:13 2020 -0700
committer Urvang Joshi <urvang@google.com> Tue Mar 31 22:02:45 2020 +0000
tree 1b56fd8c0bee8a577b107e614b2b2a616d428c63
parent 181d5902ef89f99f121d02c54727e5e59fd2d0f7

Move FRAME_INFO and init_frame_info() to encoder

These were declared/defined in common but only used by the encoder.

BUG=aomedia:2610

Change-Id: I3943d0d5f5b1582a6ab8fe3513c02671df5b5022

av1/common/av1_common_int.h

diff --git a/av1/common/av1_common_int.h b/av1/common/av1_common_int.h
index e8149f4..10fe15b 100644
--- a/av1/common/av1_common_int.h
+++ b/av1/common/av1_common_int.h
@@ -287,19 +287,6 @@
 } SequenceHeader;
 
 typedef struct {
-  int frame_width;
-  int frame_height;
-  int mi_rows;
-  int mi_cols;
-  int mb_rows;
-  int mb_cols;
-  int num_mbs;
-  aom_bit_depth_t bit_depth;
-  int subsampling_x;
-  int subsampling_y;
-} FRAME_INFO;
-
-typedef struct {
   int skip_mode_allowed;
   int skip_mode_flag;
   int ref_frame_idx_0;
@@ -1509,22 +1496,6 @@
           seq_level_idx != SEQ_LEVEL_7_2 && seq_level_idx != SEQ_LEVEL_7_3);
 }
 
-static INLINE void init_frame_info(FRAME_INFO *frame_info,
-                                   const AV1_COMMON *const cm) {
-  const CommonModeInfoParams *const mi_params = &cm->mi_params;
-  const SequenceHeader *const seq_params = &cm->seq_params;
-  frame_info->frame_width = cm->width;
-  frame_info->frame_height = cm->height;
-  frame_info->mi_cols = mi_params->mi_cols;
-  frame_info->mi_rows = mi_params->mi_rows;
-  frame_info->mb_cols = mi_params->mb_cols;
-  frame_info->mb_rows = mi_params->mb_rows;
-  frame_info->num_mbs = mi_params->MBs;
-  frame_info->bit_depth = seq_params->bit_depth;
-  frame_info->subsampling_x = seq_params->subsampling_x;
-  frame_info->subsampling_y = seq_params->subsampling_y;
-}
-
 #ifdef __cplusplus
 }  // extern "C"
 #endif

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 09f7241..55bf534 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -2985,6 +2985,22 @@
   cpi->tpl_frame = &cpi->tpl_stats_buffer[REF_FRAMES + 1];
 }
 
+static INLINE void init_frame_info(FRAME_INFO *frame_info,
+                                   const AV1_COMMON *const cm) {
+  const CommonModeInfoParams *const mi_params = &cm->mi_params;
+  const SequenceHeader *const seq_params = &cm->seq_params;
+  frame_info->frame_width = cm->width;
+  frame_info->frame_height = cm->height;
+  frame_info->mi_cols = mi_params->mi_cols;
+  frame_info->mi_rows = mi_params->mi_rows;
+  frame_info->mb_cols = mi_params->mb_cols;
+  frame_info->mb_rows = mi_params->mb_rows;
+  frame_info->num_mbs = mi_params->MBs;
+  frame_info->bit_depth = seq_params->bit_depth;
+  frame_info->subsampling_x = seq_params->subsampling_x;
+  frame_info->subsampling_y = seq_params->subsampling_y;
+}
+
 AV1_COMP *av1_create_compressor(AV1EncoderConfig *oxcf, BufferPool *const pool,
                                 FIRSTPASS_STATS *frame_stats_buf,
                                 COMPRESSOR_STAGE stage, int num_lap_buffers,

av1/encoder/encoder.h

diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index 55430a0..e1d7c24 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -826,6 +826,19 @@
   int valid;
 } MV_STATS;
 
+typedef struct {
+  int frame_width;
+  int frame_height;
+  int mi_rows;
+  int mi_cols;
+  int mb_rows;
+  int mb_cols;
+  int num_mbs;
+  aom_bit_depth_t bit_depth;
+  int subsampling_x;
+  int subsampling_y;
+} FRAME_INFO;
+
 typedef struct AV1_COMP {
   QUANTS quants;
   ThreadData td;