diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-07 11:32:09 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-05-07 11:32:09 +0000 |
| commit | f84ff736ed4e9e3c52a6341f7f2f5f325d8b5bab (patch) | |
| tree | 83dac061f616a1318f6ea4db06f9bab0079c547b /mm-core | |
| parent | 7a9835a7abaf26e9b79648550ca8f99514cd0c7a (diff) | |
| download | android_hardware_qcom_media-f84ff736ed4e9e3c52a6341f7f2f5f325d8b5bab.tar.gz android_hardware_qcom_media-f84ff736ed4e9e3c52a6341f7f2f5f325d8b5bab.tar.bz2 android_hardware_qcom_media-f84ff736ed4e9e3c52a6341f7f2f5f325d8b5bab.zip | |
Revert "mm-video-v4l2: reconcile to CAF tip"
This reverts commit 7a9835a7abaf26e9b79648550ca8f99514cd0c7a.
Change-Id: I766b5dbe122a149cbaeb339c9176e8165f42f937
Diffstat (limited to 'mm-core')
23 files changed, 596 insertions, 1779 deletions
diff --git a/mm-core/Android.mk b/mm-core/Android.mk index a9bc0744..e01df2e2 100755..100644 --- a/mm-core/Android.mk +++ b/mm-core/Android.mk @@ -28,14 +28,6 @@ else ifeq ($(TARGET_BOARD_PLATFORM),msm8610) MM_CORE_TARGET = 8610 else ifeq ($(TARGET_BOARD_PLATFORM),msm8226) MM_CORE_TARGET = 8226 -else ifeq ($(TARGET_BOARD_PLATFORM),msm8916) -MM_CORE_TARGET = 8916 -else ifeq ($(TARGET_BOARD_PLATFORM),apq8084) -MM_CORE_TARGET = 8084 -else ifeq ($(TARGET_BOARD_PLATFORM),mpq8092) -MM_CORE_TARGET = 8092 -else ifeq ($(TARGET_BOARD_PLATFORM),plutonium) -MM_CORE_TARGET = plutonium else MM_CORE_TARGET = default endif @@ -87,11 +79,7 @@ LOCAL_CFLAGS := $(OMXCORE_CFLAGS) LOCAL_SRC_FILES := src/common/omx_core_cmp.cpp LOCAL_SRC_FILES += src/common/qc_omx_core.c -ifneq (,$(filter msm8916 plutonium,$(TARGET_BOARD_PLATFORM))) -LOCAL_SRC_FILES += src/$(MM_CORE_TARGET)/registry_table_android.c -else LOCAL_SRC_FILES += src/$(MM_CORE_TARGET)/qc_registry_table_android.c -endif include $(BUILD_SHARED_LIBRARY) @@ -111,11 +99,7 @@ LOCAL_CFLAGS := $(OMXCORE_CFLAGS) LOCAL_SRC_FILES := src/common/omx_core_cmp.cpp LOCAL_SRC_FILES += src/common/qc_omx_core.c -ifneq (,$(filter msm8916 plutonium,$(TARGET_BOARD_PLATFORM))) -LOCAL_SRC_FILES += src/$(MM_CORE_TARGET)/registry_table.c -else LOCAL_SRC_FILES += src/$(MM_CORE_TARGET)/qc_registry_table.c -endif include $(BUILD_SHARED_LIBRARY) diff --git a/mm-core/inc/OMX_Core.h b/mm-core/inc/OMX_Core.h index 30c3af12..6c858e42 100755..100644 --- a/mm-core/inc/OMX_Core.h +++ b/mm-core/inc/OMX_Core.h @@ -392,16 +392,7 @@ typedef struct OMX_PARAM_COMPONENTROLETYPE { */ #define OMX_BUFFERFLAG_CODECCONFIG 0x00000080 -/* -* OMX_BUFFERFLAG_READONLY: This flag is set when a component emitting the -* buffer on an output port or the IL client wishes to identify the buffer -* payload contents to be read-only. An IL client or an input port -* shall not alter the contents of the buffer. This flag shall only be -* cleared by the originator of the buffer when the buffer is returned. -* For tunneled ports, the usage of this flag shall be allowed only if the -* components negotiated a read-only tunnel -*/ -#define OMX_BUFFERFLAG_READONLY 0x00000200 + /** @ingroup buf */ typedef struct OMX_BUFFERHEADERTYPE diff --git a/mm-core/inc/OMX_Index.h b/mm-core/inc/OMX_Index.h index 1e7fe1a6..cb94da28 100755..100644 --- a/mm-core/inc/OMX_Index.h +++ b/mm-core/inc/OMX_Index.h @@ -178,7 +178,6 @@ typedef enum OMX_INDEXTYPE { OMX_IndexParamVideoSliceFMO, /**< reference: OMX_VIDEO_PARAM_AVCSLICEFMO */ OMX_IndexConfigVideoAVCIntraPeriod, /**< reference: OMX_VIDEO_CONFIG_AVCINTRAPERIOD */ OMX_IndexConfigVideoNalSize, /**< reference: OMX_VIDEO_CONFIG_NALSIZE */ - OMX_IndexConfigCommonDeinterlace, /**< reference: OMX_VIDEO_CONFIG_DEINTERLACE */ /* Image & Video common Configurations */ OMX_IndexCommonStartUnused = 0x07000000, diff --git a/mm-core/inc/OMX_QCOMExtns.h b/mm-core/inc/OMX_QCOMExtns.h index fff70937..fb12082a 100755..100644 --- a/mm-core/inc/OMX_QCOMExtns.h +++ b/mm-core/inc/OMX_QCOMExtns.h @@ -1,5 +1,5 @@ /*-------------------------------------------------------------------------- -Copyright (c) 2009-2014, The Linux Foundation. All rights reserved. +Copyright (c) 2009-2013, The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -98,8 +98,6 @@ struct OMX_QCOM_PARAM_MEMMAPENTRYTYPE #define QOMX_VIDEO_BUFFERFLAG_EOSEQ 0x00200000 -#define QOMX_VIDEO_BUFFERFLAG_MBAFF 0x00400000 - #define OMX_QCOM_PORTDEFN_EXTN "OMX.QCOM.index.param.portdefn" /* Allowed APIs on the above Index: OMX_GetParameter() and OMX_SetParameter() */ @@ -215,12 +213,9 @@ struct OMX_QCOM_PLATFORMPRIVATE_EXTN typedef struct OMX_QCOM_PLATFORM_PRIVATE_PMEM_INFO { /** pmem file descriptor */ - unsigned long pmem_fd; + OMX_U32 pmem_fd; /** Offset from pmem device base address */ OMX_U32 offset; - OMX_U32 size; - OMX_U32 mapped_size; - OMX_PTR buffer; }OMX_QCOM_PLATFORM_PRIVATE_PMEM_INFO; typedef struct OMX_QCOM_PLATFORM_PRIVATE_ENTRY @@ -276,7 +271,6 @@ enum OMX_QCOM_COLOR_FORMATTYPE QOMX_COLOR_FormatYUV420PackedSemiPlanar16m2ka, QOMX_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka, QOMX_COLOR_FORMATYUV420PackedSemiPlanar32m, - QOMX_COLOR_FORMATYUV420PackedSemiPlanar32mMultiView, QOMX_COLOR_FormatAndroidOpaque = (OMX_COLOR_FORMATTYPE) OMX_COLOR_FormatVendorStartUnused + 0x789, }; @@ -291,8 +285,7 @@ enum OMX_QCOM_VIDEO_CODINGTYPE QOMX_VIDEO_CodingSpark = 0x7FA30C03, /**< Value when coding is Sorenson Spark */ QOMX_VIDEO_CodingVp = 0x7FA30C04, QOMX_VIDEO_CodingVp8 = 0x7FA30C05, - QOMX_VIDEO_CodingHevc = 0x7FA30C06, - QOMX_VIDEO_CodingMVC = 0x7FA30C07, + QOMX_VIDEO_CodingHevc = 0x7FA30C06 }; enum OMX_QCOM_EXTN_INDEXTYPE @@ -347,7 +340,6 @@ enum OMX_QCOM_EXTN_INDEXTYPE OMX_QcomIndexParamVideoDecoderPictureOrder = 0x7F000010, - /* "OMX.QCOM.index.config.video.FramePackingInfo" */ OMX_QcomIndexConfigVideoFramePackingArrangement = 0x7F000011, OMX_QcomIndexParamConcealMBMapExtraData = 0x7F000012, @@ -383,7 +375,6 @@ enum OMX_QCOM_EXTN_INDEXTYPE OMX_QcomIndexEnableSliceDeliveryMode = 0x7F00001F, - /* "OMX.QCOM.index.param.video.ExtnUserExtraData" */ OMX_QcomIndexEnableExtnUserData = 0x7F000020, /*"OMX.QCOM.index.param.video.EnableSmoothStreaming"*/ @@ -412,97 +403,14 @@ enum OMX_QCOM_EXTN_INDEXTYPE /*"OMX.QCOM.index.config.video.LTRMark"*/ QOMX_IndexConfigVideoLTRMark = 0x7F000029, - /* OMX.google.android.index.prependSPSPPSToIDRFrames */ OMX_QcomIndexParamSequenceHeaderWithIDR = 0x7F00002A, - /* backwards compatibility */ - OMX_QcomIndexParamEnableVUIStreamRestrictFlag = 0x7F10002B, - - OMX_QcomIndexParamH264AUDelimiter = 0x7F00002B, - - OMX_QcomIndexParamVideoDownScalar = 0x7F00002C, - - /* "OMX.QCOM.index.param.video.FramePackingExtradata" */ - OMX_QcomIndexParamVideoFramePackingExtradata = 0x7F00002D, - - /* "OMX.QCOM.index.config.activeregiondetection" */ - OMX_QcomIndexConfigActiveRegionDetection = 0x7F00002E, - - /* "OMX.QCOM.index.config.activeregiondetectionstatus" */ - OMX_QcomIndexConfigActiveRegionDetectionStatus = 0x7F00002F, - - /* "OMX.QCOM.index.config.scalingmode" */ - OMX_QcomIndexConfigScalingMode = 0x7F000030, - - /* "OMX.QCOM.index.config.noisereduction" */ - OMX_QcomIndexConfigNoiseReduction = 0x7F000031, - - /* "OMX.QCOM.index.config.imageenhancement" */ - OMX_QcomIndexConfigImageEnhancement = 0x7F000032, - - /* google smooth-streaming support */ - OMX_QcomIndexParamVideoAdaptivePlaybackMode = 0x7F000033, - - /* H.264 MVC codec index */ - QOMX_IndexParamVideoMvc = 0x7F000034, - - /* "OMX.QCOM.index.param.video.QPExtradata" */ - OMX_QcomIndexParamVideoQPExtraData = 0x7F000035, - - /* "OMX.QCOM.index.param.video.InputBitsInfoExtradata" */ - OMX_QcomIndexParamVideoInputBitsInfoExtraData = 0x7F000036, - - /* VP8 Hierarchical P support */ - OMX_QcomIndexHierarchicalStructure = 0x7F000037, - - OMX_QcomIndexParamPerfLevel = 0x7F000038, + OMX_QcomIndexParamEnableVUIStreamRestrictFlag = 0x7F00002B, - OMX_QcomIndexParamH264VUITimingInfo = 0x7F000039, - - OMX_QcomIndexParamPeakBitrate = 0x7F00003A, - - /*"OMX.QCOM.index.config.video.LTRMark"*/ - OMX_QcomIndexConfigVideoLTRMark = QOMX_IndexConfigVideoLTRMark, - - /* Enable InitialQP index */ - QOMX_IndexParamVideoInitialQp = 0x7F00003B, - - OMX_QcomIndexParamSetMVSearchrange = 0x7F00003C, + OMX_GoogleAndroidIndexPrepareForAdaptivePlayback = 0x7F00002C, }; /** - * Initial QP parameter. This structure is used to enable - * vendor specific extension to let client enable setting - * initial QP values to I P B Frames - * - * STRUCT MEMBERS: - * nSize : Size of Structure in bytes - * nVersion : OpenMAX IL specification version information - * nPortIndex : Index of the port to which this structure applies - * OMX_U32 nQpI : First Iframe QP - * OMX_U32 nQpP : First Pframe QP - * OMX_U32 nQpB : First Bframe QP - * OMX_U32 bEnableInitQp : Bit field indicating which frame type(s) shall - * use the specified initial QP. - * Bit 0: Enable initial QP for I/IDR - * and use value specified in nInitQpI - * Bit 1: Enable initial QP for P - * and use value specified in nInitQpP - * Bit 2: Enable initial QP for B - * and use value specified in nInitQpB - */ - -typedef struct QOMX_EXTNINDEX_VIDEO_INITIALQP { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nQpI; - OMX_U32 nQpP; - OMX_U32 nQpB; - OMX_U32 bEnableInitQp; -} QOMX_EXTNINDEX_VIDEO_INITIALQP; - -/** * Extension index parameter. This structure is used to enable * vendor specific extension on input/output port and * to pass the required flags and data, if any. @@ -799,56 +707,6 @@ typedef struct OMX_QCOM_VIDEO_CONFIG_QPRANGE OMX_U32 nMaxQP; /** The number for maximum quantization parameter */ } OMX_QCOM_VIDEO_CONFIG_QPRANGE; -/** - * This structure describes the parameters for the - * OMX_QcomIndexParamH264AUDelimiter extension. It enables/disables - * the AU delimiters in the H264 stream, which is used by WFD. - */ -typedef struct OMX_QCOM_VIDEO_CONFIG_H264_AUD -{ - OMX_U32 nSize; /** Size of the structure in bytes */ - OMX_VERSIONTYPE nVersion;/** OMX specification version information */ - OMX_BOOL bEnable; /** Enable/disable the setting */ -} OMX_QCOM_VIDEO_CONFIG_H264_AUD; - -typedef enum QOMX_VIDEO_PERF_LEVEL -{ - OMX_QCOM_PerfLevelNominal, - OMX_QCOM_PerfLevelTurbo -} QOMX_VIDEO_PERF_LEVEL; - -/** - * This structure describes the parameters corresponding - * to OMX_QcomIndexParamPerfLevel extension. It will set - * the performance mode specified as QOMX_VIDEO_PERF_LEVEL. - */ -typedef struct OMX_QCOM_VIDEO_PARAM_PERF_LEVEL { - OMX_U32 nSize; /** Size of the structure in bytes */ - OMX_VERSIONTYPE nVersion; /** OMX specification version information */ - QOMX_VIDEO_PERF_LEVEL ePerfLevel; /** Performance level */ -} OMX_QCOM_VIDEO_PARAM_PERF_LEVEL; - -/** - * This structure describes the parameters corresponding - * to OMX_QcomIndexParamH264VUITimingInfo extension. It - * will enable/disable the VUI timing info. - */ -typedef struct OMX_QCOM_VIDEO_PARAM_VUI_TIMING_INFO { - OMX_U32 nSize; /** Size of the structure in bytes */ - OMX_VERSIONTYPE nVersion; /** OMX specification version information */ - OMX_BOOL bEnable; /** Enable/disable the setting */ -} OMX_QCOM_VIDEO_PARAM_VUI_TIMING_INFO; - -/** - * This structure describes the parameters corresponding - * to OMX_QcomIndexParamPeakBitrate extension. It will - * set the peak bitrate specified by nPeakBitrate. - */ -typedef struct OMX_QCOM_VIDEO_PARAM_PEAK_BITRATE { - OMX_U32 nSize; /** Size of the structure in bytes */ - OMX_VERSIONTYPE nVersion; /** OMX specification version information */ - OMX_U32 nPeakBitrate; /** Peak bitrate value */ -} OMX_QCOM_VIDEO_PARAM_PEAK_BITRATE; typedef struct OMX_VENDOR_EXTRADATATYPE { OMX_U32 nPortIndex; @@ -960,22 +818,6 @@ typedef struct OMX_QCOM_FRAME_PACK_ARRANGEMENT OMX_U32 extension_flag; } OMX_QCOM_FRAME_PACK_ARRANGEMENT; -typedef struct OMX_QCOM_EXTRADATA_QP -{ - OMX_U32 nQP; -} OMX_QCOM_EXTRADATA_QP; - -typedef struct OMX_QCOM_EXTRADATA_BITS_INFO -{ - OMX_U32 header_bits; - OMX_U32 frame_bits; -} OMX_QCOM_EXTRADATA_BITS_INFO; - -typedef struct OMX_QCOM_EXTRADATA_USERDATA { - OMX_U32 type; - OMX_U32 data[1]; -} OMX_QCOM_EXTRADATA_USERDATA; - typedef struct OMX_QCOM_EXTRADATA_FRAMEINFO { // common frame meta data. interlace related info removed @@ -986,7 +828,6 @@ typedef struct OMX_QCOM_EXTRADATA_FRAMEINFO OMX_QCOM_DISPLAY_ASPECT_RATIO displayAspectRatio; OMX_U32 nConcealedMacroblocks; OMX_U32 nFrameRate; - OMX_TICKS nTimeStamp; } OMX_QCOM_EXTRADATA_FRAMEINFO; typedef struct OMX_QCOM_EXTRADATA_FRAMEDIMENSION @@ -1017,13 +858,6 @@ typedef union OMX_QCOM_EXTRADATA_CODEC_DATA OMX_QCOM_VC1EXTRADATA vc1ExtraData; } OMX_QCOM_EXTRADATA_CODEC_DATA; -typedef struct OMX_QCOM_EXTRADATA_MBINFO -{ - OMX_U32 nFormat; - OMX_U32 nDataSize; - OMX_U8 data[0]; -} OMX_QCOM_EXTRADATA_MBINFO; - typedef enum OMX_QCOM_EXTRADATATYPE { OMX_ExtraDataFrameInfo = 0x7F000001, @@ -1037,10 +871,6 @@ typedef enum OMX_QCOM_EXTRADATATYPE OMX_ExtraDataMP2ExtnData = 0x7F000009, OMX_ExtraDataMP2UserData = 0x7F00000a, OMX_ExtraDataVideoLTRInfo = 0x7F00000b, - OMX_ExtraDataFramePackingArrangement = 0x7F00000c, - OMX_ExtraDataQP = 0x7F00000d, - OMX_ExtraDataInputBitsInfo = 0x7F00000e, - OMX_ExtraDataVideoEncoderMBInfo = 0x7F00000f, } OMX_QCOM_EXTRADATATYPE; typedef struct OMX_STREAMINTERLACEFORMATTYPE { @@ -1064,59 +894,6 @@ typedef enum OMX_INTERLACETYPE #define OMX_EXTRADATA_HEADER_SIZE 20 /** - * AVC profile types, each profile indicates support for various - * performance bounds and different annexes. - */ -typedef enum QOMX_VIDEO_AVCPROFILETYPE { - QOMX_VIDEO_AVCProfileBaseline = OMX_VIDEO_AVCProfileBaseline, - QOMX_VIDEO_AVCProfileMain = OMX_VIDEO_AVCProfileMain, - QOMX_VIDEO_AVCProfileExtended = OMX_VIDEO_AVCProfileExtended, - QOMX_VIDEO_AVCProfileHigh = OMX_VIDEO_AVCProfileHigh, - QOMX_VIDEO_AVCProfileHigh10 = OMX_VIDEO_AVCProfileHigh10, - QOMX_VIDEO_AVCProfileHigh422 = OMX_VIDEO_AVCProfileHigh422, - QOMX_VIDEO_AVCProfileHigh444 = OMX_VIDEO_AVCProfileHigh444, - /* QCom specific profile indexes */ - QOMX_VIDEO_AVCProfileConstrainedBaseline = OMX_VIDEO_AVCProfileVendorStartUnused + 1, -} QOMX_VIDEO_AVCPROFILETYPE; - - -/** - * H.264 MVC Profiles - */ -typedef enum QOMX_VIDEO_MVCPROFILETYPE { - QOMX_VIDEO_MVCProfileStereoHigh = 0x1, - QOMX_VIDEO_MVCProfileMultiViewHigh = 0x2, - QOMX_VIDEO_MVCProfileKhronosExtensions = 0x6F000000, - QOMX_VIDEO_MVCProfileVendorStartUnused = 0x7F000000, - QOMX_VIDEO_MVCProfileMax = 0x7FFFFFFF -} QOMX_VIDEO_MVCPROFILETYPE; - -/** - * H.264 MVC Levels - */ -typedef enum QOMX_VIDEO_MVCLEVELTYPE { - QOMX_VIDEO_MVCLevel1 = 0x01, /**< Level 1 */ - QOMX_VIDEO_MVCLevel1b = 0x02, /**< Level 1b */ - QOMX_VIDEO_MVCLevel11 = 0x04, /**< Level 1.1 */ - QOMX_VIDEO_MVCLevel12 = 0x08, /**< Level 1.2 */ - QOMX_VIDEO_MVCLevel13 = 0x10, /**< Level 1.3 */ - QOMX_VIDEO_MVCLevel2 = 0x20, /**< Level 2 */ - QOMX_VIDEO_MVCLevel21 = 0x40, /**< Level 2.1 */ - QOMX_VIDEO_MVCLevel22 = 0x80, /**< Level 2.2 */ - QOMX_VIDEO_MVCLevel3 = 0x100, /**< Level 3 */ - QOMX_VIDEO_MVCLevel31 = 0x200, /**< Level 3.1 */ - QOMX_VIDEO_MVCLevel32 = 0x400, /**< Level 3.2 */ - QOMX_VIDEO_MVCLevel4 = 0x800, /**< Level 4 */ - QOMX_VIDEO_MVCLevel41 = 0x1000, /**< Level 4.1 */ - QOMX_VIDEO_MVCLevel42 = 0x2000, /**< Level 4.2 */ - QOMX_VIDEO_MVCLevel5 = 0x4000, /**< Level 5 */ - QOMX_VIDEO_MVCLevel51 = 0x8000, /**< Level 5.1 */ - QOMX_VIDEO_MVCLevelKhronosExtensions = 0x6F000000, - QOMX_VIDEO_MVCLevelVendorStartUnused = 0x7F000000, - QOMX_VIDEO_MVCLevelMax = 0x7FFFFFFF -} QOMX_VIDEO_MVCLEVELTYPE; - -/** * DivX Versions */ typedef enum QOMX_VIDEO_DIVXFORMATTYPE { @@ -1283,22 +1060,9 @@ typedef struct QOMX_INDEXTIMESTAMPREORDER { OMX_BOOL bEnable; } QOMX_INDEXTIMESTAMPREORDER; -typedef struct QOMX_INDEXDOWNSCALAR { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bEnable; -} QOMX_INDEXDOWNSCALAR; - - #define OMX_QCOM_INDEX_PARAM_VIDEO_SYNCFRAMEDECODINGMODE "OMX.QCOM.index.param.video.SyncFrameDecodingMode" #define OMX_QCOM_INDEX_PARAM_INDEXEXTRADATA "OMX.QCOM.index.param.IndexExtraData" #define OMX_QCOM_INDEX_PARAM_VIDEO_SLICEDELIVERYMODE "OMX.QCOM.index.param.SliceDeliveryMode" -#define OMX_QCOM_INDEX_PARAM_VIDEO_FRAMEPACKING_EXTRADATA "OMX.QCOM.index.param.video.FramePackingExtradata" -#define OMX_QCOM_INDEX_PARAM_VIDEO_QP_EXTRADATA "OMX.QCOM.index.param.video.QPExtradata" -#define OMX_QCOM_INDEX_PARAM_VIDEO_INPUTBITSINFO_EXTRADATA "OMX.QCOM.index.param.video.InputBitsInfoExtradata" -#define OMX_QCOM_INDEX_PARAM_VIDEO_EXTNUSER_EXTRADATA "OMX.QCOM.index.param.video.ExtnUserExtraData" -#define OMX_QCOM_INDEX_CONFIG_VIDEO_FRAMEPACKING_INFO "OMX.QCOM.index.config.video.FramePackingInfo" typedef enum { QOMX_VIDEO_FRAME_PACKING_CHECKERBOARD = 0, @@ -1336,116 +1100,6 @@ typedef enum QOMX_VIDEO_PICTURETYPE { QOMX_VIDEO_PictureTypeIDR = OMX_VIDEO_PictureTypeVendorStartUnused + 0x1000 } QOMX_VIDEO_PICTURETYPE; -#define OMX_QCOM_INDEX_CONFIG_ACTIVE_REGION_DETECTION "OMX.QCOM.index.config.activeregiondetection" -#define OMX_QCOM_INDEX_CONFIG_ACTIVE_REGION_DETECTION_STATUS "OMX.QCOM.index.config.activeregiondetectionstatus" -#define OMX_QCOM_INDEX_CONFIG_SCALING_MODE "OMX.QCOM.index.config.scalingmode" -#define OMX_QCOM_INDEX_CONFIG_NOISEREDUCTION "OMX.QCOM.index.config.noisereduction" -#define OMX_QCOM_INDEX_CONFIG_IMAGEENHANCEMENT "OMX.QCOM.index.config.imageenhancement" -#define OMX_QCOM_INDEX_PARAM_HELDBUFFERCOUNT "OMX.QCOM.index.param.HeldBufferCount" /**< reference: QOMX_HELDBUFFERCOUNTTYPE */ - - -typedef struct QOMX_RECTTYPE { - OMX_S32 nLeft; - OMX_S32 nTop; - OMX_U32 nWidth; - OMX_U32 nHeight; -} QOMX_RECTTYPE; - -typedef struct QOMX_ACTIVEREGIONDETECTIONTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bEnable; - QOMX_RECTTYPE sROI; - OMX_U32 nNumExclusionRegions; - QOMX_RECTTYPE sExclusionRegions[1]; -} QOMX_ACTIVEREGIONDETECTIONTYPE; - -typedef struct QOMX_ACTIVEREGIONDETECTION_STATUSTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bDetected; - QOMX_RECTTYPE sDetectedRegion; -} QOMX_ACTIVEREGIONDETECTION_STATUSTYPE; - -typedef enum QOMX_SCALE_MODETYPE { - QOMX_SCALE_MODE_Normal, - QOMX_SCALE_MODE_Anamorphic, - QOMX_SCALE_MODE_Max = 0x7FFFFFFF -} QOMX_SCALE_MODETYPE; - -typedef struct QOMX_SCALINGMODETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - QOMX_SCALE_MODETYPE eScaleMode; -} QOMX_SCALINGMODETYPE; - -typedef struct QOMX_NOISEREDUCTIONTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bEnable; - OMX_BOOL bAutoMode; - OMX_S32 nNoiseReduction; -} QOMX_NOISEREDUCTIONTYPE; - -typedef struct QOMX_IMAGEENHANCEMENTTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bEnable; - OMX_BOOL bAutoMode; - OMX_S32 nImageEnhancement; -} QOMX_IMAGEENHANCEMENTTYPE; - -/* - * these are part of OMX1.2 but JB MR2 branch doesn't have them defined - * OMX_IndexParamInterlaceFormat - * OMX_INTERLACEFORMATTYPE - */ -#ifndef OMX_IndexParamInterlaceFormat -#define OMX_IndexParamInterlaceFormat (0x7FF00000) -typedef struct OMX_INTERLACEFORMATTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nFormat; - OMX_TICKS nTimeStamp; -} OMX_INTERLACEFORMATTYPE; -#endif - -/** - * This structure is used to indicate the maximum number of buffers - * that a port will hold during data flow. - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version info - * nPortIndex : Port that this structure applies to - * nHeldBufferCount : Read-only, maximum number of buffers that will be held - */ -typedef struct QOMX_HELDBUFFERCOUNTTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nHeldBufferCount; -} QOMX_HELDBUFFERCOUNTTYPE; - -typedef enum QOMX_VIDEO_HIERARCHICALCODINGTYPE { - QOMX_HIERARCHICALCODING_P = 0x01, - QOMX_HIERARCHICALCODING_B = 0x02, -} QOMX_VIDEO_HIERARCHICALCODINGTYPE; - -typedef struct QOMX_VIDEO_HIERARCHICALLAYERS { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nNumLayers; - QOMX_VIDEO_HIERARCHICALCODINGTYPE eHierarchicalCodingType; -} QOMX_VIDEO_HIERARCHICALLAYERS; - - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/mm-core/inc/OMX_Video.h b/mm-core/inc/OMX_Video.h index 75757e3f..5e442ee8 100755..100644 --- a/mm-core/inc/OMX_Video.h +++ b/mm-core/inc/OMX_Video.h @@ -799,7 +799,6 @@ typedef enum OMX_VIDEO_AVCLEVELTYPE { OMX_VIDEO_AVCLevel42 = 0x2000, /**< Level 4.2 */ OMX_VIDEO_AVCLevel5 = 0x4000, /**< Level 5 */ OMX_VIDEO_AVCLevel51 = 0x8000, /**< Level 5.1 */ - OMX_VIDEO_AVCLevel52 = 0x10000, /**< Level 5.2 */ OMX_VIDEO_AVCLevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_AVCLevelVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_AVCLevelMax = 0x7FFFFFFF @@ -1051,23 +1050,6 @@ typedef struct OMX_VIDEO_CONFIG_NALSIZE { OMX_U32 nNaluBytes; } OMX_VIDEO_CONFIG_NALSIZE; - -/** - * Deinterlace Config - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nEnable : Specifies to enable deinterlace - */ -typedef struct OMX_VIDEO_CONFIG_DEINTERLACE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nEnable; -} OMX_VIDEO_CONFIG_DEINTERLACE; - /** @} */ #ifdef __cplusplus diff --git a/mm-core/inc/QCMediaDefs.h b/mm-core/inc/QCMediaDefs.h index cc2ea95a..1714191a 100755..100644 --- a/mm-core/inc/QCMediaDefs.h +++ b/mm-core/inc/QCMediaDefs.h @@ -61,8 +61,6 @@ extern const char *MEDIA_MIMETYPE_CONTAINER_QCMPEG2PS; extern const char *MEDIA_MIMETYPE_CONTAINER_QCMPEG4; extern const char *MEDIA_MIMETYPE_CONTAINER_QCMATROSKA; extern const char *MEDIA_MIMETYPE_CONTAINER_QCOGG; -extern const char *MEDIA_MIMETYPE_CONTAINER_QTIFLAC; -extern const char *MEDIA_MIMETYPE_VIDEO_VPX; //backward compatibility } // namespace android #endif //QC_MEDIA_DEFS_H_ diff --git a/mm-core/inc/QCMetaData.h b/mm-core/inc/QCMetaData.h index 473cca67..c4c65619 100755..100644 --- a/mm-core/inc/QCMetaData.h +++ b/mm-core/inc/QCMetaData.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -52,7 +52,6 @@ enum { kKeyFileFormat = 'ffmt', // cstring kkeyAacFormatAdif = 'adif', // bool (int32_t) - kKeyInterlace = 'intL', // bool (int32_t) kkeyAacFormatLtp = 'ltp', @@ -63,7 +62,6 @@ enum { kKeyUseArbitraryMode = 'ArbM', //bool (int32_t) kKeySmoothStreaming = 'ESmS', //bool (int32_t) kKeyHFR = 'hfr ', // int32_t - kKeyHSR = 'hsr ', // int32_t }; enum { diff --git a/mm-core/inc/QOMX_AudioExtensions.h b/mm-core/inc/QOMX_AudioExtensions.h index 10ce2f74..407c16ea 100755..100644 --- a/mm-core/inc/QOMX_AudioExtensions.h +++ b/mm-core/inc/QOMX_AudioExtensions.h @@ -74,7 +74,6 @@ extern "C" #define OMX_QCOM_INDEX_PARAM_DAK_FADE "OMX.Qualcomm.index.audio.dak_fade" #define OMX_QCOM_INDEX_PARAM_DAK_SEQ "OMX.Qualcomm.index.audio.dak_seq" #define OMX_QCOM_INDEX_CONFIG_DUALMONO "OMX.Qualcomm.index.audio.dualmono" -#define OMX_QCOM_INDEX_CONFIG_AAC_SEL_MIX_COEF "OMX.Qualcomm.index.audio.aac_sel_mix_coef" typedef enum QOMX_AUDIO_AMRBANDMODETYPE { QOMX_AUDIO_AMRBandModeWB9 = 0x7F000001,/**< AMRWB Mode 9 = SID*/ diff --git a/mm-core/inc/QOMX_AudioIndexExtensions.h b/mm-core/inc/QOMX_AudioIndexExtensions.h index aed68dfb..6082168a 100755..100644 --- a/mm-core/inc/QOMX_AudioIndexExtensions.h +++ b/mm-core/inc/QOMX_AudioIndexExtensions.h @@ -70,7 +70,6 @@ typedef enum QOMX_AUDIO_EXTENSIONS_INDEXTYPE QOMX_IndexConfigAudioDualMono = 0x7F200004, /**< "OMX.Qualcomm.index.audio.dualmono" */ QOMX_IndexParamAudioAc3 = 0x7F200005, /**< "OMX.Qualcomm.index.audio.ac3" */ QOMX_IndexParamAudioAc3PostProc = 0x7F200006, /**< "OMX.Qualcomm.index.audio.postproc.ac3" */ - QOMX_IndexParamAudioAacSelectMixCoef = 0x7F200007, /** "OMX.Qualcomm.index.audio.aac_sel_mix_coef**/ QOMX_IndexParamAudioUnused = 0x7F2FFFFF } QOMX_AUDIO_EXTENSIONS_INDEXTYPE; diff --git a/mm-core/inc/QOMX_IVCommonExtensions.h b/mm-core/inc/QOMX_IVCommonExtensions.h index 821085d6..4ab6925f 100755..100644 --- a/mm-core/inc/QOMX_IVCommonExtensions.h +++ b/mm-core/inc/QOMX_IVCommonExtensions.h @@ -1,5 +1,5 @@ /*-------------------------------------------------------------------------- -Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. +Copyright (c) 2011 The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -110,12 +110,6 @@ extern "C" * in Q16 format. */ #define OMX_QCOM_INDEX_PARAM_DIGITALZOOMHEIGHTRANGESUPPORTED "OMX.QCOM.index.param.DigitalZoomHeightRangeSupported" - // new externsions for vidpp -#define OMX_QCOM_INDEX_CONFIG_ACTIVE_REGION_DETECTION "OMX.QCOM.index.config.activeregiondetection" -#define OMX_QCOM_INDEX_CONFIG_ACTIVE_REGION_DETECTION_STATUS "OMX.QCOM.index.config.activeregiondetectionstatus" -#define OMX_QCOM_INDEX_CONFIG_SCALING_MODE "OMX.QCOM.index.config.scalingmode" -#define OMX_QCOM_INDEX_CONFIG_NOISEREDUCTION "OMX.QCOM.index.config.noisereduction" -#define OMX_QCOM_INDEX_CONFIG_IMAGEENHANCEMENT "OMX.QCOM.index.config.imageenhancement" /** * Enumeration defining the extended uncompressed image/video * formats. @@ -399,86 +393,6 @@ typedef struct QOMX_CONFIG_PAUSEPORTTYPE { OMX_BOOL bPausePort; /**< Specifies if port need to PAUSE or RESUME */ } QOMX_CONFIG_PAUSEPORTTYPE; - -typedef struct QOMX_RECTTYPE { - OMX_S32 nLeft; - OMX_S32 nTop; - OMX_U32 nWidth; - OMX_U32 nHeight; -} QOMX_RECTTYPE; - -typedef struct QOMX_ACTIVEREGIONDETECTIONTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bEnable; - QOMX_RECTTYPE sROI; - OMX_U32 nNumExclusionRegions; - QOMX_RECTTYPE sExclusionRegions[1]; -} QOMX_ACTIVEREGIONDETECTIONTYPE; - -typedef struct QOMX_ACTIVEREGIONDETECTION_STATUSTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bDetected; - QOMX_RECTTYPE sDetectedRegion; -} QOMX_ACTIVEREGIONDETECTION_STATUSTYPE; - -typedef enum QOMX_SCALE_MODETYPE { - QOMX_SCALE_MODE_Normal, - QOMX_SCALE_MODE_Anamorphic, - QOMX_SCALE_MODE_Max = 0x7FFFFFFF -} QOMX_SCALE_MODETYPE; - -typedef struct QOMX_SCALINGMODETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - QOMX_SCALE_MODETYPE eScaleMode; -} QOMX_SCALINGMODETYPE; - -typedef struct QOMX_NOISEREDUCTIONTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bEnable; - OMX_BOOL bAutoMode; - OMX_S32 nNoiseReduction; -} QOMX_NOISEREDUCTIONTYPE; - -typedef struct QOMX_IMAGEENHANCEMENTTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bEnable; - OMX_BOOL bAutoMode; - OMX_S32 nImageEnhancement; -} QOMX_IMAGEENHANCEMENTTYPE; - -/* - * these are part of OMX1.2 but JB MR2 branch doesn't have them defined - * OMX_IndexParamInterlaceFormat - * OMX_INTERLACEFORMATTYPE - */ -#ifndef OMX_IndexParamInterlaceFormat -#define OMX_IndexParamInterlaceFormat (0x7FF00000) -typedef enum OMX_INTERLACETYPE -{ - OMX_InterlaceFrameProgressive, - OMX_InterlaceInterleaveFrameTopFieldFirst, - OMX_InterlaceInterleaveFrameBottomFieldFirst, - OMX_InterlaceFrameTopFieldFirst, - OMX_InterlaceFrameBottomFieldFirst -}OMX_INTERLACEs; - -typedef struct OMX_INTERLACEFORMATTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nFormat; - OMX_TICKS nTimeStamp; -} OMX_INTERLACEFORMATTYPE; -#endif #if defined( __cplusplus ) } #endif /* end of macro __cplusplus */ diff --git a/mm-core/src/8226/qc_registry_table.c b/mm-core/src/8226/qc_registry_table.c index 157de38d..06f91e61 100755..100644 --- a/mm-core/src/8226/qc_registry_table.c +++ b/mm-core/src/8226/qc_registry_table.c @@ -44,6 +44,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -57,6 +60,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -70,6 +76,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -83,6 +92,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -96,6 +108,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -110,6 +125,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -123,6 +141,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -136,6 +157,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -149,6 +173,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -158,49 +185,13 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.video.decoder.hevc", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxVdecHevc.so", - { - "video_decoder.hevc" - } - }, - { - "OMX.qcom.video.decoder.hevchybrid", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxVdecHevc.so", - { - "video_decoder.hevc" - } - }, - { - "OMX.qcom.video.decoder.hevcswvdec", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxVdecHevc.so", - { - "video_decoder.hevcswvdec" - } - }, - { "OMX.qcom.video.decoder.vp8", NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -214,6 +205,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -227,6 +221,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -240,6 +237,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -253,6 +253,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -266,6 +269,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -279,6 +285,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -292,6 +301,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -305,6 +317,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -318,6 +333,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -331,6 +349,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -344,6 +365,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -357,6 +381,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -370,6 +397,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -383,6 +413,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -396,6 +429,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -409,6 +445,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle diff --git a/mm-core/src/8226/qc_registry_table_android.c b/mm-core/src/8226/qc_registry_table_android.c index a45681b0..bb6b203d 100755..100644 --- a/mm-core/src/8226/qc_registry_table_android.c +++ b/mm-core/src/8226/qc_registry_table_android.c @@ -45,6 +45,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -58,6 +61,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -71,6 +77,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -84,6 +93,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -97,6 +109,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -110,6 +125,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -123,6 +141,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -136,6 +157,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -149,6 +173,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -162,6 +189,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -171,49 +201,13 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.video.decoder.hevc", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxVdecHevc.so", - { - "video_decoder.hevc" - } - }, - { - "OMX.qcom.video.decoder.hevchybrid", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxVdecHevc.so", - { - "video_decoder.hevc" - } - }, - { - "OMX.qcom.video.decoder.hevcswvdec", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxVdecHevc.so", - { - "video_decoder.hevcswvdec" - } - }, - { "OMX.qcom.video.decoder.vp8", NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -227,6 +221,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -240,6 +237,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -253,19 +253,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { - NULL - }, - NULL, // Shared object library handle - "libOmxVenc.so", - { - "video_encoder.avc" - } - }, - { - "OMX.qcom.video.encoder.avc.secure", - NULL, // Create instance function - // Unique instance handle - { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -279,6 +269,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -292,6 +285,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -305,6 +301,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -318,6 +317,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -331,6 +333,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -344,6 +349,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -357,6 +365,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -370,6 +381,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -383,6 +397,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -396,6 +413,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -409,6 +429,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -422,6 +445,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -435,6 +461,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -448,6 +477,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -461,6 +493,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -474,6 +509,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle diff --git a/mm-core/src/8610/qc_registry_table.c b/mm-core/src/8610/qc_registry_table.c index 0a9a9aa6..80d2b725 100755..100644 --- a/mm-core/src/8610/qc_registry_table.c +++ b/mm-core/src/8610/qc_registry_table.c @@ -44,6 +44,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -57,6 +60,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -70,6 +76,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -83,6 +92,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -96,6 +108,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -109,6 +124,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -122,6 +140,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -136,6 +157,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -149,6 +173,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -162,6 +189,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -175,6 +205,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -188,6 +221,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -201,6 +237,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -214,6 +253,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -227,6 +269,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -240,6 +285,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -253,6 +301,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -266,6 +317,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -279,6 +333,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -292,6 +349,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -305,6 +365,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -318,6 +381,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -331,6 +397,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -344,6 +413,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -357,6 +429,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -370,6 +445,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -383,6 +461,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -396,6 +477,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -409,6 +493,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -422,6 +509,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle diff --git a/mm-core/src/8610/qc_registry_table_android.c b/mm-core/src/8610/qc_registry_table_android.c index efdffc40..8bbfdfed 100755..100644 --- a/mm-core/src/8610/qc_registry_table_android.c +++ b/mm-core/src/8610/qc_registry_table_android.c @@ -45,6 +45,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -58,6 +61,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -71,6 +77,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -84,6 +93,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -97,6 +109,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -110,6 +125,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -123,6 +141,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -136,6 +157,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -149,6 +173,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -162,6 +189,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -175,6 +205,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -188,6 +221,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -201,6 +237,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -214,6 +253,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -227,6 +269,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -240,6 +285,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -253,6 +301,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -266,6 +317,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -279,6 +333,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -292,6 +349,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -305,6 +365,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -318,6 +381,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -331,6 +397,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -344,6 +413,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -357,6 +429,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -370,6 +445,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -383,6 +461,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -396,6 +477,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -409,6 +493,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -422,6 +509,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -435,6 +525,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -448,6 +541,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle diff --git a/mm-core/src/8974/qc_registry_table.c b/mm-core/src/8974/qc_registry_table.c index c5be0307..ed4aaab2 100755..100644 --- a/mm-core/src/8974/qc_registry_table.c +++ b/mm-core/src/8974/qc_registry_table.c @@ -44,6 +44,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -57,6 +60,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -70,6 +76,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -83,6 +92,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -96,6 +108,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -110,6 +125,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -123,6 +141,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -136,6 +157,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -149,6 +173,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -162,6 +189,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -171,36 +201,13 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.video.decoder.hevchybrid", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxVdecHevc.so", - { - "video_decoder.hevc" - } - }, - { - "OMX.qcom.video.decoder.hevcswvdec", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxVdecHevc.so", - { - "video_decoder.hevcswvdec" - } - }, - { "OMX.qcom.video.decoder.vp8", NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -214,6 +221,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -227,6 +237,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -240,6 +253,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -253,6 +269,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -266,6 +285,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -279,6 +301,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -292,6 +317,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -305,6 +333,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -318,6 +349,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -331,6 +365,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -344,6 +381,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -357,6 +397,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -370,6 +413,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -383,6 +429,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -392,23 +441,13 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.audio.decoder.amrwbplus", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxAmrwbplusDec.so", - { - "audio_decoder.awbplus" - } - }, - { "OMX.qcom.audio.decoder.aac", NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -422,6 +461,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle diff --git a/mm-core/src/8974/qc_registry_table_android.c b/mm-core/src/8974/qc_registry_table_android.c index edb35d7d..8408d8ac 100755 --- a/mm-core/src/8974/qc_registry_table_android.c +++ b/mm-core/src/8974/qc_registry_table_android.c @@ -44,6 +44,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -57,6 +60,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -66,36 +72,45 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.video.decoder.divx4", + "OMX.qcom.video.decoder.avc.smoothstreaming", NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle "libOmxVdec.so", { - "video_decoder.divx" + "video_decoder.avc" } }, { - "OMX.qcom.video.decoder.divx", + "OMX.qcom.video.decoder.avc.smoothstreaming.secure", NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle "libOmxVdec.so", { - "video_decoder.divx" + "video_decoder.avc" } }, { - "OMX.qcom.video.decoder.divx311", + "OMX.qcom.video.decoder.divx4", NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -105,62 +120,77 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.video.decoder.mpeg4", + "OMX.qcom.video.decoder.divx", NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle "libOmxVdec.so", { - "video_decoder.mpeg4" + "video_decoder.divx" } }, { - "OMX.qcom.video.decoder.mpeg2", + "OMX.qcom.video.decoder.divx311", NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle "libOmxVdec.so", { - "video_decoder.mpeg2" + "video_decoder.divx" } }, { - "OMX.qcom.video.decoder.mpeg2.secure", + "OMX.qcom.video.decoder.mpeg4", NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle "libOmxVdec.so", { - "video_decoder.mpeg2" + "video_decoder.mpeg4" } }, { - "OMX.qcom.video.decoder.vc1", + "OMX.qcom.video.decoder.mpeg2", NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle "libOmxVdec.so", { - "video_decoder.vc1" + "video_decoder.mpeg2" } }, { - "OMX.qcom.video.decoder.wmv", + "OMX.qcom.video.decoder.vc1", NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -170,36 +200,45 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.video.decoder.h263", + "OMX.qcom.video.decoder.wmv", NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle "libOmxVdec.so", { - "video_decoder.h263" + "video_decoder.vc1" } }, { - "OMX.qcom.video.decoder.hevc", + "OMX.qcom.video.decoder.h263", NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle - "libOmxVdecHevc.so", + "libOmxVdec.so", { - "video_decoder.hevc" + "video_decoder.h263" } }, { - "OMX.qcom.video.decoder.hevchybrid", + "OMX.qcom.video.decoder.hevc", NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -209,23 +248,13 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.video.decoder.hevcswvdec", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxVdecHevc.so", - { - "video_decoder.hevcswvdec" - } - }, - { "OMX.qcom.video.decoder.vp8", NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -239,6 +268,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -252,6 +284,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -265,19 +300,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { - NULL - }, - NULL, // Shared object library handle - "libOmxVenc.so", - { - "video_encoder.avc" - } - }, - { - "OMX.qcom.video.encoder.avc.secure", - NULL, // Create instance function - // Unique instance handle - { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -291,6 +316,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -304,6 +332,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -317,6 +348,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -330,6 +364,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -343,6 +380,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -356,6 +396,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -369,6 +412,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -382,6 +428,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -395,6 +444,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -408,6 +460,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -421,6 +476,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -434,6 +492,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -447,6 +508,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -460,6 +524,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -473,6 +540,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -486,6 +556,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle @@ -499,6 +572,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle diff --git a/mm-core/src/common/omx_core_cmp.cpp b/mm-core/src/common/omx_core_cmp.cpp index 300abe40..a11cc4c2 100644 --- a/mm-core/src/common/omx_core_cmp.cpp +++ b/mm-core/src/common/omx_core_cmp.cpp @@ -86,7 +86,7 @@ qc_omx_component_init(OMX_IN OMX_HANDLETYPE hComp, OMX_IN OMX_STRING componentNa { OMX_ERRORTYPE eRet = OMX_ErrorBadParameter; qc_omx_component *pThis = (hComp)? (qc_omx_component *)(((OMX_COMPONENTTYPE *)hComp)->pComponentPrivate):NULL; - DEBUG_PRINT("OMXCORE: qc_omx_component_init %p\n", hComp); + DEBUG_PRINT("OMXCORE: qc_omx_component_init %x\n",(unsigned)hComp); if(pThis) { @@ -112,7 +112,7 @@ qc_omx_component_get_version(OMX_IN OMX_HANDLETYPE hComp, { OMX_ERRORTYPE eRet = OMX_ErrorBadParameter; qc_omx_component *pThis = (hComp)? (qc_omx_component *)(((OMX_COMPONENTTYPE *)hComp)->pComponentPrivate):NULL; - DEBUG_PRINT("OMXCORE: qc_omx_component_get_version %p, %s , %p\n", hComp, componentName, componentVersion); + DEBUG_PRINT("OMXCORE: qc_omx_component_get_version %x, %s , %x\n",(unsigned)hComp,componentName,(unsigned)componentVersion); if(pThis) { eRet = pThis->get_component_version(hComp,componentName,componentVersion,specVersion,componentUUID); @@ -128,7 +128,7 @@ qc_omx_component_send_command(OMX_IN OMX_HANDLETYPE hComp, { OMX_ERRORTYPE eRet = OMX_ErrorBadParameter; qc_omx_component *pThis = (hComp)? (qc_omx_component *)(((OMX_COMPONENTTYPE *)hComp)->pComponentPrivate):NULL; - DEBUG_PRINT("OMXCORE: qc_omx_component_send_command %p, %d , %d\n", hComp,(unsigned)cmd,(unsigned)param1); + DEBUG_PRINT("OMXCORE: qc_omx_component_send_command %x, %d , %d\n",(unsigned)hComp,(unsigned)cmd,(unsigned)param1); if(pThis) { @@ -144,7 +144,7 @@ qc_omx_component_get_parameter(OMX_IN OMX_HANDLETYPE hComp, { OMX_ERRORTYPE eRet = OMX_ErrorBadParameter; qc_omx_component *pThis = (hComp)? (qc_omx_component *)(((OMX_COMPONENTTYPE *)hComp)->pComponentPrivate):NULL; - DEBUG_PRINT("OMXCORE: qc_omx_component_get_parameter %p, %p , %d\n", hComp, paramData, paramIndex); + DEBUG_PRINT("OMXCORE: qc_omx_component_get_parameter %x, %x , %d\n",(unsigned)hComp,(unsigned)paramData,paramIndex); if(pThis) { @@ -160,7 +160,7 @@ qc_omx_component_set_parameter(OMX_IN OMX_HANDLETYPE hComp, { OMX_ERRORTYPE eRet = OMX_ErrorBadParameter; qc_omx_component *pThis = (hComp)? (qc_omx_component *)(((OMX_COMPONENTTYPE *)hComp)->pComponentPrivate):NULL; - DEBUG_PRINT("OMXCORE: qc_omx_component_set_parameter %p, %p , %d\n", hComp, paramData, paramIndex); + DEBUG_PRINT("OMXCORE: qc_omx_component_set_parameter %x, %x , %d\n",(unsigned)hComp,(unsigned)paramData,paramIndex); if(pThis) { @@ -176,7 +176,7 @@ qc_omx_component_get_config(OMX_IN OMX_HANDLETYPE hComp, { OMX_ERRORTYPE eRet = OMX_ErrorBadParameter; qc_omx_component *pThis = (hComp)? (qc_omx_component *)(((OMX_COMPONENTTYPE *)hComp)->pComponentPrivate):NULL; - DEBUG_PRINT("OMXCORE: qc_omx_component_get_config %p\n", hComp); + DEBUG_PRINT("OMXCORE: qc_omx_component_get_config %x\n",(unsigned)hComp); if(pThis) { @@ -194,7 +194,7 @@ qc_omx_component_set_config(OMX_IN OMX_HANDLETYPE hComp, { OMX_ERRORTYPE eRet = OMX_ErrorBadParameter; qc_omx_component *pThis = (hComp)? (qc_omx_component *)(((OMX_COMPONENTTYPE *)hComp)->pComponentPrivate):NULL; - DEBUG_PRINT("OMXCORE: qc_omx_component_set_config %p\n", hComp); + DEBUG_PRINT("OMXCORE: qc_omx_component_set_config %x\n",(unsigned)hComp); if(pThis) { @@ -225,7 +225,7 @@ qc_omx_component_get_state(OMX_IN OMX_HANDLETYPE hComp, { OMX_ERRORTYPE eRet = OMX_ErrorBadParameter; qc_omx_component *pThis = (hComp)? (qc_omx_component *)(((OMX_COMPONENTTYPE *)hComp)->pComponentPrivate):NULL; - DEBUG_PRINT("OMXCORE: qc_omx_component_get_state %p\n", hComp); + DEBUG_PRINT("OMXCORE: qc_omx_component_get_state %x\n",(unsigned)hComp); if(pThis) { @@ -241,7 +241,6 @@ qc_omx_component_tunnel_request(OMX_IN OMX_HANDLETYPE hComp, OMX_IN OMX_U32 peerPort, OMX_INOUT OMX_TUNNELSETUPTYPE* tunnelSetup) { - (void) hComp, (void) port, (void) peerComponent, (void) peerPort, (void) tunnelSetup; DEBUG_PRINT("Error: qc_omx_component_tunnel_request Not Implemented\n"); return OMX_ErrorNotImplemented; } @@ -256,7 +255,7 @@ qc_omx_component_use_buffer(OMX_IN OMX_HANDLETYPE hComp, { OMX_ERRORTYPE eRet = OMX_ErrorBadParameter; qc_omx_component *pThis = (hComp)? (qc_omx_component *)(((OMX_COMPONENTTYPE *)hComp)->pComponentPrivate):NULL; - DEBUG_PRINT("OMXCORE: qc_omx_component_use_buffer %p\n", hComp); + DEBUG_PRINT("OMXCORE: qc_omx_component_use_buffer %x\n",(unsigned)hComp); if(pThis) { @@ -282,7 +281,7 @@ qc_omx_component_allocate_buffer(OMX_IN OMX_HANDLETYPE hComp, OMX_ERRORTYPE eRet = OMX_ErrorBadParameter; qc_omx_component *pThis = (hComp)? (qc_omx_component *)(((OMX_COMPONENTTYPE *)hComp)->pComponentPrivate):NULL; - DEBUG_PRINT("OMXCORE: qc_omx_component_allocate_buffer %p, %p , %d\n",hComp, bufferHdr,(unsigned)port); + DEBUG_PRINT("OMXCORE: qc_omx_component_allocate_buffer %x, %x , %d\n",(unsigned)hComp,(unsigned)bufferHdr,(unsigned)port); if(pThis) { @@ -299,7 +298,7 @@ qc_omx_component_free_buffer(OMX_IN OMX_HANDLETYPE hComp, OMX_ERRORTYPE eRet = OMX_ErrorBadParameter; qc_omx_component *pThis = (hComp)? (qc_omx_component *)(((OMX_COMPONENTTYPE *)hComp)->pComponentPrivate):NULL; - DEBUG_PRINT("OMXCORE: qc_omx_component_free_buffer[%d] %p, %p\n", (unsigned)port, hComp, buffer); + DEBUG_PRINT("OMXCORE: qc_omx_component_free_buffer[%d] %x, %x\n", (unsigned)port, (unsigned)hComp, (unsigned)buffer); if(pThis) { @@ -314,7 +313,7 @@ qc_omx_component_empty_this_buffer(OMX_IN OMX_HANDLETYPE hComp, { OMX_ERRORTYPE eRet = OMX_ErrorBadParameter; qc_omx_component *pThis = (hComp)? (qc_omx_component *)(((OMX_COMPONENTTYPE *)hComp)->pComponentPrivate):NULL; - DEBUG_PRINT("OMXCORE: qc_omx_component_empty_this_buffer %p, %p\n",hComp, buffer); + DEBUG_PRINT("OMXCORE: qc_omx_component_empty_this_buffer %x, %x\n",(unsigned)hComp,(unsigned)buffer); if(pThis) { @@ -329,7 +328,7 @@ qc_omx_component_fill_this_buffer(OMX_IN OMX_HANDLETYPE hComp, { OMX_ERRORTYPE eRet = OMX_ErrorBadParameter; qc_omx_component *pThis = (hComp)? (qc_omx_component *)(((OMX_COMPONENTTYPE *)hComp)->pComponentPrivate):NULL; - DEBUG_PRINT("OMXCORE: qc_omx_component_fill_this_buffer %p, %p\n", hComp, buffer); + DEBUG_PRINT("OMXCORE: qc_omx_component_fill_this_buffer %x, %x\n",(unsigned)hComp,(unsigned)buffer); if(pThis) { eRet = pThis->fill_this_buffer(hComp,buffer); @@ -344,7 +343,7 @@ qc_omx_component_set_callbacks(OMX_IN OMX_HANDLETYPE hComp, { OMX_ERRORTYPE eRet = OMX_ErrorBadParameter; qc_omx_component *pThis = (hComp)? (qc_omx_component *)(((OMX_COMPONENTTYPE *)hComp)->pComponentPrivate):NULL; - DEBUG_PRINT("OMXCORE: qc_omx_component_set_callbacks %p, %p , %p\n", hComp, callbacks, appData); + DEBUG_PRINT("OMXCORE: qc_omx_component_set_callbacks %x, %x , %x\n",(unsigned)hComp,(unsigned)callbacks,(unsigned)appData); if(pThis) { @@ -358,7 +357,7 @@ qc_omx_component_deinit(OMX_IN OMX_HANDLETYPE hComp) { OMX_ERRORTYPE eRet = OMX_ErrorBadParameter; qc_omx_component *pThis = (hComp)? (qc_omx_component *)(((OMX_COMPONENTTYPE *)hComp)->pComponentPrivate):NULL; - DEBUG_PRINT("OMXCORE: qc_omx_component_deinit %p\n", hComp); + DEBUG_PRINT("OMXCORE: qc_omx_component_deinit %x\n",(unsigned)hComp); if(pThis) { @@ -382,7 +381,7 @@ qc_omx_component_use_EGL_image(OMX_IN OMX_HANDLETYPE hComp, { OMX_ERRORTYPE eRet = OMX_ErrorBadParameter; qc_omx_component *pThis = (hComp)? (qc_omx_component *)(((OMX_COMPONENTTYPE *)hComp)->pComponentPrivate):NULL; - DEBUG_PRINT("OMXCORE: qc_omx_component_use_EGL_image %p, %p , %d\n", hComp, bufferHdr,(unsigned)port); + DEBUG_PRINT("OMXCORE: qc_omx_component_use_EGL_image %x, %x , %d\n",(unsigned)hComp,(unsigned)bufferHdr,(unsigned)port); if(pThis) { eRet = pThis->use_EGL_image(hComp,bufferHdr,port,appData,eglImage); @@ -397,7 +396,7 @@ qc_omx_component_role_enum(OMX_IN OMX_HANDLETYPE hComp, { OMX_ERRORTYPE eRet = OMX_ErrorBadParameter; qc_omx_component *pThis = (hComp)? (qc_omx_component *)(((OMX_COMPONENTTYPE *)hComp)->pComponentPrivate):NULL; - DEBUG_PRINT("OMXCORE: qc_omx_component_role_enum %p, %p , %d\n", hComp, role,(unsigned)index); + DEBUG_PRINT("OMXCORE: qc_omx_component_role_enum %x, %x , %d\n",(unsigned)hComp,(unsigned)role,(unsigned)index); if(pThis) { diff --git a/mm-core/src/common/qc_omx_core.c b/mm-core/src/common/qc_omx_core.c index a19f6161..c8b560cf 100644 --- a/mm-core/src/common/qc_omx_core.c +++ b/mm-core/src/common/qc_omx_core.c @@ -401,9 +401,9 @@ OMX_GetHandle(OMX_OUT OMX_HANDLETYPE* handle, int cmp_index = -1; int hnd_index = -1; - DEBUG_PRINT("OMXCORE API : Get Handle %p %s %p\n", handle, + DEBUG_PRINT("OMXCORE API : Get Handle %x %s %x\n",(unsigned) handle, componentName, - appData); + (unsigned) appData); pthread_mutex_lock(&lock_core); if(handle) { @@ -451,7 +451,7 @@ OMX_GetHandle(OMX_OUT OMX_HANDLETYPE* handle, pthread_mutex_unlock(&lock_core); return OMX_ErrorInsufficientResources; } - DEBUG_PRINT("Component %p Successfully created\n",*handle); + DEBUG_PRINT("Component %x Successfully created\n",(unsigned)*handle); } else { @@ -498,7 +498,7 @@ OMX_FreeHandle(OMX_IN OMX_HANDLETYPE hComp) { OMX_ERRORTYPE eRet = OMX_ErrorNone; int err = 0, i = 0; - DEBUG_PRINT("OMXCORE API : Free Handle %p\n", hComp); + DEBUG_PRINT("OMXCORE API : Free Handle %x\n",(unsigned) hComp); // 0. Check that we have an active instance if((i=is_cmp_handle_exists(hComp)) >=0) @@ -508,7 +508,7 @@ OMX_FreeHandle(OMX_IN OMX_HANDLETYPE hComp) { pthread_mutex_lock(&lock_core); /* Unload component library */ - if( (i < (int)SIZE_OF_CORE) && core[i].so_lib_handle) + if( (i < SIZE_OF_CORE) && core[i].so_lib_handle) { if(check_lib_unload(i)) { @@ -528,7 +528,7 @@ OMX_FreeHandle(OMX_IN OMX_HANDLETYPE hComp) } else { - DEBUG_PRINT(" OMX_FreeHandle failed on %p\n", hComp); + DEBUG_PRINT(" OMX_FreeHandle failed on %x\n",(unsigned) hComp); return eRet; } } @@ -557,7 +557,6 @@ OMX_SetupTunnel(OMX_IN OMX_HANDLETYPE outputComponent, OMX_IN OMX_HANDLETYPE inputComponent, OMX_IN OMX_U32 inputPort) { - (void) outputComponent, (void) outputPort, (void) inputComponent, (void) inputPort; /* Not supported right now */ DEBUG_PRINT("OMXCORE API: OMX_SetupTunnel Not implemented \n"); return OMX_ErrorNotImplemented; @@ -579,7 +578,6 @@ OMX_API OMX_ERRORTYPE OMX_GetContentPipe(OMX_OUT OMX_HANDLETYPE* pipe, OMX_IN OMX_STRING uri) { - (void) pipe, (void) uri; /* Not supported right now */ DEBUG_PRINT("OMXCORE API: OMX_GetContentPipe Not implemented \n"); return OMX_ErrorNotImplemented; @@ -604,7 +602,7 @@ OMX_ComponentNameEnum(OMX_OUT OMX_STRING componentName, OMX_IN OMX_U32 index) { OMX_ERRORTYPE eRet = OMX_ErrorNone; - DEBUG_PRINT("OMXCORE API - OMX_ComponentNameEnum %p %d %d\n", componentName + DEBUG_PRINT("OMXCORE API - OMX_ComponentNameEnum %x %d %d\n",(unsigned) componentName ,(unsigned)nameLen ,(unsigned)index); if(index < SIZE_OF_CORE) diff --git a/mm-core/src/common/qc_omx_core.h b/mm-core/src/common/qc_omx_core.h index 95a17763..1a68e217 100755..100644 --- a/mm-core/src/common/qc_omx_core.h +++ b/mm-core/src/common/qc_omx_core.h @@ -39,7 +39,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "qc_omx_common.h" // OMX API #include <string.h> -#define OMX_COMP_MAX_INST 16 +#define OMX_COMP_MAX_INST 4 typedef struct _omx_core_cb_type { diff --git a/mm-core/src/default/qc_registry_table.c b/mm-core/src/default/qc_registry_table.c index ed0ab561..b0f7a952 100755..100644 --- a/mm-core/src/default/qc_registry_table.c +++ b/mm-core/src/default/qc_registry_table.c @@ -43,6 +43,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle diff --git a/mm-core/src/default/qc_registry_table_android.c b/mm-core/src/default/qc_registry_table_android.c index 5eb170c5..bb5e01f5 100755..100644 --- a/mm-core/src/default/qc_registry_table_android.c +++ b/mm-core/src/default/qc_registry_table_android.c @@ -44,6 +44,9 @@ omx_core_cb_type core[] = NULL, // Create instance function // Unique instance handle { + NULL, + NULL, + NULL, NULL }, NULL, // Shared object library handle diff --git a/mm-core/src/plutonium/registry_table.c b/mm-core/src/plutonium/registry_table.c deleted file mode 100644 index d6820a8d..00000000 --- a/mm-core/src/plutonium/registry_table.c +++ /dev/null @@ -1,495 +0,0 @@ -/*-------------------------------------------------------------------------- -Copyright (c) 2014, The Linux Foundation. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of The Linux Foundation nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ---------------------------------------------------------------------------*/ -/*============================================================================ - O p e n M A X w r a p p e r s - O p e n M A X C o r e - - This module contains the registry table for the QCOM's OpenMAX core. - -*//*========================================================================*/ - -#include "qc_omx_core.h" - -omx_core_cb_type core[] = -{ - { - "OMX.qcom.video.decoder.avc", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.avc" - } - }, - { - "OMX.qcom.video.decoder.mpeg4", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.mpeg4" - } - }, - { - "OMX.qcom.video.decoder.vc1", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.vc1" - } - }, - { - "OMX.qcom.video.decoder.wmv", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.vc1" - } - }, - { - "OMX.qcom.file.muxer", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - - "libOmxMux.so", - { - "container_muxer.mp2" - } - }, - { - "OMX.qcom.video.decoder.divx4", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.divx" - } - }, - { - "OMX.qcom.video.decoder.divx", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.divx" - } - }, - { - "OMX.qcom.video.decoder.divx311", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.divx" - } - }, - { - "OMX.qcom.video.decoder.h263", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.h263" - } - }, - { - "OMX.qcom.video.decoder.hevc", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.hevc" - } - }, - { - "OMX.qcom.video.decoder.vp8", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.vp8" - } - }, - { - "OMX.qcom.video.encoder.mpeg4", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVenc.so", - { - "video_encoder.mpeg4" - } - }, - { - "OMX.qcom.video.encoder.h263", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVenc.so", - { - "video_encoder.h263", - } - }, - { - "OMX.qcom.video.encoder.avc", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVenc.so", - { - "video_encoder.avc" - } - }, - { - "OMX.qcom.video.encoder.vp8", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVenc.so", - { - "video_encoder.vp8", - } - }, - { - "OMX.qcom.video.encoder.hevc", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVenc.so", - { - "video_encoder.hevc" - } - }, - { - "OMX.qcom.audio.decoder.Qcelp13", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxQcelp13Dec.so", - { - "audio_decoder.Qcelp13" - } - }, - { - "OMX.qcom.audio.decoder.evrc", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxEvrcDec.so", - { - "audio_decoder.evrc" - } - }, - { - "OMX.qcom.audio.decoder.wma", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxWmaDec.so", - { - "audio_decoder.wma" - } - }, - { - "OMX.qcom.audio.decoder.wma10Pro", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxWmaDec.so", - { - "audio_decoder.wma" - } - }, - { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { - "OMX.qcom.audio.encoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacEnc.so", - { - "audio_encoder.aac" - } - }, - { - "OMX.qcom.audio.encoder.qcelp13", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxQcelp13Enc.so", - { - "audio_encoder.qcelp13" - } - }, - { - "OMX.qcom.audio.encoder.evrc", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxEvrcEnc.so", - { - "audio_encoder.evrc" - } - }, - { - "OMX.qcom.audio.encoder.amrnb", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAmrEnc.so", - { - "audio_encoder.amrnb" - } - }, - { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { - "OMX.qcom.audio.decoder.multiaac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { - "OMX.qcom.video.postprocessing", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdpp.so", - { - "videopostprocessing" - } - } -}; - -const unsigned int SIZE_OF_CORE = sizeof(core) / sizeof(omx_core_cb_type); - - diff --git a/mm-core/src/plutonium/registry_table_android.c b/mm-core/src/plutonium/registry_table_android.c deleted file mode 100644 index 121ffcf6..00000000 --- a/mm-core/src/plutonium/registry_table_android.c +++ /dev/null @@ -1,590 +0,0 @@ -/*-------------------------------------------------------------------------- -Copyright (c) 2014, The Linux Foundation. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of The Linux Foundation nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---------------------------------------------------------------------------*/ -/*============================================================================ - O p e n M A X w r a p p e r s - O p e n M A X C o r e - - This module contains the registry table for the QCOM's OpenMAX core. - -*//*========================================================================*/ - - -#include "qc_omx_core.h" - -omx_core_cb_type core[] = -{ - { - "OMX.qcom.video.decoder.avc", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.avc" - } - }, - { - "OMX.qcom.video.decoder.avc.secure", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.avc" - } - }, - { - "OMX.qcom.video.decoder.divx4", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.divx" - } - }, - { - "OMX.qcom.video.decoder.divx", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.divx" - } - }, - { - "OMX.qcom.video.decoder.divx311", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.divx" - } - }, - { - "OMX.qcom.video.decoder.mpeg4", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.mpeg4" - } - }, - { - "OMX.qcom.video.decoder.mpeg2", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.mpeg2" - } - }, - { - "OMX.qcom.video.decoder.vc1", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.vc1" - } - }, - { - "OMX.qcom.video.decoder.wmv", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.vc1" - } - }, - { - "OMX.qcom.video.decoder.h263", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.h263" - } - }, -{ - "OMX.qcom.video.decoder.hevc", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.hevc" - } - }, - { - "OMX.qcom.video.decoder.vp8", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdec.so", - { - "video_decoder.vp8" - } - }, - { - "OMX.qcom.video.encoder.mpeg4", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVenc.so", - { - "video_encoder.mpeg4" - } - }, - { - "OMX.qcom.video.encoder.h263", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVenc.so", - { - "video_encoder.h263" - } - }, - { - "OMX.qcom.video.encoder.avc", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVenc.so", - { - "video_encoder.avc" - } - }, - { - "OMX.qcom.video.encoder.avc.secure", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVenc.so", - { - "video_encoder.avc" - } - }, - { - "OMX.qcom.video.encoder.vp8", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVenc.so", - { - "video_encoder.vp8" - } - }, - { - "OMX.qcom.video.encoder.hevc", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVenc.so", - { - "video_encoder.hevc" - } - }, - { - "OMX.qcom.audio.decoder.Qcelp13", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxQcelp13Dec.so", - { - "audio_decoder.Qcelp13" - } - }, - { - "OMX.qcom.audio.decoder.evrc", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxEvrcDec.so", - { - "audio_decoder.evrc" - } - }, - { - "OMX.qcom.audio.decoder.wma", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxWmaDec.so", - { - "audio_decoder.wma" - } - }, - { - "OMX.qcom.audio.decoder.wma10Pro", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxWmaDec.so", - { - "audio_decoder.wma" - } - }, - { - "OMX.qcom.audio.decoder.wmaLossLess", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxWmaDec.so", - { - "audio_decoder.wma" - } - }, - { - "OMX.qcom.audio.decoder.amrwbplus", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAmrwbplusDec.so", - { - "audio_decoder.awbplus" - } - }, - { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { - "OMX.qcom.audio.encoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacEnc.so", - { - "audio_encoder.aac" - } - }, - { - "OMX.qcom.audio.encoder.qcelp13", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxQcelp13Enc.so", - { - "audio_encoder.qcelp13" - } - }, - { - "OMX.qcom.audio.encoder.evrc", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxEvrcEnc.so", - { - "audio_encoder.evrc" - } - }, - { - "OMX.qcom.audio.encoder.amrnb", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAmrEnc.so", - { - "audio_encoder.amrnb" - } - }, - { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { - "OMX.qcom.audio.decoder.multiaac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { - "AIV.play.generic", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libAivPlay.so", - { - "AIV.play.role.generic" - } - }, - { - "OMX.qcom.file.muxer", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxMux.so", - { - "container_muxer.mp2" - } - }, - { - "OMX.qcom.video.postprocessing", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxVdpp.so", - { - "videopostprocessing" - } - } -}; - -const unsigned int SIZE_OF_CORE = sizeof(core) / sizeof(omx_core_cb_type); - - |