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

am 8c5545ef: Merge "Fix for b/4198446 HC - Support for Widevine Adaptive VOD Fix for b/4075745 libWVStreamControlAPI crashes when dlopened() and dlclosed() Added error logging to diagnose problems such as b/4430078 Playback of newly rented movie fails with "licens

Browse Source 
* commit '8c5545ef76f39094b016986c7deec02df682356d':
  Fix for b/4198446 HC - Support for Widevine Adaptive VOD Fix for b/4075745 libWVStreamControlAPI crashes when dlopened() and dlclosed() Added error logging to diagnose problems such as b/4430078 Playback of newly rented     movie fails with "license expired"
This commit is contained in:
Jeffrey Tinker
2011-05-24 12:57:28 -07:00
committed by Android Git Automerger
parent 36a686c0a4 8c5545ef76
commit fda2f64112
9 changed files with 140 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@
#include "AndroidConfig.h"
#include "WVStreamControlAPI.h"
#include "WVMInfoListener.h"
#include <media/stagefright/MediaExtractor.h>
#include "WVMExtractor.h"
#include <media/stagefright/DataSource.h>
#include <utils/RefBase.h>
@@ -30,13 +30,13 @@
namespace android {
MediaExtractor *GetInstance(sp<DataSource> dataSource);
WVMLoadableExtractor *GetInstance(sp<DataSource> dataSource);
class WVMMediaSource;
class WVMFileSource;
class WVMExtractorImpl : public MediaExtractor {
class WVMExtractorImpl : public WVMLoadableExtractor {
public:
WVMExtractorImpl(sp<DataSource> dataSource);
@@ -45,11 +45,15 @@ public:
virtual sp<MetaData> getTrackMetaData(size_t index, uint32_t flags);
virtual sp<MetaData> getMetaData();
virtual int64_t getCachedDurationUs(status_t *finalStatus);
virtual void setAdaptiveStreamingMode(bool adaptive);
bool getAdaptiveStreamingMode() const;
static void cleanup();
protected:
virtual ~WVMExtractorImpl();
void Initialize();
private:
status_t readAVCCMetaData(sp<MetaData> videoMetaData);
@@ -63,6 +67,9 @@ private:
sp<WVMInfoListener> mInfoListener;
bool mHaveMetaData;
bool mUseAdaptiveStreaming;
bool mIsLiveStream;
bool mAdaptivePrefetching;
WVSession *mSession;