diff -r 128eb6a32b84 -r 8dfd592727cb khronosfws/openmax_al/src/engine/xaengine.h --- a/khronosfws/openmax_al/src/engine/xaengine.h Thu May 27 13:20:50 2010 +0300 +++ b/khronosfws/openmax_al/src/engine/xaengine.h Wed Jun 23 18:47:10 2010 +0300 @@ -1,19 +1,19 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ + * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Nokia Corporation - initial contribution. + * + * Contributors: + * + * Description: Engine Implementation Header + * + */ #ifndef XAENGINE_H #define XAENGINE_H @@ -29,40 +29,38 @@ /** MACROS **/ - /** TYPES **/ - /** ENUMERATIONS **/ /* Enumeration for interfaces that Engine supports. */ typedef enum -{ + { ENGINE_OBJECTITF, ENGINE_ENGINEITF, ENGINE_DIMITF, ENGINE_THREADSYNCITF, -/* - ENGINE_CONFIGEXTENSIONSITF, - ENGINE_DEVICEVOLUMEITF, -*/ + /* + ENGINE_CONFIGEXTENSIONSITF, + ENGINE_DEVICEVOLUMEITF, + */ ENGINE_AUDIOIODEVICECAPAITF, -/* ENGINE_AUDIODECODERCAPAITF,*/ + /* ENGINE_AUDIODECODERCAPAITF,*/ ENGINE_AUDIOENCODERCAPAITF, -/* - ENGINE_CAMERACAPAITF, - ENGINE_IMAGEDECODERCAPAITF, - ENGINE_IMAGEENCODERCAPAITF, - ENGINE_VIDEODECODERCAPAITF, - ENGINE_VIDEOENCODERCAPAITF, -*/ + /* + ENGINE_CAMERACAPAITF, + ENGINE_IMAGEDECODERCAPAITF, + ENGINE_IMAGEENCODERCAPAITF, + ENGINE_VIDEODECODERCAPAITF, + ENGINE_VIDEOENCODERCAPAITF, + */ ENGINE_ITFCOUNT -} XAEngineInterfaces; + } XAEngineInterfaces; /** STRUCTURES **/ /* Specification for XAEngineImpl. */ typedef struct XAEngineImpl_ -{ + { /* Parent for XAEngineImpl */ XAObjectItfImpl baseObj; @@ -72,10 +70,10 @@ //actual adpatation context can point to either MMF or GST implementations FrameworkMap *frameworkMap; XACapabilities* capabilities; - -/* void* adaptationGstCtx; - void* adaptationMmfCtx;*/ -} XAEngineImpl; + + /* void* adaptationGstCtx; + void* adaptationMmfCtx;*/ + } XAEngineImpl; /** METHODS **/