Index: branches/HTM-5.0-Nokia/source/App/TAppDecoder/TAppDecTop.cpp
===================================================================
--- branches/HTM-5.0-Nokia/source/App/TAppDecoder/TAppDecTop.cpp	(revision 200)
+++ branches/HTM-5.0-Nokia/source/App/TAppDecoder/TAppDecTop.cpp	(revision 201)
@@ -88,10 +88,10 @@
 #endif
   
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
   Int iDepthViewIdx = 0;
   Int iTextureViewIdx=0;
-  Bool first_frame=1;
-  Bool viewid_zero=true;
-  Int FCO_index=0;  //when the current frame is not first frame,use FCO_index stand for viewDepth. 
+  Bool firstFrame=1;
+  Bool viewIdZero=true;
+  Int fcoIndex=0;  //when the current frame is not first frame,use FCO_index stand for viewDepth. 
 #endif
 
@@ -110,6 +110,6 @@
     pcListPic[i] = NULL;
     newPicture[i] = false;
-#if FLEX_CODING_ORDER
-    FCO_Order[i]=NULL;
+#if FLEX_CODING_ORDER_M23723
+    m_fcoOrder[i]=NULL;
 #endif
 
@@ -173,17 +173,17 @@
         depth = getVPSAccess()->getActiveVPS()->getDepthFlag(nalu.m_layerId);
       }
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
       if (viewId>0)
       {
-        viewid_zero=false;
-      }
-      if (viewid_zero==false&&viewId==0)
-      {
-        first_frame=0; //if viewId has been more than zero and now it set to zero again, we can see that it is not the first view
-      }
-      if (first_frame)
+        viewIdZero=false;
+      }
+      if (viewIdZero==false&&viewId==0)
+      {
+        firstFrame=0; //if viewId has been more than zero and now it set to zero again, we can see that it is not the first view
+      }
+      if (firstFrame)
       { // if the current view is first frame, we set the viewDepthId as texture plus depth and get the FCO order 
         viewDepthId = iDepthViewIdx+iTextureViewIdx;
-        FCO_viewDepthId=viewDepthId;
+        m_fcoViewDepthId=viewDepthId;
       }
       else
