Changeset 176:fbd331d7dcff in verona

Timestamp:

May 10, 2011 2:08:05 PM (2 years ago)

Author:

laurent <laurent@…>

Branch:

default

Message:

Add VideoSize?

Location:

phapi

Files:

• phms.c (modified) (2 diffs)
• phms_videostream.c (modified) (2 diffs)
• phms_videostream.h (modified) (1 diff)

phapi/phms.c

@@ -185 +185 @@
         if(s->newstreams & 1<<PH_MSTREAM_VIDEO1)
         {
-                video = phms_video_stream_new(video1->localport, ms_is_ipv6(video1->remoteaddr), video1->traffictype, video1->video_quality);
+                video = phms_video_stream_new(video1->localport, ms_is_ipv6(video1->remoteaddr), video1->traffictype, conf->video_config.video_webcam_capture_width,conf->video_config.video_webcam_capture_height);
                 if(video == NULL)
                 {
@@ -499 +499 @@
                 if(video_stop_on_hold)
                 {
-                        video = phms_video_stream_new(video1->localport, ms_is_ipv6(video1->remoteaddr), video1->traffictype, video1->video_quality);
+                        video = phms_video_stream_new(video1->localport, ms_is_ipv6(video1->remoteaddr), video1->traffictype, -1,-1);
                         if(video == NULL)
                         {

phapi/phms_videostream.c

@@ -117 +117 @@
 }
 
-phms_video_stream_t *phms_video_stream_new(int locport, bool_t use_ipv6, int traffictype, int quality)
+phms_video_stream_t *phms_video_stream_new(int locport, bool_t use_ipv6, int traffictype, int width, int height)
 {
         MSVideoSize vsize;
@@ -126 +126 @@
         if(pvs->s != NULL)
         {
-                get_vsize_from_quality(quality, &vsize);
-                pvs->s->sent_vsize.height = vsize.height;
-                pvs->s->sent_vsize.width = vsize.width;
-
-                ms_message("Initial sent format set to %d:%d, quality %d\n",vsize.height,vsize.width, quality);
+                
+                pvs->s->sent_vsize.width = width;
+                pvs->s->sent_vsize.height = height;
                 
                 pvs->frame_event.frame_local = (phPicture_t *)malloc(sizeof(phPicture_t));

phapi/phms_videostream.h

@@ -45 +45 @@
 typedef struct phms_video_stream_s phms_video_stream_t;
 
-phms_video_stream_t *phms_video_stream_new(int locport, bool_t use_ipv6, int traffictype, int quality);
+phms_video_stream_t *phms_video_stream_new(int locport, bool_t use_ipv6, int traffictype, int width, int height);
 int phms_video_stream_start (phms_video_stream_t *pstream, RtpProfile *profile, const char *remip, int remport,int rem_rtcp_port, int payload, int jitt_comp, void *msession);
 int phms_video_stream_start_send_only(phms_video_stream_t *pvs, RtpProfile *profile, const char *remip, int remport,int rem_rtcp_port, int payload, int jitt_comp, void *msession);