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

Remove VideoEncoder::SetChannelParameters.

Browse Source 
The SetChannelParameters function was used when WebRTC supported decoding
with errors, which we no longer do.

This cleanup CL is related to the work tracked by 9946.

Bug: webrtc:9946
Change-Id: Id2d5ed23031388f890c42651bfbe5f79eda701e5
Reviewed-on: https://webrtc-review.googlesource.com/c/108861
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
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@{#25505}
This commit is contained in:
philipel
2018-11-05 17:30:22 +01:00
committed by Commit Bot
parent c22f551842
commit ee49f7087f
41 changed files with 11 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java
View File

@ -403,12 +403,6 @@ class HardwareVideoEncoder implements VideoEncoder {
return VideoCodecStatus.OK;
}
@Override
public VideoCodecStatus setChannelParameters(short packetLoss, long roundTripTimeMs) {
encodeThreadChecker.checkIsOnValidThread();
return VideoCodecStatus.OK; // No op.
}
@Override
public VideoCodecStatus setRateAllocation(BitrateAllocation bitrateAllocation, int framerate) {
encodeThreadChecker.checkIsOnValidThread();

5
sdk/android/src/java/org/webrtc/WrappedNativeVideoEncoder.java
View File

@ -32,11 +32,6 @@ abstract class WrappedNativeVideoEncoder implements VideoEncoder {
throw new UnsupportedOperationException("Not implemented.");
}
@Override
public VideoCodecStatus setChannelParameters(short packetLoss, long roundTripTimeMs) {
throw new UnsupportedOperationException("Not implemented.");
}
@Override
public VideoCodecStatus setRateAllocation(BitrateAllocation allocation, int framerate) {
throw new UnsupportedOperationException("Not implemented.");

7
sdk/android/src/jni/androidmediaencoder.cc
View File

@ -105,8 +105,6 @@ class MediaCodecVideoEncoder : public VideoEncoder {
int32_t RegisterEncodeCompleteCallback(
EncodedImageCallback* callback) override;
int32_t Release() override;
int32_t SetChannelParameters(uint32_t /* packet_loss */,
int64_t /* rtt */) override;
int32_t SetRateAllocation(const VideoBitrateAllocation& rate_allocation,
uint32_t frame_rate) override;
@ -364,11 +362,6 @@ int32_t MediaCodecVideoEncoder::InitEncode(const VideoCodec* codec_settings,
codec_settings->expect_encode_from_texture && has_egl_context_);
}
int32_t MediaCodecVideoEncoder::SetChannelParameters(uint32_t /* packet_loss */,
int64_t /* rtt */) {
return WEBRTC_VIDEO_CODEC_OK;
}
bool MediaCodecVideoEncoder::ResetCodec() {
RTC_DCHECK_CALLED_SEQUENTIALLY(&encoder_queue_checker_);
ALOGE << "Reset";

8
sdk/android/src/jni/videoencoderwrapper.cc
View File

@ -136,14 +136,6 @@ int32_t VideoEncoderWrapper::Encode(
return HandleReturnCode(jni, ret, "encode");
}
int32_t VideoEncoderWrapper::SetChannelParameters(uint32_t packet_loss,
int64_t rtt) {
JNIEnv* jni = AttachCurrentThreadIfNeeded();
ScopedJavaLocalRef<jobject> ret = Java_VideoEncoder_setChannelParameters(
jni, encoder_, (jshort)packet_loss, (jlong)rtt);
return HandleReturnCode(jni, ret, "setChannelParameters");
}
int32_t VideoEncoderWrapper::SetRateAllocation(
const VideoBitrateAllocation& allocation,
uint32_t framerate) {

2
sdk/android/src/jni/videoencoderwrapper.h
View File

@ -45,8 +45,6 @@ class VideoEncoderWrapper : public VideoEncoder {
const CodecSpecificInfo* codec_specific_info,
const std::vector<FrameType>* frame_types) override;
int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt) override;
int32_t SetRateAllocation(const VideoBitrateAllocation& allocation,
uint32_t framerate) override;