diff options
| -rw-r--r-- | include/media/stagefright/MediaDefs.h | 2 | ||||
| -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 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/media/stagefright/MediaDefs.h b/include/media/stagefright/MediaDefs.h index 3b58122..21eb04a 100644 --- a/include/media/stagefright/MediaDefs.h +++ b/include/media/stagefright/MediaDefs.h @@ -64,7 +64,7 @@ extern const char *MEDIA_MIMETYPE_TEXT_3GPP; extern const char *MEDIA_MIMETYPE_TEXT_SUBRIP; extern const char *MEDIA_MIMETYPE_TEXT_VTT; extern const char *MEDIA_MIMETYPE_TEXT_CEA_608; -extern const char *MEDIA_MIMETYPE_DATA_METADATA; +extern const char *MEDIA_MIMETYPE_DATA_TIMED_ID3; } // namespace android 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; |