Commit 8914e38f authored by Mickaël Turnel's avatar Mickaël Turnel

Fix mediastream message when a new video configuration is selected

parent adab3a86
......@@ -44,19 +44,19 @@ static const MSVideoConfiguration vp8_conf_list[] = {
MS_VP8_CONF(1024000, 1536000, SXGA_MINUS, 12, 2),
MS_VP8_CONF( 750000, 1024000, XGA, 12, 2),
MS_VP8_CONF( 500000, 750000, SVGA, 12, 2),
MS_VP8_CONF( 800000, 3000000, VGA, 30, 8),
MS_VP8_CONF( 800000, 3000000, VGA, 30, 8),
MS_VP8_CONF( 800000, 3000000, VGA, 25, 4),
MS_VP8_CONF( 400000, 800000, VGA, 12, 2),
MS_VP8_CONF( 100000, 300000, QVGA, 18, 2),
MS_VP8_CONF( 64000, 100000, QCIF, 12, 2),
MS_VP8_CONF(400000, 600000, VGA, 12, 1),
MS_VP8_CONF(100000, 300000, QVGA, 10, 1),
MS_VP8_CONF( 64000, 100000, QCIF, 10, 1),
MS_VP8_CONF( 400000, 600000, VGA, 12, 1),
MS_VP8_CONF( 100000, 300000, QVGA, 10, 1),
MS_VP8_CONF( 64000, 100000, QCIF, 10, 1),
MS_VP8_CONF( 0, 64000, QCIF, 5, 1)
#else
MS_VP8_CONF(1536000, 2560000, SXGA_MINUS, 25, 4),
MS_VP8_CONF(800000, 2000000, 720P, 25, 4),
MS_VP8_CONF(800000, 1536000, XGA, 25, 4),
MS_VP8_CONF( 800000, 2000000, 720P, 25, 4),
MS_VP8_CONF( 800000, 1536000, XGA, 25, 4),
MS_VP8_CONF( 600000, 1024000, SVGA, 25, 2),
MS_VP8_CONF( 600000, 3000000, VGA, 30, 2),
MS_VP8_CONF( 350000, 600000, VGA, 25, 2),
......
......@@ -667,7 +667,7 @@ static void apply_bitrate_limit(MediaStream *obj, int br_limit){
vconf1 = ms_video_find_best_configuration_for_size_and_bitrate(vconf_list, vsize, ms_factory_get_cpu_count(obj->factory), previous_br_limit);
vconf2 = ms_video_find_best_configuration_for_size_and_bitrate(vconf_list, vsize, ms_factory_get_cpu_count(obj->factory), br_limit);
if (!ms_video_configuratons_equal(&vconf1, &vconf2)) {
ms_message("VideoStream[%p]: bitrate update will change would need to change fps", obj);
ms_message("VideoStream[%p]: bitrate update will change fps", obj);
ms_filter_call_method(obj->encoder, MS_FILTER_SET_FPS, &vconf2.fps);
ms_filter_call_method(((VideoStream*)obj)->source, MS_FILTER_SET_FPS, &vconf2.fps);
((VideoStream*)obj)->configured_fps = vconf2.fps;
......
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