RIO-8726: Remove usage of USE_CML2_CONFIG since all the builds have been converted...

Change-Id: I12442984ea5430cdede53aa63a408eea7940e4d4

diff --git a/Config.mk b/Config.mk
index 0973e90..070a399 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -4,7 +4,7 @@ ifneq ($(strip $(EXTERNAL_OPENCORE_CONFIG_ONCE)),true)
 
   PV_TOP := $(my-dir)
 
-  PV_CFLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DUSE_CML2_CONFIG
+  PV_CFLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
   ifeq ($(PLATFORM_VERSION),1.5)
   else ifeq ($(PLATFORM_VERSION),1.6)
   else ifeq ($(PLATFORM_VERSION),2.1)
@@ -45,7 +45,6 @@ ifneq ($(strip $(EXTERNAL_OPENCORE_CONFIG_ONCE)),true)
        $(PV_TOP)/engines/player/config/android \
        $(PV_TOP)/engines/player/include \
        $(PV_TOP)/nodes/pvmediaoutputnode/include \
-       $(PV_TOP)/nodes/pvdownloadmanagernode/config/opencore \
        $(PV_TOP)/pvmi/pvmf/include \
        $(PV_TOP)/fileformats/mp4/parser/config/opencore \
        $(PV_TOP)/oscl/oscl/config/android \

diff --git a/build_config/common/local.mk b/build_config/common/local.mk
index 65c2fa9..29ae1df 100644 (file)
--- a/build_config/common/local.mk
+++ b/build_config/common/local.mk
@@ -7,16 +7,6 @@ CML2_BASE_OUTPUT_NAME := pv_config
 include $(MK)/cml2.mk
 
 # The following lines should come after the inclusion of $(MK)/cml2.mk
-
-# define some basic preprocessor conditionals that may be needed
-# to get the pv_config.h file to be included
-#Replace double qoutes, escape spaces and prefix -D to each flag.
-XCONFIG_FLAGS:=$(call process_config_macros,$(strip $(CONFIG_FLAGS)))
-
-# $(info config_flags = $(CONFIG_FLAGS), xconfig_flags = $(XCONFIG_FLAGS))
-
-CPPFLAGS += $(XCONFIG_FLAGS)
-
 INCDIRS += -I$(SRC_ROOT)/oscl/oscl/config/$(BUILD_ARCH) -I$(SRC_ROOT)/oscl/oscl/config/shared
 
 INCDEPLIST := $(SRC_ROOT)/oscl/oscl/config/$(BUILD_ARCH),$(SRC_ROOT)/oscl/oscl/config/shared

