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

Side by Side Diff: webrtc/video_engine/vie_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/video_engine/vie_capturer_unittest.cc ('k') | webrtc/video_frame.h » ('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) 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 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 } 536 }
537 pre_encode_callback_->FrameCallback(decimated_frame); 537 pre_encode_callback_->FrameCallback(decimated_frame);
538 } 538 }
539 } 539 }
540 540
541 // If the frame was not resampled, scaled, or touched by FrameCallback => use 541 // If the frame was not resampled, scaled, or touched by FrameCallback => use
542 // original. The frame is const from here. 542 // original. The frame is const from here.
543 const VideoFrame* output_frame = 543 const VideoFrame* output_frame =
544 (decimated_frame != NULL) ? decimated_frame : &video_frame; 544 (decimated_frame != NULL) ? decimated_frame : &video_frame;
545 545
546 if (video_frame.native_handle() != NULL) {
547 // TODO(wuchengli): add texture support. http://crbug.com/362437
548 return;
549 }
550
551 #ifdef VIDEOCODEC_VP8 546 #ifdef VIDEOCODEC_VP8
552 if (vcm_->SendCodec() == webrtc::kVideoCodecVP8) { 547 if (vcm_->SendCodec() == webrtc::kVideoCodecVP8) {
553 webrtc::CodecSpecificInfo codec_specific_info; 548 webrtc::CodecSpecificInfo codec_specific_info;
554 codec_specific_info.codecType = webrtc::kVideoCodecVP8; 549 codec_specific_info.codecType = webrtc::kVideoCodecVP8;
555 { 550 {
556 CriticalSectionScoped cs(data_cs_.get()); 551 CriticalSectionScoped cs(data_cs_.get());
557 codec_specific_info.codecSpecific.VP8.hasReceivedRPSI = 552 codec_specific_info.codecSpecific.VP8.hasReceivedRPSI =
558 has_received_rpsi_; 553 has_received_rpsi_;
559 codec_specific_info.codecSpecific.VP8.hasReceivedSLI = 554 codec_specific_info.codecSpecific.VP8.hasReceivedSLI =
560 has_received_sli_; 555 has_received_sli_;
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
863 } 858 }
864 859
865 int32_t QMVideoSettingsCallback::SetVideoQMSettings( 860 int32_t QMVideoSettingsCallback::SetVideoQMSettings(
866 const uint32_t frame_rate, 861 const uint32_t frame_rate,
867 const uint32_t width, 862 const uint32_t width,
868 const uint32_t height) { 863 const uint32_t height) {
869 return vpm_->SetTargetResolution(width, height, frame_rate); 864 return vpm_->SetTargetResolution(width, height, frame_rate);
870 } 865 }
871 866
872 } // namespace webrtc 867 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video_engine/vie_capturer_unittest.cc ('k') | webrtc/video_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698