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

Side by Side Diff: media/test/pipeline_integration_test_base.cc

Issue 1235793005: Deprecate LogCB in favor of using MediaLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments and attempt to fix Android compilation Created 5 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
« no previous file with comments | « media/test/pipeline_integration_test.cc ('k') | no next file » | 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/test/pipeline_integration_test_base.h" 5 #include "media/test/pipeline_integration_test_base.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "media/base/cdm_context.h" 9 #include "media/base/cdm_context.h"
10 #include "media/base/media_log.h" 10 #include "media/base/media_log.h"
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 if (!clockless_playback_) { 255 if (!clockless_playback_) {
256 audio_sink_ = new NullAudioSink(message_loop_.task_runner()); 256 audio_sink_ = new NullAudioSink(message_loop_.task_runner());
257 } else { 257 } else {
258 clockless_audio_sink_ = new ClocklessAudioSink(); 258 clockless_audio_sink_ = new ClocklessAudioSink();
259 } 259 }
260 260
261 ScopedVector<AudioDecoder> audio_decoders; 261 ScopedVector<AudioDecoder> audio_decoders;
262 262
263 #if !defined(MEDIA_DISABLE_FFMPEG) 263 #if !defined(MEDIA_DISABLE_FFMPEG)
264 audio_decoders.push_back( 264 audio_decoders.push_back(
265 new FFmpegAudioDecoder(message_loop_.task_runner(), LogCB())); 265 new FFmpegAudioDecoder(message_loop_.task_runner(), new MediaLog()));
266 #endif 266 #endif
267 267
268 audio_decoders.push_back( 268 audio_decoders.push_back(
269 new OpusAudioDecoder(message_loop_.task_runner())); 269 new OpusAudioDecoder(message_loop_.task_runner()));
270 270
271 AudioParameters out_params(AudioParameters::AUDIO_PCM_LOW_LATENCY, 271 AudioParameters out_params(AudioParameters::AUDIO_PCM_LOW_LATENCY,
272 CHANNEL_LAYOUT_STEREO, 272 CHANNEL_LAYOUT_STEREO,
273 44100, 273 44100,
274 16, 274 16,
275 512); 275 512);
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 DCHECK(clockless_playback_); 326 DCHECK(clockless_playback_);
327 return clockless_audio_sink_->render_time(); 327 return clockless_audio_sink_->render_time();
328 } 328 }
329 329
330 base::TimeTicks DummyTickClock::NowTicks() { 330 base::TimeTicks DummyTickClock::NowTicks() {
331 now_ += base::TimeDelta::FromSeconds(60); 331 now_ += base::TimeDelta::FromSeconds(60);
332 return now_; 332 return now_;
333 } 333 }
334 334
335 } // namespace media 335 } // namespace media
OLDNEW
« no previous file with comments | « media/test/pipeline_integration_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698