Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(230)

Unified Diff: content/browser/renderer_host/media/audio_renderer_host.h

Issue 9121062: Remove "high"-latency audio code path (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase ToT 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:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/audio_renderer_host.h
diff --git a/content/browser/renderer_host/media/audio_renderer_host.h b/content/browser/renderer_host/media/audio_renderer_host.h
index 16e2d02120c78840612ffbb016f9a20f4c707618..ff8a536d442438cb40af4b2ab2655f97477025c5 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_renderer_host.h
@@ -11,43 +11,28 @@
// singleton and created in IO thread, audio output streams are also created in
// the IO thread, so we need to destroy them also in IO thread. After this class
// is created, a task of OnInitialized() is posted on IO thread in which
-// singleton of AudioManager is created and.
+// singleton of AudioManager is created.
//
// Here's an example of a typical IPC dialog for audio:
//
// Renderer AudioRendererHost
// | |
// | CreateStream > |
-// | < Created |
+// | < NotifyStreamCreated |
// | |
-// | Play > |
-// | < Playing | time
+// | PlayStream > |
+// | < NotifyStreamStateChanged | kAudioStreamPlaying
// | |
-// | < RequestAudioPacket |
-// | AudioPacketReady > |
-// | ... |
-// | < RequestAudioPacket |
-// | AudioPacketReady > |
+// | PauseStream > |
+// | < NotifyStreamStateChanged | kAudioStreamPaused
// | |
+// | PlayStream > |
+// | < NotifyStreamStateChanged | kAudioStreamPlaying
// | ... |
-// | < RequestAudioPacket |
-// | AudioPacketReady > |
-// | ... |
-// | Pause > |
-// | < Paused |
-// | ... |
-// | Start > |
-// | < Started |
-// | ... |
-// | Close > |
+// | CloseStream > |
// v v
-// The above mode of operation uses relatively big buffers and has latencies
-// of 50 ms or more. There is a second mode of operation which is low latency.
-// For low latency audio, the picture above is modified by not having the
-// RequestAudioPacket and the AudioPacketReady messages, instead a SyncSocket
-// pair is used to signal buffer readiness without having to route messages
-// using the IO thread.
+// A SyncSocket pair is used to signal buffer readiness between processes.
#ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_RENDERER_HOST_H_
#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_RENDERER_HOST_H_
@@ -97,8 +82,6 @@ class CONTENT_EXPORT AudioRendererHost
// ownership of the reader.
scoped_ptr<media::AudioOutputController::SyncReader> reader;
- bool pending_buffer_request;
-
// Set to true after we called Close() for the controller.
bool pending_close;
};
@@ -120,8 +103,6 @@ class CONTENT_EXPORT AudioRendererHost
virtual void OnPaused(media::AudioOutputController* controller) OVERRIDE;
virtual void OnError(media::AudioOutputController* controller,
int error_code) OVERRIDE;
- virtual void OnMoreData(media::AudioOutputController* controller,
- AudioBuffersState buffers_state) OVERRIDE;
private:
friend class AudioRendererHostTest;
@@ -139,9 +120,7 @@ class CONTENT_EXPORT AudioRendererHost
// Creates an audio output stream with the specified format. If this call is
// successful this object would keep an internal entry of the stream for the
// required properties.
- void OnCreateStream(int stream_id,
- const AudioParameters& params,
- bool low_latency);
+ void OnCreateStream(int stream_id, const AudioParameters& params);
// Play the audio stream referenced by |stream_id|.
void OnPlayStream(int stream_id);
@@ -149,7 +128,7 @@ class CONTENT_EXPORT AudioRendererHost
// Pause the audio stream referenced by |stream_id|.
void OnPauseStream(int stream_id);
- // Discard all audio data in stream referenced by |stream_id|.
+ // Discard all audio data in stream referenced by |stream_id|.
void OnFlushStream(int stream_id);
// Close the audio stream referenced by |stream_id|.
@@ -158,12 +137,6 @@ class CONTENT_EXPORT AudioRendererHost
// Set the volume of the audio stream referenced by |stream_id|.
void OnSetVolume(int stream_id, double volume);
- // Get the volume of the audio stream referenced by |stream_id|.
- void OnGetVolume(int stream_id);
-
- // Notify packet has been prepared for the audio stream.
- void OnNotifyPacketReady(int stream_id, uint32 packet_size);
-
// Complete the process of creating an audio stream. This will set up the
// shared memory or shared socket in low latency mode.
void DoCompleteCreation(media::AudioOutputController* controller);
@@ -172,11 +145,6 @@ class CONTENT_EXPORT AudioRendererHost
void DoSendPlayingMessage(media::AudioOutputController* controller);
void DoSendPausedMessage(media::AudioOutputController* controller);
- // Request more data from the renderer. This method is used only in normal
- // latency mode.
- void DoRequestMoreData(media::AudioOutputController* controller,
- AudioBuffersState buffers_state);
-
// Handle error coming from audio stream.
void DoHandleError(media::AudioOutputController* controller, int error_code);
« no previous file with comments | « no previous file | content/browser/renderer_host/media/audio_renderer_host.cc » ('j') | content/common/media/audio_messages.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698