In order to align with this PR[1], setParameters() should not throw if the H265 level ID we're trying to send does not match what was negotiated. This was believed to be fixed by [2] but we were still throwing due to a check on a different layer (media_engine.cc). In order to reproduce the issue despite WebRTC lacking SW encoder/decoder for H265, peer_connection_encodings_integrationtest.cc gets a new test with real stack but fake encoder/decoder factory. This allows negotiating H265 and doing SetParameters() even though the codec is not processing any frames. - Basic test coverage is added for singlecast and simulcast H265. - Test coverage for the bug being fixed added. - In Chrome the equivalent WPTs exists for when real HW is available here[3]. Those tests PASS with this CL (currently FAIL). [1] https://github.com/w3c/webrtc-pc/pull/3023 [2] https://webrtc-review.googlesource.com/c/src/+/368781 [3] https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/web_tests/external/wpt/webrtc/protocol/h265-level-id.https.html Bug: chromium:381407888 Change-Id: I3619a124586b8b26d3695cfad8890cf40bd475db Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/374164 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Henrik Boström <hbos@webrtc.org> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Jianlin Qiu <jianlin.qiu@intel.com> Cr-Commit-Position: refs/heads/main@{#43759}
160 lines
6.4 KiB
C++
160 lines
6.4 KiB
C++
/*
|
|
* Copyright 2013 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef PC_TEST_PEER_CONNECTION_TEST_WRAPPER_H_
|
|
#define PC_TEST_PEER_CONNECTION_TEST_WRAPPER_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "api/audio_codecs/audio_decoder_factory.h"
|
|
#include "api/audio_codecs/audio_encoder_factory.h"
|
|
#include "api/audio_options.h"
|
|
#include "api/data_channel_interface.h"
|
|
#include "api/field_trials_view.h"
|
|
#include "api/jsep.h"
|
|
#include "api/media_stream_interface.h"
|
|
#include "api/peer_connection_interface.h"
|
|
#include "api/rtc_error.h"
|
|
#include "api/rtp_parameters.h"
|
|
#include "api/rtp_receiver_interface.h"
|
|
#include "api/scoped_refptr.h"
|
|
#include "api/sequence_checker.h"
|
|
#include "api/video/resolution.h"
|
|
#include "api/video_codecs/video_decoder_factory.h"
|
|
#include "api/video_codecs/video_encoder_factory.h"
|
|
#include "pc/test/fake_audio_capture_module.h"
|
|
#include "pc/test/fake_periodic_video_source.h"
|
|
#include "pc/test/fake_periodic_video_track_source.h"
|
|
#include "pc/test/fake_video_track_renderer.h"
|
|
#include "rtc_base/third_party/sigslot/sigslot.h"
|
|
#include "rtc_base/thread.h"
|
|
|
|
class PeerConnectionTestWrapper
|
|
: public webrtc::PeerConnectionObserver,
|
|
public webrtc::CreateSessionDescriptionObserver,
|
|
public sigslot::has_slots<> {
|
|
public:
|
|
static void Connect(PeerConnectionTestWrapper* caller,
|
|
PeerConnectionTestWrapper* callee);
|
|
|
|
PeerConnectionTestWrapper(const std::string& name,
|
|
rtc::SocketServer* socket_server,
|
|
rtc::Thread* network_thread,
|
|
rtc::Thread* worker_thread);
|
|
virtual ~PeerConnectionTestWrapper();
|
|
|
|
bool CreatePc(
|
|
const webrtc::PeerConnectionInterface::RTCConfiguration& config,
|
|
rtc::scoped_refptr<webrtc::AudioEncoderFactory> audio_encoder_factory,
|
|
rtc::scoped_refptr<webrtc::AudioDecoderFactory> audio_decoder_factory,
|
|
std::unique_ptr<webrtc::FieldTrialsView> field_trials = nullptr);
|
|
bool CreatePc(
|
|
const webrtc::PeerConnectionInterface::RTCConfiguration& config,
|
|
rtc::scoped_refptr<webrtc::AudioEncoderFactory> audio_encoder_factory,
|
|
rtc::scoped_refptr<webrtc::AudioDecoderFactory> audio_decoder_factory,
|
|
std::unique_ptr<webrtc::VideoEncoderFactory> video_encoder_factory,
|
|
std::unique_ptr<webrtc::VideoDecoderFactory> video_decoder_factory,
|
|
std::unique_ptr<webrtc::FieldTrialsView> field_trials = nullptr);
|
|
|
|
rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> pc_factory()
|
|
const {
|
|
return peer_connection_factory_;
|
|
}
|
|
webrtc::PeerConnectionInterface* pc() { return peer_connection_.get(); }
|
|
|
|
rtc::scoped_refptr<webrtc::DataChannelInterface> CreateDataChannel(
|
|
const std::string& label,
|
|
const webrtc::DataChannelInit& init);
|
|
|
|
std::optional<webrtc::RtpCodecCapability> FindFirstSendCodecWithName(
|
|
cricket::MediaType media_type,
|
|
const std::string& name) const;
|
|
|
|
void WaitForNegotiation();
|
|
|
|
// Implements PeerConnectionObserver.
|
|
void OnSignalingChange(
|
|
webrtc::PeerConnectionInterface::SignalingState new_state) override;
|
|
void OnAddTrack(
|
|
rtc::scoped_refptr<webrtc::RtpReceiverInterface> receiver,
|
|
const std::vector<rtc::scoped_refptr<webrtc::MediaStreamInterface>>&
|
|
streams) override;
|
|
void OnDataChannel(
|
|
rtc::scoped_refptr<webrtc::DataChannelInterface> data_channel) override;
|
|
void OnRenegotiationNeeded() override {}
|
|
void OnIceConnectionChange(
|
|
webrtc::PeerConnectionInterface::IceConnectionState new_state) override {}
|
|
void OnIceGatheringChange(
|
|
webrtc::PeerConnectionInterface::IceGatheringState new_state) override {}
|
|
void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override;
|
|
|
|
// Implements CreateSessionDescriptionObserver.
|
|
void OnSuccess(webrtc::SessionDescriptionInterface* desc) override;
|
|
void OnFailure(webrtc::RTCError) override {}
|
|
|
|
void CreateOffer(
|
|
const webrtc::PeerConnectionInterface::RTCOfferAnswerOptions& options);
|
|
void CreateAnswer(
|
|
const webrtc::PeerConnectionInterface::RTCOfferAnswerOptions& options);
|
|
void ReceiveOfferSdp(const std::string& sdp);
|
|
void ReceiveAnswerSdp(const std::string& sdp);
|
|
void AddIceCandidate(const std::string& sdp_mid,
|
|
int sdp_mline_index,
|
|
const std::string& candidate);
|
|
bool WaitForCallEstablished();
|
|
bool WaitForConnection();
|
|
bool WaitForAudio();
|
|
bool WaitForVideo();
|
|
void GetAndAddUserMedia(bool audio,
|
|
const cricket::AudioOptions& audio_options,
|
|
bool video);
|
|
|
|
// sigslots
|
|
sigslot::signal3<const std::string&, int, const std::string&>
|
|
SignalOnIceCandidateReady;
|
|
sigslot::signal1<const std::string&> SignalOnSdpReady;
|
|
sigslot::signal1<webrtc::DataChannelInterface*> SignalOnDataChannel;
|
|
|
|
rtc::scoped_refptr<webrtc::MediaStreamInterface> GetUserMedia(
|
|
bool audio,
|
|
const cricket::AudioOptions& audio_options,
|
|
bool video,
|
|
webrtc::Resolution resolution = {
|
|
.width = webrtc::FakePeriodicVideoSource::kDefaultWidth,
|
|
.height = webrtc::FakePeriodicVideoSource::kDefaultHeight});
|
|
void StopFakeVideoSources();
|
|
|
|
private:
|
|
void SetLocalDescription(webrtc::SdpType type, const std::string& sdp);
|
|
void SetRemoteDescription(webrtc::SdpType type, const std::string& sdp);
|
|
bool CheckForConnection();
|
|
bool CheckForAudio();
|
|
bool CheckForVideo();
|
|
|
|
std::string name_;
|
|
rtc::SocketServer* const socket_server_;
|
|
rtc::Thread* const network_thread_;
|
|
rtc::Thread* const worker_thread_;
|
|
webrtc::SequenceChecker pc_thread_checker_;
|
|
rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_;
|
|
rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>
|
|
peer_connection_factory_;
|
|
rtc::scoped_refptr<FakeAudioCaptureModule> fake_audio_capture_module_;
|
|
std::unique_ptr<webrtc::FakeVideoTrackRenderer> renderer_;
|
|
int num_get_user_media_calls_ = 0;
|
|
bool pending_negotiation_;
|
|
std::vector<rtc::scoped_refptr<webrtc::FakePeriodicVideoTrackSource>>
|
|
fake_video_sources_;
|
|
};
|
|
|
|
#endif // PC_TEST_PEER_CONNECTION_TEST_WRAPPER_H_
|