Changeset 275:d03b538c56ad in verona

Timestamp:

Aug 23, 2011 2:25:47 PM (21 months ago)

Author:

laurent <laurent@…>

Branch:

default

Message:

adaptive video allocation

Files:

• .hgsubstate (modified) (1 diff)
• phapi/phms_videostream.c (modified) (3 diffs)

.hgsubstate

@@ -2 +2 @@
 cb83411a9e6657814a3f0e0b5d96bbb132540511 libs/miniini
 901c9952b3bf2cfc29d30111e104b4971b739187 libs/srtp
-e5530a01b408145b1ad480d05351f7ab7db30501 mediastreamer2
+cb57f462231916f9358535dbf5e247765c1cf62b mediastreamer2

phapi/phms_videostream.c

@@ -90 +90 @@
                 phms_video_stream_t *video = video1->streamerData;
 
-                if(local_view)
-                {
-                        video->frame_event.frame_local->height = local_view->h;
-                        video->frame_event.frame_local->width = local_view->w;
-                        video->frame_event.frame_local->planes[0] = local_view->planes[0];
-                }
-                
-                if(remote_view)
-                {
-                        video->frame_event.frame_remote->height = remote_view->h;
-                        video->frame_event.frame_remote->width = remote_view->w;
-                        video->frame_event.frame_remote->planes[0] = remote_view->planes[0];
-                }
-                
+                if(local_view && local_view->w && local_view->h && local_view->planes[0])
+                {
+                        if(video->frame_event.frame_local->height != local_view->h || video->frame_event.frame_local->width != local_view->w )
+                        {
+                                video->frame_event.frame_local->height = local_view->h;
+                                video->frame_event.frame_local->width = local_view->w;
+                                video->frame_event.frame_local->planes[0] =  malloc((local_view->w*local_view->h*3)/2);
+                        }
+                        memcpy(video->frame_event.frame_local->planes[0], local_view->planes[0], (local_view->w*local_view->h*3)/2);
+                }
+
+                if(remote_view  && remote_view->w && remote_view->h && remote_view->planes[0])
+                {
+                        if(video->frame_event.frame_remote->height != remote_view->h || video->frame_event.frame_remote->width != remote_view->w )
+                        {
+                                video->frame_event.frame_remote->height = remote_view->h;
+                                video->frame_event.frame_remote->width = remote_view->w;
+                                video->frame_event.frame_remote->planes[0] =  malloc((remote_view->w*remote_view->h*3)/2);
+                        }
+
+                        memcpy(video->frame_event.frame_remote->planes[0], remote_view->planes[0], (remote_view->w*remote_view->h*3)/2);
+                }
+
                 s->frameDisplayCbk((phcall_t*)s->cbkInfo, &video->frame_event);
         }
@@ -117 +126 @@
 phms_video_stream_t *phms_video_stream_new(int locport, bool_t use_ipv6, int traffictype, int width, int height)
 {
-        MSVideoSize vsize;
         phms_video_stream_t *pvs=(phms_video_stream_t*)malloc(sizeof(phms_video_stream_t));
         memset(pvs, 0, sizeof(phms_video_stream_t));
@@ -131 +139 @@
                 pvs->frame_event.frame_local = (phPicture_t *)malloc(sizeof(phPicture_t));
                 pvs->frame_event.frame_remote = (phPicture_t *)malloc(sizeof(phPicture_t));
+                pvs->frame_event.frame_remote = (phPicture_t *)malloc(sizeof(phPicture_t));
+                pvs->frame_event.frame_local->width = pvs->frame_event.frame_remote->width = width;
+                pvs->frame_event.frame_local->height = pvs->frame_event.frame_remote->height = height;
                 pvs->frame_event.frame_local->planes[0] = NULL;
                 pvs->frame_event.frame_remote->planes[0] = NULL;