diff options
| author | Chong Zhang <chz@google.com> | 2014-06-11 14:49:23 -0700 |
|---|---|---|
| committer | Chong Zhang <chz@google.com> | 2014-06-13 10:18:09 -0700 |
| commit | a7fa1d9530b6870f2c7850e3025d7db963661803 (patch) | |
| tree | 384a6c52d5b13b09860eab611c264384e5444592 /media/libstagefright | |
| parent | 404fced9bfa8fa423ee210a271ca051ffd1bec13 (diff) | |
| download | frameworks_av-a7fa1d9530b6870f2c7850e3025d7db963661803.zip frameworks_av-a7fa1d9530b6870f2c7850e3025d7db963661803.tar.gz frameworks_av-a7fa1d9530b6870f2c7850e3025d7db963661803.tar.bz2 | |
support for CEA-608 closed caption
Bug: 15470448
Change-Id: Ic6a527f5c35a8ee0a08a5b043336e4d193216083
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/MediaDefs.cpp | 1 | ||||
| -rw-r--r-- | media/libstagefright/mpeg2ts/ESQueue.cpp | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/MediaDefs.cpp b/media/libstagefright/MediaDefs.cpp index f38729e..d48dd84 100644 --- a/media/libstagefright/MediaDefs.cpp +++ b/media/libstagefright/MediaDefs.cpp @@ -59,5 +59,6 @@ const char *MEDIA_MIMETYPE_CONTAINER_WVM = "video/wvm"; 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"; } // namespace android diff --git a/media/libstagefright/mpeg2ts/ESQueue.cpp b/media/libstagefright/mpeg2ts/ESQueue.cpp index f7abf01..3c8f03e 100644 --- a/media/libstagefright/mpeg2ts/ESQueue.cpp +++ b/media/libstagefright/mpeg2ts/ESQueue.cpp @@ -777,6 +777,12 @@ sp<ABuffer> ElementaryStreamQueue::dequeueAccessUnitH264() { unsigned nalType = mBuffer->data()[pos.nalOffset] & 0x1f; + if (nalType == 6) { + sp<ABuffer> sei = new ABuffer(pos.nalSize); + memcpy(sei->data(), mBuffer->data() + pos.nalOffset, pos.nalSize); + accessUnit->meta()->setBuffer("sei", sei); + } + #if !LOG_NDEBUG char tmp[128]; sprintf(tmp, "0x%02x", nalType); |