From 75ce7656a2c0d2391b224e9c473e57b17ca23efb Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Thu, 13 Dec 2012 11:10:05 -0800
Subject: [PATCH] Signal that IDR frames are sync frames

Change-Id: Iaf77edc0572cae38935fd9d94367adbfcb370985
---
 media/libstagefright/FragmentedMP4Extractor.cpp  |  4 ++++
 media/libstagefright/Utils.cpp                   | 10 ++++++++++
 media/libstagefright/mp4/FragmentedMP4Parser.cpp |  8 ++++++++
 3 files changed, 22 insertions(+)

diff --git a/media/libstagefright/FragmentedMP4Extractor.cpp b/media/libstagefright/FragmentedMP4Extractor.cpp
index 10655b9c06..496828d1d6 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 1a6ff4b049..8ed07bf288 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 7aa5be9ae4..6130d7210e 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;
 }
-- 
2.11.0