generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix cropping when using SEncParamBase

Browse Source 
The iFrameWidth/iFrameHeight fields are already aligned by the
SetActualPicResolution() function. Previously when iFrameWidth was
aligned directly in ParamBaseTranscode, this aligned value was used
to set iActualWidth/iActualHeight - losing the original, cropped
size.

This makes sure the output bitstream from the test of encoding
res/Static_152_100.yuv actually is cropped as it should.
This commit is contained in:
Martin Storsjö 2014-03-03 10:26:21 +02:00
parent 6ec60e6aee
commit 9ccabd1fe3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec/encoder/core/inc/param_svc.h
View File

@ -266,10 +266,10 @@ int32_t ParamBaseTranscode (const SEncParamBase& pCodingParam, const bool kbEnab
pDlp->sRecFileName[0] = '\0'; // file to be constructed pDlp->sRecFileName[0] = '\0'; // file to be constructed
#endif//ENABLE_FRAME_DUMP #endif//ENABLE_FRAME_DUMP
pDlp->iActualWidth = sSpatialLayers[iIdxSpatial].iVideoWidth = iPicWidth; pDlp->iActualWidth = sSpatialLayers[iIdxSpatial].iVideoWidth = iPicWidth;
pDlp->iFrameWidth = WELS_ALIGN(pDlp->iActualWidth, MB_WIDTH_LUMA); pDlp->iFrameWidth = pDlp->iActualWidth;
pDlp->iActualHeight = sSpatialLayers[iIdxSpatial].iVideoHeight = iPicHeight; pDlp->iActualHeight = sSpatialLayers[iIdxSpatial].iVideoHeight = iPicHeight;
pDlp->iFrameHeight = WELS_ALIGN(pDlp->iActualHeight, MB_HEIGHT_LUMA); pDlp->iFrameHeight = pDlp->iActualHeight;
pDlp->iSpatialBitrate = pDlp->iSpatialBitrate =
sSpatialLayers[iIdxSpatial].iSpatialBitrate = pCodingParam.iTargetBitrate; // target bitrate for current spatial layer sSpatialLayers[iIdxSpatial].iSpatialBitrate = pCodingParam.iTargetBitrate; // target bitrate for current spatial layer

2
test/encoder_test.cpp
View File

@ -73,7 +73,7 @@ static const EncodeFileParam kFileParamArray[] = {
}, },
{ {
"res/Static_152_100.yuv", "res/Static_152_100.yuv",
"a004c7410a78bfe00af65ae7071ce1c485cf036e", 152, 100, 6.0f "af5c6a41b567ce1b2cb6fd427f4379473d3b829f", 152, 100, 6.0f
}, },
}; };