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

Side by Side Diff: webrtc/video/video_encoder.cc

Issue 1158273010: Re-land "Convert native handles to buffers before encoding." (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 6 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/test/fake_texture_frame.h ('k') | webrtc/video/video_encoder_unittest.cc » ('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) 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 return fallback_encoder_->SetRates(bitrate, framerate); 115 return fallback_encoder_->SetRates(bitrate, framerate);
116 return ret; 116 return ret;
117 } 117 }
118 118
119 void VideoEncoderSoftwareFallbackWrapper::OnDroppedFrame() { 119 void VideoEncoderSoftwareFallbackWrapper::OnDroppedFrame() {
120 if (fallback_encoder_) 120 if (fallback_encoder_)
121 return fallback_encoder_->OnDroppedFrame(); 121 return fallback_encoder_->OnDroppedFrame();
122 return encoder_->OnDroppedFrame(); 122 return encoder_->OnDroppedFrame();
123 } 123 }
124 124
125 bool VideoEncoderSoftwareFallbackWrapper::SupportsNativeHandle() const {
126 if (fallback_encoder_)
127 return fallback_encoder_->SupportsNativeHandle();
128 return encoder_->SupportsNativeHandle();
129 }
130
125 } // namespace webrtc 131 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/test/fake_texture_frame.h ('k') | webrtc/video/video_encoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698