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/mp3/XINGSeeker.cpp b/media/extractors/mp3/XINGSeeker.cpp
index adfa8d2..95ca556 100644
--- a/media/extractors/mp3/XINGSeeker.cpp
+++ b/media/extractors/mp3/XINGSeeker.cpp
@@ -76,11 +76,8 @@
}
// static
-sp<XINGSeeker> XINGSeeker::CreateFromSource(
+XINGSeeker *XINGSeeker::CreateFromSource(
DataSourceBase *source, off64_t first_frame_pos) {
- sp<XINGSeeker> seeker = new XINGSeeker;
-
- seeker->mFirstFramePos = first_frame_pos;
uint8_t buffer[4];
int offset = first_frame_pos;
@@ -98,8 +95,6 @@
NULL, &samples_per_frame)) {
return NULL;
}
- seeker->mFirstFramePos += xingframesize;
-
uint8_t version = (buffer[1] >> 3) & 3;
// determine offset of XING header
@@ -132,9 +127,13 @@
offset += 4;
uint32_t flags = U32_AT(buffer);
+ XINGSeeker *seeker = new XINGSeeker;
+ seeker->mFirstFramePos = first_frame_pos + xingframesize;
+
if (flags & 0x0001) { // Frames field is present
if (source->readAt(offset, buffer, 4) < 4) {
- return NULL;
+ delete seeker;
+ return NULL;
}
int32_t frames = U32_AT(buffer);
// only update mDurationUs if the calculated duration is valid (non zero)
@@ -148,6 +147,7 @@
}
if (flags & 0x0002) { // Bytes field is present
if (source->readAt(offset, buffer, 4) < 4) {
+ delete seeker;
return NULL;
}
seeker->mSizeBytes = U32_AT(buffer);
@@ -155,6 +155,7 @@
}
if (flags & 0x0004) { // TOC field is present
if (source->readAt(offset + 1, seeker->mTOC, 99) < 99) {
+ delete seeker;
return NULL;
}
seeker->mTOCValid = true;
@@ -164,6 +165,7 @@
#if 0
if (flags & 0x0008) { // Quality indicator field is present
if (source->readAt(offset, buffer, 4) < 4) {
+ delete seeker;
return NULL;
}
// do something with the quality indicator
@@ -171,6 +173,7 @@
}
if (source->readAt(xingbase + 0xaf - 0x24, &buffer, 1) < 1) { // encoding flags
+ delete seeker;
return false;
}