RIO-6867: cleanup of old Keys from MIOs

diff --git a/android/android_audio_mio.cpp b/android/android_audio_mio.cpp
index 528a8f4..451183c 100644 (file)
--- a/android/android_audio_mio.cpp
+++ b/android/android_audio_mio.cpp
@@ -577,22 +577,6 @@ void AndroidAudioMIO::setParametersSync(PvmiMIOSession aSession, PvmiKvp* aParam
             PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE,
                             (0, "AndroidAudioOutput::setParametersSync() Audio Format Key, Value %s", aParameters[i].value.pChar_value));
         }
-        else if (pv_mime_strcmp(aParameters[i].key, MOUT_AUDIO_SAMPLING_RATE_KEY) == 0)
-        {
-            iAudioSamplingRate = (int32)aParameters[i].value.uint32_value;
-            iAudioSamplingRateValid = true;
-            // LOGD("iAudioSamplingRate=%d", iAudioSamplingRate);
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE,
-                            (0, "AndroidAudioMIO::setParametersSync() Audio Sampling Rate Key, Value %d", iAudioSamplingRate));
-        }
-        else if (pv_mime_strcmp(aParameters[i].key, MOUT_AUDIO_NUM_CHANNELS_KEY) == 0)
-        {
-            iAudioNumChannels = (int32)aParameters[i].value.uint32_value;
-            iAudioNumChannelsValid = true;
-            // LOGD("iAudioNumChannels=%d", iAudioNumChannels);
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE,
-                            (0, "AndroidAudioMIO::setParametersSync() Audio Num Channels Key, Value %d", iAudioNumChannels));
-        }
         else if (pv_mime_strcmp(aParameters[i].key, PVMF_FORMAT_SPECIFIC_INFO_KEY_PCM) == 0)
         {
             channelSampleInfo* pcm16Info = (channelSampleInfo*)aParameters->value.key_specific_value;

diff --git a/android/android_surface_output.cpp b/android/android_surface_output.cpp
index 2ed461a..88f2ede 100755 (executable)
--- a/android/android_surface_output.cpp
+++ b/android/android_surface_output.cpp
@@ -793,47 +793,6 @@ void AndroidSurfaceOutput::setParametersSync(PvmiMIOSession aSession, PvmiKvp* a
             PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE,
                             (0, "AndroidSurfaceOutput::setParametersSync() Video Format Key, Value %s", iVideoFormatString.get_str()));
         }
