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

Side by Side Diff: webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc

Issue 1371043003: Unify FrameType and VideoFrameType. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 2 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 public: 110 public:
111 int32_t InitEncode(const VideoCodec* codecSettings, 111 int32_t InitEncode(const VideoCodec* codecSettings,
112 int32_t numberOfCores, 112 int32_t numberOfCores,
113 size_t maxPayloadSize) override { 113 size_t maxPayloadSize) override {
114 codec_ = *codecSettings; 114 codec_ = *codecSettings;
115 return 0; 115 return 0;
116 } 116 }
117 117
118 int32_t Encode(const VideoFrame& inputImage, 118 int32_t Encode(const VideoFrame& inputImage,
119 const CodecSpecificInfo* codecSpecificInfo, 119 const CodecSpecificInfo* codecSpecificInfo,
120 const std::vector<VideoFrameType>* frame_types) override { 120 const std::vector<FrameType>* frame_types) override {
121 return 0; 121 return 0;
122 } 122 }
123 123
124 int32_t RegisterEncodeCompleteCallback( 124 int32_t RegisterEncodeCompleteCallback(
125 EncodedImageCallback* callback) override { 125 EncodedImageCallback* callback) override {
126 callback_ = callback; 126 callback_ = callback;
127 return 0; 127 return 0;
128 } 128 }
129 129
130 int32_t Release() override { 130 int32_t Release() override {
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 EXPECT_EQ(0, adapter_->InitEncode(&codec_, 1, 1200)); 415 EXPECT_EQ(0, adapter_->InitEncode(&codec_, 1, 1200));
416 adapter_->RegisterEncodeCompleteCallback(this); 416 adapter_->RegisterEncodeCompleteCallback(this);
417 ASSERT_EQ(3u, helper_->factory()->encoders().size()); 417 ASSERT_EQ(3u, helper_->factory()->encoders().size());
418 for (MockVideoEncoder* encoder : helper_->factory()->encoders()) 418 for (MockVideoEncoder* encoder : helper_->factory()->encoders())
419 encoder->set_supports_native_handle(true); 419 encoder->set_supports_native_handle(true);
420 EXPECT_FALSE(adapter_->SupportsNativeHandle()); 420 EXPECT_FALSE(adapter_->SupportsNativeHandle());
421 } 421 }
422 422
423 } // namespace testing 423 } // namespace testing
424 } // namespace webrtc 424 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698