d8d3248d95
This reverts commit 4f36b7a478c2763463c7a9ea970548ec68bc3ea6. Reason for revert: Failing tests fixed. Original change's description: > Revert "Delete test/constants.h" > > This reverts commit 389b1672a32f2dd49af6c6ed40e8ddf394b986de. > > Reason for revert: Causes failure (and empty result list) in CallPerfTest.PadsToMinTransmitBitrate > > Original change's description: > > Delete test/constants.h > > > > It's not possible to use constants.h for all RTP extensions > > after the number of extensions exceeds 14, which is the maximum > > number of one-byte RTP extensions. This is because some extensions > > would have to be assigned a number greater than 14, even if the > > test only involves 14 extensions or less. > > > > For uniformity's sake, this CL also edits some files to use an > > enum as the files involved in this CL, rather than free-floating > > const-ints. > > > > Bug: webrtc:10288 > > Change-Id: Ib5e58ad72c4d3756f4c4f6521f140ec59617f3f5 > > Reviewed-on: https://webrtc-review.googlesource.com/c/123048 > > Commit-Queue: Elad Alon <eladalon@webrtc.org> > > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > > Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> > > Reviewed-by: Erik Språng <sprang@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#26728} > > TBR=danilchap@webrtc.org,kwiberg@webrtc.org,eladalon@webrtc.org,sprang@webrtc.org > > Bug: webrtc:10288, chromium:933127 > Change-Id: If1de0bd8992137c52bf0b877b3cb0a2bafc809d4 > Reviewed-on: https://webrtc-review.googlesource.com/c/123381 > Commit-Queue: Oleh Prypin <oprypin@webrtc.org> > Reviewed-by: Oleh Prypin <oprypin@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#26744} TBR=danilchap@webrtc.org,oprypin@webrtc.org,kwiberg@webrtc.org,eladalon@webrtc.org,sprang@webrtc.org Change-Id: I65e391325d3a6df6db3c0739185e2002e70fb954 Bug: webrtc:10288, chromium:933127 Reviewed-on: https://webrtc-review.googlesource.com/c/123384 Reviewed-by: Elad Alon <eladalon@webrtc.org> Commit-Queue: Elad Alon <eladalon@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26750}
90 lines
3.2 KiB
C++
90 lines
3.2 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/video_coding/codecs/vp8/include/vp8.h"
|
|
#include "test/call_test.h"
|
|
#include "test/field_trial.h"
|
|
#include "test/gtest.h"
|
|
|
|
namespace webrtc {
|
|
namespace {
|
|
enum : int { // The first valid value is 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,
|
|
public rtc::VideoSinkInterface<VideoFrame> {
|
|
public:
|
|
DecryptedFrameObserver()
|
|
: EndToEndTest(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 = 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);
|
|
decoder.decoder_factory = &decoder_factory_;
|
|
for (auto& recv_config : *receive_configs) {
|
|
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;
|
|
}
|
|
}
|
|
|
|
// Validate that rotation is preserved.
|
|
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_;
|
|
} test;
|
|
|
|
RunBaseTest(&test);
|
|
}
|
|
} // namespace webrtc
|