[x265-commits] [x265] TEncCU: remove useless field
Deepthi Nandakumar
deepthi at multicorewareinc.com
Wed Jul 16 02:07:34 CEST 2014
details: http://hg.videolan.org/x265/rev/863d969e3ab9
branches:
changeset: 7356:863d969e3ab9
user: Deepthi Nandakumar <deepthi at multicorewareinc.com>
date: Tue Jul 15 12:41:53 2014 +0530
description:
TEncCU: remove useless field
There's a global variable for this.
Subject: [x265] compress: fix for sa8dcost storage in rdlevel 1, 0
details: http://hg.videolan.org/x265/rev/c923f4a94946
branches:
changeset: 7357:c923f4a94946
user: Sumalatha Polureddy<sumalatha at multicorewareinc.com>
date: Mon Jul 14 17:27:04 2014 +0530
description:
compress: fix for sa8dcost storage in rdlevel 1, 0
Subject: [x265] entropy: nits
details: http://hg.videolan.org/x265/rev/7fac1eb8252f
branches:
changeset: 7358:7fac1eb8252f
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 13:13:45 2014 -0500
description:
entropy: nits
Subject: [x265] Remove MAX_TLAYER and stop pretending we can code multiple temporal layers
details: http://hg.videolan.org/x265/rev/e07686925819
branches:
changeset: 7359:e07686925819
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 14:06:00 2014 -0500
description:
Remove MAX_TLAYER and stop pretending we can code multiple temporal layers
This simplifies a great many things; enabling further simplications to come.
This commit leaves a sprinkling of TODOs for further cleanups
Subject: [x265] encoder: remove redundant member variables
details: http://hg.videolan.org/x265/rev/12de88f4e110
branches:
changeset: 7360:12de88f4e110
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 14:11:32 2014 -0500
description:
encoder: remove redundant member variables
Subject: [x265] slice: simplify max AMP level determination
details: http://hg.videolan.org/x265/rev/20ca3447ed96
branches:
changeset: 7361:20ca3447ed96
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 14:44:42 2014 -0500
description:
slice: simplify max AMP level determination
Subject: [x265] slice: remove unused m_interRPSPrediction from TComReferencePictureSet
details: http://hg.videolan.org/x265/rev/6ac88ce5d670
branches:
changeset: 7362:6ac88ce5d670
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 14:49:28 2014 -0500
description:
slice: remove unused m_interRPSPrediction from TComReferencePictureSet
Subject: [x265] defs: remove some dead definitions, cleanup a comment
details: http://hg.videolan.org/x265/rev/ddb6dc16a64a
branches:
changeset: 7363:ddb6dc16a64a
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 14:51:47 2014 -0500
description:
defs: remove some dead definitions, cleanup a comment
Subject: [x265] remove unused multiple HRD parameter sets from VPS class
details: http://hg.videolan.org/x265/rev/27307f7547c0
branches:
changeset: 7364:27307f7547c0
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 15:17:15 2014 -0500
description:
remove unused multiple HRD parameter sets from VPS class
Subject: [x265] frameencoder: nits
details: http://hg.videolan.org/x265/rev/e68eedbd6795
branches:
changeset: 7365:e68eedbd6795
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 15:17:28 2014 -0500
description:
frameencoder: nits
Subject: [x265] entropy: remove broken X265_CHECK
details: http://hg.videolan.org/x265/rev/1dd0b14a8e9c
branches:
changeset: 7366:1dd0b14a8e9c
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 15:25:24 2014 -0500
description:
entropy: remove broken X265_CHECK
Subject: [x265] vps: remove m_VPSId, signal hard-coded 0
details: http://hg.videolan.org/x265/rev/f7c168558bf0
branches:
changeset: 7367:f7c168558bf0
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 15:25:52 2014 -0500
description:
vps: remove m_VPSId, signal hard-coded 0
Subject: [x265] sps: hard-code an SPS ID of 0, we only ever use one SPS
details: http://hg.videolan.org/x265/rev/fe9aee4225a1
branches:
changeset: 7368:fe9aee4225a1
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 15:28:20 2014 -0500
description:
sps: hard-code an SPS ID of 0, we only ever use one SPS
Subject: [x265] vps: remove unused m_maxNuhReservedZeroLayerId, m_numOpSets
details: http://hg.videolan.org/x265/rev/00fafd0b078c
branches:
changeset: 7369:00fafd0b078c
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 15:32:16 2014 -0500
description:
vps: remove unused m_maxNuhReservedZeroLayerId, m_numOpSets
The values were all hard-coded
Subject: [x265] vps: remove now unused m_layerIdIncludedFlag
details: http://hg.videolan.org/x265/rev/bf28c2e0a8ce
branches:
changeset: 7370:bf28c2e0a8ce
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 15:33:43 2014 -0500
description:
vps: remove now unused m_layerIdIncludedFlag
Subject: [x265] vps: remove remaining set/get methods
details: http://hg.videolan.org/x265/rev/d7b673cdbc78
branches:
changeset: 7371:d7b673cdbc78
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 15:41:21 2014 -0500
description:
vps: remove remaining set/get methods
Subject: [x265] vps: remove m_maxLatencyIncrease, it was always 0
details: http://hg.videolan.org/x265/rev/969a6a5de916
branches:
changeset: 7372:969a6a5de916
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 15:43:40 2014 -0500
description:
vps: remove m_maxLatencyIncrease, it was always 0
Subject: [x265] entropy: nits
details: http://hg.videolan.org/x265/rev/dfd2bd5c7cfa
branches:
changeset: 7373:dfd2bd5c7cfa
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 15:48:24 2014 -0500
description:
entropy: nits
Subject: [x265] entropy: de-hungarian codePredWeightTable(), fix comments (remove redundants)
details: http://hg.videolan.org/x265/rev/84478006fe0f
branches:
changeset: 7374:84478006fe0f
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 15:53:00 2014 -0500
description:
entropy: de-hungarian codePredWeightTable(), fix comments (remove redundants)
Subject: [x265] ptl: remove hard-coded m_profileSpace
details: http://hg.videolan.org/x265/rev/bc9bbe6bfdb1
branches:
changeset: 7375:bc9bbe6bfdb1
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 15:56:16 2014 -0500
description:
ptl: remove hard-coded m_profileSpace
Subject: [x265] change ProfileTierLevel to a struct, no m_ prefixes
details: http://hg.videolan.org/x265/rev/758cb5de97b6
branches:
changeset: 7376:758cb5de97b6
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 16:03:12 2014 -0500
description:
change ProfileTierLevel to a struct, no m_ prefixes
Subject: [x265] slice: nits
details: http://hg.videolan.org/x265/rev/b0bc72c359d1
branches:
changeset: 7377:b0bc72c359d1
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 16:48:09 2014 -0500
description:
slice: nits
Subject: [x265] slice: simplify TimingInfo to a struct
details: http://hg.videolan.org/x265/rev/9b807ca6313a
branches:
changeset: 7378:9b807ca6313a
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 17:00:59 2014 -0500
description:
slice: simplify TimingInfo to a struct
Subject: [x265] hrd: we always signal NAL HRD but not VCL and not sub-pic
details: http://hg.videolan.org/x265/rev/27c28450e098
branches:
changeset: 7379:27c28450e098
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 17:17:26 2014 -0500
description:
hrd: we always signal NAL HRD but not VCL and not sub-pic
Remove redundant fields and methods
Subject: [x265] hrd: inline HrdLayerInfo, remove second array dimension (was for nal/vcl)
details: http://hg.videolan.org/x265/rev/b9c3a067f89e
branches:
changeset: 7380:b9c3a067f89e
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 17:24:40 2014 -0500
description:
hrd: inline HrdLayerInfo, remove second array dimension (was for nal/vcl)
Subject: [x265] hrd: CPB count is always 1
details: http://hg.videolan.org/x265/rev/00b91817e3e4
branches:
changeset: 7381:00b91817e3e4
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 17:33:42 2014 -0500
description:
hrd: CPB count is always 1
Subject: [x265] hrd: remove four unused fields
details: http://hg.videolan.org/x265/rev/e2003ed17684
branches:
changeset: 7382:e2003ed17684
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 17:35:15 2014 -0500
description:
hrd: remove four unused fields
Subject: [x265] hrd: remove set/get methods of TComHRD, remove unused members
details: http://hg.videolan.org/x265/rev/d9921a247139
branches:
changeset: 7383:d9921a247139
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 17:57:37 2014 -0500
description:
hrd: remove set/get methods of TComHRD, remove unused members
Subject: [x265] hrd: remove *Minus1 from member names and semantics, remove m_ prefixes
details: http://hg.videolan.org/x265/rev/3bc86d0fbdc7
branches:
changeset: 7384:3bc86d0fbdc7
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 18:07:55 2014 -0500
description:
hrd: remove *Minus1 from member names and semantics, remove m_ prefixes
Note that hrd->cpbSizeValue stored a "minus 1" value but was not named as such
This commit also fixed a math bug (late up-conversion) in cpbSize calculation
in ratecontrol.cpp
Subject: [x265] defs: remove more dead definitions
details: http://hg.videolan.org/x265/rev/105778f37879
branches:
changeset: 7385:105778f37879
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 18:51:43 2014 -0500
description:
defs: remove more dead definitions
Subject: [x265] slice: remove more hard-coded fields
details: http://hg.videolan.org/x265/rev/3b0e141c3a2f
branches:
changeset: 7386:3b0e141c3a2f
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 18:57:04 2014 -0500
description:
slice: remove more hard-coded fields
Subject: [x265] slice: remove unused m_useDF
details: http://hg.videolan.org/x265/rev/6e0def026364
branches:
changeset: 7387:6e0def026364
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 19:01:54 2014 -0500
description:
slice: remove unused m_useDF
Subject: [x265] slice: fix warning
details: http://hg.videolan.org/x265/rev/32aeb47c2d36
branches:
changeset: 7388:32aeb47c2d36
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 19:04:42 2014 -0500
description:
slice: fix warning
Subject: [x265] entropy: remove obsolete check macro
details: http://hg.videolan.org/x265/rev/3499aa4fa20c
branches:
changeset: 7389:3499aa4fa20c
user: Steve Borho <steve at borho.org>
date: Tue Jul 15 19:07:20 2014 -0500
description:
entropy: remove obsolete check macro
diffstat:
source/Lib/TLibCommon/CommonDef.h | 42 +--
source/Lib/TLibCommon/TComMotionInfo.h | 6 +-
source/Lib/TLibCommon/TComSlice.cpp | 58 +---
source/Lib/TLibCommon/TComSlice.h | 446 +++++---------------------------
source/Lib/TLibEncoder/TEncCu.cpp | 4 +-
source/Lib/TLibEncoder/TEncCu.h | 2 -
source/encoder/compress.cpp | 2 +-
source/encoder/dpb.cpp | 3 +-
source/encoder/encoder.cpp | 81 +----
source/encoder/encoder.h | 4 -
source/encoder/entropy.cpp | 339 ++++++++----------------
source/encoder/entropy.h | 4 +-
source/encoder/frameencoder.cpp | 23 +-
source/encoder/ratecontrol.cpp | 64 +--
source/encoder/sei.h | 59 +---
15 files changed, 271 insertions(+), 866 deletions(-)
diffs (truncated from 1948 to 300 lines):
diff -r 5c5183eeacb5 -r 3499aa4fa20c source/Lib/TLibCommon/CommonDef.h
--- a/source/Lib/TLibCommon/CommonDef.h Tue Jul 15 01:48:38 2014 -0500
+++ b/source/Lib/TLibCommon/CommonDef.h Tue Jul 15 19:07:20 2014 -0500
@@ -51,21 +51,8 @@
// Common constants
// ====================================================================================================================
-#define MAX_NUM_PICS_IN_SOP 1024
-
-#define MAX_NESTING_NUM_OPS 1024
-#define MAX_NESTING_NUM_LAYER 64
-
-#define MAX_VPS_NUM_HRD_PARAMETERS 1
-#define MAX_VPS_OP_SETS_PLUS1 1024
-#define MAX_VPS_NUH_RESERVED_ZERO_LAYER_ID_PLUS1 1
-
-#define MAX_CPB_CNT 32 ///< Upper bound of (cpb_cnt_minus1 + 1)
-#define MAX_NUM_LAYER_IDS 64
-
#define COEF_REMAIN_BIN_REDUCTION 3 ///< indicates the level at which the VLC
-
-///< transitions from Golomb-Rice to TU+EG(k)
+ ///< transitions from Golomb-Rice to TU+EG(k)
#define CU_DQP_TU_CMAX 5 ///< max number bins for truncated unary
#define CU_DQP_EG_k 0 ///< exp-golomb order
@@ -78,19 +65,10 @@
#define SAO_ENCODING_RATE 0.75
#define SAO_ENCODING_RATE_CHROMA 0.5
-#define MAX_NUM_VPS 16
-#define MAX_NUM_SPS 16
-#define MAX_NUM_PPS 64
-
-#define MIN_SCAN_POS_CROSS 4
-
#define MLS_GRP_NUM 64 ///< G644 : Max number of coefficient groups, max(16, 64)
#define MLS_CG_SIZE 4 ///< G644 : Coefficient group size of 4x4
#define MLS_CG_LOG2_SIZE 2
-#define ARL_C_PRECISION 7 ///< G382: 7-bit arithmetic precision
-#define LEVEL_RANGE 30 ///< G382: max coefficient level in statistics collection
-
#define AMVP_DECIMATION_FACTOR 4
#define SCAN_SET_SIZE 16
@@ -113,15 +91,6 @@
# define DISTORTION_PRECISION_ADJUSTMENT(x) (x)
#endif
-#define LOG2_MAX_NUM_COLUMNS_MINUS1 7
-#define LOG2_MAX_NUM_ROWS_MINUS1 7
-#define LOG2_MAX_COLUMN_WIDTH 13
-#define LOG2_MAX_ROW_HEIGHT 13
-
-#define CABAC_INIT_PRESENT_FLAG 1
-
-#define MAX_GOP 64 ///< max. value of hierarchical GOP size
-
#define MAX_NUM_REF_PICS 16 ///< max. number of pictures used for reference
#define MAX_NUM_REF 16 ///< max. number of entries in picture reference list
@@ -145,16 +114,9 @@
// AMVP: advanced motion vector prediction
#define AMVP_MAX_NUM_CANDS 2 ///< max number of final candidates
-#define AMVP_MAX_NUM_CANDS_MEM 3 ///< max number of candidates
#define MRG_MAX_NUM_CANDS 5
-// Explicit temporal layer QP offset
-#define MAX_TLAYER 8 ///< max number of temporal layer
-
-// Adaptive search range depending on POC difference
-#define ADAPT_SR_SCALE 1 ///< division factor for adaptive search range
-
-#define MAX_CHROMA_FORMAT_IDC 3
+#define MAX_CHROMA_FORMAT_IDC 3 // TODO: Remove me
//! \}
diff -r 5c5183eeacb5 -r 3499aa4fa20c source/Lib/TLibCommon/TComMotionInfo.h
--- a/source/Lib/TLibCommon/TComMotionInfo.h Tue Jul 15 01:48:38 2014 -0500
+++ b/source/Lib/TLibCommon/TComMotionInfo.h Tue Jul 15 19:07:20 2014 -0500
@@ -55,14 +55,14 @@ namespace x265 {
/// parameters for AMVP
struct AMVPInfo
{
- MV m_mvCand[AMVP_MAX_NUM_CANDS_MEM]; ///< array of motion vector predictor candidates
+ MV m_mvCand[AMVP_MAX_NUM_CANDS +1]; ///< array of motion vector predictor candidates
int m_num; ///< number of motion vector predictor candidates
};
typedef struct
{
- MV* m_mvMemBlock ;
- MV* m_mvdMemBlock ;
+ MV* m_mvMemBlock;
+ MV* m_mvdMemBlock;
char* m_refIdxMemBlock;
} MVFieldMemPool;
diff -r 5c5183eeacb5 -r 3499aa4fa20c source/Lib/TLibCommon/TComSlice.cpp
--- a/source/Lib/TLibCommon/TComSlice.cpp Tue Jul 15 01:48:38 2014 -0500
+++ b/source/Lib/TLibCommon/TComSlice.cpp Tue Jul 15 19:07:20 2014 -0500
@@ -420,43 +420,11 @@ void TComSlice::initWpScaling()
}
// ------------------------------------------------------------------------------------------------
-// Video parameter set (VPS)
-// ------------------------------------------------------------------------------------------------
-TComVPS::TComVPS()
- : m_VPSId(0)
- , m_maxTLayers(1)
- , m_maxLayers(1)
- , m_bTemporalIdNestingFlag(false)
- , m_numHrdParameters(0)
- , m_maxNuhReservedZeroLayerId(0)
- , m_hrdParameters(NULL)
- , m_hrdOpSetIdx(NULL)
- , m_cprmsPresentFlag(NULL)
-{
- for (int i = 0; i < MAX_TLAYER; i++)
- {
- m_numReorderPics[i] = 0;
- m_maxDecPicBuffering[i] = 1;
- m_maxLatencyIncrease[i] = 0;
- }
-}
-
-TComVPS::~TComVPS()
-{
- delete[] m_hrdParameters;
- delete[] m_hrdOpSetIdx;
- delete[] m_cprmsPresentFlag;
-}
-
-// ------------------------------------------------------------------------------------------------
// Sequence parameter set (SPS)
// ------------------------------------------------------------------------------------------------
TComSPS::TComSPS()
- : m_SPSId(0)
- , m_VPSId(0)
- , m_chromaFormatIdc(X265_CSP_I420)
- , m_maxTLayers(1)
+ : m_chromaFormatIdc(X265_CSP_I420)
// Structure
, m_picWidthInLumaSamples(352)
, m_picHeightInLumaSamples(288)
@@ -477,18 +445,14 @@ TComSPS::TComSPS()
, m_bitsForPOC(8)
, m_numLongTermRefPicSPS(0)
, m_bUseSAO(false)
- , m_bTemporalIdNestingFlag(false)
, m_scalingListEnabledFlag(false)
, m_useStrongIntraSmoothing(false)
, m_vuiParametersPresentFlag(false)
, m_vuiParameters()
{
- for (int i = 0; i < MAX_TLAYER; i++)
- {
- m_maxLatencyIncrease[i] = 0;
- m_maxDecPicBuffering[i] = 1;
- m_numReorderPics[i] = 0;
- }
+ m_maxLatencyIncrease = 0;
+ m_maxDecPicBuffering = 1;
+ m_numReorderPics = 0;
m_scalingList = new TComScalingList;
::memset(m_ltRefPicPocLsbSps, 0, sizeof(m_ltRefPicPocLsbSps));
@@ -501,9 +465,7 @@ TComSPS::~TComSPS()
}
TComPPS::TComPPS()
- : m_PPSId(0)
- , m_SPSId(0)
- , m_picInitQPMinus26(0)
+ : m_picInitQPMinus26(0)
, m_useDQP(false)
, m_bConstrainedIntraPred(false)
, m_bSliceChromaQpFlag(false)
@@ -539,7 +501,6 @@ TComReferencePictureSet::TComReferencePi
, m_numberOfPictures(0)
, m_numberOfNegativePictures(0)
, m_numberOfPositivePictures(0)
- , m_interRPSPrediction(0)
, m_numberOfLongtermPictures(0)
{
::memset(m_deltaPOC, 0, sizeof(m_deltaPOC));
@@ -654,15 +615,6 @@ void TComReferencePictureSet::printDelta
{
printf("%d%s ", getDeltaPOC(j), (getUsed(j) == 1) ? "*" : "");
}
-
- if (getInterRPSPrediction())
- {
- printf("}, RefIdc = { ");
- for (int j = 0; j < getNumRefIdc(); j++)
- {
- printf("%d ", getRefIdc(j));
- }
- }
printf("}\n");
}
diff -r 5c5183eeacb5 -r 3499aa4fa20c source/Lib/TLibCommon/TComSlice.h
--- a/source/Lib/TLibCommon/TComSlice.h Tue Jul 15 01:48:38 2014 -0500
+++ b/source/Lib/TLibCommon/TComSlice.h Tue Jul 15 19:07:20 2014 -0500
@@ -40,10 +40,6 @@
#include "common.h"
#include "TComRom.h"
-#include "x265.h" // NAL type enums
-
-//! \ingroup TLibCommon
-//! \{
namespace x265 {
// private namespace
@@ -51,15 +47,6 @@ namespace x265 {
class Frame;
class PicList;
-// ====================================================================================================================
-// Constants
-// ====================================================================================================================
-
-// ====================================================================================================================
-// Class definition
-// ====================================================================================================================
-
-/// Reference Picture Set class
class TComReferencePictureSet
{
public:
@@ -83,7 +70,6 @@ public:
bool m_used[MAX_NUM_REF_PICS];
int m_POC[MAX_NUM_REF_PICS];
- bool m_interRPSPrediction;
int m_numberOfLongtermPictures; // Zero when disabled
TComReferencePictureSet();
@@ -116,8 +102,6 @@ public:
int getNumberOfLongtermPictures() const { return m_numberOfLongtermPictures; }
- bool getInterRPSPrediction() const { return m_interRPSPrediction; }
-
int getDeltaRIdxMinus1() const { return m_deltaRIdxMinus1; }
int getDeltaRPS() const { return m_deltaRPS; }
@@ -130,7 +114,6 @@ public:
void printDeltaPOC();
};
-/// SCALING_LIST class
class TComScalingList
{
public:
@@ -138,26 +121,26 @@ public:
TComScalingList();
~TComScalingList();
- void setScalingListPresentFlag(bool b) { m_scalingListPresentFlag = b; }
+ void setScalingListPresentFlag(bool b) { m_scalingListPresentFlag = b; }
- bool getScalingListPresentFlag() { return m_scalingListPresentFlag; }
+ bool getScalingListPresentFlag() { return m_scalingListPresentFlag; }
- bool getUseTransformSkip() { return m_useTransformSkip; }
+ bool getUseTransformSkip() { return m_useTransformSkip; }
- void setUseTransformSkip(bool b) { m_useTransformSkip = b; }
+ void setUseTransformSkip(bool b) { m_useTransformSkip = b; }
- int32_t* getScalingListAddress(uint32_t sizeId, uint32_t listId) { return m_scalingListCoef[sizeId][listId]; }
+ int32_t* getScalingListAddress(uint32_t sizeId, uint32_t listId) { return m_scalingListCoef[sizeId][listId]; }
bool checkPredMode(uint32_t sizeId, int listId);
- void setRefMatrixId(uint32_t sizeId, uint32_t listId, uint32_t u) { m_refMatrixId[sizeId][listId] = u; }
+ void setRefMatrixId(uint32_t sizeId, uint32_t listId, uint32_t u) { m_refMatrixId[sizeId][listId] = u; }
- uint32_t getRefMatrixId(uint32_t sizeId, uint32_t listId) { return m_refMatrixId[sizeId][listId]; }
+ uint32_t getRefMatrixId(uint32_t sizeId, uint32_t listId) { return m_refMatrixId[sizeId][listId]; }
int32_t* getScalingListDefaultAddress(uint32_t sizeId, uint32_t listId);
void processDefaultMarix(uint32_t sizeId, uint32_t listId);
void setScalingListDC(uint32_t sizeId, uint32_t listId, uint32_t u) { m_scalingListDC[sizeId][listId] = u; }
- int getScalingListDC(uint32_t sizeId, uint32_t listId) { return m_scalingListDC[sizeId][listId]; }
+ int getScalingListDC(uint32_t sizeId, uint32_t listId) { return m_scalingListDC[sizeId][listId]; }
void checkDcOfMatrix();
void processRefMatrix(uint32_t sizeId, uint32_t listId, uint32_t refListId);
@@ -168,227 +151,71 @@ private:
void init();
void destroy();
int m_scalingListDC[SCALING_LIST_SIZE_NUM][SCALING_LIST_NUM]; //!< the DC value of the matrix coefficient for 16x16
More information about the x265-commits
mailing list