]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-10209: [freeswitch-core,mod_av] Add auth params to file handles
authorAnthony Minessale <anthm@freeswitch.org>
Tue, 4 Apr 2017 16:42:29 +0000 (11:42 -0500)
committerMike Jerris <mike@jerris.com>
Tue, 11 Apr 2017 18:41:34 +0000 (13:41 -0500)
src/include/switch_module_interfaces.h
src/mod/applications/mod_av/avformat.c
src/mod/applications/mod_av/mod_av.c
src/switch_core_file.c

index e0a5c2019e3d38032fa787df738a6f5830d8a9c2..7ca027d9132e449ba7b5294a3ff69b958b3e6050 100644 (file)
@@ -329,6 +329,11 @@ typedef struct switch_mm_s {
        switch_video_profile_t vprofile;
        switch_video_encode_speed_t vencspd;
        uint8_t try_hardware_encoder;
+       int scale_w;
+       int scale_h;
+       switch_img_fmt_t fmt;
+       char *auth_username;
+       char *auth_password;
 } switch_mm_t;
 
 /*! an abstract representation of a file handle (some parameters based on compat with libsndfile) */
index b944625b148bf58f3e5fabfb13f4bbb6404c930d..4b928019acc8e13eb5d9b60b4eae3979f4dcb6bf 100644 (file)
@@ -906,7 +906,7 @@ SWITCH_STANDARD_APP(record_av_function)
                char codec_str[256];
                const AVCodecDescriptor *desc;
 
-               if (!strncmp(data, "rtmp://", 7)) {
+               if (!strncmp(data, "rtmp://", 7) || !strncmp(data, "rtsp://", 7)) {
                        fmt->video_codec = AV_CODEC_ID_H264;
                        fmt->audio_codec = AV_CODEC_ID_AAC;
                }
@@ -1694,9 +1694,20 @@ static switch_status_t av_file_open(switch_file_handle_t *handle, const char *pa
                return SWITCH_STATUS_GENERR;
        } else if (handle->stream_name && (!strcasecmp(handle->stream_name, "rtmp") || !strcasecmp(handle->stream_name, "youtube"))) {
                format = "flv";
-               switch_snprintf(file, sizeof(file), "rtmp://%s", path);
+
+               // meh really silly format for the user / pass libav.....
+               if (handle->mm.auth_username && handle->mm.auth_password) { 
+                       switch_snprintf(file, sizeof(file), "rtmp://%s pubUser=%s pubPasswd=%s flashver=FMLE/3.0", path, handle->mm.auth_username, handle->mm.auth_password);
+               } else {
+                       switch_snprintf(file, sizeof(file), "rtmp://%s", path);
+               }
+
+       } else if (handle->stream_name && !strcasecmp(handle->stream_name, "rtsp")) {
+               format = "rtsp";
+               switch_snprintf(file, sizeof(file), "rtsp://%s", path);
        }
 
+
        ext++;
 
        if ((context = (av_file_context_t *)switch_core_alloc(handle->memory_pool, sizeof(av_file_context_t))) == 0) {
@@ -1783,7 +1794,7 @@ static switch_status_t av_file_open(switch_file_handle_t *handle, const char *pa
        if (fmt->video_codec != AV_CODEC_ID_NONE) {
                const AVCodecDescriptor *desc;
 
-               if ((handle->stream_name && (!strcasecmp(handle->stream_name, "rtmp") || !strcasecmp(handle->stream_name, "youtube")))) {
+               if ((handle->stream_name && (!strcasecmp(handle->stream_name, "rtmp") || !strcasecmp(handle->stream_name, "rtsp") || !strcasecmp(handle->stream_name, "youtube")))) {
 
                        if (fmt->video_codec != AV_CODEC_ID_H264 ) {
                                fmt->video_codec = AV_CODEC_ID_H264; // force H264
@@ -2525,6 +2536,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_avformat_load)
 
        supported_formats[i++] = "av";
        supported_formats[i++] = "rtmp";
+       supported_formats[i++] = "rtsp";
        supported_formats[i++] = "mp4";
        supported_formats[i++] = "m4a";
        supported_formats[i++] = "mov";
index 3d3bd8282abd513cf934f7a0a69bccadd6e4fb69..141fcdc394f09451790106dbffe0c32d5693b88b 100644 (file)
@@ -93,7 +93,7 @@ int mod_av_lockmgr_cb(void **m, enum AVLockOp op)
 static void log_callback(void *ptr, int level, const char *fmt, va_list vl)
 {
        switch_log_level_t switch_level = SWITCH_LOG_DEBUG;
-
+       return;
        /* naggy messages */
        if (level == AV_LOG_DEBUG || level == AV_LOG_WARNING) return;
 
index 46ee5390b981e48cef9cd31c1966a1fcd0151542..aff9442d7887d872a345a0885201895e28335e87 100644 (file)
@@ -177,6 +177,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_perform_file_open(const char *file,
                        fh->mm.try_hardware_encoder = switch_true(val);
                }
 
+               if ((val = switch_event_get_header(fh->params, "auth_username"))) {
+                       fh->mm.auth_username = switch_core_strdup(fh->memory_pool, val);
+               }
+
+               if ((val = switch_event_get_header(fh->params, "auth_password"))) {
+                       fh->mm.auth_password = switch_core_strdup(fh->memory_pool, val);
+               }
+
                if ((val = switch_event_get_header(fh->params, "fps"))) {
                        float ftmp = atof(val);
                        if (ftmp > 0.0f) {