@@ -192,7 +192,7 @@
         if (depth)
         {
-          for (FCO_index=0;FCO_index<2*MAX_VIEW_NUM;FCO_index++ )
+          for (fcoIndex=0;fcoIndex<2*MAX_VIEW_NUM;fcoIndex++ )
           {
-            if (FCO_Order[FCO_index]=='D')
+            if (m_fcoOrder[fcoIndex]=='D')
             {
               if (viewId==viewDepthId)
@@ -205,7 +205,7 @@
         else
         {
-          for (FCO_index=0;FCO_index<2*MAX_VIEW_NUM;FCO_index++ )
+          for (fcoIndex=0;fcoIndex<2*MAX_VIEW_NUM;fcoIndex++ )
           {
-            if (FCO_Order[FCO_index]=='T')
+            if (m_fcoOrder[fcoIndex]=='T')
             {
               if (viewId==viewDepthId)
@@ -217,5 +217,5 @@
         }
 
-        viewDepthId=FCO_index;
+        viewDepthId=fcoIndex;
 
       }
@@ -229,17 +229,17 @@
       Int viewId = nalu.m_viewId;
       Int depth = nalu.m_isDepth ? 1 : 0;
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
       if (viewId>0)
       {
-        viewid_zero=false;
-      }
-      if (viewid_zero==false&&viewId==0)
-      {
-        first_frame=0;
-      }
-      if (first_frame)
+        viewIdZero=false;
+      }
+      if (viewIdZero==false&&viewId==0)
+      {
+        firstFrame=0;
+      }
+      if (firstFrame)
       {
         viewDepthId = iDepthViewIdx+iTextureViewIdx;
-        FCO_viewDepthId=viewDepthId;
+        m_fcoViewDepthId=viewDepthId;
       }
       else
@@ -248,7 +248,7 @@
         if (depth)
         {
-          for (FCO_index=0;FCO_index<2*MAX_VIEW_NUM;FCO_index++ )
+          for (fcoIndex=0;fcoIndex<2*MAX_VIEW_NUM;fcoIndex++ )
           {
-            if (FCO_Order[FCO_index]=='D')
+            if (m_fcoOrder[fcoIndex]=='D')
             {
               if (viewId==viewDepthId)
@@ -261,7 +261,7 @@
         else
         {
-          for (FCO_index=0;FCO_index<2*MAX_VIEW_NUM;FCO_index++ )
+          for (fcoIndex=0;fcoIndex<2*MAX_VIEW_NUM;fcoIndex++ )
           {
-            if (FCO_Order[FCO_index]=='T')
+            if (m_fcoOrder[fcoIndex]=='T')
             {
               if (viewId==viewDepthId)
@@ -273,5 +273,5 @@
         }
 
-        viewDepthId=FCO_index;
+        viewDepthId=fcoIndex;
 
       }
@@ -338,16 +338,16 @@
         {
           previousPictureDecoded = true;
-#if FLEX_CODING_ORDER
-          if (first_frame)
-          {
+#if FLEX_CODING_ORDER_M23723
+        if (firstFrame)
+        {
             if (depth)
             {
                 iDepthViewIdx++;
-                FCO_Order[viewDepthId]='D';
+                m_fcoOrder[viewDepthId]='D';
             }
             else
            {
                 iTextureViewIdx++;
-                FCO_Order[viewDepthId]='T';
+                m_fcoOrder[viewDepthId]='T';
            }
           }
@@ -657,9 +657,9 @@
 TDecTop* TAppDecTop::getTDecTop( Int viewId, Bool isDepth )
 { 
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
   Int viewnumber=0;
   Int i=0;
-  Bool FCO_flag=0;
-  if (viewId>FCO_viewDepthId)
+  Bool fcoFlag=0;
+  if (viewId>m_fcoViewDepthId)
   {
     return NULL;
@@ -669,11 +669,11 @@
     if (isDepth)
    {
-      for ( i=0; i<=FCO_viewDepthId;i++)
-      {
-         if (FCO_Order[i]=='D')
+      for ( i=0; i<=m_fcoViewDepthId;i++)
+      {
+         if (m_fcoOrder[i]=='D')
          {
            if (viewnumber==viewId)
            {
-             FCO_flag=1;
+             fcoFlag=1;
              break;
            }
@@ -685,11 +685,11 @@
     else
     {
-      for ( i=0; i<=FCO_viewDepthId;i++)
-      {
-        if (FCO_Order[i]=='T')
+      for ( i=0; i<=m_fcoViewDepthId;i++)
+      {
+        if (m_fcoOrder[i]=='T')
         {
           if (viewnumber==viewId)
           {
-            FCO_flag=1;
+            fcoFlag=1;
             break;
           }
@@ -699,5 +699,5 @@
       }
     }
-    if (FCO_flag)
+    if (fcoFlag)
     {
       return m_tDecTop[i];
@@ -731,5 +731,5 @@
   assert( ( viewId >= 0 ) );
 
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
 if (getTDecTop(viewId,isDepth))
 {
Index: branches/HTM-5.0-Nokia/source/App/TAppDecoder/TAppDecTop.h
===================================================================
--- branches/HTM-5.0-Nokia/source/App/TAppDecoder/TAppDecTop.h	(revision 200)
+++ branches/HTM-5.0-Nokia/source/App/TAppDecoder/TAppDecTop.h	(revision 201)
@@ -71,7 +71,7 @@
   Bool                            m_useDepth;
 
-#if FLEX_CODING_ORDER
-  Int  FCO_viewDepthId;
-  Char FCO_Order[MAX_VIEW_NUM*2];
+#if FLEX_CODING_ORDER_M23723
+  Int  m_fcoViewDepthId;
+  Char m_fcoOrder[MAX_VIEW_NUM*2];
 #endif
 
