FCL/sf/mw/mmmw: comparison khronosfws/openmax_al/src/adptcommon/xaframeworkmgr.c

equal deleted inserted replaced

-:4ce423f34688
+:e267340986c9
 */
 #include <stdio.h>
 #include <string.h>
 #include "xaframeworkmgr.h"
+#include "xadebug.h"
 /* Default line width permitted in the cfg file + 2 to hold "\r\n"*/
 #define LINEWIDTH 82
 typedef enum
 FWMgrFwType currentFrameworkType = FWMgrFWUknown;
 FWMgrTagType currentTagType = FWMgrTagNone;
 FrameworkMap *curNode = NULL;
 FWMgrBool newNode;
 FrameworkMap *frameworkMap = NULL;
+FILE* fp = NULL;
-FILE* fp = fopen(configFileLocationC, "r");
+DEBUG_API("->XAFrameworkMgr_CreateFrameworkMap");
+/* Open file on C drive */
+DEBUG_INFO("Opening configuration file from C drive...");
+fp = fopen(configFileLocationC, "r");
 if (fp == NULL)
 {
+DEBUG_INFO("Opening configuration file from Z drive...");
 fp = fopen(configFileLocationZ, "r");
 }
-if (fp != NULL)
+if (fp == NULL)
 {
-while ((fgets(buffer, LINEWIDTH, fp) != NULL) && processedEntry)
+DEBUG_ERR("ERROR: Unable to open configuration file!");
-{
+DEBUG_API("<-XAFrameworkMgr_CreateFrameworkMap");
-/* keep looping until NULL pointer OR error... */
+return NULL;
-lineNumber++;
+}
-readSize = strlen(buffer);
+while ((fgets(buffer, LINEWIDTH, fp) != NULL) && processedEntry)
-/* Ignore comments line */
+{
-if (buffer[0] == '#')
+/* keep looping until NULL pointer OR error... */
-continue;
+lineNumber++;
+readSize = strlen(buffer);
-/* Ignore replace "\r\n" with '\0' */
+/* Ignore comments line */
-if ((readSize >= 2) && (buffer[readSize - 2] == '\r')
+if (buffer[0] == '#')
-&& (buffer[readSize - 1] == '\n'))
+continue;
-buffer[readSize - 2] = '\0';
+/* Ignore replace "\r\n" with '\0' */
-/* Ignore new line... */
+if ((readSize >= 2) && (buffer[readSize - 2] == '\r')
-if (readSize == 2)
+&& (buffer[readSize - 1] == '\n'))
-continue;
+buffer[readSize - 2] = '\0';
-processedEntry = processConfigEntry(buffer, &currentMediaType,
+/* Ignore new line... */
-&currentFrameworkType, &currentTagType, &newNode,
+if (readSize == 2)
-&curNode);
+continue;
-if (newNode)
-{
+processedEntry = processConfigEntry(buffer, &currentMediaType,
-/*Just link to the last element in the chain*/
+&currentFrameworkType, &currentTagType, &newNode,
-if (!frameworkMap)
+&curNode);
+if (newNode)
+{
+/*Just link to the last element in the chain*/
+if (!frameworkMap)
+{
+frameworkMap = curNode;
+}
+else
+{
+FrameworkMap *lastNode = frameworkMap;
+while (lastNode->next)
 {
-frameworkMap = curNode;
+lastNode = lastNode->next;
 }
-else
+lastNode->next = curNode;
-{
+}
-FrameworkMap *lastNode = frameworkMap;
+}
-while (lastNode->next)
+}
-{
+fclose(fp);
-lastNode = lastNode->next;
+DEBUG_API("<-XAFrameworkMgr_CreateFrameworkMap");
-}
-lastNode->next = curNode;
-}
-}
-}
-fclose(fp);
-}
-else
-{
-printf("unable to open config file!\n");
-}
 return frameworkMap;
 }
 #ifdef _DEBUG
 /* void XAFrameworkMgr_DumpFrameworkMap
 void XAFrameworkMgr_DumpFrameworkMap(FrameworkMap *map)
 {
 FrameworkMap *node = map;
 int i;
 int loopIndex = 0;
+DEBUG_API("->XAFrameworkMgr_DumpFrameworkMap");
 while (node)
 {
 loopIndex++;
-printf("%d>", loopIndex);
+DEBUG_INFO_A1("%d>", loopIndex);
 if (node->moType == FWMgrMOPlayer)
-printf("MediaPlayer-");
+{
+DEBUG_INFO("MediaPlayer-");
+}
 else if (node->moType == FWMgrMORecorder)
-printf("MediaRecrdr-");
+{
+DEBUG_INFO("MediaRecrdr-");
+}
 else
-printf("UKNOWN-");
+{
+DEBUG_INFO("UKNOWN-");
+}
 if (node->fwType == FWMgrFWMMF)
-printf("MMF-");
+{
+DEBUG_INFO("MMF-");
+}
 else if (node->fwType == FWMgrFWGST)
-printf("GST-");
+{
+DEBUG_INFO("GST-");
+}
 else
-printf("UKNOWN-");
+{
-printf("Scheme[");
+DEBUG_INFO("UKNOWN-");
+}
+DEBUG_INFO("Scheme[");
 for (i = 0; i < node->uriSchemeCount; i++)
-printf(" %s", node->uriSchemes[i]);
+{
+DEBUG_INFO_A1_STR(" %s", node->uriSchemes[i]);
+}
 printf("]FileExt[");
 for (i = 0; i < node->fileExtCount; i++)
-printf(" %s", node->fileExts[i]);
+{
-printf("]\n");
+DEBUG_INFO_A1_STR(" %s", node->fileExts[i]);
+}
+DEBUG_INFO("]\n");
 node = node->next;
 }
+DEBUG_API("<-XAFrameworkMgr_DumpFrameworkMap");
 }
 #endif
 /* void XAFrameworkMgr_DeleteFrameworkMap
 * Description: Deletes the list of framework and use-case map.
 void XAFrameworkMgr_DeleteFrameworkMap(FrameworkMap **map)
 {
 FrameworkMap *node = *map;
 FrameworkMap *nextNode = NULL;
 int i;
+DEBUG_API("->XAFrameworkMgr_DeleteFrameworkMap");
 while (node)
 {
 for (i = 0; i < node->uriSchemeCount; i++)
 free(node->uriSchemes[i]);
 free(node->uriSchemes);
 nextNode = node->next;
 free(node);
 node = nextNode;
 }
 *map = NULL;
+DEBUG_API("<-XAFrameworkMgr_DeleteFrameworkMap");
 }
 /* FWMgrFwType XAFrameworkMgr_GetFramework
 * Description: Returns the framework enum that handles uri.
 */
 FWMgrBool uriMatchFound = FWMgrFalse;
 FWMgrBool fileExtMatchFound = FWMgrFalse;
 int i = 0;
 int copyLen = 0;
