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

Side by Side Diff: media/filters/chunk_demuxer_unittest.cc

Issue 8351045: Change DemuxerStream::ReadCallback to use ref-counted buffers. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: forgot some &s Created 9 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "media/base/audio_decoder_config.h" 6 #include "media/base/audio_decoder_config.h"
7 #include "media/base/mock_callback.h" 7 #include "media/base/mock_callback.h"
8 #include "media/base/mock_filter_host.h" 8 #include "media/base/mock_filter_host.h"
9 #include "media/base/test_data_util.h" 9 #include "media/base/test_data_util.h"
10 #include "media/filters/chunk_demuxer.h" 10 #include "media/filters/chunk_demuxer.h"
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 TEST_F(ChunkDemuxerTest, TestAppendDataBeforeInit) { 272 TEST_F(ChunkDemuxerTest, TestAppendDataBeforeInit) {
273 scoped_array<uint8> info_tracks; 273 scoped_array<uint8> info_tracks;
274 int info_tracks_size = 0; 274 int info_tracks_size = 0;
275 CreateInfoTracks(true, true, &info_tracks, &info_tracks_size); 275 CreateInfoTracks(true, true, &info_tracks, &info_tracks_size);
276 276
277 EXPECT_FALSE(demuxer_->AppendData(info_tracks.get(), info_tracks_size)); 277 EXPECT_FALSE(demuxer_->AppendData(info_tracks.get(), info_tracks_size));
278 } 278 }
279 279
280 static void OnReadDone(const base::TimeDelta& expected_time, 280 static void OnReadDone(const base::TimeDelta& expected_time,
281 bool* called, 281 bool* called,
282 Buffer* buffer) { 282 const scoped_refptr<Buffer>& buffer) {
283 EXPECT_EQ(expected_time, buffer->GetTimestamp()); 283 EXPECT_EQ(expected_time, buffer->GetTimestamp());
284 *called = true; 284 *called = true;
285 } 285 }
286 286
287 // Make sure Read() callbacks are dispatched with the proper data. 287 // Make sure Read() callbacks are dispatched with the proper data.
288 TEST_F(ChunkDemuxerTest, TestRead) { 288 TEST_F(ChunkDemuxerTest, TestRead) {
289 InitDemuxer(true, true); 289 InitDemuxer(true, true);
290 290
291 scoped_refptr<DemuxerStream> audio = 291 scoped_refptr<DemuxerStream> audio =
292 demuxer_->GetStream(DemuxerStream::AUDIO); 292 demuxer_->GetStream(DemuxerStream::AUDIO);
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 } 531 }
532 532
533 // Check to see if |audio_read_done_| and |video_read_done_| variables 533 // Check to see if |audio_read_done_| and |video_read_done_| variables
534 // match |expected|. 534 // match |expected|.
535 void CheckIfReadDonesWereCalled(bool expected) { 535 void CheckIfReadDonesWereCalled(bool expected) {
536 EXPECT_EQ(expected, audio_read_done_); 536 EXPECT_EQ(expected, audio_read_done_);
537 EXPECT_EQ(expected, video_read_done_); 537 EXPECT_EQ(expected, video_read_done_);
538 } 538 }
539 539
540 private: 540 private:
541 static void OnEndOfStreamReadDone(bool* called, Buffer* buffer) { 541 static void OnEndOfStreamReadDone(bool* called,
542 const scoped_refptr<Buffer>& buffer) {
542 EXPECT_TRUE(buffer->IsEndOfStream()); 543 EXPECT_TRUE(buffer->IsEndOfStream());
543 *called = true; 544 *called = true;
544 } 545 }
545 546
546 scoped_refptr<Demuxer> demuxer_; 547 scoped_refptr<Demuxer> demuxer_;
547 bool audio_read_done_; 548 bool audio_read_done_;
548 bool video_read_done_; 549 bool video_read_done_;
549 550
550 DISALLOW_COPY_AND_ASSIGN(EndOfStreamHelper); 551 DISALLOW_COPY_AND_ASSIGN(EndOfStreamHelper);
551 }; 552 };
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
714 715
715 video->Read(base::Bind(&OnReadDone, 716 video->Read(base::Bind(&OnReadDone,
716 base::TimeDelta::FromMilliseconds(150), 717 base::TimeDelta::FromMilliseconds(150),
717 &video_read_done)); 718 &video_read_done));
718 719
719 EXPECT_TRUE(audio_read_done); 720 EXPECT_TRUE(audio_read_done);
720 EXPECT_TRUE(video_read_done); 721 EXPECT_TRUE(video_read_done);
721 } 722 }
722 723
723 } // namespace media 724 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698