This change resolves a lifetime issue between the media extractor and media sources. The extractor was being passed as a context object to a callout in the WV libs. In some cases, a pointer to the extractor would be delivered to the callout after the extractor had been released. This change assigns the responsibility of the lifetime of the context object to the media source, to ensure that a ref is always held on the context object during the lifetime of the media source. Change-Id: Ic7a57a1c8496a4798fe590ec356b8a19a4f69967 related-to-bug: 6502322
105 lines
2.6 KiB
C++
105 lines
2.6 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); }
|
|
|
|
static int sLastError;
|
|
|
|
#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;
|
|
|
|
MediaBufferGroup *mGroup;
|
|
|
|
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_
|