RIO-8378: Move implementation of some 2-way methods from header file into C file

Change-Id: I55ef05eebae6fef9a51442f5baf6f290f494254e

diff --git a/engines/2way/sample_app/pv2waysample/include/pv_2way_source_and_sinks_lipsync.h b/engines/2way/sample_app/pv2waysample/include/pv_2way_source_and_sinks_lipsync.h
index 7aea390..18e8f76 100644 (file)
--- a/engines/2way/sample_app/pv2waysample/include/pv_2way_source_and_sinks_lipsync.h
+++ b/engines/2way/sample_app/pv2waysample/include/pv_2way_source_and_sinks_lipsync.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.
@@ -47,8 +47,7 @@ class PV2WayLipSyncSourceAndSinks : public PV2WayDummySourceAndSinks
 {
     public:
         OSCL_IMPORT_REF PV2WayLipSyncSourceAndSinks(PV2Way324InitInfo& aSdkInitInfo);
-        OSCL_IMPORT_REF virtual ~PV2WayLipSyncSourceAndSinks()
-        {}
+        OSCL_IMPORT_REF virtual ~PV2WayLipSyncSourceAndSinks();
 
     protected:
 

diff --git a/engines/2way/sample_app/pv2waysample/src/pv_2way_media_output_mio_node_factory.cpp b/engines/2way/sample_app/pv2waysample/src/pv_2way_media_output_mio_node_factory.cpp
index 5e1b58b..88777a4 100644 (file)
--- a/engines/2way/sample_app/pv2waysample/src/pv_2way_media_output_mio_node_factory.cpp
+++ b/engines/2way/sample_app/pv2waysample/src/pv_2way_media_output_mio_node_factory.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.
@@ -18,7 +18,6 @@
 
 #include "pv_2way_media_output_mio_node_factory.h"
 #include "pv_2way_interface.h"
-#include "pvmf_fileoutput_factory.h"
 #include "pv_2way_media.h"
 #include "pvmi_media_io_fileoutput.h"
 #include "pv_media_output_node_factory.h"

diff --git a/engines/2way/sample_app/pv2waysample/src/pv_2way_source_and_sinks_lipsync.cpp b/engines/2way/sample_app/pv2waysample/src/pv_2way_source_and_sinks_lipsync.cpp
index cdd3cff..fec845a 100644 (file)
--- a/engines/2way/sample_app/pv2waysample/src/pv_2way_source_and_sinks_lipsync.cpp
+++ b/engines/2way/sample_app/pv2waysample/src/pv_2way_source_and_sinks_lipsync.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.
@@ -18,7 +18,7 @@
 #include "pv_2way_source_and_sinks_lipsync.h"
 
 
-PV2WayLipSyncSourceAndSinks::PV2WayLipSyncSourceAndSinks(PV2Way324InitInfo& aSdkInitInfo):
+OSCL_EXPORT_REF PV2WayLipSyncSourceAndSinks::PV2WayLipSyncSourceAndSinks(PV2Way324InitInfo& aSdkInitInfo):
         PV2WayDummySourceAndSinks(aSdkInitInfo)
 {
     if (iDummyMioAudioInputFactory)
@@ -44,6 +44,9 @@ PV2WayLipSyncSourceAndSinks::PV2WayLipSyncSourceAndSinks(PV2Way324InitInfo& aSdk
     iDummyMioVideoOutputFactory = OSCL_NEW(PV2WayLipSyncOutputMIONodeFactory, ());
 }
 
+OSCL_EXPORT_REF PV2WayLipSyncSourceAndSinks::~PV2WayLipSyncSourceAndSinks()
+{
 
+}
 
 

diff --git a/engines/2way/sample_app/pv2waysample/src/pv_2way_source_and_sinks_perf_test.cpp b/engines/2way/sample_app/pv2waysample/src/pv_2way_source_and_sinks_perf_test.cpp
index b32ef10..a764179 100644 (file)
--- a/engines/2way/sample_app/pv2waysample/src/pv_2way_source_and_sinks_perf_test.cpp
+++ b/engines/2way/sample_app/pv2waysample/src/pv_2way_source_and_sinks_perf_test.cpp
@@ -24,7 +24,6 @@
 #include "pvmf_media_input_node_factory.h"
 
 #include "pv_2way_interface.h"
-#include "pvmf_fileoutput_factory.h"
 #include "pv_2way_media.h"
 #include "pvmf_dummy_fileinput_node_factory.h"
 #include "pvmf_dummy_fileoutput_factory.h"

diff --git a/engines/2way/src/pv_2way_proxy_adapter.cpp b/engines/2way/src/pv_2way_proxy_adapter.cpp
index a72d78e..3c1b1ab 100644 (file)
--- a/engines/2way/src/pv_2way_proxy_adapter.cpp
+++ b/engines/2way/src/pv_2way_proxy_adapter.cpp
@@ -989,6 +989,7 @@ PVCmnAsyncErrorEvent* CPV2WayProxyAdapter::GetErrorMsgL()
 
 OSCL_EXPORT_REF void PV2WayLogger::CreateLogger()
 {
+    //output file
     OSCL_HeapString<OsclMemAllocator> logfilename(PVLOG_PREPEND_OUT_FILENAME);
     logfilename += PVLOG_OUT_FILENAME;
     PVLoggerCfgFileParser::SetupLogAppender(PVLoggerCfgFileParser::ePVLOG_APPENDER_FILE,

diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
index b3a7aff..ad6c92d 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 "1306603"
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1306627"
 #define PV2WAY_ENGINE_SDKINFO_DATE 0x20100308
 
 #endif //PV_2WAY_SDKINFO_H_INCLUDED

diff --git a/engines/2way/test/include/test_base.h b/engines/2way/test/include/test_base.h
index 2c8933b..11ab3a7 100644 (file)
--- a/engines/2way/test/include/test_base.h
+++ b/engines/2way/test/include/test_base.h
@@ -73,6 +73,7 @@ class test_base : public engine_test,
 
         virtual ~test_base()
         {
+            CancelTimers();
             cleanup();
             if (iSourceAndSinks)
             {

diff --git a/engines/2way/test/src/test_engine.cpp b/engines/2way/test/src/test_engine.cpp
index cc721bd..b153e97 100644 (file)
--- a/engines/2way/test/src/test_engine.cpp
+++ b/engines/2way/test/src/test_engine.cpp
@@ -31,7 +31,6 @@
 #include "basic_lipsync_test.h"
 #include "acceptable_formats_test.h"
 #include "negotiated_formats_test.h"
-#include "pvmf_fileoutput_factory.h"
 #include "oscl_string_utils.h"
 #include "oscl_mem_audit.h"
 #include "pv_2way_mio.h"

diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h
index 473d52a..554b8bd 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 "1306603"
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1306627"
 #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100308
 
 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED

diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h
index 4cd8755..4c24203 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 "1306603"
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1306627"
 #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100308
 
 #endif //PV_PLAYER_SDKINFO_H_INCLUDED

diff --git a/protocols/systems/3g-324m_pvterminal/Android.mk b/protocols/systems/3g-324m_pvterminal/Android.mk
index 007ef6e..a0040c4 100644 (file)
--- a/protocols/systems/3g-324m_pvterminal/Android.mk
+++ b/protocols/systems/3g-324m_pvterminal/Android.mk
@@ -5,6 +5,7 @@ LOCAL_SRC_FILES := \
        ./common/src/pvt_common.cpp \
        ./common/src/lipsync_singleton_object.cpp \
        ./common/src/h324utils.cpp \
+       ./common/src/pv_2way_h324m_types.cpp \
        ./h223/src/adaptationlayer.cpp \
        ./h223/src/cpvh223multiplex.cpp \
        ./h223/src/h223api.cpp \

diff --git a/protocols/systems/3g-324m_pvterminal/build/make/local.mk b/protocols/systems/3g-324m_pvterminal/build/make/local.mk
index 47a3e49..b49d485 100644 (file)
--- a/protocols/systems/3g-324m_pvterminal/build/make/local.mk
+++ b/protocols/systems/3g-324m_pvterminal/build/make/local.mk
@@ -32,6 +32,7 @@ INCSRCDIR := ../../.
 SRCS += common/src/pvt_common.cpp \
                common/src/lipsync_singleton_object.cpp \
        common/src/h324utils.cpp \
+       common/src/pv_2way_h324m_types.cpp \
        h223/src/adaptationlayer.cpp \
        h223/src/cpvh223multiplex.cpp \
        h223/src/h223api.cpp \

diff --git a/protocols/systems/3g-324m_pvterminal/common/include/pv_2way_h324m_types.h b/protocols/systems/3g-324m_pvterminal/common/include/pv_2way_h324m_types.h
index c44c806..864952e 100644 (file)
--- a/protocols/systems/3g-324m_pvterminal/common/include/pv_2way_h324m_types.h
+++ b/protocols/systems/3g-324m_pvterminal/common/include/pv_2way_h324m_types.h
@@ -22,6 +22,14 @@
 #include "pv_2way_basic_types.h"
 #endif
 
+#ifndef PV_UUID_H_INCLUDED
+#include "pv_uuid.h"
+#endif
+
+#ifndef PV_INTERFACE_H
+#include "pv_interface.h"
+#endif
+
 // MACROS
 /** The maximum number of supported formats for user input **/
 #define PV_2WAY_MAX_USER_INPUT_FORMATS 4
@@ -207,7 +215,7 @@ class CPVUserInput: public HeapBase, public PVInterface
          * Constructor of CPVUserInputDtmf class.
          *
          **/
-        OSCL_IMPORT_REF CPVUserInput(): iRefCounter(1) {};
+        OSCL_IMPORT_REF CPVUserInput();
 
         /**
          * Virtual destructor
@@ -266,52 +274,37 @@ class CPVUserInputDtmf : public CPVUserInput
          *          KErrNoMemory if the SDK failed to allocate memory during this operation.
          * @returns void
          **/
-        OSCL_IMPORT_REF CPVUserInputDtmf(uint8 aInput, bool aUpdate, uint16 aDuration = 0) :
-                iInput(aInput),
-                iIsUpdate(aUpdate),
-                iDuration(aDuration)
-        {};
+        OSCL_IMPORT_REF CPVUserInputDtmf(uint8 aInput, bool aUpdate, uint16 aDuration = 0);
 
         /**
          * Destructor.
          **/
-        OSCL_IMPORT_REF ~CPVUserInputDtmf() {};
+        //OSCL_IMPORT_REF ~CPVUserInputDtmf() {};
+        OSCL_IMPORT_REF ~CPVUserInputDtmf();
 
         // from CPVUserInput
-        OSCL_IMPORT_REF PV2WayUserInputType GetType()
-        {
-            return PV_DTMF;
-        }
+        OSCL_IMPORT_REF PV2WayUserInputType GetType();
 
         /**
          * Return the user input DTMF tone
          *
          * @returns Returns the input DTMF tone.
          **/
-        OSCL_IMPORT_REF uint8 GetInput()
-        {
-            return iInput;
-        }
+        OSCL_IMPORT_REF uint8 GetInput();
 
         /**
          * Return if the DTMF tone is an update
          *
          * @returns Returns if the input DTMF tone is an update.
          **/
-        OSCL_IMPORT_REF bool IsUpdate()
-        {
-            return iIsUpdate;
-        }
+        OSCL_IMPORT_REF bool IsUpdate();
 
         /**
          * Return the duration of the update.
          *
          * @returns Returns the duration of the update.
          **/
-        OSCL_IMPORT_REF uint16 GetDuration()
-        {
-            return iDuration;
-        }
+        OSCL_IMPORT_REF uint16 GetDuration();
 
     private:
         /**
@@ -347,57 +340,29 @@ class CPVUserInputAlphanumeric : public CPVUserInput
          * @leave  This method can leave with one of the following error codes
          *         OsclErrGeneral memory copy failed
          **/
-        OSCL_IMPORT_REF CPVUserInputAlphanumeric(uint8* apInput, uint16 aLen)
-        {
-            if (aLen)
-            {
-                int err;
-                ipInput = OSCL_STATIC_CAST(uint8*, OSCL_MALLOC(aLen));
-                OSCL_TRY(err, oscl_memcpy(ipInput, apInput, aLen));
-                OSCL_FIRST_CATCH_ANY(err,
-                                     OSCL_DELETE(ipInput);
-                                     OSCL_LEAVE(OsclErrGeneral);
-                                    );
-                iLength = aLen;
-            }
-        }
+        OSCL_IMPORT_REF CPVUserInputAlphanumeric(uint8* apInput, uint16 aLen);
 
         /**
          * Destructor.
          **/
-        OSCL_IMPORT_REF ~CPVUserInputAlphanumeric()
-        {
-            if (ipInput)
-            {
-                OSCL_DELETE(ipInput);
-            }
-        }
+        OSCL_IMPORT_REF ~CPVUserInputAlphanumeric();
 
         // from CPVUserInput
-        OSCL_IMPORT_REF PV2WayUserInputType GetType()
-        {
-            return PV_ALPHANUMERIC;
-        }
+        OSCL_IMPORT_REF PV2WayUserInputType GetType();
 
         /**
          * Return the user input alphanumeric user input
          *
          * @returns Returns pointer to alphanumeric user input.
          **/
-        OSCL_IMPORT_REF uint8* GetInput()
-        {
-            return ipInput;
-        }
+        OSCL_IMPORT_REF uint8* GetInput();
 
         /**
          * Return the size of alphanumeric user input
          *
          * @returns Returns size of alphanumeric user input.
          **/
-        OSCL_IMPORT_REF uint16 GetLength()
-        {
-            return iLength;
-        }
+        OSCL_IMPORT_REF uint16 GetLength();
 
     protected:
         /**

diff --git a/protocols/systems/3g-324m_pvterminal/common/src/pv_2way_h324m_types.cpp b/protocols/systems/3g-324m_pvterminal/common/src/pv_2way_h324m_types.cpp
new file mode 100644 (file)
index 0000000..2aaae13
--- /dev/null
+++ b/protocols/systems/3g-324m_pvterminal/common/src/pv_2way_h324m_types.cpp
@@ -0,0 +1,86 @@
+/* ------------------------------------------------------------------
+ * 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.
+ * 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.
+ * -------------------------------------------------------------------
+ */
+#include "pv_2way_h324m_types.h"
+
+OSCL_EXPORT_REF CPVUserInput::CPVUserInput(): iRefCounter(1) {}
+
+OSCL_EXPORT_REF CPVUserInputDtmf::CPVUserInputDtmf(uint8 aInput, bool aUpdate, uint16 aDuration) :
+        iInput(aInput),
+        iIsUpdate(aUpdate),
+        iDuration(aDuration)
+{}
+
+OSCL_EXPORT_REF CPVUserInputDtmf::~CPVUserInputDtmf()
+{}
+
+OSCL_EXPORT_REF PV2WayUserInputType CPVUserInputDtmf::GetType()
+{
+    return PV_DTMF;
+}
+
+OSCL_EXPORT_REF uint8 CPVUserInputDtmf::GetInput()
+{
+    return iInput;
+}
+
+OSCL_EXPORT_REF bool CPVUserInputDtmf::IsUpdate()
+{
+    return iIsUpdate;
+}
+
+OSCL_EXPORT_REF uint16 CPVUserInputDtmf::GetDuration()
+{
+    return iDuration;
+}
+
+OSCL_EXPORT_REF CPVUserInputAlphanumeric::CPVUserInputAlphanumeric(uint8* apInput, uint16 aLen)
+{
+    if (aLen)
+    {
+        int err;
+        OSCL_TRY(err, ipInput = OSCL_STATIC_CAST(uint8*, OSCL_MALLOC(aLen)));
+        OSCL_FIRST_CATCH_ANY(err, return;);
+
+        OSCL_TRY(err, oscl_memcpy(ipInput, apInput, aLen));
+        OSCL_FIRST_CATCH_ANY(err, OSCL_FREE(ipInput); return;);
+        iLength = aLen;
+    }
+}
+
+OSCL_EXPORT_REF CPVUserInputAlphanumeric::~CPVUserInputAlphanumeric()
+{
+    if (ipInput)
+    {
+        OSCL_DELETE(ipInput);
+    }
+}
+
+OSCL_EXPORT_REF PV2WayUserInputType CPVUserInputAlphanumeric::GetType()
+{
+    return PV_ALPHANUMERIC;
+}
+
+OSCL_EXPORT_REF uint8* CPVUserInputAlphanumeric::GetInput()
+{
+    return ipInput;
+}
+
+OSCL_EXPORT_REF uint16 CPVUserInputAlphanumeric::GetLength()
+{
+    return iLength;
+}

diff --git a/protocols/systems/3g-324m_pvterminal/h324/tsc/include/tscmain.h b/protocols/systems/3g-324m_pvterminal/h324/tsc/include/tscmain.h
index 2c6c1d1..054eabe 100644 (file)
--- a/protocols/systems/3g-324m_pvterminal/h324/tsc/include/tscmain.h
+++ b/protocols/systems/3g-324m_pvterminal/h324/tsc/include/tscmain.h
@@ -437,7 +437,7 @@ class TSC_324m : public OsclActiveObject,
          *
          * @returns A pointer to a CPvtMediaCapability
          **/
-        CPvtMediaCapability* GetRemoteCodecCapability(FormatCapabilityInfo aFormatCapabilityInfo);
+        OSCL_IMPORT_REF CPvtMediaCapability* GetRemoteCodecCapability(FormatCapabilityInfo aFormatCapabilityInfo);
 
         OSCL_IMPORT_REF void SetClock(PVMFMediaClock* aClock);
         OSCL_IMPORT_REF void SetMioLatency(int32 aLatency, bool aAudio);
@@ -451,7 +451,7 @@ class TSC_324m : public OsclActiveObject,
          *
          * @returns TPVStatusCode Fails if channel is not found
          **/
-        TPVStatusCode SetLogicalChannelPause(TPVChannelId aChannelId, TPVDirection aDir, bool aPause);
+        OSCL_IMPORT_REF TPVStatusCode SetLogicalChannelPause(TPVChannelId aChannelId, TPVDirection aDir, bool aPause);
 
     private:
         void Cleanup();

diff --git a/protocols/systems/3g-324m_pvterminal/h324/tsc/src/tschandling.cpp b/protocols/systems/3g-324m_pvterminal/h324/tsc/src/tschandling.cpp
index a963bcd..1638c0b 100644 (file)
--- a/protocols/systems/3g-324m_pvterminal/h324/tsc/src/tschandling.cpp
+++ b/protocols/systems/3g-324m_pvterminal/h324/tsc/src/tschandling.cpp
@@ -1098,7 +1098,7 @@ CPvtTerminalCapability* TSC_324m::GetRemoteCapability()
     return iTSCcapability.GetRemoteCapability();
 }
 
-CPvtMediaCapability* TSC_324m::GetRemoteCodecCapability(FormatCapabilityInfo aFormatCapabilityInfo)
+OSCL_EXPORT_REF CPvtMediaCapability* TSC_324m::GetRemoteCodecCapability(FormatCapabilityInfo aFormatCapabilityInfo)
 {
     CPvtMediaCapability* pMediaCapability = NULL;
     CPvtTerminalCapability* pRemoteCaps = GetRemoteCapability();

diff --git a/protocols/systems/3g-324m_pvterminal/h324/tsc/src/tscmain.cpp b/protocols/systems/3g-324m_pvterminal/h324/tsc/src/tscmain.cpp
index 44f8a57..1f32c91 100644 (file)
--- a/protocols/systems/3g-324m_pvterminal/h324/tsc/src/tscmain.cpp
+++ b/protocols/systems/3g-324m_pvterminal/h324/tsc/src/tscmain.cpp
@@ -991,7 +991,7 @@ TPVStatusCode TSC_324m::RequestFrameUpdate(PVMFPortInterface* port)
     return EPVT_Success;
 }
 
-PVMFStatus TSC_324m::SetLogicalChannelPause(TPVChannelId aChannelId, TPVDirection aDir, bool aPause)
+OSCL_EXPORT_REF PVMFStatus TSC_324m::SetLogicalChannelPause(TPVChannelId aChannelId, TPVDirection aDir, bool aPause)
 {
     PVLOGGER_LOGMSG(PVLOGMSG_INST_HLDBG, iLogger, PVLOGMSG_STACK_TRACE,
                     (0, "TSC_324m::SetPause ChannelId(%d), Direction(%d), Pause(%d)", aChannelId, aDir, aPause));
@@ -2573,6 +2573,9 @@ void TSC_324m::SetTerminalStatus(uint32 aStatus)
                 case PhaseG_Dis:
                     statusString[index] = "PhaseG_Dis";
                     break;
+                default:
+                    statusString[index] = NULL;
+                    break;
             }
         }