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

Side by Side Diff: webrtc/modules/video_coding/codecs/i420/i420.cc

Issue 1415693002: Remove VideoFrameType aliases for FrameType. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 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
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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 int I420Encoder::Encode(const VideoFrame& inputImage, 75 int I420Encoder::Encode(const VideoFrame& inputImage,
76 const CodecSpecificInfo* /*codecSpecificInfo*/, 76 const CodecSpecificInfo* /*codecSpecificInfo*/,
77 const std::vector<FrameType>* /*frame_types*/) { 77 const std::vector<FrameType>* /*frame_types*/) {
78 if (!_inited) { 78 if (!_inited) {
79 return WEBRTC_VIDEO_CODEC_UNINITIALIZED; 79 return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
80 } 80 }
81 if (_encodedCompleteCallback == NULL) { 81 if (_encodedCompleteCallback == NULL) {
82 return WEBRTC_VIDEO_CODEC_UNINITIALIZED; 82 return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
83 } 83 }
84 84
85 _encodedImage._frameType = kKeyFrame; 85 _encodedImage._frameType = kVideoFrameKey;
86 _encodedImage._timeStamp = inputImage.timestamp(); 86 _encodedImage._timeStamp = inputImage.timestamp();
87 _encodedImage._encodedHeight = inputImage.height(); 87 _encodedImage._encodedHeight = inputImage.height();
88 _encodedImage._encodedWidth = inputImage.width(); 88 _encodedImage._encodedWidth = inputImage.width();
89 89
90 int width = inputImage.width(); 90 int width = inputImage.width();
91 if (width > std::numeric_limits<uint16_t>::max()) { 91 if (width > std::numeric_limits<uint16_t>::max()) {
92 return WEBRTC_VIDEO_CODEC_ERR_SIZE; 92 return WEBRTC_VIDEO_CODEC_ERR_SIZE;
93 } 93 }
94 int height = inputImage.height(); 94 int height = inputImage.height();
95 if (height > std::numeric_limits<uint16_t>::max()) { 95 if (height > std::numeric_limits<uint16_t>::max()) {
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 DecodedImageCallback* callback) { 231 DecodedImageCallback* callback) {
232 _decodeCompleteCallback = callback; 232 _decodeCompleteCallback = callback;
233 return WEBRTC_VIDEO_CODEC_OK; 233 return WEBRTC_VIDEO_CODEC_OK;
234 } 234 }
235 235
236 int I420Decoder::Release() { 236 int I420Decoder::Release() {
237 _inited = false; 237 _inited = false;
238 return WEBRTC_VIDEO_CODEC_OK; 238 return WEBRTC_VIDEO_CODEC_OK;
239 } 239 }
240 } // namespace webrtc 240 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698