Changeset 1169 in 3DVCSoftware for branches/HTM-13.1-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp
- Timestamp:
- 5 Apr 2015, 22:37:43 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-13.1-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp
r1167 r1169 678 678 #endif 679 679 WRITE_UVLC( pcSPS->getChromaFormatIdc (), "chroma_format_idc" ); 680 #if !H_3D_DISABLE_CHROMA 680 681 assert(pcSPS->getChromaFormatIdc () == 1); 682 #endif 681 683 // in the first version chroma_format_idc can only be equal to 1 (4:2:0) 682 684 if( pcSPS->getChromaFormatIdc () == 3 ) … … 1376 1378 if ( pcRepFormat->getChromaAndBitDepthVpsPresentFlag() ) 1377 1379 { 1378 WRITE_CODE( pcRepFormat->getChromaFormatVpsIdc( ), 2, "chroma_format_vps_idc" );1379 1380 if ( pcRepFormat->getChromaFormatVpsIdc() == 3 )1381 {1382 WRITE_FLAG( pcRepFormat->getSeparateColourPlaneVpsFlag( ) ? 1 : 0 , "separate_colour_plane_vps_flag" );1383 }1384 WRITE_CODE( pcRepFormat->getBitDepthVpsLumaMinus8( ), 4, "bit_depth_vps_luma_minus8" );1385 WRITE_CODE( pcRepFormat->getBitDepthVpsChromaMinus8( ), 4, "bit_depth_vps_chroma_minus8" );1380 WRITE_CODE( pcRepFormat->getChromaFormatVpsIdc( ), 2, "chroma_format_vps_idc" ); 1381 1382 if ( pcRepFormat->getChromaFormatVpsIdc() == 3 ) 1383 { 1384 WRITE_FLAG( pcRepFormat->getSeparateColourPlaneVpsFlag( ) ? 1 : 0 , "separate_colour_plane_vps_flag" ); 1385 } 1386 WRITE_CODE( pcRepFormat->getBitDepthVpsLumaMinus8( ), 4, "bit_depth_vps_luma_minus8" ); 1387 WRITE_CODE( pcRepFormat->getBitDepthVpsChromaMinus8( ), 4, "bit_depth_vps_chroma_minus8" ); 1386 1388 } 1387 1389 else … … 1732 1734 1733 1735 // in the first version chroma_format_idc is equal to one, thus colour_plane_id will not be present 1736 #if H_3D_DISABLE_CHROMA 1737 assert (pcSlice->getSPS()->getChromaFormatIdc() == 1 || pcSlice->getIsDepth() ); 1738 assert (pcSlice->getSPS()->getChromaFormatIdc() == 0 || !pcSlice->getIsDepth() ); 1739 #else 1734 1740 assert (pcSlice->getSPS()->getChromaFormatIdc() == 1 ); 1741 #endif 1735 1742 // if( separate_colour_plane_flag == 1 ) 1736 1743 // colour_plane_id u(2) … … 1911 1918 { 1912 1919 WRITE_FLAG( pcSlice->getSaoEnabledFlag(), "slice_sao_luma_flag" ); 1920 #if H_3D_DISABLE_CHROMA 1921 if ( !pcSlice->getIsDepth() ) 1922 { 1913 1923 WRITE_FLAG( pcSlice->getSaoEnabledFlagChroma(), "slice_sao_chroma_flag" ); 1924 } 1925 #else 1926 WRITE_FLAG( pcSlice->getSaoEnabledFlagChroma(), "slice_sao_chroma_flag" ); 1927 #endif 1914 1928 } 1915 1929 } … … 2564 2578 { 2565 2579 wpScalingParam *wp; 2580 #if H_3D_DISABLE_CHROMA 2581 Bool bChroma = !pcSlice->getIsDepth(); // color always present in HEVC ? 2582 #else 2566 2583 Bool bChroma = true; // color always present in HEVC ? 2584 #endif 2567 2585 Int iNbRef = (pcSlice->getSliceType() == B_SLICE ) ? (2) : (1); 2568 2586 Bool bDenomCoded = false;
Note: See TracChangeset for help on using the changeset viewer.