media/audio/virtual_audio_output_stream.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: media/audio/virtual_audio_output_stream.cc

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

Patch Set: Pass target playout time to AudioSourceCallback::OnMoreData. Created 4 years, 5 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

« media/audio/simple_sources_unittest.cc ('K') | « media/audio/virtual_audio_input_stream_unittest.cc ('k') | media/audio/win/audio_low_latency_output_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/audio/virtual_audio_output_stream.cc

diff --git a/media/audio/virtual_audio_output_stream.cc b/media/audio/virtual_audio_output_stream.cc

index 990e5d5fc90dfd35749330b6f215ae87fb68fdab..e7224c111389f12674f76d4816e8b540d59cd0eb 100644

--- a/media/audio/virtual_audio_output_stream.cc

+++ b/media/audio/virtual_audio_output_stream.cc

@@ -7,6 +7,7 @@

#include <stdint.h>

#include "base/logging.h"

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

#include "media/audio/virtual_audio_input_stream.h"

namespace media {

@@ -79,10 +80,11 @@ double VirtualAudioOutputStream::ProvideInput(AudioBus* audio_bus,

// platform.

DCHECK(callback_);

- const uint32_t upstream_delay_in_bytes =

- params_.GetBytesPerFrame() * frames_delayed;

- const int frames =

- callback_->OnMoreData(audio_bus, upstream_delay_in_bytes, 0);

+ const base::TimeTicks target_playout_time =

+ base::TimeTicks::Now() +

+ base::TimeDelta::FromSecondsD(static_cast<double>(frames_delayed) /

+ params_.sample_rate());

+ const int frames = callback_->OnMoreData(target_playout_time, 0, audio_bus);

if (frames < audio_bus->frames())

audio_bus->ZeroFramesPartial(frames, audio_bus->frames() - frames);