-        else if (pv_mime_strcmp(aParameters[i].key, MOUT_VIDEO_WIDTH_KEY) == 0)
-        {
-            iVideoWidth = (int32)aParameters[i].value.uint32_value;
-            iVideoParameterFlags |= VIDEO_WIDTH_VALID;
-            LOGV("iVideoWidth=%d", iVideoWidth);
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE,
-                            (0, "AndroidSurfaceOutput::setParametersSync() Video Width Key, Value %d", iVideoWidth));
-        }
-        else if (pv_mime_strcmp(aParameters[i].key, MOUT_VIDEO_HEIGHT_KEY) == 0)
-        {
-            iVideoHeight = (int32)aParameters[i].value.uint32_value;
-            iVideoParameterFlags |= VIDEO_HEIGHT_VALID;
-            LOGV("iVideoHeight=%d", iVideoHeight);
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE,
-                            (0, "AndroidSurfaceOutput::setParametersSync() Video Height Key, Value %d", iVideoHeight));
-        }
-        else if (pv_mime_strcmp(aParameters[i].key, MOUT_VIDEO_DISPLAY_HEIGHT_KEY) == 0)
-        {
-            iVideoDisplayHeight = (int32)aParameters[i].value.uint32_value;
-            iVideoParameterFlags |= DISPLAY_HEIGHT_VALID;
-            LOGV("iVideoDisplayHeight=%d", iVideoDisplayHeight);
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE,
-                            (0, "AndroidSurfaceOutput::setParametersSync() Video Display Height Key, Value %d", iVideoDisplayHeight));
-        }
-        else if (pv_mime_strcmp(aParameters[i].key, MOUT_VIDEO_DISPLAY_WIDTH_KEY) == 0)
-        {
-            iVideoDisplayWidth = (int32)aParameters[i].value.uint32_value;
-            iVideoParameterFlags |= DISPLAY_WIDTH_VALID;
-            LOGV("iVideoDisplayWidth=%d", iVideoDisplayWidth);
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE,
-                            (0, "AndroidSurfaceOutput::setParametersSync() Video Display Width Key, Value %d", iVideoDisplayWidth));
-        }
-        else if (pv_mime_strcmp(aParameters[i].key, MOUT_VIDEO_SUBFORMAT_KEY) == 0)
-        {
-            iVideoSubFormat = aParameters[i].value.pChar_value;
-            iVideoParameterFlags |= VIDEO_SUBFORMAT_VALID;
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE,
-                            (0, "AndroidSurfaceOutput::setParametersSync() Video SubFormat Key, Value %s", iVideoSubFormat.getMIMEStrPtr()));
-
-            LOGV("VIDEO SUBFORMAT SET TO %s\n", iVideoSubFormat.getMIMEStrPtr());
-        }
         //All FSI for video will be set here in one go
         else if (pv_mime_strcmp(aParameters[i].key, PVMF_FORMAT_SPECIFIC_INFO_KEY_YUV) == 0)
         {

diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
index 41fb80d..0e96bdf 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 "1296088"
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1297171"
 #define PV2WAY_ENGINE_SDKINFO_DATE 0x20100304
 
 #endif //PV_2WAY_SDKINFO_H_INCLUDED

diff --git a/engines/adapters/player/framemetadatautility/src/pv_frame_metadata_mio_audio.cpp b/engines/adapters/player/framemetadatautility/src/pv_frame_metadata_mio_audio.cpp
index ee2c97d..aa8d6e8 100644 (file)
--- a/engines/adapters/player/framemetadatautility/src/pv_frame_metadata_mio_audio.cpp
+++ b/engines/adapters/player/framemetadatautility/src/pv_frame_metadata_mio_audio.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.
@@ -237,18 +237,6 @@ void PVFMAudioMIO::setParametersSync(PvmiMIOSession aSession, PvmiKvp* aParamete
             iAudioFormat = aParameters[i].value.pChar_value;
             PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "PVFMAudioMIO::setParametersSync() Audio Format Key, Value %s", iAudioFormat.getMIMEStrPtr()));
         }
-        else if (pv_mime_strcmp(aParameters[i].key, MOUT_AUDIO_SAMPLING_RATE_KEY) == 0)
-        {
-            iAudioSamplingRate = (int32)aParameters[i].value.uint32_value;
-            iAudioSamplingRateValid = true;
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "PVFMAudioMIO::setParametersSync() Audio Sampling Rate Key, Value %d", iAudioSamplingRate));
-        }
-        else if (pv_mime_strcmp(aParameters[i].key, MOUT_AUDIO_NUM_CHANNELS_KEY) == 0)
-        {
-            iAudioNumChannels = (int32)aParameters[i].value.uint32_value;
-            iAudioNumChannelsValid = true;
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "PVFMAudioMIO::setParametersSync() Audio Num Channels Key, Value %d", iAudioNumChannels));
-        }
         else if (pv_mime_strcmp(aParameters[i].key, PVMF_FORMAT_SPECIFIC_INFO_KEY) == 0)
         {
             //  iOutputFile.Write(aParameters[i].value.pChar_value, sizeof(uint8), (int32)aParameters[i].capacity);

diff --git a/engines/adapters/player/framemetadatautility/src/pv_frame_metadata_mio_video.cpp b/engines/adapters/player/framemetadatautility/src/pv_frame_metadata_mio_video.cpp
index 999bd1d..aff210e 100644 (file)
--- a/engines/adapters/player/framemetadatautility/src/pv_frame_metadata_mio_video.cpp
+++ b/engines/adapters/player/framemetadatautility/src/pv_frame_metadata_mio_video.cpp
@@ -596,30 +596,6 @@ void PVFMVideoMIO::setParametersSync(PvmiMIOSession aSession, PvmiKvp* aParamete
             iVideoFormat = aParameters[i].value.pChar_value;
             PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "PVFMVideoMIO::setParametersSync() Video Format Key, Value %s", iVideoFormat.getMIMEStrPtr()));
         }
