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

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

Issue 1735803002: Implemented passing media track info from ffmpeg into blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wolenetz@ CR feedback + better track info extraction in ffmpeg Created 4 years, 9 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 | « no previous file | media/base/BUILD.gn » ('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 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"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/run_loop.h" 12 #include "base/run_loop.h"
13 #include "base/thread_task_runner_handle.h" 13 #include "base/thread_task_runner_handle.h"
14 #include "chromecast/media/cma/base/decoder_buffer_adapter.h" 14 #include "chromecast/media/cma/base/decoder_buffer_adapter.h"
15 #include "media/base/decoder_buffer.h" 15 #include "media/base/decoder_buffer.h"
16 #include "media/base/demuxer.h" 16 #include "media/base/demuxer.h"
17 #include "media/base/media_log.h" 17 #include "media/base/media_log.h"
18 #include "media/base/media_tracks.h"
18 #include "media/base/test_helpers.h" 19 #include "media/base/test_helpers.h"
19 #include "media/filters/ffmpeg_demuxer.h" 20 #include "media/filters/ffmpeg_demuxer.h"
20 #include "media/filters/file_data_source.h" 21 #include "media/filters/file_data_source.h"
21 #include "media/filters/h264_parser.h" 22 #include "media/filters/h264_parser.h"
22 23
23 namespace chromecast { 24 namespace chromecast {
24 namespace media { 25 namespace media {
25 26
26 namespace { 27 namespace {
27 28
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 } 263 }
263 264
264 return video_frames; 265 return video_frames;
265 } 266 }
266 267
267 void OnEncryptedMediaInitData(::media::EmeInitDataType init_data_type, 268 void OnEncryptedMediaInitData(::media::EmeInitDataType init_data_type,
268 const std::vector<uint8_t>& init_data) { 269 const std::vector<uint8_t>& init_data) {
269 LOG(FATAL) << "Unexpected test failure: file is encrypted."; 270 LOG(FATAL) << "Unexpected test failure: file is encrypted.";
270 } 271 }
271 272
273 void OnMediaTracksUpdated(scoped_ptr<::media::MediaTracks> tracks) {
274 }
275
272 void OnNewBuffer(BufferList* buffer_list, 276 void OnNewBuffer(BufferList* buffer_list,
273 const base::Closure& finished_cb, 277 const base::Closure& finished_cb,
274 ::media::DemuxerStream::Status status, 278 ::media::DemuxerStream::Status status,
275 const scoped_refptr< ::media::DecoderBuffer>& buffer) { 279 const scoped_refptr< ::media::DecoderBuffer>& buffer) {
276 CHECK_EQ(status, ::media::DemuxerStream::kOk); 280 CHECK_EQ(status, ::media::DemuxerStream::kOk);
277 CHECK(buffer.get()); 281 CHECK(buffer.get());
278 CHECK(buffer_list); 282 CHECK(buffer_list);
279 buffer_list->push_back(new DecoderBufferAdapter(buffer)); 283 buffer_list->push_back(new DecoderBufferAdapter(buffer));
280 finished_cb.Run(); 284 finished_cb.Run();
281 } 285 }
(...skipping 21 matching lines...) Expand all
303 } 307 }
304 308
305 DemuxResult FFmpegDemuxForTest(const base::FilePath& filepath, 309 DemuxResult FFmpegDemuxForTest(const base::FilePath& filepath,
306 bool audio) { 310 bool audio) {
307 FakeDemuxerHost fake_demuxer_host; 311 FakeDemuxerHost fake_demuxer_host;
308 ::media::FileDataSource data_source; 312 ::media::FileDataSource data_source;
309 CHECK(data_source.Initialize(filepath)); 313 CHECK(data_source.Initialize(filepath));
310 314
311 ::media::FFmpegDemuxer demuxer( 315 ::media::FFmpegDemuxer demuxer(
312 base::ThreadTaskRunnerHandle::Get(), &data_source, 316 base::ThreadTaskRunnerHandle::Get(), &data_source,
313 base::Bind(&OnEncryptedMediaInitData), new ::media::MediaLog()); 317 base::Bind(&OnEncryptedMediaInitData), base::Bind(&OnMediaTracksUpdated),
318 new ::media::MediaLog());
314 ::media::WaitableMessageLoopEvent init_event; 319 ::media::WaitableMessageLoopEvent init_event;
315 demuxer.Initialize(&fake_demuxer_host, 320 demuxer.Initialize(&fake_demuxer_host,
316 init_event.GetPipelineStatusCB(), 321 init_event.GetPipelineStatusCB(),
317 false); 322 false);
318 init_event.RunAndWaitForStatus(::media::PIPELINE_OK); 323 init_event.RunAndWaitForStatus(::media::PIPELINE_OK);
319 324
320 ::media::DemuxerStream* stream = demuxer.GetStream( 325 ::media::DemuxerStream* stream = demuxer.GetStream(
321 audio ? ::media::DemuxerStream::AUDIO : ::media::DemuxerStream::VIDEO); 326 audio ? ::media::DemuxerStream::AUDIO : ::media::DemuxerStream::VIDEO);
322 CHECK(stream); 327 CHECK(stream);
323 328
(...skipping 14 matching lines...) Expand all
338 CHECK(!demux_result.frames.empty()); 343 CHECK(!demux_result.frames.empty());
339 end_of_stream = demux_result.frames.back()->end_of_stream(); 344 end_of_stream = demux_result.frames.back()->end_of_stream();
340 } 345 }
341 346
342 demuxer.Stop(); 347 demuxer.Stop();
343 return demux_result; 348 return demux_result;
344 } 349 }
345 350
346 } // namespace media 351 } // namespace media
347 } // namespace chromecast 352 } // namespace chromecast
OLDNEW
« no previous file with comments | « no previous file | media/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698