diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:17:45 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:17:45 -0800 |
| commit | a98331d1ae08eb57a4829674ce05f50de80c169c (patch) | |
| tree | f6ff1a51d6e1b773781f6d71ddfd564f0a26237e /include/media/openmax/OMX_Core.h | |
| parent | efd11d3c0bd9dab4f83398acab27226b73da774f (diff) | |
| parent | 6df23e81f762ec7bdf3d575582ad51aaef5172cf (diff) | |
| download | frameworks_native-a98331d1ae08eb57a4829674ce05f50de80c169c.zip frameworks_native-a98331d1ae08eb57a4829674ce05f50de80c169c.tar.gz frameworks_native-a98331d1ae08eb57a4829674ce05f50de80c169c.tar.bz2 | |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/frameworks/native into cm-13.0
Android 6.0.1 release 22
Diffstat (limited to 'include/media/openmax/OMX_Core.h')
| -rw-r--r-- | include/media/openmax/OMX_Core.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/media/openmax/OMX_Core.h b/include/media/openmax/OMX_Core.h index 521c223..f746a69 100644 --- a/include/media/openmax/OMX_Core.h +++ b/include/media/openmax/OMX_Core.h @@ -509,7 +509,7 @@ typedef enum OMX_EVENTTYPE OMX_EventKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_EventVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - /** Event when tunneled decoder has rendered an output + /** Event when tunneled decoder has rendered an output or reached EOS * nData1 must contain the number of timestamps returned * pEventData must point to an array of the OMX_VIDEO_RENDEREVENTTYPE structs containing the * render-timestamps of each frame. Component may batch rendered timestamps using this event, @@ -518,6 +518,10 @@ typedef enum OMX_EVENTTYPE * * If component is doing frame-rate conversion, it must signal the render time of each * converted frame, and must interpolate media timestamps for in-between frames. + * + * When the component reached EOS, it must signal an EOS timestamp using the same mechanism. + * This is in addition to the timestamp of the last rendered frame, and should follow that + * frame. */ OMX_EventOutputRendered = 0x7F000001, OMX_EventMax = 0x7FFFFFFF |