Skip to content

Enable access to reconstructed picture output in the encoder #3894

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
marecki315 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable access to reconstructed picture output in the encoder #3894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 19 additions & 12 deletions codec/api/wels/codec_app_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,18 +641,6 @@ typedef struct {
float rPsnr[3]; ///< PSNR values for Y/U/V
} SLayerBSInfo, *PLayerBSInfo;

/**
* @brief Frame bit stream info
*/
typedef struct {
int iLayerNum;
SLayerBSInfo sLayerInfo[MAX_LAYER_NUM_OF_FRAME];

EVideoFrameType eFrameType;
int iFrameSizeInBytes;
long long uiTimeStamp;
} SFrameBSInfo, *PFrameBSInfo;

/**
* @brief Structure for source picture
*/
Expand All @@ -668,6 +656,25 @@ typedef struct Source_Picture_s {
bool bPsnrV; ///< get V PSNR for this frame
} SSourcePicture;

/**
* @brief Structure for reconstructed picture
*/
typedef SSourcePicture SReconPicture;

/**
* @brief Frame bit stream info
*/
typedef struct {
int iLayerNum;
SLayerBSInfo sLayerInfo[MAX_LAYER_NUM_OF_FRAME];

EVideoFrameType eFrameType;
int iFrameSizeInBytes;
long long uiTimeStamp;
SReconPicture *pReconPic; ///< pointer to the reconstructed picture
bool bHaveRecon; ///< whether have reconstructed picture data
} SFrameBSInfo, *PFrameBSInfo;

/**
* @brief Structure for bit rate info
*/
Expand Down
55 changes: 55 additions & 0 deletions codec/encoder/core/src/encoder_ext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3907,6 +3907,61 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour
WelsLog (pLogCtx, WELS_LOG_WARNING,
"WelsEncoderEncodeExt()MinCr Checking,codec bitstream size is larger than Level limitation");
}

if (iSpatialNum == 1 && NULL != pFbi->pReconPic
&& (NULL != pFbi->pReconPic->pData[0]
|| NULL != pFbi->pReconPic->pData[1]
|| NULL != pFbi->pReconPic->pData[2])) {
SReconPicture* pReconPic = pFbi->pReconPic;
unsigned char* pReconData[4] = {pReconPic->pData[0], pReconPic->pData[1],
pReconPic->pData[2], pReconPic->pData[3]};
SWelsSPS* pSpsTmp = pCtx->pCurDqLayer->sLayerInfo.pSpsP;
bool bFrameCroppingFlag = pSpsTmp->bFrameCroppingFlag;
SCropOffset* pFrameCrop = &pSpsTmp->sFrameCrop;

const int32_t kiStrideY = fsnr->iLineSize[0];
const int32_t kiLumaWidth = bFrameCroppingFlag ? (fsnr->iWidthInPixel - ((pFrameCrop->iCropLeft +
pFrameCrop->iCropRight) << 1)) : fsnr->iWidthInPixel;
const int32_t kiLumaHeight = bFrameCroppingFlag ? (fsnr->iHeightInPixel - ((pFrameCrop->iCropTop +
pFrameCrop->iCropBottom) << 1)) : fsnr->iHeightInPixel;
const int32_t kiChromaWidth = kiLumaWidth >> 1;
const int32_t kiChromaHeight = kiLumaHeight >> 1;

pReconPic->iColorFormat = videoFormatI420;
pReconPic->iPicWidth = kiLumaWidth;
pReconPic->iPicHeight = kiLumaHeight;
pReconPic->iStride[0] = kiStrideY;
pReconPic->uiTimeStamp = pSrcPic->uiTimeStamp;

// Copy Y plane
if (NULL != pReconData[0]) {
unsigned char* pSrcY = bFrameCroppingFlag ? (fsnr->pData[0] + kiStrideY * (pFrameCrop->iCropTop << 1) +
(pFrameCrop->iCropLeft << 1)) : fsnr->pData[0];
for (int32_t j = 0; j < kiLumaHeight; ++j) {
memcpy (pReconData[0] + j * kiLumaWidth, pSrcY + j * kiStrideY, kiLumaWidth);
}
}

// Copy U and V planes
for (int i = 1; i < 3; ++i) {
if (NULL == pReconData[i])
continue;
const int32_t kiStrideUV = fsnr->iLineSize[i];
pReconPic->iStride[i] = kiStrideUV;
unsigned char* pSrcUV = bFrameCroppingFlag ? (fsnr->pData[i] + kiStrideUV * pFrameCrop->iCropTop +
pFrameCrop->iCropLeft)
: fsnr->pData[i];
for (int32_t j = 0; j < kiChromaHeight; ++j) {
memcpy (pReconData[i] + j * kiChromaWidth, pSrcUV + j * kiStrideUV, kiChromaWidth);
}
}

pFbi->bHaveRecon = true;
} else {
pFbi->bHaveRecon = false;
}


#ifdef ENABLE_FRAME_DUMP
{
DumpDependencyRec (fsnr, &pSvcParam->sDependencyLayers[iCurDid].sRecFileName[0], iCurDid,
Expand Down