[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-clientapps-cvs
Subject:    [Clientapps-cvs] symbianMmf/audiocontroller installMMF.pcf,1.5,1.6
From:       shashikm () helixcommunity ! org
Date:       2010-01-15 10:37:35
Message-ID: 201001151035.o0FAZtcR021393 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/clientapps/symbianMmf/audiocontroller
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv31672

Modified Files:
	installMMF.pcf 
Log Message:

"Nokia submits this code under the terms of a commercial contribution agreement with \
RealNetworks, and I am authorized to contribute this code under said agreement."

Modified by:  ext-shashi.merapala@nokia.com

Reviewed by:  ashish.as.gupta@nokia.com, ehyche@real.com

Date:  01/12/2010

Project:  SymbianMmf_wm

Error Id:  ESLM-7YHD9L

Synopsis:  Helix_wmv controller: Conflict between the list from SupportsMimeType and \
actually video type (mp4) for video playback

Overview:  The WMV Extension Controller needs to be rolled up into the rest of Helix \
so that the Helix audio/video controllers support the Windows Media content.  
Solution:  Diffs attached

Files removed:  The folder ‘wmvextcontroller’ and its contents are removed from \
\clientapps\symbianMmf\   
Files added:  None

Files modified:  \client\build\BIF\hxclient_2_1_0_cayennes.bif
                 \client\build\BIF\hxclient_4_2_0_brizo.bif
                 \common\build\BIF\helix.bif
                 \clientapps\symbianMmf\videocontroller\installMMF.pcf
                 \clientapps\symbianMmf\videocontroller\MmfSis
                 \clientapps\symbianMmf\audiocontroller\installMMF.pcf
                 \clientapps\symbianMmf\audiocontroller\controllersis   
                 \clientapps\symbianMmf\videocontroller\101F8513.rss
                 \clientapps\symbianMmf\audiocontroller\10207B64.rss
                 \datatype\tools\metadataeng\engine\platform\symbian\hxmetadata_dlls.txt
  
Image size and heap use impact:  Approx. 289 kb of space saved on image creation

Module release testing (STIF):  Passed

Test case(s) added:  No

Memory leak check performed:  Yes. No new leaks introduced 

Platforms and profiles build verified:  helix-client-s60-52-mmf-mdf-dsp

Platforms and profiles functionality verified:  armv5, winscw 

Branch:  210CayS, HEAD, 420Brizo



Index: installMMF.pcf
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/audiocontroller/installMMF.pcf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- installMMF.pcf	13 Dec 2007 18:23:27 -0000	1.5
+++ installMMF.pcf	15 Jan 2010 10:37:33 -0000	1.6
@@ -120,6 +120,9 @@
 #
 lib_names = []
 
+# Plugin Dlls [built separately] that need to be included to the *dll_names*.txt \
files +additional_lib_names = []
+
 # some dlls like vidplin aggregate functionality offered individually with
 # other dlls; this list tracks those dlls that can be removed from the list
 # of dlls to install because another dll duplicates or replaces the functionality
@@ -170,7 +173,10 @@
      'arma'            : 'datatype/mp4/audio/mdf/[target]/arma.dll',
      'hxmetadataeng'   : 'datatype/xps/fileformat/[target]/hxmetadataeng.dll',
      'hxmedpltfm'  : 'client/medpltfm/[target]/hxmedpltfm.dll',
-     'hxmedplyeng'  : 'client/core/[target]/hxmedplyeng.dll'
+     'hxmedplyeng'  : 'client/core/[target]/hxmedplyeng.dll',
+     'asfff'           : 'datatype/wm/fileformat/[target]/asfff.dll',
+     'wma9'            : 'datatype/mdf/audio/arm/wma/[target]/wma9.dll',
+     'wmarender'       : 'datatype/wm/audio/renderer/[target]/wmarender.dll'
 }
 
 #
@@ -200,10 +206,23 @@
         if (item not in newList):
             newList.append(item)
     return newList
+    
+def AddAdditionalDLLs(*files):
+    global additional_lib_names      
+    for f in files:
+        additional_lib_names.append(f)    
 
 Add('hxmedpltfm')
 Add('hxmedplyeng')
 
+# always add asf file format
+Add('asfff')
+Add('wma9')
+Add('wmarender')
+
+# add hxwmdrmplugin to *dll_names*.txt 
+AddAdditionalDLLs('hxwmdrmplugin')
+
 if project.IsDefined("HELIX_FEATURE_METADATAENG"):
     Add('hxmetadataeng')
 
@@ -254,6 +273,13 @@
     path += ".dll"
     path = os.path.normpath(path)
     lib_files_copy.append(path)
+    
+additional_lib_names_copy = []
+for f in additional_lib_names:
+    path = os.path.join(playerDllDir, f)
+    path += ".dll"
+    path = os.path.normpath(path)
+    additional_lib_names_copy.append(path)    
 
 #
 # payld_dll_files, payld_rsc_files


_______________________________________________
Clientapps-cvs mailing list
Clientapps-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/clientapps-cvs


[prev in list] [next in list] [prev in thread] [next in thread]