Changeset 63:9e27c981b702 in mediastreamer2

Timestamp:

Oct 4, 2008 10:59:24 PM (5 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

• bug fixes
• new winsnd3.c (clear audio)

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

Location:

linphone

Files:

• coreapi/misc.c (modified) (4 diffs)
• gtk-glade/linphone.iss (modified) (1 diff)
• gtk-glade/main.c (modified) (1 diff)
• mediastreamer2/build/win32native/mediastreamer2.dev (modified) (2 diffs)
• mediastreamer2/src/msvideo.c (modified) (1 diff)
• mediastreamer2/src/winsnd2.c (modified) (4 diffs)
• mediastreamer2/src/winsnd3.c (added)
• mediastreamer2/src/winvideo.c (modified) (7 diffs)
• oRTP/build/win32native/ortp-dll.dev (modified) (2 diffs)
• win32/liblinphone.dev (modified) (2 diffs)

linphone/coreapi/misc.c

@@ -465 +465 @@
         laddr.sin_port=htons(local_port);
         if (bind(sock,(struct sockaddr*)&laddr,sizeof(laddr))<0){
-                ms_error("Bind to 0.0.0.0:%i failed: %s",local_port,strerror(errno));
+                ms_error("Bind socket to 0.0.0.0:%i failed: %s",local_port,getSocketError());
                 close_socket(sock);
                 return -1;
@@ -637 +637 @@
         int port=extract_sip_port(config_file);
         const char *wakeup="WAKEUP sip:127.0.0.1 SIP/2.0\r\n"
-                "Via: SIP/2.0/UDP 127.0.0.1:57655;rport;branch=z9hG4bK%u\r\n"
+                "Via: SIP/2.0/UDP 127.0.0.1:%i;rport;branch=z9hG4bK%u\r\n"
                 "From: <sip:another_linphone@127.0.0.1>;tag=%u\r\n"
                 "To:   <sip:you@127.0.0.1>\r\n"
@@ -651 +651 @@
                 snprintf(tmp,sizeof(tmp),"127.0.0.1:%i",port);
                 if (parse_stun_server_addr(tmp,&ss,&sslen)==0){
-                        int sock=create_socket(57655);
+                        int locport=57123;
+                        ortp_socket_t sock=create_socket(locport);
+                        if (sock<0) sock=create_socket(++locport);
                         if (sock>=0){
                                 char req[512];
-                                snprintf(req,sizeof(req),wakeup,random(),random(),random());
-                                if (sendto(sock,req,strlen(req),0,(struct sockaddr*)&ss,sslen)>0){
+                                snprintf(req,sizeof(req),wakeup,locport,random(),random(),random());
+                                if (connect(sock,(struct sockaddr*)&ss,sslen)<0){
+                                        fprintf(stderr,"connect failed: %s\n",getSocketError());
+                                }else if (send(sock,req,strlen(req),0)>0){
                                         /*wait a bit for a response*/
                                         int i;
                                         for(i=0;i<10;++i){
-                                                if (recv(sock,tmp,sizeof(tmp),0)>0){
-                                                        ms_message("Another linphone has been woken-up !");
-                                                        close(sock);
+                                                if (recv(sock,req,sizeof(req),0)>0){
+                                                        close_socket(sock);
                                                         return 0;
+                                                }else if (getSocketErrorCode()!=EWOULDBLOCK){
+                                                        break;
                                                 }
 #ifdef WIN32
@@ -670 +675 @@
 #endif
                                         }
-                                }
-                        }else ms_error("Fail to create socket on port 57655");
-                        close(sock);
+                                }else ms_message("sendto() of WAKEUP request failed, nobody to wakeup.");
+                        }
+                        close_socket(sock);
                 }
         }

linphone/gtk-glade/linphone.iss

@@ -35 +35 @@
 Source: "..\..\linphone-deps\bin\exosip2.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\linphone-deps\bin\libogg.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\linphone-deps\bin\speex.dll"; DestDir: "{app}"; Flags: ignoreversion
+;;Source: "..\..\linphone-deps\bin\speex.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\linphone-deps\bin\avcodec.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\linphone-deps\bin\avutil.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\linphone-deps\bin\libspeex-1.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\linphone-deps\bin\libspeexdsp-1.dll"; DestDir: "{app}"; Flags: ignoreversion
+;;Source: "..\..\linphone-deps\bin\libspeex-1.dll"; DestDir: "{app}"; Flags: ignoreversion
+;;Source: "..\..\linphone-deps\bin\libspeexdsp-1.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\mediastreamer2\build\win32native\mediastreamer2.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\oRTP\build\win32native\ortp.dll"; DestDir: "{app}"; Flags: ignoreversion

linphone/gtk-glade/main.c

@@ -717 +717 @@
         add_pixmap_directory("pixmaps");
         add_pixmap_directory(PACKAGE_DATA_DIR "/pixmaps/linphone");
+#ifdef WIN32
+        add_pixmap_directory("linphone");
+#endif
 
         the_ui=linphone_gtk_create_window("main");

linphone/mediastreamer2/build/win32native/mediastreamer2.dev

@@ -445 +445 @@
 
 [Unit42]
-FileName=..\..\src\winsnd2.c
+FileName=..\..\src\winsnd3.c
 CompileCpp=0
 Folder=mediastreamer2
@@ -513 +513 @@
 ResourceIncludes=
 MakeIncludes=
-Compiler=-ggdb_@@_-DINET6 _@@_-DORTP_INET6 _@@_-D_WORKAROUND_MINGW32_BUGS_@@_-D_WIN32_WINNT=0x0501 _@@_-DNOSDL_@@_-DVIDEO_ENABLED_@@_-DNORESAMPLE_@@_-Wall _@@_-DHAVE_LIBAVCODEC_AVCODEC_H_@@_
+Compiler=-ggdb_@@_-DINET6 _@@_-DORTP_INET6 _@@_-D_WORKAROUND_MINGW32_BUGS_@@_-D_WIN32_WINNT=0x0501 _@@_-DNOSDL_@@_-DVIDEO_ENABLED_@@_-DNORESAMPLE_@@_-Wall _@@_-DHAVE_LIBAVCODEC_AVCODEC_H_@@_-D_TRUE_TIME_@@_
 CppCompiler=
 Linker=-lortp_@@_-lavcodec_@@_-lavutil_@@_-ltheora_@@_-lspeex_@@_-lspeexdsp_@@_-lgsm_@@_-lws2_32_@@_-lwinmm_@@_-lvfw32_@@_-logg_@@__@@_

linphone/mediastreamer2/src/msvideo.c

@@ -157 +157 @@
         uint8_t *p,*pe;
         int i,j;
-        uint8_t *end=buf+(h*linesize*3);
+        uint8_t *end=buf+(h*linesize);
         uint8_t exch;
         p=buf;
         pe=end-1;
         for(i=0;i<h/2;++i){
-                for(j=0;i<w;++j){
+                for(j=0;i<w*3;++j){
                         exch=p[i];
                         p[i]=pe[-i];

linphone/mediastreamer2/src/winsnd2.c

@@ -239 +239 @@
 }
 
+
+#ifndef _TRUE_TIME
 static uint64_t winsnd_get_cur_time( void *data){
         WinSnd *d=(WinSnd*)data;
@@ -245 +247 @@
         return curtime;
 }
+#endif
 
 
@@ -409 +412 @@
                 return ;
         }
+#ifndef _TRUE_TIME
         ms_ticker_set_time_func(f->ticker,winsnd_get_cur_time,d);
+#endif
 }
 
@@ -416 +421 @@
         MMRESULT mr;
         int i;
+#ifndef _TRUE_TIME
         ms_ticker_set_time_func(f->ticker,NULL,NULL);
+#endif
         d->running=FALSE;
         mr=waveInStop(d->indev);

linphone/mediastreamer2/src/winvideo.c

@@ -59 +59 @@
         bool_t started;
         bool_t autostarted;
+        bool_t invert_rgb;
 }V4wState;
 
