Commit 948f2e49 authored by François Grisez's avatar François Grisez
Browse files

Fix regression around freezeOnError and AVPF decoding/encoding filters setter.

parent cc15c439
......@@ -75,7 +75,7 @@ int DecodingFilterWrapper::onGetOutFmtCall(MSFilter *f, void *arg) {
int DecodingFilterWrapper::onEnableAvpfCall(MSFilter *f, void *arg) {
try {
const bool_t *enable = static_cast<bool_t *>(arg);
static_cast<DecoderFilter *>(f->data)->enableAvpf(enable);
static_cast<DecoderFilter *>(f->data)->enableAvpf(*enable);
return 0;
} catch (const DecoderFilter::MethodCallFailed &) {
return -1;
......@@ -85,7 +85,7 @@ int DecodingFilterWrapper::onEnableAvpfCall(MSFilter *f, void *arg) {
int DecodingFilterWrapper::onEnableFreezeOnErrorCall(MSFilter *f, void *arg) {
try {
const bool_t *enable = static_cast<bool_t *>(arg);
static_cast<DecoderFilter *>(f->data)->enableFreezeOnError(enable);
static_cast<DecoderFilter *>(f->data)->enableFreezeOnError(*enable);
return 0;
} catch (const DecoderFilter::MethodCallFailed &) {
return -1;
......
......@@ -55,8 +55,8 @@ int EncodingFilterWrapper::onSetConfigurationCall(MSFilter *f, void *arg) {
int EncodingFilterWrapper::onEnableAvpfCall(MSFilter *f, void *arg) {
try {
bool_t enable = *static_cast<bool_t *>(arg);
static_cast<EncoderFilter *>(f->data)->enableAvpf(enable);
const bool_t *enable = static_cast<bool_t *>(arg);
static_cast<EncoderFilter *>(f->data)->enableAvpf(*enable);
return 0;
} catch (const EncoderFilter::MethodCallFailed &) {
return -1;
......
......@@ -99,8 +99,8 @@ void H26xDecoderFilter::process() {
requestPli = false;
}
if (_avpfEnabled && requestPli) {
notify(MS_VIDEO_DECODER_SEND_PLI);
if (requestPli) {
notify(_avpfEnabled ? MS_VIDEO_DECODER_SEND_PLI : MS_VIDEO_DECODER_DECODING_ERRORS);
}
}
......@@ -125,6 +125,7 @@ const MSFmtDescriptor *H26xDecoderFilter::getOutputFmt() const {
}
void H26xDecoderFilter::enableAvpf(bool enable) {
ms_message("H26xDecoder: %s AVPF mode", enable ? "enabling" : "disabling");
_avpfEnabled = enable;
}
......
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