Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
V
VVCSoftware_VTM
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jeeva Raj A
VVCSoftware_VTM
Commits
9ef615ae
Commit
9ef615ae
authored
Aug 17, 2018
by
Karsten Suehring
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge updates from BMS 2.0rc2
parent
071a27a5
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
23 deletions
+14
-23
source/Lib/CommonLib/dtrace_codingstruct.h
source/Lib/CommonLib/dtrace_codingstruct.h
+5
-5
source/Lib/CommonLib/version.h
source/Lib/CommonLib/version.h
+1
-1
source/Lib/EncoderLib/EncGOP.cpp
source/Lib/EncoderLib/EncGOP.cpp
+7
-3
source/Lib/EncoderLib/EncModeCtrl.cpp
source/Lib/EncoderLib/EncModeCtrl.cpp
+1
-1
source/Lib/EncoderLib/IntraSearch.cpp
source/Lib/EncoderLib/IntraSearch.cpp
+0
-13
No files found.
source/Lib/CommonLib/dtrace_codingstruct.h
View file @
9ef615ae
...
...
@@ -100,6 +100,10 @@ inline void dtraceModeCost(CodingStructure &cs, double lambda)
if
(
isIntra
)
intraModeL
=
g_intraMode65to33AngMapping
[
intraModeL
];
if
(
isIntra
&&
intraModeC
==
DM_CHROMA_IDX
)
intraModeC
=
36
;
else
if
(
isIntra
)
intraModeC
=
g_intraMode65to33AngMapping
[
intraModeC
];
#endif
int
imvVal
=
0
;
#if JVET_K0357_AMVR
imvVal
=
cs
.
cus
[
0
]
->
imv
;
#endif
DTRACE
(
g_trace_ctx
,
D_MODE_COST
,
"ModeCost: %6lld %3d @(%4d,%4d) [%2dx%2d] %d (qp%d,pm%d,ptSize%d,skip%d,mrg%d,fruc%d,obmc%d,ic%d,imv%d,affn%d,%d,%d) tempCS = %lld (%d,%d)
\n
"
,
DTRACE_GET_COUNTER
(
g_trace_ctx
,
D_MODE_COST
),
...
...
@@ -113,11 +117,7 @@ inline void dtraceModeCost(CodingStructure &cs, double lambda)
cs
.
cus
[
0
]
->
skip
,
cs
.
pus
[
0
]
->
mergeFlag
,
0
,
0
,
#if JVET_K0357_AMVR
cs
.
cus
[
0
]
->
imv
,
#else
0
,
#endif
imvVal
,
0
,
0
,
intraModeL
,
intraModeC
,
tempCost
,
tempBits
,
tempDist
);
...
...
source/Lib/CommonLib/version.h
View file @
9ef615ae
#if ! defined( NEXT_SOFTWARE_VERSION )
#define NEXT_SOFTWARE_VERSION "2.0rc
1
"
#define NEXT_SOFTWARE_VERSION "2.0rc
2
"
#endif
source/Lib/EncoderLib/EncGOP.cpp
View file @
9ef615ae
...
...
@@ -2970,7 +2970,11 @@ void EncGOP::xCalculateAddPSNR( Picture* pcPic, PelUnitBuf cPicD, const AccessUn
uibits
);
msg
(
NOTICE
,
" [Y %6.4lf dB U %6.4lf dB V %6.4lf dB]"
,
dPSNR
[
COMPONENT_Y
],
dPSNR
[
COMPONENT_Cb
],
dPSNR
[
COMPONENT_Cr
]
);
#if EXTENSION_360_VIDEO
m_ext360
.
printPerPOCInfo
(
NOTICE
);
#endif
if
(
m_pcEncLib
->
getPrintHexPsnr
())
{
uint64_t
xPsnr
[
MAX_NUM_COMPONENT
];
...
...
@@ -2981,11 +2985,11 @@ void EncGOP::xCalculateAddPSNR( Picture* pcPic, PelUnitBuf cPicD, const AccessUn
reinterpret_cast
<
uint8_t
*>
(
&
xPsnr
[
i
]));
}
msg
(
NOTICE
,
" [xY %16"
PRIx64
" xU %16"
PRIx64
" xV %16"
PRIx64
"]"
,
xPsnr
[
COMPONENT_Y
],
xPsnr
[
COMPONENT_Cb
],
xPsnr
[
COMPONENT_Cr
]);
}
#if EXTENSION_360_VIDEO
m_ext360
.
printPerPOCInfo
(
NOTICE
);
m_ext360
.
printPerPOCInfo
(
NOTICE
,
true
);
#endif
}
if
(
printFrameMSE
)
{
...
...
source/Lib/EncoderLib/EncModeCtrl.cpp
View file @
9ef615ae
...
...
@@ -950,7 +950,7 @@ void EncModeCtrlMTnoRQT::initCTUEncoding( const Slice &slice )
}
}
#if ENABLE_TRACING
#if ENABLE_TRACING
&& !JVET_K0220_ENC_CTRL
static
unsigned
getHalvedIdx
(
unsigned
idx
)
{
return
gp_sizeIdxInfo
->
idxFrom
(
gp_sizeIdxInfo
->
sizeFrom
(
idx
)
>>
1
);
...
...
source/Lib/EncoderLib/IntraSearch.cpp
View file @
9ef615ae
...
...
@@ -1248,19 +1248,6 @@ void IntraSearch::xIntraCodingTUBlock(TransformUnit &tu, const ComponentID &comp
m_pcTrQuant
->
selectLambda
(
compID
);
#endif
#if JVET_K0190
if
(
!
PU
::
isLMCMode
(
uiChFinalMode
)
&&
sps
.
getSpsNext
().
getUseLMChroma
()
)
{
if
(
compID
==
COMPONENT_Cb
)
{
m_pcTrQuant
->
setLambda
(
m_pcTrQuant
->
getLambda
()
*
15.0
/
16.0
);
}
else
if
(
compID
==
COMPONENT_Cr
)
{
m_pcTrQuant
->
setLambda
(
m_pcTrQuant
->
getLambda
()
*
16.0
/
15.0
);
}
}
#endif
m_pcTrQuant
->
transformNxN
(
tu
,
compID
,
cQP
,
uiAbsSum
,
m_CABACEstimator
->
getCtx
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment