2b068ce1b8
This reverts commit a4f23ad0ce4382e3a11bc6a8c1f9f6183e722fd8. Reason for revert: Downstream fix landed. TBR=mflodman@webrtc.org Original change's description: > Revert "Moved VideoReceiveStream::Decoder::decoder_factory to VideoReceiveStream::Config::decoder_factory." > > This reverts commit acb9d8365a5f9eb1e2a9e9902690d62dab1e5759. > > Reason for revert: Break downstream stuff. > > Original change's description: > > Moved VideoReceiveStream::Decoder::decoder_factory to VideoReceiveStream::Config::decoder_factory. > > > > Bug: webrtc:9106 > > Change-Id: I85712f3ab6a734d3fad7819491d3b8e3388b47e7 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180342 > > Reviewed-by: Niels Moller <nisse@webrtc.org> > > Reviewed-by: Magnus Flodman <mflodman@webrtc.org> > > Commit-Queue: Philip Eliasson <philipel@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#31834} > > TBR=nisse@webrtc.org,philipel@webrtc.org,mflodman@webrtc.org > > Change-Id: I6cfdb85a154a78135839f84edf5f69673d5ab715 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:9106 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180807 > Reviewed-by: Philip Eliasson <philipel@webrtc.org> > Commit-Queue: Philip Eliasson <philipel@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#31835} TBR=nisse@webrtc.org,philipel@webrtc.org,mflodman@webrtc.org # Not skipping CQ checks because this is a reland. Bug: webrtc:9106 Change-Id: I03b3e68532107bec37bcc6e47a5489c84fe91ef9 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180808 Commit-Queue: Philip Eliasson <philipel@webrtc.org> Reviewed-by: Philip Eliasson <philipel@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31866}
92 lines
3.3 KiB
C++
92 lines
3.3 KiB
C++
/*
|
|
* Copyright 2018 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.
|
|
*/
|
|
|
|
#include "api/test/fake_frame_decryptor.h"
|
|
#include "api/test/fake_frame_encryptor.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 "test/call_test.h"
|
|
#include "test/gtest.h"
|
|
|
|
namespace webrtc {
|
|
namespace {
|
|
|
|
using FrameEncryptionEndToEndTest = test::CallTest;
|
|
|
|
enum : int { // The first valid value is 1.
|
|
kGenericDescriptorExtensionId = 1,
|
|
};
|
|
|
|
class DecryptedFrameObserver : public test::EndToEndTest,
|
|
public rtc::VideoSinkInterface<VideoFrame> {
|
|
public:
|
|
DecryptedFrameObserver()
|
|
: EndToEndTest(test::CallTest::kDefaultTimeoutMs),
|
|
encoder_factory_([] { return VP8Encoder::Create(); }) {}
|
|
|
|
private:
|
|
void ModifyVideoConfigs(
|
|
VideoSendStream::Config* send_config,
|
|
std::vector<VideoReceiveStream::Config>* receive_configs,
|
|
VideoEncoderConfig* encoder_config) override {
|
|
// Use VP8 instead of FAKE.
|
|
send_config->encoder_settings.encoder_factory = &encoder_factory_;
|
|
send_config->rtp.payload_name = "VP8";
|
|
send_config->rtp.payload_type = test::CallTest::kVideoSendPayloadType;
|
|
send_config->frame_encryptor = new FakeFrameEncryptor();
|
|
send_config->crypto_options.sframe.require_frame_encryption = true;
|
|
encoder_config->codec_type = kVideoCodecVP8;
|
|
VideoReceiveStream::Decoder decoder =
|
|
test::CreateMatchingDecoder(*send_config);
|
|
for (auto& recv_config : *receive_configs) {
|
|
recv_config.decoder_factory = &decoder_factory_;
|
|
recv_config.decoders.clear();
|
|
recv_config.decoders.push_back(decoder);
|
|
recv_config.renderer = this;
|
|
recv_config.frame_decryptor = new FakeFrameDecryptor();
|
|
recv_config.crypto_options.sframe.require_frame_encryption = true;
|
|
}
|
|
}
|
|
|
|
void OnFrame(const VideoFrame& video_frame) override {
|
|
observation_complete_.Set();
|
|
}
|
|
|
|
void PerformTest() override {
|
|
EXPECT_TRUE(Wait())
|
|
<< "Timed out waiting for decrypted frames to be rendered.";
|
|
}
|
|
|
|
std::unique_ptr<VideoEncoder> encoder_;
|
|
test::FunctionVideoEncoderFactory encoder_factory_;
|
|
InternalDecoderFactory decoder_factory_;
|
|
};
|
|
|
|
// 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);
|
|
}
|
|
|
|
TEST_F(FrameEncryptionEndToEndTest,
|
|
WithDependencyDescriptorRequireFrameEncryptionEnforced) {
|
|
RegisterRtpExtension(RtpExtension(RtpExtension::kDependencyDescriptorUri,
|
|
kGenericDescriptorExtensionId));
|
|
DecryptedFrameObserver test;
|
|
RunBaseTest(&test);
|
|
}
|
|
} // namespace
|
|
} // namespace webrtc
|