Merge branch 'master' into 'M0427-INLOOP-RESHAPER'
# Conflicts: # cfg/encoder_intra_vtm.cfg # source/Lib/CommonLib/TypeDef.h
Showing
- cfg/encoder_intra_vtm.cfg 2 additions, 0 deletionscfg/encoder_intra_vtm.cfg
- cfg/encoder_lowdelay_P_vtm.cfg 3 additions, 0 deletionscfg/encoder_lowdelay_P_vtm.cfg
- cfg/encoder_lowdelay_vtm.cfg 3 additions, 0 deletionscfg/encoder_lowdelay_vtm.cfg
- cfg/encoder_randomaccess_vtm.cfg 3 additions, 0 deletionscfg/encoder_randomaccess_vtm.cfg
- source/App/EncoderApp/EncApp.cpp 3 additions, 0 deletionssource/App/EncoderApp/EncApp.cpp
- source/App/EncoderApp/EncAppCfg.cpp 7 additions, 0 deletionssource/App/EncoderApp/EncAppCfg.cpp
- source/App/EncoderApp/EncAppCfg.h 3 additions, 0 deletionssource/App/EncoderApp/EncAppCfg.h
- source/Lib/CommonLib/CommonDef.h 1 addition, 1 deletionsource/Lib/CommonLib/CommonDef.h
- source/Lib/CommonLib/Contexts.cpp 1 addition, 1 deletionsource/Lib/CommonLib/Contexts.cpp
- source/Lib/CommonLib/LoopFilter.cpp 575 additions, 6 deletionssource/Lib/CommonLib/LoopFilter.cpp
- source/Lib/CommonLib/LoopFilter.h 17 additions, 2 deletionssource/Lib/CommonLib/LoopFilter.h
- source/Lib/CommonLib/MotionInfo.h 22 additions, 2 deletionssource/Lib/CommonLib/MotionInfo.h
- source/Lib/CommonLib/TypeDef.h 7 additions, 1 deletionsource/Lib/CommonLib/TypeDef.h
- source/Lib/CommonLib/UnitTools.cpp 23 additions, 5 deletionssource/Lib/CommonLib/UnitTools.cpp
- source/Lib/EncoderLib/EncCfg.h 7 additions, 0 deletionssource/Lib/EncoderLib/EncCfg.h
- source/Lib/EncoderLib/InterSearch.cpp 218 additions, 28 deletionssource/Lib/EncoderLib/InterSearch.cpp
- source/Lib/EncoderLib/InterSearch.h 12 additions, 2 deletionssource/Lib/EncoderLib/InterSearch.h
Loading
Please register or sign in to comment