commit d3fc161c169dfe8816a5549c251481790d2cd543
author Jakob Ivarsson <jakobi@webrtc.org> Tue Jun 25 12:32:48 2019 +0000
committer Commit Bot <commit-bot@chromium.org> Tue Jun 25 12:33:01 2019 +0000
tree a1767737b6241c0e8f1c6b9ac80f1fc967be733c
parent 87977dd06e702ed517f26235c12e37bd927527c7

Revert "Change buffer level filter to store current level in number of samples."

This reverts commit 87977dd06e702ed517f26235c12e37bd927527c7.

Reason for revert: Breaks downstream project

Original change's description:
> Change buffer level filter to store current level in number of samples.
> 
> The buffer level should not be converted back and forth between samples and packets in case of variable packet lengths.
> 
> Bug: webrtc:10736
> Change-Id: Ia08dcfac3d8104dc79fbad0704a5f6f12a050a01
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/142178
> Reviewed-by: Minyue Li <minyue@webrtc.org>
> Commit-Queue: Jakob Ivarsson <jakobi@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#28368}

TBR=henrik.lundin@webrtc.org,minyue@webrtc.org,jakobi@webrtc.org

Change-Id: I3900c9f6071fce51d13fb3b7c886157304d7a5c3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10736
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/143786
Reviewed-by: Jakob Ivarsson <jakobi@webrtc.org>
Commit-Queue: Jakob Ivarsson <jakobi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28369}

modules/audio_coding/neteq/neteq_unittest.cc

diff --git a/modules/audio_coding/neteq/neteq_unittest.cc b/modules/audio_coding/neteq/neteq_unittest.cc
index a864985..6c67ca8 100644
--- a/modules/audio_coding/neteq/neteq_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_unittest.cc
@@ -458,16 +458,16 @@
       webrtc::test::ResourcePath("audio_coding/neteq_universal_new", "rtp");
 
   const std::string output_checksum =
-      PlatformChecksum("415cc2366810676aad27a92b7a9068e79b7e4093",
-                       "52411c46e946e1d50fa777bbfb4686e7161f9cc7", "not used",
-                       "415cc2366810676aad27a92b7a9068e79b7e4093",
-                       "3e02f268f3b4f3acfcc1c397214ea13d09c212fd");
+      PlatformChecksum("9652cee1d6771a9cbfda821ae1bbdb41b0dd4dee",
+                       "54a7e32f163663c0af35bf70bf45cefc24ad62ef", "not used",
+                       "9652cee1d6771a9cbfda821ae1bbdb41b0dd4dee",
+                       "79496b0a1ef0a3824f3ee04789748a461bed643f");
 
   const std::string network_stats_checksum =
-      PlatformChecksum("6c8726e8699cc61535e65ef9406d339954a05cf8",
-                       "b9f2c862328ddb8d3ec9e79f61cc1d937ee56df6", "not used",
-                       "6c8726e8699cc61535e65ef9406d339954a05cf8",
-                       "6c8726e8699cc61535e65ef9406d339954a05cf8");
+      PlatformChecksum("c59b1f9f282b6d8733cdff975e3c150ca4a47d51",
+                       "bca95e565996a4ffd6e2ac15736e08843bdca93b", "not used",
+                       "c59b1f9f282b6d8733cdff975e3c150ca4a47d51",
+                       "c59b1f9f282b6d8733cdff975e3c150ca4a47d51");
 
   DecodeAndCompare(input_rtp_file, output_checksum, network_stats_checksum,
                    FLAG_gen_ref);
@@ -486,17 +486,17 @@
   // Checksum depends on libopus being compiled with or without SSE.
   const std::string maybe_sse =
       "14a63b3c7b925c82296be4bafc71bec85f2915c2|"
-      "8884ffe98700454875a88d1c3ea9b55e829a2016";
+      "2c05677daa968d6c68b92adf4affb7cd9bb4d363";
   const std::string output_checksum = PlatformChecksum(
-      maybe_sse, "1f76c884d16812704dec85f2b98db697108d2d9b",
-      "f888efef2d0710f202f19ba167ed509609146929", maybe_sse, maybe_sse);
+      maybe_sse, "b7b7ed802b0e18ee416973bf3b9ae98599b0181d",
+      "5876e52dda90d5ca433c3726555b907b97c86374", maybe_sse, maybe_sse);
 
   const std::string network_stats_checksum =
-      PlatformChecksum("bb8d91f71873df562224fe0dc5822b5dfb030090",
-                       "9f858290a675c4ceabf575feb6a59bef76d62eaf",
-                       "12963c965d9d102ebbc1f619508e2960a1f7dbee",
-                       "bb8d91f71873df562224fe0dc5822b5dfb030090",
-                       "bb8d91f71873df562224fe0dc5822b5dfb030090");
+      PlatformChecksum("adb3272498e436d1c019cbfd71610e9510c54497",
+                       "fa935a91abc7291db47428a2d7c5361b98713a92",
+                       "42106aa5267300f709f63737707ef07afd9dac61",
+                       "adb3272498e436d1c019cbfd71610e9510c54497",
+                       "adb3272498e436d1c019cbfd71610e9510c54497");
 
   DecodeAndCompare(input_rtp_file, output_checksum, network_stats_checksum,
                    FLAG_gen_ref);
@@ -796,7 +796,7 @@
   const double kDriftFactor = 1000.0 / (1000.0 + 25.0);
   const double kNetworkFreezeTimeMs = 5000.0;
   const bool kGetAudioDuringFreezeRecovery = false;
-  const int kDelayToleranceMs = 60;
+  const int kDelayToleranceMs = 50;
   const int kMaxTimeToSpeechMs = 200;
   LongCngWithClockDrift(kDriftFactor, kNetworkFreezeTimeMs,
                         kGetAudioDuringFreezeRecovery, kDelayToleranceMs,