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

Commit ea2a79bf authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "heif: rename nGrid{Width|Height} to nTile{Width|Height}" into pi-dev am: 5dfc9c71

am: 3bb85dac

Change-Id: I5f9e5d6f5eb335e93aecadb3b23d0107d9a3801d
parents b7044d44 3bb85dac
Loading
Loading
Loading
Loading
+15 −14
Original line number Original line Diff line number Diff line
@@ -427,14 +427,15 @@ typedef struct OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE {
 * use cases, corresponding to index OMX_IndexParamVideoAndroidImageGrid.
 * use cases, corresponding to index OMX_IndexParamVideoAndroidImageGrid.
 *
 *
 * OMX_VIDEO_CodingImageHEIC encoders must handle this param type. When this param is set
 * OMX_VIDEO_CodingImageHEIC encoders must handle this param type. When this param is set
 * on the component with bEnabled set to true, nGrid* indicates the desired grid config
 * on the component with bEnabled set to true, nTileWidth, nTileHeight, nGridRows,
 * by the client. The component can use this as a heuristic, but is free to choose any
 * nGridCols indicates the desired grid config by the client. The component can use this
 * suitable grid configs, and the client shall always get the actual from the component
 * as a heuristic, and is free to choose any suitable grid configs. The client shall
 * after the param is set. Encoder will receive each input image in full, and shall encode
 * always get the actual from the component after the param is set. Encoder will receive
 * it into tiles in row-major, top-row first, left-to-right order, and send each encoded
 * each input image in full, and shall encode it into tiles in row-major, top-row first,
 * tile in a separate output buffer. All output buffers for the same input buffer shall
 * left-to-right order, and send each encoded tile in a separate output buffer. All output
 * carry the same timestamp as the input buffer. If the input buffer is marked EOS,
 * buffers for the same input buffer shall carry the same timestamp as the input buffer.
 * the EOS should only appear on the last output buffer for that input buffer.
 * If the input buffer is marked EOS, the EOS should only appear on the last output buffer
 * for that input buffer.
 *
 *
 * OMX_VIDEO_CodingHEVC encoders might also receive this param when it's used for image
 * OMX_VIDEO_CodingHEVC encoders might also receive this param when it's used for image
 * encoding, although in this case the param only serves as a hint. The encoder will
 * encoding, although in this case the param only serves as a hint. The encoder will
@@ -446,10 +447,10 @@ typedef struct OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE {
 *  nSize                      : Size of the structure in bytes
 *  nSize                      : Size of the structure in bytes
 *  nVersion                   : OMX specification version information
 *  nVersion                   : OMX specification version information
 *  nPortIndex                 : Port that this structure applies to (output port for encoders)
 *  nPortIndex                 : Port that this structure applies to (output port for encoders)
 *  bEnabled                   : Whether grid is enabled. If true, nGrid* specifies the grid
 *  bEnabled                   : Whether grid is enabled. If true, the other parameters
 *                               config; otherwise nGrid* shall be ignored.
 *                               specifies the grid config; otherwise they shall be ignored.
 *  nGridWidth                 : Width of each tile.
 *  nTileWidth                 : Width of each tile.
 *  nGridHeight                : Height of each tile.
 *  nTileHeight                : Height of each tile.
 *  nGridRows                  : Number of rows in the grid.
 *  nGridRows                  : Number of rows in the grid.
 *  nGridCols                  : Number of cols in the grid.
 *  nGridCols                  : Number of cols in the grid.
 */
 */
@@ -458,8 +459,8 @@ typedef struct OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE {
    OMX_VERSIONTYPE nVersion;
    OMX_VERSIONTYPE nVersion;
    OMX_U32 nPortIndex;
    OMX_U32 nPortIndex;
    OMX_BOOL bEnabled;
    OMX_BOOL bEnabled;
    OMX_U32 nGridWidth;
    OMX_U32 nTileWidth;
    OMX_U32 nGridHeight;
    OMX_U32 nTileHeight;
    OMX_U32 nGridRows;
    OMX_U32 nGridRows;
    OMX_U32 nGridCols;
    OMX_U32 nGridCols;
} OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE;
} OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE;