Skip to content

GitLab

V
VVCSoftware_BMS
Commit 4cca058b authored by Karsten Suehring's avatar Karsten Suehring
Browse files
Options

Merge branch 'high_precision_mv_storage' into 'master' 

High precision mv storage

See merge request !112
parents 23eede45 76e6c346
Pipeline #133 passed with stage
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 958 additions and 199 deletions
    cfg/encoder_intra_bms.cfg
    View file @ 4cca058b
    ......@@ -105,7 +105,6 @@ MTT : 1
    EMT : 3
    EMTFast : 3
    Affine : 1
    HighPrecMv : 1
    SubPuMvp : 1
    MaxNumMergeCand : 6
    LMChroma : 1
    ......@@ -127,3 +126,4 @@ AMaxBT : 1
    ### DO NOT ADD ANYTHING BELOW THIS LINE ###
    ### DO NOT DELETE THE EMPTY LINE BELOW ###
    cfg/encoder_intra_vtm.cfg
    View file @ 4cca058b
    ......@@ -105,7 +105,6 @@ MTT : 1
    EMT : 1
    EMTFast : 1
    Affine : 1
    HighPrecMv : 1
    SubPuMvp : 1
    MaxNumMergeCand : 6
    LMChroma : 1 # use CCLM only
    ......@@ -121,3 +120,4 @@ AMaxBT : 1
    ### DO NOT ADD ANYTHING BELOW THIS LINE ###
    ### DO NOT DELETE THE EMPTY LINE BELOW ###
    cfg/encoder_lowdelay_P_bms.cfg
    View file @ 4cca058b
    ......@@ -121,7 +121,6 @@ MTT : 1
    EMT : 3
    EMTFast : 3
    Affine : 1
    HighPrecMv : 1
    SubPuMvp : 1
    MaxNumMergeCand : 6
    LMChroma : 1
    ......@@ -143,3 +142,4 @@ AMaxBT : 1
    ### DO NOT ADD ANYTHING BELOW THIS LINE ###
    ### DO NOT DELETE THE EMPTY LINE BELOW ###
    cfg/encoder_lowdelay_P_vtm.cfg
    View file @ 4cca058b
    ......@@ -121,7 +121,6 @@ MTT : 1
    EMT : 1
    EMTFast : 1
    Affine : 1
    HighPrecMv : 1
    SubPuMvp : 1
    MaxNumMergeCand : 6
    LMChroma : 1 # use CCLM only
    ......@@ -137,3 +136,4 @@ AMaxBT : 1
    ### DO NOT ADD ANYTHING BELOW THIS LINE ###
    ### DO NOT DELETE THE EMPTY LINE BELOW ###
    cfg/encoder_lowdelay_bms.cfg
    View file @ 4cca058b
    ......@@ -121,7 +121,6 @@ MTT : 1
    EMT : 3
    EMTFast : 3
    Affine : 1
    HighPrecMv : 1
    SubPuMvp : 1
    MaxNumMergeCand : 6
    LMChroma : 1
    ......@@ -143,3 +142,4 @@ AMaxBT : 1
    ### DO NOT ADD ANYTHING BELOW THIS LINE ###
    ### DO NOT DELETE THE EMPTY LINE BELOW ###
    cfg/encoder_lowdelay_vtm.cfg
    View file @ 4cca058b
    ......@@ -121,7 +121,6 @@ MTT : 1
    EMT : 1
    EMTFast : 1
    Affine : 1
    HighPrecMv : 1
    SubPuMvp : 1
    MaxNumMergeCand : 6
    LMChroma : 1 # use CCLM only
    ......@@ -137,3 +136,4 @@ AMaxBT : 1
    ### DO NOT ADD ANYTHING BELOW THIS LINE ###
    ### DO NOT DELETE THE EMPTY LINE BELOW ###
    cfg/encoder_randomaccess_bms.cfg
    View file @ 4cca058b
    ......@@ -110,7 +110,7 @@ RCForceIntraQP : 0 # Rate control: force int
    #============ JEM settings ======================
    LoopFilterTcOffset_div2 : 0
    SEIDecodedPictureHash : 0
    SEIDecodedPictureHash : 1
    CbQpOffset : 0
    CrQpOffset : 0
    ......@@ -135,7 +135,6 @@ MTT : 1
    EMT : 3
    EMTFast : 3
    Affine : 1
    HighPrecMv : 1
    SubPuMvp : 1
    MaxNumMergeCand : 6
    LMChroma : 1
    ......@@ -158,3 +157,4 @@ AMaxBT : 1
    ### DO NOT ADD ANYTHING BELOW THIS LINE ###
    ### DO NOT DELETE THE EMPTY LINE BELOW ###
    cfg/encoder_randomaccess_vtm.cfg
    View file @ 4cca058b
    ......@@ -135,7 +135,6 @@ MTT : 1
    EMT : 1
    EMTFast : 1
    Affine : 1
    HighPrecMv : 1
    SubPuMvp : 1
    MaxNumMergeCand : 6
    LMChroma : 1 # use CCLM only
    ......@@ -151,3 +150,4 @@ AMaxBT : 1
    ### DO NOT ADD ANYTHING BELOW THIS LINE ###
    ### DO NOT DELETE THE EMPTY LINE BELOW ###
    source/App/EncoderApp/EncApp.cpp
    View file @ 4cca058b
    ......@@ -241,7 +241,9 @@ void EncApp::xInitLibCfg()
    #endif
    #endif
    #if JEM_TOOLS
    #if !REMOVE_MV_ADAPT_PREC
    m_cEncLib.setHighPrecisionMv ( m_highPrecisionMv );
    #endif
    m_cEncLib.setAffine ( m_Affine );
    #if JVET_K0337_AFFINE_6PARA
    m_cEncLib.setAffineType ( m_AffineType );
    ......
    source/App/EncoderApp/EncAppCfg.cpp
    View file @ 4cca058b
    ......@@ -833,10 +833,14 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
    ("SubPuMvp", m_SubPuMvpMode, 0, "Enable Sub-PU temporal motion vector prediction (0:off, 1:on) [default: off]")
    #endif
    ("SubPuMvpLog2Size", m_SubPuMvpLog2Size, 2u, "Sub-PU TMVP size index: 2^n")
    ("HighPrecMv", m_highPrecisionMv, false, "High precision motion vectors for temporal merging (0:off, 1:on) [default: off]")
    #if !REMOVE_MV_ADAPT_PREC
    ("HighPrecMv", m_highPrecisionMv, false, "High precision motion vectors for temporal merging (0:off, 1:on) [default: off]")
    #endif
    #endif
    #if JEM_TOOLS || JVET_K_AFFINE
    ("HighPrecMv", m_highPrecisionMv, false, "High precision motion vectors for temporal merging (0:off, 1:on) [default: off]")
    #if !REMOVE_MV_ADAPT_PREC
    ("HighPrecMv", m_highPrecisionMv, false, "High precision motion vectors for temporal merging (0:off, 1:on) [default: off]")
    #endif
    ("Affine", m_Affine, false, "Enable affine prediction (0:off, 1:on) [default: off]")
    #if JVET_K0337_AFFINE_6PARA
    ( "AffineType", m_AffineType, true, "Enable affine type prediction (0:off, 1:on) [default: on]" )
    ......@@ -2122,7 +2126,9 @@ bool EncAppCfg::xCheckParameter()
    xConfirmPara( !( m_OBMCBlkSize == 4 || m_OBMCBlkSize == 8 ), "OBMC Block Size must be set to 4 or 8 samples" );
    #endif
    #if JVET_K_AFFINE
    xConfirmPara( m_Affine && !m_highPrecisionMv, "Affine is not yet implemented for HighPrecMv off." );
    #if !REMOVE_MV_ADAPT_PREC
    xConfirmPara(m_Affine && !m_highPrecisionMv, "Affine is not yet implemented for HighPrecMv off.");
    #endif
    #endif
    #if JEM_TOOLS
    xConfirmPara( m_DMVR && !m_QTBT, "DMVR without QTBT results in encoder-decoder mismatch!" );
    ......@@ -3403,11 +3409,15 @@ void EncAppCfg::xPrintParameter()
    #endif
    #endif
    #if JEM_TOOLS
    msg( VERBOSE, "HighPrecMv:%d ", m_highPrecisionMv );
    #if !REMOVE_MV_ADAPT_PREC
    msg(VERBOSE, "HighPrecMv:%d ", m_highPrecisionMv);
    #endif
    msg( VERBOSE, "BIO:%d ", m_BIO );
    #endif
    #if !JEM_TOOLS && (JVET_K0346 || JVET_K_AFFINE)
    #if !REMOVE_MV_ADAPT_PREC
    msg(VERBOSE, "HighPrecMv:%d ", m_highPrecisionMv);
    #endif
    #endif
    msg( VERBOSE, "DisMDC:%d ", m_DisableMotionCompression );
    #if JEM_TOOLS
    ......
    source/Lib/CommonLib/ContextModelling.cpp
    View file @ 4cca058b
    ......@@ -769,7 +769,13 @@ void MergeCtx::setMergeInfo( PredictionUnit& pu, int candIdx )
    {
    pu.cu->ibc = true;
    pu.bv = pu.mv[REF_PIC_LIST_0];
    #if REMOVE_MV_ADAPT_PREC
    const int shift = 2 + VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE;
    pu.bv.hor = pu.bv.hor >> shift;
    pu.bv.ver = pu.bv.ver >> shift;
    #else
    pu.bv >>= 2; // used for only integer resolution
    #endif
    }
    #endif
    #if JEM_TOOLS
    ......
    source/Lib/CommonLib/InterPrediction.cpp
    View file @ 4cca058b
    This diff is collapsed.
    source/Lib/CommonLib/InterPrediction.h
    View file @ 4cca058b
    ......@@ -324,8 +324,11 @@ protected:
    #endif
    void xFrucUpdateTemplate (PredictionUnit& pu, int nWidth, int nHeight, RefPicList eCurRefPicList, const MvField& rCurMvField );
    void xFrucInsertMv2StartList (const MvField & rMvField, std::list<MvField> & rList,bool setHighPrec);
    #if REMOVE_MV_ADAPT_PREC
    void xFrucInsertMv2StartList(const MvField & rMvField, std::list<MvField> & rList);
    #else
    void xFrucInsertMv2StartList(const MvField & rMvField, std::list<MvField> & rList, bool setHighPrec);
    #endif
    bool xFrucIsInList (const MvField & rMvField, std::list<MvField> & rList);
    bool xFrucGetCurBlkTemplate (PredictionUnit& pu, int nCurBlkWidth , int nCurBlkHeight);
    ......
    source/Lib/CommonLib/LoopFilter.cpp
    View file @ 4cca058b
    ......@@ -506,14 +506,18 @@ unsigned LoopFilter::xGetBoundaryStrengthSingle ( const CodingUnit& cu, const De
    int nThreshold = 4;
    #if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
    if( cu.cs->sps->getSpsNext().getUseHighPrecMv() )
    #if !REMOVE_MV_ADAPT_PREC
    if (cu.cs->sps->getSpsNext().getUseHighPrecMv())
    {
    mvP0.setHighPrec();
    mvP1.setHighPrec();
    mvQ0.setHighPrec();
    mvQ1.setHighPrec();
    #endif
    nThreshold = 4 << VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE;
    }
    #if !REMOVE_MV_ADAPT_PREC
    }
    #endif
    #endif
    unsigned uiBs = 0;
    ......@@ -569,12 +573,16 @@ unsigned LoopFilter::xGetBoundaryStrengthSingle ( const CodingUnit& cu, const De
    int nThreshold = 4;
    #if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
    if( cu.cs->sps->getSpsNext().getUseHighPrecMv() )
    #if !REMOVE_MV_ADAPT_PREC
    if (cu.cs->sps->getSpsNext().getUseHighPrecMv())
    {
    mvP0.setHighPrec();
    mvQ0.setHighPrec();
    #endif
    nThreshold = 4 << VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE;
    #if !REMOVE_MV_ADAPT_PREC
    }
    #endif
    #endif
    return ( ( abs( mvQ0.getHor() - mvP0.getHor() ) >= nThreshold ) || ( abs( mvQ0.getVer() - mvP0.getVer() ) >= nThreshold ) ) ? 1 : 0;
    }
    ......
    source/Lib/CommonLib/Mv.cpp
    View file @ 4cca058b
    ......@@ -44,7 +44,9 @@
    void roundMV( Mv & rMV, unsigned imvShift )
    {
    CHECK( imvShift == 0, "roundMV called for imvShift=0" );
    if( rMV.highPrec ) imvShift += VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE;
    #if !REMOVE_MV_ADAPT_PREC
    if (rMV.highPrec) imvShift += VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE;
    #endif
    int offset = 1 << ( imvShift - 1 );
    rMV.setHor( ( ( rMV.getHor() + offset ) >> imvShift ) << imvShift );
    ......@@ -63,10 +65,13 @@ void roundAffineMv( int& mvx, int& mvy, int nShift )
    void clipMv( Mv& rcMv, const Position& pos, const SPS& sps )
    {
    #if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
    int iMvShift = 2 + ( rcMv.highPrec ? VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE : 0 );
    #if (JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE) && !REMOVE_MV_ADAPT_PREC
    int iMvShift = 2 + (rcMv.highPrec ? VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE : 0);
    #else
    int iMvShift = 2;
    #endif
    #if REMOVE_MV_ADAPT_PREC
    iMvShift += VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE;
    #endif
    int iOffset = 8;
    int iHorMax = ( sps.getPicWidthInLumaSamples() + iOffset - ( int ) pos.x - 1 ) << iMvShift;
    ......
    source/Lib/CommonLib/Mv.h
    View file @ 4cca058b
    ......@@ -53,7 +53,7 @@ class Mv
    public:
    int hor; ///< horizontal component of motion vector
    int ver; ///< vertical component of motion vector
    #if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
    #if (JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE) && !REMOVE_MV_ADAPT_PREC
    bool highPrec;///< true if the vector is high precision
    #endif
    ......@@ -61,7 +61,7 @@ public:
    // constructors
    // ------------------------------------------------------------------------------------------------------------------
    #if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
    #if (JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE) && !REMOVE_MV_ADAPT_PREC
    Mv( ) : hor( 0 ), ver( 0 ), highPrec( false ) {}
    Mv( int iHor, int iVer, bool _highPrec = false ) : hor( iHor ), ver( iVer ), highPrec( _highPrec ) {}
    #if DMVR_JVET_K0217
    ......@@ -80,9 +80,33 @@ public:
    return (hor == 0 && ver == 0);
    }
    #endif
    #else
    #if JEM_TOOLS
    #if REMOVE_MV_ADAPT_PREC && DMVR_JVET_K0217
    Mv() : hor(0), ver(0) {}
    Mv(int iHor, int iVer) : hor(iHor), ver(iVer) {}
    // explicit Mv(const Mv &newMv) : hor(newMv.hor), ver(newMv.ver) {} // use default copy constructor
    explicit Mv(int iHorAndiVer) : hor(iHorAndiVer), ver(iHorAndiVer) {}
    Mv operator << (int i)
    {
    return Mv(hor << i, ver << i);
    }
    Mv operator - (void)
    {
    return Mv(-hor, -ver);
    }
    bool IsZero(void)
    {
    return (hor == 0 && ver == 0);
    }
    #else
    Mv() : hor(0), ver(0) {}
    Mv(int iHor, int iVer) : hor(iHor), ver(iVer) {}
    #endif
    #else
    Mv( ) : hor( 0 ), ver( 0 ) {}
    Mv( int iHor, int iVer ) : hor( iHor ), ver( iVer ) {}
    #endif
    #endif
    // ------------------------------------------------------------------------------------------------------------------
    ......@@ -109,7 +133,7 @@ public:
    const Mv& operator += (const Mv& _rcMv)
    {
    #if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
    #if (JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE) && !REMOVE_MV_ADAPT_PREC
    if( highPrec == _rcMv.highPrec )
    {
    hor += _rcMv.hor;
    ......@@ -120,7 +144,7 @@ public:
    {
    Mv rcMv = _rcMv;
    #if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
    #if (JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE) && !REMOVE_MV_ADAPT_PREC
    if( highPrec && !rcMv.highPrec ) rcMv.setHighPrec();
    if( !highPrec && rcMv.highPrec ) setHighPrec();
    #endif
    ......@@ -132,7 +156,7 @@ public:
    const Mv& operator-= (const Mv& _rcMv)
    {
    #if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
    #if (JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE) && !REMOVE_MV_ADAPT_PREC
    if( highPrec == _rcMv.highPrec )
    {
    hor -= _rcMv.hor;
    ......@@ -143,7 +167,7 @@ public:
    {
    Mv rcMv = _rcMv;
    #if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
    #if (JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE) && !REMOVE_MV_ADAPT_PREC
    if( highPrec && !rcMv.highPrec ) rcMv.setHighPrec();
    if( !highPrec && rcMv.highPrec ) setHighPrec();
    #endif
    ......@@ -182,7 +206,7 @@ public:
    const Mv operator - ( const Mv& rcMv ) const
    {
    #if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
    #if (JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE) && !REMOVE_MV_ADAPT_PREC
    if( rcMv.highPrec == highPrec )
    {
    return Mv( hor - rcMv.hor, ver - rcMv.ver, highPrec );
    ......@@ -201,7 +225,7 @@ public:
    const Mv operator + ( const Mv& rcMv ) const
    {
    #if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
    #if (JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE) && !REMOVE_MV_ADAPT_PREC
    if( rcMv.highPrec == highPrec )
    {
    return Mv( hor + rcMv.hor, ver + rcMv.ver, highPrec );
    ......@@ -220,7 +244,7 @@ public:
    bool operator== ( const Mv& rcMv ) const
    {
    #if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
    #if (JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE) && !REMOVE_MV_ADAPT_PREC
    if( rcMv.highPrec == highPrec )
    {
    return ( hor == rcMv.hor && ver == rcMv.ver );
    ......@@ -247,7 +271,7 @@ public:
    {
    const int mvx = Clip3( -32768, 32767, (iScale * getHor() + 127 + (iScale * getHor() < 0)) >> 8 );
    const int mvy = Clip3( -32768, 32767, (iScale * getVer() + 127 + (iScale * getVer() < 0)) >> 8 );
    #if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
    #if (JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE) && !REMOVE_MV_ADAPT_PREC
    return Mv( mvx, mvy, highPrec );
    #else
    return Mv( mvx, mvy );
    ......@@ -257,11 +281,20 @@ public:
    #if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
    void roundMV2SignalPrecision()
    {
    #if REMOVE_MV_ADAPT_PREC
    const int nShift = VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE;
    const int nOffset = 1 << (nShift - 1);
    hor = hor >= 0 ? (hor + nOffset) >> nShift : -((-hor + nOffset) >> nShift);
    ver = ver >= 0 ? (ver + nOffset) >> nShift : -((-ver + nOffset) >> nShift);
    hor = hor >= 0 ? (hor) << VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE : -((-hor) << VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE);
    ver = ver >= 0 ? (ver) << VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE : -((-ver) << VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE);
    #else
    const bool isHP = highPrec;
    setLowPrec();
    if( isHP ) setHighPrec();
    #endif
    }
    #if !REMOVE_MV_ADAPT_PREC
    void setLowPrec()
    {
    if( !highPrec ) return;
    ......@@ -280,6 +313,7 @@ public:
    highPrec = true;
    }
    #endif
    #endif
    };// END CLASS DEFINITION MV
    #if JVET_K0076_CPR
    namespace std
    ......
    source/Lib/CommonLib/RdCost.h
    View file @ 4cca058b
    ......@@ -187,7 +187,7 @@ public:
    void setPredictor ( const Mv& rcMv )
    {
    m_mvPredictor = rcMv;
    #if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
    #if (JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE) && !REMOVE_MV_ADAPT_PREC
    if( m_mvPredictor.highPrec )
    {
    m_mvPredictor = Mv( m_mvPredictor.hor >> VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE, m_mvPredictor.ver >> VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE, false );
    ......
    source/Lib/CommonLib/Slice.cpp
    View file @ 4cca058b
    ......@@ -1836,11 +1836,15 @@ SPSNext::SPSNext( SPS& sps )
    #endif
    #endif
    #if JEM_TOOLS
    #if !REMOVE_MV_ADAPT_PREC
    , m_highPrecMv ( false )
    #endif
    , m_BIO ( false )
    #endif
    #if !JEM_TOOLS && (JVET_K0346 || JVET_K_AFFINE)
    #if !REMOVE_MV_ADAPT_PREC
    , m_highPrecMv ( false )
    #endif
    #endif
    , m_DisableMotionCompression ( false )
    #if JEM_TOOLS
    ......
    source/Lib/CommonLib/Slice.h
    View file @ 4cca058b
    ......@@ -829,11 +829,15 @@ private:
    #endif
    #endif
    #if JEM_TOOLS
    #if !REMOVE_MV_ADAPT_PREC
    bool m_highPrecMv; // 11
    #endif
    bool m_BIO; // 12
    #endif
    #if !JEM_TOOLS && (JVET_K0346 || JVET_K_AFFINE)
    #if !REMOVE_MV_ADAPT_PREC
    bool m_highPrecMv;
    #endif
    #endif
    bool m_DisableMotionCompression; // 13
    #if JEM_TOOLS
    ......@@ -1016,14 +1020,18 @@ public:
    #endif
    #endif
    #if JEM_TOOLS
    void setUseHighPrecMv ( bool b ) { m_highPrecMv = b; }
    bool getUseHighPrecMv () const { return m_highPrecMv; }
    #if !REMOVE_MV_ADAPT_PREC
    void setUseHighPrecMv(bool b) { m_highPrecMv = b; }
    bool getUseHighPrecMv() const { return m_highPrecMv; }
    #endif
    void setUseBIO ( bool b ) { m_BIO = b; }
    bool getUseBIO () const { return m_BIO; }
    #endif
    #if !JEM_TOOLS && (JVET_K0346 || JVET_K_AFFINE)
    #if !REMOVE_MV_ADAPT_PREC
    void setUseHighPrecMv(bool b) { m_highPrecMv = b; }
    bool getUseHighPrecMv() const { return m_highPrecMv; }
    #endif
    #endif
    void setDisableMotCompress ( bool b ) { m_DisableMotionCompression = b; }
    bool getDisableMotCompress () const { return m_DisableMotionCompression; }
    ......
    source/Lib/CommonLib/TypeDef.h
    View file @ 4cca058b
    ......@@ -128,6 +128,8 @@
    #define JVET_K0357_AMVR 1 // Adaptive motion vector resolution separated from JEM_TOOLS macro
    #define REMOVE_MV_ADAPT_PREC 1 // remove the high precision flag in the MV class
    #if JVET_K0485_BIO
    #define JVET_K0485_BIO_EXTEND_SIZE 1
    #endif
    ......
    source/Lib/CommonLib/UnitTools.cpp
    View file @ 4cca058b
    This diff is collapsed.
    source/Lib/CommonLib/UnitTools.h
    View file @ 4cca058b
    ......@@ -189,14 +189,22 @@ namespace PU
    #if JEM_TOOLS
    bool isAffineMrgFlagCoded (const PredictionUnit &pu );
    void setAllAffineMvField ( PredictionUnit &pu, MvField *mvField, RefPicList eRefList );
    void setAllAffineMv ( PredictionUnit &pu, Mv affLT, Mv affRT, Mv affLB, RefPicList eRefList );
    void setAllAffineMv ( PredictionUnit &pu, Mv affLT, Mv affRT, Mv affLB, RefPicList eRefList
    #if REMOVE_MV_ADAPT_PREC
    , bool setHighPrec = false
    #endif
    );
    bool isBIOLDB (const PredictionUnit &pu);
    #endif
    #if !JEM_TOOLS && JVET_K_AFFINE
    bool isAffineMrgFlagCoded (const PredictionUnit &pu );
    void getAffineMergeCand (const PredictionUnit &pu, MvField (*mvFieldNeighbours)[3], unsigned char &interDirNeighbours, int &numValidMergeCand );
    void setAllAffineMvField ( PredictionUnit &pu, MvField *mvField, RefPicList eRefList );
    void setAllAffineMv ( PredictionUnit &pu, Mv affLT, Mv affRT, Mv affLB, RefPicList eRefList );
    void setAllAffineMv ( PredictionUnit &pu, Mv affLT, Mv affRT, Mv affLB, RefPicList eRefList
    #if REMOVE_MV_ADAPT_PREC
    , bool setHighPrec = false
    #endif
    );
    #endif
    #if !JEM_TOOLS && JVET_K0346
    bool getInterMergeSubPuMvpCand(const PredictionUnit &pu, MergeCtx &mrgCtx, bool& LICFlag, const int count
    ......
    source/Lib/DecoderLib/DecCu.cpp
    View file @ 4cca058b
    ......@@ -608,9 +608,15 @@ void DecCu::xDeriveCUMV( CodingUnit &cu )
    #if JVET_K0337_AFFINE_MVD_PREDICTION
    mvRT += pu.mvdAffi[eRefList][0];
    #endif
    CHECK( !mvLT.highPrec, "unexpected lp mv" );
    CHECK( !mvRT.highPrec, "unexpected lp mv" );
    #if REMOVE_MV_ADAPT_PREC
    mvLT.hor = mvLT.hor << VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE;
    mvLT.ver = mvLT.ver << VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE;
    mvRT.hor = mvRT.hor << VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE;
    mvRT.ver = mvRT.ver << VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE;
    #else
    CHECK(!mvLT.highPrec, "unexpected lp mv");
    CHECK(!mvRT.highPrec, "unexpected lp mv");
    #endif
    #if JVET_K_AFFINE_BUG_FIXES
    Mv mvLB;
    ......@@ -621,7 +627,12 @@ void DecCu::xDeriveCUMV( CodingUnit &cu )
    #if JVET_K0337_AFFINE_MVD_PREDICTION
    mvLB += pu.mvdAffi[eRefList][0];
    #endif
    CHECK( !mvLB.highPrec, "unexpected lp mv" );
    #if REMOVE_MV_ADAPT_PREC
    mvLB.hor = mvLB.hor << VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE;
    mvLB.ver = mvLB.ver << VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE;
    #else
    CHECK(!mvLB.highPrec, "unexpected lp mv");
    #endif
    }
    #endif
    #else
    ......@@ -660,10 +671,12 @@ void DecCu::xDeriveCUMV( CodingUnit &cu )
    if (eRefList == REF_PIC_LIST_0 && pu.cs->slice->getRefPic(eRefList, pu.refIdx[eRefList])->getPOC() == pu.cs->slice->getPOC())
    {
    pu.cu->ibc = true;
    #if !REMOVE_MV_ADAPT_PREC
    #if REUSE_CU_RESULTS
    if (!cu.cs->pcv->isEncoder)
    #endif
    mvd <<= 2;
    #endif
    }
    pu.mv[eRefList] = amvpInfo.mvCand[pu.mvpIdx[eRefList]] + mvd;
    #else
    ......@@ -673,7 +686,12 @@ void DecCu::xDeriveCUMV( CodingUnit &cu )
    #if JEM_TOOLS || JVET_K_AFFINE
    if( pu.cs->sps->getSpsNext().getUseAffine() )
    {
    #if REMOVE_MV_ADAPT_PREC
    pu.mv[eRefList].hor = pu.mv[eRefList].hor << VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE;
    pu.mv[eRefList].ver = pu.mv[eRefList].ver << VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE;
    #else
    pu.mv[eRefList].setHighPrec();
    #endif
    }
    #endif
    }
    ......
    source/Lib/DecoderLib/VLCReader.cpp
    View file @ 4cca058b
    ......@@ -828,11 +828,15 @@ void HLSyntaxReader::parseSPSNext( SPSNext& spsNext, const bool usePCM )
    #endif
    #endif
    #if JEM_TOOLS
    READ_FLAG( symbol, "high_precision_motion_vectors" ); spsNext.setUseHighPrecMv ( symbol != 0 );
    #if !REMOVE_MV_ADAPT_PREC
    READ_FLAG( symbol, "high_precision_motion_vectors"); spsNext.setUseHighPrecMv(symbol != 0);
    #endif
    READ_FLAG( symbol, "bio_enable_flag" ); spsNext.setUseBIO ( symbol != 0 );
    #endif
    #if !JEM_TOOLS && (JVET_K0346 || JVET_K_AFFINE)
    READ_FLAG( symbol, "high_precision_motion_vectors" ); spsNext.setUseHighPrecMv(symbol != 0);
    #if !REMOVE_MV_ADAPT_PREC
    READ_FLAG( symbol, "high_precision_motion_vectors" ); spsNext.setUseHighPrecMv(symbol != 0);
    #endif
    #endif
    READ_FLAG( symbol, "disable_motion_compression_flag" ); spsNext.setDisableMotCompress ( symbol != 0 );
    #if JEM_TOOLS
    ......
    source/Lib/EncoderLib/CABACWriter.cpp
    View file @ 4cca058b
    ......@@ -2703,11 +2703,11 @@ void CABACWriter::mvd_coding( const Mv &rMvd )
    unsigned horAbs = unsigned( horMvd < 0 ? -horMvd : horMvd );
    unsigned verAbs = unsigned( verMvd < 0 ? -verMvd : verMvd );
    #if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
    if( rMvd.highPrec )
    #if (JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE) && !REMOVE_MV_ADAPT_PREC
    if (rMvd.highPrec)
    {
    CHECK( horAbs & ((1<<VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE)-1), "mvd-x has high precision fractional part." );
    CHECK( verAbs & ((1<<VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE)-1), "mvd-y has high precision fractional part." );
    CHECK(horAbs & ((1 << VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE) - 1), "mvd-x has high precision fractional part.");
    CHECK(verAbs & ((1 << VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE) - 1), "mvd-y has high precision fractional part.");
    horAbs >>= VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE;
    verAbs >>= VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE;
    }
    ......
    source/Lib/EncoderLib/EncCfg.h
    View file @ 4cca058b
    ......@@ -228,7 +228,9 @@ protected:
    #endif
    #endif
    #if JEM_TOOLS
    #if !REMOVE_MV_ADAPT_PREC
    bool m_highPrecMv;
    #endif
    bool m_Affine;
    #if JVET_K0337_AFFINE_6PARA
    bool m_AffineType;
    ......@@ -242,7 +244,9 @@ protected:
    #endif
    #endif
    #if !JEM_TOOLS && (JVET_K0346 || JVET_K_AFFINE)
    #if !REMOVE_MV_ADAPT_PREC
    bool m_highPrecMv;
    #endif
    #endif
    bool m_DisableMotionCompression;
    #if JEM_TOOLS
    ......@@ -738,8 +742,10 @@ public:
    #endif
    #endif
    #if JEM_TOOLS
    void setHighPrecisionMv ( bool b ) { m_highPrecMv = b; }
    #if !REMOVE_MV_ADAPT_PREC
    void setHighPrecisionMv (bool b) { m_highPrecMv = b; }
    bool getHighPrecisionMv () { return m_highPrecMv; }
    #endif
    void setBIO ( bool b ) { m_BIO = b; }
    bool getBIO () const { return m_BIO; }
    ......@@ -760,8 +766,10 @@ public:
    #endif
    #endif
    #if !JEM_TOOLS && (JVET_K0346 || JVET_K_AFFINE)
    void setHighPrecisionMv(bool b) { m_highPrecMv = b; }
    bool getHighPrecisionMv() { return m_highPrecMv; }
    #if !REMOVE_MV_ADAPT_PREC
    void setHighPrecisionMv ( bool b ) { m_highPrecMv = b; }
    bool getHighPrecisionMv () { return m_highPrecMv; }
    #endif
    #endif
    void setDisableMotionCompression ( bool b ) { m_DisableMotionCompression = b; }
    bool getDisableMotionCompression () const { return m_DisableMotionCompression; }
    ......
    source/Lib/EncoderLib/EncLib.cpp
    View file @ 4cca058b
    ......@@ -965,7 +965,9 @@ void EncLib::xInitSPS(SPS &sps)
    #endif
    #endif
    #if JEM_TOOLS || JVET_K_AFFINE
    #if !REMOVE_MV_ADAPT_PREC
    sps.getSpsNext().setUseHighPrecMv ( m_highPrecMv );
    #endif
    sps.getSpsNext().setUseAffine ( m_Affine );
    #if JVET_K0337_AFFINE_6PARA
    sps.getSpsNext().setUseAffineType ( m_AffineType );
    ......@@ -975,7 +977,9 @@ void EncLib::xInitSPS(SPS &sps)
    sps.getSpsNext().setUseBIO ( m_BIO );
    #endif
    #if !JEM_TOOLS && JVET_K0346 && !JVET_K_AFFINE
    sps.getSpsNext().setUseHighPrecMv(m_highPrecMv);
    #if !REMOVE_MV_ADAPT_PREC
    sps.getSpsNext().setUseHighPrecMv ( m_highPrecMv );
    #endif
    #endif
    sps.getSpsNext().setDisableMotCompress ( m_DisableMotionCompression );
    #if JEM_TOOLS
    ......
    source/Lib/EncoderLib/InterSearch.cpp
    View file @ 4cca058b
    This diff is collapsed.