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

Side by Side Diff: media/filters/buffered_audio_tracker.cc

Issue 256163005: Introduce AudioClock to improve playback delay calculations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
(Empty)
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
3 // found in the LICENSE file.
4
5 #include "media/filters/buffered_audio_tracker.h"
6
7 #include "base/logging.h"
8
9 namespace media {
10
11 BufferedAudioTracker::BufferedAudioTracker(int sample_rate)
12 : sample_rate_(sample_rate) {
13 }
14
15 BufferedAudioTracker::~BufferedAudioTracker() {
16 }
17
18 void BufferedAudioTracker::AudioCallbackFired(int delay_frames) {
19 if (buffered_audio_.empty())
20 return;
21
22 size_t i = buffered_audio_.size() - 1;
23 while (true) {
24 if (buffered_audio_[i].frames <= delay_frames) {
25 // Reached the end before accounting for all of |delay_frames|. This means
26 // we haven't written enough audio data yet to account for hardware delay.
27 // In this case, do nothing.
28 if (i == 0)
29 return;
30
31 // Keep accounting for |delay_frames|.
32 delay_frames -= buffered_audio_[i].frames;
33 --i;
34 continue;
35 }
36
37 // All of |delay_frames| has been accounted for: adjust amount of frames
38 // left in current buffer. All preceeding elements with index < |i| should
39 // be considered played out and hence discared.
40 buffered_audio_[i].frames = delay_frames;
41 break;
42 }
43
44 // At this point |i| points at what will be the new head of |buffered_audio_|
45 // however if it contains no audio it should be removed as well.
46 if (buffered_audio_[i].frames == 0)
47 ++i;
48
49 buffered_audio_.erase(buffered_audio_.begin(), buffered_audio_.begin() + i);
50 }
51
52 base::TimeDelta BufferedAudioTracker::BufferedTime() const {
53 base::TimeDelta buffered_time;
54
55 for (size_t i = 0; i < buffered_audio_.size(); ++i) {
56 // Skip over silence.
57 if (buffered_audio_[i].playback_rate == 0)
58 continue;
59
60 // Multiply by playback rate as frames represent time-scaled audio.
61 buffered_time += base::TimeDelta::FromMicroseconds(
62 base::Time::kMicrosecondsPerSecond * buffered_audio_[i].frames *
63 buffered_audio_[i].playback_rate / sample_rate_);
64 }
65
66 return buffered_time;
67 }
68
69 void BufferedAudioTracker::WroteAudio(int frames, float playback_rate) {
70 CHECK_GT(playback_rate, 0);
71 CHECK_GT(frames, 0);
72
73 // Avoid creating extra elements where possible.
74 if (!buffered_audio_.empty() &&
75 buffered_audio_.back().playback_rate == playback_rate) {
76 buffered_audio_.back().frames += frames;
77 return;
78 }
79
80 buffered_audio_.push_back(BufferedAudio(frames, playback_rate));
81 }
82
83 void BufferedAudioTracker::WroteSilence(int frames) {
84 CHECK_GT(frames, 0);
85
86 // Avoid creating extra elements where possible.
87 if (!buffered_audio_.empty() && buffered_audio_.back().playback_rate == 0) {
88 buffered_audio_.back().frames += frames;
89 return;
90 }
91
92 buffered_audio_.push_back(BufferedAudio(frames, 0));
93 }
94
95 BufferedAudioTracker::BufferedAudio::BufferedAudio(int frames,
96 float playback_rate)
97 : frames(frames), playback_rate(playback_rate) {
98 }
99
100 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698