libvideorender: CB2 add essos depends [1/2]
PD#SWPL-159621
Problem:
add essos depends
Solution:
add essos depends
Verify:
ap222
Change-Id: I629953bc0174fc628bf5e9e9eb299a96fbd93e9f
Signed-off-by: fei.deng <fei.deng@amlogic.com>
diff --git a/westeros/Makefile b/westeros/Makefile
index 08a5eff..61e198f 100644
--- a/westeros/Makefile
+++ b/westeros/Makefile
@@ -76,7 +76,6 @@
-I../ \
-I$(TOOLS_PATH) \
-I$(STAGING_DIR)/usr/include \
- -I./essos \
$(VERSION_CFLAGS) \
OBJ_CLIENT_LIB += \
@@ -95,7 +94,7 @@
all: $(GENERATED_SOURCES) $(TARGET)
-LD_FLAG = -L./essos -g -fPIC -O -Wcpp -lm -lpthread -lz -Wl,-Bsymbolic -ldl
+LD_FLAG = -g -fPIC -O -Wcpp -lm -lpthread -lz -Wl,-Bsymbolic -ldl
LD_FLAG_LIB = $(LD_FLAG) -shared $(LD_SUPPORT) -llog -lessosrmgr
%.o:%.c $(DEPS)
diff --git a/westeros/essos/essos-resmgr.h b/westeros/essos/essos-resmgr.h
deleted file mode 100644
index 841561e..0000000
--- a/westeros/essos/essos-resmgr.h
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * If not stated otherwise in this file or this component's Licenses.txt file the
- * following copyright and licenses apply:
- *
- * Copyright 2019 RDK Management
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __ESSOS_RESMGR__
-#define __ESSOS_RESMGR__
-
-#ifndef __cplusplus
-#include <stdbool.h>
-#endif
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-typedef struct _EssRMgr EssRMgr;
-
-typedef enum _EssRMgrResType
-{
- EssRMgrResType_videoDecoder,
- EssRMgrResType_audioDecoder,
- EssRMgrResType_frontEnd,
- EssRMgrResType_svpAllocator
-} EssRMgrResType;
-
-typedef enum _EssRMgrVideoDecoderCaps
-{
- EssRMgrVidCap_none= (0),
- EssRMgrVidCap_limitedResolution= (1<<0),
- EssRMgrVidCap_limitedQuality= (1<<1),
- EssRMgrVidCap_limitedPerformance= (1<<2),
- EssRMgrVidCap_hardware= (1<<16),
- EssRMgrVidCap_software= (1<<17),
-
-} EssRMgrVideoDecoderCaps;
-
-typedef enum _EssRMgrVideoUsage
-{
- EssRMgrVidUse_none= (0),
- EssRMgrVidUse_fullResolution= (1<<0),
- EssRMgrVidUse_fullQuality= (1<<1),
- EssRMgrVidUse_fullPerformance= (1<<2),
-
-} EssRMgrVideoUsage;
-
-typedef enum _EssRMgrAudioDecoderCaps
-{
- EssRMgrAudCap_none= (0),
-} EssRMgrAudioDecoderCaps;
-
-typedef enum _EssRMgrAudioUsage
-{
- EssRMgrAudUse_none= (0),
-} EssRMgrAudioUsage;
-
-typedef enum _EssRMgrFrontEndCaps
-{
- EssRMgrFECap_none= (0),
-} EssRMgrFrontEndCaps;
-
-typedef enum _EssRMgrFrontEndUsage
-{
- EssRMgrFEUse_none= (0),
-} EssRMgrFrontEndUsage;
-
-typedef enum _EssRMgrSVPAllocCaps
-{
- EssRMgrSVPACap_none= (0),
-} EssRMgrSVPAllocCaps;
-
-typedef enum _EssRMgrSVPAllocUsage
-{
- EssRMgrSVPAUse_none= (0),
-} EssRMgrSVPAllocUsage;
-
-typedef enum _EssRMgrResState
-{
- EssRMgrRes_idle= 0,
- EssRMgrRes_paused= 1,
- EssRMgrRes_active= 2,
- EssRMgrRes_max= 3
-} EssRMgrResState;
-
-typedef enum _EssRMgrEvent
-{
- /*
- * Received when a resource is granted asynchronusly.
- */
- EssRMgrEvent_granted,
-
- /*
- * Received when a resource is being revoked. When received,
- * the application should release the resource and then call
- * EssRMgrReleaseResource.
- */
- EssRMgrEvent_revoked
-} EssRMgrEvent;
-
-typedef void (*EssRMgrNotifyCB)( EssRMgr *rm, int event, int type, int id, void* userData );
-
-typedef struct _EssRMgrVideoInfo
-{
- int maxWidth;
- int maxHeight;
-} EssRMgrVideoInfo;
-
-typedef struct _EssRMgrAudioInfo
-{
-} EssRMgrAudioInfo;
-
-typedef struct _EssRMgrFEInfo
-{
-} EssRMgrFEInfo;
-
-typedef struct _EssRMgrSVPAInfo
-{
-} EssRMgrSVPAInfo;
-
-typedef union EssRMgrUsageInfo
-{
- EssRMgrVideoInfo video;
- EssRMgrAudioInfo audio;
- EssRMgrFEInfo frontEnd;
- EssRMgrSVPAInfo svpAllocator;
-} EssRMgrUsageInfo;
-
-typedef struct _EssRMgrRequest
-{
- int type;
- int usage;
- int priority;
- bool asyncEnable;
- EssRMgrNotifyCB notifyCB;
- void *notifyUserData;
- EssRMgrUsageInfo info;
- int requestId;
- int assignedId;
- int assignedCaps;
-} EssRMgrRequest;
-
-typedef struct _EssRMgrCaps
-{
- int capabilities;
- EssRMgrUsageInfo info;
-} EssRMgrCaps;
-
-typedef struct _EssRMgrUsage
-{
- int usage;
- EssRMgrUsageInfo info;
-} EssRMgrUsage;
-
-
-
-/**
- * EssRMgrInit
- *
- * Initialize resource manager
- */
-bool EssRMgrInit();
-
-/**
- * EssRMgrTerm
- *
- * Terminate resource manager
- */
-void EssRMgrTerm();
-
-/**
- * EssRMgrCreate
- *
- * Create an Essos resource manager context.
- */
-EssRMgr* EssRMgrCreate();
-
-/**
- * EssRMgrDestroy
- *
- * Destroy an Essos resource manager context.
- */
-void EssRMgrDestroy( EssRMgr *rm );
-
-/**
- * EssRMgrGetPolicyPriorityTie
- *
- * Get the policy for priority ties. Returns true if requester
- * wins priority tie, false otherwise
- */
-bool EssRMgrGetPolicyPriorityTie( EssRMgr *rm );
-
-/**
- * EssRMgrGetAVState
- *
- * Get aggregate AV state. Specified as value from the enum EssRMgrResState
- */
-bool EssRMgrGetAVState( EssRMgr *rm, int *state );
-
-/**
- * EssRMgrResourceGetCount
- *
- * Get number of instances of specified resource type
- */
-int EssRMgrResourceGetCount( EssRMgr *rm, int type );
-
-/**
- * EssRMgrResourceGetOwner
- *
- * Get current owner of specified resource
- */
-bool EssRMgrResourceGetOwner( EssRMgr *rm, int type, int id, int *client, int *priority );
-
-/**
- * EssRMgrResourceGetCaps
- *
- * Get capabilities info for specified resource
- */
-bool EssRMgrResourceGetCaps( EssRMgr *rm, int type, int id, EssRMgrCaps *caps );
-
-/**
- * EssRMgrResourceGetState
- *
- * Get state of the specified resource. Specified as value from the enum EssRMgrResState
- */
-bool EssRMgrResourceGetState( EssRMgr *rm, int type, int id, int *state );
-
-/**
- * EssRMgrResourceSetState
- *
- * Set state of the specified resource. Specified as value from the enum EssRMgrResState.
- * Only the current owner can set the state.
- */
-bool EssRMgrResourceSetState( EssRMgr *rm, int type, int id, int state );
-
-/**
- * EssRMgrRequestResource
- *
- * Request ownership of an instance of the specified resource.
- *
- * The caller provides details of the request in the EssRMgrRequest structure including the intended usage constraints,
- * request priority, if the request can be asynchronous, and a notification callback. This call back will be
- * invoked for asynchronous grant and revocation events. Prior to returning, the requestId field of the supplied EssRMgrRequest
- * structure is assigned a value. This value can be used in subsequent calls requiring a requestId until the
- * id is invalidated by calling EssRMgrReleaseResource or EssRMgrRequestCancel.
- */
-bool EssRMgrRequestResource( EssRMgr *rm, int type, EssRMgrRequest *req );
-
-/**
- * EssRMgrReleaseResource
- *
- * Release ownership of a resource.
- */
-void EssRMgrReleaseResource( EssRMgr *rm, int type, int id );
-
-/**
- * EssRMgrUsageSetPriority
- *
- * Update the priority of a resource request. This may result
- * in a change of resource ownership.
- */
-bool EssRMgrRequestSetPriority( EssRMgr *rm, int type, int requestId, int priority );
-
-/**
- * EssRMgrRequestSetUsage
- *
- * Update the usage of a resource request. This may result
- * in a change or resource ownership.
- */
-bool EssRMgrRequestSetUsage( EssRMgr *rm, int type, int requestId, EssRMgrUsage *usage );
-
-/**
- * EssRMgrRequestCancel
- *
- * Cancel a resource request.
- */
-void EssRMgrRequestCancel( EssRMgr *rm, int type, int requestId );
-
-/**
- * EssRMgrDumpState
- *
- * Emit state data to log output
- */
-void EssRMgrDumpState( EssRMgr *rm );
-
-#if defined(__cplusplus)
-} //extern "C"
-#endif
-
-#endif
-
diff --git a/westeros/essos/libessosrmgr.so b/westeros/essos/libessosrmgr.so
deleted file mode 100644
index 8e9fb19..0000000
--- a/westeros/essos/libessosrmgr.so
+++ /dev/null
Binary files differ