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

Side by Side Diff: media/base/audio_renderer_mixer.h

Issue 16823003: Replace erroneous use of base::Time with base::TimeTicks throughout media code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: s/PresubmitPromptWarning/PresubmitPromptOrNotify/ Created 7 years, 6 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
« no previous file with comments | « media/base/android/media_source_player.cc ('k') | media/base/audio_renderer_mixer.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 (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 MEDIA_BASE_AUDIO_RENDERER_MIXER_H_ 5 #ifndef MEDIA_BASE_AUDIO_RENDERER_MIXER_H_
6 #define MEDIA_BASE_AUDIO_RENDERER_MIXER_H_ 6 #define MEDIA_BASE_AUDIO_RENDERER_MIXER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/synchronization/lock.h" 10 #include "base/synchronization/lock.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 AudioRendererMixerInputSet; 49 AudioRendererMixerInputSet;
50 AudioRendererMixerInputSet mixer_inputs_; 50 AudioRendererMixerInputSet mixer_inputs_;
51 base::Lock mixer_inputs_lock_; 51 base::Lock mixer_inputs_lock_;
52 52
53 // Handles mixing and resampling between input and output parameters. 53 // Handles mixing and resampling between input and output parameters.
54 AudioConverter audio_converter_; 54 AudioConverter audio_converter_;
55 55
56 // Handles physical stream pause when no inputs are playing. For latency 56 // Handles physical stream pause when no inputs are playing. For latency
57 // reasons we don't want to immediately pause the physical stream. 57 // reasons we don't want to immediately pause the physical stream.
58 base::TimeDelta pause_delay_; 58 base::TimeDelta pause_delay_;
59 base::Time last_play_time_; 59 base::TimeTicks last_play_time_;
60 bool playing_; 60 bool playing_;
61 61
62 DISALLOW_COPY_AND_ASSIGN(AudioRendererMixer); 62 DISALLOW_COPY_AND_ASSIGN(AudioRendererMixer);
63 }; 63 };
64 64
65 } // namespace media 65 } // namespace media
66 66
67 #endif // MEDIA_BASE_AUDIO_RENDERER_MIXER_H_ 67 #endif // MEDIA_BASE_AUDIO_RENDERER_MIXER_H_
OLDNEW
« no previous file with comments | « media/base/android/media_source_player.cc ('k') | media/base/audio_renderer_mixer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698