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

Side by Side Diff: media/base/android/media_source_player_unittest.cc

Issue 872253008: Passing key frame info flag renderer to browser process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rename end_of_stream to is_end_of_stream Created 5 years, 10 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/base/android/media_decoder_job.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <string> 5 #include <string>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 data.access_units.resize(1); 416 data.access_units.resize(1);
417 data.access_units[0] = CreateAccessUnitWithData(false, 0, use_large_size); 417 data.access_units[0] = CreateAccessUnitWithData(false, 0, use_large_size);
418 return data; 418 return data;
419 } 419 }
420 420
421 DemuxerData CreateEOSAck(bool is_audio) { 421 DemuxerData CreateEOSAck(bool is_audio) {
422 DemuxerData data; 422 DemuxerData data;
423 data.type = is_audio ? DemuxerStream::AUDIO : DemuxerStream::VIDEO; 423 data.type = is_audio ? DemuxerStream::AUDIO : DemuxerStream::VIDEO;
424 data.access_units.resize(1); 424 data.access_units.resize(1);
425 data.access_units[0].status = DemuxerStream::kOk; 425 data.access_units[0].status = DemuxerStream::kOk;
426 data.access_units[0].end_of_stream = true; 426 data.access_units[0].is_end_of_stream = true;
427 return data; 427 return data;
428 } 428 }
429 429
430 DemuxerData CreateAbortedAck(bool is_audio) { 430 DemuxerData CreateAbortedAck(bool is_audio) {
431 DemuxerData data; 431 DemuxerData data;
432 data.type = is_audio ? DemuxerStream::AUDIO : DemuxerStream::VIDEO; 432 data.type = is_audio ? DemuxerStream::AUDIO : DemuxerStream::VIDEO;
433 data.access_units.resize(1); 433 data.access_units.resize(1);
434 data.access_units[0].status = DemuxerStream::kAborted; 434 data.access_units[0].status = DemuxerStream::kAborted;
435 return data; 435 return data;
436 } 436 }
(...skipping 1885 matching lines...) Expand 10 before | Expand all | Expand 10 after
2322 // Wait for the metadata change. 2322 // Wait for the metadata change.
2323 while(manager_.num_metadata_changes() == 1) { 2323 while(manager_.num_metadata_changes() == 1) {
2324 player_.OnDemuxerDataAvailable(data); 2324 player_.OnDemuxerDataAvailable(data);
2325 WaitForVideoDecodeDone(); 2325 WaitForVideoDecodeDone();
2326 } 2326 }
2327 EXPECT_EQ(2, manager_.num_metadata_changes()); 2327 EXPECT_EQ(2, manager_.num_metadata_changes());
2328 WaitForVideoDecodeDone(); 2328 WaitForVideoDecodeDone();
2329 } 2329 }
2330 2330
2331 } // namespace media 2331 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/media_decoder_job.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698