diff options
author | Hirokazu Honda <hiroh@chromium.org> | 2023-11-29 01:32:21 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-11-29 01:32:21 +0000 |
commit | 2faf9c3e0e8c4ae9b723d3f9c8a95916d6fe8f79 (patch) | |
tree | a0185a606201d002ae8b04f785a530c2c7a781a5 | |
parent | 59a3b791fbc474a11f3062d52c0f8ace72a34d72 (diff) | |
parent | 56c78a68b0a881b7f039c0de662cc758ab40d08c (diff) | |
download | libvpx-2faf9c3e0e8c4ae9b723d3f9c8a95916d6fe8f79.tar.gz |
Merge "ratectrl_rtc: Remove duplicated DropFrameReason enum class" into main
-rw-r--r-- | vp8/vp8_ratectrl_rtc.h | 5 | ||||
-rw-r--r-- | vp9/ratectrl_rtc.h | 5 | ||||
-rw-r--r-- | vpx/internal/vpx_ratectrl_rtc.h | 5 |
3 files changed, 5 insertions, 10 deletions
diff --git a/vp8/vp8_ratectrl_rtc.h b/vp8/vp8_ratectrl_rtc.h index 4c174b131..59fb60752 100644 --- 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 7f624a5fe..85005c547 100644 --- 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 eb90cd1d0..6ffd798eb 100644 --- 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() { |