forked from cisco/openh264
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "add max nal size setting in gmp wrapper"
This reverts commit a20c503.
- Loading branch information
Showing
1 changed file
with
33 additions
and
88 deletions.
There are no files selected for viewing
This file contains 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 |
|---|---|---|
|
|
@@ -204,95 +204,40 @@ class OpenH264VideoEncoder : public GMPVideoEncoder { | |
| if (rv) { | ||
| return GMPVideoGenericErr; | ||
| } | ||
| if (maxPayloadSize <= 0) { | ||
| SEncParamBase param; | ||
| memset (¶m, 0, sizeof (param)); | ||
|
|
||
| GMPLOG (GL_INFO, "Initializing encoder at " | ||
| << codecSettings.mWidth | ||
| << "x" | ||
| << codecSettings.mHeight | ||
| << "@" | ||
| << static_cast<int> (codecSettings.mMaxFramerate) | ||
| << "max payload size=" | ||
| << maxPayloadSize); | ||
|
|
||
| // Translate parameters. | ||
| param.iUsageType = CAMERA_VIDEO_REAL_TIME; | ||
| param.iPicWidth = codecSettings.mWidth; | ||
| param.iPicHeight = codecSettings.mHeight; | ||
| param.iTargetBitrate = codecSettings.mStartBitrate * 1000; | ||
| GMPLOG (GL_INFO, "Initializing Bit Rate at: Start: " | ||
| << codecSettings.mStartBitrate | ||
| << "; Min: " | ||
| << codecSettings.mMinBitrate | ||
| << "; Max: " | ||
| << codecSettings.mMaxBitrate); | ||
|
|
||
| param.iRCMode = RC_BITRATE_MODE; | ||
|
|
||
| // TODO([email protected]). Scary conversion from unsigned char to float below. | ||
| param.fMaxFrameRate = static_cast<float> (codecSettings.mMaxFramerate); | ||
| param.iInputCsp = videoFormatI420; | ||
|
|
||
| rv = encoder_->Initialize (¶m); | ||
| if (rv) { | ||
| GMPLOG (GL_ERROR, "Couldn't initialize encoder"); | ||
| return GMPVideoGenericErr; | ||
| } | ||
| } else { | ||
| SEncParamExt param; | ||
| memset (¶m, 0, sizeof (param)); | ||
| encoder_->GetDefaultParams (¶m); | ||
|
|
||
| GMPLOG (GL_INFO, "Initializing encoder at " | ||
| << codecSettings.mWidth | ||
| << "x" | ||
| << codecSettings.mHeight | ||
| << "@" | ||
| << static_cast<int> (codecSettings.mMaxFramerate) | ||
| << "max payload size=" | ||
| << maxPayloadSize); | ||
|
|
||
| // Translate parameters. | ||
| param.iUsageType = CAMERA_VIDEO_REAL_TIME; | ||
| param.iInputCsp = videoFormatI420; | ||
| param.iPicWidth = codecSettings.mWidth; | ||
| param.iPicHeight = codecSettings.mHeight; | ||
| param.iRCMode = RC_BITRATE_MODE; | ||
| param.iTargetBitrate = codecSettings.mStartBitrate * 1000; | ||
| param.iMaxBitrate = codecSettings.mMaxBitrate * 1000; | ||
| GMPLOG (GL_INFO, "Initializing Bit Rate at: Start: " | ||
| << codecSettings.mStartBitrate | ||
| << "; Min: " | ||
| << codecSettings.mMinBitrate | ||
| << "; Max: " | ||
| << codecSettings.mMaxBitrate); | ||
| //for controlling the NAL size (normally for packetization-mode=0) | ||
| param.uiMaxNalSize = maxPayloadSize; | ||
|
|
||
| // TODO([email protected]). Scary conversion from unsigned char to float below. | ||
| param.fMaxFrameRate = static_cast<float> (codecSettings.mMaxFramerate); | ||
|
|
||
| // Set up layers. Currently we have one layer. | ||
| SSpatialLayerConfig* layer = ¶m.sSpatialLayers[0]; | ||
|
|
||
| layer->iVideoWidth = codecSettings.mWidth; | ||
| layer->iVideoHeight = codecSettings.mHeight; | ||
| layer->fFrameRate = param.fMaxFrameRate; | ||
| layer->iSpatialBitrate = param.iTargetBitrate; | ||
| layer->iMaxSpatialBitrate = param.iMaxBitrate; | ||
|
|
||
| // Based on guidance from Cisco. | ||
| layer->sSliceCfg.uiSliceMode = SM_DYN_SLICE; | ||
| layer->sSliceCfg.sSliceArgument.uiSliceSizeConstraint = maxPayloadSize; | ||
|
|
||
| rv = encoder_->InitializeExt (¶m); | ||
| if (rv) { | ||
| GMPLOG (GL_ERROR, "Couldn't initialize encoder"); | ||
| return GMPVideoGenericErr; | ||
| } | ||
|
|
||
| SEncParamBase param; | ||
| memset (¶m, 0, sizeof (param)); | ||
|
|
||
| GMPLOG (GL_INFO, "Initializing encoder at " | ||
| << codecSettings.mWidth | ||
| << "x" | ||
| << codecSettings.mHeight | ||
| << "@" | ||
| << static_cast<int> (codecSettings.mMaxFramerate) | ||
| << "max payload size=" | ||
| << maxPayloadSize); | ||
|
|
||
| // Translate parameters. | ||
| param.iUsageType = CAMERA_VIDEO_REAL_TIME; | ||
| param.iPicWidth = codecSettings.mWidth; | ||
| param.iPicHeight = codecSettings.mHeight; | ||
| param.iTargetBitrate = codecSettings.mStartBitrate * 1000; | ||
| GMPLOG (GL_INFO, "Initializing Bit Rate at: Start: " | ||
| << codecSettings.mStartBitrate | ||
| << "; Min: " | ||
| << codecSettings.mMinBitrate | ||
| << "; Max: " | ||
| << codecSettings.mMaxBitrate); | ||
| param.iRCMode = RC_BITRATE_MODE; | ||
|
|
||
| // TODO([email protected]). Scary conversion from unsigned char to float below. | ||
| param.fMaxFrameRate = static_cast<float> (codecSettings.mMaxFramerate); | ||
| param.iInputCsp = videoFormatI420; | ||
|
|
||
| rv = encoder_->Initialize (¶m); | ||
| if (rv) { | ||
| GMPLOG (GL_ERROR, "Couldn't initialize encoder"); | ||
| return GMPVideoGenericErr; | ||
| } | ||
|
|
||
| max_payload_size_ = maxPayloadSize; | ||
|
|
||