diff options
author | xians <xians@chromium.org> | 2014-09-03 09:58:25 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-03 17:04:56 +0000 |
commit | 6e5a8c5087c7f6d827d5eb39996a4065d2397a0b (patch) | |
tree | e49012be15efaa7733e8e6f8eec2394af7418498 /media/base/audio_block_fifo.h | |
parent | 11550278244a1e332594a380d2e22da4ea324ee9 (diff) | |
download | chromium_src-6e5a8c5087c7f6d827d5eb39996a4065d2397a0b.zip chromium_src-6e5a8c5087c7f6d827d5eb39996a4065d2397a0b.tar.gz chromium_src-6e5a8c5087c7f6d827d5eb39996a4065d2397a0b.tar.bz2 |
Revert of Reland 501823002: Used native deinterleaved and float point format for the input streams (patchset #4 id:80001 of https://codereview.chromium.org/510073002/)
Reason for revert:
It is speculated that this CL is blamed for crbug/409819, I temporarily revert it to be able to verify it on canary.
Original issue's description:
> Used native deinterleaved and float point format for the input streams.
>
> If we call GetProperty of kAudioUnitProperty_StreamFormat before setting the format, the device will report kAudioFormatFlagsNativeFloatPacked | kLinearPCMFormatFlagIsNonInterleaved as the native format of the device, which is the same as the output.
>
> This patch changes the format to use kAudioFormatFlagsNativeFloatPacked | kLinearPCMFormatFlagIsNonInterleaved to open the device, so that we will avoid format flipping back and forth. Hope this optimization will help increase the stability of the input audio on Mac.
>
> TBR=DaleCurtis@chromium.org
>
> BUG=404884
> TEST=media_unittests && https://webrtc.googlecode.com/svn-history/r5497/trunk/samples/js/demos/html/pc1.html, https://www.google.com/intl/en/chrome/demos/speech.html
>
> Committed: https://chromium.googlesource.com/chromium/src/+/2c732c000e18a6decd1da8da24e1f5f9e5f16833
TBR=dalecurtis@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=404884
Review URL: https://codereview.chromium.org/532303002
Cr-Commit-Position: refs/heads/master@{#293156}
Diffstat (limited to 'media/base/audio_block_fifo.h')
-rw-r--r-- | media/base/audio_block_fifo.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/media/base/audio_block_fifo.h b/media/base/audio_block_fifo.h index 56a2fe0..fdb5cef 100644 --- a/media/base/audio_block_fifo.h +++ b/media/base/audio_block_fifo.h @@ -28,10 +28,6 @@ class MEDIA_EXPORT AudioBlockFifo { // Push() will crash if the allocated space is insufficient. void Push(const void* source, int frames, int bytes_per_sample); - // Pushes the audio data from |source| to the FIFO. - // Push() will crash if the allocated space is insufficient. - void Push(const AudioBus* source); - // Consumes a block of audio from the FIFO. Returns an AudioBus which // contains the consumed audio data to avoid copying. // Consume() will crash if the FIFO does not contain a block of data. @@ -50,9 +46,6 @@ class MEDIA_EXPORT AudioBlockFifo { int GetUnfilledFrames() const; private: - // Helper method to update the indexes in Push methods. - void UpdatePosition(int push_frames); - // The actual FIFO is a vector of audio buses. ScopedVector<AudioBus> audio_blocks_; |