Changeset 152:994ae61ef42c in mediastreamer2

Timestamp:

Nov 3, 2008 10:30:27 PM (5 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

fiw bug when using libswscale, and optimize.

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@155 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

File:

• linphone/mediastreamer2/src/videoout.c (modified) (4 diffs)

linphone/mediastreamer2/src/videoout.c

@@ -220 +220 @@
         uint8_t *rgb;
         int rgb_len;
+        struct SwsContext *sws;
         bool_t new_ev;
 }WinDisplay;
@@ -310 +311 @@
                 wd->rgb=NULL;
                 wd->rgb_len=0;
+                sws_freeContext(wd->sws);
+                wd->sws=NULL;
         }
         else
@@ -367 +370 @@
 
 
-static void yuv420p_to_rgb(MSPicture *src, uint8_t *rgb){
-        struct SwsContext *sws;
+static void yuv420p_to_rgb(WinDisplay *wd, MSPicture *src, uint8_t *rgb){
         int rgb_stride=-src->w*3;
         uint8_t *p;
 
         p=rgb+(src->w*3*(src->h-1));
-        sws=sws_getContext(src->w,src->h,PIX_FMT_YUV420P,
+        if (wd->sws==NULL){
+                wd->sws=sws_getContext(src->w,src->h,PIX_FMT_YUV420P,
                         src->w,src->h,PIX_FMT_BGR24,
                         0, NULL, NULL, NULL);
-        if (sws_scale(sws,src->planes,src->strides, 0,
-                                0, &p, &rgb_stride)<0){
-                        ms_error("Error in 420->rgb sws_scale().");
-        }
-        sws_freeContext(sws);
+        }
+        if (sws_scale(wd->sws,src->planes,src->strides, 0,
+                                src->h, &p, &rgb_stride)<0){
+                ms_error("Error in 420->rgb sws_scale().");
+        }
 }
 
@@ -443 +446 @@
         if (wd->fb.planes[0]) ms_free(wd->fb.planes[0]);
         if (wd->rgb) ms_free(wd->rgb);
+        if (wd->sws) sws_freeContext(wd->sws);
         ms_free(wd);
 }