commit 9290570f8a9b9861bc846e3a650e76444f619cf4
author Hangyu Kuang <hkuang@google.com> Fri Apr 21 04:55:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 21 04:55:16 2017 +0000
tree 441952e3a6159625d79d4b43e3a19f0660c0900f
parent c5b26eecdd82668c26bb38ac3c4009a050083429
parent f093bae5ff5912c98d79a4f72943eaf6ae488ae2

Merge "media: Add getStopTimeOffsetUs in GraphicBufferSource." into oc-dev am: 17572138b5
am: f093bae5ff

Change-Id: Ie158aa5e24be6cdb8d1c585984e755831c7faf95

current.txt

diff --git a/current.txt b/current.txt
index 8a36490..aac6414 100644
--- a/current.txt
+++ b/current.txt
@@ -114,7 +114,7 @@
 d4ed2f0e14f9e914d0b1275d2e0363192fe30aca9059c84edb5fad15995f9ec4 android.hardware.light@2.0::ILight
 d9584bfcaedd6e62cf337881748246b23e36cbc2bc3aa84c01b6a1e622061400 android.hardware.light@2.0::types
 16c0cf0f73de1e5208a95020c6c6474903e7094f76b2d782651afaca0e5fd86f android.hardware.media@1.0::types
-f65c927479a4cde505326773681217cde4ebe9191b66d8b7a422e463bee24161 android.hardware.media.omx@1.0::IGraphicBufferSource
+3f6801c6bb8a67c77c2c4fa71b6082cd3f84bb7a45d12365bf3749d56b726e02 android.hardware.media.omx@1.0::IGraphicBufferSource
 0d3de9cd89d4718ea3b772f2d8b93be004feb3abb7e7dc5402e37047cc730d05 android.hardware.media.omx@1.0::IOmx
 32002e1c358c64de106c977a6dc6af7da27be4803a5bb66fd6f891a5ba0a1617 android.hardware.media.omx@1.0::IOmxBufferSource
 81ad8d8bb1cf6f41923cf11dd39354a8fe433db284a234cc675de7e75a82224c android.hardware.media.omx@1.0::IOmxNode

media/omx/1.0/IGraphicBufferSource.hal

diff --git a/media/omx/1.0/IGraphicBufferSource.hal b/media/omx/1.0/IGraphicBufferSource.hal
index 62073ad..49383c0 100644
--- a/media/omx/1.0/IGraphicBufferSource.hal
+++ b/media/omx/1.0/IGraphicBufferSource.hal
@@ -43,6 +43,8 @@
 
     setStopTimeUs(int64_t stopTimeUs) generates (Status status);
 
+    getStopTimeOffsetUs() generates (Status status, int64_t stopTimeOffsetUs);
+
     setColorAspects(ColorAspects aspects) generates (Status status);
 
     setTimeOffsetUs(int64_t timeOffsetUs) generates (Status status);