diff --git a/source/Lib/CommonLib/Mv.cpp b/source/Lib/CommonLib/Mv.cpp
index 14b5591a..98881475 100644
a
|
b
|
void clipMv( Mv& rcMv, const Position& pos, const struct Size& size, const SPS& |
61 | 61 | void clipMv( Mv& rcMv, const Position& pos, const struct Size& size, const SPS& sps ) |
62 | 62 | #endif |
63 | 63 | { |
| 64 | #if WA_FIX |
| 65 | if (sps.getWrapAroundEnabledFlag()) |
| 66 | { |
| 67 | wrapClipMv(rcMv, pos, size, &sps, &pps); |
| 68 | return; |
| 69 | } |
| 70 | #endif |
| 71 | |
64 | 72 | int iMvShift = MV_FRACTIONAL_BITS_INTERNAL; |
65 | 73 | int iOffset = 8; |
66 | 74 | #if JVET_O1164_PS |
… |
… |
void clipMv( Mv& rcMv, const Position& pos, const struct Size& size, const SPS& |
76 | 84 | int iVerMax = ( sps.getPicHeightInLumaSamples() + iOffset - ( int ) pos.y - 1 ) << iMvShift; |
77 | 85 | #endif |
78 | 86 | int iVerMin = ( -( int ) sps.getMaxCUHeight() - iOffset - ( int ) pos.y + 1 ) << iMvShift; |
79 | | |
| 87 | #if !WA_FIX |
80 | 88 | if( sps.getWrapAroundEnabledFlag() ) |
81 | 89 | { |
82 | 90 | return; |
83 | 91 | } |
84 | | |
| 92 | #endif |
85 | 93 | rcMv.setHor( std::min( iHorMax, std::max( iHorMin, rcMv.getHor() ) ) ); |
86 | 94 | rcMv.setVer( std::min( iVerMax, std::max( iVerMin, rcMv.getVer() ) ) ); |
87 | 95 | } |
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 88063fe2..f8439729 100644
a
|
b
|
|
50 | 50 | #include <assert.h> |
51 | 51 | #include <cassert> |
52 | 52 | |
| 53 | #define WA_FIX 1 |
| 54 | |
53 | 55 | #define JVET_O1164_RPR 1 // JVET-O1164: Reference picture resampling |
54 | 56 | #if JVET_O1164_RPR |
55 | 57 | #define JVET_O1164_PS 1 |