diff --git a/webrtc/video/vie_encoder.cc b/webrtc/video/vie_encoder.cc index b0f01184ce..de6b9a8a63 100644 --- a/webrtc/video/vie_encoder.cc +++ b/webrtc/video/vie_encoder.cc @@ -33,13 +33,7 @@ namespace { // Time interval for logging frame counts. const int64_t kFrameLogIntervalMs = 60000; // We will never ask for a resolution lower than this. -#if defined(WEBRTC_ANDROID) -// TODO(kthelgason): Lower this limit when better testing -// on MediaCodec and fallback implementations are in place. -const int kMinPixelsPerFrame = 320 * 180; -#else const int kMinPixelsPerFrame = 120 * 90; -#endif // TODO(pbos): Lower these thresholds (to closer to 100%) when we handle // pipelining encoders better (multiple input frames before something comes diff --git a/webrtc/video/vie_encoder_unittest.cc b/webrtc/video/vie_encoder_unittest.cc index 9b201d170e..da925e5224 100644 --- a/webrtc/video/vie_encoder_unittest.cc +++ b/webrtc/video/vie_encoder_unittest.cc @@ -20,16 +20,6 @@ #include "webrtc/video/send_statistics_proxy.h" #include "webrtc/video/vie_encoder.h" -namespace { -#if defined(WEBRTC_ANDROID) -// TODO(kthelgason): Lower this limit when better testing -// on MediaCodec and fallback implementations are in place. -const int kMinPixelsPerFrame = 320 * 180; -#else -const int kMinPixelsPerFrame = 120 * 90; -#endif -} - namespace webrtc { using DegredationPreference = VideoSendStream::DegradationPreference; @@ -1031,6 +1021,8 @@ TEST_F(ViEEncoderTest, DoesNotScaleBelowSetLimit) { const int kTargetBitrateBps = 100000; int frame_width = 1280; int frame_height = 720; + // from vie_encoder.cc + const int kMinPixelsPerFrame = 120 * 90; vie_encoder_->OnBitrateUpdated(kTargetBitrateBps, 0, 0); for (size_t i = 1; i <= 10; i++) {