Commit eb6d2bf6 authored by Simon Morlat's avatar Simon Morlat
Browse files

Workaround VP8 encoder reconfiguration not taking into account framerate...

Workaround VP8 encoder reconfiguration not taking into account framerate changes. Fix video size adaptation not taking into account bitrate changes. A bit of cleanup in logs.
parent 82a6f61d
......@@ -424,7 +424,7 @@ void MS2AudioStream::render(const OfferAnswerContext &params, CallSession::State
}
}
}
getGroup().addPostRenderHook([this, onHoldFile] {
/* The on-hold file is to be played once both audio and video are ready */
if (!onHoldFile.empty() && !getMediaSessionPrivate().getParams()->getPrivate()->getInConference()) {
......
......@@ -425,6 +425,7 @@ static void video_call_expected_size_for_specified_bandwidth(int bandwidth, int
LinphoneCall *call = linphone_core_get_current_call(marie->lc);
VideoStream *vstream = (VideoStream *)linphone_call_get_stream(call, LinphoneStreamTypeVideo);
MSVideoConfiguration vconf;
LinphoneCallStats *stats;
wait_for_until(marie->lc, pauline->lc, &marie->stat.last_tmmbr_value_received, 1, 50000);
......@@ -433,7 +434,9 @@ static void video_call_expected_size_for_specified_bandwidth(int bandwidth, int
while (wait_for_until(marie->lc, pauline->lc, &marie->stat.last_tmmbr_value_received, 1, 10000)) {
marie->stat.last_tmmbr_value_received = 0;
}
stats = linphone_call_get_video_stats(call);
BC_ASSERT_GREATER((int)linphone_call_stats_get_upload_bandwidth(stats), 250, int, "%i");
linphone_call_stats_unref(stats);
ms_filter_call_method(vstream->ms.encoder, MS_VIDEO_ENCODER_GET_CONFIGURATION, &vconf);
BC_ASSERT_EQUAL(vconf.vsize.width*vconf.vsize.height, width*height, int, "%d");
......
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