Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lsolak add video orientation extension #1905

Closed
wants to merge 1 commit into from
Closed

Lsolak add video orientation extension #1905

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions plugins/janus_sip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,6 +943,8 @@ typedef struct janus_sip_media {
janus_rtp_switching_context context;
int pipefd[2];
gboolean updated;
int video_orientation_extension_id;
int audio_level_extension_id;
} janus_sip_media;

typedef struct janus_sip_session {
Expand Down Expand Up @@ -1350,6 +1352,8 @@ static void janus_sip_media_reset(janus_sip_session *session) {
session->media.video_pt_name = NULL; /* Immutable string, no need to free*/
session->media.video_send = TRUE;
session->media.pre_hold_video_dir = JANUS_SDP_DEFAULT;
session->media.video_orientation_extension_id = -1;
session->media.audio_level_extension_id = -1;
janus_rtp_switching_context_reset(&session->media.context);
}

Expand Down Expand Up @@ -1940,6 +1944,8 @@ void janus_sip_create_session(janus_plugin_session *handle, int *error) {
session->media.video_pt_name = NULL;
session->media.video_send = TRUE;
session->media.pre_hold_video_dir = JANUS_SDP_DEFAULT;
session->media.video_orientation_extension_id = -1;
session->media.audio_level_extension_id = -1;
/* Initialize the RTP context */
janus_rtp_switching_context_reset(&session->media.context);
session->media.pipefd[0] = -1;
Expand Down Expand Up @@ -3166,6 +3172,11 @@ static void *janus_sip_handler(void *data) {
if(offer_srtp) {
JANUS_LOG(LOG_VERB, "Going to negotiate SDES-SRTP (%s)...\n", require_srtp ? "mandatory" : "optional");
}

/* Get video-orientation extension id from SDP we got */
session->media.video_orientation_extension_id = janus_rtp_header_extension_get_id(msg_sdp, JANUS_RTP_EXTMAP_VIDEO_ORIENTATION);
/* Get audio-level extension id from SDP we got */
session->media.audio_level_extension_id = janus_rtp_header_extension_get_id(msg_sdp, JANUS_RTP_EXTMAP_AUDIO_LEVEL);
/* Parse the SDP we got, manipulate some things, and generate a new one */
char sdperror[100];
janus_sdp *parsed_sdp = janus_sdp_parse(msg_sdp, sdperror, sizeof(sdperror));
Expand Down Expand Up @@ -3424,6 +3435,11 @@ static void *janus_sip_handler(void *data) {
if(answer_srtp) {
JANUS_LOG(LOG_VERB, "Going to negotiate SDES-SRTP (%s)...\n", session->media.require_srtp ? "mandatory" : "optional");
}

/* Get video-orientation extension id from SDP we got */
session->media.video_orientation_extension_id = janus_rtp_header_extension_get_id(msg_sdp, JANUS_RTP_EXTMAP_VIDEO_ORIENTATION);
/* Get audio-level extension id from SDP we got */
session->media.audio_level_extension_id = janus_rtp_header_extension_get_id(msg_sdp, JANUS_RTP_EXTMAP_AUDIO_LEVEL);
/* Parse the SDP we got, manipulate some things, and generate a new one */
char sdperror[100];
janus_sdp *parsed_sdp = janus_sdp_parse(msg_sdp, sdperror, sizeof(sdperror));
Expand Down Expand Up @@ -3566,6 +3582,11 @@ static void *janus_sip_handler(void *data) {
g_snprintf(error_cause, 512, "[SIP-%s] SDP type %s is incompatible with session status %s\n", session->account.username, msg_sdp_type, janus_sip_call_status_string(session->status));
goto error;
}

/* Get video-orientation extension id from SDP we got */
session->media.video_orientation_extension_id = janus_rtp_header_extension_get_id(msg_sdp, JANUS_RTP_EXTMAP_VIDEO_ORIENTATION);
/* Get audio-level extension id from SDP we got */
session->media.audio_level_extension_id = janus_rtp_header_extension_get_id(msg_sdp, JANUS_RTP_EXTMAP_AUDIO_LEVEL);
/* Parse the SDP we got, manipulate some things, and generate a new one */
char sdperror[100];
janus_sdp *parsed_sdp = janus_sdp_parse(msg_sdp, sdperror, sizeof(sdperror));
Expand Down Expand Up @@ -6005,6 +6026,18 @@ static void *janus_sip_relay_thread(void *data) {
/* Relay to application */
janus_plugin_rtp rtp = { .video = FALSE, .buffer = buffer, .length = bytes };
janus_plugin_rtp_extensions_reset(&rtp.extensions);

/* Add audio-level extension */
if(session->media.audio_level_extension_id != -1) {
gboolean vad = FALSE;
int level = -1;
if(janus_rtp_header_extension_parse_audio_level(buffer, bytes,
session->media.audio_level_extension_id, &vad, &level) == 0) {
rtp.extensions.audio_level = level;
rtp.extensions.audio_level_vad = vad;
}
}

gateway->relay_rtp(session->handle, &rtp);
continue;
} else if(session->media.audio_rtcp_fd != -1 && fds[i].fd == session->media.audio_rtcp_fd) {
Expand Down Expand Up @@ -6073,6 +6106,24 @@ static void *janus_sip_relay_thread(void *data) {
/* Relay to application */
janus_plugin_rtp rtp = { .video = TRUE, .buffer = buffer, .length = bytes };
janus_plugin_rtp_extensions_reset(&rtp.extensions);

/* Add video-orientation extension */
if(session->media.video_orientation_extension_id > 0) {
gboolean c = FALSE, f = FALSE, r1 = FALSE, r0 = FALSE;
if (janus_rtp_header_extension_parse_video_orientation(buffer, bytes,
session->media.video_orientation_extension_id, &c, &f, &r1, &r0) == 0) {
rtp.extensions.video_rotation = 0;
if (r1 && r0)
rtp.extensions.video_rotation = 270;
else if (r1)
rtp.extensions.video_rotation = 180;
else if (r0)
rtp.extensions.video_rotation = 90;
rtp.extensions.video_back_camera = c;
rtp.extensions.video_flipped = f;
}
}

gateway->relay_rtp(session->handle, &rtp);
continue;
} else if(session->media.video_rtcp_fd != -1 && fds[i].fd == session->media.video_rtcp_fd) {
Expand Down