Changeset 897:6d16408a1ff2 in mediastreamer2

Timestamp:

Feb 26, 2010 1:24:01 PM (3 years ago)

Author:

Aymeric Moizard <jack@…>

Branch:

default

Parents:

895:29e9357e6fb3 (diff), 896:92f3fa1b08d7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of git.linphone.org:mediastreamer2

Files:

• src/videoout.c (modified) (14 diffs)
• src/videoout.c (modified) (1 diff)

src/videoout.c

@@ -40 +40 @@
                 return d->desc->pollevent(d,ev);
         else return FALSE;
+}
+
+static int gcd(int m, int n)
+{
+   if(n == 0)
+     return m;
+   else
+     return gcd(n, m % n);
+}
+   
+static void reduce(int *num, int *denom)
+{
+   int divisor = gcd(*num, *denom);
+   *num /= divisor;
+   *denom /= divisor;
 }
 
@@ -55 +70 @@
 
         float sv_scalefactor;
+        MSVideoSize screen_size;
 } SdlDisplay;
 
@@ -109 +125 @@
 static int sdl_create_window(SdlDisplay *wd, int w, int h){
         static bool_t once=TRUE;
+        uint32_t flags = SDL_ANYFORMAT | SDL_DOUBLEBUF | SDL_RESIZABLE;
+        const SDL_VideoInfo *info;
+        info =SDL_GetVideoInfo();
+        if (info->wm_available) {
+                ms_message("Using window manager");
+        }
+        if (info->hw_available) {
+                ms_message("hw surface available (%dk memory)", info->video_mem);
+                flags |= SDL_HWSURFACE;
+        }
+        else
+                flags |= SDL_SWSURFACE;
         
-        wd->sdl_screen = SDL_SetVideoMode(w,h, 0,SDL_HWSURFACE|SDL_RESIZABLE);
+        if (info->blit_hw) {
+                ms_message("hw surface available (%dk memory)", info->video_mem);
+                flags |= SDL_ASYNCBLIT;
+        }
+        if (info->blit_hw_CC)
+                ms_message("Colorkey blits between hw surfaces: accelerated");
+        if (info->blit_hw_A)
+                ms_message("Alpha blits between hw surfaces:  accelerated");
+        if (info->blit_sw)
+                ms_message("Copy blits from sw to hw surfaces:  accelerated");
+        if (info->blit_hw_CC)
+                ms_message("Colorkey blits between sw to hw surfaces: accelerated");
+        if (info->blit_hw_A)
+                ms_message("Alpha blits between sw to hw surfaces: accelerated");
+
+        wd->sdl_screen = SDL_SetVideoMode(wd->screen_size.width,wd->screen_size.height, 0,flags);
         if (wd->sdl_screen == NULL ) {
                 ms_warning("no hardware for video mode: %s\n",
-                                                SDL_GetError());
-        }
-        if (wd->sdl_screen == NULL )
-                wd->sdl_screen = SDL_SetVideoMode(w,h, 0,SDL_SWSURFACE|SDL_RESIZABLE);
-        if (wd->sdl_screen == NULL ) {
-                ms_warning("Couldn't set video mode: %s\n",
-                                                SDL_GetError());
-                return -1;
+                                   SDL_GetError());
         }
         if (wd->sdl_screen->flags & SDL_HWSURFACE) ms_message("SDL surface created in hardware");
@@ -127 +163 @@
                 once=FALSE;
         }
-        ms_message("Using yuv overlay.");
         wd->lay=SDL_CreateYUVOverlay(w , h ,SDL_YV12_OVERLAY,wd->sdl_screen);
         if (wd->lay==NULL){
@@ -147 +182 @@
         int i;
         if (wd==NULL){
+                char driver[128];
                 /* Initialize the SDL library */
                 wd=(SdlDisplay*)ms_new0(SdlDisplay,1);
@@ -157 +193 @@
                 }
                 wd->sdl_initialized=TRUE;
+                if (SDL_VideoDriverName(driver, sizeof(driver))){
+                        ms_message("Video driver: %s", driver);
+                }
                 ms_mutex_init(&wd->sdl_mutex,NULL);
                 ms_mutex_lock(&wd->sdl_mutex);
+                wd->screen_size.width = fbuf->w;
+                wd->screen_size.height = fbuf->h;
+                
         }else {
                 ms_mutex_lock(&wd->sdl_mutex);
@@ -170 +212 @@
         }
         wd->filter = f;
