Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 00:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1516669 - Update fake-cdm to use CDM10 interface. r=cpearce

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D15520

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Bryce Van Dyk 2019-01-14 16:41:55 +00:00
parent e41e35bf8d
commit 53ec57bafc
6 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/media/fake-cdm/cdm-fake.cpp
View File

@ -47,11 +47,11 @@ CDM_API
void* CreateCdmInstance(int cdm_interface_version, const char* key_system,
uint32_t key_system_size,
GetCdmHostFunc get_cdm_host_func, void* user_data) {
if (cdm_interface_version != cdm::ContentDecryptionModule_9::kVersion) {
// Only support CDM version 9 currently.
if (cdm_interface_version != cdm::ContentDecryptionModule_10::kVersion) {
// Only support CDM version 10 currently.
return nullptr;
}
cdm::Host_9* host = static_cast<cdm::Host_9*>(
cdm::Host_10* host = static_cast<cdm::Host_10*>(
get_cdm_host_func(cdm_interface_version, user_data));
return new FakeDecryptor(host);
}

2
dom/media/fake-cdm/cdm-test-decryptor.cpp
View File

@ -72,7 +72,7 @@ class TestManager {
set<string> mTestIDs;
};
FakeDecryptor::FakeDecryptor(cdm::Host_9* aHost) : mHost(aHost) {
FakeDecryptor::FakeDecryptor(cdm::Host_10* aHost) : mHost(aHost) {
MOZ_ASSERT(!sInstance);
sInstance = this;
}

22
dom/media/fake-cdm/cdm-test-decryptor.h
View File

@ -10,12 +10,14 @@
#include <string>
#include "mozilla/Attributes.h"
class FakeDecryptor : public cdm::ContentDecryptionModule_9 {
class FakeDecryptor : public cdm::ContentDecryptionModule_10 {
public:
explicit FakeDecryptor(cdm::Host_9* aHost);
explicit FakeDecryptor(cdm::Host_10* aHost);
void Initialize(bool aAllowDistinctiveIdentifier,
bool aAllowPersistentState) override {}
void Initialize(bool aAllowDistinctiveIdentifier, bool aAllowPersistentState,
bool aUseHardwareSecureCodecs) override {
mHost->OnInitialized(true);
}
void GetStatusForPolicy(uint32_t aPromiseId,
const cdm::Policy& aPolicy) override {}
@ -45,18 +47,18 @@ class FakeDecryptor : public cdm::ContentDecryptionModule_9 {
void TimerExpired(void* aContext) override {}
cdm::Status Decrypt(const cdm::InputBuffer_1& aEncryptedBuffer,
cdm::Status Decrypt(const cdm::InputBuffer_2& aEncryptedBuffer,
cdm::DecryptedBlock* aDecryptedBuffer) override {
return cdm::Status::kDecodeError;
}
cdm::Status InitializeAudioDecoder(
const cdm::AudioDecoderConfig_1& aAudioDecoderConfig) override {
const cdm::AudioDecoderConfig_2& aAudioDecoderConfig) override {
return cdm::Status::kDecodeError;
}
cdm::Status InitializeVideoDecoder(
const cdm::VideoDecoderConfig_1& aVideoDecoderConfig) override {
const cdm::VideoDecoderConfig_2& aVideoDecoderConfig) override {
return cdm::Status::kDecodeError;
}
@ -64,13 +66,13 @@ class FakeDecryptor : public cdm::ContentDecryptionModule_9 {
void ResetDecoder(cdm::StreamType aDecoderType) override {}
cdm::Status DecryptAndDecodeFrame(const cdm::InputBuffer_1& aEncryptedBuffer,
cdm::Status DecryptAndDecodeFrame(const cdm::InputBuffer_2& aEncryptedBuffer,
cdm::VideoFrame* aVideoFrame) override {
return cdm::Status::kDecodeError;
}
cdm::Status DecryptAndDecodeSamples(
const cdm::InputBuffer_1& aEncryptedBuffer,
const cdm::InputBuffer_2& aEncryptedBuffer,
cdm::AudioFrames* aAudioFrame) override {
return cdm::Status::kDecodeError;
}
@ -92,7 +94,7 @@ class FakeDecryptor : public cdm::ContentDecryptionModule_9 {
static void Message(const std::string& aMessage);
cdm::Host_9* mHost;
cdm::Host_10* mHost;
static FakeDecryptor* sInstance;

14
dom/media/fake-cdm/cdm-test-storage.cpp
View File

@ -35,7 +35,7 @@ class WriteRecordClient : public FileIOClient {
void OnWriteComplete(Status aStatus) override { Done(aStatus); }
void Do(const string& aName, Host_9* aHost) {
void Do(const string& aName, Host_10* aHost) {
// Initialize the FileIO.
mFileIO = aHost->CreateFileIO(this);
mFileIO->Open(aName.c_str(), aName.size());
@ -68,7 +68,7 @@ class WriteRecordClient : public FileIOClient {
std::vector<uint8_t> mData;
};
void WriteRecord(Host_9* aHost, const std::string& aRecordName,
void WriteRecord(Host_10* aHost, const std::string& aRecordName,
const uint8_t* aData, uint32_t aNumBytes,
function<void()>&& aOnSuccess, function<void()>&& aOnFailure) {
// client will be delete in WriteRecordClient::Done
@ -77,7 +77,7 @@ void WriteRecord(Host_9* aHost, const std::string& aRecordName,
client->Do(aRecordName, aHost);
}
void WriteRecord(Host_9* aHost, const std::string& aRecordName,
void WriteRecord(Host_10* aHost, const std::string& aRecordName,
const std::string& aData, function<void()>&& aOnSuccess,
function<void()>&& aOnFailure) {
return WriteRecord(aHost, aRecordName, (const uint8_t*)aData.c_str(),
@ -106,7 +106,7 @@ class ReadRecordClient : public FileIOClient {
void OnWriteComplete(Status aStatus) override {}
void Do(const string& aName, Host_9* aHost) {
void Do(const string& aName, Host_10* aHost) {
mFileIO = aHost->CreateFileIO(this);
mFileIO->Open(aName.c_str(), aName.size());
}
@ -138,7 +138,7 @@ class ReadRecordClient : public FileIOClient {
};
void ReadRecord(
Host_9* aHost, const std::string& aRecordName,
Host_10* aHost, const std::string& aRecordName,
function<void(bool, const uint8_t*, uint32_t)>&& aOnReadComplete) {
// client will be delete in ReadRecordClient::Done
ReadRecordClient* client = new ReadRecordClient(move(aOnReadComplete));
@ -157,7 +157,7 @@ class OpenRecordClient : public FileIOClient {
void OnWriteComplete(Status aStatus) override {}
void Do(const string& aName, Host_9* aHost) {
void Do(const string& aName, Host_10* aHost) {
// Initialize the FileIO.
mFileIO = aHost->CreateFileIO(this);
mFileIO->Open(aName.c_str(), aName.size());
@ -189,7 +189,7 @@ class OpenRecordClient : public FileIOClient {
;
};
void OpenRecord(Host_9* aHost, const std::string& aRecordName,
void OpenRecord(Host_10* aHost, const std::string& aRecordName,
function<void(bool)>&& aOpenComplete) {
// client will be delete in OpenRecordClient::Done
OpenRecordClient* client = new OpenRecordClient(move(aOpenComplete));

8
dom/media/fake-cdm/cdm-test-storage.h
View File

@ -24,17 +24,17 @@ class ReadContinuation {
uint32_t aDataSize) = 0;
};
void WriteRecord(cdm::Host_9* aHost, const std::string& aRecordName,
void WriteRecord(cdm::Host_10* aHost, const std::string& aRecordName,
const std::string& aData, std::function<void()>&& aOnSuccess,
std::function<void()>&& aOnFailure);
void WriteRecord(cdm::Host_9* aHost, const std::string& aRecordName,
void WriteRecord(cdm::Host_10* aHost, const std::string& aRecordName,
const uint8_t* aData, uint32_t aNumBytes,
std::function<void()>&& aOnSuccess,
std::function<void()>&& aOnFailure);
void ReadRecord(
cdm::Host_9* aHost, const std::string& aRecordName,
cdm::Host_10* aHost, const std::string& aRecordName,
std::function<void(bool, const uint8_t*, uint32_t)>&& aOnReadComplete);
class OpenContinuation {
@ -43,6 +43,6 @@ class OpenContinuation {
virtual void operator()(bool aSuccess) = 0;
};
void OpenRecord(cdm::Host_9* aHost, const std::string& aRecordName,
void OpenRecord(cdm::Host_10* aHost, const std::string& aRecordName,
std::function<void(bool)>&& aOpenComplete);
#endif // TEST_CDM_STORAGE_H__

4
dom/media/fake-cdm/manifest.json
View File

@ -3,7 +3,7 @@
"description": "Fake CDM Plugin",
"version": "1",
"x-cdm-module-versions": "4",
"x-cdm-interface-versions": "9",
"x-cdm-host-versions": "9",
"x-cdm-interface-versions": "10",
"x-cdm-host-versions": "10",
"x-cdm-codecs": ""
}