Remove RefBase from the extractor API
- Add MetaDataBase base class that MetaData derives from, but which
does not derive from RefBase.
- MediaBuffer::meta_data() now returns a MetaDataBase& rather than an
sp<MetaData>
- Rename MediaSourceBase to MediaTrack.
- MediaSource no longer derives from MediaSourceBase (or MediaTrack)
- MediaTrack::getFormat(), MediaExtractor::getTrackMetaData() and
MediaExtractor::getMetaData() all take a MetaDataBase& parameter that
they fill out, rather than returning a MetaData directly (the
corresponding methods on MediaSource and RemoteMediaExtractor continue
to return MetaData)
Bug: 67908544
Test: CTS MediaPlayerTest, DecoderTest, EncodeDecodeTest, manually record video
Change-Id: Ib531ab309061290be33d40d6100c9a8127e22083
diff --git a/media/extractors/midi/Android.bp b/media/extractors/midi/Android.bp
index 9af128e..5412e99 100644
--- a/media/extractors/midi/Android.bp
+++ b/media/extractors/midi/Android.bp
@@ -9,8 +9,7 @@
shared_libs: [
"liblog",
"libmediaextractor",
- "libstagefright_foundation",
- "libutils",
+ "libstagefright_foundation"
],
static_libs: [
diff --git a/media/extractors/midi/MidiExtractor.cpp b/media/extractors/midi/MidiExtractor.cpp
index cf446db..949fbe0 100644
--- a/media/extractors/midi/MidiExtractor.cpp
+++ b/media/extractors/midi/MidiExtractor.cpp
@@ -25,7 +25,7 @@
#include <media/stagefright/MediaBufferGroup.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MetaData.h>
-#include <media/MediaSourceBase.h>
+#include <media/MediaTrack.h>
#include <libsonivox/eas_reverb.h>
namespace android {
@@ -33,16 +33,16 @@
// how many Sonivox output buffers to aggregate into one MediaBufferBase
static const int NUM_COMBINE_BUFFERS = 4;
-class MidiSource : public MediaSourceBase {
+class MidiSource : public MediaTrack {
public:
MidiSource(
- const sp<MidiEngine> &engine,
- const sp<MetaData> &trackMetadata);
+ MidiEngine &engine,
+ MetaDataBase &trackMetadata);
- virtual status_t start(MetaData *params);
+ virtual status_t start(MetaDataBase *params);
virtual status_t stop();
- virtual sp<MetaData> getFormat();
+ virtual status_t getFormat(MetaDataBase&);
virtual status_t read(
MediaBufferBase **buffer, const ReadOptions *options = NULL);
@@ -51,8 +51,8 @@
virtual ~MidiSource();
private:
- sp<MidiEngine> mEngine;
- sp<MetaData> mTrackMetadata;
+ MidiEngine &mEngine;
+ MetaDataBase &mTrackMetadata;
bool mInitCheck;
bool mStarted;
@@ -68,8 +68,8 @@
// Midisource
MidiSource::MidiSource(
- const sp<MidiEngine> &engine,
- const sp<MetaData> &trackMetadata)
+ MidiEngine &engine,
+ MetaDataBase &trackMetadata)
: mEngine(engine),
mTrackMetadata(trackMetadata),
mInitCheck(false),
@@ -87,13 +87,13 @@
}
}
-status_t MidiSource::start(MetaData * /* params */)
+status_t MidiSource::start(MetaDataBase * /* params */)
{
ALOGV("MidiSource::start");
CHECK(!mStarted);
mStarted = true;
- mEngine->allocateBuffers();
+ mEngine.allocateBuffers();
return OK;
}
@@ -103,14 +103,15 @@
CHECK(mStarted);
mStarted = false;
- mEngine->releaseBuffers();
+ mEngine.releaseBuffers();
return OK;
}
-sp<MetaData> MidiSource::getFormat()
+status_t MidiSource::getFormat(MetaDataBase &meta)
{
- return mTrackMetadata;
+ meta = mTrackMetadata;
+ return OK;
}
status_t MidiSource::read(
@@ -125,9 +126,9 @@
if (seekTimeUs <= 0LL) {
seekTimeUs = 0LL;
}
- mEngine->seekTo(seekTimeUs);
+ mEngine.seekTo(seekTimeUs);
}
- buffer = mEngine->readBuffer();
+ buffer = mEngine.readBuffer();
*outBuffer = buffer;
ALOGV("MidiSource::read %p done", this);
return buffer != NULL ? (status_t) OK : (status_t) ERROR_END_OF_STREAM;
@@ -142,8 +143,8 @@
// MidiEngine
MidiEngine::MidiEngine(DataSourceBase *dataSource,
- const sp<MetaData> &fileMetadata,
- const sp<MetaData> &trackMetadata) :
+ MetaDataBase *fileMetadata,
+ MetaDataBase *trackMetadata) :
mGroup(NULL),
mEasData(NULL),
mEasHandle(NULL),
@@ -191,7 +192,7 @@
EAS_Shutdown(mEasData);
}
delete mGroup;
-
+ delete mIoWrapper;
}
status_t MidiEngine::initCheck() {
@@ -238,7 +239,7 @@
EAS_I32 timeMs;
EAS_GetLocation(mEasData, mEasHandle, &timeMs);
int64_t timeUs = 1000ll * timeMs;
- buffer->meta_data()->setInt64(kKeyTime, timeUs);
+ buffer->meta_data().setInt64(kKeyTime, timeUs);
EAS_PCM* p = (EAS_PCM*) buffer->data();
int numBytesOutput = 0;
@@ -266,9 +267,7 @@
mInitCheck(false)
{
ALOGV("MidiExtractor ctor");
- mFileMetadata = new MetaData;
- mTrackMetadata = new MetaData;
- mEngine = new MidiEngine(mDataSource, mFileMetadata, mTrackMetadata);
+ mEngine = new MidiEngine(mDataSource, &mFileMetadata, &mTrackMetadata);
mInitCheck = mEngine->initCheck();
}
@@ -282,35 +281,38 @@
return mInitCheck == OK ? 1 : 0;
}
-MediaSourceBase *MidiExtractor::getTrack(size_t index)
+MediaTrack *MidiExtractor::getTrack(size_t index)
{
if (mInitCheck != OK || index > 0) {
return NULL;
}
- return new MidiSource(mEngine, mTrackMetadata);
+ return new MidiSource(*mEngine, mTrackMetadata);
}
-sp<MetaData> MidiExtractor::getTrackMetaData(
+status_t MidiExtractor::getTrackMetaData(
+ MetaDataBase &meta,
size_t index, uint32_t /* flags */) {
ALOGV("MidiExtractor::getTrackMetaData");
if (mInitCheck != OK || index > 0) {
- return NULL;
+ return UNKNOWN_ERROR;
}
- return mTrackMetadata;
+ meta = mTrackMetadata;
+ return OK;
}
-sp<MetaData> MidiExtractor::getMetaData()
+status_t MidiExtractor::getMetaData(MetaDataBase &meta)
{
ALOGV("MidiExtractor::getMetaData");
- return mFileMetadata;
+ meta = mFileMetadata;
+ return OK;
}
// Sniffer
bool SniffMidi(DataSourceBase *source, float *confidence)
{
- sp<MidiEngine> p = new MidiEngine(source, NULL, NULL);
- if (p->initCheck() == OK) {
+ MidiEngine p(source, NULL, NULL);
+ if (p.initCheck() == OK) {
*confidence = 0.8;
ALOGV("SniffMidi: yes");
return true;
diff --git a/media/extractors/midi/MidiExtractor.h b/media/extractors/midi/MidiExtractor.h
index 4274513..244dd0f 100644
--- a/media/extractors/midi/MidiExtractor.h
+++ b/media/extractors/midi/MidiExtractor.h
@@ -21,17 +21,18 @@
#include <media/MediaExtractor.h>
#include <media/stagefright/MediaBufferBase.h>
#include <media/stagefright/MediaBufferGroup.h>
+#include <media/stagefright/MetaDataBase.h>
#include <media/MidiIoWrapper.h>
#include <utils/String8.h>
#include <libsonivox/eas.h>
namespace android {
-class MidiEngine : public RefBase {
+class MidiEngine {
public:
- MidiEngine(DataSourceBase *dataSource,
- const sp<MetaData> &fileMetadata,
- const sp<MetaData> &trackMetadata);
+ explicit MidiEngine(DataSourceBase *dataSource,
+ MetaDataBase *fileMetadata,
+ MetaDataBase *trackMetadata);
~MidiEngine();
status_t initCheck();
@@ -41,7 +42,7 @@
status_t seekTo(int64_t positionUs);
MediaBufferBase* readBuffer();
private:
- sp<MidiIoWrapper> mIoWrapper;
+ MidiIoWrapper *mIoWrapper;
MediaBufferGroup *mGroup;
EAS_DATA_HANDLE mEasData;
EAS_HANDLE mEasHandle;
@@ -55,10 +56,10 @@
explicit MidiExtractor(DataSourceBase *source);
virtual size_t countTracks();
- virtual MediaSourceBase *getTrack(size_t index);
- virtual sp<MetaData> getTrackMetaData(size_t index, uint32_t flags);
+ virtual MediaTrack *getTrack(size_t index);
+ virtual status_t getTrackMetaData(MetaDataBase& meta, size_t index, uint32_t flags);
- virtual sp<MetaData> getMetaData();
+ virtual status_t getMetaData(MetaDataBase& meta);
virtual const char * name() { return "MidiExtractor"; }
protected:
@@ -67,12 +68,12 @@
private:
DataSourceBase *mDataSource;
status_t mInitCheck;
- sp<MetaData> mFileMetadata;
+ MetaDataBase mFileMetadata;
// There is only one track
- sp<MetaData> mTrackMetadata;
+ MetaDataBase mTrackMetadata;
- sp<MidiEngine> mEngine;
+ MidiEngine *mEngine;
EAS_DATA_HANDLE mEasData;
EAS_HANDLE mEasHandle;