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

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

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Rebase. Created 3 years, 8 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 <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 306
307 DemuxResult::~DemuxResult() { 307 DemuxResult::~DemuxResult() {
308 } 308 }
309 309
310 DemuxResult FFmpegDemuxForTest(const base::FilePath& filepath, 310 DemuxResult FFmpegDemuxForTest(const base::FilePath& filepath,
311 bool audio) { 311 bool audio) {
312 FakeDemuxerHost fake_demuxer_host; 312 FakeDemuxerHost fake_demuxer_host;
313 ::media::FileDataSource data_source; 313 ::media::FileDataSource data_source;
314 CHECK(data_source.Initialize(filepath)); 314 CHECK(data_source.Initialize(filepath));
315 315
316 ::media::FFmpegDemuxer demuxer( 316 ::media::MediaLog media_log;
317 base::ThreadTaskRunnerHandle::Get(), &data_source, 317 ::media::FFmpegDemuxer demuxer(base::ThreadTaskRunnerHandle::Get(),
318 base::Bind(&OnEncryptedMediaInitData), base::Bind(&OnMediaTracksUpdated), 318 &data_source,
319 new ::media::MediaLog()); 319 base::Bind(&OnEncryptedMediaInitData),
320 base::Bind(&OnMediaTracksUpdated), &media_log);
320 ::media::WaitableMessageLoopEvent init_event; 321 ::media::WaitableMessageLoopEvent init_event;
321 demuxer.Initialize(&fake_demuxer_host, 322 demuxer.Initialize(&fake_demuxer_host, init_event.GetPipelineStatusCB(),
322 init_event.GetPipelineStatusCB(),
323 false); 323 false);
324 init_event.RunAndWaitForStatus(::media::PIPELINE_OK); 324 init_event.RunAndWaitForStatus(::media::PIPELINE_OK);
325 325
326 auto stream_type = 326 auto stream_type =
327 audio ? ::media::DemuxerStream::AUDIO : ::media::DemuxerStream::VIDEO; 327 audio ? ::media::DemuxerStream::AUDIO : ::media::DemuxerStream::VIDEO;
328 ::media::DemuxerStream* stream = demuxer.GetFirstStream(stream_type); 328 ::media::DemuxerStream* stream = demuxer.GetFirstStream(stream_type);
329 CHECK(stream); 329 CHECK(stream);
330 330
331 DemuxResult demux_result; 331 DemuxResult demux_result;
332 if (audio) { 332 if (audio) {
(...skipping 12 matching lines...) Expand all
345 CHECK(!demux_result.frames.empty()); 345 CHECK(!demux_result.frames.empty());
346 end_of_stream = demux_result.frames.back()->end_of_stream(); 346 end_of_stream = demux_result.frames.back()->end_of_stream();
347 } 347 }
348 348
349 demuxer.Stop(); 349 demuxer.Stop();
350 return demux_result; 350 return demux_result;
351 } 351 }
352 352
353 } // namespace media 353 } // namespace media
354 } // namespace chromecast 354 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/media/cma/decoder/cast_audio_decoder_linux.cc ('k') | chromecast/media/service/cast_mojo_media_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698