Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76ade36b authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

am 037d4ca3: Merge "media: change parameters for OMX_EventOutputRendered" into mnc-dev

* commit '037d4ca3':
  media: change parameters for OMX_EventOutputRendered
parents aeac647a 037d4ca3
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -510,8 +510,14 @@ typedef enum OMX_EVENTTYPE
    OMX_EventVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */

    /** Event when tunneled decoder has rendered an output
     *  nData1 must contain the lower 32-bits of the buffer timestamp
     *  nData2 must contain the upper 32-bits of the buffer timestamp
     *  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,
     *  but must signal the event no more than 40ms after the first frame in the batch. The frames
     *  must be ordered by system timestamp inside and across batches.
     *
     *  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.
     */
    OMX_EventOutputRendered = 0x7F000001,
    OMX_EventMax = 0x7FFFFFFF
+6 −0
Original line number Diff line number Diff line
@@ -203,6 +203,12 @@ typedef struct OMX_VIDEO_SLICESEGMENTSTYPE {
    OMX_BOOL bEnableLoopFilterAcrossSlices;
} OMX_VIDEO_SLICESEGMENTSTYPE;

/** Structure to return timestamps of rendered output frames for tunneled components */
typedef struct OMX_VIDEO_RENDEREVENTTYPE {
    OMX_S64 nMediaTimeUs;  // timestamp of rendered video frame
    OMX_S64 nSystemTimeNs; // system monotonic time at the time frame was rendered
} OMX_VIDEO_RENDEREVENTTYPE;

#ifdef __cplusplus
}
#endif /* __cplusplus */