Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f9c5e26 authored by Robert Shih's avatar Robert Shih
Browse files

Change mime for HLS timed ID3 stream to application/x-id3v4 

Bug: 21151892
Change-Id: I6a243b0edbbb445df0caf65f395f81926fd515f0
parent 804a77d1

include/media/stagefright/MediaDefs.h

+1 −1
Original line number Diff line number Diff line
@@ -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

media/libstagefright/MediaDefs.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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

media/libstagefright/httplive/LiveSession.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

media/libstagefright/mpeg2ts/ESQueue.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;