diff options
| author | Robert Shih <robertshih@google.com> | 2015-05-14 16:26:20 -0700 |
|---|---|---|
| committer | Robert Shih <robertshih@google.com> | 2015-05-14 17:25:18 -0700 |
| commit | 6f9c5e26c710dbee50e57316f1c460dda4850fa5 (patch) | |
| tree | 8368f61969f53ea80838f561a2cf9f8385e409e2 /media | |
| parent | 804a77d1045c6c4023f73a0975a09025b2e8eef2 (diff) | |
| download | frameworks_av-6f9c5e26c710dbee50e57316f1c460dda4850fa5.zip frameworks_av-6f9c5e26c710dbee50e57316f1c460dda4850fa5.tar.gz frameworks_av-6f9c5e26c710dbee50e57316f1c460dda4850fa5.tar.bz2 | |
Change mime for HLS timed ID3 stream to application/x-id3v4
Bug: 21151892
Change-Id: I6a243b0edbbb445df0caf65f395f81926fd515f0
Diffstat (limited to 'media')
| -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 |
3 files changed, 3 insertions, 3 deletions
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 7b5b46a..618a865 100644 --- a/media/libstagefright/mpeg2ts/ESQueue.cpp +++ b/media/libstagefright/mpeg2ts/ESQueue.cpp @@ -1391,7 +1391,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; |