This repository was archived by the owner on Jul 29, 2024. It is now read-only.
Vbv dev #155
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -84,6 +84,10 @@ | |
| #define NALU_FILE_TOKEN "-nalu-file" | ||
| #define RATE_CONTROL_ENABLE_TOKEN "-rc" | ||
| #define TARGET_BIT_RATE_TOKEN "-tbr" | ||
| #define VBV_MAX_RATE_TOKEN "-vbv-maxrate" | ||
| #define VBV_BUFFER_SIZE_TOKEN "-vbv-bufsize" | ||
| #define VBV_BUFFER_INIT_TOKEN "-vbv-init" | ||
| #define HRD_TOKEN "-hrd" | ||
| #define MAX_QP_TOKEN "-max-qp" | ||
| #define MIN_QP_TOKEN "-min-qp" | ||
| #define TEMPORAL_ID "-temporal-id" // no Eval | ||
|
|
@@ -204,6 +208,10 @@ static void SetEnableConstrainedIntra (const char *value, EbConfig_t * | |
| static void SetCfgTune (const char *value, EbConfig_t *cfg) {cfg->tune = (uint8_t)strtoul(value, NULL, 0); }; | ||
| static void SetBitRateReduction (const char *value, EbConfig_t *cfg) {cfg->bitRateReduction = (EB_BOOL)strtol(value, NULL, 0); }; | ||
| static void SetImproveSharpness (const char *value, EbConfig_t *cfg) {cfg->improveSharpness = (EB_BOOL)strtol(value, NULL, 0);}; | ||
| static void SetVbvMaxrate (const char *value, EbConfig_t *cfg) { cfg->vbvMaxRate = strtoul(value, NULL, 0);}; | ||
| static void SetVbvBufsize (const char *value, EbConfig_t *cfg) { cfg->vbvBufsize = strtoul(value, NULL, 0);}; | ||
| static void SetVbvBufInit (const char *value, EbConfig_t *cfg) { cfg->vbvBufInit = strtoul(value, NULL, 0);}; | ||
| static void SetHrdFlag (const char *value, EbConfig_t *cfg) { cfg->hrdFlag = strtoul(value, NULL, 0);}; | ||
| static void SetVideoUsabilityInfo (const char *value, EbConfig_t *cfg) {cfg->videoUsabilityInfo = strtol(value, NULL, 0);}; | ||
| static void SetHighDynamicRangeInput (const char *value, EbConfig_t *cfg) {cfg->highDynamicRangeInput = strtol(value, NULL, 0);}; | ||
| static void SetAccessUnitDelimiter (const char *value, EbConfig_t *cfg) {cfg->accessUnitDelimiter = strtol(value, NULL, 0);}; | ||
|
|
@@ -321,7 +329,18 @@ config_entry_t config_entry[] = { | |
|
|
||
| // Quantization | ||
| { SINGLE_INPUT, QP_TOKEN, "QP", SetCfgQp }, | ||
| { SINGLE_INPUT, USE_QP_FILE_TOKEN, "UseQpFile", SetCfgUseQpFile }, | ||
|
||
| { SINGLE_INPUT, RATE_CONTROL_ENABLE_TOKEN, "RateControlMode", SetRateControlMode }, | ||
| { SINGLE_INPUT, LOOK_AHEAD_DIST_TOKEN, "LookAheadDistance", SetLookAheadDistance}, | ||
| { SINGLE_INPUT, TARGET_BIT_RATE_TOKEN, "TargetBitRate", SetTargetBitRate }, | ||
|
||
| { SINGLE_INPUT, MAX_QP_TOKEN, "MaxQpAllowed", SetMaxQpAllowed }, | ||
| { SINGLE_INPUT, MIN_QP_TOKEN, "MinQpAllowed", SetMinQpAllowed }, | ||
| { SINGLE_INPUT, VBV_MAX_RATE_TOKEN, "vbvMaxRate", SetVbvMaxrate }, | ||
| { SINGLE_INPUT, VBV_BUFFER_SIZE_TOKEN, "vbvBufsize", SetVbvBufsize }, | ||
| { SINGLE_INPUT, HRD_TOKEN, "hrd", SetHrdFlag }, | ||
| { SINGLE_INPUT, VBV_BUFFER_INIT_TOKEN, "vbvBufInit", SetVbvBufInit}, | ||
|
|
||
|
|
||
| // Deblock Filter | ||
| { SINGLE_INPUT, LOOP_FILTER_DISABLE_TOKEN, "LoopFilterDisable", SetDisableDlfFlag }, | ||
|
|
||
|
|
@@ -424,6 +443,10 @@ void EbConfigCtor(EbConfig_t *configPtr) | |
| configPtr->minQpAllowed = 10; | ||
| configPtr->baseLayerSwitchMode = 0; | ||
| configPtr->encMode = 9; | ||
| configPtr->vbvMaxRate = 0; | ||
| configPtr->vbvBufsize = 0; | ||
| configPtr->vbvBufInit = 90; | ||
| configPtr->hrdFlag = 0; | ||
| configPtr->intraPeriod = -2; | ||
| configPtr->intraRefreshType = 1; | ||
| configPtr->hierarchicalLevels = 3; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1120,7 +1120,7 @@ EB_API EB_ERRORTYPE EbInitEncoder(EB_COMPONENTTYPE *h265EncComponent) | |
| return_error = EbSystemResourceCtor( | ||
| &encHandlePtr->pictureDemuxResultsResourcePtr, | ||
| encHandlePtr->sequenceControlSetInstanceArray[0]->sequenceControlSetPtr->pictureDemuxFifoInitCount, | ||
| encHandlePtr->sequenceControlSetInstanceArray[0]->sequenceControlSetPtr->sourceBasedOperationsProcessInitCount + encHandlePtr->sequenceControlSetInstanceArray[0]->sequenceControlSetPtr->encDecProcessInitCount + 1, // 1 for packetization | ||
| EB_PictureManagerProcessInitCount, | ||
| &encHandlePtr->pictureDemuxResultsProducerFifoPtrArray, | ||
| &encHandlePtr->pictureDemuxResultsConsumerFifoPtrArray, | ||
|
|
@@ -1412,7 +1412,7 @@ EB_API EB_ERRORTYPE EbInitEncoder(EB_COMPONENTTYPE *h265EncComponent) | |
| encHandlePtr->encDecTasksConsumerFifoPtrArray[processIndex], | ||
| encHandlePtr->encDecResultsProducerFifoPtrArray[processIndex], | ||
| encHandlePtr->encDecTasksProducerFifoPtrArray[EncDecPortLookup(ENCDEC_INPUT_PORT_ENCDEC, processIndex)], | ||
| encHandlePtr->pictureDemuxResultsProducerFifoPtrArray[encHandlePtr->sequenceControlSetInstanceArray[0]->sequenceControlSetPtr->sourceBasedOperationsProcessInitCount + processIndex], // Add port lookup logic here JMJ | ||
| is16bit, | ||
| (EB_COLOR_FORMAT)encHandlePtr->sequenceControlSetInstanceArray[0]->sequenceControlSetPtr->chromaFormatIdc); | ||
| if (return_error == EB_ErrorInsufficientResources){ | ||
|
|
@@ -1439,7 +1439,9 @@ EB_API EB_ERRORTYPE EbInitEncoder(EB_COMPONENTTYPE *h265EncComponent) | |
| return_error = PacketizationContextCtor( | ||
| (PacketizationContext_t**) &encHandlePtr->packetizationContextPtr, | ||
| encHandlePtr->entropyCodingResultsConsumerFifoPtrArray[0], | ||
| encHandlePtr->rateControlTasksProducerFifoPtrArray[RateControlPortLookup(RATE_CONTROL_INPUT_PORT_PACKETIZATION, 0)], | ||
| encHandlePtr->pictureDemuxResultsProducerFifoPtrArray[encHandlePtr->sequenceControlSetInstanceArray[0]->sequenceControlSetPtr->sourceBasedOperationsProcessInitCount + encHandlePtr->sequenceControlSetInstanceArray[0]->sequenceControlSetPtr->encDecProcessInitCount] // Add port lookup logic here JMJ | ||
| ); | ||
|
|
||
| if (return_error == EB_ErrorInsufficientResources){ | ||
| return EB_ErrorInsufficientResources; | ||
|
|
@@ -2107,6 +2109,9 @@ void CopyApiFromApp( | |
| // Rate Control | ||
| sequenceControlSetPtr->staticConfig.sceneChangeDetection = ((EB_H265_ENC_CONFIGURATION*)pComponentParameterStructure)->sceneChangeDetection; | ||
| sequenceControlSetPtr->staticConfig.rateControlMode = ((EB_H265_ENC_CONFIGURATION*)pComponentParameterStructure)->rateControlMode; | ||
| sequenceControlSetPtr->staticConfig.vbvMaxrate = ((EB_H265_ENC_CONFIGURATION*)pComponentParameterStructure)->vbvMaxrate; | ||
| sequenceControlSetPtr->staticConfig.vbvBufsize = ((EB_H265_ENC_CONFIGURATION*)pComponentParameterStructure)->vbvBufsize; | ||
| sequenceControlSetPtr->staticConfig.vbvBufInit = ((EB_H265_ENC_CONFIGURATION*)pComponentParameterStructure)->vbvBufInit; | ||
| sequenceControlSetPtr->staticConfig.lookAheadDistance = ((EB_H265_ENC_CONFIGURATION*)pComponentParameterStructure)->lookAheadDistance; | ||
| sequenceControlSetPtr->staticConfig.framesToBeEncoded = ((EB_H265_ENC_CONFIGURATION*)pComponentParameterStructure)->framesToBeEncoded; | ||
|
|
||
|
|
@@ -2161,9 +2166,9 @@ void CopyApiFromApp( | |
| sequenceControlSetPtr->staticConfig.frameRateDenominator = ((EB_H265_ENC_CONFIGURATION*)pComponentParameterStructure)->frameRateDenominator; | ||
| sequenceControlSetPtr->staticConfig.frameRateNumerator = ((EB_H265_ENC_CONFIGURATION*)pComponentParameterStructure)->frameRateNumerator; | ||
| sequenceControlSetPtr->staticConfig.reconEnabled = ((EB_H265_ENC_CONFIGURATION*)pComponentParameterStructure)->reconEnabled; | ||
| sequenceControlSetPtr->staticConfig.hrdFlag = ((EB_H265_ENC_CONFIGURATION*)pComponentParameterStructure)->hrdFlag; | ||
| sequenceControlSetPtr->staticConfig.unrestrictedMotionVector = ((EB_H265_ENC_CONFIGURATION*)pComponentParameterStructure)->unrestrictedMotionVector; | ||
| sequenceControlSetPtr->enableTmvpSps = sequenceControlSetPtr->staticConfig.unrestrictedMotionVector; | ||
| sequenceControlSetPtr->staticConfig.maxCLL = ((EB_H265_ENC_CONFIGURATION*)pComponentParameterStructure)->maxCLL; | ||
| sequenceControlSetPtr->staticConfig.maxFALL = ((EB_H265_ENC_CONFIGURATION*)pComponentParameterStructure)->maxFALL; | ||
|
|
||
|
|
@@ -2218,9 +2223,15 @@ void CopyApiFromApp( | |
| sequenceControlSetPtr->staticConfig.lookAheadDistance = ComputeDefaultLookAhead(&sequenceControlSetPtr->staticConfig); | ||
| } | ||
|
|
||
| //Set required flags to signal vbv status when hrd is enabled | ||
| if (sequenceControlSetPtr->staticConfig.hrdFlag == 1) { | ||
| sequenceControlSetPtr->staticConfig.videoUsabilityInfo = 1; | ||
|
||
| sequenceControlSetPtr->videoUsabilityInfoPtr->vuiHrdParametersPresentFlag = 1; | ||
| sequenceControlSetPtr->staticConfig.bufferingPeriodSEI = 1; | ||
| sequenceControlSetPtr->staticConfig.pictureTimingSEI = 1; | ||
| sequenceControlSetPtr->videoUsabilityInfoPtr->hrdParametersPtr->nalHrdParametersPresentFlag = 1; | ||
| sequenceControlSetPtr->videoUsabilityInfoPtr->hrdParametersPtr->cpbDpbDelaysPresentFlag = 1; | ||
| } | ||
| return; | ||
| } | ||
|
|
||
|
|
@@ -2507,6 +2518,16 @@ static EB_ERRORTYPE VerifySettings(\ | |
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
| if (config->hrdFlag > 1) { | ||
| SVT_LOG("SVT [Error]: Instance %u: hrdFlag must be [0 - 1]\n", channelNumber + 1); | ||
| return_error = EB_ErrorBadParameter; | ||
|
Contributor
There was a problem hiding this comment. please use "SVT_LOG("SVT [Error]:"
Contributor
There was a problem hiding this comment. Please follow the coding style here. |
||
| } | ||
|
|
||
| if (config->hrdFlag == 1 && ((config->vbvBufsize <= 0) || (config->vbvMaxrate <= 0))) { | ||
| SVT_LOG("SVT [Error]: Instance %u: hrd requires vbv max rate and vbv bufsize to be greater than 0 ", channelNumber + 1); | ||
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
| if ( config->enableSaoFlag > 1) { | ||
| SVT_LOG("SVT [Error]: Instance %u: Invalid SAO. SAO range must be [0 - 1]\n",channelNumber+1); | ||
| return_error = EB_ErrorBadParameter; | ||
|
|
@@ -2522,13 +2543,11 @@ static EB_ERRORTYPE VerifySettings(\ | |
| if ((config->searchAreaWidth > 256) || (config->searchAreaWidth == 0)){ | ||
| SVT_LOG("SVT [Error]: Instance %u: Invalid SearchAreaWidth. SearchAreaWidth must be [1 - 256]\n",channelNumber+1); | ||
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
| if((config->searchAreaHeight > 256) || (config->searchAreaHeight == 0)) { | ||
| SVT_LOG("SVT [Error]: Instance %u: Invalid SearchAreaHeight. SearchAreaHeight must be [1 - 256]\n",channelNumber+1); | ||
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
| if (levelIdx < 13) { | ||
|
|
@@ -2700,27 +2719,27 @@ static EB_ERRORTYPE VerifySettings(\ | |
| } | ||
|
|
||
| if ((config->maxCLL && !config->highDynamicRangeInput) || (config->maxFALL && !config->highDynamicRangeInput)) { | ||
| SVT_LOG("SVT [Error]: Instance %u: maxCLL or maxFALL should be used only with high dynamic range input; set highDynamicRangeInput to 1\n", channelNumber); | ||
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
| if (config->useMasteringDisplayColorVolume && !config->highDynamicRangeInput) { | ||
| SVT_LOG("SVT [Error]: Instance %u: MasterDisplay should be used only with high dynamic range input; set highDynamicRangeInput to 1\n", channelNumber); | ||
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
| if (config->dolbyVisionProfile != 0 && config->dolbyVisionProfile != 81) { | ||
| SVT_LOG("SVT [Error]: Instance %u: Only Dolby Vision Profile 8.1 is supported \n", channelNumber); | ||
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
| if (config->dolbyVisionProfile == 81 && config->encoderBitDepth != 10) { | ||
| SVT_LOG("SVT [Error]: Instance %u: Dolby Vision Profile 8.1 work only with main10 input \n", channelNumber); | ||
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
| if (config->dolbyVisionProfile == 81 && !config->useMasteringDisplayColorVolume) { | ||
| SVT_LOG("SVT [Error]: Instance %u: Dolby Vision Profile 8.1 requires mastering display color volume information \n", channelNumber); | ||
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
|
|
@@ -2746,8 +2765,7 @@ static EB_ERRORTYPE VerifySettings(\ | |
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
| if (config->compressedTenBitFormat > 1) { | ||
| SVT_LOG("SVT [Error]: Instance %u: Invalid Compressed Ten Bit Format shall be only [0 - 1] \n", channelNumber + 1); | ||
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
@@ -2782,6 +2800,11 @@ static EB_ERRORTYPE VerifySettings(\ | |
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
| if (config->vbvBufInit > 100) { | ||
| SVT_LOG("SVT [Error]: Instance %u: Invalid vbvBufInit [0 - 100]\n", channelNumber + 1); | ||
| return_error = EB_ErrorBadParameter; | ||
| } | ||
|
|
||
| if (config->tileColumnCount < 1) { | ||
| SVT_LOG("SVT [Error]: Instance %u : Invalid tile column count\n", channelNumber + 1); | ||
| return_error = EB_ErrorBadParameter; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you also update sample.cfg? Thx.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated and pushed (Commit : 9db1593)