Changeset 1079 in 3DVCSoftware


Ignore:
Timestamp:
21 Oct 2014, 23:01:55 (9 years ago)
Author:
tech
Message:

Removed MV-HEVC related macros part 5
.

Location:
branches/HTM-12.1-dev0/source
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-12.1-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

    r1078 r1079  
    386386  ("DLT",                   m_useDLT,           true,  "Depth lookup table")
    387387#endif
    388 #if MTK_SINGLE_DEPTH_MODE_I0095
     388#if H_3D
    389389  ("SingleDepthMode",    m_useSingleDepthMode, true, "Single depth mode")                         
    390390#endif
     
    26172617  printf("DLT:%d ", m_useDLT );
    26182618#endif
    2619 #if MTK_SINGLE_DEPTH_MODE_I0095
     2619#if H_3D
    26202620  printf("SingleDepthMode:%d ",    m_useSingleDepthMode);
    26212621#endif
  • branches/HTM-12.1-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1078 r1079  
    27632763    }
    27642764    assert( ( m_pcBitstream->getNumBitsRead() - posFollSliceSegHeaderExtLen ) == rpcSlice->getSliceSegmentHeaderExtensionLength() * 8  );
     2765  }
    27652766#else
    27662767    READ_UVLC( uiCode, "slice_header_extension_length" );
     
    27702771      READ_CODE(8,ignore,"slice_header_extension_data_byte");
    27712772    } 
    2772   }
    2773   else
    2774   {
    2775     rpcSlice->setSliceSegmentHeaderExtensionLength( 0 );
    2776     rpcSlice->setPocMsbValPresentFlag( false );
    27772773  }
    27782774#endif
  • branches/HTM-12.1-dev0/source/Lib/TLibDecoder/TDecGop.cpp

    r976 r1079  
    248248    calcAndPrintHashStatus(*rpcPic->getPicYuvRec(), hash);
    249249  }
     250#if !H_MV
     251#if SETTING_PIC_OUTPUT_MARK
     252  rpcPic->setOutputMark(rpcPic->getSlice(0)->getPicOutputFlag() ? true : false);
     253#else
     254  rpcPic->setOutputMark(true);
     255#endif
     256  rpcPic->setReconMark(true);
     257#endif
    250258}
    251259
  • branches/HTM-12.1-dev0/source/Lib/TLibDecoder/TDecTop.cpp

    r1078 r1079  
    11731173#endif   
    11741174#endif
    1175     // For generalized B
    11761175#if H_MV
    11771176    if( m_layerId > 0 && !pcSlice->isIntra() && pcSlice->getEnableTMVPFlag() )
  • branches/HTM-12.1-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp

    r1076 r1079  
    23002300  WRITE_FLAG(ptl->getFrameOnlyConstraintFlag(), "general_frame_only_constraint_flag");
    23012301 
     2302#if H_MV
    23022303  if( ptl->getV2ConstraintsPresentFlag() )
    23032304  {
     
    23292330    WRITE_FLAG(0, "reserved_zero_bit");
    23302331  }
     2332#else
     2333  WRITE_CODE(0 , 16, "XXX_reserved_zero_44bits[0..15]");
     2334  WRITE_CODE(0 , 16, "XXX_reserved_zero_44bits[16..31]");
     2335  WRITE_CODE(0 , 12, "XXX_reserved_zero_44bits[32..43]");
     2336#endif
    23312337}
    23322338
Note: See TracChangeset for help on using the changeset viewer.