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 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
327 return; | 327 return; |
328 } | 328 } |
329 TraceFrameDropEnd(); | 329 TraceFrameDropEnd(); |
330 codec_type = encoder_config_.codecType; | 330 codec_type = encoder_config_.codecType; |
331 } | 331 } |
332 | 332 |
333 TRACE_EVENT_ASYNC_STEP0("webrtc", "Video", video_frame.render_time_ms(), | 333 TRACE_EVENT_ASYNC_STEP0("webrtc", "Video", video_frame.render_time_ms(), |
334 "Encode"); | 334 "Encode"); |
335 const VideoFrame* frame_to_send = &video_frame; | 335 const VideoFrame* frame_to_send = &video_frame; |
336 // TODO(wuchengli): support texture frames. | 336 // TODO(wuchengli): support texture frames. |
337 if (!video_frame.native_handle()) { | 337 if (!video_frame.video_frame_buffer()->native_handle()) { |
338 // Pass frame via preprocessor. | 338 // Pass frame via preprocessor. |
339 frame_to_send = vp_->PreprocessFrame(video_frame); | 339 frame_to_send = vp_->PreprocessFrame(video_frame); |
340 if (!frame_to_send) { | 340 if (!frame_to_send) { |
341 // Drop this frame, or there was an error processing it. | 341 // Drop this frame, or there was an error processing it. |
342 return; | 342 return; |
343 } | 343 } |
344 } | 344 } |
345 | 345 |
346 // If we haven't resampled the frame and we have a FrameCallback, we need to | 346 // If we haven't resampled the frame and we have a FrameCallback, we need to |
347 // make a deep copy of |video_frame|. | 347 // make a deep copy of |video_frame|. |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
530 const uint32_t width, | 530 const uint32_t width, |
531 const uint32_t height) { | 531 const uint32_t height) { |
532 return vp_->SetTargetResolution(width, height, frame_rate); | 532 return vp_->SetTargetResolution(width, height, frame_rate); |
533 } | 533 } |
534 | 534 |
535 void QMVideoSettingsCallback::SetTargetFramerate(int frame_rate) { | 535 void QMVideoSettingsCallback::SetTargetFramerate(int frame_rate) { |
536 vp_->SetTargetFramerate(frame_rate); | 536 vp_->SetTargetFramerate(frame_rate); |
537 } | 537 } |
538 | 538 |
539 } // namespace webrtc | 539 } // namespace webrtc |
OLD | NEW |