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

Side by Side Diff: chromecast/media/cma/test/frame_segmenter_for_test.cc

Issue 1142513004: Chromecast: MessageLoopProxy cleanup --> SingleThreadTaskRunner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 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 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 "chromecast/media/cma/test/frame_segmenter_for_test.h" 5 #include "chromecast/media/cma/test/frame_segmenter_for_test.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/port.h" 10 #include "base/port.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "base/thread_task_runner_handle.h"
12 #include "chromecast/media/cma/base/decoder_buffer_adapter.h" 13 #include "chromecast/media/cma/base/decoder_buffer_adapter.h"
13 #include "media/base/decoder_buffer.h" 14 #include "media/base/decoder_buffer.h"
14 #include "media/base/demuxer.h" 15 #include "media/base/demuxer.h"
15 #include "media/base/media_log.h" 16 #include "media/base/media_log.h"
16 #include "media/base/test_helpers.h" 17 #include "media/base/test_helpers.h"
17 #include "media/filters/ffmpeg_demuxer.h" 18 #include "media/filters/ffmpeg_demuxer.h"
18 #include "media/filters/file_data_source.h" 19 #include "media/filters/file_data_source.h"
19 #include "media/filters/h264_parser.h" 20 #include "media/filters/h264_parser.h"
20 21
21 namespace chromecast { 22 namespace chromecast {
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 DemuxResult::~DemuxResult() { 301 DemuxResult::~DemuxResult() {
301 } 302 }
302 303
303 DemuxResult FFmpegDemuxForTest(const base::FilePath& filepath, 304 DemuxResult FFmpegDemuxForTest(const base::FilePath& filepath,
304 bool audio) { 305 bool audio) {
305 FakeDemuxerHost fake_demuxer_host; 306 FakeDemuxerHost fake_demuxer_host;
306 ::media::FileDataSource data_source; 307 ::media::FileDataSource data_source;
307 CHECK(data_source.Initialize(filepath)); 308 CHECK(data_source.Initialize(filepath));
308 309
309 ::media::FFmpegDemuxer demuxer( 310 ::media::FFmpegDemuxer demuxer(
310 base::MessageLoopProxy::current(), &data_source, 311 base::ThreadTaskRunnerHandle::Get(), &data_source,
311 base::Bind(&OnEncryptedMediaInitData), new ::media::MediaLog()); 312 base::Bind(&OnEncryptedMediaInitData), new ::media::MediaLog());
312 ::media::WaitableMessageLoopEvent init_event; 313 ::media::WaitableMessageLoopEvent init_event;
313 demuxer.Initialize(&fake_demuxer_host, 314 demuxer.Initialize(&fake_demuxer_host,
314 init_event.GetPipelineStatusCB(), 315 init_event.GetPipelineStatusCB(),
315 false); 316 false);
316 init_event.RunAndWaitForStatus(::media::PIPELINE_OK); 317 init_event.RunAndWaitForStatus(::media::PIPELINE_OK);
317 318
318 ::media::DemuxerStream* stream = demuxer.GetStream( 319 ::media::DemuxerStream* stream = demuxer.GetStream(
319 audio ? ::media::DemuxerStream::AUDIO : ::media::DemuxerStream::VIDEO); 320 audio ? ::media::DemuxerStream::AUDIO : ::media::DemuxerStream::VIDEO);
320 CHECK(stream); 321 CHECK(stream);
(...skipping 15 matching lines...) Expand all
336 CHECK(!demux_result.frames.empty()); 337 CHECK(!demux_result.frames.empty());
337 end_of_stream = demux_result.frames.back()->end_of_stream(); 338 end_of_stream = demux_result.frames.back()->end_of_stream();
338 } 339 }
339 340
340 demuxer.Stop(); 341 demuxer.Stop();
341 return demux_result; 342 return demux_result;
342 } 343 }
343 344
344 } // namespace media 345 } // namespace media
345 } // namespace chromecast 346 } // namespace chromecast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698