Changeset 1179 in 3DVCSoftware for trunk/source/Lib/TAppCommon


Ignore:
Timestamp:
7 Apr 2015, 17:05:30 (9 years ago)
Author:
tech
Message:

Merged branch 13.1-dev0@1178.

Location:
trunk/source/Lib/TAppCommon
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TAppCommon/TAppComCamPara.cpp

    r1133 r1179  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2011, ISO/IEC
     6 * Copyright (c) 2010-2015, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    399399
    400400
     401#if !HHI_CAM_PARA_K0052
    401402Void
    402403TAppComCamPara::xGetViewOrderIndices( const std::vector<Int>& raiId2SortedId, std::vector<Int>& raiVOIdx )
     
    411412  }
    412413}
     414#endif
    413415
    414416
     
    447449    else
    448450    {
    449     Int     iBaseView  = m_aiBaseViews[ iBaseViewId ];
    450     Double  dFL1, dFLX;
    451     Double  dCP1, dCPX;
    452     Double  dCS1, dCSX;
    453     Double  dZN1, dZNX;
    454     Double  dZF1, dZFX;
    455     Bool    bInterpolated;
    456     xGetGeometryData( iBaseView, m_uiFirstFrameId, dFL1, dCP1, dCS1, bInterpolated );  AOT( bInterpolated );
    457     xGetZNearZFar   ( iBaseView, m_uiFirstFrameId, dZN1, dZF1 );
    458 
    459     for( UInt uiFrameId = m_uiFirstFrameId + 1; !bChangeDetected && uiFrameId <= m_uiLastFrameId; uiFrameId++ )
    460     {
    461       xGetGeometryData( iBaseView, uiFrameId, dFLX, dCPX, dCSX, bInterpolated );  AOT( bInterpolated );
    462       xGetZNearZFar   ( iBaseView, uiFrameId, dZNX, dZFX );
    463 
    464       if( dFL1 != dFLX || dCP1 != dCPX || dCS1 != dCSX || dZN1 != dZNX || dZF1 != dZFX )
    465       {
    466         bChangeDetected = true;
    467       }
    468     }
    469   }
     451      Int     iBaseView  = m_aiBaseViews[ iBaseViewId ];
     452      Double  dFL1, dFLX;
     453      Double  dCP1, dCPX;
     454      Double  dCS1, dCSX;
     455      Double  dZN1, dZNX;
     456      Double  dZF1, dZFX;
     457      Bool    bInterpolated;
     458      xGetGeometryData( iBaseView, m_uiFirstFrameId, dFL1, dCP1, dCS1, bInterpolated );  AOT( bInterpolated );
     459      xGetZNearZFar   ( iBaseView, m_uiFirstFrameId, dZN1, dZF1 );
     460
     461      for( UInt uiFrameId = m_uiFirstFrameId + 1; !bChangeDetected && uiFrameId <= m_uiLastFrameId; uiFrameId++ )
     462      {
     463        xGetGeometryData( iBaseView, uiFrameId, dFLX, dCPX, dCSX, bInterpolated );  AOT( bInterpolated );
     464        xGetZNearZFar   ( iBaseView, uiFrameId, dZNX, dZFX );
     465
     466        if( dFL1 != dFLX || dCP1 != dCPX || dCS1 != dCSX || dZN1 != dZNX || dZF1 != dZFX )
     467        {
     468          bChangeDetected = true;
     469        }
     470      }
     471    }
    470472  }
    471473  return bChangeDetected;
     
    721723  else
    722724  {
    723   Double  dScale, dOffset;
    724   Bool    bInterpolated = xGetShiftParameterReal( uiSourceView, uiTargetView, uiFrame, false, bByIdx, dScale, dOffset );
    725   AOT(    bInterpolated ); // must be base view
    726 
    727   Double  dMultOffset   = (Double)( 1 << ( m_uiCamParsCodedPrecision + 1 ) );
    728   Double  dMultScale    = (Double)( 1 << ( m_uiCamParsCodedPrecision + 1 + m_uiInputBitDepth ) );
    729   riOffset              = (Int)floor( dMultOffset * dOffset + .5 );
    730   riScale               = (Int)floor( dMultScale  * dScale  + .5 );
    731 }
    732 
     725    Double  dScale, dOffset;
     726    Bool    bInterpolated = xGetShiftParameterReal( uiSourceView, uiTargetView, uiFrame, false, bByIdx, dScale, dOffset );
     727    AOT(    bInterpolated ); // must be base view
     728
     729    Double  dMultOffset   = (Double)( 1 << ( m_uiCamParsCodedPrecision + 1 ) );
     730    Double  dMultScale    = (Double)( 1 << ( m_uiCamParsCodedPrecision + 1 + m_uiInputBitDepth ) );
     731    riOffset              = (Int)floor( dMultOffset * dOffset + .5 );
     732    riScale               = (Int)floor( dMultScale  * dScale  + .5 );
     733  }
    733734}
    734735
     
    958959
    959960
     961
     962#if !HHI_CAM_PARA_K0052
    960963Void
    961964TAppComCamPara::xSetPdmConversionParams()
     
    995998  }
    996999}
     1000#endif
    9971001
    9981002
     
    12801284
    12811285  //===== set derived parameters =====
     1286#if !HHI_CAM_PARA_K0052
    12821287  xGetViewOrderIndices( m_aiBaseId2SortedId, m_aiViewOrderIndex );
     1288#endif
    12831289  m_bCamParsVaryOverTime = xGetCamParsChangeFlag();
    12841290
  • trunk/source/Lib/TAppCommon/TAppComCamPara.h

    r655 r1179  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2011, ISO/IEC
     6 * Copyright (c) 2010-2015, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    8585
    8686  // SPS and slice header related variables
     87#if !HHI_CAM_PARA_K0052
    8788  std::vector<Int>    m_aiViewOrderIndex;                     ///< list of view order indices
     89#endif
    8890  UInt                m_uiCamParsCodedPrecision;              ///< precision for coding of camera parameters (x: max error in disparity is 2^(-x) luma samples)
    8991  Bool                m_bCamParsVaryOverTime;                 ///< flag specifying whether camera parameters vary for given frame numbers
     
    145147  // getting conversion parameters for disparity to virtual depth conversion
    146148  Void  xGetCameraShifts          ( UInt uiSourceView, UInt uiTargetView, UInt uiFrame, Double& rdCamPosShift, Double& rdPicPosShift );
     149#if !HHI_CAM_PARA_K0052
    147150  Void  xSetPdmConversionParams   ();
     151#endif
    148152
    149153public:
     
    216220  Bool                getVaryingCameraParameters()  { return m_bCamParsVaryOverTime;    }
    217221  UInt                getCamParsCodedPrecision  ()  { return m_uiCamParsCodedPrecision; }
     222#if !HHI_CAM_PARA_K0052
    218223  std::vector<Int>&   getViewOrderIndex         ()  { return m_aiViewOrderIndex;        }
     224#endif
    219225  Int**               getCodedScale             ()  { return m_aaiCodedScale;           }
    220226  Int**               getCodedOffset            ()  { return m_aaiCodedOffset;          }
  • trunk/source/Lib/TAppCommon/program_options_lite.cpp

    r872 r1179  
    44 * granted under this license. 
    55 *
    6 * Copyright (c) 2010-2014, ITU/ISO/IEC
     6* Copyright (c) 2010-2015, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
  • trunk/source/Lib/TAppCommon/program_options_lite.h

    r1084 r1179  
    44 * granted under this license. 
    55 *
    6 * Copyright (c) 2010-2014, ITU/ISO/IEC
     6* Copyright (c) 2010-2015, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
Note: See TracChangeset for help on using the changeset viewer.