Merge changes from topic "libdrmframework" am: 84a53822a1 am: 460618a6d1 am: c317c587d5
am: e25539a93f
Change-Id: Ib8636ca3d1a5e251de8a4ce3643f0f88dfe85234
gugelfrei
Dongwon Kang
5 years ago
committed by
android-build-merger
commit
cd8793a325
@ -1,143 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2018 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
//#define LOG_NDEBUG 0
|
||||
#define LOG_TAG "ClearFileSource"
|
||||
#include <utils/Log.h>
|
||||
|
||||
#include <datasource/ClearFileSource.h>
|
||||
#include <media/stagefright/foundation/ADebug.h>
|
||||
#include <media/stagefright/FoundationUtils.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
namespace android {
|
||||
|
||||
ClearFileSource::ClearFileSource(const char *filename)
|
||||
: mFd(-1),
|
||||
mOffset(0),
|
||||
mLength(-1),
|
||||
mName("<null>") {
|
||||
|
||||
if (filename) {
|
||||
mName = String8::format("FileSource(%s)", filename);
|
||||
}
|
||||
ALOGV("%s", filename);
|
||||
mFd = open(filename, O_LARGEFILE | O_RDONLY);
|
||||
|
||||
if (mFd >= 0) {
|
||||
mLength = lseek64(mFd, 0, SEEK_END);
|
||||
} else {
|
||||
ALOGE("Failed to open file '%s'. (%s)", filename, strerror(errno));
|
||||
}
|
||||
}
|
||||
|
||||
ClearFileSource::ClearFileSource(int fd, int64_t offset, int64_t length)
|
||||
: mFd(fd),
|
||||
mOffset(offset),
|
||||
mLength(length),
|
||||
mName("<null>") {
|
||||
ALOGV("fd=%d (%s), offset=%lld, length=%lld",
|
||||
fd, nameForFd(fd).c_str(), (long long) offset, (long long) length);
|
||||
|
||||
if (mOffset < 0) {
|
||||
mOffset = 0;
|
||||
}
|
||||
if (mLength < 0) {
|
||||
mLength = 0;
|
||||
}
|
||||
if (mLength > INT64_MAX - mOffset) {
|
||||
mLength = INT64_MAX - mOffset;
|
||||
}
|
||||
struct stat s;
|
||||
if (fstat(fd, &s) == 0) {
|
||||
if (mOffset > s.st_size) {
|
||||
mOffset = s.st_size;
|
||||
mLength = 0;
|
||||
}
|
||||
if (mOffset + mLength > s.st_size) {
|
||||
mLength = s.st_size - mOffset;
|
||||
}
|
||||
}
|
||||
if (mOffset != offset || mLength != length) {
|
||||
ALOGW("offset/length adjusted from %lld/%lld to %lld/%lld",
|
||||
(long long) offset, (long long) length,
|
||||
(long long) mOffset, (long long) mLength);
|
||||
}
|
||||
|
||||
mName = String8::format(
|
||||
"FileSource(fd(%s), %lld, %lld)",
|
||||
nameForFd(fd).c_str(),
|
||||
(long long) mOffset,
|
||||
(long long) mLength);
|
||||
|
||||
}
|
||||
|
||||
ClearFileSource::~ClearFileSource() {
|
||||
if (mFd >= 0) {
|
||||
::close(mFd);
|
||||
mFd = -1;
|
||||
}
|
||||
}
|
||||
|
||||
status_t ClearFileSource::initCheck() const {
|
||||
return mFd >= 0 ? OK : NO_INIT;
|
||||
}
|
||||
|
||||
ssize_t ClearFileSource::readAt(off64_t offset, void *data, size_t size) {
|
||||
if (mFd < 0) {
|
||||
return NO_INIT;
|
||||
}
|
||||
|
||||
Mutex::Autolock autoLock(mLock);
|
||||
if (mLength >= 0) {
|
||||
if (offset >= mLength) {
|
||||
return 0; // read beyond EOF.
|
||||
}
|
||||
uint64_t numAvailable = mLength - offset;
|
||||
if ((uint64_t)size > numAvailable) {
|
||||
size = numAvailable;
|
||||
}
|
||||
}
|
||||
return readAt_l(offset, data, size);
|
||||
}
|
||||
|
||||
ssize_t ClearFileSource::readAt_l(off64_t offset, void *data, size_t size) {
|
||||
off64_t result = lseek64(mFd, offset + mOffset, SEEK_SET);
|
||||
if (result == -1) {
|
||||
ALOGE("seek to %lld failed", (long long)(offset + mOffset));
|
||||
return UNKNOWN_ERROR;
|
||||
}
|
||||
|
||||
return ::read(mFd, data, size);
|
||||
}
|
||||
|
||||
status_t ClearFileSource::getSize(off64_t *size) {
|
||||
Mutex::Autolock autoLock(mLock);
|
||||
|
||||
if (mFd < 0) {
|
||||
return NO_INIT;
|
||||
}
|
||||
|
||||
*size = mLength;
|
||||
|
||||
return OK;
|
||||
}
|
||||
|
||||
} // namespace android
|
||||
@ -1,184 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2018 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
//#define LOG_NDEBUG 0
|
||||
#define LOG_TAG "ClearMediaHTTP"
|
||||
#include <utils/Log.h>
|
||||
|
||||
#include <datasource/ClearMediaHTTP.h>
|
||||
|
||||
#include <media/stagefright/foundation/ADebug.h>
|
||||
#include <media/stagefright/foundation/ALooper.h>
|
||||
#include <media/stagefright/FoundationUtils.h>
|
||||
|
||||
#include <media/MediaHTTPConnection.h>
|
||||
|
||||
namespace android {
|
||||
|
||||
ClearMediaHTTP::ClearMediaHTTP(const sp<MediaHTTPConnection> &conn)
|
||||
: mInitCheck((conn != NULL) ? OK : NO_INIT),
|
||||
mHTTPConnection(conn),
|
||||
mCachedSizeValid(false),
|
||||
mCachedSize(0ll) {
|
||||
}
|
||||
|
||||
ClearMediaHTTP::~ClearMediaHTTP() {
|
||||
}
|
||||
|
||||
status_t ClearMediaHTTP::connect(
|
||||
const char *uri,
|
||||
const KeyedVector<String8, String8> *headers,
|
||||
off64_t /* offset */) {
|
||||
if (mInitCheck != OK) {
|
||||
return mInitCheck;
|
||||
}
|
||||
|
||||
KeyedVector<String8, String8> extHeaders;
|
||||
if (headers != NULL) {
|
||||
extHeaders = *headers;
|
||||
}
|
||||
|
||||
if (extHeaders.indexOfKey(String8("User-Agent")) < 0) {
|
||||
extHeaders.add(String8("User-Agent"), String8(MakeUserAgent().c_str()));
|
||||
}
|
||||
|
||||
mLastURI = uri;
|
||||
// reconnect() calls with uri == old mLastURI.c_str(), which gets zapped
|
||||
// as part of the above assignment. Ensure no accidental later use.
|
||||
uri = NULL;
|
||||
|
||||
bool success = mHTTPConnection->connect(mLastURI.c_str(), &extHeaders);
|
||||
|
||||
mLastHeaders = extHeaders;
|
||||
|
||||
mCachedSizeValid = false;
|
||||
|
||||
if (success) {
|
||||
AString sanitized = uriDebugString(mLastURI);
|
||||
mName = String8::format("ClearMediaHTTP(%s)", sanitized.c_str());
|
||||
}
|
||||
|
||||
return success ? OK : UNKNOWN_ERROR;
|
||||
}
|
||||
|
||||
void ClearMediaHTTP::close() {
|
||||
disconnect();
|
||||
}
|
||||
|
||||
void ClearMediaHTTP::disconnect() {
|
||||
mName = String8("ClearMediaHTTP(<disconnected>)");
|
||||
if (mInitCheck != OK) {
|
||||
return;
|
||||
}
|
||||
|
||||
mHTTPConnection->disconnect();
|
||||
}
|
||||
|
||||
status_t ClearMediaHTTP::initCheck() const {
|
||||
return mInitCheck;
|
||||
}
|
||||
|
||||
ssize_t ClearMediaHTTP::readAt(off64_t offset, void *data, size_t size) {
|
||||
if (mInitCheck != OK) {
|
||||
return mInitCheck;
|
||||
}
|
||||
|
||||
int64_t startTimeUs = ALooper::GetNowUs();
|
||||
|
||||
size_t numBytesRead = 0;
|
||||
while (numBytesRead < size) {
|
||||
size_t copy = size - numBytesRead;
|
||||
|
||||
if (copy > 64 * 1024) {
|
||||
// limit the buffer sizes transferred across binder boundaries
|
||||
// to avoid spurious transaction failures.
|
||||
copy = 64 * 1024;
|
||||
}
|
||||
|
||||
ssize_t n = mHTTPConnection->readAt(
|
||||
offset + numBytesRead, (uint8_t *)data + numBytesRead, copy);
|
||||
|
||||
if (n < 0) {
|
||||
return n;
|
||||
} else if (n == 0) {
|
||||
break;
|
||||
}
|
||||
|
||||
numBytesRead += n;
|
||||
}
|
||||
|
||||
int64_t delayUs = ALooper::GetNowUs() - startTimeUs;
|
||||
|
||||
addBandwidthMeasurement(numBytesRead, delayUs);
|
||||
|
||||
return numBytesRead;
|
||||
}
|
||||
|
||||
status_t ClearMediaHTTP::getSize(off64_t *size) {
|
||||
if (mInitCheck != OK) {
|
||||
return mInitCheck;
|
||||
}
|
||||
|
||||
// Caching the returned size so that it stays valid even after a
|
||||
// disconnect. NuCachedSource2 relies on this.
|
||||
|
||||
if (!mCachedSizeValid) {
|
||||
mCachedSize = mHTTPConnection->getSize();
|
||||
mCachedSizeValid = true;
|
||||
}
|
||||
|
||||
*size = mCachedSize;
|
||||
|
||||
return *size < 0 ? *size : static_cast<status_t>(OK);
|
||||
}
|
||||
|
||||
uint32_t ClearMediaHTTP::flags() {
|
||||
return kWantsPrefetching | kIsHTTPBasedSource;
|
||||
}
|
||||
|
||||
status_t ClearMediaHTTP::reconnectAtOffset(off64_t offset) {
|
||||
return connect(mLastURI.c_str(), &mLastHeaders, offset);
|
||||
}
|
||||
|
||||
|
||||
String8 ClearMediaHTTP::getUri() {
|
||||
if (mInitCheck != OK) {
|
||||
return String8::empty();
|
||||
}
|
||||
|
||||
String8 uri;
|
||||
if (OK == mHTTPConnection->getUri(&uri)) {
|
||||
return uri;
|
||||
}
|
||||
return String8(mLastURI.c_str());
|
||||
}
|
||||
|
||||
String8 ClearMediaHTTP::getMIMEType() const {
|
||||
if (mInitCheck != OK) {
|
||||
return String8("application/octet-stream");
|
||||
}
|
||||
|
||||
String8 mimeType;
|
||||
status_t err = mHTTPConnection->getMIMEType(&mimeType);
|
||||
|
||||
if (err != OK) {
|
||||
return String8("application/octet-stream");
|
||||
}
|
||||
|
||||
return mimeType;
|
||||
}
|
||||
|
||||
} // namespace android
|
||||
@ -1,68 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2018 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef CLEAR_FILE_SOURCE_H_
|
||||
|
||||
#define CLEAR_FILE_SOURCE_H_
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include <media/DataSource.h>
|
||||
#include <media/stagefright/MediaErrors.h>
|
||||
#include <utils/threads.h>
|
||||
|
||||
namespace android {
|
||||
|
||||
class ClearFileSource : public DataSource {
|
||||
public:
|
||||
ClearFileSource(const char *filename);
|
||||
// ClearFileSource takes ownership and will close the fd
|
||||
ClearFileSource(int fd, int64_t offset, int64_t length);
|
||||
|
||||
virtual status_t initCheck() const;
|
||||
|
||||
virtual ssize_t readAt(off64_t offset, void *data, size_t size);
|
||||
|
||||
virtual status_t getSize(off64_t *size);
|
||||
|
||||
virtual uint32_t flags() {
|
||||
return kIsLocalFileSource;
|
||||
}
|
||||
|
||||
virtual String8 toString() {
|
||||
return mName;
|
||||
}
|
||||
|
||||
protected:
|
||||
virtual ~ClearFileSource();
|
||||
virtual ssize_t readAt_l(off64_t offset, void *data, size_t size);
|
||||
|
||||
int mFd;
|
||||
int64_t mOffset;
|
||||
int64_t mLength;
|
||||
Mutex mLock;
|
||||
|
||||
private:
|
||||
String8 mName;
|
||||
|
||||
ClearFileSource(const ClearFileSource &);
|
||||
ClearFileSource &operator=(const ClearFileSource &);
|
||||
};
|
||||
|
||||
} // namespace android
|
||||
|
||||
#endif // CLEAR_FILE_SOURCE_H_
|
||||
|
||||
@ -1,73 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2018 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef CLEAR_MEDIA_HTTP_H_
|
||||
|
||||
#define CLEAR_MEDIA_HTTP_H_
|
||||
|
||||
#include <media/stagefright/foundation/AString.h>
|
||||
|
||||
#include "HTTPBase.h"
|
||||
|
||||
namespace android {
|
||||
|
||||
struct MediaHTTPConnection;
|
||||
|
||||
struct ClearMediaHTTP : public HTTPBase {
|
||||
ClearMediaHTTP(const sp<MediaHTTPConnection> &conn);
|
||||
|
||||
virtual status_t connect(
|
||||
const char *uri,
|
||||
const KeyedVector<String8, String8> *headers,
|
||||
off64_t offset);
|
||||
|
||||
virtual void close();
|
||||
|
||||
virtual void disconnect();
|
||||
|
||||
virtual status_t initCheck() const;
|
||||
|
||||
virtual ssize_t readAt(off64_t offset, void *data, size_t size);
|
||||
|
||||
virtual status_t getSize(off64_t *size);
|
||||
|
||||
virtual uint32_t flags();
|
||||
|
||||
virtual status_t reconnectAtOffset(off64_t offset);
|
||||
|
||||
protected:
|
||||
virtual ~ClearMediaHTTP();
|
||||
|
||||
virtual String8 getUri();
|
||||
virtual String8 getMIMEType() const;
|
||||
|
||||
AString mLastURI;
|
||||
|
||||
private:
|
||||
status_t mInitCheck;
|
||||
sp<MediaHTTPConnection> mHTTPConnection;
|
||||
|
||||
KeyedVector<String8, String8> mLastHeaders;
|
||||
|
||||
bool mCachedSizeValid;
|
||||
off64_t mCachedSize;
|
||||
|
||||
DISALLOW_EVIL_CONSTRUCTORS(ClearMediaHTTP);
|
||||
};
|
||||
|
||||
} // namespace android
|
||||
|
||||
#endif // CLEAR_MEDIA_HTTP_H_
|
||||
@ -0,0 +1,43 @@
|
||||
cc_library_static {
|
||||
name: "libplayerservice_datasource",
|
||||
|
||||
srcs: [
|
||||
"PlayerServiceDataSourceFactory.cpp",
|
||||
"PlayerServiceFileSource.cpp",
|
||||
"PlayerServiceMediaHTTP.cpp",
|
||||
],
|
||||
|
||||
header_libs: [
|
||||
"media_ndk_headers",
|
||||
"libmedia_headers",
|
||||
],
|
||||
|
||||
shared_libs: [
|
||||
"libdatasource",
|
||||
"libdrmframework",
|
||||
"liblog",
|
||||
"libutils",
|
||||
],
|
||||
|
||||
local_include_dirs: [
|
||||
"include",
|
||||
],
|
||||
|
||||
export_include_dirs: [
|
||||
"include",
|
||||
],
|
||||
|
||||
cflags: [
|
||||
"-Werror",
|
||||
"-Wno-error=deprecated-declarations",
|
||||
"-Wall",
|
||||
],
|
||||
|
||||
sanitize: {
|
||||
misc_undefined: [
|
||||
"unsigned-integer-overflow",
|
||||
"signed-integer-overflow",
|
||||
],
|
||||
cfi: true,
|
||||
},
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
/*
|
||||
* Copyright (C) 2017 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
//#define LOG_NDEBUG 0
|
||||
#define LOG_TAG "PlayerServuceDataSourceFactory"
|
||||
|
||||
|
||||
#include <datasource/PlayerServiceDataSourceFactory.h>
|
||||
#include <datasource/PlayerServiceFileSource.h>
|
||||
#include <datasource/PlayerServiceMediaHTTP.h>
|
||||
#include <media/MediaHTTPConnection.h>
|
||||
#include <media/MediaHTTPService.h>
|
||||
|
||||
namespace android {
|
||||
|
||||
// static
|
||||
sp<PlayerServiceDataSourceFactory> PlayerServiceDataSourceFactory::sInstance;
|
||||
// static
|
||||
Mutex PlayerServiceDataSourceFactory::sInstanceLock;
|
||||
|
||||
// static
|
||||
sp<PlayerServiceDataSourceFactory> PlayerServiceDataSourceFactory::getInstance() {
|
||||
Mutex::Autolock l(sInstanceLock);
|
||||
if (!sInstance) {
|
||||
sInstance = new PlayerServiceDataSourceFactory();
|
||||
}
|
||||
return sInstance;
|
||||
}
|
||||
|
||||
sp<DataSource> PlayerServiceDataSourceFactory::CreateMediaHTTP(
|
||||
const sp<MediaHTTPService> &httpService) {
|
||||
if (httpService == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
sp<MediaHTTPConnection> conn = httpService->makeHTTPConnection();
|
||||
if (conn == NULL) {
|
||||
ALOGE("Failed to make http connection from http service!");
|
||||
return NULL;
|
||||
} else {
|
||||
return new PlayerServiceMediaHTTP(conn);
|
||||
}
|
||||
}
|
||||
|
||||
sp<DataSource> PlayerServiceDataSourceFactory::CreateFileSource(const char *uri) {
|
||||
return new PlayerServiceFileSource(uri);
|
||||
}
|
||||
|
||||
} // namespace android
|
||||
@ -0,0 +1,155 @@
|
||||
/*
|
||||
* Copyright (C) 2009 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
//#define LOG_NDEBUG 0
|
||||
#define LOG_TAG "PlayerServiceFileSource"
|
||||
#include <utils/Log.h>
|
||||
|
||||
#include <datasource/PlayerServiceFileSource.h>
|
||||
#include <media/stagefright/foundation/ADebug.h>
|
||||
#include <private/android_filesystem_config.h>
|
||||
|
||||
namespace android {
|
||||
|
||||
PlayerServiceFileSource::PlayerServiceFileSource(const char *filename)
|
||||
: FileSource(filename),
|
||||
mDecryptHandle(NULL),
|
||||
mDrmManagerClient(NULL),
|
||||
mDrmBufOffset(0),
|
||||
mDrmBufSize(0),
|
||||
mDrmBuf(NULL){
|
||||
}
|
||||
|
||||
PlayerServiceFileSource::PlayerServiceFileSource(int fd, int64_t offset, int64_t length)
|
||||
: FileSource(fd, offset, length),
|
||||
mDecryptHandle(NULL),
|
||||
mDrmManagerClient(NULL),
|
||||
mDrmBufOffset(0),
|
||||
mDrmBufSize(0),
|
||||
mDrmBuf(NULL) {
|
||||
}
|
||||
|
||||
PlayerServiceFileSource::~PlayerServiceFileSource() {
|
||||
if (mDrmBuf != NULL) {
|
||||
delete[] mDrmBuf;
|
||||
mDrmBuf = NULL;
|
||||
}
|
||||
|
||||
if (mDecryptHandle != NULL) {
|
||||
// To release mDecryptHandle
|
||||
CHECK(mDrmManagerClient);
|
||||
mDrmManagerClient->closeDecryptSession(mDecryptHandle);
|
||||
mDecryptHandle = NULL;
|
||||
}
|
||||
|
||||
if (mDrmManagerClient != NULL) {
|
||||
delete mDrmManagerClient;
|
||||
mDrmManagerClient = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
ssize_t PlayerServiceFileSource::readAt(off64_t offset, void *data, size_t size) {
|
||||
if (mFd < 0) {
|
||||
return NO_INIT;
|
||||
}
|
||||
|
||||
Mutex::Autolock autoLock(mLock);
|
||||
|
||||
if (mLength >= 0) {
|
||||
if (offset >= mLength) {
|
||||
return 0; // read beyond EOF.
|
||||
}
|
||||
uint64_t numAvailable = mLength - offset;
|
||||
if ((uint64_t)size > numAvailable) {
|
||||
size = numAvailable;
|
||||
}
|
||||
}
|
||||
|
||||
if (mDecryptHandle != NULL && DecryptApiType::CONTAINER_BASED
|
||||
== mDecryptHandle->decryptApiType) {
|
||||
return readAtDRM_l(offset, data, size);
|
||||
} else {
|
||||
return readAt_l(offset, data, size);
|
||||
}
|
||||
}
|
||||
|
||||
sp<DecryptHandle> PlayerServiceFileSource::DrmInitialization(const char *mime) {
|
||||
if (getuid() == AID_MEDIA_EX) return nullptr; // no DRM in media extractor
|
||||
if (mDrmManagerClient == NULL) {
|
||||
mDrmManagerClient = new DrmManagerClient();
|
||||
}
|
||||
|
||||
if (mDrmManagerClient == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (mDecryptHandle == NULL) {
|
||||
mDecryptHandle = mDrmManagerClient->openDecryptSession(
|
||||
mFd, mOffset, mLength, mime);
|
||||
}
|
||||
|
||||
if (mDecryptHandle == NULL) {
|
||||
delete mDrmManagerClient;
|
||||
mDrmManagerClient = NULL;
|
||||
}
|
||||
|
||||
return mDecryptHandle;
|
||||
}
|
||||
|
||||
ssize_t PlayerServiceFileSource::readAtDRM_l(off64_t offset, void *data, size_t size) {
|
||||
size_t DRM_CACHE_SIZE = 1024;
|
||||
if (mDrmBuf == NULL) {
|
||||
mDrmBuf = new unsigned char[DRM_CACHE_SIZE];
|
||||
}
|
||||
|
||||
if (mDrmBuf != NULL && mDrmBufSize > 0 && (offset + mOffset) >= mDrmBufOffset
|
||||
&& (offset + mOffset + size) <= static_cast<size_t>(mDrmBufOffset + mDrmBufSize)) {
|
||||
/* Use buffered data */
|
||||
memcpy(data, (void*)(mDrmBuf+(offset+mOffset-mDrmBufOffset)), size);
|
||||
return size;
|
||||
} else if (size <= DRM_CACHE_SIZE) {
|
||||
/* Buffer new data */
|
||||
mDrmBufOffset = offset + mOffset;
|
||||
mDrmBufSize = mDrmManagerClient->pread(mDecryptHandle, mDrmBuf,
|
||||
DRM_CACHE_SIZE, offset + mOffset);
|
||||
if (mDrmBufSize > 0) {
|
||||
int64_t dataRead = 0;
|
||||
dataRead = size > static_cast<size_t>(mDrmBufSize) ? mDrmBufSize : size;
|
||||
memcpy(data, (void*)mDrmBuf, dataRead);
|
||||
return dataRead;
|
||||
} else {
|
||||
return mDrmBufSize;
|
||||
}
|
||||
} else {
|
||||
/* Too big chunk to cache. Call DRM directly */
|
||||
return mDrmManagerClient->pread(mDecryptHandle, data, size, offset + mOffset);
|
||||
}
|
||||
}
|
||||
|
||||
/* static */
|
||||
bool PlayerServiceFileSource::requiresDrm(int fd, int64_t offset, int64_t length, const char *mime) {
|
||||
std::unique_ptr<DrmManagerClient> drmClient(new DrmManagerClient());
|
||||
sp<DecryptHandle> decryptHandle =
|
||||
drmClient->openDecryptSession(fd, offset, length, mime);
|
||||
bool requiresDrm = false;
|
||||
if (decryptHandle != nullptr) {
|
||||
requiresDrm = decryptHandle->decryptApiType == DecryptApiType::CONTAINER_BASED;
|
||||
drmClient->closeDecryptSession(decryptHandle);
|
||||
}
|
||||
return requiresDrm;
|
||||
}
|
||||
|
||||
} // namespace android
|
||||
@ -0,0 +1,74 @@
|
||||
/*
|
||||
* Copyright (C) 2013 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
//#define LOG_NDEBUG 0
|
||||
#define LOG_TAG "PlayerServiceMediaHTTP"
|
||||
#include <utils/Log.h>
|
||||
|
||||
#include <datasource/PlayerServiceMediaHTTP.h>
|
||||
|
||||
#include <binder/IServiceManager.h>
|
||||
#include <media/stagefright/foundation/ADebug.h>
|
||||
#include <media/stagefright/foundation/ALooper.h>
|
||||
#include <media/stagefright/FoundationUtils.h>
|
||||
|
||||
#include <media/MediaHTTPConnection.h>
|
||||
|
||||
namespace android {
|
||||
|
||||
PlayerServiceMediaHTTP::PlayerServiceMediaHTTP(const sp<MediaHTTPConnection> &conn)
|
||||
: MediaHTTP(conn),
|
||||
mDrmManagerClient(NULL) {
|
||||
}
|
||||
|
||||
PlayerServiceMediaHTTP::~PlayerServiceMediaHTTP() {
|
||||
clearDRMState_l();
|
||||
}
|
||||
|
||||
// DRM...
|
||||
|
||||
sp<DecryptHandle> PlayerServiceMediaHTTP::DrmInitialization(const char* mime) {
|
||||
if (mDrmManagerClient == NULL) {
|
||||
mDrmManagerClient = new DrmManagerClient();
|
||||
}
|
||||
|
||||
if (mDrmManagerClient == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (mDecryptHandle == NULL) {
|
||||
mDecryptHandle = mDrmManagerClient->openDecryptSession(
|
||||
String8(mLastURI.c_str()), mime);
|
||||
}
|
||||
|
||||
if (mDecryptHandle == NULL) {
|
||||
delete mDrmManagerClient;
|
||||
mDrmManagerClient = NULL;
|
||||
}
|
||||
|
||||
return mDecryptHandle;
|
||||
}
|
||||
|
||||
void PlayerServiceMediaHTTP::clearDRMState_l() {
|
||||
if (mDecryptHandle != NULL) {
|
||||
// To release mDecryptHandle
|
||||
CHECK(mDrmManagerClient);
|
||||
mDrmManagerClient->closeDecryptSession(mDecryptHandle);
|
||||
mDecryptHandle = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace android
|
||||
@ -0,0 +1,48 @@
|
||||
/*
|
||||
* Copyright (C) 2017 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef PLAYER_SERVICE_DATA_SOURCE_FACTORY_H_
|
||||
|
||||
#define PLAYER_SERVICE_DATA_SOURCE_FACTORY_H_
|
||||
|
||||
#include <datasource/DataSourceFactory.h>
|
||||
#include <media/DataSource.h>
|
||||
#include <sys/types.h>
|
||||
#include <utils/RefBase.h>
|
||||
|
||||
namespace android {
|
||||
|
||||
struct MediaHTTPService;
|
||||
class String8;
|
||||
struct HTTPBase;
|
||||
|
||||
class PlayerServiceDataSourceFactory : public DataSourceFactory {
|
||||
public:
|
||||
static sp<PlayerServiceDataSourceFactory> getInstance();
|
||||
virtual sp<DataSource> CreateMediaHTTP(const sp<MediaHTTPService> &httpService);
|
||||
|
||||
protected:
|
||||
virtual sp<DataSource> CreateFileSource(const char *uri);
|
||||
|
||||
private:
|
||||
static sp<PlayerServiceDataSourceFactory> sInstance;
|
||||
static Mutex sInstanceLock;
|
||||
PlayerServiceDataSourceFactory() {};
|
||||
};
|
||||
|
||||
} // namespace android
|
||||
|
||||
#endif // PLAYER_SERVICE_DATA_SOURCE_FACTORY_H_
|
||||
@ -0,0 +1,64 @@
|
||||
/*
|
||||
* Copyright (C) 2009 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef PLAYER_SERVICE_FILE_SOURCE_H_
|
||||
|
||||
#define PLAYER_SERVICE_FILE_SOURCE_H_
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include <datasource/FileSource.h>
|
||||
#include <media/stagefright/MediaErrors.h>
|
||||
#include <utils/threads.h>
|
||||
#include <drm/DrmManagerClient.h>
|
||||
|
||||
namespace android {
|
||||
|
||||
// FileSource implementation which works on MediaPlayerService.
|
||||
// Supports OMA(forword-lock) files.
|
||||
class PlayerServiceFileSource : public FileSource {
|
||||
public:
|
||||
PlayerServiceFileSource(const char *filename);
|
||||
// PlayerServiceFileSource takes ownership and will close the fd
|
||||
PlayerServiceFileSource(int fd, int64_t offset, int64_t length);
|
||||
|
||||
virtual ssize_t readAt(off64_t offset, void *data, size_t size);
|
||||
|
||||
virtual sp<DecryptHandle> DrmInitialization(const char *mime);
|
||||
|
||||
static bool requiresDrm(int fd, int64_t offset, int64_t length, const char *mime);
|
||||
|
||||
protected:
|
||||
virtual ~PlayerServiceFileSource();
|
||||
|
||||
private:
|
||||
/*for DRM*/
|
||||
sp<DecryptHandle> mDecryptHandle;
|
||||
DrmManagerClient *mDrmManagerClient;
|
||||
int64_t mDrmBufOffset;
|
||||
ssize_t mDrmBufSize;
|
||||
unsigned char *mDrmBuf;
|
||||
|
||||
ssize_t readAtDRM_l(off64_t offset, void *data, size_t size);
|
||||
|
||||
PlayerServiceFileSource(const PlayerServiceFileSource &);
|
||||
PlayerServiceFileSource &operator=(const PlayerServiceFileSource &);
|
||||
};
|
||||
|
||||
} // namespace android
|
||||
|
||||
#endif // PLAYER_SERVICE_FILE_SOURCE_H_
|
||||
|
||||
@ -0,0 +1,49 @@
|
||||
/*
|
||||
* Copyright (C) 2013 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef PLAYER_SERVICE_MEDIA_HTTP_H_
|
||||
|
||||
#define PLAYER_SERVICE_MEDIA_HTTP_H_
|
||||
|
||||
#include <datasource/MediaHTTP.h>
|
||||
#include <media/stagefright/foundation/AString.h>
|
||||
|
||||
namespace android {
|
||||
|
||||
struct MediaHTTPConnection;
|
||||
|
||||
// MediaHTTP implementation which works on MediaPlayerService.
|
||||
// Supports OMA(forword-lock) stream.
|
||||
struct PlayerServiceMediaHTTP : public MediaHTTP {
|
||||
PlayerServiceMediaHTTP(const sp<MediaHTTPConnection> &conn);
|
||||
|
||||
protected:
|
||||
virtual ~PlayerServiceMediaHTTP();
|
||||
|
||||
virtual sp<DecryptHandle> DrmInitialization(const char* mime);
|
||||
|
||||
private:
|
||||
sp<DecryptHandle> mDecryptHandle;
|
||||
DrmManagerClient *mDrmManagerClient;
|
||||
|
||||
void clearDRMState_l();
|
||||
|
||||
DISALLOW_EVIL_CONSTRUCTORS(PlayerServiceMediaHTTP);
|
||||
};
|
||||
|
||||
} // namespace android
|
||||
|
||||
#endif // PLAYER_SERVICE_MEDIA_HTTP_H_
|
||||
Loading…
Reference in new issue