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

Side by Side Diff: media/renderers/video_renderer_impl_unittest.cc

Issue 1666653002: media: Remove SetCdmReadyCB and CdmReadyCB (part 1). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and fix compile errors Created 4 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/renderers/video_renderer_impl.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 <stdint.h> 5 #include <stdint.h>
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 void CallInitialize(const PipelineStatusCB& status_cb, 115 void CallInitialize(const PipelineStatusCB& status_cb,
116 bool low_delay, 116 bool low_delay,
117 bool expect_to_success) { 117 bool expect_to_success) {
118 if (low_delay) 118 if (low_delay)
119 demuxer_stream_.set_liveness(DemuxerStream::LIVENESS_LIVE); 119 demuxer_stream_.set_liveness(DemuxerStream::LIVENESS_LIVE);
120 EXPECT_CALL(*decoder_, Initialize(_, _, _, _, _)) 120 EXPECT_CALL(*decoder_, Initialize(_, _, _, _, _))
121 .WillOnce( 121 .WillOnce(
122 DoAll(SaveArg<4>(&output_cb_), RunCallback<3>(expect_to_success))); 122 DoAll(SaveArg<4>(&output_cb_), RunCallback<3>(expect_to_success)));
123 EXPECT_CALL(*this, OnWaitingForDecryptionKey()).Times(0); 123 EXPECT_CALL(*this, OnWaitingForDecryptionKey()).Times(0);
124 renderer_->Initialize( 124 renderer_->Initialize(
125 &demuxer_stream_, status_cb, SetCdmReadyCB(), 125 &demuxer_stream_, status_cb, nullptr,
126 base::Bind(&VideoRendererImplTest::OnStatisticsUpdate, 126 base::Bind(&VideoRendererImplTest::OnStatisticsUpdate,
127 base::Unretained(this)), 127 base::Unretained(this)),
128 base::Bind(&StrictMock<MockCB>::BufferingStateChange, 128 base::Bind(&StrictMock<MockCB>::BufferingStateChange,
129 base::Unretained(&mock_cb_)), 129 base::Unretained(&mock_cb_)),
130 ended_event_.GetClosure(), error_event_.GetPipelineStatusCB(), 130 ended_event_.GetClosure(), error_event_.GetPipelineStatusCB(),
131 base::Bind(&WallClockTimeSource::GetWallClockTimes, 131 base::Bind(&WallClockTimeSource::GetWallClockTimes,
132 base::Unretained(&time_source_)), 132 base::Unretained(&time_source_)),
133 base::Bind(&VideoRendererImplTest::OnWaitingForDecryptionKey, 133 base::Bind(&VideoRendererImplTest::OnWaitingForDecryptionKey,
134 base::Unretained(this))); 134 base::Unretained(this)));
135 } 135 }
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 QueueFrames("0 10 20 30"); 777 QueueFrames("0 10 20 30");
778 StartPlayingFrom(0); 778 StartPlayingFrom(0);
779 Flush(); 779 Flush();
780 ASSERT_EQ(1u, frame_ready_cbs_.size()); 780 ASSERT_EQ(1u, frame_ready_cbs_.size());
781 // This frame will be discarded. 781 // This frame will be discarded.
782 frame_ready_cbs_.front().Run(); 782 frame_ready_cbs_.front().Run();
783 Destroy(); 783 Destroy();
784 } 784 }
785 785
786 } // namespace media 786 } // namespace media
OLDNEW
« no previous file with comments | « media/renderers/video_renderer_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698