diff options
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/ACodec.cpp | 4 | ||||
-rw-r--r-- | media/libstagefright/MPEG4Writer.cpp | 7 | ||||
-rw-r--r-- | media/libstagefright/MediaDefs.cpp | 2 | ||||
-rw-r--r-- | media/libstagefright/httplive/LiveSession.cpp | 2 | ||||
-rw-r--r-- | media/libstagefright/mpeg2ts/ESQueue.cpp | 2 |
5 files changed, 12 insertions, 5 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 3db4a58..34bd4c7 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -698,7 +698,7 @@ status_t ACodec::allocateBuffersOnPort(OMX_U32 portIndex) { for (OMX_U32 i = 0; i < def.nBufferCountActual; ++i) { sp<IMemory> mem = mDealer[portIndex]->allocate(def.nBufferSize); - if (mem.get() == NULL) { + if (mem == NULL || mem->pointer() == NULL) { return NO_MEMORY; } @@ -990,7 +990,7 @@ status_t ACodec::allocateOutputMetaDataBuffers() { sp<IMemory> mem = mDealer[kPortIndexOutput]->allocate( sizeof(struct VideoDecoderOutputMetaData)); - if (mem.get() == NULL) { + if (mem == NULL || mem->pointer() == NULL) { return NO_MEMORY; } info.mData = new ABuffer(mem->pointer(), mem->size()); diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index 3bc22f2..95f361e 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -369,9 +369,16 @@ MPEG4Writer::MPEG4Writer(int fd) mWriterThreadStarted(false), mOffset(0), mMdatOffset(0), + mMoovBoxBuffer(NULL), + mMoovBoxBufferOffset(0), + mWriteMoovBoxToMemory(false), + mFreeBoxOffset(0), + mStreamableFile(false), mEstimatedMoovBoxSize(0), mMoovExtraSize(0), mInterleaveDurationUs(1000000), + mTimeScale(-1), + mStartTimestampUs(-1ll), mLatitudex10000(0), mLongitudex10000(0), mAreGeoTagsAvailable(false), diff --git a/media/libstagefright/MediaDefs.cpp b/media/libstagefright/MediaDefs.cpp index b0a65d2..2a50692 100644 --- a/media/libstagefright/MediaDefs.cpp +++ b/media/libstagefright/MediaDefs.cpp @@ -62,6 +62,6 @@ const char *MEDIA_MIMETYPE_TEXT_3GPP = "text/3gpp-tt"; const char *MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip"; const char *MEDIA_MIMETYPE_TEXT_VTT = "text/vtt"; const char *MEDIA_MIMETYPE_TEXT_CEA_608 = "text/cea-608"; -const char *MEDIA_MIMETYPE_DATA_METADATA = "application/octet-stream"; +const char *MEDIA_MIMETYPE_DATA_TIMED_ID3 = "application/x-id3v4"; } // namespace android diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp index 64a8532..27509cb 100644 --- a/media/libstagefright/httplive/LiveSession.cpp +++ b/media/libstagefright/httplive/LiveSession.cpp @@ -1406,7 +1406,7 @@ sp<AMessage> LiveSession::getTrackInfo(size_t trackIndex) const { sp<AMessage> format = new AMessage(); format->setInt32("type", MEDIA_TRACK_TYPE_METADATA); format->setString("language", "und"); - format->setString("mime", MEDIA_MIMETYPE_DATA_METADATA); + format->setString("mime", MEDIA_MIMETYPE_DATA_TIMED_ID3); return format; } return mPlaylist->getTrackInfo(trackIndex); diff --git a/media/libstagefright/mpeg2ts/ESQueue.cpp b/media/libstagefright/mpeg2ts/ESQueue.cpp index baf3b15..36ec367 100644 --- a/media/libstagefright/mpeg2ts/ESQueue.cpp +++ b/media/libstagefright/mpeg2ts/ESQueue.cpp @@ -1393,7 +1393,7 @@ sp<ABuffer> ElementaryStreamQueue::dequeueAccessUnitMetadata() { if (mFormat == NULL) { mFormat = new MetaData; - mFormat->setCString(kKeyMIMEType, MEDIA_MIMETYPE_DATA_METADATA); + mFormat->setCString(kKeyMIMEType, MEDIA_MIMETYPE_DATA_TIMED_ID3); } return accessUnit; |