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

Unified Diff: webrtc/modules/audio_device/fine_audio_buffer.h

Issue 2715963002: Simplifies FineAudioBuffer by using rtc::Buffer (Closed)
Patch Set: Improved buffer handling after feedback from kwiberg@ Created 3 years, 10 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: webrtc/modules/audio_device/fine_audio_buffer.h
diff --git a/webrtc/modules/audio_device/fine_audio_buffer.h b/webrtc/modules/audio_device/fine_audio_buffer.h
index 92f9f41577de12df834a013538fb42e93fb2e03e..306f9d24d377a7fe3ec31e0d01e298f86bf2db63 100644
--- a/webrtc/modules/audio_device/fine_audio_buffer.h
+++ b/webrtc/modules/audio_device/fine_audio_buffer.h
@@ -42,10 +42,6 @@ class FineAudioBuffer {
int sample_rate);
~FineAudioBuffer();
- // Returns the required size of |buffer| when calling GetPlayoutData(). If
- // the buffer is smaller memory trampling will happen.
- size_t RequiredPlayoutBufferSizeBytes();
-
// Clears buffers and counters dealing with playour and/or recording.
void ResetPlayout();
void ResetRecord();
@@ -60,8 +56,7 @@ class FineAudioBuffer {
// They can be fixed values on most platforms and they are ignored if an
// external (hardware/built-in) AEC is used.
// The size of |buffer| is given by |size_in_bytes| and must be equal to
- // |desired_frame_size_bytes_|. A RTC_CHECK will be hit if this is not the
- // case.
+ // |desired_frame_size_bytes_|.
// Example: buffer size is 5ms => call #1 stores 5ms of data, call #2 stores
// 5ms of data and sends a total of 10ms to WebRTC and clears the intenal
// cache. Call #3 restarts the scheme above.
@@ -87,12 +82,7 @@ class FineAudioBuffer {
const size_t samples_per_10_ms_;
// Number of audio bytes per 10ms.
const size_t bytes_per_10_ms_;
- // Storage for output samples that are not yet asked for.
- std::unique_ptr<int8_t[]> playout_cache_buffer_;
- // Location of first unread output sample.
- size_t playout_cached_buffer_start_;
- // Number of bytes stored in output (contain samples to be played out) cache.
- size_t playout_cached_bytes_;
+ rtc::BufferT<int8_t> playout_buffer_;
// Storage for input samples that are about to be delivered to the WebRTC
// ADB or remains from the last successful delivery of a 10ms audio buffer.
rtc::BufferT<int8_t> record_buffer_;

Powered by Google App Engine
This is Rietveld 408576698