diff --git a/src/main.cpp b/src/main.cpp index cfcac225c..f99e7778f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1447,7 +1447,7 @@ int main(int argc, char *argv[]) params["a_tx_port"].i = opt.audio.send_port; if (strcmp(opt.video_protocol, "rtsp") == 0) { - rtps_types_t avType; + rtsp_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 diff --git a/src/rtsp/BasicRTSPOnlySubsession.cpp b/src/rtsp/BasicRTSPOnlySubsession.cpp index b454b8a24..36834c7e3 100644 --- a/src/rtsp/BasicRTSPOnlySubsession.cpp +++ b/src/rtsp/BasicRTSPOnlySubsession.cpp @@ -60,13 +60,13 @@ BasicRTSPOnlySubsession* BasicRTSPOnlySubsession::createNew(UsageEnvironment& env, - Boolean reuseFirstSource, rtps_types_t avType, + Boolean reuseFirstSource, rtsp_types_t avType, struct rtsp_server_parameters params) { return new BasicRTSPOnlySubsession(env, reuseFirstSource, avType, params); } BasicRTSPOnlySubsession::BasicRTSPOnlySubsession(UsageEnvironment& env, - Boolean reuseFirstSource, rtps_types_t avType, + Boolean reuseFirstSource, rtsp_types_t avType, struct rtsp_server_parameters params) : ServerMediaSubsession(env), fSDPLines(NULL), fReuseFirstSource( reuseFirstSource), fLastStreamToken(NULL), diff --git a/src/rtsp/BasicRTSPOnlySubsession.hh b/src/rtsp/BasicRTSPOnlySubsession.hh index af42d6883..1289f3a48 100644 --- a/src/rtsp/BasicRTSPOnlySubsession.hh +++ b/src/rtsp/BasicRTSPOnlySubsession.hh @@ -95,12 +95,12 @@ public: static BasicRTSPOnlySubsession* createNew(UsageEnvironment& env, Boolean reuseFirstSource, - rtps_types_t avType, struct rtsp_server_parameters); + rtsp_types_t avType, struct rtsp_server_parameters); protected: BasicRTSPOnlySubsession(UsageEnvironment& env, Boolean reuseFirstSource, - rtps_types_t avType, struct rtsp_server_parameters); + rtsp_types_t avType, struct rtsp_server_parameters); ~BasicRTSPOnlySubsession() override; @@ -152,7 +152,7 @@ private: MAYBE_UNUSED_ATTRIBUTE Boolean fReuseFirstSource; MAYBE_UNUSED_ATTRIBUTE void* fLastStreamToken; char fCNAME[100]; - rtps_types_t avType; + rtsp_types_t avType; struct rtsp_server_parameters rtsp_params; }; diff --git a/src/rtsp/c_basicRTSPOnlyServer.h b/src/rtsp/c_basicRTSPOnlyServer.h index 5c2d265dc..b3ce6704d 100644 --- a/src/rtsp/c_basicRTSPOnlyServer.h +++ b/src/rtsp/c_basicRTSPOnlyServer.h @@ -67,7 +67,7 @@ struct rtsp_server_parameters { unsigned int rtsp_port; struct module *parent; - rtps_types_t avType; + rtsp_types_t avType; audio_codec_t audio_codec; int audio_sample_rate; int audio_channels; diff --git a/src/rtsp/rtsp_utils.h b/src/rtsp/rtsp_utils.h index 307bbebb8..1bd6d3912 100644 --- a/src/rtsp/rtsp_utils.h +++ b/src/rtsp/rtsp_utils.h @@ -7,7 +7,6 @@ typedef enum { video = 1 << 1, av = audio | video, rtsp_av_type_last = av, -}rtps_types_t; - +} rtsp_types_t; #endif diff --git a/src/video_capture/rtsp.c b/src/video_capture/rtsp.c index 17d8320d8..11f697eca 100644 --- a/src/video_capture/rtsp.c +++ b/src/video_capture/rtsp.c @@ -277,7 +277,7 @@ struct rtsp_state { CURL *curl; char uri[1024]; char base_url[1024]; ///< for control URLs with relative path; '/' included - rtps_types_t avType; + rtsp_types_t avType; const char *addr; char *sdp; diff --git a/src/video_rxtx/h264_rtp.cpp b/src/video_rxtx/h264_rtp.cpp index c73c45e96..78adc7170 100644 --- a/src/video_rxtx/h264_rtp.cpp +++ b/src/video_rxtx/h264_rtp.cpp @@ -67,7 +67,7 @@ h264_rtp_video_rxtx::h264_rtp_video_rxtx(std::map const &p { rtsp_params.rtsp_port = (unsigned) rtsp_port; rtsp_params.parent = static_cast(params.at("parent").ptr); - rtsp_params.avType = static_cast(params.at("avType").l); + rtsp_params.avType = static_cast(params.at("avType").l); rtsp_params.audio_codec = static_cast(params.at("audio_codec").l); rtsp_params.audio_sample_rate = params.at("audio_sample_rate").i; rtsp_params.audio_channels = params.at("audio_channels").i;