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

Side by Side Diff: content/browser/renderer_host/media/audio_sync_reader.h

Issue 22886005: Switch audio synchronization from sleep() based to select() based. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix DCHECK. Created 7 years, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_SYNC_READER_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_SYNC_READER_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_SYNC_READER_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_SYNC_READER_H_
7 7
8 #include "base/file_descriptor_posix.h" 8 #include "base/file_descriptor_posix.h"
9 #include "base/process/process.h" 9 #include "base/process/process.h"
10 #include "base/sync_socket.h" 10 #include "base/sync_socket.h"
(...skipping 15 matching lines...) Expand all
26 class AudioSyncReader : public media::AudioOutputController::SyncReader { 26 class AudioSyncReader : public media::AudioOutputController::SyncReader {
27 public: 27 public:
28 AudioSyncReader(base::SharedMemory* shared_memory, 28 AudioSyncReader(base::SharedMemory* shared_memory,
29 const media::AudioParameters& params, 29 const media::AudioParameters& params,
30 int input_channels); 30 int input_channels);
31 31
32 virtual ~AudioSyncReader(); 32 virtual ~AudioSyncReader();
33 33
34 // media::AudioOutputController::SyncReader implementations. 34 // media::AudioOutputController::SyncReader implementations.
35 virtual void UpdatePendingBytes(uint32 bytes) OVERRIDE; 35 virtual void UpdatePendingBytes(uint32 bytes) OVERRIDE;
36 virtual int Read(bool block, 36 virtual void Read(const media::AudioBus* source,
37 const media::AudioBus* source, 37 media::AudioBus* dest) OVERRIDE;
38 media::AudioBus* dest) OVERRIDE;
39 virtual void Close() OVERRIDE; 38 virtual void Close() OVERRIDE;
40 39
41 bool Init(); 40 bool Init();
42 bool PrepareForeignSocketHandle(base::ProcessHandle process_handle, 41 bool PrepareForeignSocketHandle(base::ProcessHandle process_handle,
43 #if defined(OS_WIN) 42 #if defined(OS_WIN)
44 base::SyncSocket::Handle* foreign_handle); 43 base::SyncSocket::Handle* foreign_handle);
45 #else 44 #else
46 base::FileDescriptor* foreign_handle); 45 base::FileDescriptor* foreign_handle);
47 #endif 46 #endif
48 47
49 private: 48 private:
50 // Indicates whether the renderer has data available for reading. 49 // Blocks until data is ready for reading or a timeout expires. Returns false
51 bool DataReady(); 50 // if an error or timeout occurs.
52 51 bool WaitUntilDataIsReady();
53 // Blocks until DataReady() is true or a timeout expires.
54 void WaitTillDataReady();
55 52
56 base::SharedMemory* shared_memory_; 53 base::SharedMemory* shared_memory_;
57 54
58 // Number of input channels for synchronized I/O. 55 // Number of input channels for synchronized I/O.
59 int input_channels_; 56 int input_channels_;
60 57
61 // Mutes all incoming samples. This is used to prevent audible sound 58 // Mutes all incoming samples. This is used to prevent audible sound
62 // during automated testing. 59 // during automated testing.
63 bool mute_audio_; 60 bool mute_audio_;
64 61
(...skipping 11 matching lines...) Expand all
76 scoped_ptr<media::AudioBus> input_bus_; 73 scoped_ptr<media::AudioBus> input_bus_;
77 74
78 // Maximum amount of audio data which can be transferred in one Read() call. 75 // Maximum amount of audio data which can be transferred in one Read() call.
79 int packet_size_; 76 int packet_size_;
80 77
81 // Track the number of times the renderer missed its real-time deadline and 78 // Track the number of times the renderer missed its real-time deadline and
82 // report a UMA stat during destruction. 79 // report a UMA stat during destruction.
83 size_t renderer_callback_count_; 80 size_t renderer_callback_count_;
84 size_t renderer_missed_callback_count_; 81 size_t renderer_missed_callback_count_;
85 82
83 // The maximum amount of time to wait for data from the renderer. Calculated
84 // from the parameters given at construction.
85 const base::TimeDelta maximum_wait_time_;
86
87 // The index of the audio buffer we're expecting to be sent from the renderer;
88 // used to block with timeout for audio data.
89 uint32 buffer_index_;
90
86 DISALLOW_COPY_AND_ASSIGN(AudioSyncReader); 91 DISALLOW_COPY_AND_ASSIGN(AudioSyncReader);
87 }; 92 };
88 93
89 } // namespace content 94 } // namespace content
90 95
91 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_SYNC_READER_H_ 96 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_SYNC_READER_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/audio_renderer_host.cc ('k') | content/browser/renderer_host/media/audio_sync_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698