8a9f3a8f53
This reverts commit f9e3bdd2ce410b18ca7e03b3754f94a18eb7ef3a. Reason for revert: reland with fix Original change's description: > Revert "Remove dependency of video_replay on TestADM." > > This reverts commit 01716663a9837a26fa292fe70fdea353cbd01a67. > > Reason for revert: breaking CallPerfTest > https://ci.chromium.org/ui/p/webrtc/builders/perf/Perf%20Android32%20(R%20Pixel5)/967/overview > > Original change's description: > > Remove dependency of video_replay on TestADM. > > > > This should remove requirement to build TestADM in chromium build. > > > > Bug: b/272350185, webrtc:15081 > > Change-Id: Iceb8862aa81099c22bd378ae692229f01ab3314c > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/302380 > > Reviewed-by: Henrik Andreassson <henrika@webrtc.org> > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > > Commit-Queue: Artem Titov <titovartem@webrtc.org> > > Cr-Commit-Position: refs/heads/main@{#39934} > > Bug: b/272350185, webrtc:15081 > Change-Id: I73aa0fd3c3d8c244d20e5f29f5792a4c7d7e4165 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/303160 > Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> > Owners-Override: Jeremy Leconte <jleconte@google.com> > Commit-Queue: Jeremy Leconte <jleconte@google.com> > Cr-Commit-Position: refs/heads/main@{#39939} Bug: b/272350185, webrtc:15081 Change-Id: I360ef3e140e60fc21d622480d1f3326e40a76f58 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/303400 Commit-Queue: Artem Titov <titovartem@webrtc.org> Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Commit-Queue: Henrik Andreassson <henrika@webrtc.org> Auto-Submit: Artem Titov <titovartem@webrtc.org> Cr-Commit-Position: refs/heads/main@{#39946}
94 lines
3.4 KiB
C++
94 lines
3.4 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"
|
|
#include "test/video_test_constants.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::VideoTestConstants::kDefaultTimeout),
|
|
encoder_factory_([] { return VP8Encoder::Create(); }) {}
|
|
|
|
private:
|
|
void ModifyVideoConfigs(
|
|
VideoSendStream::Config* send_config,
|
|
std::vector<VideoReceiveStreamInterface::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::VideoTestConstants::kVideoSendPayloadType;
|
|
send_config->frame_encryptor = new FakeFrameEncryptor();
|
|
send_config->crypto_options.sframe.require_frame_encryption = true;
|
|
encoder_config->codec_type = kVideoCodecVP8;
|
|
VideoReceiveStreamInterface::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 = rtc::make_ref_counted<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
|