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

Add an integration test frame encryption works with DependencyDescriptor

Browse Source 
Bug: webrtc:10342
Change-Id: I3a18c1fbe222eada7a484f8f62a0b5bad76eb073
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168888
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30595}
This commit is contained in:
Danil Chapovalov
2020-02-24 14:29:27 +01:00
committed by Commit Bot
parent c63bf10790
commit ce515f7625
2 changed files with 60 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/call_test.cc
View File

@ -259,6 +259,8 @@ void CallTest::CreateVideoSendConfig(VideoSendStream::Config* video_config,
&video_config->rtp.extensions); &video_config->rtp.extensions);
AddRtpExtensionByUri(RtpExtension::kGenericFrameDescriptorUri01, AddRtpExtensionByUri(RtpExtension::kGenericFrameDescriptorUri01,
&video_config->rtp.extensions); &video_config->rtp.extensions);
AddRtpExtensionByUri(RtpExtension::kDependencyDescriptorUri,
&video_config->rtp.extensions);
if (video_encoder_configs_.empty()) { if (video_encoder_configs_.empty()) {
video_encoder_configs_.emplace_back(); video_encoder_configs_.emplace_back();
FillEncoderConfiguration(kVideoCodecGeneric, num_video_streams, FillEncoderConfiguration(kVideoCodecGeneric, num_video_streams,

46
video/end_to_end_tests/frame_encryption_tests.cc
View File

@ -11,39 +11,26 @@
#include "api/test/fake_frame_decryptor.h" #include "api/test/fake_frame_decryptor.h"
#include "api/test/fake_frame_encryptor.h" #include "api/test/fake_frame_encryptor.h"
#include "media/engine/internal_decoder_factory.h" #include "media/engine/internal_decoder_factory.h"
#include "modules/rtp_rtcp/source/rtp_dependency_descriptor_extension.h"
#include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "test/call_test.h" #include "test/call_test.h"
#include "test/field_trial.h"
#include "test/gtest.h" #include "test/gtest.h"
namespace webrtc { namespace webrtc {
namespace { namespace {
using FrameEncryptionEndToEndTest = test::CallTest;
enum : int { // The first valid value is 1. enum : int { // The first valid value is 1.
kGenericDescriptorExtensionId = 1, kGenericDescriptorExtensionId = 1,
}; };
} // namespace
class FrameEncryptionEndToEndTest : public test::CallTest {
public:
FrameEncryptionEndToEndTest() {
RegisterRtpExtension(RtpExtension(RtpExtension::kGenericFrameDescriptorUri,
kGenericDescriptorExtensionId));
}
private:
// GenericDescriptor is required for FrameEncryption to work.
test::ScopedFieldTrials field_trials_{"WebRTC-GenericDescriptor/Enabled/"};
};
// Validates that payloads cannot be sent without a frame encryptor and frame
// decryptor attached.
TEST_F(FrameEncryptionEndToEndTest, RequireFrameEncryptionEnforced) {
class DecryptedFrameObserver : public test::EndToEndTest, class DecryptedFrameObserver : public test::EndToEndTest,
public rtc::VideoSinkInterface<VideoFrame> { public rtc::VideoSinkInterface<VideoFrame> {
public: public:
DecryptedFrameObserver() DecryptedFrameObserver()
: EndToEndTest(kDefaultTimeoutMs), : EndToEndTest(test::CallTest::kDefaultTimeoutMs),
encoder_factory_([]() { return VP8Encoder::Create(); }) {} encoder_factory_([] { return VP8Encoder::Create(); }) {}
private: private:
void ModifyVideoConfigs( void ModifyVideoConfigs(
@ -53,7 +40,7 @@ TEST_F(FrameEncryptionEndToEndTest, RequireFrameEncryptionEnforced) {
// Use VP8 instead of FAKE. // Use VP8 instead of FAKE.
send_config->encoder_settings.encoder_factory = &encoder_factory_; send_config->encoder_settings.encoder_factory = &encoder_factory_;
send_config->rtp.payload_name = "VP8"; send_config->rtp.payload_name = "VP8";
send_config->rtp.payload_type = kVideoSendPayloadType; send_config->rtp.payload_type = test::CallTest::kVideoSendPayloadType;
send_config->frame_encryptor = new FakeFrameEncryptor(); send_config->frame_encryptor = new FakeFrameEncryptor();
send_config->crypto_options.sframe.require_frame_encryption = true; send_config->crypto_options.sframe.require_frame_encryption = true;
encoder_config->codec_type = kVideoCodecVP8; encoder_config->codec_type = kVideoCodecVP8;
@ -69,7 +56,6 @@ TEST_F(FrameEncryptionEndToEndTest, RequireFrameEncryptionEnforced) {
} }
} }
// Validate that rotation is preserved.
void OnFrame(const VideoFrame& video_frame) override { void OnFrame(const VideoFrame& video_frame) override {
observation_complete_.Set(); observation_complete_.Set();
} }
@ -82,8 +68,24 @@ TEST_F(FrameEncryptionEndToEndTest, RequireFrameEncryptionEnforced) {
std::unique_ptr<VideoEncoder> encoder_; std::unique_ptr<VideoEncoder> encoder_;
test::FunctionVideoEncoderFactory encoder_factory_; test::FunctionVideoEncoderFactory encoder_factory_;
InternalDecoderFactory decoder_factory_; InternalDecoderFactory decoder_factory_;
} test; };
// Validates that payloads cannot be sent without a frame encryptor and frame
// decryptor attached.
TEST_F(FrameEncryptionEndToEndTest,
WithGenericFrameDescriptorRequireFrameEncryptionEnforced) {
RegisterRtpExtension(RtpExtension(RtpExtension::kGenericFrameDescriptorUri00,
kGenericDescriptorExtensionId));
DecryptedFrameObserver test;
RunBaseTest(&test); RunBaseTest(&test);
} }
TEST_F(FrameEncryptionEndToEndTest,
WithDependencyDescriptorRequireFrameEncryptionEnforced) {
RegisterRtpExtension(RtpExtension(RtpExtension::kDependencyDescriptorUri,
kGenericDescriptorExtensionId));
DecryptedFrameObserver test;
RunBaseTest(&test);
}
} // namespace
} // namespace webrtc } // namespace webrtc