Changeset 1246 in SHVCSoftware for branches/SHM-dev/source/App/TAppDecoder

Timestamp:

14 Jul 2015, 00:26:07 (10 years ago)

Author:

seregin

Message:

port rev 4240

Location:

branches/SHM-dev/source/App/TAppDecoder

Files:

• TAppDecCfg.cpp (modified) (3 diffs)
• TAppDecCfg.h (modified) (2 diffs)
• TAppDecTop.cpp (modified) (2 diffs)
• decmain.cpp (modified) (1 diff)

branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.cpp

@@ -2 +2 @@
  * License, included below. This software may be subject to other third party
  * and contributor rights, including patent rights, and no such rights are
- * granted under this license.  
+ * granted under this license.
  *
  * Copyright (c) 2010-2014, ITU/ISO/IEC
@@ -123 +123 @@
   ("ForceDecodeBitDepth",       m_forceDecodeBitDepth,                 0U,         "Force the decoder to operate at a particular bit-depth (best effort decoding)")
 #endif
+  ("OutputDecodedSEIMessagesFilename",  m_outputDecodedSEIMessagesFilename,    string(""), "When non empty, output decoded SEI messages to the indicated file. If file is '-', then output to stdout\n")
 #if Q0074_COLOUR_REMAPPING_SEI
   ("SEIColourRemappingInfo,-cri", m_colourRemapSEIEnabled, false, "Control handling of Colour Remapping Information SEI messages\n"
@@ -249 +250 @@
       }
       fclose (targetDecLayerIdSetFile);
+      if ( m_targetDecLayerIdSet.size() > 0 && !isLayerIdZeroIncluded )
+      {
+        fprintf(stderr, "TargetDecLayerIdSet must contain LayerId=0, aborting" );
+        return false;
+      }
     }
     else

branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.h

@@ -2 +2 @@
  * License, included below. This software may be subject to other third party
  * and contributor rights, including patent rights, and no such rights are
- * granted under this license.  
+ * granted under this license.
  *
  * Copyright (c) 2010-2014, ITU/ISO/IEC
@@ -116 +116 @@
   {
     for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
+    {
       m_outputBitDepth[channelTypeIndex] = 0;
+    }
   }
 

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -324 +324 @@
         for (UInt channelType = 0; channelType < MAX_NUM_CHANNEL_TYPE; channelType++)
         {
-          if (m_outputBitDepth[channelType] == 0) m_outputBitDepth[channelType] = g_bitDepth[channelType];
+          if (m_outputBitDepth[channelType] == 0)
+          {
+            m_outputBitDepth[channelType] = g_bitDepth[channelType];
+          }
         }
         m_acTVideoIOYuvReconFile[curLayerId].open( m_pchReconFile[curLayerId], true, m_outputBitDepth, m_outputBitDepth, g_bitDepth ); // write mode
@@ -540 +543 @@
         for (UInt channelType = 0; channelType < MAX_NUM_CHANNEL_TYPE; channelType++)
         {
-          if (m_outputBitDepth[channelType] == 0) m_outputBitDepth[channelType] = g_bitDepth[channelType];
+          if (m_outputBitDepth[channelType] == 0)
+          {
+            m_outputBitDepth[channelType] = g_bitDepth[channelType];
+          }
         }
 

branches/SHM-dev/source/App/TAppDecoder/decmain.cpp

@@ -2 +2 @@
  * License, included below. This software may be subject to other third party
  * and contributor rights, including patent rights, and no such rights are
- * granted under this license.  
+ * granted under this license.
  *
  * Copyright (c) 2010-2014, ITU/ISO/IEC