[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-datatype-cvs
Subject: [Datatype-cvs] tools/symbian_mediatoolkit Umakedll, NONE,
From: rohitratri () helixcommunity ! org
Date: 2011-04-29 16:55:49
Message-ID: 201104291655.p3TGtnuN004482 () mailer ! progressive-comp ! com
[Download RAW message or body]
Update of /cvsroot/datatype/tools/symbian_mediatoolkit
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv4821
Added Files:
Tag: hxclient_4_2_0_brizo
Umakedll Umakelib
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with \
Real Networks, and I am authorized to contribute this code under said agreement."
Modified by
rohit.atri@nokia.com
Reviewed by:
girish.shetty@nokia.com
RC Id:
Date: 20/04/2011
Project: SymbianMmf_wm
Synopsis: Enabling MTK in Ribosome build in Brizo 420
Overview:
This commit is to enable MTK in the Ribosome build in Brizo420. This includes changes \
to brizo420 BIF and UMAKE files within MTK module.
- datatype/symbian_mediatoolkit/umakefil now refers to the 3 newly added umake files \
(see below)
- mtk_utility has been made a STATIC LIBRARY to conform with the structure followed \
by metadatengine - (The only function of this lib is to dynamically load the \
mtkengine dll.)
- new module ids created for Symbian_mediatookit ( \
datatype_tools_symbian_mediatoolkit_main) and Symbian_mediatoolkit/mtk_utility \
(datatype_tools_symbian_mediatoolkit_mtk_utility) and a wrapper module id \
(datatype_tools_symbian_mediatoolkit) for both in the brizo420 bif
Files added:
datatype/symbian_mediatoolkit/umakelib
datatype/symbian_mediatoolkit/umakedll
datatype/symbian_mediatoolkit/mtk_utility/umakefil
Files modified:
datatype/symbian_mediatoolkit/umakefil
client/build/hxclient_4_2_0_brizo.bif
Image Size and Heap Use impact:
Module Release testing (STIF): Not run
Test case(s) Added: No
Memory leak check performed: Passed, No additional leaks introduced.
Platforms and Profiles Build Verified: helix-client-symbian-4
Platforms and Profiles Functionality verified: armv5
Branch: 420Brizo
--- NEW FILE: Umakedll ---
#
# ***** BEGIN LICENSE BLOCK *****
# Source last modified: $Id: Umakedll,v 1.1.2.1 2011/04/29 16:55:46 rohitratri Exp $
#
# Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
#
# The contents of this file, and the files included with this file,
# are subject to the current version of the RealNetworks Public
# Source License (the "RPSL") available at
# http://www.helixcommunity.org/content/rpsl unless you have licensed
# the file under the current version of the RealNetworks Community
# Source License (the "RCSL") available at
# http://www.helixcommunity.org/content/rcsl, in which case the RCSL
# will apply. You may also obtain the license terms directly from
# RealNetworks. You may not use this file except in compliance with
# the RPSL or, if you have a valid RCSL with RealNetworks applicable
# to this file, the RCSL. Please see the applicable RPSL or RCSL for
# the rights, obligations and limitations governing use of the
# contents of the file.
#
# Alternatively, the contents of this file may be used under the
# terms of the GNU General Public License Version 2 (the
# "GPL") in which case the provisions of the GPL are applicable
# instead of those above. If you wish to allow use of your version of
# this file only under the terms of the GPL, and not to allow others
# to use your version of this file under the terms of either the RPSL
# or RCSL, indicate your decision by deleting the provisions above
# and replace them with the notice and other provisions required by
# the GPL. If you do not delete the provisions above, a recipient may
# use your version of this file under the terms of any one of the
# RPSL, the RCSL or the GPL.
#
# This file is part of the Helix DNA Technology. RealNetworks is the
# developer of the Original Code and owns the copyrights in the
# portions it created.
#
# This file, and the files included with this file, is distributed
# and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
# KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
# ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
# ENJOYMENT OR NON-INFRINGEMENT.
#
# Technology Compatibility Kit Test Suite(s) Location:
# http://www.helixcommunity.org/content/tck
#
# Contributor(s): Nokia
#
# ***** END LICENSE BLOCK *****
#
UmakefileVersion(2,2)
# Module includes
project.AddModuleIncludes("common/include")
project.AddModuleIncludes("client/include")
project.AddModuleIncludes("common/system/pub")
project.AddModuleIncludes("common/system/pub/platform/symbian")
project.AddModuleIncludes("client/common/container/pub")
project.AddModuleIncludes("common/fileio/pub")
project.AddModuleIncludes("common/fileio/pub/platform/symbian")
project.AddModuleIncludes("common/dbgtool/pub")
project.AddModuleIncludes("common/util/pub")
project.AddModuleIncludes("common/container/pub")
project.AddModuleIncludes("client/common/system/pub")
project.AddModuleIncludes("client/common/util/pub")
project.AddModuleIncludes("common/log/logutil/pub")
project.AddModuleIncludes("common/runtime/pub")
# Media tool kit includes
project.AddIncludes("./client/pub")
project.AddIncludes("./server/pub")
project.AddIncludes("./tools/pub")
project.AddIncludes("./common/pub")
project.AddIncludes("./engine/pub")
project.AddIncludes("./tools/videoframeiterator")
project.AddIncludes("./tools/thumbnail")
project.AddIncludes("./client")
project.AddIncludes("./common")
# symbian client
project.AddSources("client/mtkclient.cpp ")
# symbian server
# Common
project.AddSources("common/mtktoolsessfactory.cpp ")
# Tool / Video frame iterator tool
project.AddSources("tools/videoframeiterator/mtkvideoframeiteratorimpl.cpp",
"tools/videoframeiterator/mtkvideoframeiterclient.cpp",
"tools/videoframeiterator/mtkvfitoolsession.cpp")
# Tool / Thumbnail tool
project.AddSources("tools/thumbnail/mtkthumbnailimpl.cpp",
"tools/thumbnail/mtkthumbnailclient.cpp",
"tools/thumbnail/mtktntoolsession.cpp")
# Root files
project.AddSources("mtkengineplugin.cpp",
"mediatoolkitbackend.cpp")
project.AddModuleLibraries("datatype/tools/symbian_mediatoolkit[mtkenginelib]",
"common/log/logutil[logutillib]",
"common/dbgtool[debuglib]",
"common/runtime[runtlib]",
"common/system[syslib]",
"common/container[contlib]",
"common/util[utillib]",
"common/fileio[fileiolib]",
"client/common/container[contclntlib]",
"client/common/util[utlclntlib]")
project.AddSystemLibraries("efsrv.lib",
"libc.lib",
"libm.lib",
"euser.lib",
"hal.lib",
"AKNNOTIFY.LIB",
"flogger.lib",
"ecom.lib",
"charconv.lib",
"mmfserverbaseclasses.lib",
"caf.lib",
"apgrfx.lib", "apmime.lib",
"estor.lib")
project.ExportFunction("MtkCreateEngine",
"CMediaToolkit** ppObj")
project.ExportFunction("MtkCreateMediaSource",
"CMtkMediaSource** ppSourceObj",
"CMtkMediaSource::eMtkSourceType eSourceType")
DLLTarget('mtkengine')
DependTarget()
--- NEW FILE: Umakelib ---
#
# ***** BEGIN LICENSE BLOCK *****
# Source last modified: $Id: Umakelib,v 1.1.2.1 2011/04/29 16:55:46 rohitratri Exp $
#
# Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
#
# The contents of this file, and the files included with this file,
# are subject to the current version of the RealNetworks Public
# Source License (the "RPSL") available at
# http://www.helixcommunity.org/content/rpsl unless you have licensed
# the file under the current version of the RealNetworks Community
# Source License (the "RCSL") available at
# http://www.helixcommunity.org/content/rcsl, in which case the RCSL
# will apply. You may also obtain the license terms directly from
# RealNetworks. You may not use this file except in compliance with
# the RPSL or, if you have a valid RCSL with RealNetworks applicable
# to this file, the RCSL. Please see the applicable RPSL or RCSL for
# the rights, obligations and limitations governing use of the
# contents of the file.
#
# Alternatively, the contents of this file may be used under the
# terms of the GNU General Public License Version 2 (the
# "GPL") in which case the provisions of the GPL are applicable
# instead of those above. If you wish to allow use of your version of
# this file only under the terms of the GPL, and not to allow others
# to use your version of this file under the terms of either the RPSL
# or RCSL, indicate your decision by deleting the provisions above
# and replace them with the notice and other provisions required by
# the GPL. If you do not delete the provisions above, a recipient may
# use your version of this file under the terms of any one of the
# RPSL, the RCSL or the GPL.
#
# This file is part of the Helix DNA Technology. RealNetworks is the
# developer of the Original Code and owns the copyrights in the
# portions it created.
#
# This file, and the files included with this file, is distributed
# and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
# KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
# ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
# ENJOYMENT OR NON-INFRINGEMENT.
#
# Technology Compatibility Kit Test Suite(s) Location:
# http://www.helixcommunity.org/content/tck
#
# Contributor(s): Nokia
#
# ***** END LICENSE BLOCK *****
#
UmakefileVersion(2,2)
# Module includes
project.AddModuleIncludes("common/include")
project.AddModuleIncludes("client/include")
project.AddModuleIncludes("common/system/pub")
project.AddModuleIncludes("common/system/pub/platform/symbian")
project.AddModuleIncludes("client/common/container/pub")
project.AddModuleIncludes("common/fileio/pub")
project.AddModuleIncludes("common/fileio/pub/platform/symbian")
project.AddModuleIncludes("common/dbgtool/pub")
project.AddModuleIncludes("common/util/pub")
project.AddModuleIncludes("common/container/pub")
project.AddModuleIncludes("client/common/system/pub")
project.AddModuleIncludes("client/common/util/pub")
project.AddModuleIncludes("common/log/logutil/pub")
project.AddModuleIncludes("common/runtime/pub")
project.AddModuleIncludes("common/include")
# Media tool kit includes
project.AddIncludes("./client/pub")
project.AddIncludes("./server/pub")
project.AddIncludes("./tools/pub")
project.AddIncludes("./common/pub")
project.AddIncludes("./engine/pub")
project.AddIncludes("./client")
project.AddIncludes("./common")
# symbian server
project.AddSources("server/mtksession.cpp ")
project.AddSources("server/mtkserverctx.cpp ")
# Common
project.AddSources("common/mtkutils.cpp ")
project.AddSources("common/mtkmediapktimpl.cpp ")
project.AddSources("common/mtkmetadataparserimpl.cpp ")
project.AddSources("common/mtkmetadatahelper.cpp ")
project.AddSources("common/mtkmediasourceimpl.cpp ")
project.AddSources("common/clientserverq.cpp ")
# Root files
project.AddSources("engine/mpengine.cpp",
"engine/mpffhandler.cpp",
"engine/mpvideoprocessor.cpp")
LibraryTarget('mtkenginelib')
DependTarget()
_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic