Feature/adaptive video definition

include/mediastreamer2/Makefile.am

@@ -46,6 +46,7 @@ mediastreamer2_include_HEADERS=allfilters.h \
 				msvideo.h \
 				msvideoout.h \
 				msvideopresets.h \
+				msvideoqualitycontroller.h \
 				msvolume.h \
 				mswebcam.h \
 				qualityindicator.h \

include/mediastreamer2/mediastream.h

@@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <mediastreamer2/mssndcard.h>
 #include <mediastreamer2/mswebcam.h>
 #include <mediastreamer2/msvideo.h>
+#include <mediastreamer2/msvideoqualitycontroller.h>
 #include <mediastreamer2/bitratecontrol.h>
 #include <mediastreamer2/qualityindicator.h>
 #include <mediastreamer2/ice.h>
@@ -142,6 +143,7 @@ struct _MediaStream {
 	OrtpEvDispatcher *evd;
 	MSFactory *factory;
 	MSBandwidthController *bandwidth_controller;
+	MSVideoQualityController *video_quality_controller;
 };
 
 MS2_PUBLIC void media_stream_init(MediaStream *stream, MSFactory *factory, const MSMediaStreamSessions *sessions);
@@ -930,6 +932,8 @@ MS2_PUBLIC MSFilter* video_stream_get_source_filter(const VideoStream* stream);
 
 MS2_PUBLIC void video_stream_change_camera(VideoStream *stream, MSWebCam *cam);
 
+MS2_PUBLIC void video_stream_change_camera_skip_bitrate(VideoStream *stream, MSWebCam *cam);
+
 /**
  * @brief This functions changes the source filter for the passed video stream.
  * @details This is quite the same function as \ref video_stream_change_camera, but this one
@@ -1164,6 +1168,12 @@ MS2_PUBLIC void audio_stream_unlink_video(AudioStream *stream, VideoStream *vide
  */
 MS2_PUBLIC void video_stream_use_video_preset(VideoStream *stream, const char *preset);
 
+/**
+ * Returns the name of the video preset used for the video stream.
+ * @param[in] stream VideoStream object
+ */
+MS2_PUBLIC const char* video_stream_get_video_preset(VideoStream *stream);
+
 
 /**
  * Open a player to play a video file (mkv) to remote end.

include/mediastreamer2/msvideoqualitycontroller.h

+/*
+ * msvideoqualitycontroller.h - Controls the quality of a video stream
+ *
+ * Copyright (C) 2019 Belledonne Communications, Grenoble, France
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef msvideoqualitycontroller_h
+#define msvideoqualitycontroller_h
+
+#include "mediastreamer2/msvideo.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct _VideoStream;
+
+struct _MSVideoQualityController {
+	struct _VideoStream *stream;
+	int last_tmmbr;
+	MSVideoSize last_vsize;
+	
+	time_t increase_timer_start;
+	bool_t increase_timer_running;
+};
+
+typedef struct _MSVideoQualityController MSVideoQualityController;
+
+MS2_PUBLIC MSVideoQualityController *ms_video_quality_controller_new(struct _VideoStream *stream);
+MS2_PUBLIC void ms_video_quality_controller_destroy(MSVideoQualityController *obj);
+
+MS2_PUBLIC void ms_video_quality_controller_process_timer(MSVideoQualityController *obj);
+MS2_PUBLIC void ms_video_quality_controller_update_from_tmmbr(MSVideoQualityController *obj, int tmmbr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* msvideoqualitycontroller_h */

include/CMakeLists.txt

@@ -67,6 +67,7 @@ set(HEADER_FILES
 	msvideo.h
 	msvideoout.h
 	msvideopresets.h
+	msvideoqualitycontroller.h
 	msvolume.h
 	mswebcam.h
 	qualityindicator.h

java/src/org/linphone/mediastream/video/capture/hwconf/AndroidCameraConfiguration.java

@@ -102,12 +102,6 @@ public class AndroidCameraConfiguration {
 			}
 		}
 
-		public AndroidCamera(int i, boolean f, List<Size> r, int o) {
-			this.id = i;
-			this.frontFacing = f;
-			this.orientation = o;
-			this.resolutions = r;
-		}
 		public AndroidCamera(int i, boolean f, int o, List<android.hardware.Camera.Size> origin) {
 			this.resolutions = new ArrayList<Size>(origin.size());
 			for (android.hardware.Camera.Size s : origin) {
@@ -117,10 +111,10 @@ public class AndroidCameraConfiguration {
 			this.frontFacing = f;
 			this.orientation = o;
 		}
+
 		public int id;
 		public boolean frontFacing; // false => rear facing
 		public int orientation;
 		public List<Size> resolutions;
-
 	}
 }
\ No newline at end of file