[x265-commits] [x265] param: spelling nit
Steve Borho
steve at borho.org
Fri Mar 7 04:39:15 CET 2014
details: http://hg.videolan.org/x265/rev/102ad4518b1c
branches:
changeset: 6409:102ad4518b1c
user: Steve Borho <steve at borho.org>
date: Thu Mar 06 12:29:32 2014 -0600
description:
param: spelling nit
Subject: [x265] common: consolidate system header includes into common.h
details: http://hg.videolan.org/x265/rev/ef83ccb3d34d
branches:
changeset: 6410:ef83ccb3d34d
user: Steve Borho <steve at borho.org>
date: Thu Mar 06 14:00:58 2014 -0600
description:
common: consolidate system header includes into common.h
Hopefully this will prevent random compile failures in the future from missed
cmath, climits, or memory.h includes.
Subject: [x265] cleanup the labels in assembly code with trailing colon
details: http://hg.videolan.org/x265/rev/c97fc1244d0b
branches:
changeset: 6411:c97fc1244d0b
user: Yuvaraj Venkatesh <yuvaraj at multicorewareinc.com>
date: Thu Mar 06 16:12:38 2014 +0530
description:
cleanup the labels in assembly code with trailing colon
Subject: [x265] C primitive for blockcopy_ss
details: http://hg.videolan.org/x265/rev/c078ccf260b2
branches:
changeset: 6412:c078ccf260b2
user: Murugan Vairavel <murugan at multicorewareinc.com>
date: Thu Mar 06 16:33:09 2014 +0530
description:
C primitive for blockcopy_ss
Subject: [x265] Testbench code for blockcopy_ss
details: http://hg.videolan.org/x265/rev/d46917d3ac2d
branches:
changeset: 6413:d46917d3ac2d
user: Murugan Vairavel <murugan at multicorewareinc.com>
date: Thu Mar 06 16:38:34 2014 +0530
description:
Testbench code for blockcopy_ss
Subject: [x265] param: print vbv-init as a float
details: http://hg.videolan.org/x265/rev/7209562f4cc8
branches:
changeset: 6414:7209562f4cc8
user: Steve Borho <steve at borho.org>
date: Thu Mar 06 15:29:23 2014 -0600
description:
param: print vbv-init as a float
Subject: [x265] CU is square
details: http://hg.videolan.org/x265/rev/5c502cce2a1f
branches:
changeset: 6415:5c502cce2a1f
user: Satoshi Nakagawa <nakagawa424 at oki.com>
date: Thu Mar 06 11:01:59 2014 +0900
description:
CU is square
unify TComDataCU::m_width and m_height to m_cuSize
Subject: [x265] share m_mvpIdx[0] as m_mergeIdx
details: http://hg.videolan.org/x265/rev/51f8673f8b35
branches:
changeset: 6416:51f8673f8b35
user: Satoshi Nakagawa <nakagawa424 at oki.com>
date: Thu Mar 06 17:29:06 2014 +0900
description:
share m_mvpIdx[0] as m_mergeIdx
Subject: [x265] TComSlice: nits
details: http://hg.videolan.org/x265/rev/d049b579ff18
branches:
changeset: 6417:d049b579ff18
user: Steve Borho <steve at borho.org>
date: Thu Mar 06 21:27:30 2014 -0600
description:
TComSlice: nits
Subject: [x265] TEncSBac: remove unused define
details: http://hg.videolan.org/x265/rev/33b67a53b6de
branches:
changeset: 6418:33b67a53b6de
user: Steve Borho <steve at borho.org>
date: Thu Mar 06 21:27:55 2014 -0600
description:
TEncSBac: remove unused define
diffstat:
source/Lib/TLibCommon/ContextTables.h | 2 +-
source/Lib/TLibCommon/SEI.h | 2 +-
source/Lib/TLibCommon/TComBitStream.cpp | 4 -
source/Lib/TLibCommon/TComBitStream.h | 4 -
source/Lib/TLibCommon/TComDataCU.cpp | 266 +++++++++----------
source/Lib/TLibCommon/TComDataCU.h | 26 +-
source/Lib/TLibCommon/TComLoopFilter.cpp | 16 +-
source/Lib/TLibCommon/TComMotionInfo.cpp | 4 +-
source/Lib/TLibCommon/TComMotionInfo.h | 2 +-
source/Lib/TLibCommon/TComPattern.cpp | 16 +-
source/Lib/TLibCommon/TComPattern.h | 1 -
source/Lib/TLibCommon/TComPic.cpp | 6 +-
source/Lib/TLibCommon/TComPic.h | 4 +-
source/Lib/TLibCommon/TComPicSym.cpp | 24 +-
source/Lib/TLibCommon/TComPicSym.h | 12 +-
source/Lib/TLibCommon/TComPicYuv.cpp | 20 +-
source/Lib/TLibCommon/TComPrediction.cpp | 2 +-
source/Lib/TLibCommon/TComRdCost.h | 2 +-
source/Lib/TLibCommon/TComRom.cpp | 7 +-
source/Lib/TLibCommon/TComRom.h | 5 +-
source/Lib/TLibCommon/TComSampleAdaptiveOffset.cpp | 15 +-
source/Lib/TLibCommon/TComSlice.cpp | 3 +-
source/Lib/TLibCommon/TComSlice.h | 18 +-
source/Lib/TLibCommon/TComTrQuant.cpp | 4 -
source/Lib/TLibCommon/TComYuv.cpp | 5 -
source/Lib/TLibCommon/TypeDef.h | 10 +-
source/Lib/TLibEncoder/NALwrite.cpp | 4 +-
source/Lib/TLibEncoder/TEncCu.cpp | 71 ++--
source/Lib/TLibEncoder/TEncEntropy.cpp | 8 +-
source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.cpp | 14 +-
source/Lib/TLibEncoder/TEncSbac.cpp | 23 +-
source/Lib/TLibEncoder/TEncSearch.cpp | 176 ++++++------
source/common/common.cpp | 6 -
source/common/common.h | 37 ++
source/common/cpu.cpp | 3 -
source/common/cpu.h | 2 +-
source/common/dct.cpp | 2 +-
source/common/intrapred.cpp | 2 -
source/common/ipfilter.cpp | 3 -
source/common/md5.cpp | 2 +-
source/common/md5.h | 2 +-
source/common/mv.h | 2 +-
source/common/param.cpp | 21 +-
source/common/pixel.cpp | 18 +
source/common/primitives.cpp | 6 -
source/common/primitives.h | 33 +--
source/common/shortyuv.cpp | 5 -
source/common/threading.h | 5 -
source/common/threadpool.cpp | 5 +-
source/common/threadpool.h | 2 +-
source/common/vec/blockcopy-sse3.cpp | 1 -
source/common/vec/dct-sse3.cpp | 3 -
source/common/vec/dct-sse41.cpp | 3 -
source/common/vec/dct-ssse3.cpp | 3 -
source/common/wavefront.cpp | 2 -
source/common/wavefront.h | 2 +-
source/common/x86/intrapred16.asm | 14 +-
source/common/x86/intrapred8.asm | 16 +-
source/common/x86/ipfilter16.asm | 36 +-
source/common/x86/ipfilter8.asm | 90 +++---
source/common/x86/mc-a.asm | 32 +-
source/common/x86/pixel-util8.asm | 52 +-
source/common/x86/pixeladd8.asm | 40 +-
source/common/x86/sad-a.asm | 54 ++--
source/common/x86/ssd-a.asm | 24 +-
source/encoder/bitcost.cpp | 3 -
source/encoder/bitcost.h | 3 +-
source/encoder/compress.cpp | 22 +-
source/encoder/cturow.cpp | 2 +-
source/encoder/encoder.cpp | 20 +-
source/encoder/frameencoder.cpp | 5 +-
source/encoder/framefilter.cpp | 16 +-
source/encoder/motion.cpp | 4 -
source/encoder/ratecontrol.cpp | 2 -
source/encoder/reference.cpp | 10 +-
source/input/input.cpp | 1 -
source/input/y4m.cpp | 3 +-
source/input/yuv.cpp | 4 +-
source/output/output.cpp | 1 -
source/output/y4m.cpp | 1 -
source/output/yuv.cpp | 1 -
source/output/yuv.h | 3 +-
source/test/intrapredharness.cpp | 5 +-
source/test/ipfilterharness.cpp | 5 +-
source/test/mbdstharness.cpp | 5 +-
source/test/pixelharness.cpp | 57 +++-
source/test/pixelharness.h | 1 +
source/test/testbench.cpp | 6 +-
source/test/testharness.h | 2 -
source/test/testpool.cpp | 5 +-
source/x265.cpp | 7 +-
91 files changed, 697 insertions(+), 801 deletions(-)
diffs (truncated from 5180 to 300 lines):
diff -r 889edfd2c4c3 -r 33b67a53b6de source/Lib/TLibCommon/ContextTables.h
--- a/source/Lib/TLibCommon/ContextTables.h Thu Mar 06 00:00:42 2014 -0600
+++ b/source/Lib/TLibCommon/ContextTables.h Thu Mar 06 21:27:55 2014 -0600
@@ -39,7 +39,7 @@
#ifndef X265_CONTEXTTABLES_H
#define X265_CONTEXTTABLES_H
-#include <stdint.h>
+#include "common.h"
//! \ingroup TLibCommon
//! \{
diff -r 889edfd2c4c3 -r 33b67a53b6de source/Lib/TLibCommon/SEI.h
--- a/source/Lib/TLibCommon/SEI.h Thu Mar 06 00:00:42 2014 -0600
+++ b/source/Lib/TLibCommon/SEI.h Thu Mar 06 21:27:55 2014 -0600
@@ -34,7 +34,7 @@
#ifndef X265_SEI_H
#define X265_SEI_H
-#include <cstring>
+#include "common.h"
namespace x265 {
// private namespace
diff -r 889edfd2c4c3 -r 33b67a53b6de source/Lib/TLibCommon/TComBitStream.cpp
--- a/source/Lib/TLibCommon/TComBitStream.cpp Thu Mar 06 00:00:42 2014 -0600
+++ b/source/Lib/TLibCommon/TComBitStream.cpp Thu Mar 06 21:27:55 2014 -0600
@@ -38,10 +38,6 @@
#include "TComBitStream.h"
#include "common.h"
-#include <stdint.h>
-#include <string.h>
-#include <memory.h>
-
using namespace x265;
//! \ingroup TLibCommon
diff -r 889edfd2c4c3 -r 33b67a53b6de source/Lib/TLibCommon/TComBitStream.h
--- a/source/Lib/TLibCommon/TComBitStream.h Thu Mar 06 00:00:42 2014 -0600
+++ b/source/Lib/TLibCommon/TComBitStream.h Thu Mar 06 21:27:55 2014 -0600
@@ -40,10 +40,6 @@
#include "CommonDef.h"
-#include <stdint.h>
-#include <stdio.h>
-#include <assert.h>
-
//! \ingroup TLibCommon
//! \{
diff -r 889edfd2c4c3 -r 33b67a53b6de source/Lib/TLibCommon/TComDataCU.cpp
--- a/source/Lib/TLibCommon/TComDataCU.cpp Thu Mar 06 00:00:42 2014 -0600
+++ b/source/Lib/TLibCommon/TComDataCU.cpp Thu Mar 06 21:27:55 2014 -0600
@@ -67,11 +67,9 @@ TComDataCU::TComDataCU()
m_partSizes = NULL;
m_predModes = NULL;
m_cuTransquantBypass = NULL;
- m_width = NULL;
- m_height = NULL;
+ m_cuSize = NULL;
m_qp = NULL;
m_bMergeFlags = NULL;
- m_mergeIndex = NULL;
m_lumaIntraDir = NULL;
m_chromaIntraDir = NULL;
m_interDir = NULL;
@@ -127,15 +125,13 @@ bool TComDataCU::create(uint32_t numPart
CHECKED_MALLOC(m_qp, char, numPartition);
CHECKED_MALLOC(m_depth, UChar, numPartition);
- CHECKED_MALLOC(m_width, UChar, numPartition);
- CHECKED_MALLOC(m_height, UChar, numPartition);
+ CHECKED_MALLOC(m_cuSize, uint8_t, numPartition);
CHECKED_MALLOC(m_skipFlag, bool, numPartition);
CHECKED_MALLOC(m_partSizes, char, numPartition);
CHECKED_MALLOC(m_predModes, char, numPartition);
CHECKED_MALLOC(m_cuTransquantBypass, bool, numPartition);
CHECKED_MALLOC(m_bMergeFlags, bool, numPartition);
- CHECKED_MALLOC(m_mergeIndex, UChar, numPartition);
CHECKED_MALLOC(m_lumaIntraDir, UChar, numPartition);
CHECKED_MALLOC(m_chromaIntraDir, UChar, numPartition);
CHECKED_MALLOC(m_interDir, UChar, numPartition);
@@ -149,8 +145,8 @@ bool TComDataCU::create(uint32_t numPart
CHECKED_MALLOC(m_cbf[1], UChar, numPartition);
CHECKED_MALLOC(m_cbf[2], UChar, numPartition);
- CHECKED_MALLOC(m_mvpIdx[0], char, numPartition);
- CHECKED_MALLOC(m_mvpIdx[1], char, numPartition);
+ CHECKED_MALLOC(m_mvpIdx[0], uint8_t, numPartition * 2);
+ m_mvpIdx[1] = m_mvpIdx[0] + numPartition;
CHECKED_MALLOC(m_trCoeffY, TCoeff, width * height);
CHECKED_MALLOC(m_trCoeffCb, TCoeff, (width >> m_hChromaShift) * (height >> m_vChromaShift));
@@ -174,14 +170,12 @@ void TComDataCU::destroy()
X265_FREE(m_pattern);
X265_FREE(m_qp);
X265_FREE(m_depth);
- X265_FREE(m_width);
- X265_FREE(m_height);
+ X265_FREE(m_cuSize);
X265_FREE(m_cbf[0]);
X265_FREE(m_cbf[1]);
X265_FREE(m_cbf[2]);
X265_FREE(m_interDir);
X265_FREE(m_bMergeFlags);
- X265_FREE(m_mergeIndex);
X265_FREE(m_lumaIntraDir);
X265_FREE(m_chromaIntraDir);
X265_FREE(m_trIdx);
@@ -196,7 +190,6 @@ void TComDataCU::destroy()
X265_FREE(m_iPCMSampleCb);
X265_FREE(m_iPCMSampleCr);
X265_FREE(m_mvpIdx[0]);
- X265_FREE(m_mvpIdx[1]);
X265_FREE(m_cuTransquantBypass);
X265_FREE(m_skipFlag);
X265_FREE(m_partSizes);
@@ -227,8 +220,8 @@ void TComDataCU::initCU(TComPic* pic, ui
m_pic = pic;
m_slice = pic->getSlice();
m_cuAddr = cuAddr;
- m_cuPelX = (cuAddr % pic->getFrameWidthInCU()) * g_maxCUWidth;
- m_cuPelY = (cuAddr / pic->getFrameWidthInCU()) * g_maxCUHeight;
+ m_cuPelX = (cuAddr % pic->getFrameWidthInCU()) * g_maxCUSize;
+ m_cuPelY = (cuAddr / pic->getFrameWidthInCU()) * g_maxCUSize;
m_absIdxInLCU = 0;
m_totalCost = MAX_INT64;
m_sa8dCost = MAX_INT64;
@@ -256,11 +249,9 @@ void TComDataCU::initCU(TComPic* pic, ui
memset(m_transformSkip[0], 0, numElements * sizeof(*m_transformSkip[0]));
memset(m_transformSkip[1], 0, numElements * sizeof(*m_transformSkip[1]));
memset(m_transformSkip[2], 0, numElements * sizeof(*m_transformSkip[2]));
- memset(m_width, g_maxCUWidth, numElements * sizeof(*m_width));
- memset(m_height, g_maxCUHeight, numElements * sizeof(*m_height));
+ memset(m_cuSize, g_maxCUSize, numElements * sizeof(*m_cuSize));
memset(m_qp, qp, numElements * sizeof(*m_qp));
memset(m_bMergeFlags, false, numElements * sizeof(*m_bMergeFlags));
- memset(m_mergeIndex, 0, numElements * sizeof(*m_mergeIndex));
memset(m_lumaIntraDir, DC_IDX, numElements * sizeof(*m_lumaIntraDir));
memset(m_chromaIntraDir, 0, numElements * sizeof(*m_chromaIntraDir));
memset(m_interDir, 0, numElements * sizeof(*m_interDir));
@@ -270,8 +261,8 @@ void TComDataCU::initCU(TComPic* pic, ui
memset(m_iPCMFlags, false, numElements * sizeof(*m_iPCMFlags));
}
- uint32_t y_tmp = g_maxCUWidth * g_maxCUHeight;
- uint32_t c_tmp = (g_maxCUWidth >> m_hChromaShift) * (g_maxCUHeight >> m_vChromaShift);
+ uint32_t y_tmp = g_maxCUSize * g_maxCUSize;
+ uint32_t c_tmp = (g_maxCUSize >> m_hChromaShift) * (g_maxCUSize >> m_vChromaShift);
{
m_cuMvField[0].clearMvField();
m_cuMvField[1].clearMvField();
@@ -340,14 +331,12 @@ void TComDataCU::initEstData(uint32_t de
m_totalDistortion = 0;
m_totalBits = 0;
- UChar width = g_maxCUWidth >> depth;
- UChar height = g_maxCUHeight >> depth;
+ UChar cuSize = g_maxCUSize >> depth;
for (uint32_t i = 0; i < m_numPartitions; i++)
{
m_depth[i] = depth;
- m_width[i] = width;
- m_height[i] = height;
+ m_cuSize[i] = cuSize;
m_trIdx[i] = 0;
m_transformSkip[0][i] = 0;
m_transformSkip[1][i] = 0;
@@ -383,8 +372,8 @@ void TComDataCU::initSubCU(TComDataCU* c
m_cuAddr = cu->getAddr();
m_absIdxInLCU = cu->getZorderIdxInCU() + partOffset;
- m_cuPelX = cu->getCUPelX() + (g_maxCUWidth >> depth) * (partUnitIdx & 1);
- m_cuPelY = cu->getCUPelY() + (g_maxCUHeight >> depth) * (partUnitIdx >> 1);
+ m_cuPelX = cu->getCUPelX() + (g_maxCUSize >> depth) * (partUnitIdx & 1);
+ m_cuPelY = cu->getCUPelY() + (g_maxCUSize >> depth) * (partUnitIdx >> 1);
m_totalCost = MAX_INT64;
m_sa8dCost = MAX_INT64;
@@ -417,10 +406,8 @@ void TComDataCU::initSubCU(TComDataCU* c
memset(m_cbf[2], 0, iSizeInUchar);
memset(m_depth, depth, iSizeInUchar);
- UChar width = g_maxCUWidth >> depth;
- UChar heigth = g_maxCUHeight >> depth;
- memset(m_width, width, iSizeInUchar);
- memset(m_height, heigth, iSizeInUchar);
+ UChar cuSize = g_maxCUSize >> depth;
+ memset(m_cuSize, cuSize, iSizeInUchar);
memset(m_iPCMFlags, 0, iSizeInBool);
for (uint32_t i = 0; i < m_numPartitions; i++)
{
@@ -453,8 +440,8 @@ void TComDataCU::copyToSubCU(TComDataCU*
m_cuAddr = cu->getAddr();
m_absIdxInLCU = cu->getZorderIdxInCU() + partOffset;
- m_cuPelX = cu->getCUPelX() + (g_maxCUWidth >> depth) * (partUnitIdx & 1);
- m_cuPelY = cu->getCUPelY() + (g_maxCUHeight >> depth) * (partUnitIdx >> 1);
+ m_cuPelX = cu->getCUPelX() + (g_maxCUSize >> depth) * (partUnitIdx & 1);
+ m_cuPelY = cu->getCUPelY() + (g_maxCUSize >> depth) * (partUnitIdx >> 1);
m_totalCost = MAX_INT64;
m_sa8dCost = MAX_INT64;
@@ -474,8 +461,7 @@ void TComDataCU::copyToSubCU(TComDataCU*
memcpy(m_lumaIntraDir, rpcCU->getLumaIntraDir() + m_absIdxInLCU, iSizeInUchar);
memcpy(m_depth, rpcCU->getDepth() + m_absIdxInLCU, iSizeInUchar);
- memcpy(m_width, rpcCU->getWidth() + m_absIdxInLCU, iSizeInUchar);
- memcpy(m_height, rpcCU->getHeight() + m_absIdxInLCU, iSizeInUchar);
+ memcpy(m_cuSize, rpcCU->getCUSize() + m_absIdxInLCU, iSizeInUchar);
}
// --------------------------------------------------------------------------------------------------------------------
@@ -506,7 +492,6 @@ void TComDataCU::copyPartFrom(TComDataCU
memcpy(m_predModes + offset, cu->getPredictionMode(), sizeof(*m_predModes) * numPartition);
memcpy(m_cuTransquantBypass + offset, cu->getCUTransquantBypass(), sizeof(*m_cuTransquantBypass) * numPartition);
memcpy(m_bMergeFlags + offset, cu->getMergeFlag(), iSizeInBool);
- memcpy(m_mergeIndex + offset, cu->getMergeIndex(), iSizeInUchar);
memcpy(m_lumaIntraDir + offset, cu->getLumaIntraDir(), iSizeInUchar);
memcpy(m_chromaIntraDir + offset, cu->getChromaIntraDir(), iSizeInUchar);
memcpy(m_interDir + offset, cu->getInterDir(), iSizeInUchar);
@@ -520,8 +505,7 @@ void TComDataCU::copyPartFrom(TComDataCU
memcpy(m_cbf[2] + offset, cu->getCbf(TEXT_CHROMA_V), iSizeInUchar);
memcpy(m_depth + offset, cu->getDepth(), iSizeInUchar);
- memcpy(m_width + offset, cu->getWidth(), iSizeInUchar);
- memcpy(m_height + offset, cu->getHeight(), iSizeInUchar);
+ memcpy(m_cuSize + offset, cu->getCUSize(), iSizeInUchar);
memcpy(m_mvpIdx[0] + offset, cu->getMVPIdx(REF_PIC_LIST_0), iSizeInUchar);
memcpy(m_mvpIdx[1] + offset, cu->getMVPIdx(REF_PIC_LIST_1), iSizeInUchar);
@@ -539,12 +523,12 @@ void TComDataCU::copyPartFrom(TComDataCU
m_cuMvField[0].copyFrom(cu->getCUMvField(REF_PIC_LIST_0), cu->getTotalNumPart(), offset);
m_cuMvField[1].copyFrom(cu->getCUMvField(REF_PIC_LIST_1), cu->getTotalNumPart(), offset);
- uint32_t tmp = g_maxCUWidth * g_maxCUHeight >> (depth << 1);
+ uint32_t tmp = g_maxCUSize * g_maxCUSize >> (depth << 1);
uint32_t tmp2 = partUnitIdx * tmp;
memcpy(m_trCoeffY + tmp2, cu->getCoeffY(), sizeof(TCoeff) * tmp);
memcpy(m_iPCMSampleY + tmp2, cu->getPCMSampleY(), sizeof(Pel) * tmp);
- tmp = (g_maxCUWidth >> m_hChromaShift) * (g_maxCUHeight >> m_vChromaShift) >> (depth << 1);
+ tmp = (g_maxCUSize >> m_hChromaShift) * (g_maxCUSize >> m_vChromaShift) >> (depth << 1);
tmp2 = partUnitIdx * tmp;
memcpy(m_trCoeffCb + tmp2, cu->getCoeffCb(), sizeof(TCoeff) * tmp);
memcpy(m_trCoeffCr + tmp2, cu->getCoeffCr(), sizeof(TCoeff) * tmp);
@@ -575,7 +559,6 @@ void TComDataCU::copyToPic(UChar uhDepth
memcpy(rpcCU->getPredictionMode() + m_absIdxInLCU, m_predModes, sizeof(*m_predModes) * m_numPartitions);
memcpy(rpcCU->getCUTransquantBypass() + m_absIdxInLCU, m_cuTransquantBypass, sizeof(*m_cuTransquantBypass) * m_numPartitions);
memcpy(rpcCU->getMergeFlag() + m_absIdxInLCU, m_bMergeFlags, iSizeInBool);
- memcpy(rpcCU->getMergeIndex() + m_absIdxInLCU, m_mergeIndex, iSizeInUchar);
memcpy(rpcCU->getLumaIntraDir() + m_absIdxInLCU, m_lumaIntraDir, iSizeInUchar);
memcpy(rpcCU->getChromaIntraDir() + m_absIdxInLCU, m_chromaIntraDir, iSizeInUchar);
memcpy(rpcCU->getInterDir() + m_absIdxInLCU, m_interDir, iSizeInUchar);
@@ -589,8 +572,7 @@ void TComDataCU::copyToPic(UChar uhDepth
memcpy(rpcCU->getCbf(TEXT_CHROMA_V) + m_absIdxInLCU, m_cbf[2], iSizeInUchar);
memcpy(rpcCU->getDepth() + m_absIdxInLCU, m_depth, iSizeInUchar);
- memcpy(rpcCU->getWidth() + m_absIdxInLCU, m_width, iSizeInUchar);
- memcpy(rpcCU->getHeight() + m_absIdxInLCU, m_height, iSizeInUchar);
+ memcpy(rpcCU->getCUSize() + m_absIdxInLCU, m_cuSize, iSizeInUchar);
memcpy(rpcCU->getMVPIdx(REF_PIC_LIST_0) + m_absIdxInLCU, m_mvpIdx[0], iSizeInUchar);
memcpy(rpcCU->getMVPIdx(REF_PIC_LIST_1) + m_absIdxInLCU, m_mvpIdx[1], iSizeInUchar);
@@ -600,12 +582,12 @@ void TComDataCU::copyToPic(UChar uhDepth
memcpy(rpcCU->getIPCMFlag() + m_absIdxInLCU, m_iPCMFlags, iSizeInBool);
- uint32_t tmp = (g_maxCUWidth * g_maxCUHeight) >> (uhDepth << 1);
- uint32_t tmp2 = m_absIdxInLCU * m_pic->getMinCUWidth() * m_pic->getMinCUHeight();
+ uint32_t tmp = (g_maxCUSize * g_maxCUSize) >> (uhDepth << 1);
+ uint32_t tmp2 = m_absIdxInLCU * m_pic->getMinCUSize() * m_pic->getMinCUSize();
memcpy(rpcCU->getCoeffY() + tmp2, m_trCoeffY, sizeof(TCoeff) * tmp);
memcpy(rpcCU->getPCMSampleY() + tmp2, m_iPCMSampleY, sizeof(Pel) * tmp);
- tmp = ((g_maxCUWidth >> m_hChromaShift) * (g_maxCUHeight >> m_vChromaShift)) >> (uhDepth << 1);
- tmp2 = m_absIdxInLCU * (m_pic->getMinCUWidth() >> m_hChromaShift) * (m_pic->getMinCUHeight() >> m_vChromaShift);
+ tmp = ((g_maxCUSize >> m_hChromaShift) * (g_maxCUSize >> m_vChromaShift)) >> (uhDepth << 1);
+ tmp2 = m_absIdxInLCU * (m_pic->getMinCUSize() >> m_hChromaShift) * (m_pic->getMinCUSize() >> m_vChromaShift);
memcpy(rpcCU->getCoeffCb() + tmp2, m_trCoeffCb, sizeof(TCoeff) * tmp);
memcpy(rpcCU->getCoeffCr() + tmp2, m_trCoeffCr, sizeof(TCoeff) * tmp);
memcpy(rpcCU->getPCMSampleCb() + tmp2, m_iPCMSampleCb, sizeof(Pel) * tmp);
@@ -630,12 +612,12 @@ void TComDataCU::copyCodedToPic(UChar de
memcpy(rpcCU->getCbf(TEXT_CHROMA_U) + m_absIdxInLCU, m_cbf[1], iSizeInUchar);
memcpy(rpcCU->getCbf(TEXT_CHROMA_V) + m_absIdxInLCU, m_cbf[2], iSizeInUchar);
- uint32_t tmp = (g_maxCUWidth * g_maxCUHeight) >> (depth << 1);
- uint32_t tmp2 = m_absIdxInLCU * m_pic->getMinCUWidth() * m_pic->getMinCUHeight();
+ uint32_t tmp = (g_maxCUSize * g_maxCUSize) >> (depth << 1);
+ uint32_t tmp2 = m_absIdxInLCU * m_pic->getMinCUSize() * m_pic->getMinCUSize();
memcpy(rpcCU->getCoeffY() + tmp2, m_trCoeffY, sizeof(TCoeff) * tmp);
- tmp = ((g_maxCUWidth >> m_hChromaShift) * (g_maxCUHeight >> m_hChromaShift)) >> (depth << 1);
- tmp2 = m_absIdxInLCU * (m_pic->getMinCUWidth() >> m_hChromaShift) * (m_pic->getMinCUHeight() >> m_vChromaShift);
+ tmp = ((g_maxCUSize >> m_hChromaShift) * (g_maxCUSize >> m_hChromaShift)) >> (depth << 1);
+ tmp2 = m_absIdxInLCU * (m_pic->getMinCUSize() >> m_hChromaShift) * (m_pic->getMinCUSize() >> m_vChromaShift);
memcpy(rpcCU->getCoeffCb() + tmp2, m_trCoeffCb, sizeof(TCoeff) * tmp);
More information about the x265-commits
mailing list