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

Side by Side Diff: webrtc/video_engine/encoder_state_feedback_unittest.cc

Issue 1354143004: Remove callback_cs_ in ViEEncoder. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 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 | « webrtc/video/video_send_stream.cc ('k') | webrtc/video_engine/vie_channel_group.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 14 matching lines...) Expand all
25 #include "webrtc/video_engine/payload_router.h" 25 #include "webrtc/video_engine/payload_router.h"
26 #include "webrtc/video_engine/vie_encoder.h" 26 #include "webrtc/video_engine/vie_encoder.h"
27 27
28 using ::testing::NiceMock; 28 using ::testing::NiceMock;
29 29
30 namespace webrtc { 30 namespace webrtc {
31 31
32 class MockVieEncoder : public ViEEncoder { 32 class MockVieEncoder : public ViEEncoder {
33 public: 33 public:
34 explicit MockVieEncoder(ProcessThread* process_thread, PacedSender* pacer) 34 explicit MockVieEncoder(ProcessThread* process_thread, PacedSender* pacer)
35 : ViEEncoder(1, 1, *process_thread, pacer, NULL) {} 35 : ViEEncoder(1, 1, process_thread, nullptr, nullptr, pacer, nullptr) {}
36 ~MockVieEncoder() {} 36 ~MockVieEncoder() {}
37 37
38 MOCK_METHOD1(OnReceivedIntraFrameRequest, 38 MOCK_METHOD1(OnReceivedIntraFrameRequest,
39 void(uint32_t)); 39 void(uint32_t));
40 MOCK_METHOD2(OnReceivedSLI, 40 MOCK_METHOD2(OnReceivedSLI,
41 void(uint32_t ssrc, uint8_t picture_id)); 41 void(uint32_t ssrc, uint8_t picture_id));
42 MOCK_METHOD2(OnReceivedRPSI, 42 MOCK_METHOD2(OnReceivedRPSI,
43 void(uint32_t ssrc, uint64_t picture_id)); 43 void(uint32_t ssrc, uint64_t picture_id));
44 MOCK_METHOD2(OnLocalSsrcChanged, 44 MOCK_METHOD2(OnLocalSsrcChanged,
45 void(uint32_t old_ssrc, uint32_t new_ssrc)); 45 void(uint32_t old_ssrc, uint32_t new_ssrc));
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 134
135 encoder_state_feedback_->RemoveEncoder(&encoder_1); 135 encoder_state_feedback_->RemoveEncoder(&encoder_1);
136 EXPECT_CALL(encoder_2, OnReceivedIntraFrameRequest(ssrc_2)) 136 EXPECT_CALL(encoder_2, OnReceivedIntraFrameRequest(ssrc_2))
137 .Times(1); 137 .Times(1);
138 encoder_state_feedback_->GetRtcpIntraFrameObserver()-> 138 encoder_state_feedback_->GetRtcpIntraFrameObserver()->
139 OnReceivedIntraFrameRequest(ssrc_2); 139 OnReceivedIntraFrameRequest(ssrc_2);
140 encoder_state_feedback_->RemoveEncoder(&encoder_2); 140 encoder_state_feedback_->RemoveEncoder(&encoder_2);
141 } 141 }
142 142
143 } // namespace webrtc 143 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/video_send_stream.cc ('k') | webrtc/video_engine/vie_channel_group.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698