Remove setTemporalLayerBitrateFramerate in libmix
BZ: 179113
Remove setTemporalLayerBitrateFramerate in libmix.
It will be replaced by VideoEncodeCommon
Rename variable name.
Change-Id: I9679960a873b9d4a11fcf5b1a5c3294338a0520d
Signed-off-by: bolunliu <bolun.liu@intel.com>
diff --git a/videoencoder/VideoEncoderBase.cpp b/videoencoder/VideoEncoderBase.cpp
index c14ba3d..718b9c9 100644
--- a/videoencoder/VideoEncoderBase.cpp
+++ b/videoencoder/VideoEncoderBase.cpp
@@ -887,6 +887,8 @@
mComParams.rcParams.disableFrameSkip = 0;
mComParams.rcParams.disableBitsStuffing = 1;
mComParams.rcParams.enableIntraFrameQPControl = 0;
+ mComParams.rcParams.temporalFrameRate = 0;
+ mComParams.rcParams.temporalID = 0;
mComParams.cyclicFrameInterval = 30;
mComParams.refreshType = VIDEO_ENC_NONIR;
mComParams.airParams.airMBs = 0;
@@ -1227,8 +1229,7 @@
case VideoConfigTypeSliceNum:
case VideoConfigTypeVP8:
case VideoConfigTypeVP8ReferenceFrame:
- case VideoConfigTypeVP8MaxFrameSizeRatio:
- case VideoConfigTypeVP8TemporalBitRateFrameRate:{
+ case VideoConfigTypeVP8MaxFrameSizeRatio:{
ret = derivedSetConfig(videoEncConfig);
break;
}
diff --git a/videoencoder/VideoEncoderDef.h b/videoencoder/VideoEncoderDef.h
index c116412..6c74b32 100644
--- a/videoencoder/VideoEncoderDef.h
+++ b/videoencoder/VideoEncoderDef.h
@@ -231,6 +231,8 @@
uint32_t disableFrameSkip;
uint32_t disableBitsStuffing;
uint32_t enableIntraFrameQPControl;
+ uint32_t temporalFrameRate;
+ uint32_t temporalID;
VideoRateControlParams &operator=(const VideoRateControlParams &other) {
if (this == &other) return *this;
@@ -246,6 +248,8 @@
this->disableFrameSkip = other.disableFrameSkip;
this->disableBitsStuffing = other.disableBitsStuffing;
this->enableIntraFrameQPControl = other.enableIntraFrameQPControl;
+ this->temporalFrameRate = other.temporalFrameRate;
+ this->temporalID = other.temporalID;
return *this;
}
@@ -331,7 +335,6 @@
VideoConfigTypeVP8ReferenceFrame,
VideoConfigTypeCIR,
VideoConfigTypeVP8MaxFrameSizeRatio,
- VideoConfigTypeVP8TemporalBitRateFrameRate,
VideoParamsConfigExtension
};
@@ -699,19 +702,4 @@
uint32_t max_frame_size_ratio;
};
-struct VideoConfigVP8TemporalBitRateFrameRate : VideoParamConfigSet {
-
- VideoConfigVP8TemporalBitRateFrameRate() {
- type = VideoConfigTypeVP8TemporalBitRateFrameRate;
- size = sizeof(VideoConfigVP8TemporalBitRateFrameRate);
- }
-
- uint32_t layerID;
- uint32_t bitRate;
- uint32_t frameRate;
-};
-
-
-
-
#endif /* __VIDEO_ENCODER_DEF_H__ */
diff --git a/videoencoder/VideoEncoderVP8.cpp b/videoencoder/VideoEncoderVP8.cpp
index 4892cf0..3db3435 100644
--- a/videoencoder/VideoEncoderVP8.cpp
+++ b/videoencoder/VideoEncoderVP8.cpp
@@ -44,16 +44,6 @@
mVideoConfigVP8ReferenceFrame.refresh_golden_frame = 1;
mVideoConfigVP8ReferenceFrame.refresh_alternate_frame = 1;
- mVideoConfigVP8TemporalBitRateFrameRate[0].bitRate = 0;
- mVideoConfigVP8TemporalBitRateFrameRate[0].frameRate = 0;
- mVideoConfigVP8TemporalBitRateFrameRate[0].layerID = 0;
- mVideoConfigVP8TemporalBitRateFrameRate[1].bitRate = 0;
- mVideoConfigVP8TemporalBitRateFrameRate[1].frameRate = 0;
- mVideoConfigVP8TemporalBitRateFrameRate[1].layerID = 0;
- mVideoConfigVP8TemporalBitRateFrameRate[2].bitRate = 0;
- mVideoConfigVP8TemporalBitRateFrameRate[2].frameRate = 0;
- mVideoConfigVP8TemporalBitRateFrameRate[2].layerID = 0;
-
mComParams.profile = VAProfileVP8Version0_3;
}
@@ -273,7 +263,7 @@
misc_param->type = VAEncMiscParameterTypeRateControl;
misc_rate_ctrl = (VAEncMiscParameterRateControl *)misc_param->data;
memset(misc_rate_ctrl, 0, sizeof(*misc_rate_ctrl));
- misc_rate_ctrl->bits_per_second = mVideoConfigVP8TemporalBitRateFrameRate[i].bitRate;
+// misc_rate_ctrl->bits_per_second = mVideoConfigVP8TemporalBitRateFrameRate[i].bitRate;
misc_rate_ctrl->rc_flags.bits.temporal_id = 0;
misc_rate_ctrl->target_percentage = 100;
misc_rate_ctrl->window_size = 1000;
@@ -299,7 +289,7 @@
misc_framerate = (VAEncMiscParameterFrameRate *)misc_param->data;
memset(misc_framerate, 0, sizeof(*misc_framerate));
misc_framerate->framerate_flags.bits.temporal_id = i;
- misc_framerate->framerate = mVideoConfigVP8TemporalBitRateFrameRate[i].frameRate;
+// misc_framerate->framerate = mVideoConfigVP8TemporalBitRateFrameRate[i].frameRate;
vaUnmapBuffer(mVADisplay, framerate_param_buf);
@@ -433,20 +423,6 @@
}
break;
- case VideoConfigTypeVP8TemporalBitRateFrameRate:{
- VideoConfigVP8TemporalBitRateFrameRate *encConfigVP8TemporalBitRateFrameRate =
- reinterpret_cast<VideoConfigVP8TemporalBitRateFrameRate*>(videoEncConfig);
-
- if(encConfigVP8TemporalBitRateFrameRate->size != sizeof(VideoConfigVP8TemporalBitRateFrameRate)) {
- return ENCODE_INVALID_PARAMS;
- }
- layer_id = encConfigVP8TemporalBitRateFrameRate->layerID % 3;
- encConfigVP8TemporalBitRateFrameRate->bitRate= mVideoConfigVP8TemporalBitRateFrameRate[layer_id].bitRate;
- encConfigVP8TemporalBitRateFrameRate->frameRate = mVideoConfigVP8TemporalBitRateFrameRate[layer_id].frameRate;
- }
- break;
-
-
default: {
LOG_E ("Invalid Config Type");
break;
@@ -503,21 +479,6 @@
}
break;
- case VideoConfigTypeVP8TemporalBitRateFrameRate:{
- VideoConfigVP8TemporalBitRateFrameRate *encConfigVP8TemporalBitRateFrameRate =
- reinterpret_cast<VideoConfigVP8TemporalBitRateFrameRate*>(videoEncConfig);
-
- if (encConfigVP8TemporalBitRateFrameRate->size != sizeof(VideoConfigVP8TemporalBitRateFrameRate)) {
- return ENCODE_INVALID_PARAMS;
- }
- layer_id = encConfigVP8TemporalBitRateFrameRate->layerID % 3;
- mVideoConfigVP8TemporalBitRateFrameRate[layer_id].layerID = layer_id;
- mVideoConfigVP8TemporalBitRateFrameRate[layer_id].bitRate = encConfigVP8TemporalBitRateFrameRate->bitRate;
- mVideoConfigVP8TemporalBitRateFrameRate[layer_id].frameRate = encConfigVP8TemporalBitRateFrameRate->frameRate;
- mRenderMultiTemporal = true;
- }
- break;
-
default: {
LOG_E ("Invalid Config Type");
break;
diff --git a/videoencoder/VideoEncoderVP8.h b/videoencoder/VideoEncoderVP8.h
index 6a036f7..20cd72c 100644
--- a/videoencoder/VideoEncoderVP8.h
+++ b/videoencoder/VideoEncoderVP8.h
@@ -45,7 +45,6 @@
VideoConfigVP8 mVideoConfigVP8;
VideoParamsVP8 mVideoParamsVP8;
VideoConfigVP8ReferenceFrame mVideoConfigVP8ReferenceFrame;
- VideoConfigVP8TemporalBitRateFrameRate mVideoConfigVP8TemporalBitRateFrameRate[3];
};
#endif /* __VIDEO_ENCODER_VP8_H__ */
