diff --git a/cfg/encoder_lowdelay_P_vtm.cfg b/cfg/encoder_lowdelay_P_vtm.cfg
index d2001e4a5691fac2b250977f20b840615d27b24d..9ec4a5d13cf00e9d8e1da1bfc47971a6f37dc64c 100644
--- a/cfg/encoder_lowdelay_P_vtm.cfg
+++ b/cfg/encoder_lowdelay_P_vtm.cfg
@@ -56,6 +56,11 @@ TransformSkipFast : 1 # Fast Transform skipping (0: OFF, 1
TransformSkipLog2MaxSize : 5
SAOLcuBoundary : 0 # SAOLcuBoundary using non-deblocked pixels (0: OFF, 1: ON)
+#=========== TemporalFilter =================
+TemporalFilter : 0 # Enable/disable GOP Based Temporal Filter
+TemporalFilterFutureReference : 0 # Enable/disable reading future frames
+TemporalFilterStrengthFrame4 : 0.4 # Enable filter at every 4th frame with strength
+
#============ Slices ================
SliceMode : 0 # 0: Disable all slice options.
# 1: Enforce maximum number of LCU in an slice,
diff --git a/cfg/encoder_lowdelay_vtm.cfg b/cfg/encoder_lowdelay_vtm.cfg
index 0125529b61d6ecedf749e5189460431c2fa1f420..c8899e2e74339001db4bce7515fd2c23997dd3a0 100644
--- a/cfg/encoder_lowdelay_vtm.cfg
+++ b/cfg/encoder_lowdelay_vtm.cfg
@@ -56,6 +56,11 @@ TransformSkipFast : 1 # Fast Transform skipping (0: OFF, 1
TransformSkipLog2MaxSize : 5
SAOLcuBoundary : 0 # SAOLcuBoundary using non-deblocked pixels (0: OFF, 1: ON)
+#=========== TemporalFilter =================
+TemporalFilter : 0 # Enable/disable GOP Based Temporal Filter
+TemporalFilterFutureReference : 0 # Enable/disable reading future frames
+TemporalFilterStrengthFrame4 : 0.4 # Enable filter at every 4th frame with strength
+
#============ Slices ================
SliceMode : 0 # 0: Disable all slice options.
# 1: Enforce maximum number of LCU in an slice,
diff --git a/cfg/encoder_randomaccess_vtm.cfg b/cfg/encoder_randomaccess_vtm.cfg
index 631c6cb006f179d2d8da722839c7c170019cc0b9..e11813ba3f1e9f7352d753f5ff48ca0db0e1bfe4 100644
--- a/cfg/encoder_randomaccess_vtm.cfg
+++ b/cfg/encoder_randomaccess_vtm.cfg
@@ -70,6 +70,12 @@ TransformSkipFast : 1 # Fast Transform skipping (0: OFF, 1
TransformSkipLog2MaxSize : 5
SAOLcuBoundary : 0 # SAOLcuBoundary using non-deblocked pixels (0: OFF, 1: ON)
+#=========== TemporalFilter =================
+TemporalFilter : 0 # Enable/disable GOP Based Temporal Filter
+TemporalFilterFutureReference : 1 # Enable/disable reading future frames
+TemporalFilterStrengthFrame8 : 0.95 # Enable filter at every 8th frame with given strength
+TemporalFilterStrengthFrame16 : 1.5 # Enable filter at every 16th frame with given strength, longer intervals has higher priority
+
#============ Slices ================
SliceMode : 0 # 0: Disable all slice options.
# 1: Enforce maximum number of LCU in an slice,
diff --git a/doc/software-manual.tex b/doc/software-manual.tex
old mode 100755
new mode 100644
index 820df1b14e1df0497b45e0d89078b692af8037b6..db557a0b809463dd14c99ac25c6c777c8e84ae11
--- a/doc/software-manual.tex
+++ b/doc/software-manual.tex
@@ -890,6 +890,32 @@ Picture output options: output upscaled (2), decoded but in full resolution buff
\end{OptionTableNoShorthand}
+%%
+%% GOP based temporal filter parameters
+%%
+
+\begin{OptionTableNoShorthand}{GOP based temporal filter paramters}{tab:gop-based-temporal-filter}
+
+\Option{TemporalFilter} &
+%\ShortOption{\None} &
+\Default{false} &
+Enables or disables GOP based temporal filter.
+\\
+\Option{TemporalFilterFutureReference} &
+%\ShortOption{\None} &
+\Default{true} &
+Enables or disable referencing future frames in the GOP based temporal filter. Can be used to disable future referencing for
+low delay configurations.
+\\
+\Option{TemporalFilterStrengthFrame*} &
+%\ShortOption{\None} &
+\Default{} &
+Strength for every * frame in GOP based temporal filter, where * is an integer. E.g. --TemporalFilterStrengthFrame8 0.95 will
+enable GOP based temporal filter at every 8th frame with strength 0.95. Longer intervals overrides shorter when there are
+multiple matches.
+\\
+\end{OptionTableNoShorthand}
+
%%
%% profile, level and conformance options
%%
diff --git a/source/App/DecoderApp/DecApp.cpp b/source/App/DecoderApp/DecApp.cpp
index 1e35ab2fa557689283adec96e6724e730d556044..629b23511b892ff9d5601b501b3d368b55daa73b 100644
--- a/source/App/DecoderApp/DecApp.cpp
+++ b/source/App/DecoderApp/DecApp.cpp
@@ -457,7 +457,7 @@ void DecApp::xWriteOutput( PicList* pcListPic, uint32_t tId )
if (!m_reconFileName.empty())
{
- const Window &conf = pcPic->cs->pps->getConformanceWindow();
+ const Window &conf = pcPic->getConformanceWindow();
const SPS* sps = pcPic->cs->sps;
ChromaFormat chromaFormatIDC = sps->getChromaFormatIdc();
if( m_upscaledOutput )
@@ -581,7 +581,7 @@ void DecApp::xFlushOutput( PicList* pcListPic )
if (!m_reconFileName.empty())
{
- const Window &conf = pcPic->cs->pps->getConformanceWindow();
+ const Window &conf = pcPic->getConformanceWindow();
const SPS* sps = pcPic->cs->sps;
ChromaFormat chromaFormatIDC = sps->getChromaFormatIdc();
if( m_upscaledOutput )
diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index c60e719034f6d90c2bfedabaf4f87ffb24578f76..9bef109b99561eb948a10028cfded011392901cd 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -48,6 +48,10 @@
#include "AppEncHelper360/TExt360AppEncTop.h"
#endif
+#if JVET_O0549_ENCODER_ONLY_FILTER
+#include "EncoderLib/EncTemporalFilter.h"
+#endif
+
using namespace std;
//! \ingroup EncoderApp
@@ -644,6 +648,9 @@ void EncApp::xInitLibCfg()
m_cEncLib.setCropOffsetBottom (m_cropOffsetBottom);
m_cEncLib.setCalculateHdrMetrics (m_calculateHdrMetrics);
#endif
+#if JVET_O0549_ENCODER_ONLY_FILTER
+ m_cEncLib.setGopBasedTemporalFilterEnabled(m_gopBasedTemporalFilterEnabled);
+#endif
}
void EncApp::xCreateLib( std::list<PelUnitBuf*>& recBufList
@@ -744,6 +751,17 @@ void EncApp::encode()
TExt360AppEncTop ext360(*this, m_cEncLib.getGOPEncoder()->getExt360Data(), *(m_cEncLib.getGOPEncoder()), orgPic);
#endif
+#if JVET_O0549_ENCODER_ONLY_FILTER
+ EncTemporalFilter temporalFilter;
+ if (m_gopBasedTemporalFilterEnabled)
+ {
+ temporalFilter.init(m_FrameSkip, m_inputBitDepth, m_MSBExtendedBitDepth, m_internalBitDepth, m_iSourceWidth, m_iSourceHeight,
+ m_aiPad, m_bClipInputVideoToRec709Range, m_inputFileName, m_chromaFormatIDC,
+ m_inputColourSpaceConvert, m_iQP, m_gopBasedTemporalFilterStrengths,
+ m_gopBasedTemporalFilterFutureReference);
+ }
+#endif
+
while ( !bEos )
{
// read input YUV file
@@ -760,6 +778,13 @@ void EncApp::encode()
m_cVideoIOYuvInputFile.read( orgPic, trueOrgPic, ipCSC, m_aiPad, m_InputChromaFormatIDC, m_bClipInputVideoToRec709Range );
#endif
+#if JVET_O0549_ENCODER_ONLY_FILTER
+ if (m_gopBasedTemporalFilterEnabled)
+ {
+ temporalFilter.filter(&orgPic, m_iFrameRcvd);
+ }
+#endif
+
// increase number of received frames
m_iFrameRcvd++;
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 386380bb28dcdb8e11d2fe3b109660915ffa4850..0b07ec200515a68fb181fbab8f0324f161bc9cf1 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -608,6 +608,27 @@ static inline istream& operator >> (std::istream &in, EncAppCfg::OptionalValue<T
}
#endif
+#if JVET_O0549_ENCODER_ONLY_FILTER
+template <class T1, class T2>
+static inline istream& operator >> (std::istream& in, std::map<T1, T2>& map)
+{
+ T1 key;
+ T2 value;
+ try
+ {
+ in >> key;
+ in >> value;
+ }
+ catch (...)
+ {
+ in.setstate(ios::failbit);
+ }
+
+ map[key] = value;
+ return in;
+}
+#endif
+
static void
automaticallySelectRExtProfile(const bool bUsingGeneralRExtTools,
const bool bUsingChromaQPAdjustment,
@@ -1374,6 +1395,14 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
( "UpscaledOutput", m_upscaledOutput, 0, "Output upscaled (2), decoded but in full resolution buffer (1) or decoded cropped (0, default) picture for RPR" )
;
+#if JVET_O0549_ENCODER_ONLY_FILTER
+ opts.addOptions()
+ ("TemporalFilter", m_gopBasedTemporalFilterEnabled, false, "Enable GOP based temporal filter. Disabled per default")
+ ("TemporalFilterFutureReference", m_gopBasedTemporalFilterFutureReference, true, "Enable referencing of future frames in the GOP based temporal filter. This is typically disabled for Low Delay configurations.")
+ ("TemporalFilterStrengthFrame*", m_gopBasedTemporalFilterStrengths, std::map<int, double>(), "Strength for every * frame in GOP based temporal filter, where * is an integer."
+ " E.g. --TemporalFilterStrengthFrame8 0.95 will enable GOP based temporal filter at every 8th frame with strength 0.95");
+#endif
+
#if EXTENSION_360_VIDEO
TExt360AppEncCfg::TExt360AppEncCfgContext ext360CfgContext;
m_ext360.addOptions(opts, ext360CfgContext);
@@ -3368,6 +3397,12 @@ bool EncAppCfg::xCheckParameter()
xConfirmPara( m_decodeBitstreams[0] == m_bitstreamFileName, "Debug bitstream and the output bitstream cannot be equal.\n" );
xConfirmPara( m_decodeBitstreams[1] == m_bitstreamFileName, "Decode2 bitstream and the output bitstream cannot be equal.\n" );
xConfirmPara(unsigned(m_LMChroma) > 1, "LMMode exceeds range (0 to 1)");
+#if JVET_O0549_ENCODER_ONLY_FILTER
+ if (m_gopBasedTemporalFilterEnabled)
+ {
+ xConfirmPara(m_temporalSubsampleRatio != 1, "GOP Based Temporal Filter only support Temporal sub-sample ratio 1");
+ }
+#endif
#if EXTENSION_360_VIDEO
check_failed |= m_ext360.verifyParameters();
#endif
@@ -3690,7 +3725,9 @@ void EncAppCfg::xPrintParameter()
{
msg( VERBOSE, "RPR:%d", 0 );
}
-
+#if JVET_O0549_ENCODER_ONLY_FILTER
+ msg(VERBOSE, "TemporalFilter:%d ", m_gopBasedTemporalFilterEnabled);
+#endif
#if EXTENSION_360_VIDEO
m_ext360.outputConfigurationSummary();
#endif
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index c993b9ddab39ac0b284a62e5ec921f57f735165c..1269ebd1f1589a45a7e70ff5d275ba80b17e8054 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -39,6 +39,14 @@
#define __ENCAPPCFG__
#include "CommonLib/CommonDef.h"
+#if JVET_O0549_ENCODER_ONLY_FILTER
+
+#include <map>
+template <class T1, class T2>
+static inline std::istream& operator >> (std::istream &in, std::map<T1, T2> &map);
+
+#include "Utilities/program_options_lite.h"
+#endif
#include "EncoderLib/EncCfg.h"
#if EXTENSION_360_VIDEO
@@ -48,6 +56,9 @@
#if JVET_O0756_CALCULATE_HDRMETRICS
#include "HDRLib/inc/DistortionMetric.H"
#endif
+#if JVET_O0549_ENCODER_ONLY_FILTER
+namespace po = df::program_options_lite;
+#endif
#include <sstream>
#include <vector>
@@ -605,6 +616,12 @@ protected:
int m_switchPocPeriod;
int m_upscaledOutput; ////< Output upscaled (2), decoded cropped but in full resolution buffer (1) or decoded cropped (0, default) picture for RPR.
+#if JVET_O0549_ENCODER_ONLY_FILTER
+ bool m_gopBasedTemporalFilterEnabled; ///< GOP-based Temporal Filter enable/disable
+ bool m_gopBasedTemporalFilterFutureReference; ///< Enable/disable future frame references in the GOP-based Temporal Filter
+ std::map<int, double> m_gopBasedTemporalFilterStrengths; ///< Filter strength per frame for the GOP-based Temporal Filter
+#endif
+
#if EXTENSION_360_VIDEO
TExt360AppEncCfg m_ext360;
friend class TExt360AppEncCfg;
diff --git a/source/Lib/CommonLib/Buffer.h b/source/Lib/CommonLib/Buffer.h
index e714d2869888ebeb6cf2a80c2cb0288acdac23a8..f4ea3ad6c5d7af238669cd71de3e037635788db0 100644
--- a/source/Lib/CommonLib/Buffer.h
+++ b/source/Lib/CommonLib/Buffer.h
@@ -118,6 +118,9 @@ struct AreaBuf : public Size
void subtract ( const AreaBuf<const T> &other );
void extendSingleBorderPel();
void extendBorderPel ( unsigned margin );
+#if JVET_O0549_ENCODER_ONLY_FILTER
+ void extendBorderPel(unsigned marginX, unsigned marginY);
+#endif
void addWeightedAvg ( const AreaBuf<const T> &other1, const AreaBuf<const T> &other2, const ClpRng& clpRng, const int8_t gbiIdx);
void removeWeightHighFreq ( const AreaBuf<T>& other, const bool bClip, const ClpRng& clpRng, const int8_t iGbiWeight);
void addAvg ( const AreaBuf<const T> &other1, const AreaBuf<const T> &other2, const ClpRng& clpRng );
@@ -526,6 +529,46 @@ void AreaBuf<T>::updateHistogram( std::vector<int32_t>& hist ) const
}
}
+#if JVET_O0549_ENCODER_ONLY_FILTER
+template<typename T>
+void AreaBuf<T>::extendBorderPel(unsigned marginX, unsigned marginY)
+{
+ T* p = buf;
+ int h = height;
+ int w = width;
+ int s = stride;
+
+ CHECK((w + 2 * marginX) > s, "Size of buffer too small to extend");
+ // do left and right margins
+ for (int y = 0; y < h; y++)
+ {
+ for (int x = 0; x < marginX; x++)
+ {
+ *(p - marginX + x) = p[0];
+ p[w + x] = p[w - 1];
+ }
+ p += s;
+ }
+
+ // p is now the (0,height) (bottom left of image within bigger picture
+ p -= (s + marginX);
+ // p is now the (-margin, height-1)
+ for (int y = 0; y < marginY; y++)
+ {
+ ::memcpy(p + (y + 1) * s, p, sizeof(T) * (w + (marginX << 1)));
+ }
+
+ // p is still (-marginX, height-1)
+ p -= ((h - 1) * s);
+ // p is now (-marginX, 0)
+ for (int y = 0; y < marginY; y++)
+ {
+ ::memcpy(p - (y + 1) * s, p, sizeof(T) * (w + (marginX << 1)));
+ }
+}
+#endif
+
+
template<typename T>
void AreaBuf<T>::extendBorderPel( unsigned margin )
{
@@ -693,6 +736,9 @@ struct UnitBuf
void addWeightedAvg ( const UnitBuf<const T> &other1, const UnitBuf<const T> &other2, const ClpRngs& clpRngs, const uint8_t gbiIdx = GBI_DEFAULT, const bool chromaOnly = false, const bool lumaOnly = false);
void addAvg ( const UnitBuf<const T> &other1, const UnitBuf<const T> &other2, const ClpRngs& clpRngs, const bool chromaOnly = false, const bool lumaOnly = false);
void extendSingleBorderPel();
+#if JVET_O0549_ENCODER_ONLY_FILTER
+ void extendBorderPel(unsigned marginX, unsigned marginY);
+#endif
void extendBorderPel ( unsigned margin );
void removeHighFreq ( const UnitBuf<T>& other, const bool bClip, const ClpRngs& clpRngs
, const int8_t gbiWeight = g_GbiWeights[GBI_DEFAULT]
@@ -802,6 +848,17 @@ void UnitBuf<T>::extendSingleBorderPel()
}
}
+#if JVET_O0549_ENCODER_ONLY_FILTER
+template<typename T>
+void UnitBuf<T>::extendBorderPel(unsigned marginX, unsigned marginY)
+{
+ for (unsigned i = 0; i < bufs.size(); i++)
+ {
+ bufs[i].extendBorderPel(marginX >> getComponentScaleX(ComponentID(i), chromaFormat), marginY >> getComponentScaleY(ComponentID(i), chromaFormat));
+ }
+}
+#endif
+
template<typename T>
void UnitBuf<T>::extendBorderPel( unsigned margin )
{
diff --git a/source/Lib/CommonLib/InterPrediction.cpp b/source/Lib/CommonLib/InterPrediction.cpp
index edd0202072deb29279183d0a7b8400fc61330a7b..92e2e94187ec71dd5f298c51f8c6ba8b20e9b49b 100644
--- a/source/Lib/CommonLib/InterPrediction.cpp
+++ b/source/Lib/CommonLib/InterPrediction.cpp
@@ -297,6 +297,9 @@ void InterPrediction::xSubPuMC( PredictionUnit& pu, PelUnitBuf& predBuf, const R
int fstStep = (!verMC ? puHeight : puWidth);
int secStep = (!verMC ? puWidth : puHeight);
+ pu.refIdx[0] = 0; pu.refIdx[1] = pu.cs->slice->getSliceType() == B_SLICE ? 0 : -1;
+ bool scaled = !PU::isRefPicSameSize( pu );
+
m_subPuMC = true;
for (int fstDim = fstStart; fstDim < fstEnd; fstDim += fstStep)
@@ -313,7 +316,7 @@ void InterPrediction::xSubPuMC( PredictionUnit& pu, PelUnitBuf& predBuf, const R
while (later < secEnd)
{
const MotionInfo &laterMi = !verMC ? pu.getMotionInfo(Position{ later, fstDim }) : pu.getMotionInfo(Position{ fstDim, later });
- if (laterMi == curMi)
+ if (!scaled && laterMi == curMi)
{
length += secStep;
}
@@ -419,7 +422,10 @@ void InterPrediction::xPredInterUni(const PredictionUnit& pu, const RefPicList&
if( !pu.cu->affine )
{
- clipMv( mv[0], pu.cu->lumaPos(), pu.cu->lumaSize(), sps, *pu.cs->pps );
+ if( pu.cu->slice->getScalingRatio( eRefPicList, iRefIdx ) == SCALE_1X )
+ {
+ clipMv( mv[0], pu.cu->lumaPos(), pu.cu->lumaSize(), sps, *pu.cs->pps );
+ }
}
for( uint32_t comp = COMPONENT_Y; comp < pcYuvPred.bufs.size() && comp <= m_maxCompIDToPred; comp++ )
@@ -854,7 +860,7 @@ void InterPrediction::xPredAffineBlk( const ComponentID& compID, const Predictio
enablePROF &= !subblkMVSpreadOverLimit;
const int profThres = 1 << (iBit + (m_isBi ? 1 : 0));
enablePROF &= !m_encOnly || pu.cu->slice->getCheckLDC() || iDMvHorX > profThres || iDMvHorY > profThres || iDMvVerX > profThres || iDMvVerY > profThres || iDMvHorX < -profThres || iDMvHorY < -profThres || iDMvVerX < -profThres || iDMvVerY < -profThres;
- enablePROF &= pu.cs->pps->getPicWidthInLumaSamples() == refPic->cs->pps->getPicWidthInLumaSamples() && pu.cs->pps->getPicHeightInLumaSamples() == refPic->cs->pps->getPicHeightInLumaSamples();
+ enablePROF &= pu.cs->pps->getPicWidthInLumaSamples() == refPic->getPicWidthInLumaSamples() && pu.cs->pps->getPicHeightInLumaSamples() == refPic->getPicHeightInLumaSamples();
if (compID == COMPONENT_Y)
{
@@ -998,8 +1004,11 @@ void InterPrediction::xPredAffineBlk( const ComponentID& compID, const Predictio
{
wrapRef = false;
m_storedMv[h / AFFINE_MIN_BLOCK_SIZE * MVBUFFER_SIZE + w / AFFINE_MIN_BLOCK_SIZE].set(iMvScaleTmpHor, iMvScaleTmpVer);
- iMvScaleTmpHor = std::min<int>(iHorMax, std::max<int>(iHorMin, iMvScaleTmpHor));
- iMvScaleTmpVer = std::min<int>(iVerMax, std::max<int>(iVerMin, iMvScaleTmpVer));
+ if( scalingRatio == SCALE_1X )
+ {
+ iMvScaleTmpHor = std::min<int>(iHorMax, std::max<int>(iHorMin, iMvScaleTmpHor));
+ iMvScaleTmpVer = std::min<int>(iVerMax, std::max<int>(iVerMin, iMvScaleTmpVer));
+ }
}
}
else
@@ -1014,8 +1023,11 @@ void InterPrediction::xPredAffineBlk( const ComponentID& compID, const Predictio
else
{
wrapRef = false;
- curMv.hor = std::min<int>(iHorMax, std::max<int>(iHorMin, curMv.hor));
- curMv.ver = std::min<int>(iVerMax, std::max<int>(iVerMin, curMv.ver));
+ if( scalingRatio == SCALE_1X )
+ {
+ curMv.hor = std::min<int>(iHorMax, std::max<int>(iHorMin, curMv.hor));
+ curMv.ver = std::min<int>(iVerMax, std::max<int>(iVerMin, curMv.ver));
+ }
}
iMvScaleTmpHor = curMv.hor;
iMvScaleTmpVer = curMv.ver;
@@ -1631,6 +1643,7 @@ void InterPrediction::motionCompensation( PredictionUnit &pu, PelUnitBuf &predBu
bioApplied = false;
}
}
+ bioApplied = PU::isRefPicSameSize( pu ) ? bioApplied : false;
bool dmvrApplied = false;
dmvrApplied = (pu.mvRefine) && PU::checkDMVRCondition(pu);
if ((pu.lumaSize().width > MAX_BDOF_APPLICATION_REGION || pu.lumaSize().height > MAX_BDOF_APPLICATION_REGION) && pu.mergeType != MRG_TYPE_SUBPU_ATMVP && (bioApplied && !dmvrApplied))
@@ -2346,8 +2359,8 @@ bool InterPrediction::xPredInterBlkRPR( const std::pair<int, int>& scalingRatio,
if( scaled )
{
int row, col;
- int refPicWidth = refPic->cs->pps->getPicWidthInLumaSamples();
- int refPicHeight = refPic->cs->pps->getPicHeightInLumaSamples();
+ int refPicWidth = refPic->getPicWidthInLumaSamples();
+ int refPicHeight = refPic->getPicHeightInLumaSamples();
#if JVET_P0088_P0353_RPR_FILTERS
int xFilter = filterIndex;
@@ -2384,17 +2397,24 @@ bool InterPrediction::xPredInterBlkRPR( const std::pair<int, int>& scalingRatio,
int offX = 1 << ( posShift - shiftHor - 1 );
int offY = 1 << ( posShift - shiftVer - 1 );
- x0Int = ( ( blk.pos().x << ( 4 + ::getComponentScaleX( compID, chFmt ) ) ) + mv.getHor() )* scalingRatio.first;
+ x0Int = ( ( blk.pos().x << ( 4 + ::getComponentScaleX( compID, chFmt ) ) ) + mv.getHor() )* (int64_t)scalingRatio.first;
x0Int = SIGN( x0Int ) * ( ( llabs( x0Int ) + ( (long long)1 << ( 7 + ::getComponentScaleX( compID, chFmt ) ) ) ) >> ( 8 + ::getComponentScaleX( compID, chFmt ) ) );
- y0Int = ( ( blk.pos().y << ( 4 + ::getComponentScaleY( compID, chFmt ) ) ) + mv.getVer() )* scalingRatio.second;
+ y0Int = ( ( blk.pos().y << ( 4 + ::getComponentScaleY( compID, chFmt ) ) ) + mv.getVer() )* (int64_t)scalingRatio.second;
y0Int = SIGN( y0Int ) * ( ( llabs( y0Int ) + ( (long long)1 << ( 7 + ::getComponentScaleY( compID, chFmt ) ) ) ) >> ( 8 + ::getComponentScaleY( compID, chFmt ) ) );
const int extSize = isLuma( compID ) ? 1 : 2;
int vFilterSize = isLuma( compID ) ? NTAPS_LUMA : NTAPS_CHROMA;
- int refHeight = height * scalingRatio.second >> SCALE_RATIO_BITS;
+ int yInt0 = ( (int32_t)y0Int + offY ) >> posShift;
+ yInt0 = std::min( std::max( -4, yInt0 ), ( refPicHeight >> ::getComponentScaleY( compID, chFmt ) ) + 4 );
+
+ int xInt0 = ( (int32_t)x0Int + offX ) >> posShift;
+ xInt0 = std::min( std::max( -4, xInt0 ), ( refPicWidth >> ::getComponentScaleX( compID, chFmt ) ) + 4 );
+
+ int refHeight = ((((int32_t)y0Int + (height-1) * stepY) + offY ) >> posShift) - ((((int32_t)y0Int + 0 * stepY) + offY ) >> posShift) + 1;
+
refHeight = std::max<int>( 1, refHeight );
CHECK( MAX_CU_SIZE * MAX_SCALING_RATIO < refHeight + vFilterSize - 1 + extSize, "Buffer size is not enough, increase MAX_SCALING_RATIO" );
@@ -2403,12 +2423,6 @@ bool InterPrediction::xPredInterBlkRPR( const std::pair<int, int>& scalingRatio,
int tmpStride = width;
- int yInt0 = ( (int32_t)y0Int + offY ) >> posShift;
- yInt0 = std::min( std::max( 0, yInt0 ), ( refPicHeight >> ::getComponentScaleY( compID, chFmt ) ) );
-
- int xInt0 = ( (int32_t)x0Int + offX ) >> posShift;
- xInt0 = std::min( std::max( 0, xInt0 ), ( refPicWidth >> ::getComponentScaleX( compID, chFmt ) ) );
-
int xInt = 0, yInt = 0;
for( col = 0; col < width; col++ )
diff --git a/source/Lib/CommonLib/Picture.h b/source/Lib/CommonLib/Picture.h
index 9c8c5d24624356224e1b22dcd6d952ba84bdf4cc..e352118b9c7860092a3234e37a47457840544ff5 100644
--- a/source/Lib/CommonLib/Picture.h
+++ b/source/Lib/CommonLib/Picture.h
@@ -296,6 +296,19 @@ public:
std::deque<Slice*> slices;
SEIMessages SEIs;
+ uint32_t m_picWidthInLumaSamples;
+ uint32_t m_picHeightInLumaSamples;
+ Window m_conformanceWindow;
+
+ void setPicWidthInLumaSamples( uint32_t u ) { m_picWidthInLumaSamples = u; }
+ uint32_t getPicWidthInLumaSamples() const { return m_picWidthInLumaSamples; }
+ void setPicHeightInLumaSamples( uint32_t u ) { m_picHeightInLumaSamples = u; }
+ uint32_t getPicHeightInLumaSamples() const { return m_picHeightInLumaSamples; }
+
+ Window& getConformanceWindow() { return m_conformanceWindow; }
+ const Window& getConformanceWindow() const { return m_conformanceWindow; }
+ void setConformanceWindow( Window& conformanceWindow ) { m_conformanceWindow = conformanceWindow; }
+
void allocateNewSlice();
Slice *swapSliceObject(Slice * p, uint32_t i);
void clearSliceBuffer();
diff --git a/source/Lib/CommonLib/QuantRDOQ.cpp b/source/Lib/CommonLib/QuantRDOQ.cpp
index 212f46d1b246444895d703ab0d6b52f9526ac4f4..e72c83a866e6d92351b9580d06fac4d1a3877894 100644
--- a/source/Lib/CommonLib/QuantRDOQ.cpp
+++ b/source/Lib/CommonLib/QuantRDOQ.cpp
@@ -1749,7 +1749,15 @@ inline uint32_t QuantRDOQ::xGetCodedLevelTSPred(double& rd64CodedCost
double dErr = 0.0;
dErr = double(levelDouble - (Intermediate_Int(absLevel) << qBits));
coeffLevelError[errorInd] = dErr * dErr * errorScale;
+#if JVET_P0298_DISABLE_LEVELMAPPING_IN_BYPASS
+ int modAbsLevel = absLevel;
+ if (cctx.numCtxBins() >= 4)
+ {
+ modAbsLevel = cctx.deriveModCoeff(rightPixel, belowPixel, absLevel, m_bdpcm);
+ }
+#else
int modAbsLevel = cctx.deriveModCoeff(rightPixel, belowPixel, absLevel, m_bdpcm);
+#endif
#if JVET_P0072_SIMPLIFIED_TSRC
int numCtxBins = 0;
double dCurrCost = coeffLevelError[errorInd] + xGetICost(xGetICRateTS(modAbsLevel, fracBitsPar, cctx, fracBitsAccess, fracBitsSign, fracBitsGt1, numCtxBins, sign, ricePar, useLimitedPrefixLength, maxLog2TrDynamicRange));
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index 3b1548a506952bc866086713434fad873140e3b4..2890f78484c663b46ce661b2a791b09beb020ad3 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -2527,7 +2527,7 @@ void Slice::scaleRefPicList( Picture *scaledRefPic[ ], APS** apss, APS* lmcsAps,
// reference resampling for the whole picture is not applied at decoder
int xScale, yScale;
- CU::getRprScaling( sps, pps, m_apcRefPicList[refList][rIdx]->slices[0]->getPPS(), xScale, yScale );
+ CU::getRprScaling( sps, pps, m_apcRefPicList[refList][rIdx], xScale, yScale );
m_scalingRatio[refList][rIdx] = std::pair<int, int>( xScale, yScale );
if( m_scalingRatio[refList][rIdx] == SCALE_1X || isDecoder )
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 3721b62dde7f6139b4c1a5f238bb89c3083be85f..99c4419c46216ba58ce02fe053f49f8cec6104d0 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -50,6 +50,11 @@
#include <assert.h>
#include <cassert>
+#define JVET_P0298_DISABLE_LEVELMAPPING_IN_BYPASS 1 // JVET-P0298: Disable level mapping in bypass mode
+
+#define JVET_P0347_MAX_MTT_DEPTH_CONSTRAINT 1 // JVET-P0347: Max MTT Depth constraint
+
+#define JVET_P0325_CHANGE_MERGE_CANDIDATE_ORDER 1 // JVET-P0325: reorder the spatial merge candidates
#define JVET_P0578_MINIMUM_CU_SIZE_CONSTRAINT 1 // JVET-P0578: minimum CU size constraint
@@ -91,6 +96,8 @@
#define JVET_P0164_ALF_SYNTAX_SIMP 1 // JVET-p0164: simplify alf syntax with method2
+#define JVET_O0549_ENCODER_ONLY_FILTER 1 // JVET-O0549: Encoder-only temporal filter, no decoder changes
+
#define JVET_P0042_FIX_INTER_DIR_CTX 1 // JVET-P0042: Fix overlap in context between the bi-pred flag for 8x8 CUs and the L0/L1 flag for all size CUs
#define JVET_P0111_CHROMA_422_FIX 1 // JVET-P0422: Bug fix of chroma 422 intra mode mapping
diff --git a/source/Lib/CommonLib/UnitTools.cpp b/source/Lib/CommonLib/UnitTools.cpp
index 5c0e1c37fcb93ea5206d6e9b01604923f2d779b4..2ca98de92fde125f01a050cdd88d5fc8b6488a95 100644
--- a/source/Lib/CommonLib/UnitTools.cpp
+++ b/source/Lib/CommonLib/UnitTools.cpp
@@ -100,14 +100,14 @@ void CS::setRefinedMotionField(CodingStructure &cs)
}
// CU tools
-bool CU::getRprScaling( const SPS* sps, const PPS* curPPS, const PPS* refPPS, int& xScale, int& yScale )
+bool CU::getRprScaling( const SPS* sps, const PPS* curPPS, Picture* refPic, int& xScale, int& yScale )
{
const Window& curConfWindow = curPPS->getConformanceWindow();
int curPicWidth = curPPS->getPicWidthInLumaSamples() - (curConfWindow.getWindowLeftOffset() + curConfWindow.getWindowRightOffset()) * SPS::getWinUnitY(sps->getChromaFormatIdc());
int curPicHeight = curPPS->getPicHeightInLumaSamples() - (curConfWindow.getWindowTopOffset() + curConfWindow.getWindowBottomOffset()) * SPS::getWinUnitY(sps->getChromaFormatIdc());
- const Window& refConfWindow = refPPS->getConformanceWindow();
- int refPicWidth = refPPS->getPicWidthInLumaSamples() - (refConfWindow.getWindowLeftOffset() + refConfWindow.getWindowRightOffset()) * SPS::getWinUnitY(sps->getChromaFormatIdc());
- int refPicHeight = refPPS->getPicHeightInLumaSamples() - (refConfWindow.getWindowTopOffset() + refConfWindow.getWindowBottomOffset()) * SPS::getWinUnitY(sps->getChromaFormatIdc());
+ const Window& refConfWindow = refPic->getConformanceWindow();
+ int refPicWidth = refPic->getPicWidthInLumaSamples() - (refConfWindow.getWindowLeftOffset() + refConfWindow.getWindowRightOffset()) * SPS::getWinUnitY(sps->getChromaFormatIdc());
+ int refPicHeight = refPic->getPicHeightInLumaSamples() - (refConfWindow.getWindowTopOffset() + refConfWindow.getWindowBottomOffset()) * SPS::getWinUnitY(sps->getChromaFormatIdc());
xScale = ( ( refPicWidth << SCALE_RATIO_BITS ) + ( curPicWidth >> 1 ) ) / curPicWidth;
yScale = ( ( refPicHeight << SCALE_RATIO_BITS ) + ( curPicHeight >> 1 ) ) / curPicHeight;
@@ -893,6 +893,72 @@ void PU::getInterMergeCandidates( const PredictionUnit &pu, MergeCtx& mrgCtx,
const Position posLB = pu.Y().bottomLeft();
MotionInfo miAbove, miLeft, miAboveLeft, miAboveRight, miBelowLeft;
+#if JVET_P0325_CHANGE_MERGE_CANDIDATE_ORDER
+ // above
+ const PredictionUnit *puAbove = cs.getPURestricted(posRT.offset(0, -1), pu, pu.chType);
+
+ bool isAvailableB1 = puAbove && isDiffMER(pu, *puAbove) && pu.cu != puAbove->cu && CU::isInter(*puAbove->cu);
+
+ if (isAvailableB1)
+ {
+ miAbove = puAbove->getMotionInfo(posRT.offset(0, -1));
+
+ // get Inter Dir
+ mrgCtx.interDirNeighbours[cnt] = miAbove.interDir;
+ mrgCtx.useAltHpelIf[cnt] = miAbove.useAltHpelIf;
+ // get Mv from Above
+ mrgCtx.GBiIdx[cnt] = (mrgCtx.interDirNeighbours[cnt] == 3) ? puAbove->cu->GBiIdx : GBI_DEFAULT;
+ mrgCtx.mvFieldNeighbours[cnt << 1].setMvField(miAbove.mv[0], miAbove.refIdx[0]);
+
+ if (slice.isInterB())
+ {
+ mrgCtx.mvFieldNeighbours[(cnt << 1) + 1].setMvField(miAbove.mv[1], miAbove.refIdx[1]);
+ }
+ if (mrgCandIdx == cnt && canFastExit)
+ {
+ return;
+ }
+
+ cnt++;
+ }
+
+ // early termination
+ if (cnt == maxNumMergeCand)
+ {
+ return;
+ }
+
+ //left
+ const PredictionUnit* puLeft = cs.getPURestricted(posLB.offset(-1, 0), pu, pu.chType);
+
+ const bool isAvailableA1 = puLeft && isDiffMER(pu, *puLeft) && pu.cu != puLeft->cu && CU::isInter(*puLeft->cu);
+
+ if (isAvailableA1)
+ {
+ miLeft = puLeft->getMotionInfo(posLB.offset(-1, 0));
+
+ if (!isAvailableB1 || (miAbove != miLeft))
+ {
+ // get Inter Dir
+ mrgCtx.interDirNeighbours[cnt] = miLeft.interDir;
+ mrgCtx.useAltHpelIf[cnt] = miLeft.useAltHpelIf;
+ mrgCtx.GBiIdx[cnt] = (mrgCtx.interDirNeighbours[cnt] == 3) ? puLeft->cu->GBiIdx : GBI_DEFAULT;
+ // get Mv from Left
+ mrgCtx.mvFieldNeighbours[cnt << 1].setMvField(miLeft.mv[0], miLeft.refIdx[0]);
+
+ if (slice.isInterB())
+ {
+ mrgCtx.mvFieldNeighbours[(cnt << 1) + 1].setMvField(miLeft.mv[1], miLeft.refIdx[1]);
+ }
+ if (mrgCandIdx == cnt && canFastExit)
+ {
+ return;
+ }
+
+ cnt++;
+ }
+ }
+#else
//left
const PredictionUnit* puLeft = cs.getPURestricted( posLB.offset( -1, 0 ), pu, pu.chType );
@@ -960,6 +1026,7 @@ void PU::getInterMergeCandidates( const PredictionUnit &pu, MergeCtx& mrgCtx,
cnt++;
}
}
+#endif
// early termination
if( cnt == maxNumMergeCand )
@@ -3853,16 +3920,16 @@ bool PU::isRefPicSameSize( const PredictionUnit& pu )
if( pu.refIdx[0] >= 0 )
{
- int refPicWidth = pu.cu->slice->getRefPic( REF_PIC_LIST_0, pu.refIdx[0] )->unscaledPic->cs->pps->getPicWidthInLumaSamples();
- int refPicHeight = pu.cu->slice->getRefPic( REF_PIC_LIST_0, pu.refIdx[0] )->unscaledPic->cs->pps->getPicHeightInLumaSamples();
+ int refPicWidth = pu.cu->slice->getRefPic( REF_PIC_LIST_0, pu.refIdx[0] )->getPicWidthInLumaSamples();
+ int refPicHeight = pu.cu->slice->getRefPic( REF_PIC_LIST_0, pu.refIdx[0] )->getPicHeightInLumaSamples();
samePicSize = refPicWidth == curPicWidth && refPicHeight == curPicHeight;
}
if( pu.refIdx[1] >= 0 )
{
- int refPicWidth = pu.cu->slice->getRefPic( REF_PIC_LIST_1, pu.refIdx[1] )->unscaledPic->cs->pps->getPicWidthInLumaSamples();
- int refPicHeight = pu.cu->slice->getRefPic( REF_PIC_LIST_1, pu.refIdx[1] )->unscaledPic->cs->pps->getPicHeightInLumaSamples();
+ int refPicWidth = pu.cu->slice->getRefPic( REF_PIC_LIST_1, pu.refIdx[1] )->getPicWidthInLumaSamples();
+ int refPicHeight = pu.cu->slice->getRefPic( REF_PIC_LIST_1, pu.refIdx[1] )->getPicHeightInLumaSamples();
samePicSize = samePicSize && ( refPicWidth == curPicWidth && refPicHeight == curPicHeight );
}
diff --git a/source/Lib/CommonLib/UnitTools.h b/source/Lib/CommonLib/UnitTools.h
index d9445e937802f71f9d4276a673d7d4d17376dff3..a1c766ff382a35bb7b2a6ef16892523d363d5a5d 100644
--- a/source/Lib/CommonLib/UnitTools.h
+++ b/source/Lib/CommonLib/UnitTools.h
@@ -119,7 +119,7 @@ namespace CU
uint8_t numSbtModeRdo (uint8_t sbtAllowed);
bool isSbtMode (const uint8_t sbtInfo);
bool isSameSbtSize (const uint8_t sbtInfo1, const uint8_t sbtInfo2);
- bool getRprScaling ( const SPS* sps, const PPS* curPPS, const PPS* refPPS, int& xScale, int& yScale );
+ bool getRprScaling ( const SPS* sps, const PPS* curPPS, Picture* refPic, int& xScale, int& yScale );
}
// PU tools
namespace PU
diff --git a/source/Lib/DecoderLib/CABACReader.cpp b/source/Lib/DecoderLib/CABACReader.cpp
index b5804f31d5d26d4495372608995ca6f576031d0f..260c5751ff7efb6e827f63545d370e7a20bbb8e7 100644
--- a/source/Lib/DecoderLib/CABACReader.cpp
+++ b/source/Lib/DecoderLib/CABACReader.cpp
@@ -3590,7 +3590,11 @@ void CABACReader::residual_coding_subblockTS( CoeffCodingContext& cctx, TCoeff*
tcoeff += ( rem << 1 );
#endif
}
+#if JVET_P0298_DISABLE_LEVELMAPPING_IN_BYPASS
+ if (!cctx.bdpcm() && cutoffVal)
+#else
if (!cctx.bdpcm())
+#endif
{
if (tcoeff > 0)
{
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index e8f2871708dea749dee60c835f271db78ce6c602..58b680f472034e721f325330d8228222af96004f 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -922,6 +922,12 @@ void DecLib::xActivateParameterSets()
m_pcPic->cs->slice = pSlice;
m_pcPic->cs->sps = sps;
m_pcPic->cs->pps = pps;
+
+ Window confWin = pps->getConformanceWindow( );
+ m_pcPic->setPicWidthInLumaSamples( pps->getPicWidthInLumaSamples() );
+ m_pcPic->setPicHeightInLumaSamples( pps->getPicHeightInLumaSamples() );
+ m_pcPic->setConformanceWindow( confWin );
+
memcpy(m_pcPic->cs->alfApss, apss, sizeof(m_pcPic->cs->alfApss));
m_pcPic->cs->lmcsAps = lmcsAPS;
m_pcPic->cs->scalinglistAps = scalinglistAPS;
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 09c625f2662a33307d7fd68813e92234e789587f..364601e3b80b0c5c66fc405e0e14a4f7af535a99 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -1282,7 +1282,13 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
unsigned minQtLog2SizeInterY = uiCode + pcSPS->getLog2MinCodingBlockSize();
minQT[1] = 1 << minQtLog2SizeInterY;
READ_UVLC(uiCode, "sps_max_mtt_hierarchy_depth_inter_slice"); maxBTD[1] = uiCode;
+#if JVET_P0347_MAX_MTT_DEPTH_CONSTRAINT
+ CHECK(uiCode > 2*(ctbLog2SizeY - log2MinCUSize), "sps_max_mtt_hierarchy_depth_inter_slice shall be in the range 0 to 2*(ctbLog2SizeY - log2MinCUSize)");
+#endif
READ_UVLC(uiCode, "sps_max_mtt_hierarchy_depth_intra_slice_luma"); maxBTD[0] = uiCode;
+#if JVET_P0347_MAX_MTT_DEPTH_CONSTRAINT
+ CHECK(uiCode > 2 * (ctbLog2SizeY - log2MinCUSize), "sps_max_mtt_hierarchy_depth_intra_slice_luma shall be in the range 0 to 2*(ctbLog2SizeY - log2MinCUSize)");
+#endif
maxTTSize[0] = maxBTSize[0] = minQT[0];
if (maxBTD[0] != 0)
@@ -1304,6 +1310,9 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
{
READ_UVLC(uiCode, "sps_log2_diff_min_qt_min_cb_intra_slice_chroma"); minQT[2] = 1 << (uiCode + pcSPS->getLog2MinCodingBlockSize());
READ_UVLC(uiCode, "sps_max_mtt_hierarchy_depth_intra_slice_chroma"); maxBTD[2] = uiCode;
+#if JVET_P0347_MAX_MTT_DEPTH_CONSTRAINT
+ CHECK(uiCode > 2 * (ctbLog2SizeY - log2MinCUSize), "sps_max_mtt_hierarchy_depth_intra_slice_chroma shall be in the range 0 to 2*(ctbLog2SizeY - log2MinCUSize)");
+#endif
maxTTSize[2] = maxBTSize[2] = minQT[2];
if (maxBTD[2] != 0)
{
@@ -1994,6 +2003,9 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para
{
READ_UVLC(uiCode, "slice_log2_diff_min_qt_min_cb"); pcSlice->setMinQTSize(1 << (uiCode + sps->getLog2MinCodingBlockSize()));
READ_UVLC(uiCode, "slice_max_mtt_hierarchy_depth_luma"); pcSlice->setMaxMTTHierarchyDepth(uiCode);
+#if JVET_P0347_MAX_MTT_DEPTH_CONSTRAINT
+ CHECK(uiCode > 2 * (floorLog2(sps->getCTUSize()) - sps->getLog2MinCodingBlockSize()), "slice_max_mtt_hierarchy_depth_luma shall be in the range 0 to 2*(ctbLog2SizeY - log2MinCUSize)");
+#endif
if (pcSlice->getMaxMTTHierarchyDepth() != 0)
{
READ_UVLC(uiCode, "slice_log2_diff_max_bt_min_qt"); pcSlice->setMaxBTSize(pcSlice->getMinQTSize() << uiCode);
@@ -2010,6 +2022,9 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para
{
READ_UVLC(uiCode, "slice_log2_diff_min_qt_min_cb_chroma"); pcSlice->setMinQTSizeIChroma(1 << (uiCode + sps->getLog2MinCodingBlockSize()));
READ_UVLC(uiCode, "slice_max_mtt_hierarchy_depth_chroma"); pcSlice->setMaxMTTHierarchyDepthIChroma(uiCode);
+#if JVET_P0347_MAX_MTT_DEPTH_CONSTRAINT
+ CHECK(uiCode > 2 * (floorLog2(sps->getCTUSize()) - sps->getLog2MinCodingBlockSize()), "slice_max_mtt_hierarchy_depth_chroma shall be in the range 0 to 2*(ctbLog2SizeY - log2MinCUSize)");
+#endif
if (pcSlice->getMaxMTTHierarchyDepthIChroma() != 0)
{
READ_UVLC(uiCode, "slice_log2_diff_max_bt_min_qt_chroma"); pcSlice->setMaxBTSizeIChroma(pcSlice->getMinQTSizeIChroma() << uiCode);
diff --git a/source/Lib/EncoderLib/CABACWriter.cpp b/source/Lib/EncoderLib/CABACWriter.cpp
index b4ec13d5107cf96f9af1a3404903b21d69475aae..6d9ab1d4a2f624f10b31b4f0cc32f8e4f9c40544 100644
--- a/source/Lib/EncoderLib/CABACWriter.cpp
+++ b/source/Lib/EncoderLib/CABACWriter.cpp
@@ -3290,10 +3290,16 @@ void CABACWriter::residual_coding_subblockTS( CoeffCodingContext& cctx, const TC
{
unsigned absLevel;
cctx.neighTS(rightPixel, belowPixel, scanPos, coeff);
+#if JVET_P0298_DISABLE_LEVELMAPPING_IN_BYPASS
+ cutoffVal = (scanPos <= lastScanPosPass2 ? 10 : (scanPos <= lastScanPosPass1 ? 2 : 0));
+ absLevel = cctx.deriveModCoeff(rightPixel, belowPixel, abs(coeff[cctx.blockPos(scanPos)]), cctx.bdpcm()||!cutoffVal);
+#else
absLevel = cctx.deriveModCoeff(rightPixel, belowPixel, abs(coeff[cctx.blockPos(scanPos)]), cctx.bdpcm());
#if JVET_P0072_SIMPLIFIED_TSRC
cutoffVal = (scanPos <= lastScanPosPass2 ? 10 : (scanPos <= lastScanPosPass1 ? 2 : 0));
#endif
+#endif
+
if( absLevel >= cutoffVal )
{
int rice = cctx.templateAbsSumTS( scanPos, coeff );
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index 043a6356775d9bc59363972e0a8a1e08ec9e58b6..ce58afcab59f5507930dc3f297b212389748fc80 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -450,6 +450,9 @@ protected:
bool m_bFastUDIUseMPMEnabled;
bool m_bFastMEForGenBLowDelayEnabled;
bool m_bUseBLambdaForNonKeyLowDelayPictures;
+#if JVET_O0549_ENCODER_ONLY_FILTER
+ bool m_gopBasedTemporalFilterEnabled;
+#endif
//====== Slice ========
SliceConstraint m_sliceMode;
int m_sliceArgument;
@@ -1192,6 +1195,10 @@ public:
bool getFastUDIUseMPMEnabled () { return m_bFastUDIUseMPMEnabled; }
bool getFastMEForGenBLowDelayEnabled () { return m_bFastMEForGenBLowDelayEnabled; }
bool getUseBLambdaForNonKeyLowDelayPictures () { return m_bUseBLambdaForNonKeyLowDelayPictures; }
+#if JVET_O0549_ENCODER_ONLY_FILTER
+ void setGopBasedTemporalFilterEnabled(bool flag) { m_gopBasedTemporalFilterEnabled = flag; }
+ bool getGopBasedTemporalFilterEnabled() { return m_gopBasedTemporalFilterEnabled; }
+#endif
bool getCrossComponentPredictionEnabledFlag () const { return m_crossComponentPredictionEnabledFlag; }
void setCrossComponentPredictionEnabledFlag (const bool value) { m_crossComponentPredictionEnabledFlag = value; }
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index 88fc69c47a25ad044b010df85ae48478da75af79..c3b588dbee0506d52da2fcbf9f7277778ab19f12 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -3645,7 +3645,11 @@ void EncGOP::xCalculateAddPSNR(Picture* pcPic, PelUnitBuf cPicD, const AccessUni
const CPelUnitBuf& pic = cPicD;
CHECK(!(conversion == IPCOLOURSPACE_UNCHANGED), "Unspecified error");
// const CPelUnitBuf& org = (conversion != IPCOLOURSPACE_UNCHANGED) ? pcPic->getPicYuvTrueOrg()->getBuf() : pcPic->getPicYuvOrg()->getBuf();
+#if JVET_O0549_ENCODER_ONLY_FILTER
+ const CPelUnitBuf& org = (sps.getUseReshaper() || m_pcCfg->getGopBasedTemporalFilterEnabled()) ? pcPic->getTrueOrigBuf() : pcPic->getOrigBuf();
+#else
const CPelUnitBuf& org = sps.getUseReshaper() ? pcPic->getTrueOrigBuf() : pcPic->getOrigBuf();
+#endif
#if ENABLE_QPA
const bool useWPSNR = m_pcEncLib->getUseWPSNR();
#endif
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index cfd0e5e35a1ecd6ce2d4a70da830dd78329e5280..15641661ff172cc95ab63e0459d02c75034dfea9 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -558,6 +558,11 @@ void EncLib::encode( bool flush, PelStorage* pcPicYuvOrg, PelStorage* cPicYuvTru
const PPS *pps = m_ppsMap.getPS(2);
const SPS *sps = m_spsMap.getPS(pps->getSPSId());
+ Window confWin = pps->getConformanceWindow( );
+ picCurr->setPicWidthInLumaSamples( pps->getPicWidthInLumaSamples() );
+ picCurr->setPicHeightInLumaSamples( pps->getPicHeightInLumaSamples() );
+ picCurr->setConformanceWindow( confWin );
+
picCurr->M_BUFS(0, PIC_ORIGINAL).copyFrom(m_cGOPEncoder.getPicBg()->getRecoBuf());
picCurr->finalInit( *sps, *pps, m_apss, m_lmcsAPS, m_scalinglistAPS );
picCurr->poc = m_iPOCLast - 1;
@@ -619,6 +624,11 @@ void EncLib::encode( bool flush, PelStorage* pcPicYuvOrg, PelStorage* cPicYuvTru
const PPS *pPPS=(ppsID<0) ? m_ppsMap.getFirstPS() : m_ppsMap.getPS(ppsID);
const SPS *pSPS=m_spsMap.getPS(pPPS->getSPSId());
+ Window confWin = pPPS->getConformanceWindow( );
+ pcPicCurr->setPicWidthInLumaSamples( pPPS->getPicWidthInLumaSamples() );
+ pcPicCurr->setPicHeightInLumaSamples( pPPS->getPicHeightInLumaSamples() );
+ pcPicCurr->setConformanceWindow( confWin );
+
if( m_rprEnabled )
{
pcPicCurr->M_BUFS( 0, PIC_ORIGINAL_INPUT ).getBuf( COMPONENT_Y ).copyFrom( pcPicYuvOrg->getBuf( COMPONENT_Y ) );
@@ -740,6 +750,11 @@ void EncLib::encode( bool flush, PelStorage* pcPicYuvOrg, PelStorage* pcPicYuvTr
int ppsID=-1; // Use default PPS ID
const PPS *pPPS=(ppsID<0) ? m_ppsMap.getFirstPS() : m_ppsMap.getPS(ppsID);
const SPS *pSPS=m_spsMap.getPS(pPPS->getSPSId());
+ Window confWin = pPPS->getConformanceWindow( );
+ pcField->setPicWidthInLumaSamples( pPPS->getPicWidthInLumaSamples() );
+ pcField->setPicHeightInLumaSamples( pPPS->getPicHeightInLumaSamples() );
+ pcField->setConformanceWindow( confWin );
+
pcField->finalInit( *pSPS, *pPPS, m_apss, m_lmcsAPS, m_scalinglistAPS );
}
@@ -1028,6 +1043,11 @@ void EncLib::xInitSPS(SPS &sps)
#if JVET_P0578_MINIMUM_CU_SIZE_CONSTRAINT
CHECK(log2MinCUSize > std::min(6, floorLog2(sps.getMaxCUWidth())), "log2_min_luma_coding_block_size_minus2 shall be in the range of 0 to min (4, log2_ctu_size - 2)");
#endif
+#if JVET_P0347_MAX_MTT_DEPTH_CONSTRAINT
+ CHECK(m_uiMaxMTTHierarchyDepth > 2 * (floorLog2(sps.getCTUSize()) - sps.getLog2MinCodingBlockSize()), "sps_max_mtt_hierarchy_depth_inter_slice shall be in the range 0 to 2*(ctbLog2SizeY - log2MinCUSize)");
+ CHECK(m_uiMaxMTTHierarchyDepthI > 2 * (floorLog2(sps.getCTUSize()) - sps.getLog2MinCodingBlockSize()), "sps_max_mtt_hierarchy_depth_intra_slice_luma shall be in the range 0 to 2*(ctbLog2SizeY - log2MinCUSize)");
+ CHECK(m_uiMaxMTTHierarchyDepthIChroma > 2 * (floorLog2(sps.getCTUSize()) - sps.getLog2MinCodingBlockSize()), "sps_max_mtt_hierarchy_depth_intra_slice_chroma shall be in the range 0 to 2*(ctbLog2SizeY - log2MinCUSize)");
+#endif
sps.setTransformSkipEnabledFlag(m_useTransformSkip);
sps.setBDPCMEnabledFlag(m_useBDPCM);
diff --git a/source/Lib/EncoderLib/EncTemporalFilter.cpp b/source/Lib/EncoderLib/EncTemporalFilter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..147d0cbb9c1e2dea44c279a821ee66dea2024d11
--- /dev/null
+++ b/source/Lib/EncoderLib/EncTemporalFilter.cpp
@@ -0,0 +1,628 @@
+/* The copyright in this software is being made available under the BSD
+* License, included below. This software may be subject to other third party
+* and contributor rights, including patent rights, and no such rights are
+* granted under this license.
+*
+* Copyright (c) 2010-2019, ITU/ISO/IEC
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* * Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+* * Neither the name of the ITU/ISO/IEC nor the names of its contributors may
+* be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
+* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+* THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/** \file EncTemporalFilter.cpp
+\brief EncTemporalFilter class
+*/
+
+#include "EncTemporalFilter.h"
+#include <math.h>
+
+#if JVET_O0549_ENCODER_ONLY_FILTER
+
+// ====================================================================================================================
+// Constructor / destructor / initialization / destroy
+// ====================================================================================================================
+
+const int EncTemporalFilter::m_range = 2;
+const double EncTemporalFilter::m_chromaFactor = 0.55;
+const double EncTemporalFilter::m_sigmaMultiplier = 9.0;
+const double EncTemporalFilter::m_sigmaZeroPoint = 10.0;
+const int EncTemporalFilter::m_motionVectorFactor = 16;
+const int EncTemporalFilter::m_padding = 128;
+const int EncTemporalFilter::m_interpolationFilter[16][8] =
+{
+ { 0, 0, 0, 64, 0, 0, 0, 0 }, //0
+ { 0, 1, -3, 64, 4, -2, 0, 0 }, //1 -->-->
+ { 0, 1, -6, 62, 9, -3, 1, 0 }, //2 -->
+ { 0, 2, -8, 60, 14, -5, 1, 0 }, //3 -->-->
+ { 0, 2, -9, 57, 19, -7, 2, 0 }, //4
+ { 0, 3, -10, 53, 24, -8, 2, 0 }, //5 -->-->
+ { 0, 3, -11, 50, 29, -9, 2, 0 }, //6 -->
+ { 0, 3, -11, 44, 35, -10, 3, 0 }, //7 -->-->
+ { 0, 1, -7, 38, 38, -7, 1, 0 }, //8
+ { 0, 3, -10, 35, 44, -11, 3, 0 }, //9 -->-->
+ { 0, 2, -9, 29, 50, -11, 3, 0 }, //10-->
+ { 0, 2, -8, 24, 53, -10, 3, 0 }, //11-->-->
+ { 0, 2, -7, 19, 57, -9, 2, 0 }, //12
+ { 0, 1, -5, 14, 60, -8, 2, 0 }, //13-->-->
+ { 0, 1, -3, 9, 62, -6, 1, 0 }, //14-->
+ { 0, 0, -2, 4, 64, -3, 1, 0 } //15-->-->
+};
+
+const double EncTemporalFilter::m_refStrengths[3][2] =
+{ // abs(POC offset)
+ // 1, 2
+ {0.85, 0.60}, // m_range * 2
+ {1.20, 1.00}, // m_range
+ {0.30, 0.30} // otherwise
+};
+
+EncTemporalFilter::EncTemporalFilter() :
+ m_FrameSkip(0),
+ m_chromaFormatIDC(NUM_CHROMA_FORMAT),
+ m_sourceWidth(0),
+ m_sourceHeight(0),
+ m_QP(0),
+ m_clipInputVideoToRec709Range(false),
+ m_inputColourSpaceConvert(NUMBER_INPUT_COLOUR_SPACE_CONVERSIONS)
+{}
+
+void EncTemporalFilter::init(const int frameSkip,
+ const int inputBitDepth[MAX_NUM_CHANNEL_TYPE],
+ const int msbExtendedBitDepth[MAX_NUM_CHANNEL_TYPE],
+ const int internalBitDepth[MAX_NUM_CHANNEL_TYPE],
+ const int width,
+ const int height,
+ const int *pad,
+ const bool rec709,
+ const std::string &filename,
+ const ChromaFormat inputChromaFormatIDC,
+ const InputColourSpaceConversion colorSpaceConv,
+ const int qp,
+ const std::map<int, double> &temporalFilterStrengths,
+ const bool gopBasedTemporalFilterFutureReference)
+{
+ m_FrameSkip = frameSkip;
+ for (int i = 0; i < MAX_NUM_CHANNEL_TYPE; i++)
+ {
+ m_inputBitDepth[i] = inputBitDepth[i];
+ m_MSBExtendedBitDepth[i] = msbExtendedBitDepth[i];
+ m_internalBitDepth[i] = internalBitDepth[i];
+ }
+
+ m_sourceWidth = width;
+ m_sourceHeight = height;
+ for (int i = 0; i < 2; i++)
+ {
+ m_pad[i] = pad[i];
+ }
+ m_clipInputVideoToRec709Range = rec709;
+ m_inputFileName = filename;
+ m_chromaFormatIDC = inputChromaFormatIDC;
+ m_inputColourSpaceConvert = colorSpaceConv;
+ m_area = Area(0, 0, width, height);
+ m_QP = qp;
+ m_temporalFilterStrengths = temporalFilterStrengths;
+ m_gopBasedTemporalFilterFutureReference = gopBasedTemporalFilterFutureReference;
+}
+
+// ====================================================================================================================
+// Public member functions
+// ====================================================================================================================
+
+bool EncTemporalFilter::filter(PelStorage *orgPic, int receivedPoc)
+{
+ bool isFilterThisFrame = false;
+ if (m_QP >= 17) // disable filter for QP < 17
+ {
+ for (map<int, double>::iterator it = m_temporalFilterStrengths.begin(); it != m_temporalFilterStrengths.end(); ++it)
+ {
+ int filteredFrame = it->first;
+ if (receivedPoc % filteredFrame == 0)
+ {
+ isFilterThisFrame = true;
+ break;
+ }
+ }
+ }
+
+ if (isFilterThisFrame)
+ {
+ int offset = m_FrameSkip;
+ VideoIOYuv yuvFrames;
+ yuvFrames.open(m_inputFileName, false, m_inputBitDepth, m_MSBExtendedBitDepth, m_internalBitDepth);
+ yuvFrames.skipFrames(std::max(offset + receivedPoc - m_range, 0), m_sourceWidth - m_pad[0], m_sourceHeight - m_pad[1], m_chromaFormatIDC);
+
+
+ std::deque<TemporalFilterSourcePicInfo> srcFrameInfo;
+
+ int firstFrame = receivedPoc + offset - m_range;
+ int lastFrame = receivedPoc + offset + m_range;
+ if (!m_gopBasedTemporalFilterFutureReference)
+ {
+ lastFrame = receivedPoc + offset - 1;
+ }
+ int origOffset = -m_range;
+
+ // subsample original picture so it only needs to be done once
+ PelStorage origPadded;
+
+ origPadded.create(m_chromaFormatIDC, m_area, 0, m_padding);
+ origPadded.copyFrom(*orgPic);
+ origPadded.extendBorderPel(m_padding, m_padding);
+
+ PelStorage origSubsampled2;
+ PelStorage origSubsampled4;
+
+ subsampleLuma(origPadded, origSubsampled2);
+ subsampleLuma(origSubsampled2, origSubsampled4);
+
+ // determine motion vectors
+ for (int poc = firstFrame; poc <= lastFrame; poc++)
+ {
+ if (poc < 0)
+ {
+ origOffset++;
+ continue; // frame not available
+ }
+ else if (poc == offset + receivedPoc)
+ { // hop over frame that will be filtered
+ yuvFrames.skipFrames(1, m_sourceWidth - m_pad[0], m_sourceHeight - m_pad[1], m_chromaFormatIDC);
+ origOffset++;
+ continue;
+ }
+ srcFrameInfo.push_back(TemporalFilterSourcePicInfo());
+ TemporalFilterSourcePicInfo &srcPic=srcFrameInfo.back();
+
+ PelStorage dummyPicBufferTO; // Only used temporary in yuvFrames.read
+ srcPic.picBuffer.create(m_chromaFormatIDC, m_area, 0, m_padding);
+ dummyPicBufferTO.create(m_chromaFormatIDC, m_area, 0, m_padding);
+ if (!yuvFrames.read(srcPic.picBuffer, dummyPicBufferTO, m_inputColourSpaceConvert, m_pad, m_chromaFormatIDC, m_clipInputVideoToRec709Range))
+ {
+ return false; // eof or read fail
+ }
+ srcPic.picBuffer.extendBorderPel(m_padding, m_padding);
+ srcPic.mvs.allocate(m_sourceWidth / 4, m_sourceHeight / 4);
+
+ motionEstimation(srcPic.mvs, origPadded, srcPic.picBuffer, origSubsampled2, origSubsampled4);
+ srcPic.origOffset = origOffset;
+ origOffset++;
+ }
+
+ // filter
+ PelStorage newOrgPic;
+ newOrgPic.create(m_chromaFormatIDC, m_area, 0, m_padding);
+ double overallStrength = -1.0;
+ for (map<int, double>::iterator it = m_temporalFilterStrengths.begin(); it != m_temporalFilterStrengths.end(); ++it)
+ {
+ int frame = it->first;
+ double strength = it->second;
+ if (receivedPoc % frame == 0)
+ {
+ overallStrength = strength;
+ }
+ }
+
+ bilateralFilter(origPadded, srcFrameInfo, newOrgPic, overallStrength);
+
+ // move filtered to orgPic
+ orgPic->copyFrom(newOrgPic);
+
+ yuvFrames.close();
+ return true;
+ }
+ return false;
+}
+
+// ====================================================================================================================
+// Private member functions
+// ====================================================================================================================
+
+void EncTemporalFilter::subsampleLuma(const PelStorage &input, PelStorage &output, const int factor) const
+{
+ const int newWidth = input.Y().width / factor;
+ const int newHeight = input.Y().height / factor;
+ output.create(m_chromaFormatIDC, Area(0, 0, newWidth, newHeight), 0, m_padding);
+
+ const Pel* srcRow = input.Y().buf;
+ const int srcStride = input.Y().stride;
+ Pel *dstRow = output.Y().buf;
+ const int dstStride = output.Y().stride;
+
+ for (int y = 0; y < newHeight; y++, srcRow+=factor*srcStride, dstRow+=dstStride)
+ {
+ const Pel *inRow = srcRow;
+ const Pel *inRowBelow = srcRow+srcStride;
+ Pel *target = dstRow;
+
+ for (int x = 0; x < newWidth; x++)
+ {
+ target[x] = (inRow[0] + inRowBelow[0] + inRow[1] + inRowBelow[1] + 2) >> 2;
+ inRow += 2;
+ inRowBelow += 2;
+ }
+ }
+ output.extendBorderPel(m_padding, m_padding);
+}
+
+int EncTemporalFilter::motionErrorLuma(const PelStorage &orig,
+ const PelStorage &buffer,
+ const int x,
+ const int y,
+ int dx,
+ int dy,
+ const int bs,
+ const int besterror = 8 * 8 * 1024 * 1024) const
+{
+ const Pel* origOrigin = orig.Y().buf;
+ const int origStride = orig.Y().stride;
+ const Pel *buffOrigin = buffer.Y().buf;
+ const int buffStride = buffer.Y().stride;
+
+ int error = 0;// dx * 10 + dy * 10;
+ if (((dx | dy) & 0xF) == 0)
+ {
+ dx /= m_motionVectorFactor;
+ dy /= m_motionVectorFactor;
+ for (int y1 = 0; y1 < bs; y1++)
+ {
+ const Pel* origRowStart = origOrigin + (y+y1)*origStride + x;
+ const Pel* bufferRowStart = buffOrigin + (y+y1+dy)*buffStride + (x+dx);
+ for (int x1 = 0; x1 < bs; x1 += 2)
+ {
+ int diff = origRowStart[x1] - bufferRowStart[x1];
+ error += diff * diff;
+ diff = origRowStart[x1 + 1] - bufferRowStart[x1 + 1];
+ error += diff * diff;
+ }
+ if (error > besterror)
+ {
+ return error;
+ }
+ }
+ }
+ else
+ {
+ const int *xFilter = m_interpolationFilter[dx & 0xF];
+ const int *yFilter = m_interpolationFilter[dy & 0xF];
+ int tempArray[64 + 8][64];
+
+ int sum, base;
+ for (int y1 = 1; y1 < bs + 7; y1++)
+ {
+ const int yOffset = y + y1 + (dy >> 4) - 3;
+ const Pel *sourceRow = buffOrigin + (yOffset)*buffStride + 0;
+ for (int x1 = 0; x1 < bs; x1++)
+ {
+ sum = 0;
+ base = x + x1 + (dx >> 4) - 3;
+ const Pel *rowStart = sourceRow + base;
+
+ sum += xFilter[1] * rowStart[1];
+ sum += xFilter[2] * rowStart[2];
+ sum += xFilter[3] * rowStart[3];
+ sum += xFilter[4] * rowStart[4];
+ sum += xFilter[5] * rowStart[5];
+ sum += xFilter[6] * rowStart[6];
+
+ tempArray[y1][x1] = sum;
+ }
+ }
+
+ const Pel maxSampleValue = (1<<m_internalBitDepth[CHANNEL_TYPE_LUMA])-1;
+ for (int y1 = 0; y1 < bs; y1++)
+ {
+ const Pel *origRow = origOrigin + (y+y1)*origStride + 0;
+ for (int x1 = 0; x1 < bs; x1++)
+ {
+ sum = 0;
+ sum += yFilter[1] * tempArray[y1 + 1][x1];
+ sum += yFilter[2] * tempArray[y1 + 2][x1];
+ sum += yFilter[3] * tempArray[y1 + 3][x1];
+ sum += yFilter[4] * tempArray[y1 + 4][x1];
+ sum += yFilter[5] * tempArray[y1 + 5][x1];
+ sum += yFilter[6] * tempArray[y1 + 6][x1];
+
+ sum = (sum + (1 << 11)) >> 12;
+ sum = sum < 0 ? 0 : (sum > maxSampleValue ? maxSampleValue : sum);
+
+ error += (sum - origRow[x + x1]) * (sum - origRow[x + x1]);
+ }
+ if (error > besterror)
+ {
+ return error;
+ }
+ }
+ }
+ return error;
+}
+
+void EncTemporalFilter::motionEstimationLuma(Array2D<MotionVector> &mvs, const PelStorage &orig, const PelStorage &buffer, const int blockSize,
+ const Array2D<MotionVector> *previous, const int factor, const bool doubleRes) const
+{
+ int range = 5;
+ const int stepSize = blockSize;
+
+ const int origWidth = orig.Y().width;
+ const int origHeight = orig.Y().height;
+
+ for (int blockY = 0; blockY + blockSize < origHeight; blockY += stepSize)
+ {
+ for (int blockX = 0; blockX + blockSize < origWidth; blockX += stepSize)
+ {
+ MotionVector best;
+
+ if (previous == NULL)
+ {
+ range = 8;
+ }
+ else
+ {
+ for (int py = -2; py <= 2; py++)
+ {
+ int testy = blockY / (2 * blockSize) + py;
+ for (int px = -2; px <= 2; px++)
+ {
+ int testx = blockX / (2 * blockSize) + px;
+ if ((testx >= 0) && (testx < origWidth / (2 * blockSize)) && (testy >= 0) && (testy < origHeight / (2 * blockSize)))
+ {
+ MotionVector old = previous->get(testx, testy);
+ int error = motionErrorLuma(orig, buffer, blockX, blockY, old.x * factor, old.y * factor, blockSize, best.error);
+ if (error < best.error)
+ {
+ best.set(old.x * factor, old.y * factor, error);
+ }
+ }
+ }
+ }
+ }
+ MotionVector prevBest = best;
+ for (int y2 = prevBest.y / m_motionVectorFactor - range; y2 <= prevBest.y / m_motionVectorFactor + range; y2++)
+ {
+ for (int x2 = prevBest.x / m_motionVectorFactor - range; x2 <= prevBest.x / m_motionVectorFactor + range; x2++)
+ {
+ int error = motionErrorLuma(orig, buffer, blockX, blockY, x2 * m_motionVectorFactor, y2 * m_motionVectorFactor, blockSize, best.error);
+ if (error < best.error)
+ {
+ best.set(x2 * m_motionVectorFactor, y2 * m_motionVectorFactor, error);
+ }
+ }
+ }
+ if (doubleRes)
+ { // merge into one loop, probably with precision array (here [12, 3] or maybe [4, 1]) with setable number of iterations
+ prevBest = best;
+ int doubleRange = 3 * 4;
+ for (int y2 = prevBest.y - doubleRange; y2 <= prevBest.y + doubleRange; y2 += 4)
+ {
+ for (int x2 = prevBest.x - doubleRange; x2 <= prevBest.x + doubleRange; x2 += 4)
+ {
+ int error = motionErrorLuma(orig, buffer, blockX, blockY, x2, y2, blockSize, best.error);
+ if (error < best.error)
+ {
+ best.set(x2, y2, error);
+ }
+
+ }
+ }
+
+ prevBest = best;
+ doubleRange = 3;
+ for (int y2 = prevBest.y - doubleRange; y2 <= prevBest.y + doubleRange; y2++)
+ {
+ for (int x2 = prevBest.x - doubleRange; x2 <= prevBest.x + doubleRange; x2++)
+ {
+ int error = motionErrorLuma(orig, buffer, blockX, blockY, x2, y2, blockSize, best.error);
+ if (error < best.error)
+ {
+ best.set(x2, y2, error);
+ }
+
+ }
+ }
+
+ }
+ mvs.get(blockX / stepSize, blockY / stepSize) = best;
+ }
+ }
+}
+
+void EncTemporalFilter::motionEstimation(Array2D<MotionVector> &mv, const PelStorage &orgPic, const PelStorage &buffer, const PelStorage &origSubsampled2, const PelStorage &origSubsampled4) const
+{
+ const int width = m_sourceWidth;
+ const int height = m_sourceHeight;
+ Array2D<MotionVector> mv_0(width / 16, height / 16);
+ Array2D<MotionVector> mv_1(width / 16, height / 16);
+ Array2D<MotionVector> mv_2(width / 16, height / 16);
+
+ PelStorage bufferSub2;
+ PelStorage bufferSub4;
+
+ subsampleLuma(buffer, bufferSub2);
+ subsampleLuma(bufferSub2, bufferSub4);
+
+ motionEstimationLuma(mv_0, origSubsampled4, bufferSub4, 16);
+ motionEstimationLuma(mv_1, origSubsampled2, bufferSub2, 16, &mv_0, 2);
+ motionEstimationLuma(mv_2, orgPic, buffer, 16, &mv_1, 2);
+
+ motionEstimationLuma(mv, orgPic, buffer, 8, &mv_2, 1, true);
+}
+
+void EncTemporalFilter::applyMotion(const Array2D<MotionVector> &mvs, const PelStorage &input, PelStorage &output) const
+{
+ static const int lumaBlockSize=8;
+
+ for(int c=0; c< getNumberValidComponents(m_chromaFormatIDC); c++)
+ {
+ const ComponentID compID=(ComponentID)c;
+ const int csx=getComponentScaleX(compID, m_chromaFormatIDC);
+ const int csy=getComponentScaleY(compID, m_chromaFormatIDC);
+ const int blockSizeX = lumaBlockSize>>csx;
+ const int blockSizeY = lumaBlockSize>>csy;
+ const int height = input.bufs[c].height;
+ const int width = input.bufs[c].width;
+
+ const Pel maxValue = (1<<m_internalBitDepth[toChannelType(compID)])-1;
+
+ const Pel *srcImage = input.bufs[c].buf;
+ const int srcStride = input.bufs[c].stride;
+
+ Pel *dstImage = output.bufs[c].buf;
+ int dstStride = output.bufs[c].stride;
+
+ for (int y = 0, blockNumY = 0; y + blockSizeY <= height; y += blockSizeY, blockNumY++)
+ {
+ for (int x = 0, blockNumX = 0; x + blockSizeX <= width; x += blockSizeX, blockNumX++)
+ {
+ const MotionVector &mv = mvs.get(blockNumX,blockNumY);
+ const int dx = mv.x >> csx ;
+ const int dy = mv.y >> csy ;
+ const int xInt = mv.x >> (4+csx) ;
+ const int yInt = mv.y >> (4+csy) ;
+
+ const int *xFilter = m_interpolationFilter[dx & 0xf];
+ const int *yFilter = m_interpolationFilter[dy & 0xf]; // will add 6 bit.
+ const int numFilterTaps=7;
+ const int centreTapOffset=3;
+
+ int tempArray[lumaBlockSize + numFilterTaps][lumaBlockSize];
+
+ for (int by = 1; by < blockSizeY + numFilterTaps; by++)
+ {
+ const int yOffset = y + by + yInt - centreTapOffset;
+ const Pel *sourceRow = srcImage+yOffset*srcStride;
+ for (int bx = 0; bx < blockSizeX; bx++)
+ {
+ int base = x + bx + xInt - centreTapOffset;
+ const Pel *rowStart = sourceRow + base;
+
+ int sum = 0;
+ sum += xFilter[1] * rowStart[1];
+ sum += xFilter[2] * rowStart[2];
+ sum += xFilter[3] * rowStart[3];
+ sum += xFilter[4] * rowStart[4];
+ sum += xFilter[5] * rowStart[5];
+ sum += xFilter[6] * rowStart[6];
+
+ tempArray[by][bx] = sum;
+ }
+ }
+
+ Pel *dstRow = dstImage+y*dstStride;
+ for (int by = 0; by < blockSizeY; by++, dstRow+=dstStride)
+ {
+ Pel *dstPel=dstRow+x;
+ for (int bx = 0; bx < blockSizeX; bx++, dstPel++)
+ {
+ int sum = 0;
+
+ sum += yFilter[1] * tempArray[by + 1][bx];
+ sum += yFilter[2] * tempArray[by + 2][bx];
+ sum += yFilter[3] * tempArray[by + 3][bx];
+ sum += yFilter[4] * tempArray[by + 4][bx];
+ sum += yFilter[5] * tempArray[by + 5][bx];
+ sum += yFilter[6] * tempArray[by + 6][bx];
+
+ sum = (sum + (1 << 11)) >> 12;
+ sum = sum < 0 ? 0 : (sum > maxValue ? maxValue : sum);
+ *dstPel = sum;
+ }
+ }
+ }
+ }
+ }
+}
+
+void EncTemporalFilter::bilateralFilter(const PelStorage &orgPic,
+ const std::deque<TemporalFilterSourcePicInfo> &srcFrameInfo,
+ PelStorage &newOrgPic,
+ double overallStrength) const
+{
+ const int numRefs = int(srcFrameInfo.size());
+ std::vector<PelStorage> correctedPics(numRefs);
+ for (int i = 0; i < numRefs; i++)
+ {
+ correctedPics[i].create(m_chromaFormatIDC, m_area, 0, m_padding);
+ applyMotion(srcFrameInfo[i].mvs, srcFrameInfo[i].picBuffer, correctedPics[i]);
+ }
+
+ int refStrengthRow = 2;
+ if (numRefs == m_range*2)
+ {
+ refStrengthRow = 0;
+ }
+ else if (numRefs == m_range)
+ {
+ refStrengthRow = 1;
+ }
+
+ const double lumaSigmaSq = (m_QP - m_sigmaZeroPoint) * (m_QP - m_sigmaZeroPoint) * m_sigmaMultiplier;
+ const double chromaSigmaSq = 30 * 30;
+
+ for(int c=0; c< getNumberValidComponents(m_chromaFormatIDC); c++)
+ {
+ const ComponentID compID=(ComponentID)c;
+ const int height = orgPic.bufs[c].height;
+ const int width = orgPic.bufs[c].width;
+ const Pel *srcPelRow = orgPic.bufs[c].buf;
+ const int srcStride = orgPic.bufs[c].stride;
+ Pel *dstPelRow = newOrgPic.bufs[c].buf;
+ const int dstStride = newOrgPic.bufs[c].stride;
+ const double sigmaSq = isChroma(compID)? chromaSigmaSq : lumaSigmaSq;
+ const double weightScaling = overallStrength * (isChroma(compID) ? m_chromaFactor : 0.4);
+ const Pel maxSampleValue = (1<<m_internalBitDepth[toChannelType(compID)])-1;
+ const double bitDepthDiffWeighting=1024.0 / (maxSampleValue+1);
+
+ for (int y = 0; y < height; y++, srcPelRow+=srcStride, dstPelRow+=dstStride)
+ {
+ const Pel *srcPel=srcPelRow;
+ Pel *dstPel=dstPelRow;
+ for (int x = 0; x < width; x++, srcPel++, dstPel++)
+ {
+ const int orgVal = (int) *srcPel;
+ double temporalWeightSum = 1.0;
+ double newVal = (double) orgVal;
+ for (int i = 0; i < numRefs; i++)
+ {
+ const Pel *pCorrectedPelPtr=correctedPics[i].bufs[c].buf+(y*correctedPics[i].bufs[c].stride+x);
+ const int refVal = (int) *pCorrectedPelPtr;
+ double diff = (double)(refVal - orgVal);
+ diff *= bitDepthDiffWeighting;
+ double diffSq = diff * diff;
+ const int index = std::min(1, std::abs(srcFrameInfo[i].origOffset) - 1);
+ const double weight = weightScaling * m_refStrengths[refStrengthRow][index] * exp(-diffSq / (2 * sigmaSq));
+ newVal += weight * refVal;
+ temporalWeightSum += weight;
+ }
+ newVal /= temporalWeightSum;
+ Pel sampleVal = (Pel)round(newVal);
+ sampleVal=(sampleVal<0?0 : (sampleVal>maxSampleValue ? maxSampleValue : sampleVal));
+ *dstPel = sampleVal;
+ }
+ }
+ }
+}
+
+//! \}
+
+#endif
diff --git a/source/Lib/EncoderLib/EncTemporalFilter.h b/source/Lib/EncoderLib/EncTemporalFilter.h
new file mode 100644
index 0000000000000000000000000000000000000000..e9dbe86d711cd1ee8f6e6c4ef14e0942746bbe6b
--- /dev/null
+++ b/source/Lib/EncoderLib/EncTemporalFilter.h
@@ -0,0 +1,167 @@
+/* The copyright in this software is being made available under the BSD
+* License, included below. This software may be subject to other third party
+* and contributor rights, including patent rights, and no such rights are
+* granted under this license.
+*
+* Copyright (c) 2010-2019, ITU/ISO/IEC
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* * Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright notice,
+* this list of conditions and the following disclaimer in the documentation
+* and/or other materials provided with the distribution.
+* * Neither the name of the ITU/ISO/IEC nor the names of its contributors may
+* be used to endorse or promote products derived from this software without
+* specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
+* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+* THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/** \file EncTemporalFilter.h
+\brief EncTemporalFilter class (header)
+*/
+
+#ifndef __TEMPORAL_FILTER__
+#define __TEMPORAL_FILTER__
+#include "EncLib.h"
+#include "CommonLib/Buffer.h"
+#include <sstream>
+#include <map>
+#include <deque>
+
+#if JVET_O0549_ENCODER_ONLY_FILTER
+
+//! \ingroup EncoderLib
+//! \{
+
+struct MotionVector
+{
+ int x, y;
+ int error;
+ MotionVector() : x(0), y(0), error(INT_LEAST32_MAX) {}
+ void set(int vectorX, int vectorY, int errorValue) { x = vectorX; y = vectorY; error = errorValue; }
+};
+
+template <class T>
+struct Array2D
+{
+private:
+ int m_width, m_height;
+ std::vector< T > v;
+public:
+ Array2D() : m_width(0), m_height(0), v() { }
+ Array2D(int width, int height, const T& value=T()) : m_width(0), m_height(0), v() { allocate(width, height, value); }
+
+ void allocate(int width, int height, const T& value=T())
+ {
+ m_width=width;
+ m_height=height;
+ v.resize(std::size_t(m_width*m_height), value);
+ }
+
+ T& get(int x, int y)
+ {
+ assert(x<m_width && y<m_height);
+ return v[y*m_width+x];
+ }
+
+ const T& get(int x, int y) const
+ {
+ assert(x<m_width && y<m_height);
+ return v[y*m_width+x];
+ }
+};
+
+struct TemporalFilterSourcePicInfo
+{
+ TemporalFilterSourcePicInfo() : picBuffer(), mvs(), origOffset(0) { }
+ PelStorage picBuffer;
+ Array2D<MotionVector> mvs;
+ int origOffset;
+};
+
+// ====================================================================================================================
+// Class definition
+// ====================================================================================================================
+
+class EncTemporalFilter
+{
+public:
+ EncTemporalFilter();
+ ~EncTemporalFilter() {}
+
+ void init(const int frameSkip,
+ const int inputBitDepth[MAX_NUM_CHANNEL_TYPE],
+ const int msbExtendedBitDepth[MAX_NUM_CHANNEL_TYPE],
+ const int internalBitDepth[MAX_NUM_CHANNEL_TYPE],
+ const int width,
+ const int height,
+ const int *pad,
+ const bool rec709,
+ const std::string &filename,
+ const ChromaFormat inputChroma,
+ const InputColourSpaceConversion colorSpaceConv,
+ const int qp,
+ const std::map<int, double> &temporalFilterStrengths,
+ const bool gopBasedTemporalFilterFutureReference);
+
+ bool filter(PelStorage *orgPic, int frame);
+
+private:
+ // Private static member variables
+ static const int m_range;
+ static const double m_chromaFactor;
+ static const double m_sigmaMultiplier;
+ static const double m_sigmaZeroPoint;
+ static const int m_motionVectorFactor;
+ static const int m_padding;
+ static const int m_interpolationFilter[16][8];
+ static const double m_refStrengths[3][2];
+
+ // Private member variables
+ int m_FrameSkip;
+ std::string m_inputFileName;
+ int m_inputBitDepth[MAX_NUM_CHANNEL_TYPE];
+ int m_MSBExtendedBitDepth[MAX_NUM_CHANNEL_TYPE];
+ int m_internalBitDepth[MAX_NUM_CHANNEL_TYPE];
+ ChromaFormat m_chromaFormatIDC;
+ int m_sourceWidth;
+ int m_sourceHeight;
+ int m_QP;
+ std::map<int, double> m_temporalFilterStrengths;
+ int m_pad[2];
+ bool m_clipInputVideoToRec709Range;
+ InputColourSpaceConversion m_inputColourSpaceConvert;
+ Area m_area;
+ bool m_gopBasedTemporalFilterFutureReference;
+
+ // Private functions
+ void subsampleLuma(const PelStorage &input, PelStorage &output, const int factor = 2) const;
+ int motionErrorLuma(const PelStorage &orig, const PelStorage &buffer, const int x, const int y, int dx, int dy, const int bs, const int besterror) const;
+ void motionEstimationLuma(Array2D<MotionVector> &mvs, const PelStorage &orig, const PelStorage &buffer, const int bs,
+ const Array2D<MotionVector> *previous=0, const int factor = 1, const bool doubleRes = false) const;
+ void motionEstimation(Array2D<MotionVector> &mvs, const PelStorage &orgPic, const PelStorage &buffer, const PelStorage &origSubsampled2, const PelStorage &origSubsampled4) const;
+
+ void bilateralFilter(const PelStorage &orgPic, const std::deque<TemporalFilterSourcePicInfo> &srcFrameInfo, PelStorage &newOrgPic, double overallStrength) const;
+ void applyMotion(const Array2D<MotionVector> &mvs, const PelStorage &input, PelStorage &output) const;
+}; // END CLASS DEFINITION EncTemporalFilter
+
+ //! \}
+
+#endif
+
+#endif // __TEMPORAL_FILTER__
diff --git a/source/Lib/Utilities/program_options_lite.cpp b/source/Lib/Utilities/program_options_lite.cpp
index 0c4bba0502cc08c2caa01b4cd61f66554dfe30ab..4a380e04cc1b64761d11aed3852252fc47addca4 100644
--- a/source/Lib/Utilities/program_options_lite.cpp
+++ b/source/Lib/Utilities/program_options_lite.cpp
@@ -96,8 +96,22 @@ namespace df
}
else
{
+#if JVET_O0549_ENCODER_ONLY_FILTER_POL
+ if (opt_name.size() > 0 && opt_name.back() == '*')
+ {
+ string prefix_name = opt_name.substr(0, opt_name.size() - 1);
+ names->opt_prefix.push_back(prefix_name);
+ opt_prefix_map[prefix_name].push_back(names);
+ }
+ else
+ {
+ names->opt_long.push_back(opt_name);
+ opt_long_map[opt_name].push_back(names);
+ }
+#else
names->opt_long.push_back(opt_name);
opt_long_map[opt_name].push_back(names);
+#endif
}
opt_start += opt_end + 1;
}
@@ -150,6 +164,12 @@ namespace df
{
out << "--" << entry.opt_long.front();
}
+#if JVET_O0549_ENCODER_ONLY_FILTER_POL
+ else if (!entry.opt_prefix.empty())
+ {
+ out << "--" << entry.opt_prefix.front() << "*";
+ }
+#endif
}
/* format the help text */
@@ -271,6 +291,9 @@ namespace df
bool OptionWriter::storePair(bool allow_long, bool allow_short, const string& name, const string& value)
{
bool found = false;
+#if JVET_O0549_ENCODER_ONLY_FILTER_POL
+ std::string val = value;
+#endif
Options::NamesMap::iterator opt_it;
if (allow_long)
{
@@ -290,15 +313,34 @@ namespace df
found = true;
}
}
-
+#if JVET_O0549_ENCODER_ONLY_FILTER_POL
+ bool allow_prefix = allow_long;
+ if (allow_prefix && !found)
+ {
+ for (opt_it = opts.opt_prefix_map.begin(); opt_it != opts.opt_prefix_map.end(); opt_it++)
+ {
+ std::string name_prefix = name.substr(0, opt_it->first.size());
+ if (name_prefix == opt_it->first)
+ {
+ // prepend value matching *
+ val = name.substr(name_prefix.size()) + std::string(" ") + val;
+ found = true;
+ break;
+ }
+ }
+ }
+#endif
if (!found)
{
error_reporter.error(where())
<< "Unknown option `" << name << "' (value:`" << value << "')\n";
return false;
}
-
+#if JVET_O0549_ENCODER_ONLY_FILTER_POL
+ setOptions((*opt_it).second, val, error_reporter);
+#else
setOptions((*opt_it).second, value, error_reporter);
+#endif
return true;
}
diff --git a/source/Lib/Utilities/program_options_lite.h b/source/Lib/Utilities/program_options_lite.h
index 2ce2bd26ed80c6066ec93401034513b2b4b71b4a..dfd082cb73f9ca67f58d04a6ce1a2fd97b51910c 100644
--- a/source/Lib/Utilities/program_options_lite.h
+++ b/source/Lib/Utilities/program_options_lite.h
@@ -36,6 +36,8 @@
#include <list>
#include <map>
+#define JVET_O0549_ENCODER_ONLY_FILTER_POL 1 // JVET-O0549: Encoder-only GOP-based temporal filter. Program Options Lite related changes.
+
#ifndef __PROGRAM_OPTIONS_LITE__
#define __PROGRAM_OPTIONS_LITE__
@@ -196,6 +198,9 @@ namespace df
}
std::list<std::string> opt_long;
std::list<std::string> opt_short;
+#if JVET_O0549_ENCODER_ONLY_FILTER_POL
+ std::list<std::string> opt_prefix;
+#endif
OptionBase* opt;
};
@@ -207,6 +212,9 @@ namespace df
typedef std::map<std::string, NamesPtrList> NamesMap;
NamesMap opt_long_map;
NamesMap opt_short_map;
+#if JVET_O0549_ENCODER_ONLY_FILTER_POL
+ NamesMap opt_prefix_map;
+#endif
};
/* Class with templated overloaded operator(), for use by Options::addOptions() */