7dd83e2bf7
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}
41 lines
1.2 KiB
C++
41 lines
1.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.
|
|
*/
|
|
|
|
#ifndef API_TEST_MOCK_FRAME_DECRYPTOR_H_
|
|
#define API_TEST_MOCK_FRAME_DECRYPTOR_H_
|
|
|
|
#include <vector>
|
|
|
|
#include "api/crypto/frame_decryptor_interface.h"
|
|
#include "test/gmock.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class MockFrameDecryptor : public FrameDecryptorInterface {
|
|
public:
|
|
MockFrameDecryptor();
|
|
~MockFrameDecryptor() override;
|
|
|
|
MOCK_METHOD6(Decrypt,
|
|
int(cricket::MediaType,
|
|
const std::vector<uint32_t>&,
|
|
rtc::ArrayView<const uint8_t>,
|
|
rtc::ArrayView<const uint8_t>,
|
|
rtc::ArrayView<uint8_t>,
|
|
size_t*));
|
|
|
|
MOCK_METHOD2(GetMaxPlaintextByteSize,
|
|
size_t(cricket::MediaType, size_t encrypted_frame_size));
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // API_TEST_MOCK_FRAME_DECRYPTOR_H_
|