-        else if (pv_mime_strcmp(aParameters[i].key, MOUT_VIDEO_WIDTH_KEY) == 0)
-        {
-            iVideoWidth = (int32)aParameters[i].value.uint32_value;
-            iVideoWidthValid = true;
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "PVFMVideoMIO::setParametersSync() Video Width Key, Value %d", iVideoWidth));
-        }
-        else if (pv_mime_strcmp(aParameters[i].key, MOUT_VIDEO_HEIGHT_KEY) == 0)
-        {
-            iVideoHeight = (int32)aParameters[i].value.uint32_value;
-            iVideoHeightValid = true;
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "PVFMVideoMIO::setParametersSync() Video Height Key, Value %d", iVideoHeight));
-        }
-        else if (pv_mime_strcmp(aParameters[i].key, MOUT_VIDEO_DISPLAY_HEIGHT_KEY) == 0)
-        {
-            iVideoDisplayHeight = (int32)aParameters[i].value.uint32_value;
-            iVideoDisplayHeightValid = true;
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "PVFMVideoMIO::setParametersSync() Video Display Height Key, Value %d", iVideoDisplayHeight));
-        }
-        else if (pv_mime_strcmp(aParameters[i].key, MOUT_VIDEO_DISPLAY_WIDTH_KEY) == 0)
-        {
-            iVideoDisplayWidth = (int32)aParameters[i].value.uint32_value;
-            iVideoDisplayWidthValid = true;
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "PVFMVideoMIO::setParametersSync() Video Display Width Key, Value %d", iVideoDisplayWidth));
-        }
         else if (pv_mime_strcmp(aParameters[i].key, PVMF_FORMAT_SPECIFIC_INFO_KEY) == 0)
         {
             //  iOutputFile.Write(aParameters[i].value.pChar_value, sizeof(uint8), (int32)aParameters[i].capacity);

diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h
index 6cb3bb5..aa3e105 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 "1296088"
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1297171"
 #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100304
 
 #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 063fded..6eb5ed2 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 "1296088"
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1297171"
 #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100304
 
 #endif //PV_PLAYER_SDKINFO_H_INCLUDED

diff --git a/pvmi/media_io/pvmiofileoutput/src/pvmi_media_io_fileoutput.cpp b/pvmi/media_io/pvmiofileoutput/src/pvmi_media_io_fileoutput.cpp
index f50541e..6489bbe 100644 (file)
--- a/pvmi/media_io/pvmiofileoutput/src/pvmi_media_io_fileoutput.cpp
+++ b/pvmi/media_io/pvmiofileoutput/src/pvmi_media_io_fileoutput.cpp
@@ -1628,22 +1628,6 @@ void PVRefFileOutput::setParametersSync(PvmiMIOSession aSession,
             PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE,
                             (0, "PVRefFileOutput::setParametersSync() Audio Format Key, Value %s", iAudioFormatString.get_str()));
         }
-        else if (pv_mime_strcmp(aParameters[i].key, MOUT_AUDIO_SAMPLING_RATE_KEY) == 0)
-        {
-            iAudioSamplingRate = (int32)aParameters[i].value.uint32_value;
-            iAudioSamplingRateValid = true;
-            iFmtSubchunk.sampleRate = iAudioSamplingRate;
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE,
-                            (0, "PVRefFileOutput::setParametersSync() Audio Sampling Rate Key, Value %d", iAudioSamplingRate));
-        }
-        else if (pv_mime_strcmp(aParameters[i].key, MOUT_AUDIO_NUM_CHANNELS_KEY) == 0)
-        {
-            iAudioNumChannels = (int32)aParameters[i].value.uint32_value;
-            iAudioNumChannelsValid = true;
-            iFmtSubchunk.numChannels = iAudioNumChannels;
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE,
-                            (0, "PVRefFileOutput::setParametersSync() Audio Num Channels Key, Value %d", iAudioNumChannels));
-        }
         //Check against known video parameter keys...
         else if (pv_mime_strcmp(aParameters[i].key, MOUT_VIDEO_FORMAT_KEY) == 0)
         {