Ticket #1354: bugfix.patch

File bugfix.patch, 4.2 KB (added by kolya, 10 years ago)

PTL naming patch

  • source/Lib/TLibDecoder/TDecCAVLC.cpp 

    diff --git a/source/Lib/TLibDecoder/TDecCAVLC.cpp b/source/Lib/TLibDecoder/TDecCAVLC.cpp
index 5875194..03d469b 100644
    a b  
    16301630Void TDecCavlc::parseProfileTier(ProfileTierLevel *ptl)
    16311631{
    16321632  UInt uiCode;
    1633   READ_CODE(2 , uiCode, "general_profile_space");   ptl->setProfileSpace(uiCode);
    1634   READ_FLAG(    uiCode, "general_tier_flag"    );   ptl->setTierFlag    (uiCode ? Level::HIGH : Level::MAIN);
    1635   READ_CODE(5 , uiCode, "general_profile_idc"  );   ptl->setProfileIdc  (Profile::Name(uiCode));
     1633  READ_CODE(2 , uiCode, "profile_space");   ptl->setProfileSpace(uiCode);
     1634  READ_FLAG(    uiCode, "tier_flag"    );   ptl->setTierFlag    (uiCode ? Level::HIGH : Level::MAIN);
     1635  READ_CODE(5 , uiCode, "profile_idc"  );   ptl->setProfileIdc  (Profile::Name(uiCode));
    16361636  for(Int j = 0; j < 32; j++)
    16371637  {
    1638     READ_FLAG(  uiCode, "XXX_profile_compatibility_flag[][j]");   ptl->setProfileCompatibilityFlag(j, uiCode ? 1 : 0);
     1638    READ_FLAG(  uiCode, "profile_compatibility_flag[][j]");   ptl->setProfileCompatibilityFlag(j, uiCode ? 1 : 0);
    16391639  }
    1640   READ_FLAG(uiCode, "general_progressive_source_flag");
     1640  READ_FLAG(uiCode, "progressive_source_flag");
    16411641  ptl->setProgressiveSourceFlag(uiCode ? true : false);
    16421642
    1643   READ_FLAG(uiCode, "general_interlaced_source_flag");
     1643  READ_FLAG(uiCode, "interlaced_source_flag");
    16441644  ptl->setInterlacedSourceFlag(uiCode ? true : false);
    16451645
    1646   READ_FLAG(uiCode, "general_non_packed_constraint_flag");
     1646  READ_FLAG(uiCode, "non_packed_constraint_flag");
    16471647  ptl->setNonPackedConstraintFlag(uiCode ? true : false);
    16481648
    1649   READ_FLAG(uiCode, "general_frame_only_constraint_flag");
     1649  READ_FLAG(uiCode, "frame_only_constraint_flag");
    16501650  ptl->setFrameOnlyConstraintFlag(uiCode ? true : false);
    16511651
    16521652  if (ptl->getProfileIdc() == Profile::MAINREXT || ptl->getProfileIdc() == Profile::HIGHTHROUGHPUTREXT )
    16531653  {
    16541654    UInt maxBitDepth=16;
    1655     READ_FLAG(    uiCode, "general_max_12bit_constraint_flag" ); if (uiCode) maxBitDepth=12;
    1656     READ_FLAG(    uiCode, "general_max_10bit_constraint_flag" ); if (uiCode) maxBitDepth=10;
    1657     READ_FLAG(    uiCode, "general_max_8bit_constraint_flag"  ); if (uiCode) maxBitDepth=8;
     1655    READ_FLAG(    uiCode, "max_12bit_constraint_flag" ); if (uiCode) maxBitDepth=12;
     1656    READ_FLAG(    uiCode, "max_10bit_constraint_flag" ); if (uiCode) maxBitDepth=10;
     1657    READ_FLAG(    uiCode, "max_8bit_constraint_flag"  ); if (uiCode) maxBitDepth=8;
    16581658    ptl->setBitDepthConstraint(maxBitDepth);
    16591659    ChromaFormat chromaFmtConstraint=CHROMA_444;
    1660     READ_FLAG(    uiCode, "general_max_422chroma_constraint_flag"  ); if (uiCode) chromaFmtConstraint=CHROMA_422;
    1661     READ_FLAG(    uiCode, "general_max_420chroma_constraint_flag"  ); if (uiCode) chromaFmtConstraint=CHROMA_420;
    1662     READ_FLAG(    uiCode, "general_max_monochrome_constraint_flag" ); if (uiCode) chromaFmtConstraint=CHROMA_400;
     1660    READ_FLAG(    uiCode, "max_422chroma_constraint_flag"  ); if (uiCode) chromaFmtConstraint=CHROMA_422;
     1661    READ_FLAG(    uiCode, "max_420chroma_constraint_flag"  ); if (uiCode) chromaFmtConstraint=CHROMA_420;
     1662    READ_FLAG(    uiCode, "max_monochrome_constraint_flag" ); if (uiCode) chromaFmtConstraint=CHROMA_400;
    16631663    ptl->setChromaFormatConstraint(chromaFmtConstraint);
    1664     READ_FLAG(    uiCode, "general_intra_constraint_flag");          ptl->setIntraConstraintFlag(uiCode != 0);
    1665     READ_FLAG(    uiCode, "general_one_picture_only_constraint_flag");
    1666     READ_FLAG(    uiCode, "general_lower_bit_rate_constraint_flag"); ptl->setLowerBitRateConstraintFlag(uiCode != 0);
    1667     READ_CODE(16, uiCode, "general_reserved_zero_35bits[0..15]");
    1668     READ_CODE(16, uiCode, "general_reserved_zero_35bits[16..31]");
    1669     READ_CODE(3,  uiCode, "general_reserved_zero_35bits[32..34]");
     1664    READ_FLAG(    uiCode, "intra_constraint_flag");          ptl->setIntraConstraintFlag(uiCode != 0);
     1665    READ_FLAG(    uiCode, "one_picture_only_constraint_flag");
     1666    READ_FLAG(    uiCode, "lower_bit_rate_constraint_flag"); ptl->setLowerBitRateConstraintFlag(uiCode != 0);
     1667    READ_CODE(16, uiCode, "reserved_zero_35bits[0..15]");
     1668    READ_CODE(16, uiCode, "reserved_zero_35bits[16..31]");
     1669    READ_CODE(3,  uiCode, "reserved_zero_35bits[32..34]");