Changeset 1273 in SHVCSoftware for branches/SHM-dev/source/App

Timestamp:

15 Jul 2015, 20:51:59 (10 years ago)

Author:

seregin

Message:

port rev 4306 and rev 4307

Location:

branches/SHM-dev/source/App

Files:

• TAppDecoder/TAppDecCfg.cpp (modified) (1 diff)
• TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• TAppEncoder/TAppEncCfg.cpp (modified) (2 diffs)
• TAppEncoder/TAppEncTop.cpp (modified) (1 diff)

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

@@ -116 +116 @@
                                                                                    "\t1: check hash in SEI messages if available in the bitstream\n"
                                                                                    "\t0: ignore SEI message")
-  ("SEIpictureDigest",          m_decodedPictureHashSEIEnabled,        1,          "deprecated alias for SEIDecodedPictureHash")
   ("SEINoDisplay",              m_decodedNoDisplaySEIEnabled,          true,       "Control handling of decoded no display SEI messages")
   ("TarDecLayerIdSetFile,l",    cfg_TargetDecLayerIdSetFile,           string(""), "targetDecLayerIdSet file name. The file should include white space separated LayerId values to be decoded. Omitting the option or a value of -1 in the file decodes all layers.")

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

@@ -1544 +1544 @@
         this->setMetadataFileRefresh(false);
 
-        TComDigest recon_digest;
+        TComPictureHash recon_digest;
         Int numChar = calcMD5(*pic->getPicYuvRec(), recon_digest);
-        fprintf(fptr, "%8d%9d    MD5:%s\n", pic->getLayerId(), pic->getSlice(0)->getPOC(), digestToString(recon_digest, numChar).c_str());
+        fprintf(fptr, "%8d%9d    MD5:%s\n", pic->getLayerId(), pic->getSlice(0)->getPOC(), hashToString(recon_digest, numChar).c_str());
         fclose(fptr);
       }

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -1401 +1401 @@
                                                                                                                "\t1: use MD5\n"
                                                                                                                "\t0: disable")
-  ("SEIpictureDigest",                                m_decodedPictureHashSEIEnabled,                       0, "deprecated alias for SEIDecodedPictureHash")
   ("TMVPMode",                                        m_TMVPModeId,                                         1, "TMVP mode 0: TMVP disable for all slices. 1: TMVP enable for all slices (default) 2: TMVP enable for certain slices only")
   ("FEN",                                             m_bUseFastEnc,                                    false, "fast encoder setting")
@@ -4135 +4134 @@
   if((m_numTileColumnsMinus1 <= 0) && (m_numTileRowsMinus1 <= 0) && m_tmctsSEIEnabled)
   {
-    printf("SEITempMotionConstrainedTileSets is set to false to disable 'temporal_motion_constrained_tile_sets' SEI because there are no tiles enabled\n");
+    printf("Warning: SEITempMotionConstrainedTileSets is set to false to disable temporal motion-constrained tile sets SEI message because there are no tiles enabled.\n");
     m_tmctsSEIEnabled = false;
   }

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1604 +1604 @@
         numDU ++;
       }
-      vps->getBspHrd(i)->setNumDU( numDU );
+      //vps->getBspHrd(i)->setNumDU( numDU );
       vps->setBspHrdParameters( i, pcCfgLayer->getFrameRate(), numDU, pcCfgLayer->getTargetBitrate(), ( pcCfgLayer->getIntraPeriod() > 0 ) );
     }