update for latest openh264

parent a414fe65
...@@ -53,7 +53,6 @@ void MSOpenH264Decoder::initialize() ...@@ -53,7 +53,6 @@ void MSOpenH264Decoder::initialize()
mUnpacker=rfc3984_new(); mUnpacker=rfc3984_new();
if (mDecoder != 0) { if (mDecoder != 0) {
SDecodingParam params = { 0 }; SDecodingParam params = { 0 };
params.eOutputColorFormat = videoFormatI420;
params.uiTargetDqLayer = (unsigned char) -1; params.uiTargetDqLayer = (unsigned char) -1;
params.eEcActiveIdc = ERROR_CON_FRAME_COPY_CROSS_IDR; params.eEcActiveIdc = ERROR_CON_FRAME_COPY_CROSS_IDR;
params.sVideoProperty.size = sizeof(params.sVideoProperty); params.sVideoProperty.size = sizeof(params.sVideoProperty);
......
...@@ -122,14 +122,14 @@ void MSOpenH264Encoder::initialize() ...@@ -122,14 +122,14 @@ void MSOpenH264Encoder::initialize()
params.bEnableLongTermReference = false; params.bEnableLongTermReference = false;
params.iSpatialLayerNum=1; params.iSpatialLayerNum=1;
params.eSpsPpsIdStrategy = CONSTANT_ID; params.eSpsPpsIdStrategy = CONSTANT_ID;
params.sSpatialLayers[0].iVideoWidth = mVConf.vsize.width; params.sSpatialLayers[0].iVideoWidth = mVConf.vsize.width;
params.sSpatialLayers[0].iVideoHeight = mVConf.vsize.height; params.sSpatialLayers[0].iVideoHeight = mVConf.vsize.height;
params.sSpatialLayers[0].fFrameRate = mVConf.fps; params.sSpatialLayers[0].fFrameRate = mVConf.fps;
params.sSpatialLayers[0].iSpatialBitrate = targetBitrate; params.sSpatialLayers[0].iSpatialBitrate = targetBitrate;
params.sSpatialLayers[0].iMaxSpatialBitrate = maxBitrate; params.sSpatialLayers[0].iMaxSpatialBitrate = maxBitrate;
params.sSpatialLayers[0].sSliceCfg.uiSliceMode = SM_DYN_SLICE; params.sSpatialLayers[0].sSliceArgument.uiSliceMode = SM_SIZELIMITED_SLICE;
params.sSpatialLayers[0].sSliceCfg.sSliceArgument.uiSliceSizeConstraint = ms_factory_get_payload_max_size(mFilter->factory); params.sSpatialLayers[0].sSliceArgument.uiSliceSizeConstraint = ms_factory_get_payload_max_size(mFilter->factory);
ret = mEncoder->InitializeExt(&params); ret = mEncoder->InitializeExt(&params);
if (ret != 0) { if (ret != 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment