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

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

Issue 547913002: MediaLog: Log selected audio/video decoder name. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/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 27 matching lines...) Expand all
38 "Media.AudioRendererEvents", event, RENDER_EVENT_MAX + 1); 38 "Media.AudioRendererEvents", event, RENDER_EVENT_MAX + 1);
39 } 39 }
40 40
41 } // namespace 41 } // namespace
42 42
43 AudioRendererImpl::AudioRendererImpl( 43 AudioRendererImpl::AudioRendererImpl(
44 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 44 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
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 const AudioHardwareConfig& hardware_config) 48 const AudioHardwareConfig& hardware_config,
49 const scoped_refptr<MediaLog>& media_log)
49 : task_runner_(task_runner), 50 : task_runner_(task_runner),
50 expecting_config_changes_(false), 51 expecting_config_changes_(false),
51 sink_(sink), 52 sink_(sink),
52 audio_buffer_stream_(new AudioBufferStream(task_runner, 53 audio_buffer_stream_(new AudioBufferStream(task_runner,
53 decoders.Pass(), 54 decoders.Pass(),
54 set_decryptor_ready_cb)), 55 set_decryptor_ready_cb,
56 media_log)),
55 hardware_config_(hardware_config), 57 hardware_config_(hardware_config),
56 playback_rate_(0), 58 playback_rate_(0),
57 state_(kUninitialized), 59 state_(kUninitialized),
58 buffering_state_(BUFFERING_HAVE_NOTHING), 60 buffering_state_(BUFFERING_HAVE_NOTHING),
59 rendering_(false), 61 rendering_(false),
60 sink_playing_(false), 62 sink_playing_(false),
61 pending_read_(false), 63 pending_read_(false),
62 received_end_of_stream_(false), 64 received_end_of_stream_(false),
63 rendered_end_of_stream_(false), 65 rendered_end_of_stream_(false),
64 last_timestamp_update_(kNoTimestamp()), 66 last_timestamp_update_(kNoTimestamp()),
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 << buffering_state; 714 << buffering_state;
713 DCHECK_NE(buffering_state_, buffering_state); 715 DCHECK_NE(buffering_state_, buffering_state);
714 lock_.AssertAcquired(); 716 lock_.AssertAcquired();
715 buffering_state_ = buffering_state; 717 buffering_state_ = buffering_state;
716 718
717 task_runner_->PostTask(FROM_HERE, 719 task_runner_->PostTask(FROM_HERE,
718 base::Bind(buffering_state_cb_, buffering_state_)); 720 base::Bind(buffering_state_cb_, buffering_state_));
719 } 721 }
720 722
721 } // namespace media 723 } // 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