widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extractors are now binderized

Browse Source 
Change-Id: I96030f2a345aa41193cea57e6f2f925eedea7957
This commit is contained in:
Marco Nelissen
2015-09-22 15:14:43 -07:00
parent 64ad54fdb0
commit c8d0ddadf5
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proprietary/wvm/WVMExtractorImpl.cpp
View File

@@ -487,7 +487,7 @@ size_t WVMExtractorImpl::countTracks() {
return 2; // 1 audio + 1 video return 2; // 1 audio + 1 video
} }
sp<MediaSource> WVMExtractorImpl::getTrack(size_t index) sp<IMediaSource> WVMExtractorImpl::getTrack(size_t index)
{ {
status_t err; status_t err;
if ((err = readMetaData()) != OK) { if ((err = readMetaData()) != OK) {

2
proprietary/wvm/include/WVMExtractorImpl.h
View File

@@ -27,7 +27,7 @@ public:
WVMExtractorImpl(sp<DataSource> dataSource); WVMExtractorImpl(sp<DataSource> dataSource);
virtual size_t countTracks(); virtual size_t countTracks();
virtual sp<MediaSource> getTrack(size_t index); virtual sp<IMediaSource> getTrack(size_t index);
virtual sp<MetaData> getTrackMetaData(size_t index, uint32_t flags); virtual sp<MetaData> getTrackMetaData(size_t index, uint32_t flags);
virtual sp<MetaData> getMetaData(); virtual sp<MetaData> getMetaData();

3
proprietary/wvm/wvm-core.mk
View File

@@ -13,7 +13,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libwvmcommon libwvmcommon
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libbinder \
libmedia \
libstagefright \ libstagefright \
libstagefright_foundation \
libWVStreamControlAPI_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL) \ libWVStreamControlAPI_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL) \
libdrmframework \ libdrmframework \
libcutils \ libcutils \