Changeset 1355 in 3DVCSoftware for branches


Ignore:
Timestamp:
26 Oct 2015, 14:16:11 (9 years ago)
Author:
tech
Message:
  • Clean-up.
  • Fix NH_3D_FIX_NBDV_COL.
Location:
branches/HTM-15.1-dev0-NICT
Files:
4 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-15.1-dev0-NICT/build/HM_vc10.sln

    r1349 r1355  
    1 
     1
    22Microsoft Visual Studio Solution File, Format Version 11.00
    33# Visual Studio 2010
    … …  
    2424Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TAppExtractor", "vc10\TAppExtractor_vc10.vcxproj", "{F46F95E9-7174-4328-90DD-092450E4DCF6}"
    2525EndProject
     26Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TAppDecoderAnalyser", "vc10\TAppDecoderAnalyser_vc10.vcxproj", "{6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}"
     27EndProject
    2628Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLibDecoderAnalyser", "vc10\TLibDecoderAnalyser_vc10.vcxproj", "{68C1251A-55D8-47C9-9052-62F785BD437A}"
    27 EndProject
    28 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TAppDecoderAnalyser", "vc10\TAppDecoderAnalyser_vc10.vcxproj", "{6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}"
    2929EndProject
    3030Global
    … …  
    124124                {F46F95E9-7174-4328-90DD-092450E4DCF6}.Release|x64.ActiveCfg = Release|x64
    125125                {F46F95E9-7174-4328-90DD-092450E4DCF6}.Release|x64.Build.0 = Release|x64
     126                {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Debug|Win32.ActiveCfg = Debug|Win32
     127                {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Debug|Win32.Build.0 = Debug|Win32
     128                {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Debug|x64.ActiveCfg = Debug|x64
     129                {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Debug|x64.Build.0 = Debug|x64
     130                {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Release|Win32.ActiveCfg = Release|Win32
     131                {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Release|Win32.Build.0 = Release|Win32
     132                {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Release|x64.ActiveCfg = Release|x64
     133                {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Release|x64.Build.0 = Release|x64
    126134                {68C1251A-55D8-47C9-9052-62F785BD437A}.Debug|Win32.ActiveCfg = Debug|Win32
    127135                {68C1251A-55D8-47C9-9052-62F785BD437A}.Debug|Win32.Build.0 = Debug|Win32
    … …  
    132140                {68C1251A-55D8-47C9-9052-62F785BD437A}.Release|x64.ActiveCfg = Release|x64
    133141                {68C1251A-55D8-47C9-9052-62F785BD437A}.Release|x64.Build.0 = Release|x64
    134                 {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Debug|Win32.ActiveCfg = Debug|Win32
    135                 {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Debug|Win32.Build.0 = Debug|Win32
    136                 {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Debug|x64.ActiveCfg = Debug|x64
    137                 {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Debug|x64.Build.0 = Debug|x64
    138                 {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Release|Win32.ActiveCfg = Release|Win32
    139                 {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Release|Win32.Build.0 = Release|Win32
    140                 {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Release|x64.ActiveCfg = Release|x64
    141                 {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Release|x64.Build.0 = Release|x64
    142142        EndGlobalSection
    143143        GlobalSection(SolutionProperties) = preSolution

  • branches/HTM-15.1-dev0-NICT/source/App/TAppDecoder/TAppDecCfg.h

    r1349 r1355  
    9494  Bool          m_printReceivedNalus;                 ///< Print information on received NAL units
    9595#if NH_3D
    96   Char*         m_pchScaleOffsetFile = nullptr;         ///< output coded scale and offset parameters // NICT FIX
     96  Char*         m_pchScaleOffsetFile;                   ///< output coded scale and offset parameters
    9797  Bool          m_depth420OutputFlag;                   ///< output depth layers in 4:2:0
    9898#endif
    … …  
    124124      m_outputBitDepth[channelTypeIndex] = 0;
    125125    }
     126#if NH_3D
     127    m_pchScaleOffsetFile = NULL;
     128#endif
    126129  }
    127130

  • branches/HTM-15.1-dev0-NICT/source/Lib/TLibCommon/SEI.cpp

    r1354 r1355  
    14741474  xAddGeneralOpts( opts , defAppLayerIds, defAppPocs, defAppTids, defAppVclNaluTypes, defSeiNaluId, defPositionInSeiNalu, defModifyByEncoder );
    14751475
    1476   // 3 = m_numConstituentViewsGvdMinus1 + 2
    14771476  opts.addOptions()
    14781477    ("AlternativeDepthInfoCancelFlag" , m_alternativeDepthInfoCancelFlag  , false               , "AlternativeDepthInfoCancelFlag"  )
    … …  
    16181617};
    16191618
    1620 /*
    1621 UInt SEIAlternativeDepthInfo::getManGvdRLen                  ( Int i, int j, int k ) const
    1622 {
    1623   UInt rval;
    1624   rval = xGetSyntaxElementLen( m_expGvdR[i][j][k], m_precGvdRotationParam, m_manGvdR[i][j][k] );
    1625   if (rval == 0)
    1626     return m_precGvdRotationParam;
    1627   else
    1628     return rval;
    1629 };
    1630 */
    1631 
    16321619UInt SEIAlternativeDepthInfo::getManGvdTXLen                 ( Int i, int j ) const
    16331620{
    … …  
    16521639  }
    16531640
    1654 #if DEBUG_NH_3D_SEI
    1655   printf("DEBUG: SEIAlternativeDepthInfo::xGetSyntaxElementLen(): val: %d, len %u\n", val, len);
    1656 #endif
    16571641  assert( val >= 0 );
    16581642  assert( val <= ( ( 1 << len )- 1) );

  • branches/HTM-15.1-dev0-NICT/source/Lib/TLibCommon/TComDataCU.cpp

    r1321 r1355  
    54665466    }
    54675467
     5468#if NH_3D_FIX_NBDV_COL
     5469    // The picture pColCU->getSlice()->getRefPic(eColRefPicList, iColRefIdx) might not be in DPB anymore
     5470    // So don't access it directly.
     5471    iColRefViewIdx = pColCU->getSlice()->getVPS()->getViewOrderIdx( pColCU->getSlice()->getRefLayerId( eColRefPicList, iColRefIdx ) );       
     5472#else
    54685473    iColRefViewIdx = pColCU->getSlice()->getRefPic(eColRefPicList, iColRefIdx)->getViewIndex();
     5474#endif
     5475
    54695476
    54705477    if ( iColViewIdx    == iColRefViewIdx ) // temporal vector

  • branches/HTM-15.1-dev0-NICT/source/Lib/TLibCommon/TComRom.cpp

    r1344 r1355  
    537537const Bool g_bEncDecTraceEnable  = true;
    538538const Bool g_bEncDecTraceDisable = false;
    539 Bool   g_HLSTraceEnable = true;
     539Bool   g_HLSTraceEnable = false;
    540540Bool   g_bJustDoIt = false;
    541541UInt64 g_nSymbolCounter = 0;
    … …  
    544544Bool g_tracePU = false;
    545545Bool g_traceTU = false;
    546 Bool g_disableNumbering = true;
     546Bool g_disableNumbering = false;
    547547Bool g_disableHLSTrace = false;
    548548UInt64 g_stopAtCounter       = 4660;

  • branches/HTM-15.1-dev0-NICT/source/Lib/TLibCommon/TypeDef.h

    r1349 r1355  
    7777#if NH_3D
    7878#define H_3D_FIX_ARP_CHECK_NOT_IN_DPB     1
     79#define NH_3D_FIX_NBDV_COL                1
    7980#endif
    8081/////////////////////////////////////////////////////////////////////////////////////////
    … …  
    359360#define RExt__DECODER_DEBUG_BIT_STATISTICS                0 ///< 0 (default) = decoder reports as normal, 1 = decoder produces bit usage statistics (will impact decoder run time by up to ~10%)
    360361#endif
    361 #if NH_3D
    362 #define DEBUG_NH_3D_SEI                                   0 ///< When enabled, prints out SEI values
    363 #endif
    364362// This can be enabled by the makefile
    365363#if !NH_MV

  • branches/HTM-15.1-dev0-NICT/source/Lib/TLibDecoder/SEIread.cpp

    r1354 r1355  
    17451745          sei_read_flag( pDecodedMessageOutputStream, code, "sign_gvd_focal_length_x" ); sei.m_signGvdFocalLengthX[i][j] = (code == 1);
    17461746          sei_read_code( pDecodedMessageOutputStream, 6, code, "exp_gvd_focal_length_x" ); sei.m_expGvdFocalLengthX[i][j] = code;
    1747           //sei_read_code( pDecodedMessageOutputStream, sei.m_precGvdFocalLength, code, "man_gvd_focal_length_x" ); sei.m_manGvdFocalLengthX[i][j] = code;
    17481747          sei_read_code( pDecodedMessageOutputStream, sei.getManGvdFocalLengthXLen(i,j), code, "man_gvd_focal_length_x" ); sei.m_manGvdFocalLengthX[i][j] = code;
    17491748          sei_read_flag( pDecodedMessageOutputStream, code, "sign_gvd_focal_length_y" ); sei.m_signGvdFocalLengthY[i][j] = (code == 1);
    17501749          sei_read_code( pDecodedMessageOutputStream, 6, code, "exp_gvd_focal_length_y" ); sei.m_expGvdFocalLengthY[i][j] = code;
    1751           //sei_read_code( pDecodedMessageOutputStream, sei.m_precGvdFocalLength, code, "man_gvd_focal_length_y" ); sei.m_manGvdFocalLengthY[i][j] = code;
    17521750          sei_read_code( pDecodedMessageOutputStream, sei.getManGvdFocalLengthYLen(i,j), code, "man_gvd_focal_length_y" ); sei.m_manGvdFocalLengthY[i][j] = code;
    17531751          sei_read_flag( pDecodedMessageOutputStream, code, "sign_gvd_principal_point_x" ); sei.m_signGvdPrincipalPointX[i][j] = (code == 1);
    17541752          sei_read_code( pDecodedMessageOutputStream, 6, code, "exp_gvd_principal_point_x" ); sei.m_expGvdPrincipalPointX[i][j] = code;
    1755           //sei_read_code( pDecodedMessageOutputStream, sei.m_precGvdPrincipalPoint, code, "man_gvd_principal_point_x" ); sei.m_manGvdPrincipalPointX[i][j] = code;
    17561753          sei_read_code( pDecodedMessageOutputStream, sei.getManGvdPrincipalPointXLen(i,j), code, "man_gvd_principal_point_x" ); sei.m_manGvdPrincipalPointX[i][j] = code;
    17571754          sei_read_flag( pDecodedMessageOutputStream, code, "sign_gvd_principal_point_y" ); sei.m_signGvdPrincipalPointY[i][j] = (code == 1);
    17581755          sei_read_code( pDecodedMessageOutputStream, 6, code, "exp_gvd_principal_point_y" ); sei.m_expGvdPrincipalPointY[i][j] = code;
    1759           //sei_read_code( pDecodedMessageOutputStream, sei.m_precGvdPrincipalPoint, code, "man_gvd_principal_point_y" ); sei.m_manGvdPrincipalPointY[i][j] = code;
    17601756          sei_read_code( pDecodedMessageOutputStream, sei.getManGvdPrincipalPointYLen(i,j), code, "man_gvd_principal_point_y" ); sei.m_manGvdPrincipalPointY[i][j] = code;
    1761 #if DEBUG_NH_3D_SEI
    1762           printf("manLEN_gvd_focal_length_x     : sei.getManGvdFocalLengthXLen(%d,%d): %u\n", i, j, sei.getManGvdFocalLengthXLen(i,j));
    1763           printf("manLEN_gvd_focal_length_y     : sei.getManGvdFocalLengthYLen(%d,%d): %u\n", i, j, sei.getManGvdFocalLengthYLen(i,j));
    1764           printf("manLEN_gvd_principal_point_x  : sei.getManGvdPrincipalPointXLen(%d,%d): %u\n", i, j, sei.getManGvdPrincipalPointXLen(i,j));
    1765           printf("manLEN_gvd_principal_point_x  : sei.getManGvdPrincipalPointYLen(%d,%d): %u\n", i, j, sei.getManGvdPrincipalPointYLen(i,j));
    1766 #endif
    17671757        }
    17681758        if( sei.m_rotationGvdFlag )
    … …  
    18011791          sei_read_flag( pDecodedMessageOutputStream, code, "sign_gvd_t_x" ); sei.m_signGvdTX[i][j] = (code == 1);
    18021792          sei_read_code( pDecodedMessageOutputStream, 6, code, "exp_gvd_t_x" ); sei.m_expGvdTX[i][j] = code;
    1803           //sei_read_code( pDecodedMessageOutputStream, sei.m_precGvdTranslationParam, code, "man_gvd_t_x" ); sei.m_manGvdTX[i][j] = code;
    18041793          sei_read_code( pDecodedMessageOutputStream, sei.getManGvdTXLen(i,j), code, "man_gvd_t_x" ); sei.m_manGvdTX[i][j] = code;
    1805 #if DEBUG_NH_3D_SEI
    1806           printf("manLEN_gvd_t_x                : sei.getManGvdTXLen(%d,%d): %u\n", i, j, sei.getManGvdTXLen(i,j));
    1807 #endif
    18081794        }
    18091795      }

  • branches/HTM-15.1-dev0-NICT/source/Lib/TLibDecoder/TDecTop.cpp

    r1349 r1355  
    7575  xDeleteArray( m_adBaseViewShiftLUT, MAX_NUM_LAYERS, MAX_NUM_LAYERS, 2 );
    7676  xDeleteArray( m_aiBaseViewShiftLUT, MAX_NUM_LAYERS, MAX_NUM_LAYERS, 2 );
    77   if (m_receivedIdc != nullptr) // NICT FIX
     77  if ( m_receivedIdc != NULL )
     78  {
    7879    xDeleteArray( m_receivedIdc, m_vps->getNumViews() );
     80  }
    7981}
    8082

  • branches/HTM-15.1-dev0-NICT/source/Lib/TLibEncoder/SEIwrite.cpp

    r1354 r1355  
    13171317  if( sei.m_alternativeDepthInfoCancelFlag  ==  0 )
    13181318  {
    1319 #if DEBUG_NH_3D_SEI
    1320     printf("\n################## xWriteSEIAlternativeDepthInfo() ################\n");
    1321 #endif
    13221319    WRITE_CODE( sei.m_depthType, 2, "depth_type" );
    13231320
    … …  
    13341331        for( Int i = 0, j = 0; j  <=  sei.m_numConstituentViewsGvdMinus1 + 1; j++ )
    13351332        {
    1336 #if DEBUG_NH_3D_SEI
    1337           printf("sign_gvd_z_near_flag          : sei.m_signGvdZNearFlag[%d][%d]: %u\n", i, j, sei.m_signGvdZNearFlag[i][j]);
    1338           printf("exp_gvd_z_near                : sei.m_expGvdZNear[%d][%d]: %u\n", i, j, sei.m_expGvdZNear[i][j]);
    1339           printf("man_len_gvd_z_near_minus1     : sei.m_manLenGvdZNearMinus1[%d][%d]: %u\n", i, j, sei.m_manLenGvdZNearMinus1[i][j]);
    1340           printf("man_gvd_z_near                : sei.m_manGvdZNear[%d][%d]: %u\n", i, j, sei.m_manGvdZNear[i][j]);
    1341           printf("sign_gvd_z_far_flag           : sei.m_signGvdZFarFlag[%d][%d]: %u\n", i, j, sei.m_signGvdZFarFlag[i][j]);
    1342           printf("exp_gvd_z_far                 : sei.m_expGvdZFar[%d][%d]: %u\n", i, j, sei.m_expGvdZFar[i][j]);
    1343           printf("man_len_gvd_z_far_minus1      : sei.m_manLenGvdZFarMinus1[%d][%d]: %u\n", i, j, sei.m_manLenGvdZFarMinus1[i][j]);
    1344           printf("man_gvd_z_far                 : sei.m_manGvdZFar[%d][%d]: %u\n", i, j, sei.m_manGvdZFar[i][j]);
    1345 #endif
    13461333          WRITE_FLAG( ( sei.m_signGvdZNearFlag[i][j] ? 1 : 0 ), "sign_gvd_z_near_flag" );
    13471334          WRITE_CODE( sei.m_expGvdZNear[i][j], 7, "exp_gvd_z_near" );
    … …  
    13561343      if( sei.m_intrinsicParamGvdFlag )
    13571344      {
    1358 #if DEBUG_NH_3D_SEI
    1359         printf("prec_gvd_focal_length         : sei.m_precGvdFocalLength: %u\n", sei.m_precGvdFocalLength);
    1360         printf("prec_gvd_principal_point      : sei.m_precGvdPrincipalPoint: %u\n", sei.m_precGvdPrincipalPoint);
    1361 #endif
    13621345        WRITE_UVLC( sei.m_precGvdFocalLength, "prec_gvd_focal_length" );
    13631346        WRITE_UVLC( sei.m_precGvdPrincipalPoint, "prec_gvd_principal_point" );
    … …  
    13651348      if( sei.m_rotationGvdFlag )
    13661349      {
    1367 #if DEBUG_NH_3D_SEI
    1368         printf("prec_gvd_focal_length         : sei.m_precGvdFocalLength: %u\n", sei.m_precGvdFocalLength);
    1369 #endif
    13701350        WRITE_UVLC( sei.m_precGvdRotationParam, "prec_gvd_rotation_param" );
    13711351      }
    13721352      if( sei.m_translationGvdFlag )
    13731353      {
    1374 #if DEBUG_NH_3D_SEI
    1375         printf("prec_gvd_focal_length         : sei.m_precGvdFocalLength: %u\n", sei.m_precGvdFocalLength);
    1376 #endif
    13771354        WRITE_UVLC( sei.m_precGvdTranslationParam, "prec_gvd_translation_param" );
    13781355      }
    … …  
    13811358        if( sei.m_intrinsicParamGvdFlag )
    13821359        {
    1383 #if DEBUG_NH_3D_SEI
    1384           printf("sign_gvd_focal_length_x       : sei.m_signGvdFocalLengthX[%d][%d]: %u\n", i, j, sei.m_signGvdFocalLengthX[i][j]);
    1385           printf("exp_gvd_focal_length_x        : sei.m_expGvdFocalLengthX[%d][%d]: %u\n", i, j, sei.m_expGvdFocalLengthX[i][j]);
    1386           printf("man_gvd_focal_length_x        : sei.m_manGvdFocalLengthX[%d][%d]: %u\n", i, j, sei.m_manGvdFocalLengthX[i][j]);
    1387           printf("manLEN_gvd_focal_length_x     : sei.getManGvdFocalLengthXLen(%d,%d): %u\n", i, j, sei.getManGvdFocalLengthXLen(i,j));
    1388           printf("sign_gvd_focal_length_y       : sei.m_signGvdFocalLengthY[%d][%d]: %u\n", i, j, sei.m_signGvdFocalLengthY[i][j]);
    1389           printf("exp_gvd_focal_length_y        : sei.m_expGvdFocalLengthY[%d][%d]: %u\n", i, j, sei.m_expGvdFocalLengthY[i][j]);
    1390           printf("man_gvd_focal_length_y        : sei.m_manGvdFocalLengthY[%d][%d]: %u\n", i, j, sei.m_manGvdFocalLengthY[i][j]);
    1391           printf("manLEN_gvd_focal_length_y     : sei.getManGvdFocalLengthYLen(%d,%d): %u\n", i, j, sei.getManGvdFocalLengthYLen(i,j));
    1392           printf("sign_gvd_principal_point_x    : sei.m_signGvdPrincipalPointX[%d][%d]: %u\n", i, j, sei.m_signGvdPrincipalPointX[i][j]);
    1393           printf("exp_gvd_principal_point_x     : sei.m_expGvdPrincipalPointX[%d][%d]: %u\n", i, j, sei.m_expGvdPrincipalPointX[i][j]);
    1394           printf("man_gvd_principal_point_x     : sei.m_manGvdPrincipalPointX[%d][%d]: %u\n", i, j, sei.m_manGvdPrincipalPointX[i][j]);
    1395           printf("manLEN_gvd_principal_point_x  : sei.getManGvdPrincipalPointXLen(%d,%d): %u\n", i, j, sei.getManGvdPrincipalPointXLen(i,j));
    1396           printf("sign_gvd_principal_point_y    : sei.m_signGvdPrincipalPointY[%d][%d]: %u\n", i, j, sei.m_signGvdPrincipalPointY[i][j]);
    1397           printf("exp_gvd_principal_point_y     : sei.m_expGvdPrincipalPointY[%d][%d]: %u\n", i, j, sei.m_expGvdPrincipalPointY[i][j]);
    1398           printf("man_gvd_principal_point_y     : sei.m_manGvdPrincipalPointY[%d][%d]: %u\n", i, j, sei.m_manGvdPrincipalPointY[i][j]);
    1399           printf("manLEN_gvd_principal_point_x  : sei.getManGvdPrincipalPointYLen(%d,%d): %u\n", i, j, sei.getManGvdPrincipalPointYLen(i,j));
    1400 #endif
    14011360          WRITE_FLAG( ( sei.m_signGvdFocalLengthX[i][j] ? 1 : 0 ), "sign_gvd_focal_length_x" );
    14021361          WRITE_CODE( sei.m_expGvdFocalLengthX[i][j], 6, "exp_gvd_focal_length_x" );
    1403           //WRITE_CODE( sei.m_manGvdFocalLengthX[i][j], sei.m_precGvdFocalLength, "man_gvd_focal_length_x" );
    14041362          WRITE_CODE( sei.m_manGvdFocalLengthX[i][j], sei.getManGvdFocalLengthXLen(i,j), "man_gvd_focal_length_x" );
    14051363          WRITE_FLAG( ( sei.m_signGvdFocalLengthY[i][j] ? 1 : 0 ), "sign_gvd_focal_length_y" );
    14061364          WRITE_CODE( sei.m_expGvdFocalLengthY[i][j], 6, "exp_gvd_focal_length_y" );
    1407           //WRITE_CODE( sei.m_manGvdFocalLengthY[i][j], sei.m_precGvdFocalLength, "man_gvd_focal_length_y" );
    14081365          WRITE_CODE( sei.m_manGvdFocalLengthY[i][j], sei.getManGvdFocalLengthYLen(i,j), "man_gvd_focal_length_y" );
    14091366          WRITE_FLAG( ( sei.m_signGvdPrincipalPointX[i][j] ? 1 : 0 ), "sign_gvd_principal_point_x" );
    14101367          WRITE_CODE( sei.m_expGvdPrincipalPointX[i][j], 6, "exp_gvd_principal_point_x" );
    1411           //WRITE_CODE( sei.m_manGvdPrincipalPointX[i][j], sei.m_precGvdPrincipalPoint, "man_gvd_principal_point_x" );
    14121368          WRITE_CODE( sei.m_manGvdPrincipalPointX[i][j], sei.getManGvdPrincipalPointXLen(i,j), "man_gvd_principal_point_x" );
    14131369          WRITE_FLAG( ( sei.m_signGvdPrincipalPointY[i][j] ? 1 : 0 ), "sign_gvd_principal_point_y" );
    14141370          WRITE_CODE( sei.m_expGvdPrincipalPointY[i][j], 6, "exp_gvd_principal_point_y" );
    1415           //WRITE_CODE( sei.m_manGvdPrincipalPointY[i][j], sei.m_precGvdPrincipalPoint, "man_gvd_principal_point_y" );
    14161371          WRITE_CODE( sei.m_manGvdPrincipalPointY[i][j], sei.getManGvdPrincipalPointYLen(i,j), "man_gvd_principal_point_y" );
    14171372        }
    14181373        if( sei.m_rotationGvdFlag )
    14191374        {
    1420 #if DEBUG_NH_3D_SEI/*
    1421           printf("sign_gvd_r                    : sei.m_signGvdR[%d][%d][%d]: %u\n", i, j, k, sei.m_signGvdR[i][j][k]);
    1422           printf("exp_gvd_r                     : sei.m_expGvdR[%d][%d][%d]: %u\n", i, j, k, sei.m_expGvdR[i][j][k]);
    1423           printf("man_gvd_r                     : sei.m_manGvdR[%d][%d][%d]: %u\n", i, j, k, sei.m_manGvdR[i][j][k]);
    1424           printf("sign_gvd_r                    : sei.m_signGvdR[%d][%d][%d]: %u\n", i, j, k, sei.m_signGvdR[i][j][k]);
    1425           printf("exp_gvd_r                     : sei.m_expGvdR[%d][%d][%d]: %u\n", i, j, k, sei.m_expGvdR[i][j][k]);
    1426           printf("man_gvd_r                     : sei.m_manGvdR[%d][%d][%d]: %u\n", i, j, k, sei.m_manGvdR[i][j][k]);
    1427           printf("sign_gvd_r                    : sei.m_signGvdR[%d][%d][%d]: %u\n", i, j, k, sei.m_signGvdR[i][j][k]);
    1428           printf("exp_gvd_r                     : sei.m_expGvdR[%d][%d][%d]: %u\n", i, j, k, sei.m_expGvdR[i][j][k]);
    1429           printf("man_gvd_r                     : sei.m_manGvdR[%d][%d][%d]: %u\n", i, j, k, sei.m_manGvdR[i][j][k]);
    1430           */
    1431           //printf("manLEN_gvd_r                  : sei.getManGvdRLen(%d,%d,%d): %u\n", i, j, k, sei.getManGvdRLen(i,j,k));
    1432 #endif
    14331375          WRITE_FLAG( ( sei.m_signGvdR00[i][j] ? 1 : 0 ), "sign_gvd_r00" );
    14341376          WRITE_CODE( sei.m_expGvdR00[i][j], 6, "exp_gvd_r00" );
    … …  
    14581400          WRITE_CODE( sei.m_expGvdR22[i][j], 6, "exp_gvd_r22" );
    14591401          WRITE_CODE( sei.m_manGvdR22[i][j], sei.m_precGvdRotationParam, "man_gvd_r22" );
    1460           //WRITE_CODE( sei.m_manGvdR2[i][j], sei.getManGvdRLen(i,j,k), "man_gvd_r" );
    14611402        }
    14621403        if( sei.m_translationGvdFlag )
    14631404        {
    1464 #if DEBUG_NH_3D_SEI
    1465           printf("sign_gvd_t_x                  : sei.m_signGvdTX[%d][%d]: %u\n", i, j, sei.m_signGvdTX[i][j]);
    1466           printf("exp_gvd_t_x                   : sei.m_expGvdTX[%d][%d]: %u\n", i, j, sei.m_expGvdTX[i][j]);
    1467           printf("man_gvd_t_x                   : sei.m_manGvdTX[%d][%d]: %u\n", i, j, sei.m_manGvdTX[i][j]);
    1468           printf("manLEN_gvd_t_x                : sei.getManGvdTXLen(%d,%d): %u\n", i, j, sei.getManGvdTXLen(i,j));
    1469 #endif
    14701405          WRITE_FLAG( ( sei.m_signGvdTX[i][j] ? 1 : 0 ), "sign_gvd_t_x" );
    14711406          WRITE_CODE( sei.m_expGvdTX[i][j], 6, "exp_gvd_t_x" );
    1472           //WRITE_CODE( sei.m_manGvdTX[i][j], sei.m_precGvdTranslationParam, "man_gvd_t_x" );
    14731407          WRITE_CODE( sei.m_manGvdTX[i][j], sei.getManGvdTXLen(i,j), "man_gvd_t_x" );
    14741408        }

  • branches/HTM-15.1-dev0-NICT/source/Lib/TLibEncoder/TEncGOP.cpp

    r1349 r1355  
    232232  OutputNALUnit nalu(naluType, temporalId);
    233233#endif
    234   printf("\nDEBUG: TEncGOP::xWriteSEI() call SEIWriter::writeSEImessages()\n");
    235234  m_seiWriter.writeSEImessages(nalu.m_Bitstream, seiMessages, sps, false);
    236235  auPos = accessUnit.insert(auPos, new NALUnitEBSP(nalu));
Note: See TracChangeset for help on using the changeset viewer.