shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Clean up vp9_firstpass.h"

--- a/vp9/encoder/vp9_firstpass.h

+++ b/vp9/encoder/vp9_firstpass.h

@@ -43,12 +43,6 @@

 #define INVALID_ROW -1

-// Length of the bi-predictive frame group (BFG)

-// NOTE: Currently each BFG contains one backward ref (BWF) frame plus a certain

-//       number of bi-predictive frames.

-#define BFG_INTERVAL 2

-#define MAX_EXT_ARFS 2

-#define MIN_EXT_ARF_INTERVAL 4

 #define MAX_ARF_LAYERS 6

 typedef struct {

@@ -200,7 +194,6 @@

 struct TileDataEnc;

 void vp9_init_first_pass(struct VP9_COMP *cpi);

-void vp9_rc_get_first_pass_params(struct VP9_COMP *cpi);

 void vp9_first_pass(struct VP9_COMP *cpi, const struct lookahead_entry *source);

 void vp9_end_first_pass(struct VP9_COMP *cpi);

@@ -218,17 +211,6 @@

 void calculate_coded_size(struct VP9_COMP *cpi, int *scaled_frame_width,

                           int *scaled_frame_height);

-

-static INLINE int get_number_of_extra_arfs(int interval, int arf_pending) {

-  assert(MAX_EXT_ARFS > 0);

-  if (arf_pending) {

-    if (interval >= MIN_EXT_ARF_INTERVAL * (MAX_EXT_ARFS + 1))

-      return MAX_EXT_ARFS;

-    else if (interval >= MIN_EXT_ARF_INTERVAL * MAX_EXT_ARFS)

-      return MAX_EXT_ARFS - 1;

-  }

-  return 0;

-}

 #ifdef __cplusplus

 }  // extern "C"