Changeset 1405 in 3DVCSoftware for trunk/source/App


Ignore:
Timestamp:
27 May 2016, 17:32:40 (9 years ago)
Author:
tech
Message:

Merged HTM-16.1-dev@1404.

Location:
trunk/source/App
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/App/TAppDecoder/TAppDecCfg.cpp

    r1386 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/TAppDecoder/TAppDecCfg.h

    r1386 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/TAppDecoder/TAppDecTop.cpp

    r1396 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/TAppDecoder/TAppDecTop.h

    r1386 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/TAppDecoder/decmain.cpp

    r1386 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/TAppEncoder/TAppEncCfg.cpp

    r1396 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
    … …  
    239239  in>>entry.m_POC;
    240240  in>>entry.m_QPOffset;
     241#if W0038_CQP_ADJ
     242  in>>entry.m_CbQPoffset;
     243  in>>entry.m_CrQPoffset;
     244#endif
    241245  in>>entry.m_QPFactor;
    242246  in>>entry.m_tcOffsetDiv2;
    … …  
    769773  const Int defaultPrimaryCodes[6]     = { 0,50000, 0,0, 50000,0 };
    770774  const Int defaultWhitePointCode[2]   = { 16667, 16667 };
    771   SMultiValueInput<Int>  cfg_DisplayPrimariesCode            (0, 50000, 3, 3, defaultPrimaryCodes,   sizeof(defaultPrimaryCodes  )/sizeof(Int));
     775  SMultiValueInput<Int>  cfg_DisplayPrimariesCode            (0, 50000, 6, 6, defaultPrimaryCodes,   sizeof(defaultPrimaryCodes  )/sizeof(Int));
    772776  SMultiValueInput<Int>  cfg_DisplayWhitePointCode           (0, 50000, 2, 2, defaultWhitePointCode, sizeof(defaultWhitePointCode)/sizeof(Int));
    773777
    … …  
    877881  ("FrameRate,-fr",                                   m_iFrameRate,                                         0, "Frame rate")
    878882  ("FrameSkip,-fs",                                   m_FrameSkip,                                         0u, "Number of frames to skip at start of input YUV")
     883  ("TemporalSubsampleRatio,-ts",                      m_temporalSubsampleRatio,                            1u, "Temporal sub-sample ratio when reading input YUV")
    879884  ("FramesToBeEncoded,f",                             m_framesToBeEncoded,                                  0, "Number of frames to be encoded (default=all)")
    880885  ("ClipInputVideoToRec709Range",                     m_bClipInputVideoToRec709Range,                   false, "If true then clip input video to the Rec. 709 Range on loading when InternalBitDepth is less than MSBExtendedBitDepth")
    … …  
    950955
    951956  ("HadamardME",                                      m_bUseHADME,                                       true, "Hadamard ME for fractional-pel")
    952   ("ASR",                                             m_bUseASR,                                        false, "Adaptive motion search range")
     957  ("ASR",                                             m_bUseASR,                                        false, "Adaptive motion search range");
     958  opts.addOptions()
    953959
    954960  // Mode decision parameters
    … …  
    978984  ("CrQpOffset,-crqpofs",                             m_crQpOffset,                                         0, "Chroma Cr QP Offset")
    979985
     986#if W0038_CQP_ADJ
     987  ("SliceChromaQPOffsetPeriodicity",                  m_sliceChromaQpOffsetPeriodicity,                    0u, "Used in conjunction with Slice Cb/Cr QpOffsetIntraOrPeriodic. Use 0 (default) to disable periodic nature.")
     988  ("SliceCbQpOffsetIntraOrPeriodic",                  m_sliceChromaQpOffsetIntraOrPeriodic[0],              0, "Chroma Cb QP Offset at slice level for I slice or for periodic inter slices as defined by SliceChromaQPOffsetPeriodicity. Replaces offset in the GOP table.")
     989  ("SliceCrQpOffsetIntraOrPeriodic",                  m_sliceChromaQpOffsetIntraOrPeriodic[1],              0, "Chroma Cr QP Offset at slice level for I slice or for periodic inter slices as defined by SliceChromaQPOffsetPeriodicity. Replaces offset in the GOP table.")
     990#endif
    980991#if ADAPTIVE_QP_SELECTION
    981992  ("AdaptiveQpSelection,-aqps",                       m_bUseAdaptQpSelect,                              false, "AdaptiveQpSelection")
    … …  
    10011012  ("LoopFilterBetaOffset_div2",                       m_loopFilterBetaOffsetDiv2,                           0)
    10021013  ("LoopFilterTcOffset_div2",                         m_loopFilterTcOffsetDiv2,                             0)
     1014#if W0038_DB_OPT
     1015  ("DeblockingFilterMetric",                          m_deblockingFilterMetric,                             0)
     1016#else
    10031017  ("DeblockingFilterMetric",                          m_DeblockingFilterMetric,                         false)
    1004 
     1018#endif
    10051019  // Coding tools
    10061020  ("AMP",                                             m_enableAMP,                                       true, "Enable asymmetric motion partitions")
    … …  
    10281042  ("MaxNumOffsetsPerPic",                             m_maxNumOffsetsPerPic,                             2048, "Max number of SAO offset per picture (Default: 2048)")
    10291043  ("SAOLcuBoundary",                                  m_saoCtuBoundary,                                 false, "0: right/bottom CTU boundary areas skipped from SAO parameter estimation, 1: non-deblocked pixels are used for those areas")
     1044#if OPTIONAL_RESET_SAO_ENCODING_AFTER_IRAP
     1045  ("SAOResetEncoderStateAfterIRAP",                   m_saoResetEncoderStateAfterIRAP,                  false, "When true, resets the encoder's SAO state after an IRAP (POC order). Disabled by default.")
     1046#endif
    10301047  ("SliceMode",                                       tmpSliceMode,                            Int(NO_SLICES), "0: Disable all Recon slice limits, 1: Enforce max # of CTUs, 2: Enforce max # of bytes, 3:specify tiles per dependent slice")
    10311048  ("SliceArgument",                                   m_sliceArgument,                                      0, "Depending on SliceMode being:"
    … …  
    11381155  ("RecalculateQPAccordingToLambda",                  m_recalculateQPAccordingToLambda,                 false, "Recalculate QP values according to lambda values. Do not suggest to be enabled in all intra case")
    11391156  ("StrongIntraSmoothing,-sis",                       m_useStrongIntraSmoothing,                         true, "Enable strong intra smoothing for 32x32 blocks")
    1140   ("SEIActiveParameterSets",                          m_activeParameterSetsSEIEnabled,                      0, "Enable generation of active parameter sets SEI messages")
     1157  ("SEIActiveParameterSets",                          m_activeParameterSetsSEIEnabled,                      0, "Enable generation of active parameter sets SEI messages");
     1158  opts.addOptions()
    11411159  ("VuiParametersPresent,-vui",                       m_vuiParametersPresentFlag,                       false, "Enable generation of vui_parameters()")
    11421160  ("AspectRatioInfoPresent",                          m_aspectRatioInfoPresentFlag,                     false, "Signals whether aspect_ratio_idc is present")
    … …  
    11711189  ("MaxBitsPerMinCuDenom",                            m_maxBitsPerMinCuDenom,                               1, "Indicates an upper bound for the number of bits of coding_unit() data")
    11721190  ("Log2MaxMvLengthHorizontal",                       m_log2MaxMvLengthHorizontal,                         15, "Indicate the maximum absolute value of a decoded horizontal MV component in quarter-pel luma units")
    1173   ("Log2MaxMvLengthVertical",                         m_log2MaxMvLengthVertical,                           15, "Indicate the maximum absolute value of a decoded vertical MV component in quarter-pel luma units")
     1191  ("Log2MaxMvLengthVertical",                         m_log2MaxMvLengthVertical,                           15, "Indicate the maximum absolute value of a decoded vertical MV component in quarter-pel luma units");
     1192  opts.addOptions()
    11741193  ("SEIColourRemappingInfoFileRoot,-cri",             m_colourRemapSEIFileRoot,                    string(""), "Colour Remapping Information SEI parameters root file name (wo num ext)")
    11751194  ("SEIRecoveryPoint",                                m_recoveryPointSEIEnabled,                        false, "Control generation of recovery point SEI messages")
    … …  
    12771296  ("SEIMasteringDisplayPrimaries",                    cfg_DisplayPrimariesCode,       cfg_DisplayPrimariesCode, "Mastering display primaries for all three colour planes in CIE xy coordinates in increments of 1/50000 (results in the ranges 0 to 50000 inclusive)")
    12781297  ("SEIMasteringDisplayWhitePoint",                   cfg_DisplayWhitePointCode,     cfg_DisplayWhitePointCode, "Mastering display white point CIE xy coordinates in normalised increments of 1/50000 (e.g. 0.333 = 16667)")
     1298#if U0033_ALTERNATIVE_TRANSFER_CHARACTERISTICS_SEI
     1299  ("SEIPreferredTransferCharacterisics",              m_preferredTransferCharacteristics,                   -1, "Value for the preferred_transfer_characteristics field of the Alternative transfer characteristics SEI which will override the corresponding entry in the VUI. If negative, do not produce the respective SEI message")
     1300#endif
    12791301#if NH_MV
    12801302  ("SeiCfgFileName_%d",                               m_seiCfgFileNames,             (TChar *) 0 ,MAX_NUM_SEIS , "SEI cfg file name %d")
    … …  
    14161438   * Set any derived parameters
    14171439   */
     1440
     1441  m_framesToBeEncoded = ( m_framesToBeEncoded + m_temporalSubsampleRatio - 1 ) / m_temporalSubsampleRatio;
    14181442  m_adIntraLambdaModifier = cfg_adIntraLambdaModifier.values;
    14191443  if(m_isField)
    … …  
    22592283  xConfirmPara( m_InputChromaFormatIDC >= NUM_CHROMA_FORMAT,                                "InputChromaFormatIDC must be either 400, 420, 422 or 444" );
    22602284  xConfirmPara( m_iFrameRate <= 0,                                                          "Frame rate must be more than 1" );
     2285  xConfirmPara( m_temporalSubsampleRatio < 1,                                               "Temporal subsample rate must be no less than 1" );
    22612286  xConfirmPara( m_framesToBeEncoded <= 0,                                                   "Total Number Of Frames encoded must be more than 0" );
    22622287#if NH_MV
    … …  
    25072532  {
    25082533    xConfirmPara( m_iQP[layer] <  -6 * (m_internalBitDepth[CHANNEL_TYPE_LUMA] - 8) || m_iQP[layer] > 51,      "QP exceeds supported range (-QpBDOffsety to 51)" );
    2509     xConfirmPara( m_DeblockingFilterMetric && (m_bLoopFilterDisable[layer] || m_loopFilterOffsetInPPS), "If DeblockingFilterMetric is true then both LoopFilterDisable and LoopFilterOffsetInPPS must be 0");
     2534    xConfirmPara( m_deblockingFilterMetric!=0 && (m_bLoopFilterDisable[layer] || m_loopFilterOffsetInPPS), "If DeblockingFilterMetric is true then both LoopFilterDisable and LoopFilterOffsetInPPS must be 0");
    25102535  }
    25112536#else
    25122537  xConfirmPara( m_iQP <  -6 * (m_internalBitDepth[CHANNEL_TYPE_LUMA] - 8) || m_iQP > 51,    "QP exceeds supported range (-QpBDOffsety to 51)" );
     2538#if W0038_DB_OPT
     2539  xConfirmPara( m_deblockingFilterMetric!=0 && (m_bLoopFilterDisable || m_loopFilterOffsetInPPS), "If DeblockingFilterMetric is non-zero then both LoopFilterDisable and LoopFilterOffsetInPPS must be 0");
     2540#else
    25132541  xConfirmPara( m_DeblockingFilterMetric && (m_bLoopFilterDisable || m_loopFilterOffsetInPPS), "If DeblockingFilterMetric is true then both LoopFilterDisable and LoopFilterOffsetInPPS must be 0");
     2542#endif
    25142543#endif
    25152544 
    … …  
    25372566    {
    25382567      xConfirmPara( m_iIntraPeriod[i] > 0 && m_iIntraPeriod[i] <= m_iGOPSize ,                      "Intra period must be larger than GOP size for periodic IDR pictures");
     2568#if OPTIONAL_RESET_SAO_ENCODING_AFTER_IRAP
     2569  if (m_saoResetEncoderStateAfterIRAP)
     2570  {
     2571    xConfirmPara( m_iIntraPeriod[i] > 0 && m_iIntraPeriod[i] <= m_iGOPSize ,                      "Intra period must be larger than GOP size when SAOResetEncoderStateAfterIRAP is enabled");
     2572  }
     2573#endif
     2574
    25392575    }
    25402576#else
    2541     xConfirmPara( m_iIntraPeriod > 0 && m_iIntraPeriod <= m_iGOPSize ,                      "Intra period must be larger than GOP size for periodic IDR pictures");
     2577#if OPTIONAL_RESET_SAO_ENCODING_AFTER_IRAP
     2578  if (m_saoResetEncoderStateAfterIRAP)
     2579  {
     2580    xConfirmPara( m_iIntraPeriod > 0 && m_iIntraPeriod <= m_iGOPSize ,                      "Intra period must be larger than GOP size when SAOResetEncoderStateAfterIRAP is enabled");
     2581  }
     2582#endif
     2583
     2584   xConfirmPara( m_iIntraPeriod > 0 && m_iIntraPeriod <= m_iGOPSize ,                      "Intra period must be larger than GOP size for periodic IDR pictures");
    25422585#endif
    25432586  }
    … …  
    28762919    }
    28772920  }
     2921
     2922#if W0038_CQP_ADJ
     2923  for(Int i=0; i<m_iGOPSize; i++)
     2924  {
     2925    xConfirmPara( abs(m_GOPList[i].m_CbQPoffset               ) > 12, "Cb QP Offset for one of the GOP entries exceeds supported range (-12 to 12)" );
     2926    xConfirmPara( abs(m_GOPList[i].m_CbQPoffset + m_cbQpOffset) > 12, "Cb QP Offset for one of the GOP entries, when combined with the PPS Cb offset, exceeds supported range (-12 to 12)" );
     2927    xConfirmPara( abs(m_GOPList[i].m_CrQPoffset               ) > 12, "Cr QP Offset for one of the GOP entries exceeds supported range (-12 to 12)" );
     2928    xConfirmPara( abs(m_GOPList[i].m_CrQPoffset + m_crQpOffset) > 12, "Cr QP Offset for one of the GOP entries, when combined with the PPS Cr offset, exceeds supported range (-12 to 12)" );
     2929  }
     2930  xConfirmPara( abs(m_sliceChromaQpOffsetIntraOrPeriodic[0]                 > 12), "Intra/periodic Cb QP Offset exceeds supported range (-12 to 12)" );
     2931  xConfirmPara( abs(m_sliceChromaQpOffsetIntraOrPeriodic[0]  + m_cbQpOffset > 12), "Intra/periodic Cb QP Offset, when combined with the PPS Cb offset, exceeds supported range (-12 to 12)" );
     2932  xConfirmPara( abs(m_sliceChromaQpOffsetIntraOrPeriodic[1]                 > 12), "Intra/periodic Cr QP Offset exceeds supported range (-12 to 12)" );
     2933  xConfirmPara( abs(m_sliceChromaQpOffsetIntraOrPeriodic[1]  + m_crQpOffset > 12), "Intra/periodic Cr QP Offset, when combined with the PPS Cr offset, exceeds supported range (-12 to 12)" );
     2934#endif
    28782935
    28792936  m_extraRPSs=0;
    … …  
    33423399  }
    33433400
     3401#if U0033_ALTERNATIVE_TRANSFER_CHARACTERISTICS_SEI
     3402  xConfirmPara(m_preferredTransferCharacteristics > 255, "transfer_characteristics_idc should not be greater than 255.");
     3403#endif
     3404
    33443405#undef xConfirmPara
    33453406  if (check_failed)
    … …  
    34083469#endif
    34093470
    3410   printf("Real     Format                   : %dx%d %dHz\n", m_iSourceWidth - m_confWinLeft - m_confWinRight, m_iSourceHeight - m_confWinTop - m_confWinBottom, m_iFrameRate );
    3411   printf("Internal Format                   : %dx%d %dHz\n", m_iSourceWidth, m_iSourceHeight, m_iFrameRate );
     3471  printf("Real     Format                        : %dx%d %gHz\n", m_iSourceWidth - m_confWinLeft - m_confWinRight, m_iSourceHeight - m_confWinTop - m_confWinBottom, (Double)m_iFrameRate/m_temporalSubsampleRatio );
     3472  printf("Internal Format                        : %dx%d %gHz\n", m_iSourceWidth, m_iSourceHeight, (Double)m_iFrameRate/m_temporalSubsampleRatio );
    34123473  printf("Sequence PSNR output              : %s\n", (m_printMSEBasedSequencePSNR ? "Linear average, MSE-based" : "Linear average only") );
    34133474  printf("Sequence MSE output               : %s\n", (m_printSequenceMSE ? "Enabled" : "Disabled") );

  • trunk/source/App/TAppEncoder/TAppEncCfg.h

    r1396 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
    … …  
    144144  Int       m_iFrameRate;                                     ///< source frame-rates (Hz)
    145145  UInt      m_FrameSkip;                                   ///< number of skipped frames from the beginning
     146  UInt      m_temporalSubsampleRatio;                         ///< temporal subsample ratio, 2 means code every two frames
    146147  Int       m_iSourceWidth;                                   ///< source width in pixel
    147148  Int       m_iSourceHeight;                                  ///< source height in pixel (when interlaced = field height)
    … …  
    254255  Int       m_crQpOffset;                                     ///< Chroma Cr QP Offset (0:default)
    255256
     257#if W0038_CQP_ADJ
     258  UInt      m_sliceChromaQpOffsetPeriodicity;                 ///< Used in conjunction with Slice Cb/Cr QpOffsetIntraOrPeriodic. Use 0 (default) to disable periodic nature.
     259  Int       m_sliceChromaQpOffsetIntraOrPeriodic[2/*Cb,Cr*/]; ///< Chroma Cb QP Offset at slice level for I slice or for periodic inter slices as defined by SliceChromaQPOffsetPeriodicity. Replaces offset in the GOP table.
     260#endif
    256261#if ADAPTIVE_QP_SELECTION
    257262  Bool      m_bUseAdaptQpSelect;
    … …  
    312317  Int       m_maxNumOffsetsPerPic;                            ///< SAO maximun number of offset per picture
    313318  Bool      m_saoCtuBoundary;                                 ///< SAO parameter estimation using non-deblocked pixels for CTU bottom and right boundary areas
     319#if OPTIONAL_RESET_SAO_ENCODING_AFTER_IRAP
     320  Bool      m_saoResetEncoderStateAfterIRAP;                  ///< When true, SAO encoder state will be reset following an IRAP.
     321#endif
    314322  // coding tools (loop filter)
    315323#if NH_MV
    … …  
    321329  Int       m_loopFilterBetaOffsetDiv2;                     ///< beta offset for deblocking filter
    322330  Int       m_loopFilterTcOffsetDiv2;                       ///< tc offset for deblocking filter
     331#if W0038_DB_OPT
     332  Int       m_deblockingFilterMetric;                         ///< blockiness metric in encoder
     333#else
    323334  Bool      m_DeblockingFilterMetric;                         ///< blockiness metric in encoder
    324 
     335#endif
    325336  // coding tools (PCM)
    326337  Bool      m_usePCM;                                         ///< flag for using IPCM
    … …  
    440451  Int*      m_kneeSEIInputKneePoint;
    441452  Int*      m_kneeSEIOutputKneePoint;
     453#if U0033_ALTERNATIVE_TRANSFER_CHARACTERISTICS_SEI
     454  Int       m_preferredTransferCharacteristics;
     455#endif
     456
    442457  // weighted prediction
    443458  Bool      m_useWeightedPred;                    ///< Use of weighted prediction in P slices

  • trunk/source/App/TAppEncoder/TAppEncTop.cpp

    r1396 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
    … …  
    354354  m_cTEncTop.setFrameRate                                         ( m_iFrameRate );
    355355  m_cTEncTop.setFrameSkip                                         ( m_FrameSkip );
     356  m_cTEncTop.setTemporalSubsampleRatio                            ( m_temporalSubsampleRatio );
    356357  m_cTEncTop.setSourceWidth                                       ( m_iSourceWidth );
    357358  m_cTEncTop.setSourceHeight                                      ( m_iSourceHeight );
    … …  
    417418  m_cTEncTop.setLoopFilterBetaOffset                              ( m_loopFilterBetaOffsetDiv2  );
    418419  m_cTEncTop.setLoopFilterTcOffset                                ( m_loopFilterTcOffsetDiv2    );
     420#if W0038_DB_OPT
     421  m_cTEncTop.setDeblockingFilterMetric                            ( m_deblockingFilterMetric );
     422#else
    419423  m_cTEncTop.setDeblockingFilterMetric                            ( m_DeblockingFilterMetric );
     424#endif
    420425
    421426  //====== Motion search ========
    … …  
    439444  m_cTEncTop.setChromaCbQpOffset                                  ( m_cbQpOffset     );
    440445  m_cTEncTop.setChromaCrQpOffset                                  ( m_crQpOffset  );
     446#if W0038_CQP_ADJ
     447  m_cTEncTop.setSliceChromaOffsetQpIntraOrPeriodic                ( m_sliceChromaQpOffsetPeriodicity, m_sliceChromaQpOffsetIntraOrPeriodic );
     448#endif
    441449
    442450#if NH_3D
    … …  
    554562
    555563  m_cTEncTop.setSaoCtuBoundary                                    ( m_saoCtuBoundary);
     564#if OPTIONAL_RESET_SAO_ENCODING_AFTER_IRAP
     565  m_cTEncTop.setSaoResetEncoderStateAfterIRAP                     ( m_saoResetEncoderStateAfterIRAP);
     566#endif
    556567  m_cTEncTop.setPCMInputBitDepthFlag                              ( m_bPCMInputBitDepthFlag);
    557568  m_cTEncTop.setPCMFilterDisableFlag                              ( m_bPCMFilterDisableFlag);
    … …  
    628639  m_cTEncTop.setColourRemapInfoSEIFileRoot                        ( m_colourRemapSEIFileRoot );
    629640  m_cTEncTop.setMasteringDisplaySEI                               ( m_masteringDisplay );
     641#if U0033_ALTERNATIVE_TRANSFER_CHARACTERISTICS_SEI
     642  m_cTEncTop.setSEIAlternativeTransferCharacteristicsSEIEnable    ( m_preferredTransferCharacteristics>=0     );
     643  m_cTEncTop.setSEIPreferredTransferCharacteristics               ( UChar(m_preferredTransferCharacteristics) );
     644#endif
    630645
    631646#if NH_MV
    … …  
    11241139      outputAccessUnits.clear();
    11251140    }
     1141    // temporally skip frames
     1142    if( m_temporalSubsampleRatio > 1 )
     1143    {
     1144      m_cTVideoIOYuvInputFile.skipFrames(m_temporalSubsampleRatio-1, m_iSourceWidth - m_aiPad[0], m_iSourceHeight - m_aiPad[1], m_InputChromaFormatIDC);
     1145    }
    11261146  }
    11271147
    … …  
    14201440{
    14211441#if NH_MV
    1422   Double time = (Double) m_frameRcvd[0] / m_iFrameRate;
     1442  Double time = (Double) m_frameRcvd[0] / m_iFrameRate * m_temporalSubsampleRatio;
    14231443  printf("\n");
    14241444#else
    1425   Double time = (Double) m_iFrameRcvd / m_iFrameRate;
     1445  Double time = (Double) m_iFrameRcvd / m_iFrameRate * m_temporalSubsampleRatio;
    14261446#endif
    14271447  printf("Bytes written to file: %u (%.3f kbps)\n", m_totalBytes, 0.008 * m_totalBytes / time);

  • trunk/source/App/TAppEncoder/TAppEncTop.h

    r1386 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/TAppEncoder/encmain.cpp

    r1313 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/TAppExtractor/TAppExtrCfg.cpp

    r1386 r1405  
    44 * granted under this license. 
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/TAppExtractor/TAppExtrCfg.h

    r1386 r1405  
    44 * granted under this license. 
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/TAppExtractor/TAppExtrTop.cpp

    r1313 r1405  
    44// * granted under this license. 
    55// *
    6 // * Copyright (c) 2010-2015, ITU/ISO/IEC
     6// * Copyright (c) 2010-2016, ITU/ISO/IEC
    77// * All rights reserved.
    88// *

  • trunk/source/App/TAppExtractor/TAppExtrTop.h

    r1313 r1405  
    44 * granted under this license. 
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/TAppExtractor/extrmain.cpp

    r1313 r1405  
    44 * granted under this license. 
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/TAppRenderer/RendererMain.cpp

    r1386 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/TAppRenderer/TAppRendererCfg.cpp

    r1396 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/TAppRenderer/TAppRendererCfg.h

    r1396 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/TAppRenderer/TAppRendererTop.cpp

    r1396 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/TAppRenderer/TAppRendererTop.h

    r1386 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/utils/BitrateTargeting/ExtractBitrates.cpp

    r1313 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/utils/BitrateTargeting/ExtractBitrates.h

    r1313 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/utils/BitrateTargeting/ExtractBitratesMain.cpp

    r1313 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/utils/BitrateTargeting/GuessLambdaModifiers.cpp

    r1313 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/utils/BitrateTargeting/GuessLambdaModifiers.h

    r1313 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/utils/BitrateTargeting/GuessLambdaModifiersMain.cpp

    r1313 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/utils/BitrateTargeting/RuntimeError.h

    r1313 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/utils/annexBbytecount.cpp

    r1313 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *

  • trunk/source/App/utils/convert_NtoMbit_YCbCr.cpp

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