Rewrite RTSP server

configure.ac

@@ -1392,8 +1392,7 @@ livemedia=no
 livemedia_prefix=/usr
 
 AC_ARG_ENABLE(rtsp_server,
-[  --enable-rtsp-server    enables RTSP server support (default is auto)]
-[                          Requires: live555 (<= 2015)],
+[  --enable-rtsp-server    enables RTSP server support (default is auto)],
     [rtsp_server_req=$enableval],
     [rtsp_server_req=$build_default]
     )
@@ -1411,13 +1410,8 @@ if test $rtsp_server_req != no; then
         CPPFLAGS="$CPPFLAGS $RTSP_SERVER_FLAGS"
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
                            #include <liveMedia.hh>
-                           #include <liveMedia_version.hh>
-                           ]], [[
-                                #if LIVEMEDIA_LIBRARY_VERSION_INT > 1438905600
-                                #error "Unsuppored live555 version (too new)"
-                                #endif
-                                ]]
-                           )], FOUND_LIVE_H=yes, [echo "liveMedia (live555 library) headers not found or wrong version (< 2015 needed)"; FOUND_LIVE_H=no])
+                           ]]
+                           )], FOUND_LIVE_H=yes, [echo "liveMedia (live555 library) headers not found"; FOUND_LIVE_H=no])
         CPPFLAGS=$SAVED_CPPFLAGS
         AC_LANG_POP(C++)
         if test $FOUND_LIVE_H = yes
@@ -1426,7 +1420,7 @@ if test $rtsp_server_req != no; then
                 CFLAGS="$CFLAGS $RTSP_SERVER_FLAGS"
                 CXXFLAGS="$CXXFLAGS $RTSP_SERVER_FLAGS"
                 RTSP_SERVER_LIBS="-lliveMedia -lBasicUsageEnvironment -lUsageEnvironment -lgroupsock"
-                RTSP_SERVER_OBJ="src/rtsp/c_basicRTSPOnlyServer.o src/rtsp/BasicRTSPOnlyServer.o src/rtsp/BasicRTSPOnlySubsession.o src/video_rxtx/h264_rtp.o"
+                RTSP_SERVER_OBJ="src/rtsp/ultragrid_rtsp.o src/rtsp/UltragridRTSPServer.o src/rtsp/UltragridRTSPSubsession.o src/video_rxtx/h264_rtp.o"
                 add_module video_rxtx_h264 "$RTSP_SERVER_OBJ" "$RTSP_SERVER_LIBS"
                 rtsp_server=yes
                 livemedia=yes

src/main.cpp

@@ -1474,22 +1474,28 @@ int main(int argc, char *argv[])
                 params["audio_codec"].l = ac_params.codec;
                 params["audio_sample_rate"].i =
                     IF_NOT_NULL_ELSE(ac_params.sample_rate, kHz48);
-                params["audio_channels"].i = audio_capture_channels;
                 params["audio_bps"].i = 2;
                 params["a_rx_port"].i = opt.audio.recv_port;
                 params["a_tx_port"].i = opt.audio.send_port;
 
+                // override number of channels for OPUS as OPUS does not support mono
+                if (ac_params.codec == AC_OPUS) {
+                        params["audio_channels"].i = 2;
+                } else {
+                        params["audio_channels"].i = audio_capture_channels;
+                }
+
                 if (strcmp(opt.video_protocol, "rtsp") == 0) {
-                        rtps_types_t avType;
-                        if(strcmp("none", vidcap_params_get_driver(opt.vidcap_params_head)) != 0 && (strcmp("none",opt.audio.send_cfg) != 0)) avType = av; //AVStream
-                        else if((strcmp("none",opt.audio.send_cfg) != 0)) avType = audio; //AStream
-                        else if(strcmp("none", vidcap_params_get_driver(opt.vidcap_params_head))) avType = video; //VStream
+                        rtsp_media_type_t media_type;
+                        if(strcmp("none", vidcap_params_get_driver(opt.vidcap_params_head)) != 0 && (strcmp("none",opt.audio.send_cfg) != 0)) media_type = av; //AVStream
+                        else if((strcmp("none",opt.audio.send_cfg) != 0)) media_type = audio; //AStream
+                        else if(strcmp("none", vidcap_params_get_driver(opt.vidcap_params_head))) media_type = video; //VStream
                         else {
                                 printf("[RTSP SERVER CHECK] no stream type... check capture devices input...\n");
-                                avType = none;
+                                media_type = none;
                         }
 
-                        params["avType"].l = (long) avType;
+                        params["media_type"].l = (long) media_type;
                 }
 
                 sdp_set_properties(opt.requested_receiver, opt.video_rxtx_mode & MODE_SENDER && strcasecmp(opt.video_protocol, "sdp") == 0, opt.audio.send_port != 0 && strcasecmp(opt.audio.proto, "sdp") == 0);