diff options
author | Marco Nelissen <marcone@google.com> | 2012-12-13 11:10:05 -0800 |
---|---|---|
committer | Marco Nelissen <marcone@google.com> | 2012-12-13 11:10:05 -0800 |
commit | 8c95fa91fff6e8726df03598d52243f22e5ff8e7 (patch) | |
tree | 826e6435991cab3835b2d36d3888aeec6e7f6ac3 | |
parent | 308ca621005ab86847b1b1dabaf65a2521844a2a (diff) | |
download | frameworks_av-8c95fa91fff6e8726df03598d52243f22e5ff8e7.zip frameworks_av-8c95fa91fff6e8726df03598d52243f22e5ff8e7.tar.gz frameworks_av-8c95fa91fff6e8726df03598d52243f22e5ff8e7.tar.bz2 |
Signal that IDR frames are sync frames
Change-Id: Iaf77edc0572cae38935fd9d94367adbfcb370985
-rw-r--r-- | media/libstagefright/FragmentedMP4Extractor.cpp | 4 | ||||
-rw-r--r-- | media/libstagefright/Utils.cpp | 10 | ||||
-rw-r--r-- | media/libstagefright/mp4/FragmentedMP4Parser.cpp | 8 |
3 files changed, 22 insertions, 0 deletions
diff --git a/media/libstagefright/FragmentedMP4Extractor.cpp b/media/libstagefright/FragmentedMP4Extractor.cpp index 10655b9..496828d 100644 --- a/media/libstagefright/FragmentedMP4Extractor.cpp +++ b/media/libstagefright/FragmentedMP4Extractor.cpp @@ -278,6 +278,10 @@ status_t FragmentedMPEG4Source::read( sp<AMessage> meta = parseBuffer->meta(); int64_t timeUs; CHECK(meta->findInt64("timeUs", &timeUs)); + int32_t isSync; + if (meta->findInt32("is-sync-frame", &isSync) && isSync != 0) { + buffer->meta_data()->setInt32(kKeyIsSyncFrame, 1); + } buffer->meta_data()->setInt64(kKeyTime, timeUs); buffer->set_range(0, parseBuffer->size()); memcpy(buffer->data(), parseBuffer->data(), parseBuffer->size()); diff --git a/media/libstagefright/Utils.cpp b/media/libstagefright/Utils.cpp index 1a6ff4b..8ed07bf 100644 --- a/media/libstagefright/Utils.cpp +++ b/media/libstagefright/Utils.cpp @@ -78,6 +78,11 @@ status_t convertMetaDataToMessage( msg->setInt64("durationUs", durationUs); } + int32_t isSync; + if (meta->findInt32(kKeyIsSyncFrame, &isSync) && isSync != 0) { + msg->setInt32("is-sync-frame", 1); + } + if (!strncasecmp("video/", mime, 6)) { int32_t width, height; CHECK(meta->findInt32(kKeyWidth, &width)); @@ -370,6 +375,11 @@ void convertMessageToMetaData(const sp<AMessage> &msg, sp<MetaData> &meta) { meta->setInt64(kKeyDuration, durationUs); } + int32_t isSync; + if (msg->findInt32("is-sync-frame", &isSync) && isSync != 0) { + meta->setInt32(kKeyIsSyncFrame, 1); + } + if (mime.startsWith("video/")) { int32_t width; int32_t height; diff --git a/media/libstagefright/mp4/FragmentedMP4Parser.cpp b/media/libstagefright/mp4/FragmentedMP4Parser.cpp index 7aa5be9..6130d72 100644 --- a/media/libstagefright/mp4/FragmentedMP4Parser.cpp +++ b/media/libstagefright/mp4/FragmentedMP4Parser.cpp @@ -18,6 +18,7 @@ #define LOG_TAG "FragmentedMP4Parser" #include <utils/Log.h> +#include "include/avc_utils.h" #include "include/ESDS.h" #include "include/FragmentedMP4Parser.h" #include "TrackFragment.h" @@ -961,6 +962,10 @@ status_t FragmentedMP4Parser::makeAccessUnit( sample.mSize); (*accessUnit)->meta()->setInt64("timeUs", presentationTimeUs); + if (IsIDR(*accessUnit)) { + (*accessUnit)->meta()->setInt32("is-sync-frame", 1); + } + return OK; } @@ -1003,6 +1008,9 @@ status_t FragmentedMP4Parser::makeAccessUnit( "timeUs", presentationTimeUs); } } + if (IsIDR(*accessUnit)) { + (*accessUnit)->meta()->setInt32("is-sync-frame", 1); + } return OK; } |