content/browser/renderer_host/media/audio_sync_reader.h - Issue 9121045: Switch AudioDevice classes from SyncSocket to CancelableSyncSocket.

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/renderer_host/media/audio_sync_reader.h

Issue 9121045: Switch AudioDevice classes from SyncSocket to CancelableSyncSocket. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments, add temporary ScopedAllowIO for the audio thread cleanup+TODO for next cl. Created 8 years, 11 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:

Index: content/browser/renderer_host/media/audio_sync_reader.h

diff --git a/content/browser/renderer_host/media/audio_sync_reader.h b/content/browser/renderer_host/media/audio_sync_reader.h

index 4aff8aa963aa656782d2cd6cc1539e26644d222e..32eaf2e9236367f17ad8c494622396be4f5cd54d 100644

--- a/content/browser/renderer_host/media/audio_sync_reader.h

+++ b/content/browser/renderer_host/media/audio_sync_reader.h

@@ -45,12 +45,12 @@ class AudioSyncReader : public media::AudioOutputController::SyncReader {

base::SharedMemory* shared_memory_;

base::Time previous_call_time_;

- // A pair of SyncSocket for transmitting audio data.

- scoped_ptr<base::SyncSocket> socket_;

+ // Socket for transmitting audio data.

+ scoped_ptr<base::CancelableSyncSocket> socket_;

- // SyncSocket to be used by the renderer. The reference is released after

+ // Socket to be used by the renderer. The reference is released after

// PrepareForeignSocketHandle() is called and ran successfully.

- scoped_ptr<base::SyncSocket> foreign_socket_;

+ scoped_ptr<base::CancelableSyncSocket> foreign_socket_;

// Protect socket_ access by lock to prevent race condition when audio

// controller thread closes the reader and hardware audio thread is reading