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

Side by Side Diff: webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 235
236 // TODO(tkchin): Try setting payload size via 236 // TODO(tkchin): Try setting payload size via
237 // kVTCompressionPropertyKey_MaxH264SliceBytes. 237 // kVTCompressionPropertyKey_MaxH264SliceBytes.
238 238
239 return ResetCompressionSession(); 239 return ResetCompressionSession();
240 } 240 }
241 241
242 int H264VideoToolboxEncoder::Encode( 242 int H264VideoToolboxEncoder::Encode(
243 const VideoFrame& input_image, 243 const VideoFrame& input_image,
244 const CodecSpecificInfo* codec_specific_info, 244 const CodecSpecificInfo* codec_specific_info,
245 const std::vector<VideoFrameType>* frame_types) { 245 const std::vector<FrameType>* frame_types) {
246 if (input_image.IsZeroSize()) { 246 if (input_image.IsZeroSize()) {
247 // It's possible to get zero sizes as a signal to produce keyframes (this 247 // It's possible to get zero sizes as a signal to produce keyframes (this
248 // happens for internal sources). But this shouldn't happen in 248 // happens for internal sources). But this shouldn't happen in
249 // webrtcvideoengine2. 249 // webrtcvideoengine2.
250 RTC_NOTREACHED(); 250 RTC_NOTREACHED();
251 return WEBRTC_VIDEO_CODEC_OK; 251 return WEBRTC_VIDEO_CODEC_OK;
252 } 252 }
253 if (!callback_ || !compression_session_) { 253 if (!callback_ || !compression_session_) {
254 return WEBRTC_VIDEO_CODEC_UNINITIALIZED; 254 return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
255 } 255 }
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 if (compression_session_) { 429 if (compression_session_) {
430 VTCompressionSessionInvalidate(compression_session_); 430 VTCompressionSessionInvalidate(compression_session_);
431 CFRelease(compression_session_); 431 CFRelease(compression_session_);
432 compression_session_ = nullptr; 432 compression_session_ = nullptr;
433 } 433 }
434 } 434 }
435 435
436 } // namespace webrtc 436 } // namespace webrtc
437 437
438 #endif // defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED) 438 #endif // defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698