content/browser/media/capture/web_contents_audio_muter.cc - Issue 2101303004: Pass delay and timestamp to AudioSourceCallback::OnMoreData.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/media/capture/web_contents_audio_muter.cc

Issue 2101303004: Pass delay and timestamp to AudioSourceCallback::OnMoreData. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: Fix Mac CQ errors. Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chromecast/media/audio/cast_audio_output_stream.h ('K') | « content/browser/media/capture/web_contents_audio_input_stream_unittest.cc ('k') | content/renderer/media/audio_track_recorder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/capture/web_contents_audio_muter.cc

diff --git a/content/browser/media/capture/web_contents_audio_muter.cc b/content/browser/media/capture/web_contents_audio_muter.cc

index 63df637666d355e7e6b35ebc87a965ed43ea0272..949858bfc3108ae023edc00205f6324d71e762ba 100644

--- a/content/browser/media/capture/web_contents_audio_muter.cc

+++ b/content/browser/media/capture/web_contents_audio_muter.cc

@@ -4,9 +4,13 @@

#include "content/browser/media/capture/web_contents_audio_muter.h"

+#include <memory>

+#include <set>

#include "base/bind.h"

#include "base/bind_helpers.h"

#include "base/macros.h"

+#include "base/time/time.h"

#include "content/browser/media/capture/audio_mirroring_manager.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/render_frame_host.h"

@@ -50,7 +54,8 @@ class AudioDiscarder : public media::AudioOutputStream {

~AudioDiscarder() override {}

void FetchAudioData(AudioSourceCallback* callback) {

- callback->OnMoreData(audio_bus_.get(), 0, 0);

+ callback->OnMoreData(base::TimeDelta(), base::TimeTicks::Now(), 0,

+ audio_bus_.get());

}

// Calls FetchAudioData() at regular intervals and discards the data.