+DEBUG_API("->XAFrameworkMgr_GetFramework");
 if (!map || !uri)
 {
-/* TODO Log invalid uri */
+DEBUG_ERR("NULL map/uri");
+DEBUG_API("<-XAFrameworkMgr_GetFramework");
 return retVal;
 }
+DEBUG_INFO_A1_STR("uri[%s]", uri);
 /* Get uri scheme */
 uriScheme = strchr(uri, ':');
 if (uriScheme == NULL)
 {
-/* TODO Log invalid uri */
+DEBUG_ERR("malformed URI. Could not find [:]");
+DEBUG_API("<-XAFrameworkMgr_GetFramework");
 return retVal;
 }
 copyLen = (uriScheme - uri);
 uriScheme = (char*) calloc(copyLen + 1, sizeof(char));
 {
 /* Get uri extension */
 char* dotLoc = strrchr(uri, '.');
 if (dotLoc == NULL)
 {
-/* TODO Log invalid uri */
+DEBUG_ERR("malformed URI. Could not find extension char[.]");
+DEBUG_API("<-XAFrameworkMgr_GetFramework");
 free(uriScheme);
 return retVal;
 }
 /* We need to add 1 to exclude '.'*/
 copyLen = strlen(uri) - (dotLoc + 1 - uri);
 fileExtMatchFound = FWMgrFalse;
 /* Match for uri*/
 for (i = 0; i < node->uriSchemeCount; i++)
 {
 if (strcasecmp(uriScheme, node->uriSchemes[i]) == 0)
 {
 uriMatchFound = FWMgrTrue;
+DEBUG_INFO_A1_STR("Found macthing framework for scheme[%s]", uriScheme);
 break;
 }
 }
 /* if uri scheme is not file, we only need to check for uri */
 if (!fileExt)
 for (i = 0; i < node->fileExtCount; i++)
 {
 if (strcasecmp(fileExt, node->fileExts[i]) == 0)
 {
 fileExtMatchFound = FWMgrTrue;
+DEBUG_INFO_A1_STR("Found macthing framework for fileext[%s]", fileExt);
 break;
 }
 }
 }
-if ((uriMatchFound == FWMgrTrue) && (fileExtMatchFound
+if ((uriMatchFound == FWMgrTrue) &&
-== FWMgrTrue))
+(fileExtMatchFound == FWMgrTrue))
 {
 retVal = node->fwType;
+DEBUG_INFO_A1("Framework is[%d]", (int)retVal);
 break;
 }
 }
 node = node->next;
 }
 free(uriScheme);
 free(fileExt);
+DEBUG_API("<-XAFrameworkMgr_GetFramework");
 return retVal;
 }
 /* Local functions */

changeset 55	e267340986c9
parent 42	1fa3fb47b1e3