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

Side by Side Diff: talk/media/webrtc/webrtcvideoengine2.cc

Issue 1660963002: Bitrate controller for VideoToolbox encoder. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 4 years, 10 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 * libjingle 2 * libjingle
3 * Copyright 2014 Google Inc. 3 * Copyright 2014 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 1513 matching lines...) Expand 10 before | Expand all | Expand 10 after
1524 webrtc::VideoCodecType type, 1524 webrtc::VideoCodecType type,
1525 bool external) 1525 bool external)
1526 : encoder(encoder), 1526 : encoder(encoder),
1527 external_encoder(nullptr), 1527 external_encoder(nullptr),
1528 type(type), 1528 type(type),
1529 external(external) { 1529 external(external) {
1530 if (external) { 1530 if (external) {
1531 external_encoder = encoder; 1531 external_encoder = encoder;
1532 this->encoder = 1532 this->encoder =
1533 new webrtc::VideoEncoderSoftwareFallbackWrapper(type, encoder); 1533 new webrtc::VideoEncoderSoftwareFallbackWrapper(type, encoder);
1534 } else if (encoder && encoder->IsHardwareEncoder()) {
1535 this->encoder = new webrtc::HardwareVideoEncoderWrapper(encoder);
1534 } 1536 }
1535 } 1537 }
1536 1538
1537 WebRtcVideoChannel2::WebRtcVideoSendStream::WebRtcVideoSendStream( 1539 WebRtcVideoChannel2::WebRtcVideoSendStream::WebRtcVideoSendStream(
1538 webrtc::Call* call, 1540 webrtc::Call* call,
1539 const StreamParams& sp, 1541 const StreamParams& sp,
1540 const webrtc::VideoSendStream::Config& config, 1542 const webrtc::VideoSendStream::Config& config,
1541 WebRtcVideoEncoderFactory* external_encoder_factory, 1543 WebRtcVideoEncoderFactory* external_encoder_factory,
1542 const VideoOptions& options, 1544 const VideoOptions& options,
1543 int max_bitrate_bps, 1545 int max_bitrate_bps,
(...skipping 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after
2552 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2554 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2553 } 2555 }
2554 } 2556 }
2555 2557
2556 return video_codecs; 2558 return video_codecs;
2557 } 2559 }
2558 2560
2559 } // namespace cricket 2561 } // namespace cricket
2560 2562
2561 #endif // HAVE_WEBRTC_VIDEO 2563 #endif // HAVE_WEBRTC_VIDEO
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698