zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove SetChannelParameters function from API classes.

Browse Source 
Followup to https://webrtc-review.googlesource.com/c/src/+/108861

Bug: webrtc:9946
Change-Id: Ia6e7fa3942c21aefeadb7b214c85cff93fbc2ef6
Reviewed-on: https://webrtc-review.googlesource.com/c/109860
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25747}
This commit is contained in:
philipel
2018-11-07 13:17:24 +01:00
committed by Commit Bot
parent ecd62056e3
commit 5486bcd0d0
3 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/video_codecs/video_encoder.cc
View File

@ -123,8 +123,4 @@ VideoEncoder::EncoderInfo VideoEncoder::GetEncoderInfo() const {
info.implementation_name = ImplementationName(); info.implementation_name = ImplementationName();
return info; return info;
} }
int32_t VideoEncoder::SetChannelParameters(uint32_t packet_loss, int64_t rtt) {
return 0;
}
} // namespace webrtc } // namespace webrtc

11
api/video_codecs/video_encoder.h
View File

@ -202,17 +202,6 @@ class RTC_EXPORT VideoEncoder {
const CodecSpecificInfo* codec_specific_info, const CodecSpecificInfo* codec_specific_info,
const std::vector<FrameType>* frame_types) = 0; const std::vector<FrameType>* frame_types) = 0;
// Inform the encoder of the new packet loss rate and the round-trip time of
// the network.
//
// Input:
// - packet_loss : Fraction lost
// (loss rate in percent = 100 * packetLoss / 255)
// - rtt : Round-trip time in milliseconds
// Return value : WEBRTC_VIDEO_CODEC_OK if OK
// <0 - Errors: WEBRTC_VIDEO_CODEC_ERROR
virtual int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt);
// Inform the encoder about the new target bit rate. // Inform the encoder about the new target bit rate.
// //
// Input: // Input:

13
sdk/android/api/org/webrtc/VideoEncoder.java
View File

@ -210,19 +210,6 @@ public interface VideoEncoder {
*/ */
@CalledByNative VideoCodecStatus encode(VideoFrame frame, EncodeInfo info); @CalledByNative VideoCodecStatus encode(VideoFrame frame, EncodeInfo info);
/**
* Informs the encoder of the packet loss and the round-trip time of the network.
*
* @param packetLoss How many packets are lost on average per 255 packets.
* @param roundTripTimeMs Round-trip time of the network in milliseconds.
*/
// TODO(webrtc:9946): Remove this function when downstream projects have been
// updated.
@Deprecated
default VideoCodecStatus setChannelParameters(short packetLoss, long roundTripTimeMs) {
return VideoCodecStatus.OK;
}
/** Sets the bitrate allocation and the target framerate for the encoder. */ /** Sets the bitrate allocation and the target framerate for the encoder. */
@CalledByNative VideoCodecStatus setRateAllocation(BitrateAllocation allocation, int framerate); @CalledByNative VideoCodecStatus setRateAllocation(BitrateAllocation allocation, int framerate);