1024b041e8
This change alters the way that the media player interacts with the Widevine adaptive streaming buffer logic. It eliminates the reliance on cached buffer duration to determine pause/play states and instead only generates buffering events when the widevine library is not producing data (i.e. when it is buffering). This eliminates unnecessary pause and rebuffer cycles, reducing startup time and the frequency and duration of spinners. Multi-repo commit, depends on related changes in frameworks/av Change-Id: I5b71f954268fbd390eed7f27db98a1bb470d5cfb related-to-bug:6503294 related-to-bug:6463780
110 lines
2.7 KiB
C++
110 lines
2.7 KiB
C++
/*
|
|
* Copyright (C) 2011 Google, Inc. All Rights Reserved
|
|
*/
|
|
|
|
|
|
#ifndef WVMMEDIA_SOURCE_H_
|
|
#define WVMMEDIA_SOURCE_H_
|
|
|
|
#include "AndroidConfig.h"
|
|
#include "WVStreamControlAPI.h"
|
|
#include <media/stagefright/DataSource.h>
|
|
#include <media/stagefright/MediaSource.h>
|
|
#include <media/stagefright/MetaData.h>
|
|
#include <media/stagefright/MediaBufferGroup.h>
|
|
#include <utils/RefBase.h>
|
|
#include "ClientContext.h"
|
|
#ifdef REQUIRE_SECURE_BUFFERS
|
|
#include "OEMCrypto_L1.h"
|
|
#endif
|
|
|
|
|
|
namespace android {
|
|
|
|
class WVMFileSource;
|
|
|
|
class WVMMediaSource : public MediaSource {
|
|
public:
|
|
WVMMediaSource(WVSession *session, WVEsSelector esSelector,
|
|
const sp<MetaData> &metaData, bool isLive, bool cryptoPluginMode);
|
|
|
|
void delegateFileSource(sp<WVMFileSource> fileSource);
|
|
void delegateDataSource(sp<DataSource> dataSource);
|
|
void delegateClientContext(sp<ClientContext> context);
|
|
|
|
virtual status_t start(MetaData *params = NULL);
|
|
virtual status_t stop();
|
|
|
|
virtual sp<MetaData> getFormat();
|
|
|
|
virtual status_t setBuffers(const Vector<MediaBuffer *> &buffers);
|
|
virtual status_t read(MediaBuffer **buffer, const ReadOptions *options = NULL);
|
|
|
|
void addEncryptedSize(size_t size) { mEncryptedSizes.push_back(size); }
|
|
bool isStalled() const { return mIsStalled; }
|
|
|
|
static int sLastError;
|
|
|
|
int64_t getTime() { return mKeyTime; }; // usec.
|
|
|
|
#ifdef REQUIRE_SECURE_BUFFERS
|
|
class DecryptContext {
|
|
public:
|
|
void Initialize(MediaBuffer *mediaBuf) {
|
|
mMediaBuf = mediaBuf;
|
|
mOffset = 0;
|
|
memset(mIV, 0, sizeof(mIV));
|
|
}
|
|
MediaBuffer *mMediaBuf;
|
|
size_t mOffset;
|
|
static const int kCryptoBlockSize = 16;
|
|
unsigned char mIV[kCryptoBlockSize];
|
|
};
|
|
|
|
static void DecryptCallback(WVEsSelector esType, void* input, void* output, size_t length,
|
|
int key, void *context);
|
|
DecryptContext& getDecryptContext() { return mDecryptContext; }
|
|
private:
|
|
DecryptContext mDecryptContext;
|
|
#endif
|
|
|
|
protected:
|
|
virtual ~WVMMediaSource();
|
|
|
|
private:
|
|
Mutex mLock;
|
|
|
|
WVSession *mSession;
|
|
WVEsSelector mESSelector; // indicates audio vs. video
|
|
|
|
sp<MetaData> mTrackMetaData;
|
|
|
|
bool mStarted;
|
|
bool mLogOnce;
|
|
bool mIsLiveStream;
|
|
bool mNewSegment;
|
|
bool mCryptoInitialized;
|
|
bool mIsStalled;
|
|
|
|
MediaBufferGroup *mGroup;
|
|
|
|
int64_t mKeyTime;
|
|
unsigned long long mDts;
|
|
unsigned long long mPts;
|
|
|
|
sp<WVMFileSource> mFileSource;
|
|
sp<DataSource> mDataSource;
|
|
sp<ClientContext> mClientContext;
|
|
|
|
Vector<size_t> mEncryptedSizes;
|
|
|
|
void allocBufferGroup();
|
|
|
|
WVMMediaSource(const WVMMediaSource &);
|
|
WVMMediaSource &operator=(const WVMMediaSource &);
|
|
};
|
|
|
|
} // namespace android
|
|
|
|
#endif // WVMMEDIA_SOURCE_H_
|