-        
+                
         i=sdl_create_window(wd, fbuf->w, fbuf->h);
         if (i==0){
@@ -209 +251 @@
         SdlDisplay *wd = (SdlDisplay*)obj->data;
         SDL_Rect rect;
+        int ratiow;
+        int ratioh;
+        int w;
+        int h;
+        
         rect.x=0;
         rect.y=0;
         ms_mutex_lock(&wd->sdl_mutex);
-        rect.w=wd->lay->w;
-        rect.h=wd->lay->h;
+
+        ratiow=wd->lay->w;
+        ratioh=wd->lay->h;
+        reduce(&ratiow, &ratioh);
+        w = wd->screen_size.width/ratiow*ratiow;
+        h = wd->screen_size.height/ratioh*ratioh;
+
+        if (h*ratiow>w*ratioh)
+        {
+                w = w;
+                h = w*ratioh/ratiow;
+        }
+        else
+        {
+                h = h;
+                w = h*ratiow/ratioh;
+        }
+
+        if (h*wd->lay->w!=w*wd->lay->h)
+                ms_error("wrong ratio");
+
+        rect.x = (wd->screen_size.width-w)/2;
+        rect.y = (wd->screen_size.height-h)/2;
+        rect.w = w;
+        rect.h = h;
         SDL_DisplayYUVOverlay(wd->lay,&rect);
         ms_mutex_unlock(&wd->sdl_mutex);
@@ -231 +301 @@
                                 ev->w=event.resize.w;
                                 ev->h=event.resize.h;
+                                wd->screen_size.width = event.resize.w;
+                                wd->screen_size.height = event.resize.h;
                                 return TRUE;
                         break;
@@ -516 +588 @@
                 ms_error("Error in 420->rgb ms_sws_scale().");
         }
-}
-
-static int gcd(int m, int n)
-{
-   if(n == 0)
-     return m;
-   else
-     return gcd(n, m % n);
-}
-   
-static void reduce(int *num, int *denom)
-{
-   int divisor = gcd(*num, *denom);
-   *num /= divisor;
-   *denom /= divisor;
 }
 
@@ -924 +981 @@
 }
 
+static void re_vsize(VideoOut *s, MSVideoSize *sz){
+        ms_message("Windows size set to %ix%i",sz->width,sz->height);
+}
+
+
 static void set_vsize(VideoOut *s, MSVideoSize *sz){
         s->fbuf.w=sz->width & ~0x1;
@@ -1007 +1069 @@
 
 static int video_out_handle_resizing(MSFilter *f, void *data){
+        /* to be removed */
+}
+
+static int _video_out_handle_resizing(MSFilter *f, void *data){
         VideoOut *s=(VideoOut*)f->data;
         MSDisplay *disp=s->display;
@@ -1018 +1084 @@
                                 ms_filter_lock(f);
                                 if (s->ready){
-                                        set_vsize(s,&sz);
+                                        re_vsize(s,&sz);
                                         s->ready=FALSE;
                                 }
@@ -1038 +1104 @@
         int update=0;
         int update_selfview=0;
-
+        int i;
+
+        for(i=0;i<100;++i){
+                _video_out_handle_resizing(f, NULL);
+        }
         ms_filter_lock(f);
         if (!obj->ready) video_out_prepare(f);

src/videoout.c

@@ -1226 +1226 @@
                 corner.planes[3]=0;
                 ms_display_lock(obj->display);
-                yuv_buf_copy(obj->local_pic.planes,obj->local_pic.strides,
+                ms_yuv_buf_copy(obj->local_pic.planes,obj->local_pic.strides,
                                 corner.planes,corner.strides,roi);
                 ms_display_unlock(obj->display);