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

Side by Side Diff: media/base/audio_block_fifo.cc

Issue 510073002: Reland 501823002: Used native deinterleaved and float point format for the input streams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: uint8 -> float Created 6 years, 3 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
« no previous file with comments | « media/base/audio_block_fifo.h ('k') | media/base/audio_block_fifo_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "media/base/audio_block_fifo.h" 5 #include "media/base/audio_block_fifo.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace media { 9 namespace media {
10 10
11 AudioBlockFifo::AudioBlockFifo(int channels, int frames, int blocks) 11 AudioBlockFifo::AudioBlockFifo(int channels, int frames, int blocks)
12 : block_frames_(frames), 12 : block_frames_(frames),
13 write_block_(0), 13 write_block_(0),
14 read_block_(0), 14 read_block_(0),
15 available_blocks_(0), 15 available_blocks_(0),
16 write_pos_(0) { 16 write_pos_(0) {
17 // Create |blocks| of audio buses and push them to the containers. 17 // Create |blocks| of audio buses and push them to the containers.
18 audio_blocks_.reserve(blocks); 18 audio_blocks_.reserve(blocks);
19 for (int i = 0; i < blocks; ++i) { 19 for (int i = 0; i < blocks; ++i) {
20 scoped_ptr<AudioBus> audio_bus = AudioBus::Create(channels, frames); 20 scoped_ptr<AudioBus> audio_bus = AudioBus::Create(channels, frames);
21 audio_blocks_.push_back(audio_bus.release()); 21 audio_blocks_.push_back(audio_bus.release());
22 } 22 }
23 } 23 }
24 24
25 AudioBlockFifo::~AudioBlockFifo() {} 25 AudioBlockFifo::~AudioBlockFifo() {
26 }
26 27
27 void AudioBlockFifo::Push(const void* source, 28 void AudioBlockFifo::Push(const void* source,
28 int frames, 29 int frames,
29 int bytes_per_sample) { 30 int bytes_per_sample) {
30 DCHECK(source); 31 DCHECK(source);
31 DCHECK_GT(frames, 0); 32 DCHECK_GT(frames, 0);
32 DCHECK_GT(bytes_per_sample, 0); 33 DCHECK_GT(bytes_per_sample, 0);
33 DCHECK_LT(available_blocks_, static_cast<int>(audio_blocks_.size())); 34 DCHECK_LT(available_blocks_, static_cast<int>(audio_blocks_.size()));
34 35
35 const uint8* source_ptr = static_cast<const uint8*>(source); 36 const uint8* source_ptr = static_cast<const uint8*>(source);
36 int frames_to_push = frames; 37 int frames_to_push = frames;
37 while (frames_to_push) { 38 while (frames_to_push) {
38 // Get the current write block. 39 // Get the current write block.
39 AudioBus* current_block = audio_blocks_[write_block_]; 40 AudioBus* current_block = audio_blocks_[write_block_];
40 41
41 // Figure out what segment sizes we need when adding the new content to 42 // Figure out what segment sizes we need when adding the new content to
42 // the FIFO. 43 // the FIFO.
43 const int push_frames = 44 const int push_frames =
44 std::min(block_frames_ - write_pos_, frames_to_push); 45 std::min(block_frames_ - write_pos_, frames_to_push);
45 46
46 // Deinterleave the content to the FIFO and update the |write_pos_|. 47 // Deinterleave the content to the FIFO and update the |write_pos_|.
47 current_block->FromInterleavedPartial( 48 current_block->FromInterleavedPartial(
48 source_ptr, write_pos_, push_frames, bytes_per_sample); 49 source_ptr, write_pos_, push_frames, bytes_per_sample);
49 write_pos_ = (write_pos_ + push_frames) % block_frames_;
50 if (!write_pos_) {
51 // The current block is completely filled, increment |write_block_| and
52 // |available_blocks_|.
53 write_block_ = (write_block_ + 1) % audio_blocks_.size();
54 ++available_blocks_;
55 }
56 50
51 UpdatePosition(push_frames);
57 source_ptr += push_frames * bytes_per_sample * current_block->channels(); 52 source_ptr += push_frames * bytes_per_sample * current_block->channels();
58 frames_to_push -= push_frames; 53 frames_to_push -= push_frames;
59 DCHECK_GE(frames_to_push, 0); 54 DCHECK_GE(frames_to_push, 0);
60 } 55 }
61 } 56 }
62 57
58 void AudioBlockFifo::Push(const AudioBus* source) {
59 DCHECK(source);
60 DCHECK_LT(available_blocks_, static_cast<int>(audio_blocks_.size()));
61
62 int source_start_frame = 0;
63 while (source_start_frame < source->frames()) {
64 // Get the current write block.
65 AudioBus* current_block = audio_blocks_[write_block_];
66 DCHECK_EQ(source->channels(), current_block->channels());
67
68 // Figure out what segment sizes we need when adding the new content to
69 // the FIFO.
70 const int push_frames = std::min(block_frames_ - write_pos_,
71 source->frames() - source_start_frame);
72
73 // Copy the data to FIFO.
74 source->CopyPartialFramesTo(
75 source_start_frame, push_frames, write_pos_, current_block);
76
77 UpdatePosition(push_frames);
78 source_start_frame += push_frames;
79 DCHECK_LE(source_start_frame, source->frames());
80 }
81 }
82
63 const AudioBus* AudioBlockFifo::Consume() { 83 const AudioBus* AudioBlockFifo::Consume() {
64 DCHECK(available_blocks_); 84 DCHECK(available_blocks_);
65 AudioBus* audio_bus = audio_blocks_[read_block_]; 85 AudioBus* audio_bus = audio_blocks_[read_block_];
66 read_block_ = (read_block_ + 1) % audio_blocks_.size(); 86 read_block_ = (read_block_ + 1) % audio_blocks_.size();
67 --available_blocks_; 87 --available_blocks_;
68 return audio_bus; 88 return audio_bus;
69 } 89 }
70 90
71 void AudioBlockFifo::Clear() { 91 void AudioBlockFifo::Clear() {
72 write_pos_ = 0; 92 write_pos_ = 0;
73 write_block_ = 0; 93 write_block_ = 0;
74 read_block_ = 0; 94 read_block_ = 0;
75 available_blocks_ = 0; 95 available_blocks_ = 0;
76 } 96 }
77 97
78 int AudioBlockFifo::GetAvailableFrames() const { 98 int AudioBlockFifo::GetAvailableFrames() const {
79 return available_blocks_ * block_frames_ + write_pos_; 99 return available_blocks_ * block_frames_ + write_pos_;
80 } 100 }
81 101
82 int AudioBlockFifo::GetUnfilledFrames() const { 102 int AudioBlockFifo::GetUnfilledFrames() const {
83 const int unfilled_frames = 103 const int unfilled_frames =
84 (audio_blocks_.size() - available_blocks_) * block_frames_ - write_pos_; 104 (audio_blocks_.size() - available_blocks_) * block_frames_ - write_pos_;
85 DCHECK_GE(unfilled_frames, 0); 105 DCHECK_GE(unfilled_frames, 0);
86 return unfilled_frames; 106 return unfilled_frames;
87 } 107 }
88 108
109 void AudioBlockFifo::UpdatePosition(int push_frames) {
110 write_pos_ = (write_pos_ + push_frames) % block_frames_;
111 if (!write_pos_) {
112 // The current block is completely filled, increment |write_block_| and
113 // |available_blocks_|.
114 write_block_ = (write_block_ + 1) % audio_blocks_.size();
115 ++available_blocks_;
116 }
117 }
118
89 } // namespace media 119 } // namespace media
OLDNEW
« no previous file with comments | « media/base/audio_block_fifo.h ('k') | media/base/audio_block_fifo_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698