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

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

Issue 380893002: Use base::TickClock in media::AudioRendererImpl instead of a callback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove now_cb_ entirely Created 6 years, 5 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/filters/audio_renderer_impl.h ('k') | media/filters/audio_renderer_impl_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 (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 #include "media/filters/audio_renderer_impl.h" 5 #include "media/filters/audio_renderer_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 media::AudioRendererSink* sink, 45 media::AudioRendererSink* sink,
46 ScopedVector<AudioDecoder> decoders, 46 ScopedVector<AudioDecoder> decoders,
47 const SetDecryptorReadyCB& set_decryptor_ready_cb, 47 const SetDecryptorReadyCB& set_decryptor_ready_cb,
48 AudioHardwareConfig* hardware_config) 48 AudioHardwareConfig* hardware_config)
49 : task_runner_(task_runner), 49 : task_runner_(task_runner),
50 sink_(sink), 50 sink_(sink),
51 audio_buffer_stream_(task_runner, 51 audio_buffer_stream_(task_runner,
52 decoders.Pass(), 52 decoders.Pass(),
53 set_decryptor_ready_cb), 53 set_decryptor_ready_cb),
54 hardware_config_(hardware_config), 54 hardware_config_(hardware_config),
55 now_cb_(base::Bind(&base::TimeTicks::Now)),
56 state_(kUninitialized), 55 state_(kUninitialized),
57 buffering_state_(BUFFERING_HAVE_NOTHING), 56 buffering_state_(BUFFERING_HAVE_NOTHING),
58 rendering_(false), 57 rendering_(false),
59 sink_playing_(false), 58 sink_playing_(false),
60 pending_read_(false), 59 pending_read_(false),
61 received_end_of_stream_(false), 60 received_end_of_stream_(false),
62 rendered_end_of_stream_(false), 61 rendered_end_of_stream_(false),
63 weak_factory_(this) { 62 weak_factory_(this) {
64 audio_buffer_stream_.set_splice_observer(base::Bind( 63 audio_buffer_stream_.set_splice_observer(base::Bind(
65 &AudioRendererImpl::OnNewSpliceBuffer, weak_factory_.GetWeakPtr())); 64 &AudioRendererImpl::OnNewSpliceBuffer, weak_factory_.GetWeakPtr()));
(...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after
700 << buffering_state; 699 << buffering_state;
701 DCHECK_NE(buffering_state_, buffering_state); 700 DCHECK_NE(buffering_state_, buffering_state);
702 lock_.AssertAcquired(); 701 lock_.AssertAcquired();
703 buffering_state_ = buffering_state; 702 buffering_state_ = buffering_state;
704 703
705 task_runner_->PostTask(FROM_HERE, 704 task_runner_->PostTask(FROM_HERE,
706 base::Bind(buffering_state_cb_, buffering_state_)); 705 base::Bind(buffering_state_cb_, buffering_state_));
707 } 706 }
708 707
709 } // namespace media 708 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/audio_renderer_impl.h ('k') | media/filters/audio_renderer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698