2018-11-30 16:18:26 -08:00
|
|
|
/*
|
|
|
|
|
* Copyright (c) 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 "video/buffered_frame_decryptor.h"
|
|
|
|
|
|
|
|
|
|
#include <map>
|
|
|
|
|
#include <memory>
|
2024-10-01 10:50:45 +02:00
|
|
|
#include <optional>
|
2018-11-30 16:18:26 -08:00
|
|
|
#include <vector>
|
|
|
|
|
|
|
|
|
|
#include "api/test/mock_frame_decryptor.h"
|
|
|
|
|
#include "modules/video_coding/packet_buffer.h"
|
|
|
|
|
#include "system_wrappers/include/clock.h"
|
|
|
|
|
#include "test/gmock.h"
|
|
|
|
|
#include "test/gtest.h"
|
2022-03-14 12:52:48 +01:00
|
|
|
#include "test/scoped_key_value_config.h"
|
2018-11-30 16:18:26 -08:00
|
|
|
|
|
|
|
|
using ::testing::Return;
|
|
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
namespace {
|
|
|
|
|
|
Reland "Refactor FrameDecryptorInterface::Decrypt to use new API."
This reverts commit 7dd83e2bf73a7f1746c5ee976939bf52e19fa8be.
Reason for revert: This wasn't the cause of the break.
Original change's description:
> Revert "Refactor FrameDecryptorInterface::Decrypt to use new API."
>
> This reverts commit 642aa81f7d5cc55d5b99e2abc51327eed9d40195.
>
> Reason for revert: Speculative revert. The chromium roll is failing:
> https://ci.chromium.org/p/chromium/builders/try/linux-rel/64388
> But I can't figure out exactly what is failing, this looks suspecious.
>
> Original change's description:
> > Refactor FrameDecryptorInterface::Decrypt to use new API.
> >
> > This change refactors the FrameDecryptorInterface to use the new API. The new
> > API surface simply moves bytes_written to the return type and implements a
> > simple Status type.
> >
> > Bug: webrtc:10512
> > Change-Id: I622c5d344d58e618853c94c2f691cf7c8fb73a36
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131460
> > Reviewed-by: Steve Anton <steveanton@webrtc.org>
> > Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> > Commit-Queue: Benjamin Wright <benwright@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#27497}
>
> TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org
>
> Change-Id: Ia9ec70263762c34671af13f0d519e636eb8473cd
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:10512
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132013
> Reviewed-by: Henrik Boström <hbos@webrtc.org>
> Commit-Queue: Henrik Boström <hbos@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27510}
TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,hbos@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org
Change-Id: I8e4b7965cf1d1a1554c3b46e6245f5ad0d2dcbb4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10512
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131982
Reviewed-by: Benjamin Wright <benwright@webrtc.org>
Commit-Queue: Benjamin Wright <benwright@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27529}
2019-04-09 20:08:41 +00:00
|
|
|
FrameDecryptorInterface::Result DecryptSuccess() {
|
|
|
|
|
return FrameDecryptorInterface::Result(FrameDecryptorInterface::Status::kOk,
|
|
|
|
|
0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
FrameDecryptorInterface::Result DecryptFail() {
|
|
|
|
|
return FrameDecryptorInterface::Result(
|
|
|
|
|
FrameDecryptorInterface::Status::kFailedToDecrypt, 0);
|
|
|
|
|
}
|
|
|
|
|
|
2018-11-30 16:18:26 -08:00
|
|
|
} // namespace
|
|
|
|
|
|
2019-10-22 17:12:42 +02:00
|
|
|
class BufferedFrameDecryptorTest : public ::testing::Test,
|
|
|
|
|
public OnDecryptedFrameCallback,
|
|
|
|
|
public OnDecryptionStatusChangeCallback {
|
2018-11-30 16:18:26 -08:00
|
|
|
public:
|
|
|
|
|
// Implements the OnDecryptedFrameCallbackInterface
|
2021-03-23 12:00:49 +01:00
|
|
|
void OnDecryptedFrame(std::unique_ptr<RtpFrameObject> frame) override {
|
2018-11-30 16:18:26 -08:00
|
|
|
decrypted_frame_call_count_++;
|
|
|
|
|
}
|
|
|
|
|
|
Reland "Refactor FrameDecryptorInterface::Decrypt to use new API."
This reverts commit 7dd83e2bf73a7f1746c5ee976939bf52e19fa8be.
Reason for revert: This wasn't the cause of the break.
Original change's description:
> Revert "Refactor FrameDecryptorInterface::Decrypt to use new API."
>
> This reverts commit 642aa81f7d5cc55d5b99e2abc51327eed9d40195.
>
> Reason for revert: Speculative revert. The chromium roll is failing:
> https://ci.chromium.org/p/chromium/builders/try/linux-rel/64388
> But I can't figure out exactly what is failing, this looks suspecious.
>
> Original change's description:
> > Refactor FrameDecryptorInterface::Decrypt to use new API.
> >
> > This change refactors the FrameDecryptorInterface to use the new API. The new
> > API surface simply moves bytes_written to the return type and implements a
> > simple Status type.
> >
> > Bug: webrtc:10512
> > Change-Id: I622c5d344d58e618853c94c2f691cf7c8fb73a36
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131460
> > Reviewed-by: Steve Anton <steveanton@webrtc.org>
> > Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> > Commit-Queue: Benjamin Wright <benwright@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#27497}
>
> TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org
>
> Change-Id: Ia9ec70263762c34671af13f0d519e636eb8473cd
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:10512
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132013
> Reviewed-by: Henrik Boström <hbos@webrtc.org>
> Commit-Queue: Henrik Boström <hbos@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27510}
TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,hbos@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org
Change-Id: I8e4b7965cf1d1a1554c3b46e6245f5ad0d2dcbb4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10512
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131982
Reviewed-by: Benjamin Wright <benwright@webrtc.org>
Commit-Queue: Benjamin Wright <benwright@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27529}
2019-04-09 20:08:41 +00:00
|
|
|
void OnDecryptionStatusChange(FrameDecryptorInterface::Status status) {
|
2019-03-01 11:01:59 -08:00
|
|
|
++decryption_status_change_count_;
|
|
|
|
|
}
|
|
|
|
|
|
2018-11-30 16:18:26 -08:00
|
|
|
// Returns a new fake RtpFrameObject it abstracts the difficult construction
|
|
|
|
|
// of the RtpFrameObject to simplify testing.
|
2021-03-23 12:00:49 +01:00
|
|
|
std::unique_ptr<RtpFrameObject> CreateRtpFrameObject(bool key_frame) {
|
2018-11-30 16:18:26 -08:00
|
|
|
seq_num_++;
|
2020-02-12 19:25:57 +01:00
|
|
|
RTPVideoHeader rtp_video_header;
|
|
|
|
|
rtp_video_header.generic.emplace();
|
2018-11-30 16:18:26 -08:00
|
|
|
|
2019-09-26 16:59:45 +02:00
|
|
|
// clang-format off
|
2021-03-23 12:00:49 +01:00
|
|
|
return std::make_unique<RtpFrameObject>(
|
2019-09-26 16:59:45 +02:00
|
|
|
seq_num_,
|
|
|
|
|
seq_num_,
|
|
|
|
|
/*markerBit=*/true,
|
|
|
|
|
/*times_nacked=*/0,
|
|
|
|
|
/*first_packet_received_time=*/0,
|
|
|
|
|
/*last_packet_received_time=*/0,
|
|
|
|
|
/*rtp_timestamp=*/0,
|
|
|
|
|
/*ntp_time_ms=*/0,
|
|
|
|
|
VideoSendTiming(),
|
|
|
|
|
/*payload_type=*/0,
|
|
|
|
|
kVideoCodecGeneric,
|
|
|
|
|
kVideoRotation_0,
|
|
|
|
|
VideoContentType::UNSPECIFIED,
|
2020-02-12 19:25:57 +01:00
|
|
|
rtp_video_header,
|
2024-08-29 13:00:40 +00:00
|
|
|
/*color_space=*/std::nullopt,
|
2024-10-01 10:50:45 +02:00
|
|
|
/*frame_instrumentation_data=*/std::nullopt,
|
2019-09-26 16:59:45 +02:00
|
|
|
RtpPacketInfos(),
|
2019-09-20 17:57:15 +02:00
|
|
|
EncodedImageBuffer::Create(/*size=*/0));
|
2019-09-26 16:59:45 +02:00
|
|
|
// clang-format on
|
2018-11-30 16:18:26 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
protected:
|
2019-09-20 17:57:15 +02:00
|
|
|
BufferedFrameDecryptorTest() {
|
2018-11-30 16:18:26 -08:00
|
|
|
fake_packet_data_ = std::vector<uint8_t>(100);
|
|
|
|
|
decrypted_frame_call_count_ = 0;
|
2019-03-01 11:01:59 -08:00
|
|
|
decryption_status_change_count_ = 0;
|
2018-11-30 16:18:26 -08:00
|
|
|
seq_num_ = 0;
|
2021-04-22 19:21:43 +02:00
|
|
|
mock_frame_decryptor_ = rtc::make_ref_counted<MockFrameDecryptor>();
|
2019-04-03 10:44:18 -07:00
|
|
|
buffered_frame_decryptor_ =
|
2022-03-14 12:52:48 +01:00
|
|
|
std::make_unique<BufferedFrameDecryptor>(this, this, field_trials_);
|
2022-01-13 13:58:46 +01:00
|
|
|
buffered_frame_decryptor_->SetFrameDecryptor(mock_frame_decryptor_);
|
2018-11-30 16:18:26 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const size_t kMaxStashedFrames;
|
|
|
|
|
|
2022-03-14 12:52:48 +01:00
|
|
|
test::ScopedKeyValueConfig field_trials_;
|
2018-11-30 16:18:26 -08:00
|
|
|
std::vector<uint8_t> fake_packet_data_;
|
|
|
|
|
rtc::scoped_refptr<MockFrameDecryptor> mock_frame_decryptor_;
|
|
|
|
|
std::unique_ptr<BufferedFrameDecryptor> buffered_frame_decryptor_;
|
|
|
|
|
size_t decrypted_frame_call_count_;
|
2019-03-01 11:01:59 -08:00
|
|
|
size_t decryption_status_change_count_ = 0;
|
2018-11-30 16:18:26 -08:00
|
|
|
uint16_t seq_num_;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const size_t BufferedFrameDecryptorTest::kMaxStashedFrames = 24;
|
|
|
|
|
|
|
|
|
|
// Callback should always be triggered on a successful decryption.
|
|
|
|
|
TEST_F(BufferedFrameDecryptorTest, CallbackCalledOnSuccessfulDecryption) {
|
Reland "Refactor FrameDecryptorInterface::Decrypt to use new API."
This reverts commit 7dd83e2bf73a7f1746c5ee976939bf52e19fa8be.
Reason for revert: This wasn't the cause of the break.
Original change's description:
> Revert "Refactor FrameDecryptorInterface::Decrypt to use new API."
>
> This reverts commit 642aa81f7d5cc55d5b99e2abc51327eed9d40195.
>
> Reason for revert: Speculative revert. The chromium roll is failing:
> https://ci.chromium.org/p/chromium/builders/try/linux-rel/64388
> But I can't figure out exactly what is failing, this looks suspecious.
>
> Original change's description:
> > Refactor FrameDecryptorInterface::Decrypt to use new API.
> >
> > This change refactors the FrameDecryptorInterface to use the new API. The new
> > API surface simply moves bytes_written to the return type and implements a
> > simple Status type.
> >
> > Bug: webrtc:10512
> > Change-Id: I622c5d344d58e618853c94c2f691cf7c8fb73a36
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131460
> > Reviewed-by: Steve Anton <steveanton@webrtc.org>
> > Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> > Commit-Queue: Benjamin Wright <benwright@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#27497}
>
> TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org
>
> Change-Id: Ia9ec70263762c34671af13f0d519e636eb8473cd
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:10512
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132013
> Reviewed-by: Henrik Boström <hbos@webrtc.org>
> Commit-Queue: Henrik Boström <hbos@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27510}
TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,hbos@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org
Change-Id: I8e4b7965cf1d1a1554c3b46e6245f5ad0d2dcbb4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10512
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131982
Reviewed-by: Benjamin Wright <benwright@webrtc.org>
Commit-Queue: Benjamin Wright <benwright@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27529}
2019-04-09 20:08:41 +00:00
|
|
|
EXPECT_CALL(*mock_frame_decryptor_, Decrypt)
|
|
|
|
|
.Times(1)
|
|
|
|
|
.WillOnce(Return(DecryptSuccess()));
|
2018-11-30 16:18:26 -08:00
|
|
|
EXPECT_CALL(*mock_frame_decryptor_, GetMaxPlaintextByteSize)
|
|
|
|
|
.Times(1)
|
|
|
|
|
.WillOnce(Return(0));
|
|
|
|
|
buffered_frame_decryptor_->ManageEncryptedFrame(CreateRtpFrameObject(true));
|
|
|
|
|
EXPECT_EQ(decrypted_frame_call_count_, static_cast<size_t>(1));
|
2019-03-01 11:01:59 -08:00
|
|
|
EXPECT_EQ(decryption_status_change_count_, static_cast<size_t>(1));
|
2018-11-30 16:18:26 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// An initial fail to decrypt should not trigger the callback.
|
|
|
|
|
TEST_F(BufferedFrameDecryptorTest, CallbackNotCalledOnFailedDecryption) {
|
Reland "Refactor FrameDecryptorInterface::Decrypt to use new API."
This reverts commit 7dd83e2bf73a7f1746c5ee976939bf52e19fa8be.
Reason for revert: This wasn't the cause of the break.
Original change's description:
> Revert "Refactor FrameDecryptorInterface::Decrypt to use new API."
>
> This reverts commit 642aa81f7d5cc55d5b99e2abc51327eed9d40195.
>
> Reason for revert: Speculative revert. The chromium roll is failing:
> https://ci.chromium.org/p/chromium/builders/try/linux-rel/64388
> But I can't figure out exactly what is failing, this looks suspecious.
>
> Original change's description:
> > Refactor FrameDecryptorInterface::Decrypt to use new API.
> >
> > This change refactors the FrameDecryptorInterface to use the new API. The new
> > API surface simply moves bytes_written to the return type and implements a
> > simple Status type.
> >
> > Bug: webrtc:10512
> > Change-Id: I622c5d344d58e618853c94c2f691cf7c8fb73a36
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131460
> > Reviewed-by: Steve Anton <steveanton@webrtc.org>
> > Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> > Commit-Queue: Benjamin Wright <benwright@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#27497}
>
> TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org
>
> Change-Id: Ia9ec70263762c34671af13f0d519e636eb8473cd
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:10512
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132013
> Reviewed-by: Henrik Boström <hbos@webrtc.org>
> Commit-Queue: Henrik Boström <hbos@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27510}
TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,hbos@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org
Change-Id: I8e4b7965cf1d1a1554c3b46e6245f5ad0d2dcbb4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10512
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131982
Reviewed-by: Benjamin Wright <benwright@webrtc.org>
Commit-Queue: Benjamin Wright <benwright@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27529}
2019-04-09 20:08:41 +00:00
|
|
|
EXPECT_CALL(*mock_frame_decryptor_, Decrypt)
|
|
|
|
|
.Times(1)
|
|
|
|
|
.WillOnce(Return(DecryptFail()));
|
2018-11-30 16:18:26 -08:00
|
|
|
EXPECT_CALL(*mock_frame_decryptor_, GetMaxPlaintextByteSize)
|
|
|
|
|
.Times(1)
|
|
|
|
|
.WillOnce(Return(0));
|
|
|
|
|
buffered_frame_decryptor_->ManageEncryptedFrame(CreateRtpFrameObject(true));
|
|
|
|
|
EXPECT_EQ(decrypted_frame_call_count_, static_cast<size_t>(0));
|
2019-03-01 11:01:59 -08:00
|
|
|
EXPECT_EQ(decryption_status_change_count_, static_cast<size_t>(1));
|
2018-11-30 16:18:26 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Initial failures should be stored and retried after the first successful
|
|
|
|
|
// decryption.
|
|
|
|
|
TEST_F(BufferedFrameDecryptorTest, DelayedCallbackOnBufferedFrames) {
|
|
|
|
|
EXPECT_CALL(*mock_frame_decryptor_, Decrypt)
|
|
|
|
|
.Times(3)
|
Reland "Refactor FrameDecryptorInterface::Decrypt to use new API."
This reverts commit 7dd83e2bf73a7f1746c5ee976939bf52e19fa8be.
Reason for revert: This wasn't the cause of the break.
Original change's description:
> Revert "Refactor FrameDecryptorInterface::Decrypt to use new API."
>
> This reverts commit 642aa81f7d5cc55d5b99e2abc51327eed9d40195.
>
> Reason for revert: Speculative revert. The chromium roll is failing:
> https://ci.chromium.org/p/chromium/builders/try/linux-rel/64388
> But I can't figure out exactly what is failing, this looks suspecious.
>
> Original change's description:
> > Refactor FrameDecryptorInterface::Decrypt to use new API.
> >
> > This change refactors the FrameDecryptorInterface to use the new API. The new
> > API surface simply moves bytes_written to the return type and implements a
> > simple Status type.
> >
> > Bug: webrtc:10512
> > Change-Id: I622c5d344d58e618853c94c2f691cf7c8fb73a36
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131460
> > Reviewed-by: Steve Anton <steveanton@webrtc.org>
> > Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> > Commit-Queue: Benjamin Wright <benwright@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#27497}
>
> TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org
>
> Change-Id: Ia9ec70263762c34671af13f0d519e636eb8473cd
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:10512
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132013
> Reviewed-by: Henrik Boström <hbos@webrtc.org>
> Commit-Queue: Henrik Boström <hbos@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27510}
TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,hbos@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org
Change-Id: I8e4b7965cf1d1a1554c3b46e6245f5ad0d2dcbb4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10512
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131982
Reviewed-by: Benjamin Wright <benwright@webrtc.org>
Commit-Queue: Benjamin Wright <benwright@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27529}
2019-04-09 20:08:41 +00:00
|
|
|
.WillOnce(Return(DecryptFail()))
|
|
|
|
|
.WillOnce(Return(DecryptSuccess()))
|
|
|
|
|
.WillOnce(Return(DecryptSuccess()));
|
2018-11-30 16:18:26 -08:00
|
|
|
EXPECT_CALL(*mock_frame_decryptor_, GetMaxPlaintextByteSize)
|
|
|
|
|
.Times(3)
|
|
|
|
|
.WillRepeatedly(Return(0));
|
|
|
|
|
|
|
|
|
|
// The first decrypt will fail stashing the first frame.
|
|
|
|
|
buffered_frame_decryptor_->ManageEncryptedFrame(CreateRtpFrameObject(true));
|
|
|
|
|
EXPECT_EQ(decrypted_frame_call_count_, static_cast<size_t>(0));
|
2019-03-01 11:01:59 -08:00
|
|
|
EXPECT_EQ(decryption_status_change_count_, static_cast<size_t>(1));
|
2018-11-30 16:18:26 -08:00
|
|
|
// The second call will succeed playing back both frames.
|
|
|
|
|
buffered_frame_decryptor_->ManageEncryptedFrame(CreateRtpFrameObject(false));
|
|
|
|
|
EXPECT_EQ(decrypted_frame_call_count_, static_cast<size_t>(2));
|
2019-03-01 11:01:59 -08:00
|
|
|
EXPECT_EQ(decryption_status_change_count_, static_cast<size_t>(2));
|
2018-11-30 16:18:26 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Subsequent failure to decrypts after the first successful decryption should
|
|
|
|
|
// fail to decryptk
|
|
|
|
|
TEST_F(BufferedFrameDecryptorTest, FTDDiscardedAfterFirstSuccess) {
|
|
|
|
|
EXPECT_CALL(*mock_frame_decryptor_, Decrypt)
|
|
|
|
|
.Times(4)
|
Reland "Refactor FrameDecryptorInterface::Decrypt to use new API."
This reverts commit 7dd83e2bf73a7f1746c5ee976939bf52e19fa8be.
Reason for revert: This wasn't the cause of the break.
Original change's description:
> Revert "Refactor FrameDecryptorInterface::Decrypt to use new API."
>
> This reverts commit 642aa81f7d5cc55d5b99e2abc51327eed9d40195.
>
> Reason for revert: Speculative revert. The chromium roll is failing:
> https://ci.chromium.org/p/chromium/builders/try/linux-rel/64388
> But I can't figure out exactly what is failing, this looks suspecious.
>
> Original change's description:
> > Refactor FrameDecryptorInterface::Decrypt to use new API.
> >
> > This change refactors the FrameDecryptorInterface to use the new API. The new
> > API surface simply moves bytes_written to the return type and implements a
> > simple Status type.
> >
> > Bug: webrtc:10512
> > Change-Id: I622c5d344d58e618853c94c2f691cf7c8fb73a36
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131460
> > Reviewed-by: Steve Anton <steveanton@webrtc.org>
> > Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> > Commit-Queue: Benjamin Wright <benwright@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#27497}
>
> TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org
>
> Change-Id: Ia9ec70263762c34671af13f0d519e636eb8473cd
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:10512
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132013
> Reviewed-by: Henrik Boström <hbos@webrtc.org>
> Commit-Queue: Henrik Boström <hbos@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27510}
TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,hbos@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org
Change-Id: I8e4b7965cf1d1a1554c3b46e6245f5ad0d2dcbb4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10512
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131982
Reviewed-by: Benjamin Wright <benwright@webrtc.org>
Commit-Queue: Benjamin Wright <benwright@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27529}
2019-04-09 20:08:41 +00:00
|
|
|
.WillOnce(Return(DecryptFail()))
|
|
|
|
|
.WillOnce(Return(DecryptSuccess()))
|
|
|
|
|
.WillOnce(Return(DecryptSuccess()))
|
|
|
|
|
.WillOnce(Return(DecryptFail()));
|
2018-11-30 16:18:26 -08:00
|
|
|
EXPECT_CALL(*mock_frame_decryptor_, GetMaxPlaintextByteSize)
|
|
|
|
|
.Times(4)
|
|
|
|
|
.WillRepeatedly(Return(0));
|
|
|
|
|
|
|
|
|
|
// The first decrypt will fail stashing the first frame.
|
|
|
|
|
buffered_frame_decryptor_->ManageEncryptedFrame(CreateRtpFrameObject(true));
|
|
|
|
|
EXPECT_EQ(decrypted_frame_call_count_, static_cast<size_t>(0));
|
2019-03-01 11:01:59 -08:00
|
|
|
EXPECT_EQ(decryption_status_change_count_, static_cast<size_t>(1));
|
2018-11-30 16:18:26 -08:00
|
|
|
// The second call will succeed playing back both frames.
|
|
|
|
|
buffered_frame_decryptor_->ManageEncryptedFrame(CreateRtpFrameObject(false));
|
|
|
|
|
EXPECT_EQ(decrypted_frame_call_count_, static_cast<size_t>(2));
|
2019-03-01 11:01:59 -08:00
|
|
|
EXPECT_EQ(decryption_status_change_count_, static_cast<size_t>(2));
|
2018-11-30 16:18:26 -08:00
|
|
|
// A new failure call will not result in an additional decrypted frame
|
|
|
|
|
// callback.
|
|
|
|
|
buffered_frame_decryptor_->ManageEncryptedFrame(CreateRtpFrameObject(true));
|
|
|
|
|
EXPECT_EQ(decrypted_frame_call_count_, static_cast<size_t>(2));
|
2019-03-01 11:01:59 -08:00
|
|
|
EXPECT_EQ(decryption_status_change_count_, static_cast<size_t>(3));
|
2018-11-30 16:18:26 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Validate that the maximum number of stashed frames cannot be exceeded even if
|
|
|
|
|
// more than its maximum arrives before the first successful decryption.
|
|
|
|
|
TEST_F(BufferedFrameDecryptorTest, MaximumNumberOfFramesStored) {
|
|
|
|
|
const size_t failed_to_decrypt_count = kMaxStashedFrames * 2;
|
|
|
|
|
EXPECT_CALL(*mock_frame_decryptor_, Decrypt)
|
|
|
|
|
.Times(failed_to_decrypt_count)
|
Reland "Refactor FrameDecryptorInterface::Decrypt to use new API."
This reverts commit 7dd83e2bf73a7f1746c5ee976939bf52e19fa8be.
Reason for revert: This wasn't the cause of the break.
Original change's description:
> Revert "Refactor FrameDecryptorInterface::Decrypt to use new API."
>
> This reverts commit 642aa81f7d5cc55d5b99e2abc51327eed9d40195.
>
> Reason for revert: Speculative revert. The chromium roll is failing:
> https://ci.chromium.org/p/chromium/builders/try/linux-rel/64388
> But I can't figure out exactly what is failing, this looks suspecious.
>
> Original change's description:
> > Refactor FrameDecryptorInterface::Decrypt to use new API.
> >
> > This change refactors the FrameDecryptorInterface to use the new API. The new
> > API surface simply moves bytes_written to the return type and implements a
> > simple Status type.
> >
> > Bug: webrtc:10512
> > Change-Id: I622c5d344d58e618853c94c2f691cf7c8fb73a36
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131460
> > Reviewed-by: Steve Anton <steveanton@webrtc.org>
> > Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> > Commit-Queue: Benjamin Wright <benwright@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#27497}
>
> TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org
>
> Change-Id: Ia9ec70263762c34671af13f0d519e636eb8473cd
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:10512
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132013
> Reviewed-by: Henrik Boström <hbos@webrtc.org>
> Commit-Queue: Henrik Boström <hbos@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27510}
TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,hbos@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org
Change-Id: I8e4b7965cf1d1a1554c3b46e6245f5ad0d2dcbb4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10512
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131982
Reviewed-by: Benjamin Wright <benwright@webrtc.org>
Commit-Queue: Benjamin Wright <benwright@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27529}
2019-04-09 20:08:41 +00:00
|
|
|
.WillRepeatedly(Return(DecryptFail()));
|
2018-11-30 16:18:26 -08:00
|
|
|
EXPECT_CALL(*mock_frame_decryptor_, GetMaxPlaintextByteSize)
|
|
|
|
|
.WillRepeatedly(Return(0));
|
|
|
|
|
|
|
|
|
|
for (size_t i = 0; i < failed_to_decrypt_count; ++i) {
|
|
|
|
|
buffered_frame_decryptor_->ManageEncryptedFrame(CreateRtpFrameObject(true));
|
|
|
|
|
}
|
|
|
|
|
EXPECT_EQ(decrypted_frame_call_count_, static_cast<size_t>(0));
|
2019-03-01 11:01:59 -08:00
|
|
|
EXPECT_EQ(decryption_status_change_count_, static_cast<size_t>(1));
|
2018-11-30 16:18:26 -08:00
|
|
|
|
|
|
|
|
EXPECT_CALL(*mock_frame_decryptor_, Decrypt)
|
|
|
|
|
.Times(kMaxStashedFrames + 1)
|
Reland "Refactor FrameDecryptorInterface::Decrypt to use new API."
This reverts commit 7dd83e2bf73a7f1746c5ee976939bf52e19fa8be.
Reason for revert: This wasn't the cause of the break.
Original change's description:
> Revert "Refactor FrameDecryptorInterface::Decrypt to use new API."
>
> This reverts commit 642aa81f7d5cc55d5b99e2abc51327eed9d40195.
>
> Reason for revert: Speculative revert. The chromium roll is failing:
> https://ci.chromium.org/p/chromium/builders/try/linux-rel/64388
> But I can't figure out exactly what is failing, this looks suspecious.
>
> Original change's description:
> > Refactor FrameDecryptorInterface::Decrypt to use new API.
> >
> > This change refactors the FrameDecryptorInterface to use the new API. The new
> > API surface simply moves bytes_written to the return type and implements a
> > simple Status type.
> >
> > Bug: webrtc:10512
> > Change-Id: I622c5d344d58e618853c94c2f691cf7c8fb73a36
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131460
> > Reviewed-by: Steve Anton <steveanton@webrtc.org>
> > Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> > Commit-Queue: Benjamin Wright <benwright@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#27497}
>
> TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org
>
> Change-Id: Ia9ec70263762c34671af13f0d519e636eb8473cd
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:10512
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132013
> Reviewed-by: Henrik Boström <hbos@webrtc.org>
> Commit-Queue: Henrik Boström <hbos@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27510}
TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,hbos@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org
Change-Id: I8e4b7965cf1d1a1554c3b46e6245f5ad0d2dcbb4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10512
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131982
Reviewed-by: Benjamin Wright <benwright@webrtc.org>
Commit-Queue: Benjamin Wright <benwright@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27529}
2019-04-09 20:08:41 +00:00
|
|
|
.WillRepeatedly(Return(DecryptSuccess()));
|
2018-11-30 16:18:26 -08:00
|
|
|
buffered_frame_decryptor_->ManageEncryptedFrame(CreateRtpFrameObject(true));
|
|
|
|
|
EXPECT_EQ(decrypted_frame_call_count_, kMaxStashedFrames + 1);
|
2019-03-01 11:01:59 -08:00
|
|
|
EXPECT_EQ(decryption_status_change_count_, static_cast<size_t>(2));
|
2018-11-30 16:18:26 -08:00
|
|
|
}
|
|
|
|
|
|
2019-04-03 10:44:18 -07:00
|
|
|
// Verifies if a BufferedFrameDecryptor is attached but has no FrameDecryptor
|
|
|
|
|
// attached it will still store frames up to the frame max.
|
|
|
|
|
TEST_F(BufferedFrameDecryptorTest, FramesStoredIfDecryptorNull) {
|
|
|
|
|
buffered_frame_decryptor_->SetFrameDecryptor(nullptr);
|
|
|
|
|
for (size_t i = 0; i < (2 * kMaxStashedFrames); ++i) {
|
|
|
|
|
buffered_frame_decryptor_->ManageEncryptedFrame(CreateRtpFrameObject(true));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
EXPECT_CALL(*mock_frame_decryptor_, Decrypt)
|
|
|
|
|
.Times(kMaxStashedFrames + 1)
|
Reland "Refactor FrameDecryptorInterface::Decrypt to use new API."
This reverts commit 7dd83e2bf73a7f1746c5ee976939bf52e19fa8be.
Reason for revert: This wasn't the cause of the break.
Original change's description:
> Revert "Refactor FrameDecryptorInterface::Decrypt to use new API."
>
> This reverts commit 642aa81f7d5cc55d5b99e2abc51327eed9d40195.
>
> Reason for revert: Speculative revert. The chromium roll is failing:
> https://ci.chromium.org/p/chromium/builders/try/linux-rel/64388
> But I can't figure out exactly what is failing, this looks suspecious.
>
> Original change's description:
> > Refactor FrameDecryptorInterface::Decrypt to use new API.
> >
> > This change refactors the FrameDecryptorInterface to use the new API. The new
> > API surface simply moves bytes_written to the return type and implements a
> > simple Status type.
> >
> > Bug: webrtc:10512
> > Change-Id: I622c5d344d58e618853c94c2f691cf7c8fb73a36
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131460
> > Reviewed-by: Steve Anton <steveanton@webrtc.org>
> > Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> > Commit-Queue: Benjamin Wright <benwright@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#27497}
>
> TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org
>
> Change-Id: Ia9ec70263762c34671af13f0d519e636eb8473cd
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:10512
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132013
> Reviewed-by: Henrik Boström <hbos@webrtc.org>
> Commit-Queue: Henrik Boström <hbos@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27510}
TBR=brandtr@webrtc.org,steveanton@webrtc.org,solenberg@webrtc.org,hbos@webrtc.org,ossu@webrtc.org,stefan@webrtc.org,benwright@webrtc.org
Change-Id: I8e4b7965cf1d1a1554c3b46e6245f5ad0d2dcbb4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10512
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131982
Reviewed-by: Benjamin Wright <benwright@webrtc.org>
Commit-Queue: Benjamin Wright <benwright@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27529}
2019-04-09 20:08:41 +00:00
|
|
|
.WillRepeatedly(Return(DecryptSuccess()));
|
2019-04-03 10:44:18 -07:00
|
|
|
EXPECT_CALL(*mock_frame_decryptor_, GetMaxPlaintextByteSize)
|
|
|
|
|
.WillRepeatedly(Return(0));
|
|
|
|
|
|
|
|
|
|
// Attach the frame decryptor at a later point after frames have arrived.
|
2022-01-13 13:58:46 +01:00
|
|
|
buffered_frame_decryptor_->SetFrameDecryptor(mock_frame_decryptor_);
|
2019-04-03 10:44:18 -07:00
|
|
|
|
|
|
|
|
// Next frame should trigger kMaxStashedFrame decryptions.
|
|
|
|
|
buffered_frame_decryptor_->ManageEncryptedFrame(CreateRtpFrameObject(true));
|
|
|
|
|
EXPECT_EQ(decrypted_frame_call_count_, kMaxStashedFrames + 1);
|
|
|
|
|
}
|
|
|
|
|
|
2018-11-30 16:18:26 -08:00
|
|
|
} // namespace webrtc
|