From 1cd0a0ab43846072b1e2f37c953ecd770feb5963 Mon Sep 17 00:00:00 2001 From: kthelgason Date: Fri, 9 Dec 2016 02:30:46 -0800 Subject: [PATCH] Revert of Bump up scaling limit for MediaCodec. (patchset #3 id:40001 of https://codereview.webrtc.org/2566533002/ ) Reason for revert: Failed on the perf tests. Original issue's description: > Bump up scaling limit for MediaCodec. > > Wait until MediaCodec is better tested at these low > resolutions, and until some fallback mechanism is in place > before lowering this threshold. > > BUG=webrtc:6837 > > Committed: https://crrev.com/3e9b1330467edf6b5af609b375c15efb9e6b4933 > Cr-Commit-Position: refs/heads/master@{#15498} TBR=magjed@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6837 Review-Url: https://codereview.webrtc.org/2562963002 Cr-Commit-Position: refs/heads/master@{#15500} --- webrtc/video/vie_encoder.cc | 6 ------ webrtc/video/vie_encoder_unittest.cc | 12 ++---------- 2 files changed, 2 insertions(+), 16 deletions(-) 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++) {