summaryrefslogtreecommitdiffstats
path: root/remoting/client
diff options
context:
space:
mode:
authorgarykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-29 14:22:40 +0000
committergarykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-29 14:22:40 +0000
commitdc0c4d44704d94100294cb5a5f97ee20688810d1 (patch)
tree6dd338c103444b9c1ad56529ba5579612597e618 /remoting/client
parent84f28a94be0e1eead978bd737f985cfedcf1e9b2 (diff)
downloadchromium_src-dc0c4d44704d94100294cb5a5f97ee20688810d1.zip
chromium_src-dc0c4d44704d94100294cb5a5f97ee20688810d1.tar.gz
chromium_src-dc0c4d44704d94100294cb5a5f97ee20688810d1.tar.bz2
[Chromoting] Fix audio bug with hissing/crash on Mac.
The number of bytes consumed from the queued samples list was not being reset when the list was reset. BUG=150843 Review URL: https://chromiumcodereview.appspot.com/10977090 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client')
-rw-r--r--remoting/client/plugin/pepper_audio_player.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/remoting/client/plugin/pepper_audio_player.cc b/remoting/client/plugin/pepper_audio_player.cc
index b52a40c..cbb1218 100644
--- a/remoting/client/plugin/pepper_audio_player.cc
+++ b/remoting/client/plugin/pepper_audio_player.cc
@@ -95,6 +95,7 @@ void PepperAudioPlayer::ProcessAudioPacket(scoped_ptr<AudioPacket> packet) {
base::AutoLock auto_lock(lock_);
STLDeleteElements(&queued_packets_);
queued_samples_ = 0;
+ bytes_consumed_ = 0;
}
bool success = ResetAudioPlayer(packet->sampling_rate());
@@ -110,6 +111,7 @@ void PepperAudioPlayer::ProcessAudioPacket(scoped_ptr<AudioPacket> packet) {
base::Time::kMillisecondsPerSecond) {
STLDeleteElements(&queued_packets_);
queued_samples_ = 0;
+ bytes_consumed_ = 0;
}
queued_samples_ += packet->data(0).size() / (kChannels * kSampleSizeBytes);