Skip to content

fixed 444 deblocking error and 422 1920x1080 error #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kelvinhu325 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fixed 444 deblocking error and 422 1920x1080 error #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e87fc1
fixed 444 deblocking error and 422 1920x1080 error
Jan 22, 2019
a17acb3
Merge branch 'master' into upstream
lijing0010 Jan 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions Source/Lib/Codec/EbDeblockingFilter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2259,8 +2259,8 @@ EB_ERRORTYPE LCUInternalAreaDLFCore(
EB_U32 chromaLcuPos_y = lcuPos_y >> (colorFormat==EB_YUV420?1:0);
EB_U32 numVerticalChromaSampleEdges = (lcuWidth >> (colorFormat==EB_YUV444?3:4)) - (colorFormat==EB_YUV444?1:((lcuWidth & 15) == 0));
EB_U32 numHorizontalChromaSampleEdges = (lcuHeight >> (colorFormat==EB_YUV420?4:3)) - (colorFormat==EB_YUV420?((lcuHeight & 15) == 0):1);
EB_U32 num2SampleEdgesPerVerticalChromaSampleEdge = (lcuHeight >> (colorFormat==EB_YUV420?2:1)) - 2 - (((lcuHeight & 15) == 0) << 1);
EB_U32 num2SampleEdgesPerHorizontalChromaSampleEdge = (lcuWidth >> (colorFormat==EB_YUV444?1:2)) - 2 - (colorFormat==EB_YUV444?0:(((lcuWidth & 15) == 0) << 1));
EB_U32 num2SampleEdgesPerVerticalChromaSampleEdge = (lcuHeight >> (colorFormat==EB_YUV420?2:1)) - 2 - (((lcuHeight & (colorFormat==EB_YUV420?15:7)) == 0) << 1);
EB_U32 num2SampleEdgesPerHorizontalChromaSampleEdge = (lcuWidth >> (colorFormat==EB_YUV444?1:2)) - 2 - (((lcuWidth & (colorFormat==EB_YUV444?7:15)) == 0) << 1);
EB_U8 curCuQp;
EB_BYTE edgeStartFilteredSamplePtr;
EB_BYTE edgeStartSampleCb;
Expand Down Expand Up @@ -3066,7 +3066,7 @@ void LCUBoundaryDLFCore(

edgeCLowerBlk2x2Addr = GET_CHROMA_4X4BLK_ADDR(
horizontalIdx << (3 - subWidthShfitMinus1),
2,
2 >> subHeightShfitMinus1,
logMaxLcuSizeIn4x4blk);

edgeDRightBlk2x2Addr = GET_CHROMA_4X4BLK_ADDR(
Expand Down Expand Up @@ -3128,7 +3128,7 @@ void LCUBoundaryDLFCore(
logMaxLcuSizeIn4x4blk);

edgeDRightBlk2x2Addr = GET_CHROMA_4X4BLK_ADDR(
2,
2 >> subWidthShfitMinus1,
verticalIdx << (3 - subHeightShfitMinus1),
logMaxLcuSizeIn4x4blk);

Expand Down Expand Up @@ -3621,7 +3621,6 @@ void LCUPictureEdgeDLFCore(
if ((sequenceControlSet->chromaWidth & 7) == 0) {
//num4SampleHorizontalEdges = (sequenceControlSet->chromaHeight >> 3) + ((sequenceControlSet->chromaHeight & 7) != 0) - 1;
num4SampleHorizontalEdges = (lcuHeight >> (colorFormat==EB_YUV420?4:3)) + (((lcuHeight >> (colorFormat==EB_YUV420?1:0)) & (colorFormat==EB_YUV420?7:15)) != 0);
//printf("kelvin ---> loopfilter sequenceControlSet->lumaWidth=%d, sequenceControlSet->chromaWidth=%d, sequenceControlSet->lumaHeight=%d, sequenceControlSet->chromaHeight=%d\n", sequenceControlSet->lumaWidth, sequenceControlSet->chromaWidth, sequenceControlSet->lumaHeight, sequenceControlSet->chromaHeight);
fourSampleEdgeStartSamplePos_x = sequenceControlSet->chromaWidth - 4; // Picture wise location
//for(verticalIdx = 1; verticalIdx <= num4SampleHorizontalEdges; ++verticalIdx) {
for (verticalIdx = (lcuPos_y == 0); verticalIdx < num4SampleHorizontalEdges; ++verticalIdx) {
Expand Down
6 changes: 4 additions & 2 deletions Source/SimpleApp/EbSimpleAppContext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,10 @@ EB_ERRORTYPE CopyConfigurationParameters(
callbackData->ebEncParameters.codeVpsSpsPps = 0;
callbackData->ebEncParameters.reconEnabled = config->reconFile ? 1 : 0;

//callbackData->ebEncParameters.asmType= 0;
callbackData->ebEncParameters.disableDlfFlag = 1;

// callbackData->ebEncParameters.asmType= 0;
callbackData->ebEncParameters.disableDlfFlag = 0;//1;

callbackData->ebEncParameters.enableSaoFlag = 0;
callbackData->ebEncParameters.qp=20;
callbackData->ebEncParameters.rateControlMode=0;
Expand Down