ratectrl_rtc: Remove duplicated DropFrameReason enum class

DropFrameReason is declared in two places. This moves it
to the common place.

Change-Id: I04c16db4a49135588edff7e1746dcf9172750bb9

diff --git a/vp8/vp8_ratectrl_rtc.h b/vp8/vp8_ratectrl_rtc.h
index 4c174b1..59fb607 100644 (file)
--- a/vp8/vp8_ratectrl_rtc.h
+++ b/vp8/vp8_ratectrl_rtc.h
@@ -33,11 +33,6 @@ struct VP8FrameParamsQpRTC {
   int temporal_layer_id;
 };
 
-enum class FrameDropDecision {
-  kOk,    // Frame is encoded.
-  kDrop,  // Frame is dropped.
-};
-
 class VP8RateControlRTC {
  public:
   static std::unique_ptr<VP8RateControlRTC> Create(

diff --git a/vp9/ratectrl_rtc.h b/vp9/ratectrl_rtc.h
index 7f624a5..85005c5 100644 (file)
--- a/vp9/ratectrl_rtc.h
+++ b/vp9/ratectrl_rtc.h
@@ -64,11 +64,6 @@ struct VP9SegmentationData {
   size_t delta_q_size;
 };
 
-enum class FrameDropDecision {
-  kOk,    // Frame is encoded.
-  kDrop,  // Frame is dropped.
-};
-
 // This interface allows using VP9 real-time rate control without initializing
 // the encoder. To use this interface, you need to link with libvpxrc.a.
 //

diff --git a/vpx/internal/vpx_ratectrl_rtc.h b/vpx/internal/vpx_ratectrl_rtc.h
index eb90cd1..6ffd798 100644 (file)
--- a/vpx/internal/vpx_ratectrl_rtc.h
+++ b/vpx/internal/vpx_ratectrl_rtc.h
@@ -17,6 +17,11 @@ namespace libvpx {
 
 enum class RcFrameType { kKeyFrame = 0, kInterFrame = 1 };
 
+enum class FrameDropDecision {
+  kOk,    // Frame is encoded.
+  kDrop,  // Frame is dropped.
+};
+
 struct VpxRateControlRtcConfig {
  public:
   VpxRateControlRtcConfig() {