@@ -87 +88 @@
 
 static bool_t try_format(V4wState *s, BITMAPINFO *videoformat, MSPixFmt pixfmt){
+        bool_t ret;
         capGetVideoFormat(s->capvideo, videoformat, sizeof(BITMAPINFO));
         videoformat->bmiHeader.biSizeImage = 0;
@@ -107 +109 @@
                         return FALSE;
         }
-        return capSetVideoFormat(s->capvideo, videoformat, sizeof(BITMAPINFO));
+        ret=capSetVideoFormat(s->capvideo, videoformat, sizeof(BITMAPINFO));
+        if (ret) {
+                /*recheck video format */
+                capGetVideoFormat(s->capvideo, videoformat, sizeof(BITMAPINFO));
+        }
+        return ret;
 }
 
@@ -186 +193 @@
 
         driver_last=ms_fourcc_to_pix_fmt(videoformat.bmiHeader.biCompression);
-
         if (s->startwith_yuv_bug==TRUE && try_format(s,&videoformat,MS_RGB24)){
                 s->pix_fmt=MS_RGB24;
@@ -210 +216 @@
                 return -1;
         }
+        if (s->pix_fmt==MS_RGB24){
+                s->invert_rgb=(videoformat.bmiHeader.biHeight>0);
+        }else s->invert_rgb=FALSE;
         if (!capSetCallbackOnVideoStream(s->capvideo, VideoStreamCallback))
         {
@@ -247 +256 @@
         s->started=FALSE;
         s->autostarted=FALSE;
-
+        s->invert_rgb=FALSE;
 #ifdef AMD_HACK2
         /* avoid bug with USB vimicro cards:
@@ -502 +511 @@
                                 if (om!=NULL) freemsg(om);
                                 om=m;
+                        }
+                        if (om!=NULL){
+                                if (s->invert_rgb) rgb24_revert(om->b_rptr,s->vsize.width,s->vsize.height,s->vsize.width*3);
                         }
                 }else {

linphone/oRTP/build/win32native/ortp-dll.dev

@@ -382 +382 @@
 AutoIncBuildNrOnRebuild=0
 AutoIncBuildNrOnCompile=0
-UnitCount=40
+UnitCount=41
 
 [Unit37]
@@ -470 +470 @@
 Priority=1000
 OverrideBuildCmd=0
-BuildCmd=       $(CC) -c b64.c -o "Default Profile/b64.o" $(CFLAGS)
-
+BuildCmd=$(CC) -c b64.c -o "Default Profile/b64.o" $(CFLAGS)
+

linphone/win32/liblinphone.dev

@@ -212 +212 @@
 AutoIncBuildNrOnRebuild=0
 AutoIncBuildNrOnCompile=0
+UnitCount=18
 
 [Profile1]
@@ -226 +227 @@
 Linker=
 PreprocDefines=
-CompilerSettings=0000000000100000000000
+CompilerSettings=0000000000010000000000
 Icon=
 ExeOutput=..\win32