Commit b5212f8d authored by Mickaël Turnel's avatar Mickaël Turnel

Remove setter for configuration list

parent ad53807c
......@@ -211,13 +211,6 @@ static int msopenh264_enc_get_configuration_list(MSFilter *f, void *arg) {
return 0;
}
static int msopenh264_enc_set_configuration_list(MSFilter *f, void *arg) {
MSOpenH264Encoder *e = static_cast<MSOpenH264Encoder *>(f->data);
const MSVideoConfiguration **vconf_list = static_cast<const MSVideoConfiguration **>(arg);
e->setConfigurationList(*vconf_list);
return 0;
}
static int msopenh264_enc_get_configuration(MSFilter *f, void *arg) {
MSOpenH264Encoder *e = static_cast<MSOpenH264Encoder *>(f->data);
MSVideoConfiguration *vconf = static_cast<MSVideoConfiguration *>(arg);
......@@ -240,7 +233,6 @@ static MSFilterMethod msopenh264_enc_methods[] = {
{ MS_VIDEO_ENCODER_NOTIFY_FIR, msopenh264_enc_notify_fir },
{ MS_VIDEO_ENCODER_ENABLE_AVPF, msopenh264_enc_enable_avpf },
{ MS_VIDEO_ENCODER_GET_CONFIGURATION_LIST, msopenh264_enc_get_configuration_list },
{ MS_VIDEO_ENCODER_SET_CONFIGURATION_LIST, msopenh264_enc_set_configuration_list },
{ MS_VIDEO_ENCODER_GET_CONFIGURATION, msopenh264_enc_get_configuration },
{ MS_VIDEO_ENCODER_SET_CONFIGURATION, msopenh264_enc_set_configuration },
{ 0, NULL }
......
......@@ -72,7 +72,6 @@ MSOpenH264Encoder::MSOpenH264Encoder(MSFilter *f)
if (ret != 0) {
ms_error("OpenH264 encoder: Failed to create encoder: %li", ret);
}
setConfigurationList(NULL);
}
MSOpenH264Encoder::~MSOpenH264Encoder()
......@@ -238,17 +237,6 @@ void MSOpenH264Encoder::addFmtp(const char *fmtp)
}
}
void MSOpenH264Encoder::setConfigurationList(const MSVideoConfiguration *confList) {
MSVideoSize vsize;
if (confList == NULL) {
mVConfList = openh264_conf_list;
} else {
mVConfList = confList;
}
MS_VIDEO_SIZE_ASSIGN(vsize, CIF);
mVConf = ms_video_find_best_configuration_for_size(mVConfList, vsize, ms_factory_get_cpu_count(mFilter->factory));
}
void MSOpenH264Encoder::setConfiguration(MSVideoConfiguration conf)
{
MSVideoSize vsize = mVConf.vsize;
......
......@@ -36,7 +36,6 @@ public:
void uninitialize();
void addFmtp(const char *fmtp);
const MSVideoConfiguration *getConfigurationList() const { return mVConfList; }
void setConfigurationList(const MSVideoConfiguration *confList);
void setConfiguration(MSVideoConfiguration conf);
MSVideoConfiguration getConfiguration() { return mVConf; }
void requestVFU();
......
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