Changeset 1356 in SHVCSoftware for branches/SHM-dev/source/Lib


Ignore:
Timestamp:
22 Jul 2015, 04:03:45 (10 years ago)
Author:
seregin
Message:

port rev 4434

Location:
branches/SHM-dev/source/Lib
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

    r1348 r1356  
    203203  ChromaFormat      m_chromaFormatConstraintValue;
    204204  Bool              m_intraConstraintFlag;
     205  Bool              m_onePictureOnlyConstraintFlag;
    205206  Bool              m_lowerBitRateConstraintFlag;
    206207
    … …  
    243244  Bool          getIntraConstraintFlag() const              { return m_intraConstraintFlag;         }
    244245  Void          setIntraConstraintFlag(Bool b)              { m_intraConstraintFlag = b;            }
     246
     247  Bool          getOnePictureOnlyConstraintFlag() const     { return m_onePictureOnlyConstraintFlag;}
     248  Void          setOnePictureOnlyConstraintFlag(Bool b)     { m_onePictureOnlyConstraintFlag = b;   }
    245249
    246250  Bool          getLowerBitRateConstraintFlag() const       { return m_lowerBitRateConstraintFlag;  }

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1352 r1356  
    21862186    ptl->setChromaFormatConstraint(chromaFmtConstraint);
    21872187    READ_FLAG(    uiCode, PTL_TRACE_TEXT("intra_constraint_flag"           )); ptl->setIntraConstraintFlag(uiCode != 0);
    2188     READ_FLAG(    uiCode, PTL_TRACE_TEXT("one_picture_only_constraint_flag"));
     2188    READ_FLAG(    uiCode, PTL_TRACE_TEXT("one_picture_only_constraint_flag")); ptl->setOnePictureOnlyConstraintFlag(uiCode != 0);
    21892189    READ_FLAG(    uiCode, PTL_TRACE_TEXT("lower_bit_rate_constraint_flag"  )); ptl->setLowerBitRateConstraintFlag(uiCode != 0);
    21902190#if SVC_EXTENSION

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r1352 r1356  
    14071407    WRITE_FLAG(chromaFmtConstraint==CHROMA_420||chromaFmtConstraint==CHROMA_400,                                  PTL_TRACE_TEXT("max_420chroma_constraint_flag" ));
    14081408    WRITE_FLAG(chromaFmtConstraint==CHROMA_400,                                                                   PTL_TRACE_TEXT("max_monochrome_constraint_flag"));
    1409     WRITE_FLAG(ptl->getIntraConstraintFlag(),        PTL_TRACE_TEXT("intra_constraint_flag"           ));
    1410     WRITE_FLAG(0,                                    PTL_TRACE_TEXT("one_picture_only_constraint_flag"));
    1411     WRITE_FLAG(ptl->getLowerBitRateConstraintFlag(), PTL_TRACE_TEXT("lower_bit_rate_constraint_flag"  ));
     1409    WRITE_FLAG(ptl->getIntraConstraintFlag(),          PTL_TRACE_TEXT("intra_constraint_flag"           ));
     1410    WRITE_FLAG(ptl->getOnePictureOnlyConstraintFlag(), PTL_TRACE_TEXT("one_picture_only_constraint_flag"));
     1411    WRITE_FLAG(ptl->getLowerBitRateConstraintFlag(),   PTL_TRACE_TEXT("lower_bit_rate_constraint_flag"  ));
    14121412#if SVC_EXTENSION
    14131413    WRITE_CODE(0, 32,  "general_reserved_zero_34bits");  WRITE_CODE(0, 2,  "general_reserved_zero_34bits");

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

    r1334 r1356  
    125125  ChromaFormat      m_chromaFormatConstraintValue;
    126126  Bool              m_intraConstraintFlag;
     127  Bool              m_onePictureOnlyConstraintFlag;
    127128  Bool              m_lowerBitRateConstraintFlag;
    128129
    … …  
    10161017  Void         setIntraConstraintFlag(Bool b)                        { m_intraConstraintFlag=b; }
    10171018
     1019  Bool         getOnePictureOnlyConstraintFlag() const               { return m_onePictureOnlyConstraintFlag; }
     1020  Void         setOnePictureOnlyConstraintFlag(Bool b)               { m_onePictureOnlyConstraintFlag=b; }
     1021
    10181022  Bool         getLowerBitRateConstraintFlag() const                 { return m_lowerBitRateConstraintFlag; }
    10191023  Void         setLowerBitRateConstraintFlag(Bool b)                 { m_lowerBitRateConstraintFlag=b; }
    … …  
    10291033  Void      setSummaryPicFilenameBase(const std::string &s)          { m_summaryPicFilenameBase = s; }
    10301034  const std::string& getSummaryPicFilenameBase() const               { return m_summaryPicFilenameBase; }
     1035
    10311036  Void      setSummaryVerboseness(UInt v)                            { m_summaryVerboseness = v; }
    10321037  UInt      getSummaryVerboseness( ) const                           { return m_summaryVerboseness; }

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp

    r1350 r1356  
    873873  profileTierLevel.setChromaFormatConstraint(m_chromaFormatConstraintValue);
    874874  profileTierLevel.setIntraConstraintFlag(m_intraConstraintFlag);
     875  profileTierLevel.setOnePictureOnlyConstraintFlag(m_onePictureOnlyConstraintFlag);
    875876  profileTierLevel.setLowerBitRateConstraintFlag(m_lowerBitRateConstraintFlag);
    876877
Note: See TracChangeset for help on using the changeset viewer.