OLD | NEW |
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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 } | 226 } |
227 } | 227 } |
228 | 228 |
229 webrtc::FrameType VCMEncodedFrame::ConvertFrameType(VideoFrameType frameType) | 229 webrtc::FrameType VCMEncodedFrame::ConvertFrameType(VideoFrameType frameType) |
230 { | 230 { |
231 switch(frameType) { | 231 switch(frameType) { |
232 case kKeyFrame: | 232 case kKeyFrame: |
233 return kVideoFrameKey; | 233 return kVideoFrameKey; |
234 case kDeltaFrame: | 234 case kDeltaFrame: |
235 return kVideoFrameDelta; | 235 return kVideoFrameDelta; |
236 case kSkipFrame: | |
237 return kFrameEmpty; | |
238 default: | |
239 return kVideoFrameDelta; | |
240 } | 236 } |
| 237 // Bogus default return value. |
| 238 return kVideoFrameDelta; |
241 } | 239 } |
242 | 240 |
243 VideoFrameType VCMEncodedFrame::ConvertFrameType(webrtc::FrameType frame_type) { | 241 VideoFrameType VCMEncodedFrame::ConvertFrameType(webrtc::FrameType frame_type) { |
244 switch (frame_type) { | 242 switch (frame_type) { |
245 case kVideoFrameKey: | 243 case kVideoFrameKey: |
246 return kKeyFrame; | 244 return kKeyFrame; |
247 case kVideoFrameDelta: | 245 case kVideoFrameDelta: |
248 return kDeltaFrame; | 246 return kDeltaFrame; |
249 default: | 247 default: |
250 assert(false); | 248 assert(false); |
251 return kDeltaFrame; | 249 return kDeltaFrame; |
252 } | 250 } |
253 } | 251 } |
254 | 252 |
255 void VCMEncodedFrame::ConvertFrameTypes( | 253 void VCMEncodedFrame::ConvertFrameTypes( |
256 const std::vector<webrtc::FrameType>& frame_types, | 254 const std::vector<webrtc::FrameType>& frame_types, |
257 std::vector<VideoFrameType>* video_frame_types) { | 255 std::vector<VideoFrameType>* video_frame_types) { |
258 assert(video_frame_types); | 256 assert(video_frame_types); |
259 video_frame_types->reserve(frame_types.size()); | 257 video_frame_types->reserve(frame_types.size()); |
260 for (size_t i = 0; i < frame_types.size(); ++i) { | 258 for (size_t i = 0; i < frame_types.size(); ++i) { |
261 (*video_frame_types)[i] = ConvertFrameType(frame_types[i]); | 259 (*video_frame_types)[i] = ConvertFrameType(frame_types[i]); |
262 } | 260 } |
263 } | 261 } |
264 | 262 |
265 } | 263 } |
OLD | NEW |