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

Commit 891b1ce1 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "media: add and clarify OMX float numerical type" into nyc-dev

parents fac5847d 18cff14e

include/media/openmax/OMX_Audio.h

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ typedef struct OMX_AUDIO_PARAM_PCMMODETYPE { 
    OMX_VERSIONTYPE nVersion;         /**< OMX specification version information */

    OMX_U32 nPortIndex;               /**< port that this structure applies to */

    OMX_U32 nChannels;                /**< Number of channels (e.g. 2 for stereo) */

    OMX_NUMERICALDATATYPE eNumData;   /**< indicates PCM data as signed or unsigned */

    OMX_NUMERICALDATATYPE eNumData;   /**< indicates PCM data as signed, unsigned or floating pt. */

    OMX_ENDIANTYPE eEndian;           /**< indicates PCM data as little or big endian */

    OMX_BOOL bInterleaved;            /**< True for normal interleaved data; false for

                                           non-interleaved data (e.g. block data) */

include/media/openmax/OMX_Types.h

+7 −1
Original line number Diff line number Diff line
@@ -280,12 +280,18 @@ typedef enum OMX_ENDIANTYPE 




/** The OMX_NUMERICALDATATYPE enumeration is used to indicate if data

    is signed or unsigned

    is signed, unsigned or floating point (Android extension).



    Android floating point support policy:

    If component does not support floating point raw audio, it can reset

    configuration to signed 16-bit integer (support for which is required.)

    nBitsPerSample will be set to 32 for float data.

 */

typedef enum OMX_NUMERICALDATATYPE

{

    OMX_NumericalDataSigned, /**< signed data */

    OMX_NumericalDataUnsigned, /**< unsigned data */

    OMX_NumericalDataFloat = 0x7F000001, /**< floating point data */

    OMX_NumercialDataMax = 0x7FFFFFFF

} OMX_NUMERICALDATATYPE;