diff --git a/build_config/common/rules.cml b/build_config/common/rules.cml
index a719065..0c2acee 100644 (file)
--- a/build_config/common/rules.cml
+++ b/build_config/common/rules.cml
@@ -769,8 +769,6 @@ derive TARGET_aggregate from (pv_so_name.opencore_common_so_name.
 
 # Derive compile directives
 derive USE_LOADABLE_MODULES from module_support==y 
-derive cml2_support_flag from 1==1 ? "USE_CML2_CONFIG" : "" #Should be always set when using CML2
-derive CONFIG_FLAGS from cml2_support_flag
 
 # Concatenate all the derived makefile paths to get the list of library paths
 # LIBDIR_static is the list of libraries selected to build as static library

diff --git a/build_config/opencore_dynamic/pv_config.h b/build_config/opencore_dynamic/pv_config.h
index fe892ae..a7fc1bc 100644 (file)
--- a/build_config/opencore_dynamic/pv_config.h
+++ b/build_config/opencore_dynamic/pv_config.h
@@ -585,7 +585,7 @@
 #define nodes_common_headers_y_mk ""
 #define pvbroadcastwithpvrfsp_y_lib ""
 #define pvflvparser_node_so_name ""
-#define cml2_support_flag "USE_CML2_CONFIG"
+#define SOLIBS_opencore_common "-losclbase -losclerror -losclmemory -losclproc -losclregcli -losclregserv -losclutil -losclio -lpvlogger  -loscllib -lomx_mastercore_lib                -lpv_avc_common_lib -lpv_amr_nb_common_lib -lpvgsmamrparser -lgetactualaacconfig -lm4v_config -lpv_config_parser -lcolorconvert -lthreadsafe_callback_ao -lpvmediadatastruct -lpvmimeutils -lpvgendatastruct -lpvmf -lpvfileoutputnode -lpvmediainputnode -lpvomxencnode -lpvmiofileinput -lpvmioaviwavfileinput -lpvavifileparser -lpvthreadmessaging -lpvmiofileoutput -lpvmediaoutputnode -lpvomxvideodecnode -lpvomxaudiodecnode -lpvomxbasedecnode -lpvlatmpayloadparser -lpvwav -lpvfileparserutils -lscsp"
 #define MODS_omx_mp3dec_sharedlibrary "-lomx_sharedlibrary -lopencore_common"
 #define pvplayer_engine_y_lib ""
 #define SOLIBS_pvmtp ""
@@ -826,7 +826,6 @@
 #define wmvdecoder_m_lib ""
 #define SOLIBS_pvrealsupportcommon ""
 #define pvdtcp_mbds_so_m_mk ""
-#define CONFIG_FLAGS "USE_CML2_CONFIG"
 #define mp4recognizer_utility_y_mk ""
 #define REGISTER_OMX_H263_COMPONENT 1
 #define pvmp4reginterface_m_lib "-lpvmp4reginterface"
@@ -1076,7 +1075,6 @@
 #define pvmp4ffcomposernodeopencore_y_mk ""
 #define wmavoicedecoder_imp_m_lib ""
 #define pvsocketnode_m_lib "-lpvsocketnode"
-#define SOLIBS_opencore_common "-losclbase -losclerror -losclmemory -losclproc -losclregcli -losclregserv -losclutil -losclio -lpvlogger  -loscllib -lomx_mastercore_lib                -lpv_avc_common_lib -lpv_amr_nb_common_lib -lpvgsmamrparser -lgetactualaacconfig -lm4v_config -lpv_config_parser -lcolorconvert -lthreadsafe_callback_ao -lpvmediadatastruct -lpvmimeutils -lpvgendatastruct -lpvmf -lpvfileoutputnode -lpvmediainputnode -lpvomxencnode -lpvmiofileinput -lpvmioaviwavfileinput -lpvavifileparser -lpvthreadmessaging -lpvmiofileoutput -lpvmediaoutputnode -lpvomxvideodecnode -lpvomxaudiodecnode -lpvomxbasedecnode -lpvlatmpayloadparser -lpvwav -lpvfileparserutils -lscsp"
 #define pvgsmamrparser_m_mk "/fileformats/rawgsmamr/parser/build/make"
 #define pvprotocolengine_asfstreamingreg_link_type "loaded"
 #define rvdecoder_m_mk ""

diff --git a/build_config/opencore_dynamic/pv_config_derived.mk b/build_config/opencore_dynamic/pv_config_derived.mk
index ae08f47..9da523d 100644 (file)
--- a/build_config/opencore_dynamic/pv_config_derived.mk
+++ b/build_config/opencore_dynamic/pv_config_derived.mk
@@ -102,7 +102,7 @@ pvomxbasedecnode_y_mk=""
 nodes_common_headers_y_mk=""
 pvbroadcastwithpvrfsp_y_lib=""
 pvflvparser_node_so_name=""
-cml2_support_flag="USE_CML2_CONFIG"
+SOLIBS_opencore_common="-losclbase -losclerror -losclmemory -losclproc -losclregcli -losclregserv -losclutil -losclio -lpvlogger  -loscllib -lomx_mastercore_lib                -lpv_avc_common_lib -lpv_amr_nb_common_lib -lpvgsmamrparser -lgetactualaacconfig -lm4v_config -lpv_config_parser -lcolorconvert -lthreadsafe_callback_ao -lpvmediadatastruct -lpvmimeutils -lpvgendatastruct -lpvmf -lpvfileoutputnode -lpvmediainputnode -lpvomxencnode -lpvmiofileinput -lpvmioaviwavfileinput -lpvavifileparser -lpvthreadmessaging -lpvmiofileoutput -lpvmediaoutputnode -lpvomxvideodecnode -lpvomxaudiodecnode -lpvomxbasedecnode -lpvlatmpayloadparser -lpvwav -lpvfileparserutils -lscsp"
 MODS_omx_mp3dec_sharedlibrary="-lomx_sharedlibrary -lopencore_common"
 pvplayer_engine_y_lib=""
 SOLIBS_pvmtp=""
@@ -343,7 +343,6 @@ USING_OMX=1
 wmvdecoder_m_lib=""
 SOLIBS_pvrealsupportcommon=""
 pvdtcp_mbds_so_m_mk=""
-CONFIG_FLAGS="USE_CML2_CONFIG"
 mp4recognizer_utility_y_mk=""
 REGISTER_OMX_H263_COMPONENT=1
 pvmp4reginterface_m_lib="-lpvmp4reginterface"
@@ -593,7 +592,6 @@ omx_avcenc_component_imp_m_lib=""
 pvmp4ffcomposernodeopencore_y_mk=""
 wmavoicedecoder_imp_m_lib=""
 pvsocketnode_m_lib="-lpvsocketnode"
-SOLIBS_opencore_common="-losclbase -losclerror -losclmemory -losclproc -losclregcli -losclregserv -losclutil -losclio -lpvlogger  -loscllib -lomx_mastercore_lib                -lpv_avc_common_lib -lpv_amr_nb_common_lib -lpvgsmamrparser -lgetactualaacconfig -lm4v_config -lpv_config_parser -lcolorconvert -lthreadsafe_callback_ao -lpvmediadatastruct -lpvmimeutils -lpvgendatastruct -lpvmf -lpvfileoutputnode -lpvmediainputnode -lpvomxencnode -lpvmiofileinput -lpvmioaviwavfileinput -lpvavifileparser -lpvthreadmessaging -lpvmiofileoutput -lpvmediaoutputnode -lpvomxvideodecnode -lpvomxaudiodecnode -lpvomxbasedecnode -lpvlatmpayloadparser -lpvwav -lpvfileparserutils -lscsp"
 pvgsmamrparser_m_mk="/fileformats/rawgsmamr/parser/build/make"
 pvprotocolengine_asfstreamingreg_link_type="loaded"
 rvdecoder_m_mk=""

diff --git a/codecs_v2/omx/omx_common/include/pv_omxcore.h b/codecs_v2/omx/omx_common/include/pv_omxcore.h
index dbff5c3..a0fcdd4 100644 (file)
--- a/codecs_v2/omx/omx_common/include/pv_omxcore.h
+++ b/codecs_v2/omx/omx_common/include/pv_omxcore.h
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,7 +53,6 @@
 #endif
 #endif
 
-
 #if USE_DYNAMIC_LOAD_OMX_COMPONENTS
 #ifndef OSCL_SHARED_LIBRARY_H_INCLUDED
 #include "oscl_shared_library.h"

diff --git a/codecs_v2/omx/omx_common/src/pv_omxcore.cpp b/codecs_v2/omx/omx_common/src/pv_omxcore.cpp
index 4d4bb5e..0b675e7 100644 (file)
--- a/codecs_v2/omx/omx_common/src/pv_omxcore.cpp
+++ b/codecs_v2/omx/omx_common/src/pv_omxcore.cpp
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,8 +51,6 @@
 #include "pv_omx_config_parser.h"
 #endif
 
-// pv_omxregistry.h is only needed if NOT using CML2
-
 #include "oscl_init.h"
 
 // Use default DLL entry point

diff --git a/codecs_v2/omx/omx_common/src/pv_omxregistry.cpp b/codecs_v2/omx/omx_common/src/pv_omxregistry.cpp
index cd2f570..3ffd8eb 100644 (file)
--- a/codecs_v2/omx/omx_common/src/pv_omxregistry.cpp
+++ b/codecs_v2/omx/omx_common/src/pv_omxregistry.cpp
@@ -30,9 +30,6 @@
 #include "OMX_Component.h"
 #include "pv_omxcore.h"
 
-// pv_omxregistry.h is only needed if NOT using CML2
-
-
 // Use default DLL entry point
 #ifndef OSCL_DLL_H_INCLUDED
 #include "oscl_dll.h"

diff --git a/codecs_v2/omx/omx_mastercore/src/pv_omxmastercore.cpp b/codecs_v2/omx/omx_mastercore/src/pv_omxmastercore.cpp
index 80b1cd9..71b2794 100644 (file)
--- a/codecs_v2/omx/omx_mastercore/src/pv_omxmastercore.cpp
+++ b/codecs_v2/omx/omx_mastercore/src/pv_omxmastercore.cpp
@@ -34,7 +34,15 @@
 
 #define MAX_PATHNAME_LENGTH 512
 
+// Setting up the default values if not already defined by CML2
 
+#ifndef MAX_NUMBER_OF_OMX_CORES
+#define MAX_NUMBER_OF_OMX_CORES 10
+#endif
+
+#ifndef MAX_NUMBER_OF_OMX_COMPONENTS
+#define MAX_NUMBER_OF_OMX_COMPONENTS 50
+#endif
 
 typedef class OMXMasterCoreGlobalData
 {

diff --git a/codecs_v2/utilities/colorconvert/include/colorconv_config.h b/codecs_v2/utilities/colorconvert/include/colorconv_config.h
index 0864cc9..78d98fb 100644 (file)
--- a/codecs_v2/utilities/colorconvert/include/colorconv_config.h
+++ b/codecs_v2/utilities/colorconvert/include/colorconv_config.h
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,5 +54,22 @@
 
 *********************************************************************************************/
 
+// Setting up the default values if not already defined by CML2
+
+#ifndef UY0VY1
+#define UY0VY1 1
+#endif
+
+#ifndef Y1VY0U
+#define Y1VY0U 0
+#endif
+
+#ifndef Y0VY1U
+#define Y0VY1U 0
+#endif
+
+#ifndef RGB_FORMAT
+#define RGB_FORMAT  1
+#endif
 
 #endif // COLORCONV_CONFIG_H_INCLUDED

diff --git a/codecs_v2/video/m4v_h263/dec/src/mp4def.h b/codecs_v2/video/m4v_h263/dec/src/mp4def.h
index f199d82..a77b16f 100644 (file)
--- a/codecs_v2/video/m4v_h263/dec/src/mp4def.h
+++ b/codecs_v2/video/m4v_h263/dec/src/mp4def.h
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,6 +49,7 @@ typedef int16 MOT;   /*  : "int" type runs faster on RISC machine */
 /*    not well-optimized.    04/19/2000.                        */
 #define CLIP_THE_RANGE(x,LB,UB) if (x<LB) x = LB; else if (x>UB) x = UB
 
+// Setting up the default values if not already defined by CML2
 
 #define PV_MPEG4  0x0
 #define PV_H263   0x1

diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
index b07019b..b3a7aff 100644 (file)
--- a/engines/2way/src/pv_2way_sdkinfo.h
+++ b/engines/2way/src/pv_2way_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PV2WAY_ENGINE_SDKINFO_LABEL "1306418"
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1306603"
 #define PV2WAY_ENGINE_SDKINFO_DATE 0x20100308
 
 #endif //PV_2WAY_SDKINFO_H_INCLUDED

diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h
index a048c4b..473d52a 100644 (file)
--- a/engines/author/src/pv_author_sdkinfo.h
+++ b/engines/author/src/pv_author_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1306418"
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1306603"
 #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100308
 
 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED

diff --git a/engines/player/build/make/player_config.mk b/engines/player/build/make/player_config.mk
deleted file mode 100644 (file)
index 27e9b2e..0000000
--- a/engines/player/build/make/player_config.mk
+++ /dev/null
@@ -1,107 +0,0 @@
-# The conditions in this makefile fragment would be removed once
-# the projects are configured using CML2.
-# It is not allowed to add any more conditions in this file.
-
-# Add the include path based on project to pick the right tunable and config header
-#
-ifeq ($(ARCHITECTURE),android)
-    XINCDIRS += -I ../../config/$(BUILD_ARCH)
-else
-    ifeq ($(FORMAT),3gpp)
-        XINCDIRS += -I ../../config/linux_3gpp
-    else
-        ifeq ($(ARCHITECTURE),panasonic_arm)
-            XINCDIRS += -I ../../config/$(BUILD_ARCH)
-         else
-            ifeq ($(ARCHITECTURE),panasonic_pc)
-                XINCDIRS += -I ../../config/$(BUILD_ARCH)
-            else
-                ifeq ($(ARCHITECTURE),nec_hsdpa_linux)
-                    XINCDIRS += -I ../../config/$(BUILD_ARCH)
-                else
-                    ifeq ($(ARCHITECTURE),nec_hsdpa_arm)
-                        XINCDIRS += -I ../../config/$(BUILD_ARCH)
-                    else
-                        ifeq ($(FORMAT),real)
-                            XINCDIRS += -I ../../config/linux_real
-                        else
-                            ifeq ($(FORMAT),asf)
-                                XINCDIRS += -I ../../config/linux_asf
-                            else
-                                ifeq ($(ARCHITECTURE),necel_arm)
-                                    XINCDIRS += -I ../../config/$(BUILD_ARCH)
-                                else
-                                    ifeq ($(FORMAT),android)
-                                        XINCDIRS += -I ../../config/android
-                                    else
-                                        ifeq ($(ARCHITECTURE),farnsworth_arm)
-                                            XINCDIRS += -I ../../config/$(BUILD_ARCH)
-                                        else
-                                            ifeq ($(FORMAT),linux_non_omx)
-                                                XINCDIRS += -I ../../config/linux_non_omx
-                                            else
-                                                XINCDIRS += -I ../../config/linux
-                                            endif
-                                        endif
-                                    endif
-                                endif
-                            endif
-                        endif
-                    endif
-                endif
-            endif
-         endif
-    endif
-endif
-
-# Pick the node registry based on project
-#
-ifeq ($(USE_CML2_CONFIG), 1)
-    SRCS += ../config/core/pv_player_node_registry_populator.cpp
-else
-    ifeq ($(ARCHITECTURE),panasonic_arm)
-        SRCS += ../config/$(BUILD_ARCH)/pv_player_node_registry_populator.cpp
-    else
-        ifeq ($(ARCHITECTURE),panasonic_pc)
-           SRCS += ../config/$(BUILD_ARCH)/pv_player_node_registry_populator.cpp
-               else
-            ifeq ($(ARCHITECTURE),nec_hsdpa_linux)
-                       SRCS += ../config/$(BUILD_ARCH)/pv_player_node_registry_populator.cpp
-               else
-               ifeq ($(ARCHITECTURE),nec_hsdpa_arm)
-                       SRCS += ../config/$(BUILD_ARCH)/pv_player_node_registry_populator.cpp
-               else
-                       ifeq ($(FORMAT),real)
-                       SRCS += ../config/linux_real/pv_player_node_registry_populator.cpp
-                       else
-                       ifeq ($(FORMAT),asf)
-                               SRCS += ../config/linux_asf/pv_player_node_registry_populator.cpp
-                       else
-                               ifeq ($(ARCHITECTURE),necel_arm)
-                               SRCS += ../config/$(BUILD_ARCH)/pv_player_node_registry_populator.cpp
-                               else
-                               ifeq ($(FORMAT),android)
-                                       SRCS += ../config/android/pv_player_node_registry_populator.cpp
-                               else
-                                       ifeq ($(ARCHITECTURE),farnsworth_arm)
-                                       SRCS += ../config/$(BUILD_ARCH)/pv_player_node_registry_populator.cpp
-                                       else
-                                           ifeq ($(FORMAT),linux_non_omx)
-                                           SRCS += ../config/linux_non_omx/pv_player_node_registry_populator.cpp
-                                           else
-                                           ifeq ($(FORMAT),3gpp)
-                                                   SRCS += ../config/linux_3gpp/pv_player_node_registry_populator.cpp
-                                           else
-                                                   SRCS += ../config/linux/pv_player_node_registry_populator.cpp
-                                           endif
-                                           endif
-                                       endif
-                               endif 
-                               endif
-                       endif
-                       endif
-                   endif
-           endif
-           endif
-       endif
-endif

diff --git a/engines/player/src/pv_player_engine.cpp b/engines/player/src/pv_player_engine.cpp
index da0b764..cdfbe3d 100644 (file)
--- a/engines/player/src/pv_player_engine.cpp
+++ b/engines/player/src/pv_player_engine.cpp
@@ -19,7 +19,6 @@
 
 #include "pv_player_config.h"
 
-
 #include "pv_player_sdkinfo.h"
 
 #include "pvmf_node_interface.h"

diff --git a/engines/player/src/pv_player_node_registry.h b/engines/player/src/pv_player_node_registry.h
index 750a17b..69b1471 100644 (file)
--- a/engines/player/src/pv_player_node_registry.h
+++ b/engines/player/src/pv_player_node_registry.h
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,7 +74,6 @@
 #include "oscl_file_handle.h"
 #endif
 
-
 class OsclSharedLibrary;
 class NodeRegistryPopulatorInterface;
 class RecognizerPopulatorInterface;

diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h
index 22febc8..4cd8755 100644 (file)
--- a/engines/player/src/pv_player_sdkinfo.h
+++ b/engines/player/src/pv_player_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVPLAYER_ENGINE_SDKINFO_LABEL "1306418"
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1306603"
 #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100308
 
 #endif //PV_PLAYER_SDKINFO_H_INCLUDED

diff --git a/engines/player/test/src/test_pv_player_engine_testset6.cpp b/engines/player/test/src/test_pv_player_engine_testset6.cpp
index 9477b1a..b762af8 100644 (file)
--- a/engines/player/test/src/test_pv_player_engine_testset6.cpp
+++ b/engines/player/test/src/test_pv_player_engine_testset6.cpp
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,8 +76,6 @@
 #include "pvmf_protocol_engine_node_events.h"
 #endif
 
-#include "pv_config.h"
-
 
 
 

diff --git a/nodes/pvdownloadmanagernode/config/opencore/pvmf_downloadmanager_config.h b/nodes/pvdownloadmanagernode/config/opencore/pvmf_downloadmanager_config.h
deleted file mode 100644 (file)
index 24ac7f6..0000000
--- a/nodes/pvdownloadmanagernode/config/opencore/pvmf_downloadmanager_config.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * 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 PVMF_DOWNLOADMANAGER_CONFIG_H_INCLUDED
-#define PVMF_DOWNLOADMANAGER_CONFIG_H_INCLUDED
-
-
-/*!
-** This file contains a set of 0/1 flags to be used to disable/enable
-** various features in download manager.
-*/
-
-/*!
-** Support progressive playback.
-*/
-#ifndef PVMF_DOWNLOADMANAGER_SUPPORT_PPB
-#define PVMF_DOWNLOADMANAGER_SUPPORT_PPB   1
-#endif
-
-/*!
-** A tunable parameter setting the number of TCP buffers to
-** use for progressive playback.
-*/
-#ifndef PVMF_DOWNLOADMANAGER_MIN_TCP_BUFFERS_FOR_PPB
-#define PVMF_DOWNLOADMANAGER_MIN_TCP_BUFFERS_FOR_PPB  8
-#endif
-
-/*!
-** A tunable parameter setting the MBDS cache size to
-** use for shoutcast in seconds.
-** PE node required jitter buffer size is 4 seconds.
-*/
-#ifndef PVMF_DOWNLOADMANAGER_CACHE_SIZE_FOR_SC_IN_SECONDS
-#define PVMF_DOWNLOADMANAGER_CACHE_SIZE_FOR_SC_IN_SECONDS  6
-#endif
-
-/*!
-** A tunable parameter setting the maximum clip bitrate supported
-** by shoutcast in kbps
-*/
-#ifndef PVMF_DOWNLOADMANAGER_MAX_BITRATE_FOR_SC
-#define PVMF_DOWNLOADMANAGER_MAX_BITRATE_FOR_SC  128
-#endif
-
-
-#endif // PVMF_DOWNLOADMANAGER_CONFIG_H_INCLUDED
-

diff --git a/nodes/pvdownloadmanagernode/include/pvmf_memorybufferdatastream_factory.h b/nodes/pvdownloadmanagernode/include/pvmf_memorybufferdatastream_factory.h
index 449a8d3..cd94918 100644 (file)
--- a/nodes/pvdownloadmanagernode/include/pvmf_memorybufferdatastream_factory.h
+++ b/nodes/pvdownloadmanagernode/include/pvmf_memorybufferdatastream_factory.h
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  * and limitations under the License.
  * -------------------------------------------------------------------
  */
-// only include pvmf_downloadmanager_config.h if CML2 is NOT being used
 
 #if(PVMF_DOWNLOADMANAGER_SUPPORT_PPB)
 

diff --git a/nodes/pvdownloadmanagernode/src/pvmf_downloadmanager_node.h b/nodes/pvdownloadmanagernode/src/pvmf_downloadmanager_node.h
index e0e52b7..a0c8253 100644 (file)
--- a/nodes/pvdownloadmanagernode/src/pvmf_downloadmanager_node.h
+++ b/nodes/pvdownloadmanagernode/src/pvmf_downloadmanager_node.h
@@ -68,8 +68,6 @@
 #include "cpm.h"
 #endif
 
-// only include pvmf_downloadmanager_config.h if CML2 is NOT being used
-
 #if(PVMF_DOWNLOADMANAGER_SUPPORT_PPB)
 #ifndef  PVMF_MEMORYBUFFERDATASTREAM_FACTORY_H_INCLUDED
 #include "pvmf_memorybufferdatastream_factory.h"

diff --git a/nodes/pvmp3ffparsernode/include/pvmf_mp3ffparser_defs.h b/nodes/pvmp3ffparsernode/include/pvmf_mp3ffparser_defs.h
index 743d26f..2be7de2 100644 (file)
--- a/nodes/pvmp3ffparsernode/include/pvmf_mp3ffparser_defs.h
+++ b/nodes/pvmp3ffparsernode/include/pvmf_mp3ffparser_defs.h
@@ -19,7 +19,6 @@
 #ifndef PVMF_MP3FFPARSER_DEFS_H_INCLUDED
 #define PVMF_MP3FFPARSER_DEFS_H_INCLUDED
 
-
 #ifndef OSCL_BASE_H_INCLUDED
 #include "oscl_base.h"
 #endif

diff --git a/nodes/pvmp3ffparsernode/src/pvmf_mp3ffparser_node.h b/nodes/pvmp3ffparsernode/src/pvmf_mp3ffparser_node.h
index 49e5f51..7e8bfe2 100644 (file)
--- a/nodes/pvmp3ffparsernode/src/pvmf_mp3ffparser_node.h
+++ b/nodes/pvmp3ffparsernode/src/pvmf_mp3ffparser_node.h
@@ -41,7 +41,6 @@
 #include "pvmf_mp3ffparser_outport.h"
 #endif
 
-
 #ifndef PVMF_SHOUTCAST_STREAM_PARSER_H_INCLUDED
 #include "pvmf_shoutcast_stream_parser.h"
 #endif

diff --git a/tools_v2/build/make/android_make_extras.mk b/tools_v2/build/make/android_make_extras.mk
index ed53944..13ee824 100644 (file)
--- a/tools_v2/build/make/android_make_extras.mk
+++ b/tools_v2/build/make/android_make_extras.mk
@@ -241,7 +241,7 @@ $1: FORCE
        $$(quiet) echo "  PV_TOP := $$(esc_dollar)(my-dir)" >> $$@
        $$(quiet) echo "" >> $$@
 
-       $$(quiet) echo "  PV_CFLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DUSE_CML2_CONFIG" >> $$@
+       $$(quiet) echo "  PV_CFLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" >> $$@
        $$(quiet) echo "  ifeq ($$(esc_dollar)(PLATFORM_VERSION),1.5)" >> $$@
        $$(quiet) echo "  else ifeq ($$(esc_dollar)(PLATFORM_VERSION),1.6)" >> $$@
        $$(quiet) echo "  else ifeq ($$(esc_dollar)(PLATFORM_VERSION),2.1)" >> $$@
@@ -282,7 +282,6 @@ $1: FORCE
        $$(quiet) $(PRINTF) "\t$$(esc_dollar)(PV_TOP)/engines/player/config/android \\\\\n" >> $$@
        $$(quiet) $(PRINTF) "\t$$(esc_dollar)(PV_TOP)/engines/player/include \\\\\n" >> $$@
        $$(quiet) $(PRINTF) "\t$$(esc_dollar)(PV_TOP)/nodes/pvmediaoutputnode/include \\\\\n" >> $$@
-       $$(quiet) $(PRINTF) "\t$$(esc_dollar)(PV_TOP)/nodes/pvdownloadmanagernode/config/opencore \\\\\n" >> $$@
        $$(quiet) $(PRINTF) "\t$$(esc_dollar)(PV_TOP)/pvmi/pvmf/include \\\\\n" >> $$@
        $$(quiet) $(PRINTF) "\t$$(esc_dollar)(PV_TOP)/fileformats/mp4/parser/config/opencore \\\\\n" >> $$@
        $$(quiet) $(PRINTF) "\t$$(esc_dollar)(PV_TOP)/oscl/oscl/config/android \\\\\n" >> $$@