Commit a6ff0af5 authored by smorlat's avatar smorlat

few optimizations.


git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@106 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
parent c77ab037
......@@ -773,7 +773,7 @@ void linphone_core_get_local_ip(LinphoneCore *lc, const char *dest, char *result
strncpy(result,lc->sip_conf.ipv6_enabled ? "::1" : "127.0.0.1",LINPHONE_IPADDR_SIZE);
ms_error("Could not find default routable ip address !");
}
eXosip_masquerade_contact("",0);
eXosip_masquerade_contact(NULL,0);
}
const char *linphone_core_get_primary_contact(LinphoneCore *lc)
......
......@@ -110,7 +110,6 @@ struct _VideoStream
MSTicker *ticker;
RtpSession *session;
MSFilter *source;
MSFilter *predec;
MSFilter *pixconv;
MSFilter *sizeconv;
MSFilter *tee;
......
......@@ -36,6 +36,8 @@ int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt){
switch(fmt){
case MS_RGB24:
return PIX_FMT_RGB24;
case MS_RGB24_REV:
return PIX_FMT_BGR24;
case MS_YUV420P:
return PIX_FMT_YUV420P;
case MS_YUYV:
......@@ -55,6 +57,8 @@ MSPixFmt ffmpeg_pix_fmt_to_ms(int fmt){
switch(fmt){
case PIX_FMT_RGB24:
return MS_RGB24;
case PIX_FMT_BGR24:
return MS_RGB24_REV;
case PIX_FMT_YUV420P:
return MS_YUV420P;
case PIX_FMT_YUYV422:
......
......@@ -379,14 +379,14 @@ static void yuv420p_to_rgb(MSPicture *src, uint8_t *rgb){
p=rgb+(src->w*3*(src->h-1));
sws=sws_getContext(src->w,src->h,PIX_FMT_YUV420P,
src->w,src->h,PIX_FMT_RGB24,
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 0
/*revert colors*/
{
int i,j,stride;
......@@ -404,7 +404,7 @@ static void yuv420p_to_rgb(MSPicture *src, uint8_t *rgb){
p+=stride;
}
}
#endif
}
static void win_display_update(MSDisplay *obj){
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment