kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-26 04:27:25 +00:00
Code Issues Projects Releases Wiki Activity

FS-7517: update to openh264 commit 3f19534dd6118b96ce73073ae1e047490c71b6e6

Browse Source
This commit is contained in:
Seven Du 2015-02-06 13:16:51 +08:00 committed by Michael Jerris
parent f7fb5fbff3
commit 78067a890c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/codecs/mod_openh264/mod_openh264.cpp
View File

@ -38,6 +38,9 @@
#include "codec_api.h" #include "codec_api.h"
//#include "inc/logging.h" // for debug //#include "inc/logging.h" // for debug
#ifndef NAL_HEADER_ADD_0X30BYTES
#define NAL_HEADER_ADD_0X30BYTES 50
#endif
#define FPS 15.0f // frame rate #define FPS 15.0f // frame rate
#define H264_NALU_BUFFER_SIZE 65536 #define H264_NALU_BUFFER_SIZE 65536
@ -107,7 +110,7 @@ int FillSpecificParameters(h264_codec_context_t *context) {
param->bEnableDenoise = 0; // denoise control param->bEnableDenoise = 0; // denoise control
param->bEnableBackgroundDetection = 1; // background detection control param->bEnableBackgroundDetection = 1; // background detection control
param->bEnableSceneChangeDetect= 1; param->bEnableSceneChangeDetect= 1;
//param->bEnableFrameSkip = 1; param->bEnableFrameSkip = 1;
param->iMultipleThreadIdc= 1; param->iMultipleThreadIdc= 1;
param->bEnableAdaptiveQuant = 1; // adaptive quantization control param->bEnableAdaptiveQuant = 1; // adaptive quantization control
param->bEnableLongTermReference = 0; // long term reference control param->bEnableLongTermReference = 0; // long term reference control
@ -116,10 +119,11 @@ int FillSpecificParameters(h264_codec_context_t *context) {
param->iLoopFilterBetaOffset= 0; param->iLoopFilterBetaOffset= 0;
param->iComplexityMode = MEDIUM_COMPLEXITY; param->iComplexityMode = MEDIUM_COMPLEXITY;
param->uiIntraPeriod = FPS * 3; // period of Intra frame param->uiIntraPeriod = FPS * 3; // period of Intra frame
param->iNumRefFrame = AUTO_REF_PIC_COUNT; // encoder selects the number of reference frame automatically
#ifdef MT_ENABLED #ifdef MT_ENABLED
param->bEnableSpsPpsIdAddition = 1; param->eSpsPpsIdStrategy = INCREASING_ID;
#else #else
param->bEnableSpsPpsIdAddition = 0; param->eSpsPpsIdStrategy = CONSTANT_ID;
#endif #endif
param->bPrefixNalAddingCtrl = 0; param->bPrefixNalAddingCtrl = 0;
@ -142,7 +146,7 @@ int FillSpecificParameters(h264_codec_context_t *context) {
#ifdef MT_ENABLED #ifdef MT_ENABLED
param->sSpatialLayers[iIndexLayer].sSliceCfg.uiSliceMode = SM_DYN_SLICE; param->sSpatialLayers[iIndexLayer].sSliceCfg.uiSliceMode = SM_DYN_SLICE;
param->sSpatialLayers[iIndexLayer].sSliceCfg.sSliceArgument.uiSliceSizeConstraint = SLICE_SIZE; param->sSpatialLayers[iIndexLayer].sSliceCfg.sSliceArgument.uiSliceSizeConstraint = SLICE_SIZE;
param->uiMaxNalSize = SLICE_SIZE; param->uiMaxNalSize = SLICE_SIZE + NAL_HEADER_ADD_0X30BYTES;
#else #else
param->sSpatialLayers[iIndexLayer].sSliceCfg.uiSliceMode = SM_SINGLE_SLICE; param->sSpatialLayers[iIndexLayer].sSliceCfg.uiSliceMode = SM_SINGLE_SLICE;
#endif #endif