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

Revert "Use injectable hardware video decoder/encoder in AppRTCMobile."

Browse Source 
This reverts commit 0cbaf1a6f6ad13a25993f6ea3be931894a196834.

Reason for revert: Makes a test flaky:
https://build.chromium.org/p/client.webrtc/builders/Android32%20%28M%20Nexus5X%29/builds/4603

Original change's description:
> Use injectable hardware video decoder/encoder in AppRTCMobile.
> 
> Also include a small fix for getting the encoder queue.
> 
> Bug: webrtc:7760
> Change-Id: I96dc8ffb363b90382276d88148f81d5f89dca5f2
> Reviewed-on: https://webrtc-review.googlesource.com/2683
> Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
> Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#20022}

TBR=magjed@webrtc.org,sakal@webrtc.org

Change-Id: I6cb9a10eadb0eff2b85d5028d684746dc69bccfb
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:7760
Reviewed-on: https://webrtc-review.googlesource.com/4480
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20024}
This commit is contained in:
Sami Kalliomäki
2017-09-28 16:31:41 +00:00
committed by Commit Bot
parent 612f858ba0
commit 27bafec7c1
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
View File

@ -36,8 +36,6 @@ import org.webrtc.AudioTrack;
import org.webrtc.CameraVideoCapturer;
import org.webrtc.DataChannel;
import org.webrtc.EglBase;
import org.webrtc.HardwareVideoDecoderFactory;
import org.webrtc.HardwareVideoEncoderFactory;
import org.webrtc.IceCandidate;
import org.webrtc.Logging;
import org.webrtc.MediaConstraints;
@ -341,7 +339,6 @@ public class PeerConnectionClient {
createPeerConnection(
localRender, Collections.singletonList(remoteRender), videoCapturer, signalingParameters);
}
public void createPeerConnection(final VideoSink localRender,
final List<VideoRenderer.Callbacks> remoteRenders, final VideoCapturer videoCapturer,
final SignalingParameters signalingParameters) {
@ -512,12 +509,7 @@ public class PeerConnectionClient {
if (options != null) {
Log.d(TAG, "Factory networkIgnoreMask option: " + options.networkIgnoreMask);
}
final boolean enableH264HighProfile =
peerConnectionParameters.videoCodec.equals(VIDEO_CODEC_H264_HIGH);
factory = new PeerConnectionFactory(options,
new HardwareVideoEncoderFactory(rootEglBase.getEglBaseContext(),
true /* enableIntelVp8Encoder */, enableH264HighProfile),
new HardwareVideoDecoderFactory(rootEglBase.getEglBaseContext()));
factory = new PeerConnectionFactory(options);
Log.d(TAG, "Peer connection factory created.");
}

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

@ -97,6 +97,8 @@ VideoEncoderWrapper::VideoEncoderWrapper(JNIEnv* jni, jobject j_encoder)
implementation_name_ = GetImplementationName(jni);
encoder_queue_ = rtc::TaskQueue::Current();
initialized_ = false;
num_resets_ = 0;
@ -114,7 +116,6 @@ int32_t VideoEncoderWrapper::InitEncode(const VideoCodec* codec_settings,
number_of_cores_ = number_of_cores;
codec_settings_ = *codec_settings;
num_resets_ = 0;
encoder_queue_ = rtc::TaskQueue::Current();
return InitEncodeInternal(jni);
}
@ -166,7 +167,6 @@ int32_t VideoEncoderWrapper::Release() {
jobject ret = jni->CallObjectMethod(*encoder_, release_method_);
frame_extra_infos_.clear();
initialized_ = false;
encoder_queue_ = nullptr;
return HandleReturnCode(jni, ret);
}