From erik at minisip.org  Tue Jan 26 22:18:57 2010
From: erik at minisip.org (erik at minisip.org)
Date: Tue, 26 Jan 2010 22:18:57 +0100 (CET)
Subject: r3748 - in trunk/libminisip/source/subsystem_media/video: . display
Message-ID: <20100126211857.502941ACC7@mail.minisip.org>

Author: erik
Date: 2010-01-26 22:18:56 +0100 (Tue, 26 Jan 2010)
New Revision: 3748

Modified:
   trunk/libminisip/source/subsystem_media/video/VideoMedia.cxx
   trunk/libminisip/source/subsystem_media/video/display/XvDisplay.cxx
Log:
 * compile fix (ubuntu 9.10)



Modified: trunk/libminisip/source/subsystem_media/video/VideoMedia.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/VideoMedia.cxx	2009-12-18 14:02:37 UTC (rev 3747)
+++ trunk/libminisip/source/subsystem_media/video/VideoMedia.cxx	2010-01-26 21:18:56 UTC (rev 3748)
@@ -38,6 +38,7 @@
 #include<libmutil/stringutils.h>
 #include<libmutil/massert.h>
 #include<string.h>
+#include<stdio.h>
 
 #define SOURCE_QUEUE_SIZE 7
 

Modified: trunk/libminisip/source/subsystem_media/video/display/XvDisplay.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/display/XvDisplay.cxx	2009-12-18 14:02:37 UTC (rev 3747)
+++ trunk/libminisip/source/subsystem_media/video/display/XvDisplay.cxx	2010-01-26 21:18:56 UTC (rev 3748)
@@ -27,6 +27,7 @@
 #include<sys/time.h>
 #include<libminisip/media/video/VideoException.h>
 #include<stdlib.h>
+#include<stdio.h>
 
 using namespace std;
 


From erik at minisip.org  Tue Jan 26 22:19:37 2010
From: erik at minisip.org (erik at minisip.org)
Date: Tue, 26 Jan 2010 22:19:37 +0100 (CET)
Subject: r3749 - in trunk/libminisip/source/subsystem_media/video: display
	mixer
Message-ID: <20100126211937.9C09B1ACDB@mail.minisip.org>

Author: erik
Date: 2010-01-26 22:19:37 +0100 (Tue, 26 Jan 2010)
New Revision: 3749

Modified:
   trunk/libminisip/source/subsystem_media/video/display/X11Display.cxx
   trunk/libminisip/source/subsystem_media/video/mixer/ImageMixer.cxx
Log:
 * compile fix (ubuntu 9.10)



Modified: trunk/libminisip/source/subsystem_media/video/display/X11Display.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/display/X11Display.cxx	2010-01-26 21:18:56 UTC (rev 3748)
+++ trunk/libminisip/source/subsystem_media/video/display/X11Display.cxx	2010-01-26 21:19:37 UTC (rev 3749)
@@ -29,6 +29,7 @@
 #include<X11/Xatom.h>
 #include<stdlib.h>
 #include<string.h>
+#include<stdio.h>
 
 using namespace std;
 

Modified: trunk/libminisip/source/subsystem_media/video/mixer/ImageMixer.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/mixer/ImageMixer.cxx	2010-01-26 21:18:56 UTC (rev 3748)
+++ trunk/libminisip/source/subsystem_media/video/mixer/ImageMixer.cxx	2010-01-26 21:19:37 UTC (rev 3749)
@@ -30,6 +30,8 @@
 #include<libminisip/media/video/codec/VideoCodec.h>
 #include<libminisip/media/video/codec/AVCoder.h>
 
+#include<stdio.h>
+
 #define MAX_SOURCE 256
 
 using namespace std;


From erik at minisip.org  Tue Jan 26 22:21:56 2010
From: erik at minisip.org (erik at minisip.org)
Date: Tue, 26 Jan 2010 22:21:56 +0100 (CET)
Subject: r3750 - in trunk: libmikey/keyagreement libmnetutil/source
	libmsip/source/messages
Message-ID: <20100126212156.31CF51AD14@mail.minisip.org>

Author: erik
Date: 2010-01-26 22:21:55 +0100 (Tue, 26 Jan 2010)
New Revision: 3750

Modified:
   trunk/libmikey/keyagreement/KeyAgreement.cxx
   trunk/libmnetutil/source/DnsNaptr.cxx
   trunk/libmsip/source/messages/SipRequest.cxx
Log:
 * compile fix (ubuntu 9.10)



Modified: trunk/libmikey/keyagreement/KeyAgreement.cxx
===================================================================
--- trunk/libmikey/keyagreement/KeyAgreement.cxx	2010-01-26 21:19:37 UTC (rev 3749)
+++ trunk/libmikey/keyagreement/KeyAgreement.cxx	2010-01-26 21:21:55 UTC (rev 3750)
@@ -29,6 +29,7 @@
 #include<libmikey/MikeyMessage.h>
 #include<string.h>
 #include<stdlib.h>
+#include<stdio.h>
 #include<libmcrypto/hmac.h>
 #include<libmcrypto/rand.h>
 

Modified: trunk/libmnetutil/source/DnsNaptr.cxx
===================================================================
--- trunk/libmnetutil/source/DnsNaptr.cxx	2010-01-26 21:19:37 UTC (rev 3749)
+++ trunk/libmnetutil/source/DnsNaptr.cxx	2010-01-26 21:21:55 UTC (rev 3750)
@@ -29,6 +29,7 @@
 #endif
 #include<algorithm>
 #include<string.h>
+#include<stdio.h>
 
 using namespace std;
 

Modified: trunk/libmsip/source/messages/SipRequest.cxx
===================================================================
--- trunk/libmsip/source/messages/SipRequest.cxx	2010-01-26 21:19:37 UTC (rev 3749)
+++ trunk/libmsip/source/messages/SipRequest.cxx	2010-01-26 21:21:55 UTC (rev 3750)
@@ -53,6 +53,8 @@
 #include<libmsip/SipHeaderReferTo.h>
 #include<libmsip/SipHeaderSupported.h>
 
+#include<stdio.h>
+
 using namespace std;
 
 MRef<SipRequest*> SipRequest::createSipMessageAck( MRef<SipRequest*> origReq,


From erik at minisip.org  Tue Jan 26 22:40:07 2010
From: erik at minisip.org (erik at minisip.org)
Date: Tue, 26 Jan 2010 22:40:07 +0100 (CET)
Subject: r3751 - in trunk/libminisip: include include/libminisip/media
	include/libminisip/media/soundcard include/libminisip/media/video
	include/libminisip/media/video/codec source/subsystem_gui
	source/subsystem_media source/subsystem_media/codecs
	source/subsystem_media/soundcard
Message-ID: <20100126214007.4399E1AC21@mail.minisip.org>

Author: erik
Date: 2010-01-26 22:40:06 +0100 (Tue, 26 Jan 2010)
New Revision: 3751

Modified:
   trunk/libminisip/include/config.h
   trunk/libminisip/include/libminisip/media/AudioMedia.h
   trunk/libminisip/include/libminisip/media/MediaStream.h
   trunk/libminisip/include/libminisip/media/soundcard/SoundSource.h
   trunk/libminisip/include/libminisip/media/video/VideoMedia.h
   trunk/libminisip/include/libminisip/media/video/codec/AVCoder.h
   trunk/libminisip/include/libminisip/media/video/codec/AVDecoder.h
   trunk/libminisip/source/subsystem_gui/ConsoleDebugger.cxx
   trunk/libminisip/source/subsystem_media/AudioMedia.cxx
   trunk/libminisip/source/subsystem_media/MediaStream.cxx
   trunk/libminisip/source/subsystem_media/RtpReceiver.cxx
   trunk/libminisip/source/subsystem_media/codecs/SPEEXCODEC.cxx
   trunk/libminisip/source/subsystem_media/soundcard/SoundSource.cxx
Log:
 * Send RTP packets as const & to avoid mutex operations in MRefs
 * Hack to allow changing H.264 compression via ConsoleDebugger
   while in call
 * If the media subsystem can not consume packets fast enough,
   then the socket buffer will fill up. Now we read all
   packets from a socket, and if there is a long queue we
   try to do intelligent dropping by looking at the marker
   bits in the RTP header.



Modified: trunk/libminisip/include/config.h
===================================================================
--- trunk/libminisip/include/config.h	2010-01-26 21:21:55 UTC (rev 3750)
+++ trunk/libminisip/include/config.h	2010-01-26 21:40:06 UTC (rev 3751)
@@ -143,4 +143,7 @@
 #endif
 
 
+#define GLOBAL_BANDWIDTH_HACK 1
+
+
 #endif

Modified: trunk/libminisip/include/libminisip/media/AudioMedia.h
===================================================================
--- trunk/libminisip/include/libminisip/media/AudioMedia.h	2010-01-26 21:21:55 UTC (rev 3750)
+++ trunk/libminisip/include/libminisip/media/AudioMedia.h	2010-01-26 21:40:06 UTC (rev 3751)
@@ -76,7 +76,7 @@
 		* decoding if relevant.
 		* @param rtpPacket the RTP packet to play
 		*/
-		virtual void playData( MRef<RtpPacket *> rtpPacket );
+		virtual void playData( const MRef<RtpPacket *> & rtpPacket );
 
 		/**
 		* Used by the media sessions to register a MediaStreamSender.
@@ -181,7 +181,7 @@
 	public:
 		AudioMediaSource( uint32_t ssrc, std::string callId, MRef<Media *> media );
 
-		void playData( MRef<RtpPacket *> rtpPacket );
+		void playData( const MRef<RtpPacket *> & rtpPacket );
 		uint32_t getSsrc();
 		
 		MRef<Media *> getMedia() { return media; };

Modified: trunk/libminisip/include/libminisip/media/MediaStream.h
===================================================================
--- trunk/libminisip/include/libminisip/media/MediaStream.h	2010-01-26 21:21:55 UTC (rev 3750)
+++ trunk/libminisip/include/libminisip/media/MediaStream.h	2010-01-26 21:40:06 UTC (rev 3751)
@@ -297,7 +297,7 @@
 		 * playback.
 		 * @param packet the (S)RTP packet to handle
 		 */
-		virtual void handleRtpPacket( MRef<SRtpPacket *> packet, std::string callId, MRef<IPAddress *> from );
+		virtual void handleRtpPacket( const MRef<SRtpPacket *> & packet, std::string callId, MRef<IPAddress *> from );
 
 		/**
 		 * Returns a unique identifier for this Receiver. Used
@@ -468,7 +468,7 @@
 		uint16_t getSeqNo() { return seqNo; };
 #endif
 
-		void sendRtpPacket(MRef<RtpPacket*> rtp);
+		void sendRtpPacket(const MRef<RtpPacket*> & rtp);
 
 		/**
 		 * Used by the Session to specify the IP address

Modified: trunk/libminisip/include/libminisip/media/soundcard/SoundSource.h
===================================================================
--- trunk/libminisip/include/libminisip/media/soundcard/SoundSource.h	2010-01-26 21:21:55 UTC (rev 3750)
+++ trunk/libminisip/include/libminisip/media/soundcard/SoundSource.h	2010-01-26 21:40:06 UTC (rev 3751)
@@ -288,10 +288,10 @@
 		*/
 		CircularBuffer * cbuff;
 
+		short plcCache[2048];
+
 		int oFreq;
 
-		uint16_t plc_lastdata[4096];
-		
 		/**
 		Auxiliary buffer .. used both in pushSound() and getSound().
 		We need the mutex

Modified: trunk/libminisip/include/libminisip/media/video/VideoMedia.h
===================================================================
--- trunk/libminisip/include/libminisip/media/video/VideoMedia.h	2010-01-26 21:21:55 UTC (rev 3750)
+++ trunk/libminisip/include/libminisip/media/video/VideoMedia.h	2010-01-26 21:40:06 UTC (rev 3751)
@@ -61,7 +61,7 @@
 
 		virtual std::string getSdpMediaType();
 
-		virtual void playData( MRef<RtpPacket *> rtpPacket );
+		virtual void playData( const MRef<RtpPacket *> & rtpPacket );
 
 		virtual void sendVideoData( byte_t * data, uint32_t length, uint32_t ts, bool marker=false );
 
@@ -105,7 +105,7 @@
 		void addEmptyImage( MImage * image );
 		void addFilledImage( MImage * image );
 		
-		virtual void playData( MRef<RtpPacket *> packet ); 
+		virtual void playData( const MRef<RtpPacket *> & packet ); 
 
 		MRef<AVDecoder *> getDecoder();
 		MRef<AVEncoder *> getEncoder();
@@ -120,7 +120,7 @@
 		 * @param flush Packet loss was detected, and previous
 		 *              data should be flushed to the decoder.
 		 */
-		void addPacketToFrame( MRef<RtpPacket *> packet, bool flush );
+		void addPacketToFrame( const MRef<RtpPacket *> & packet, bool flush );
 
 		MRef<AVDecoder *> decoder;
 		MRef<VideoDisplay *> display;
@@ -137,7 +137,7 @@
 		uint16_t lastSeqNo;
 		uint16_t lastPlayedSeqNo;
 		std::list<MRef<RtpPacket*> > rtpReorderBuf;
-		void enqueueRtp(MRef<RtpPacket*> rtp); //ordered list of packets left to play out
+		void enqueueRtp(const MRef<RtpPacket*> & rtp); //ordered list of packets left to play out
 		void playSaved();
 
 

Modified: trunk/libminisip/include/libminisip/media/video/codec/AVCoder.h
===================================================================
--- trunk/libminisip/include/libminisip/media/video/codec/AVCoder.h	2010-01-26 21:21:55 UTC (rev 3750)
+++ trunk/libminisip/include/libminisip/media/video/codec/AVCoder.h	2010-01-26 21:40:06 UTC (rev 3751)
@@ -90,6 +90,7 @@
 		MRef<VideoDisplay*> localDisplay;
 
 		void *swsctx;
+		int N;
 };
 
 

Modified: trunk/libminisip/include/libminisip/media/video/codec/AVDecoder.h
===================================================================
--- trunk/libminisip/include/libminisip/media/video/codec/AVDecoder.h	2010-01-26 21:21:55 UTC (rev 3750)
+++ trunk/libminisip/include/libminisip/media/video/codec/AVDecoder.h	2010-01-26 21:40:06 UTC (rev 3751)
@@ -73,6 +73,7 @@
 		bool needsConvert;
 
 		void* swsctx;
+		int N;
 
 };
 

Modified: trunk/libminisip/source/subsystem_gui/ConsoleDebugger.cxx
===================================================================
--- trunk/libminisip/source/subsystem_gui/ConsoleDebugger.cxx	2010-01-26 21:21:55 UTC (rev 3750)
+++ trunk/libminisip/source/subsystem_gui/ConsoleDebugger.cxx	2010-01-26 21:40:06 UTC (rev 3751)
@@ -99,7 +99,7 @@
 	
 }
 
-int globalBitRate=1024;
+int globalBitRate=6024;
 
 void ConsoleDebugger::run(){
 #ifdef DEBUG_OUTPUT

Modified: trunk/libminisip/source/subsystem_media/AudioMedia.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/AudioMedia.cxx	2010-01-26 21:21:55 UTC (rev 3750)
+++ trunk/libminisip/source/subsystem_media/AudioMedia.cxx	2010-01-26 21:40:06 UTC (rev 3751)
@@ -151,7 +151,7 @@
 	}
 }
 
-void AudioMedia::playData( MRef<RtpPacket *> packet ){
+void AudioMedia::playData(const MRef<RtpPacket *> & packet ){
 	MRef<AudioMediaSource *> source = getSource( packet->getHeader().SSRC );
 
 	if( source ){
@@ -326,7 +326,7 @@
 		codecOutput[i]=0;
 }
 
-void AudioMediaSource::playData( MRef<RtpPacket *> rtpPacket ){
+void AudioMediaSource::playData( const MRef<RtpPacket *> & rtpPacket ){
         RtpHeader hdr = rtpPacket->getHeader();
 	MRef<CodecState *> codec = findCodec( hdr.getPayloadType() );
 

Modified: trunk/libminisip/source/subsystem_media/MediaStream.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/MediaStream.cxx	2010-01-26 21:21:55 UTC (rev 3750)
+++ trunk/libminisip/source/subsystem_media/MediaStream.cxx	2010-01-26 21:40:06 UTC (rev 3751)
@@ -383,7 +383,7 @@
 }
 #endif
 
-void RealtimeMediaStreamReceiver::handleRtpPacket( MRef<SRtpPacket *> packet, string callId, MRef<IPAddress *> from ){
+void RealtimeMediaStreamReceiver::handleRtpPacket( const MRef<SRtpPacket *> & packet, string callId, MRef<IPAddress *> from ){
 	uint32_t packetSsrc;
 	uint16_t seq_no;
 
@@ -626,7 +626,7 @@
 
 }
 
-void RealtimeMediaStreamSender::sendRtpPacket(MRef<RtpPacket*> rtp){
+void RealtimeMediaStreamSender::sendRtpPacket(const MRef<RtpPacket*> & rtp){
 	if( remoteAddress->getAddressFamily() == AF_INET && senderSock )
 		rtp->sendTo( **senderSock, **remoteAddress, remotePort );
 	else if( remoteAddress->getAddressFamily() == AF_INET6 && sender6Sock )

Modified: trunk/libminisip/source/subsystem_media/RtpReceiver.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/RtpReceiver.cxx	2010-01-26 21:21:55 UTC (rev 3750)
+++ trunk/libminisip/source/subsystem_media/RtpReceiver.cxx	2010-01-26 21:40:06 UTC (rev 3751)
@@ -246,49 +246,107 @@
 		MRef<IPAddress *> from = NULL;
 		try{
 		    packet = SRtpPacket::readPacket( **socket, from);
+		} catch (NetworkException &  ){
+			continue;
 		}
 
-		catch (NetworkException &  ){
-			continue;
+		list<MRef<SRtpPacket*> > nextpackets;
+		struct timeval nowait={0,0};
+		{
+			FD_ZERO( &rfds );
+#ifdef WIN32
+			FD_SET( (uint32_t) socket->getFd(), &rfds );
+#else
+			FD_SET( socket->getFd(), &rfds );
+
+#endif
+			while( select( socket->getFd()+1, &rfds, NULL, NULL, &nowait ) > 0 ){
+				MRef<SRtpPacket *> nextpacket;
+				try{
+					nextpacket = SRtpPacket::readPacket( **socket, from);
+				} catch (NetworkException &  ){
+					continue;
+				}
+				nextpackets.push_back(nextpacket);
+
+			}
+			int nmark=0;
+			list<MRef<SRtpPacket*> >::iterator i;
+			for (i=nextpackets.begin(); i!=nextpackets.end(); i++){
+				if ((*i)->getHeader().marker)
+					nmark++;
+			}
+			
+
+//			cerr <<"EEEE: RtpPacket::run: number of extra packets: "<< nextpackets.size() <<" nmark" <<nmark<<endl;
+			int ndrop=0;
+			if (nmark>2 && nextpackets.size()>150){
+				while ( nmark>2 ){
+					if ( (*nextpackets.begin())->getHeader().marker )
+						nmark--;
+					nextpackets.pop_front();
+					ndrop++;
+				}
+
+				cerr <<"EEEE: dropped packets n="<<ndrop<<endl;
+			}
+
+
 		}
 
+
+
+
+
 		if( !packet ){
 			continue;
 		}
+		
+		realtimeMediaStreamsLock.lock();
+		do{
 
-		realtimeMediaStreamsLock.lock();
-		for ( i = realtimeMediaStreams.begin(); i != realtimeMediaStreams.end(); i++ ) {
-                    std::list<MRef<Codec *> > codecs = (*i)->getAvailableCodecs();
-                    std::list<MRef<Codec *> >::iterator iC;
-                    int found = 0;
-			//printf( "|" );
-                    for( iC = codecs.begin(); iC != codecs.end(); iC ++ ){
-                        if ( (*iC)->getSdpMediaType() == packet->getHeader().getPayloadType() ) {
-                            (*i)->handleRtpPacket( packet, callId, from );
-                            found = 1;
-                            //printf( "~" );
-                            break;
-                        }
-                    }
+			for ( i = realtimeMediaStreams.begin(); i != realtimeMediaStreams.end(); i++ ) {
+				std::list<MRef<Codec *> > codecs = (*i)->getAvailableCodecs();
+				std::list<MRef<Codec *> >::iterator iC;
+				int found = 0;
+				//printf( "|" );
+				for( iC = codecs.begin(); iC != codecs.end(); iC ++ ){
+					if ( (*iC)->getSdpMediaType() == packet->getHeader().getPayloadType() ) {
+						(*i)->handleRtpPacket( packet, callId, from );
+						found = 1;
+						//printf( "~" );
+						break;
+					}
+				}
 #ifdef ZRTP_SUPPORT
-                    /*
-                     * If we come to this point:
-                     * no codec was found for this packet.
-                     */
-                    MRef<ZrtpHostBridgeMinisip *>zhb = (*i)->getZrtpHostBridge();
+				/*
+				 * If we come to this point:
+				 * no codec was found for this packet.
+				 */
+				MRef<ZrtpHostBridgeMinisip *>zhb = (*i)->getZrtpHostBridge();
 
-                    /*
-                     * If the packet was not processed above and it contains an
-                     * extension header then check for ZRTP packet.
-                    */
-                    if (!found && zhb && packet->getHeader().getExtension()) {
-                        (*i)->handleRtpPacketExt(packet);
-                    }
+				/*
+				 * If the packet was not processed above and it contains an
+				 * extension header then check for ZRTP packet.
+				 */
+				if (!found && zhb && packet->getHeader().getExtension()) {
+					(*i)->handleRtpPacketExt(packet);
+				}
 #endif // ZRTP_SUPPORT
-                }
-                realtimeMediaStreamsLock.unlock();
+			}
 
-                packet = NULL;
+			packet = NULL;
+
+			if (nextpackets.size()>0){
+				packet= *nextpackets.begin();
+				nextpackets.pop_front();
+			}
+
+		}while(packet);
+
+		realtimeMediaStreamsLock.unlock();
+
 	}
 	socket=NULL;
 }
+

Modified: trunk/libminisip/source/subsystem_media/codecs/SPEEXCODEC.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/codecs/SPEEXCODEC.cxx	2010-01-26 21:21:55 UTC (rev 3750)
+++ trunk/libminisip/source/subsystem_media/codecs/SPEEXCODEC.cxx	2010-01-26 21:40:06 UTC (rev 3751)
@@ -69,18 +69,18 @@
 
 
 	int ok;
-#if 0
+#if 1
 	int sample_rate=16000;
 	ok = speex_decoder_ctl(enc_state, SPEEX_SET_SAMPLING_RATE, &sample_rate);
 	massert(ok>=0);
 
 	ok = speex_encoder_ctl(enc_state,SPEEX_GET_FRAME_SIZE,&frame_size);
 	massert(ok>=0);
-	cerr <<"EEEE: SPEEX encoder frame_size="<<frame_size<<endl;
+	//cerr <<"EEEE: SPEEX encoder frame_size="<<frame_size<<endl;
 
 	int bitrate;
 	speex_encoder_ctl(enc_state, SPEEX_GET_BITRATE, &bitrate);
-	cerr <<"EEEE: SPEEX: bitrate="<<bitrate<<endl;
+	//cerr <<"EEEE: SPEEX: bitrate="<<bitrate<<endl;
 
 #endif	
 
@@ -91,14 +91,14 @@
 	dec_state = speex_decoder_init(speex_mode); 
 	massert(dec_state);
 
-#if 0
+#if 1
 	ok = speex_decoder_ctl(dec_state, SPEEX_SET_SAMPLING_RATE, &sample_rate);
 	massert(ok>=0);
 	
 	// This will hand in the frame size used by the decoder  
 	ok=speex_decoder_ctl(dec_state, SPEEX_GET_FRAME_SIZE, &frame_size);
 	massert(ok>=0);
-	cerr <<"EEEE: SPEEX decoder frame_size="<<frame_size<<endl;
+	//cerr <<"EEEE: SPEEX decoder frame_size="<<frame_size<<endl;
 #endif
 
 //	output_frame = new float[320];
@@ -122,12 +122,12 @@
 //	}
 	
 	
-	cerr <<"EEEE: Speex: in_buf_size="<<in_buf_size<<endl;
+//	cerr <<"EEEE: Speex: in_buf_size="<<in_buf_size<<endl;
 	//  now for every input frame:
 	speex_bits_reset(&bits);
-	cerr <<"EEEE: doing speex_encode_int"<<endl;
+//	cerr <<"EEEE: doing speex_encode_int"<<endl;
 	speex_encode_int(enc_state, (short*)in_buf, &bits);
-	cerr <<"EEEE: done doing speex_encode_int"<<endl;
+//	cerr <<"EEEE: done doing speex_encode_int"<<endl;
 	// returns the number of bytes that need to be written
 	//int bNum = speex_bits_nbytes(&bits); 
 	nbBytes = speex_bits_write(&bits, (char*)out_buf,/* MAX_NB_BYTES*/ 640);
@@ -138,7 +138,7 @@
 uint32_t SpeexCodecState::decode(void *in_buf, int32_t in_buf_size, void *out_buf){
 
 
-	cerr <<"EEEE: SPEEX decode running;"<<endl;
+	//cerr <<"EEEE: SPEEX decode running;"<<endl;
 	input_bytes = (char *) in_buf;  // should in_buf also be changed to short (as in encode function)?  If so, then then you should have a for loop here
 	//nbBytes = (int) in_buf_size;
 
@@ -180,12 +180,10 @@
 
 string SpeexCodec::getCodecDescription(){
 	return "SPEEX 16kHz, Speex";
-	// for now we are only using narrow-band (8kHz)
-
 }
 
 uint8_t SpeexCodec::getSdpMediaType(){
-	return 114;  
+	return 119;  
 	// Speex uses Dynamic Payload Type, meaning that there isn't a fixed assigned 
 	// payload type number for it.  So, we use an agreed number in minisip 
 	// for speex's payload type (114).
@@ -206,3 +204,4 @@
 uint32_t SpeexCodec::getVersion()const{
 	return 0x00000001;
 }
+

Modified: trunk/libminisip/source/subsystem_media/soundcard/SoundSource.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/SoundSource.cxx	2010-01-26 21:21:55 UTC (rev 3750)
+++ trunk/libminisip/source/subsystem_media/soundcard/SoundSource.cxx	2010-01-26 21:40:06 UTC (rev 3751)
@@ -37,7 +37,7 @@
 #include<libmutil/CircularBuffer.h>
 
 //jitter buffer size in units of 20ms
-#define CIRCULAR_BUFFER_SIZE 5
+#define CIRCULAR_BUFFER_SIZE 7
 
 using namespace std;
 
@@ -76,6 +76,8 @@
 		SoundSource(id, callId),
 		plcProvider(plc)   {
 	this->oNChannels = oNChannels;
+
+	memset(plcCache, 0, 2048*sizeof(short));
 	this->oFreq = oFreq;
         
 	this->position=position;
@@ -253,9 +255,14 @@
 			short *b = plcProvider->get_plc_sound(oFrames);
 			memcpy(dest, b, oFrames);
 		}else{
+		//	for (uint32_t i=0; i < oFrames * oNChannels; i++){
+		//		dest[i]=0;
+		//	}
 			for (uint32_t i=0; i < oFrames * oNChannels; i++){
-				dest[i]=0;
+				dest[i]=plcCache[i];
+				plcCache[i]/=2;
 			}
+
 		}
 		bufferLock.unlock();
                 return;
@@ -278,6 +285,9 @@
 //	resampler->resample( temp, dest );
 	memcpy(dest,temp,iFrames * oNChannels * sizeof( short ) );
 
+
+	memcpy((void*)&plcCache[0], dest, oFrames*oNChannels );
+
 // 	memset( dest, 0, oFrames * oNChannels * sizeof( short ) ); 
 	bufferLock.unlock();
 	


From erik at minisip.org  Tue Jan 26 22:44:39 2010
From: erik at minisip.org (erik at minisip.org)
Date: Tue, 26 Jan 2010 22:44:39 +0100 (CET)
Subject: r3752 - in trunk/libminisip: include/libminisip/media
	source/subsystem_media/video source/subsystem_media/video/codec
	source/subsystem_media/video/display
	source/subsystem_media/video/grabber
Message-ID: <20100126214439.3A56F1ABF2@mail.minisip.org>

Author: erik
Date: 2010-01-26 22:44:38 +0100 (Tue, 26 Jan 2010)
New Revision: 3752

Modified:
   trunk/libminisip/include/libminisip/media/RealtimeMedia.h
   trunk/libminisip/source/subsystem_media/video/VideoMedia.cxx
   trunk/libminisip/source/subsystem_media/video/codec/AVCoder.cxx
   trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.cxx
   trunk/libminisip/source/subsystem_media/video/grabber/MatroxGrabber.cxx
Log:
 (see last commit)



Modified: trunk/libminisip/include/libminisip/media/RealtimeMedia.h
===================================================================
--- trunk/libminisip/include/libminisip/media/RealtimeMedia.h	2010-01-26 21:40:06 UTC (rev 3751)
+++ trunk/libminisip/include/libminisip/media/RealtimeMedia.h	2010-01-26 21:44:38 UTC (rev 3752)
@@ -64,7 +64,7 @@
 		 * decoding if relevant.
 		 * @param rtpPacket the RTP packet to play
 		 */
-		virtual void playData( MRef<RtpPacket *> rtpPacket )=0;
+		virtual void playData( const MRef<RtpPacket *> & rtpPacket )=0;
 		
 		/**
 		 * Send the data to all the registered RealtimeMediaStreamSender.

Modified: trunk/libminisip/source/subsystem_media/video/VideoMedia.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/VideoMedia.cxx	2010-01-26 21:40:06 UTC (rev 3751)
+++ trunk/libminisip/source/subsystem_media/video/VideoMedia.cxx	2010-01-26 21:44:38 UTC (rev 3752)
@@ -95,7 +95,7 @@
         }
 }
 
-void VideoMedia::playData( MRef<RtpPacket *> packet ){
+void VideoMedia::playData( const MRef<RtpPacket *> & packet ){
 
 	MRef<VideoMediaSource *> source = getSource( packet->getHeader().SSRC );
 
@@ -355,8 +355,8 @@
 	return ret;
 }
 
-void VideoMediaSource::enqueueRtp(MRef<RtpPacket*> rtp){
-	//cerr << "EEEE: VideoMediaSource::enqueueRtp seq="<< rtp->getHeader().getSeqNo()<<endl;
+void VideoMediaSource::enqueueRtp( const MRef<RtpPacket*> & rtp){
+	cerr << "EEEE: VideoMediaSource::enqueueRtp seq="<< rtp->getHeader().getSeqNo()<<endl;
 	if (rtpReorderBuf.size()==0){
 		rtpReorderBuf.push_front(rtp);
 	}else{
@@ -380,7 +380,6 @@
 	while (rtpReorderBuf.size()>0 && rtpSeqDiff(lastPlayedSeqNo, (*rtpReorderBuf.begin())->getHeader().getSeqNo()  )==1){
 		MRef<RtpPacket*> packet=*rtpReorderBuf.begin();
 		int seqNo = packet->getHeader().getSeqNo();
-		//cerr << "EEEE: playing another queued packet with seq="<<seqNo<<endl;
 		addPacketToFrame( packet, false );
 		rtpReorderBuf.pop_front();
 		lastSeqNo=seqNo;
@@ -389,7 +388,7 @@
 
 }
 
-void VideoMediaSource::playData( MRef<RtpPacket *> packet ){
+void VideoMediaSource::playData( const MRef<RtpPacket *> & packet ){
 
 	int marker= packet->getHeader().marker;
 	int seqNo = packet->getHeader().getSeqNo();
@@ -487,7 +486,7 @@
 #endif
 }
 
-void VideoMediaSource::addPacketToFrame( MRef<RtpPacket *> packet, bool flush){
+void VideoMediaSource::addPacketToFrame( const MRef<RtpPacket *> & packet, bool flush){
 
 	if (flush){
 		//cerr <<"EEEE: addPacketToFrame: flushing"<<endl;

Modified: trunk/libminisip/source/subsystem_media/video/codec/AVCoder.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/codec/AVCoder.cxx	2010-01-26 21:40:06 UTC (rev 3751)
+++ trunk/libminisip/source/subsystem_media/video/codec/AVCoder.cxx	2010-01-26 21:44:38 UTC (rev 3752)
@@ -25,6 +25,7 @@
 #include<libminisip/media/video/codec/AVCoder.h>
 #include<sys/time.h>
 #include<libmutil/mtime.h>
+#include<libmutil/Timestamp.h>
 #include<libminisip/media/video/codec/VideoEncoderCallback.h>
 #include<libminisip/media/video/VideoException.h>
 //#include<libminisip/media/rtp/RtpPacket.h>
@@ -75,6 +76,7 @@
 	video=NULL;
 	videoCodec=NULL;
 	swsctx=NULL;
+	N=0;
 
 
 }
@@ -108,7 +110,7 @@
 
 	video->width=width;
 	video->height=height;
-	video->fps=15;
+	video->fps=30;
 
 #ifdef GLOBAL_BANDWIDTH_HACK
 	if (globalBitRate<128)
@@ -117,7 +119,7 @@
 		globalBitRate=25000;
 	videoCodec->bitrate=globalBitRate;
 #else
-	videoCodec->bitrate=1500;
+	videoCodec->bitrate=6000;
 #endif
 
 
@@ -142,7 +144,11 @@
 }
 
 #define REPORT_N 50
+#if 0
 
+#endif
+
+
 void AVEncoder::handle( MImage * image ){
 
 	massert(image);
@@ -152,8 +158,8 @@
 	static struct timeval lasttime;
 
 	static int i=0;
-	static int N=0;
-        i++;
+	//	static int N=0;
+	i++;
 
 #ifdef GLOBAL_BANDWIDTH_HACK
 	static int lastBitRate=-1;
@@ -161,12 +167,14 @@
 		lastBitRate=globalBitRate;
 
 	if (globalBitRate!=lastBitRate){
+		cerr <<"EEEE: bitrate changed. ============================="<<endl;
 		init(image->width, image->height);
 		lastBitRate=globalBitRate;
 
 	}
 #endif
 
+	Video *video = (Video*)this->video;
 
 //	if (i%7!=0)
 //		return;
@@ -178,13 +186,12 @@
                 int diffms = (now.tv_sec-lasttime.tv_sec)*1000+(now.tv_usec-lasttime.tv_usec)/1000;
                 float sec = (float)diffms/1000.0f;
                 printf("%d frames in %fs\n", REPORT_N, sec);
-                printf("FPS_ENCODE: %f\n", (float)REPORT_N/(float)sec );
+                printf("FPS_ENCODE: %f for video of size %dx%d\n", (float)REPORT_N/(float)sec, video->width, video->height );
                 lasttime=now;
         }
 #endif
 
 
-	Video *video = (Video*)this->video;
 	VideoCodec *videoCodec = (VideoCodec*)this->videoCodec;
 
 	if (!video || image->width!=video->width || image->height!=video->height){
@@ -228,6 +235,7 @@
 		struct SwsContext* ctx = (struct SwsContext*)swsctx;
 
 		sws_scale( ctx, image->data, image->linesize, 0, image->height, frame.data, frame.linesize);
+//		yuv2rgb(image->data[0], image->data[1], image->data[2], image->width, image->height, frame.data[0]);
 	}
 	else{
 		/* We can use the picture as is */
@@ -265,6 +273,8 @@
 	if (mustFreeFrame){
 		avpicture_free( (AVPicture*)&frame );
 	}
+
+	//printSnd();
 }
 
 int h264_start_code(unsigned char* p){

Modified: trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.cxx	2010-01-26 21:40:06 UTC (rev 3751)
+++ trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.cxx	2010-01-26 21:44:38 UTC (rev 3752)
@@ -2791,6 +2791,7 @@
 OpenGLDisplay::OpenGLDisplay( uint32_t width, uint32_t height, bool _fullscreen):VideoDisplay(){
 	cerr << "EEEE: OpenGLDisplay::OpenGLDisplay("<< width<<","<<height<<","<<_fullscreen<<") running"<<endl;
 	hidden=false;
+	hidden=false;
 	this->width = width;
 	this->height = height;
 	fullscreen = _fullscreen;

Modified: trunk/libminisip/source/subsystem_media/video/grabber/MatroxGrabber.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/grabber/MatroxGrabber.cxx	2010-01-26 21:40:06 UTC (rev 3751)
+++ trunk/libminisip/source/subsystem_media/video/grabber/MatroxGrabber.cxx	2010-01-26 21:44:38 UTC (rev 3752)
@@ -259,13 +259,13 @@
 		if (!UserStruct.stopped){
 			static int i=0;
 			i++;
-			if (i%2==1){ //grabber does 50fps. We send 25fps.
+//			if (i%50==1){ //grabber does 50fps. We send 25fps.
 
 				handler->handle( frame );
 				if (localDisplay){
 					localDisplay->handle(frame);
 				}
-			}
+//			}
 
 			if (i%200==0){
 				static struct timespec last_wallt;


From erik at minisip.org  Tue Jan 26 22:45:48 2010
From: erik at minisip.org (erik at minisip.org)
Date: Tue, 26 Jan 2010 22:45:48 +0100 (CET)
Subject: r3753 - trunk/minisip/minisip/gui/openglgui
Message-ID: <20100126214548.C53801ACF0@mail.minisip.org>

Author: erik
Date: 2010-01-26 22:45:48 +0100 (Tue, 26 Jan 2010)
New Revision: 3753

Modified:
   trunk/minisip/minisip/gui/openglgui/Main.cxx
   trunk/minisip/minisip/gui/openglgui/OpenGlGui.cxx
Log:
 * Cleanup



Modified: trunk/minisip/minisip/gui/openglgui/Main.cxx
===================================================================
--- trunk/minisip/minisip/gui/openglgui/Main.cxx	2010-01-26 21:44:38 UTC (rev 3752)
+++ trunk/minisip/minisip/gui/openglgui/Main.cxx	2010-01-26 21:45:48 UTC (rev 3753)
@@ -77,6 +77,7 @@
 
 	cerr <<"EEEE: ,,,,,,,,,,,,,,,,,,,,,,,, running minisip.exit"<<endl;
 	minisip.exit();
+	Thread::msleep(1000);
 	return 0;
 }
 

Modified: trunk/minisip/minisip/gui/openglgui/OpenGlGui.cxx
===================================================================
--- trunk/minisip/minisip/gui/openglgui/OpenGlGui.cxx	2010-01-26 21:44:38 UTC (rev 3752)
+++ trunk/minisip/minisip/gui/openglgui/OpenGlGui.cxx	2010-01-26 21:45:48 UTC (rev 3753)
@@ -228,6 +228,10 @@
 void OpenGlGui::handleCommand(const CommandString &cmd){
 	cerr << "OpenGlGui::handleCommand: Got "<<cmd.getString() << endl;
 
+	if (cmd.getOp()=="remote_user_not_found"){
+		display->handleCommand(cmd);
+	}
+
 	if (cmd.getOp()=="key"){
 		display->handleCommand(cmd);
 	}
@@ -264,243 +268,13 @@
 
 
 	}
-		
 
 	if (cmd.getOp()=="hang_up"){
 		cerr <<"EEEE: got hangup from opengl for callid "<< cmd.getDestinationId()<<endl;
 		sendCommand("sip", cmd);
 	}
 
-#if 0
-	bool handled = false;
 
-	if (cmd.getOp()==SipCommandString::ask_password){
-		MRef<QuestionDialog*> d= new QuestionDialog;
-		d->questionId = cmd.getDestinationId();
-		d->questionId2 = cmd.get("realm");
-		d->questions.push_back("Enter USER NAME for realm <"+d->questionId2+">");
-		d->questions.push_back("Enter PASSWORD for realm <"+d->questionId2+">");
-		showQuestionDialog(d);
-	}
-
-	if (cmd.getOp()=="register_ok"){
-		handled=true;
-		displayMessage("Register to proxy "+cmd.getParam()+" OK", green);
-	}
-
-	if (cmd.getOp()=="call_terminated"){
-		handled=true;
-		//we ignore this command
-	}
-
-	if (cmd.getOp()=="file_transfer_done"){
-		handled=true;
-		state="IDLE";
-		setPrompt(state);
-		displayMessage("File transfer done.",red);
-		callId=""; //FIXME: should check the callId of cmd.
-		inCall=false;
-	}
-
-	if (cmd.getOp()=="incoming_filetransfer_accept"){
-		handled=true;
-		if(state=="IDLE"){
-			state="RECEIVE?";
-			setPrompt(state);
-			callId=cmd.getDestinationId();
-			displayMessage("The file transfer from "+cmd.getParam(), blue);
-		}
-	}
-
-
-
-	if (cmd.getOp()=="register_sent"){
-		handled=true; // we don't need to inform the user
-	}
-
-		
-	if (cmd.getOp()==SipCommandString::incoming_im){
-		handled=true;
-		displayMessage("IM to <"+cmd.getParam3()+"> from <"+cmd.getParam2()+">: "+cmd.getParam(), bold);
-	}
-	
-	
-	if (cmd.getOp()=="invite_ok"){
-		handled=true;
-		state="INCALL";
-		inCall = true;
-		setPrompt(state);
-		displayMessage("PROGRESS: remote participant accepted the call...", blue);
-		
-		displayMessage("PROGRESS: Unmuting sending of sound.", blue);
-		CommandString cmdstr( callId,
-				MediaCommandString::set_session_sound_settings,
-				"senders", "ON");
-		sendCommand("media", cmdstr);
-	
-	}
-	else if (cmd.getOp()=="security_failed"){
-		handled=true;
-		state="IDLE";
-		setPrompt(state);
-		displayMessage("Security is not handled by the receiver", red);
-		inCall=false;
-	}
-	
-	if (cmd.getOp()=="remote_ringing"){
-		handled=true;
-		state="REMOTE RINGING";
-		setPrompt(state);
-		displayMessage("PROGRESS: the remote UA is ringing...", blue);
-	}
-	
-	if (cmd.getOp()==SipCommandString::remote_user_not_found && !p2tmode){
-		handled=true;
-		state="IDLE";
-		setPrompt(state);
-		displayMessage("User "+cmd.getParam()+" not found.",red);
-		callId=""; //FIXME: should check the callId of cmd.
-	}
-	
-	if (cmd.getOp()==SipCommandString::remote_hang_up){
-		handled=true;
-		state="IDLE";
-		setPrompt(state);
-		displayMessage("Remote user ended the call.",red);
-		callId=""; //FIXME: should check the callId of cmd.
-		inCall=false;
-	}
-	else if (cmd.getOp()==SipCommandString::remote_cancelled_invite){
-		handled=true;
-		state="IDLE";
-		setPrompt(state);
-		displayMessage("Remote user cancelled the call.",red);
-		callId=""; //FIXME: should check the callId of cmd.
-		inCall=false;
-	}
-	
-	
-	if (cmd.getOp()==SipCommandString::transport_error && !p2tmode){
-		handled=true;
-		state="IDLE";
-		setPrompt(state);
-		displayMessage("The call could not be completed because of a network error.", red);
-		callId=""; //FIXME: should check the callId of cmd.
-	}
-	
-	
-	if (cmd.getOp()=="error_message"){
-		handled=true;
-		displayMessage("ERROR: "+cmd.getParam(), red);
-	}
-	
-	if (cmd.getOp()=="remote_reject" && !p2tmode){
-		handled=true;
-		state="IDLE";
-		setPrompt(state);
-		callId="";
-		displayMessage("The remote user rejected the call.", red);
-	}
-	
-	if (cmd.getOp()==SipCommandString::incoming_available){
-		handled=true;
-		if(state=="IDLE"){
-			state="ANSWER?";
-			setPrompt(state);
-			callId=cmd.getDestinationId();
-			displayMessage("The incoming call from "+cmd.getParam(), blue);
-		}
-		else{
-			displayMessage("You missed call from "+cmd.getParam(), red);
-			CommandString hup(cmd.getDestinationId(), SipCommandString::reject_invite);
-			sendCommand("sip",hup);
-		
-		}
-		
-	}
-	if (cmd.getOp()=="conf_join_received"){
-		handled=true;
-		if(state=="IDLE"){
-			state="ANSWER?";
-			setPrompt(state);
-			callId=cmd.getDestinationId();
-			//addCommand("addc");
-			
-			
-			currentcaller=cmd.getParam();
-			
-					//conf->setGui(this);
-			string confid="";
-			string users=cmd.getParam3();
-			int i=0;	
-			while (users[i]!=';'&&users.length()!=0 &&!(i>((int)users.length()-1))){
-				confid=confid+users[i];
-				i++;
-			}
-			string mysipuri = config->defaultIdentity->getSipUri().getUserIpString();
-			users=trim(users.substr(i));
-			currentconf=new ConferenceControl(mysipuri,confid,false);
-			confCallback->setConferenceController(currentconf);
-			displayMessage("The incoming conference call from "+cmd.getParam(), blue);
-			displayMessage("The participants are "+cmd.getParam()+" "+users, blue);
-			currentconfname=confid;
-		}
-		else{
-			displayMessage("You missed call from "+cmd.getParam(), red);
-			CommandString hup(cmd.getDestinationId(), SipCommandString::reject_invite);
-			confCallback->guicb_handleCommand(hup);
-			
-		
-		}
-		
-	}
-	
-	if (cmd.getOp()==SipCommandString::transfer_pending){
-		handled=true;
-		if(inCall){
-			displayMessage( "Call transfer in progress..." );
-		}
-		
-	}
-	
-	if (cmd.getOp()==SipCommandString::transfer_requested){
-		handled=true;
-		cerr << "TestUI got transfer_requested" << endl;
-		if(inCall){
-			state="TRANSFER?";
-			setPrompt(state);
-			displayMessage("Accept call transfer to "+cmd.getParam(), blue );
-		}
-		
-	}
-	
-	if (cmd.getOp()==SipCommandString::call_transferred){
-		handled=true;
-		callId = cmd.getParam();
-		state="INCALL";
-		displayMessage("Call transferred ...");
-		setPrompt(state);
-	}
-
-	if (autoanswer && state=="ANSWER?"){
-		handled=true;
-		CommandString command(callId, SipCommandString::accept_invite);
-		sendCommand("sip",command);
-		state="INCALL";
-		setPrompt(state);
-		displayMessage("Autoanswered call from "+ cmd.getParam());
-		displayMessage("Unmuting sending of sound.", blue);
-		CommandString cmdstr( callId,
-				MediaCommandString::set_session_sound_settings,
-				"senders", "ON");
-		sendCommand("media",cmdstr);
-	}
-
-	if (!handled){
-		displayMessage("WARNING: Gui did not handle command: "+ cmd.getString(), red );
-	}
-#endif
-
 }
 
 bool OpenGlGui::configDialog( MRef<SipSoftPhoneConfiguration *> /*conf*/ ){


From erik at minisip.org  Wed Jan 27 00:14:33 2010
From: erik at minisip.org (erik at minisip.org)
Date: Wed, 27 Jan 2010 00:14:33 +0100 (CET)
Subject: r3754 - trunk/libminisip/source/subsystem_media/video/display
Message-ID: <20100126231433.A44FA1ACC7@mail.minisip.org>

Author: erik
Date: 2010-01-27 00:14:33 +0100 (Wed, 27 Jan 2010)
New Revision: 3754

Modified:
   trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.cxx
   trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.h
Log:
 * Fix problem with the wrong thread calling OpenGL functions
 * Added comments on which thread is calling some of the important
   methods.




Modified: trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.cxx	2010-01-26 21:45:48 UTC (rev 3753)
+++ trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.cxx	2010-01-26 23:14:33 UTC (rev 3754)
@@ -125,7 +125,7 @@
 };
 
 
-void Notification::draw(float x1, float y1, float x2, float y2){
+void Notification::draw(float x1, float y1, float x2, float y2){ //NOTE: must be called by internal thread
 
 	static const SDL_Color white={255,255,255};
 	static const SDL_Color black={0,0,0};
@@ -167,7 +167,7 @@
 		text = _text;
 		toppicture=NULL;
 	}
-	Menu* select(int si){
+	Menu* select(int si){ //NOTE: this method is indirectly used from external thread
 		list<Menu*>::iterator i;
 		int j=0;
 		Menu* ret=NULL;
@@ -178,7 +178,7 @@
 		}
 		return ret;
 	}
-	int nVisible(){
+	int nVisible(){ //NOTE: this method is indirectly(2) used from external thread
 		int ret=0;
 		list<Menu*>::iterator i;
 		for (i=mitems.begin();i!=mitems.end();i++){
@@ -251,7 +251,7 @@
 		return prev;
 	}
 	
-	Menu* getMenuItem(string name){
+	Menu* getMenuItem(string name){ //NOTE: this method is indirectly(2) used from external thread
 		int n=0;
 		list<Menu*>::iterator i;
 		for (i=mitems.begin();i!=mitems.end();i++, n++){
@@ -526,7 +526,7 @@
 		/**
 		 * Suggest good dimension of window. If there are multiple videos, then this will be ignored
 		 */
-		void sizeHint(int w, int h){
+		void sizeHint(int w, int h){ //NOTE: this method is used from external thread
 			cerr <<"EEEE: doing sizeHint("<<w<<","<<h<<")"<<endl;
 			if (displays.size()<=1){
 //				if (initialized && ! isFullscreen() ){
@@ -548,7 +548,7 @@
 		void keyPressed(string key, bool isRepeat);
 
 		void setPhoneConfig(MRef<SipSoftPhoneConfiguration*> conf);
-		void setCallback(OpenGLDisplay* cb){
+		void setCallback(OpenGLDisplay* cb){ //NOTE: this method is used from external thread
 			if (!callback)
 				callback=cb;
 		}
@@ -564,12 +564,12 @@
 
 		}
 
-		void registerUri(string callid, string remoteuri){
+		void registerUri(string callid, string remoteuri){ //NOTE: this method is used from external thread
 			id_uri[callid]=remoteuri;
 
 		}
 
-		void updateVideoLayout(){
+		void updateVideoLayout(){ //NOTE: this method is used from external thread
 			displaysChanged=true;
 		}
 	
@@ -770,7 +770,7 @@
 
 }
 
-void OpenGLWindow::setPhoneConfig(MRef<SipSoftPhoneConfiguration*> conf){
+void OpenGLWindow::setPhoneConfig(MRef<SipSoftPhoneConfiguration*> conf){ //NOTE: this method is used from external thread
 	pconf=conf;
 }
 
@@ -804,7 +804,7 @@
 	menuLock.unlock();
 }
 
-void OpenGLWindow::incomingCall(string callid, string uri, bool unprotected){
+void OpenGLWindow::incomingCall(string callid, string uri, bool unprotected){ //NOTE: this method is used from external thread
 	cerr <<"OpenGLWindow::incomingCall: trying to display accept call menu"<<endl;
 	menuLock.lock();
 	list<Menu*>::iterator i=menuAcceptCall->mitems.begin();
@@ -840,7 +840,7 @@
 	return NULL;
 }
 
-void OpenGLWindow::videoSelect(string key){
+void OpenGLWindow::videoSelect(string key){ //NOTE: this method is indirectly used from external thread
 	cerr <<"EEEE: videoSelect("<<key<<")"<<endl;
 
 	if (key=="KEY_PLAY"){
@@ -923,7 +923,7 @@
 
 }
 
-void OpenGLWindow::keyPressed(string key, bool isRepeat){
+void OpenGLWindow::keyPressed(string key, bool isRepeat){ //NOTE: this method is used from external thread
 //	cerr <<"EEEE: OpenGLWindow::keyPressed: "<<key<<endl;
 
 	if (isRepeat)
@@ -1043,7 +1043,7 @@
 
 }
 
-void OpenGLWindow::setTexturePath(string p){
+void OpenGLWindow::setTexturePath(string p){ //NOTE: this method is used from external thread
 	texturePath=p;
 }
 
@@ -1057,7 +1057,7 @@
 } 
 
 #define ICON_DIM 256
-bool OpenGLWindow::loadTexture(string fname){
+bool OpenGLWindow::loadTexture(string fname){ //NOTE: must be called by internal thread
 	texturesLoaded=true;
 	cerr <<"EEEE: OpenGLWindow::loadTexture: trying to load "<<fname<<endl;
 
@@ -1115,7 +1115,7 @@
 	massert(glGetError()==GL_NO_ERROR);
 }
 
-void OpenGLWindow::updateMenu(bool animate){
+void OpenGLWindow::updateMenu(bool animate){ //NOTE: this method is indirectly used from external thread
 	if (menuActions){
 		massert(menuActions);
 		massert(menuActions->getMenuItem("hangup"));
@@ -1175,7 +1175,7 @@
 
 }
 
-void OpenGLWindow::enableMenu(){
+void OpenGLWindow::enableMenu(){ //NOTE: this method is used from external thread
 	cerr<<"EEEE: called enableMenu()"<<endl;
 	massert(texturePath.size()>0);
 	/*showMenu=true;*/
@@ -1189,7 +1189,7 @@
 #define REPORT_N 500
 
 
-void OpenGLWindow::findScreenCoords() {
+void OpenGLWindow::findScreenCoords() { //NOTE: must be called by internal thread
 	GLdouble x=0;
 	GLdouble y=0;
 	GLdouble z=0;
@@ -1241,7 +1241,7 @@
 }
 
 
-void OpenGLWindow::rectToCoord(float &x1, float&y1, float &x2, float &y2, float lx1, float ly1, float lx2, float ly2, float aratio){
+void OpenGLWindow::rectToCoord(float &x1, float&y1, float &x2, float &y2, float lx1, float ly1, float lx2, float ly2, float aratio){ //NOTE: this method is indirectly (2) used from external thread
 
 	float l_aratio=(lx2-lx1)/(ly2-ly1);
 //	cerr <<"l_aratio="<<l_aratio<<endl;
@@ -1412,7 +1412,7 @@
 	return ret;
 }
 
-void OpenGLWindow::updateVideoPositions(bool doAnimate){
+void OpenGLWindow::updateVideoPositions(bool doAnimate){ //NOTE: this method is indirectly used from external thread
 
 	cerr << "EEEE: doing updateVideoPositions()"<<endl;
 	displayListLock.lock();
@@ -1560,7 +1560,7 @@
 	displayListLock.unlock();
 }
 
-void OpenGLWindow::addDisplay(OpenGLDisplay* displ){
+void OpenGLWindow::addDisplay(OpenGLDisplay* displ){ //NOTE: this method is used from external thread
 	inCall=true;
 	cerr << "EEEE: doing addDisplay()"<<endl;
 	displayListLock.lock();
@@ -1576,7 +1576,7 @@
 	updateVideoPositions(true);
 }
 
-void OpenGLWindow::removeDisplay(OpenGLDisplay* displ){
+void OpenGLWindow::removeDisplay(OpenGLDisplay* displ){ //NOTE: this method is used from external thread
 	cerr <<"EEEE: removeDisplay() running"<<endl;
 	displayListLock.lock();
 	displays.remove(displ);
@@ -1769,7 +1769,7 @@
 
 }
 
-void OpenGLWindow::menuDrawAddressBook(){
+void OpenGLWindow::menuDrawAddressBook(){ //NOTE: must be called by internal thread
 
 	static const SDL_Color white={255,255,255};
 	static const SDL_Color black={0,0,0};
@@ -1862,7 +1862,7 @@
 }
 
 
-void OpenGLWindow::menuLayout(bool animate){
+void OpenGLWindow::menuLayout(bool animate){ //NOTE: this method is indirectly used from external thread
 	cerr <<"EEEE: menuLayout called"<<endl;
 	int nicons=menuRoot->nVisible();
 	float x1= windowX0;
@@ -1965,7 +1965,7 @@
 
 }
 
-void OpenGLWindow::menuDraw(){
+void OpenGLWindow::menuDraw(){ //NOTE: must be called by internal thread
 	menuLock.lock();
 	massert(menuRoot);
 	bool drawBackground=true;
@@ -2172,7 +2172,7 @@
 
 }
 
-void OpenGLWindow::notificationsDraw(){
+void OpenGLWindow::notificationsDraw(){ //NOTE: must be called by internal(2) thread
 	list<Notification*>::iterator i;
 
 	static const SDL_Color white={255,255,255};
@@ -2196,7 +2196,8 @@
 
 }
 
-void OpenGLWindow::drawSurface(){
+void OpenGLWindow::drawSurface(){ //NOTE: must be called by internal thread
+
 	//	cerr << "EEEE: doing OpenGLWindow::drawSurface()"<<endl;
 	static struct timeval lasttime;
 	static int i=0;
@@ -2263,7 +2264,7 @@
 	int nvideos=displays.size();
 	for (video=displays.begin(); video!=displays.end(); video++){
 		//				cerr << "EEEE: getting video texture for display "<< dummy++ <<"/"<<nvideos <<endl;
-		struct mgl_gfx* gfx = (*video)->getTexture();
+		struct mgl_gfx* gfx = (*video)->getTexture(true);
 		if (!(*video)->isHidden() && gfx->texture>0){
 			massert(gfx->alpha);
 			float alpha=gfx->alpha->getVal();
@@ -2355,20 +2356,17 @@
 }
 
 
-void OpenGLWindow::sdlQuit(){
-	cerr << "EEEE: sdlQuit called"<<endl;
+void OpenGLWindow::sdlQuit(){ //NOTE: must be called by internal thread
 	if (isFullscreen() ){
 		toggleFullscreen();
 	}
 
-	cerr <<"----------------------------->EEEE: SDL_Quit int sdlQuit running by thread "<<hex<<Thread::getCurrent().asLongInt()<<dec<<endl;
 	SDL_Quit();
-	cerr <<"EEEE: done doing SDL_Quit"<<endl;
 }
 
 
 
-void OpenGLWindow::toggleFullscreen(){
+void OpenGLWindow::toggleFullscreen(){ //NOTE: must be called by internal thread
 	printf("Toggle fullscreen\n");
 	sdlFlags ^= SDL_FULLSCREEN;
 	//        SDL_WM_ToggleFullScreen(gDrawSurface);
@@ -2394,7 +2392,7 @@
 
 
 
-void OpenGLWindow::windowResized(int w, int h){
+void OpenGLWindow::windowResized(int w, int h){ //NOTE: must be called by internal thread
 	cerr<<"EEEE: doing OpenGLWindow::windowResized("<<w<<","<<h<<")"<<endl;
 	windowed_width=w;
 	windowed_height=h;
@@ -2411,7 +2409,7 @@
 }
 
 
-void OpenGLWindow::run(){
+void OpenGLWindow::run(){ //NOTE: must be called by internal thread
 	cerr << "EEEE: OpenGLWindow::run start"<<endl;
 #ifdef DEBUG_OUTPUT
 	setThreadName("OpenGLWindow");
@@ -2514,19 +2512,15 @@
 //		Thread::msleep(500);
 	}
 
-	cerr <<"----------------EEEE: OpenGl thread quitting"<<endl;
-	
-	cerr <<"EEEE: TTF_Quit running by thread "<<hex<<Thread::getCurrent().asLongInt()<<dec<<endl;
 
 	TTF_Quit();
 	if (menuMode==MENU_HIDDEN){
-		cerr <<"----------------------------->EEEE: SDL_Quit running by thread "<<hex<<Thread::getCurrent().asLongInt()<<dec<<endl;
 		SDL_Quit();
 	}
 } 
 
 
-void OpenGLWindow::start(){
+void OpenGLWindow::start(){ //NOTE: this method is used from external thread
 	cerr << "EEEE: doing OpenGLWindow::start()"<<endl;
 	lock.lock();
 	bool useSem=false;
@@ -2552,7 +2546,7 @@
 	cerr << "EEEE: after OpenGLWindow::start() runCount="<<runCount<<endl;
 }
 
-void OpenGLWindow::stop(){
+void OpenGLWindow::stop(){ //NOTE: this method is used from external thread
 	cerr << "EEEE: doing OpenGLWindow::stop()"<<endl;
 	lock.lock();
 	runCount--;
@@ -2576,7 +2570,7 @@
 
 }
 
-void OpenGLWindow::init(){
+void OpenGLWindow::init(){ //NOTE: must be called by internal thread
 
 	if (!initialized){
 		initialized=true;
@@ -2589,8 +2583,8 @@
 typedef GLvoid (*glXSwapIntervalSGIFunc) (GLint);
 typedef GLvoid (*glXSwapIntervalMESAFunc) (GLint);
 
-void OpenGLWindow::initSdl(){
-	cerr <<"---------------------> EEEE: initSdl running by thread "<<hex<<Thread::getCurrent().asLongInt()<<dec<<endl;
+void OpenGLWindow::initSdl(){ //NOTE: must be called by internal thread
+	//cerr <<"---------------------> EEEE: initSdl running by thread "<<hex<<Thread::getCurrent().asLongInt()<<dec<<endl;
 	// init video system
 	if( SDL_Init(SDL_INIT_VIDEO) < 0 )
 	{
@@ -2691,8 +2685,10 @@
 	initSurface( );
 }
 
-void OpenGLWindow::initSurface(){
+void OpenGLWindow::initSurface(){ //NOTE: must be called by internal thread
 	printf("initSurface running\n");
+
+	//cerr <<"EEEE: initSurface running by thread "<<hex<<Thread::getCurrent().asLongInt()<<dec<<endl;
 //	massert(glGetError()==GL_NO_ERROR);
 
 	// get a framebuffer
@@ -2844,10 +2840,13 @@
 		callback->handleCommand("gui",cmd);
 }
 
-struct mgl_gfx*  OpenGLDisplay::getTexture(){
+
+struct mgl_gfx*  OpenGLDisplay::getTexture(bool textureUpdate){ //NOTE: if textureUpdate is true this method can only be called by internal thread
+
 	dataLock.lock();
-	if (gfx->texture==-1){
-	massert(glGetError()==GL_NO_ERROR);
+	//cerr <<"EEEE: getTexture running by thread "<<hex<<Thread::getCurrent().asLongInt()<<dec<< " textureUpdate=" << textureUpdate << endl;
+	if (textureUpdate && gfx->texture==-1){
+		massert(glGetError()==GL_NO_ERROR);
 		massert(colorNBytes==3 || colorNBytes==4);
 		int hw_max_dim = window->getTextureMaxSize();
 		int dim = (hw_max_dim>2048) ? 2048 : hw_max_dim;
@@ -2863,10 +2862,10 @@
 		GLenum pixFormat = colorNBytes==3?GL_RGB:GL_BGRA;
 		glTexImage2D( GL_TEXTURE_2D, 0, 3, dim, dim, 0, /*pixFormat*/ GL_RGB, GL_UNSIGNED_BYTE, dummy_black );
 		free(dummy_black);
-	massert(glGetError()==GL_NO_ERROR);
+		massert(glGetError()==GL_NO_ERROR);
 	}
 
-	if (newRgbData){
+	if (textureUpdate && newRgbData){
 		//cerr <<"EEEE: uploading new texture"<<endl;
 		massert(gfx->texture>0);
 		newRgbData=false;
@@ -2935,11 +2934,11 @@
 
 	massert(rgb);
 
-	saveTime(&times_rcv.displaycopystart);
+//	saveTime(&times_rcv.displaycopystart);
 
 	memcpy(rgb, &mimage->data[0][0], width*height*colorNBytes); //TODO: don't copy since it is in correct format.
 
-	saveTime(&times_rcv.displaycopyend);
+//	saveTime(&times_rcv.displaycopyend);
 
 	newRgbData=true;
 	if (!isLocalVideo)

Modified: trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.h
===================================================================
--- trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.h	2010-01-26 21:45:48 UTC (rev 3753)
+++ trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.h	2010-01-26 23:14:33 UTC (rev 3754)
@@ -60,9 +60,11 @@
 		virtual void stop();
 
 		/*
-		 * Must only be called by the thread doing OpenGL calls.
+		 * Must only be called by the thread doing OpenGL calls unless
+		 * noTextureUpdate is set to true. This can be used
+		 * to access non-opengl attributes from non-internal threads.
 		 */
-		struct mgl_gfx* getTexture();
+		struct mgl_gfx* getTexture(bool textureUpdate=false);
 
 		virtual void setIsLocalVideo(bool);	
 		


From erik at minisip.org  Wed Jan 27 06:27:50 2010
From: erik at minisip.org (erik at minisip.org)
Date: Wed, 27 Jan 2010 06:27:50 +0100 (CET)
Subject: r3755 - trunk/libminisip/source/subsystem_media
Message-ID: <20100127052750.3467A1ACAB@mail.minisip.org>

Author: erik
Date: 2010-01-27 06:27:49 +0100 (Wed, 27 Jan 2010)
New Revision: 3755

Modified:
   trunk/libminisip/source/subsystem_media/Session.cxx
Log:

 * Added profile-level-id header to H264 SDP



Modified: trunk/libminisip/source/subsystem_media/Session.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/Session.cxx	2010-01-26 23:14:33 UTC (rev 3754)
+++ trunk/libminisip/source/subsystem_media/Session.cxx	2010-01-27 05:27:49 UTC (rev 3755)
@@ -332,6 +332,13 @@
 				ilbc_fmtp->setAttributes("fmtp:" + itoa( payloadType) + " mode=20" );
 				m->addAttribute(*ilbc_fmtp);
 			}
+			if( (*iC)->getCodecName() == "H.264" ) { 
+				MRef<SdpHeaderA*> h264_fmtp = new SdpHeaderA("a=X");
+				//h264_fmtp->setAttributes("fmtp:" + itoa( payloadType) + " profile-level-id=42900b" );
+				h264_fmtp->setAttributes("fmtp:" + itoa( payloadType) + " profile-level-id=42800d" );
+				m->addAttribute(*h264_fmtp);
+			}
+
 		}
 		if (type=="audio"){
 			//added static DTMF SDP headers in INVITE to audio media


From erik at minisip.org  Wed Jan 27 06:39:32 2010
From: erik at minisip.org (erik at minisip.org)
Date: Wed, 27 Jan 2010 06:39:32 +0100 (CET)
Subject: r3756 - in trunk/libminisip: . source/subsystem_media/soundcard
	source/subsystem_media/video/grabber
	source/subsystem_media/video/grabber/decklinksdk
Message-ID: <20100127053932.D7BCE1AD1B@mail.minisip.org>

Author: erik
Date: 2010-01-27 06:39:32 +0100 (Wed, 27 Jan 2010)
New Revision: 3756

Added:
   trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.cxx
   trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.h
   trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/
   trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/DeckLinkAPI.h
   trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/DeckLinkAPIDispatch.cxx
   trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/DeckLinkAPI_v7_1.h
   trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/DeckLinkAPI_v7_3.h
   trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/LinuxCOM.h
Modified:
   trunk/libminisip/Makefile.am
   trunk/libminisip/configure.ac
   trunk/libminisip/source/subsystem_media/soundcard/AudioMixer.cxx
   trunk/libminisip/source/subsystem_media/soundcard/SoundSource.cxx
Log:
 * Added Blackmagic DeckLink capturing support.



Modified: trunk/libminisip/Makefile.am
===================================================================
--- trunk/libminisip/Makefile.am	2010-01-27 05:27:49 UTC (rev 3755)
+++ trunk/libminisip/Makefile.am	2010-01-27 05:39:32 UTC (rev 3756)
@@ -479,6 +479,16 @@
 mdc1394_la_LIBADD = libminisip_video.la libminisip.la $(MINISIP_LIBS) $(DC1394_LIBS)
 endif
 
+if DECKLINK_VIDEO_GRABBER
+plugins_LTLIBRARIES += decklink.la
+# decklink_la_CPPFLAGS = $(MINISIP_CFLAGS) $(AVCODEC_CPPFLAGS) $(FFMPEG_CFLAGS)
+decklink_la_CPPFLAGS = $(MINISIP_CFLAGS)
+decklink_la_LDFLAGS = $(plugins_LDFLAGS)
+decklink_la_SOURCES = source/subsystem_media/video/grabber/DeckLinkGrabber.cxx \
+			source/subsystem_media/video/grabber/decklinksdk/DeckLinkAPIDispatch.cxx \
+                        source/subsystem_media/video/grabber/DeckLinkGrabber.h
+decklink_la_LIBADD = libminisip_video.la libminisip.la $(MINISIP_LIBS) $(DECKLINK_LIBS)
+endif
 
 if MATROX_VIDEO_GRABBER
 plugins_LTLIBRARIES += matrox.la

Modified: trunk/libminisip/configure.ac
===================================================================
--- trunk/libminisip/configure.ac	2010-01-27 05:27:49 UTC (rev 3755)
+++ trunk/libminisip/configure.ac	2010-01-27 05:39:32 UTC (rev 3756)
@@ -302,7 +302,21 @@
 dnl VIDEO SUPPORT
 dnl #############
 
+dnl Blackmagic DeckLink capture support
+AC_ARG_ENABLE(decklink,
+    AS_HELP_STRING([--enable-decklink],
+    	[enables Blackmagic support for HD grabbing (default disabled)]),
+    [ if test "${enable_decklink}" = "yes"
+      then
+             VIDEO_GRABBER="${VIDEO_GRABBER} decklink}"
+             DECKLINK_VIDEO_GRABBER="yes"
+             DECKLINK_LIBS="-ldl"
+             AC_DEFINE(DECKLINK_SUPPORT, [], [Compile DeckLink grabber support.])
+             AC_SUBST(DECKLINK_LIBS)
+      fi ])
 
+
+
 dnl compile for Matrox Imaging library
 AC_ARG_ENABLE(mil,
     AS_HELP_STRING([--enable-mil],
@@ -550,6 +564,7 @@
 AM_CONDITIONAL(V4L_VIDEO_GRABBER, test "${V4L_VIDEO_GRABBER}" = "yes")
 AM_CONDITIONAL(DC1394_VIDEO_GRABBER, test "${DC1394_VIDEO_GRABBER}" = "yes")
 AM_CONDITIONAL(MATROX_VIDEO_GRABBER, test "${MATROX_VIDEO_GRABBER}" = "yes")
+AM_CONDITIONAL(DECKLINK_VIDEO_GRABBER, test "${DECKLINK_VIDEO_GRABBER}" = "yes")
 AM_CONDITIONAL(XV_VIDEO_DISPLAY, test "${XV_VIDEO_DISPLAY}" = "yes")
 AM_CONDITIONAL(SDL_VIDEO_DISPLAY, test "${SDL_VIDEO_DISPLAY}" = "yes")
 AM_CONDITIONAL(OPENGL_VIDEO_DISPLAY, test "${OPENGL_VIDEO_DISPLAY}" = "yes")

Modified: trunk/libminisip/source/subsystem_media/soundcard/AudioMixer.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/AudioMixer.cxx	2010-01-27 05:27:49 UTC (rev 3755)
+++ trunk/libminisip/source/subsystem_media/soundcard/AudioMixer.cxx	2010-01-27 05:39:32 UTC (rev 3756)
@@ -34,6 +34,7 @@
 
 #include<libminisip/media/soundcard/AudioMixer.h>
 #include<string.h>
+#include<stdio.h>
 
 using namespace std;
 

Modified: trunk/libminisip/source/subsystem_media/soundcard/SoundSource.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/SoundSource.cxx	2010-01-27 05:27:49 UTC (rev 3755)
+++ trunk/libminisip/source/subsystem_media/soundcard/SoundSource.cxx	2010-01-27 05:39:32 UTC (rev 3756)
@@ -36,6 +36,8 @@
 
 #include<libmutil/CircularBuffer.h>
 
+#include<stdio.h>
+
 //jitter buffer size in units of 20ms
 #define CIRCULAR_BUFFER_SIZE 7
 

Added: trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.cxx	                        (rev 0)
+++ trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.cxx	2010-01-27 05:39:32 UTC (rev 3756)
@@ -0,0 +1,641 @@
+/*
+ Copyright (C) 2010 Erik Eliasson
+ 
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ 
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+
+/* Copyright (C) 2010
+ *
+ * Authors: Erik Eliasson <ere at kth.se>
+*/
+
+#include<config.h>
+
+#include"DeckLinkGrabber.h"
+#include<libminisip/media/video/ImageHandler.h>
+#include<libminisip/media/video/VideoMedia.h>
+#include<libminisip/media/video/VideoException.h>
+#include<stdio.h>
+#include<errno.h>
+#include<libmutil/mtime.h>
+#include<libmutil/stringutils.h>
+#include<libmutil/merror.h>
+#include<time.h>
+
+using namespace std;
+
+static std::list<std::string> pluginList;
+static bool initialized;
+
+extern "C" LIBMINISIP_API
+std::list<std::string> *decklink_LTX_listPlugins( MRef<Library*> lib ){
+	if( !initialized ){
+		pluginList.push_back("getPlugin");
+		initialized = true;
+	}
+
+	return &pluginList;
+}
+
+extern "C" LIBMINISIP_API
+MPlugin * decklink_LTX_getPlugin( MRef<Library*> lib ){
+	return new DeckLinkPlugin( lib );
+}
+
+
+#if 0
+MIL_INT MFTYPE GrabEnd(MIL_INT HookType, MIL_ID EventId, void MPTYPE *UserStructPtr)
+{
+	UserDataStruct *UserPtr=(UserDataStruct*)UserStructPtr;
+
+	/* Signal the end of grab event to the main thread waiting. */
+	MthrControl(UserPtr->GrabEndEvent, M_EVENT_SET, M_SIGNALED);
+
+	return 0;
+}
+#endif
+
+
+void uyvy_to_yuv420p(int w, int h, byte_t *in, byte_t* outy, byte_t* outu, byte_t* outv){
+	int x;
+	int y;
+	int inc;
+	int W=w/2;
+	for (y=0; y<h; y++){
+		inc = y & 1;
+		for (x=0; x<W; x++){
+			//Take u
+			*outu=*in;
+			in++;
+			outu+=inc;
+
+			//Take y1
+			*outy=*in;
+			in++;
+			outy++;
+
+			//Take v
+			*outv=*in;
+			in++;
+			outv+=inc;
+
+			//Take y2
+			*outy=*in;
+			in++;
+			outy++;
+		}
+	}
+}
+
+DeckLinkCaptureDelegate::DeckLinkCaptureDelegate(){
+	width=0;
+	height=0;
+	frame=NULL;
+	filled=false;
+	allocateImage();
+}
+
+void DeckLinkCaptureDelegate::allocateImage(){
+	if (!frame){
+		frame = new MImage;
+		//TODO: delete frame->data if it is not NULL, and set to NULL
+	}
+
+	if (width>0 && height>0){
+		//cerr <<"EEEE: allocating image of size "<<width<<"x"<<height<<endl;
+		frame->data[0] = new uint8_t[ width * height];
+		frame->data[1] = new uint8_t[ width * height / 2];
+		frame->data[2] = new uint8_t[ width * height / 2];
+		frame->linesize[0] = width;
+		frame->linesize[1] = width/2;
+		frame->linesize[2] = width/2;
+		frame->width=width;
+		frame->height=height;
+		frame->chroma = M_CHROMA_I420;
+	}
+
+}
+
+void DeckLinkCaptureDelegate::putImage(IDeckLinkVideoInputFrame* videoFrame){
+//	cerr <<"EEEE: doing DeckLinkCaptureDelegate::putImage()"<<endl;
+	int pw = videoFrame->GetWidth();
+	int ph = videoFrame->GetHeight();
+//	cerr <<"EEEE: size: "<<pw<<"x"<<ph<<endl;
+	if (pw!=width || ph!=height){
+		width=pw;
+		height=ph;
+		allocateImage();
+	}
+	byte_t* vbytes;
+	videoFrame->GetBytes((void**)&vbytes);
+
+	bufferLock.lock();
+	if (filled){
+		bufferSem.dec();
+		cerr <<"EEEE: Warning: dropping grabbed frame. Low CPU?"<<endl;
+	}
+//	cerr <<"EEEE: start convert to 420p"<<endl;
+	uyvy_to_yuv420p(pw,ph, vbytes, frame->data[0], frame->data[1], frame->data[2]  );
+//	cerr <<"EEEE: end convert to 420p"<<endl;
+	filled=true;
+	bufferSem.inc();
+	bufferLock.unlock();
+}
+
+MImage* DeckLinkCaptureDelegate::getImage(){
+	bufferSem.dec();
+	filled=false;	
+	return frame;
+}
+
+
+HRESULT DeckLinkCaptureDelegate::VideoInputFrameArrived(IDeckLinkVideoInputFrame* videoFrame, IDeckLinkAudioInputPacket* audioFrame)
+{
+//	cerr <<"EEEE: VideoInputFrameArrived called..."<<endl;
+	void *frameBytes;
+	void *audioFrameBytes;
+
+	// Handle Video Frame
+	if(videoFrame)
+	{
+		if (videoFrame->GetFlags() & bmdFrameHasNoInputSource)
+		{
+			fprintf(stderr, "Frame received (#%lu) - No input signal detected\n", frameCount);
+		}
+		else
+		{
+//			fprintf(stderr, "Frame received (#%lu) - Valid Frame (Size: %li bytes)\n", frameCount, videoFrame->GetRowBytes() * videoFrame->GetHeight());
+			putImage(videoFrame);
+
+#if 0
+			if (videoOutputFile != -1)
+			{
+				videoFrame->GetBytes(&frameBytes);
+				w
+rite(videoOutputFile, frameBytes, videoFrame->GetRowBytes() * videoFrame->GetHeight());
+			}
+#endif
+		}
+		frameCount++;
+	}
+
+	// Handle Audio Frame
+	if (audioFrame)
+	{
+#if 0
+		if (audioOutputFile != -1)
+		{
+			audioFrame->GetBytes(&audioFrameBytes);
+			write(audioOutputFile, audioFrameBytes, audioFrame->GetSampleFrameCount() * g_audioChannels * (g_audioSampleDepth / 8));
+		}
+#endif
+	}
+	return S_OK;
+}
+
+
+HRESULT DeckLinkCaptureDelegate::VideoInputFormatChanged(BMDVideoInputFormatChangedEvents events, IDeckLinkDisplayMode *mode, BMDDetectedVideoInputFormatFlags)
+{
+	cerr <<"WARNING: DeckLinkCaptureDelegate::VideoInputFormatChanged called. "<<endl;
+	return S_OK;
+}
+
+
+////
+
+DeckLinkGrabber::DeckLinkGrabber( string dev ){
+	device=dev;
+	capture=NULL;
+	initialized=false;
+	//	memset(&UserStruct,0,sizeof(UserStruct));
+}
+
+void DeckLinkGrabber::setLocalDisplay(MRef<VideoDisplay*> d){
+	localDisplay=d;
+}
+
+uint32_t DeckLinkGrabber::getHeight(){
+	if (capture){
+		return capture->getHeight();
+	}else
+		return 0;
+}
+uint32_t DeckLinkGrabber::getWidth(){
+	if (capture){
+		return capture->getWidth();
+	}else	
+		return 0;
+
+}
+
+void DeckLinkGrabber::init(){
+
+	doStop=false;
+	initialized=true;
+	//width=height=-1;
+	capture = new DeckLinkCaptureDelegate;
+
+	deckLinkIterator = CreateDeckLinkIteratorInstance();
+	HRESULT                     result;
+
+	BMDDisplayMode              selectedDisplayMode = bmdModeHD720p50;
+	IDeckLinkDisplayMode        *displayMode;
+
+	if (!deckLinkIterator)
+	{
+		fprintf(stderr, "This application requires the DeckLink drivers installed.\n");
+		initialized=false;
+		return;
+	}
+
+	/* Connect to the first DeckLink instance */
+	result = deckLinkIterator->Next(&deckLink);
+	if (result != S_OK)
+	{
+		fprintf(stderr, "No DeckLink PCI cards found.\n");
+		initialized=false;
+		return;
+	}
+
+	if (deckLink->QueryInterface(IID_IDeckLinkInput, (void**)&deckLinkInput) != S_OK){
+		fprintf(stderr, "DeckLink error.\n");
+		initialized=false;
+		return;
+	}
+
+	deckLinkInput->SetCallback(capture);
+
+
+
+	result = deckLinkInput->GetDisplayModeIterator(&displayModeIterator);
+	if (result != S_OK)
+	{
+		fprintf(stderr, "Could not obtain the video output display mode iterator - result = %08x\n", result);
+		initialized=false;
+		return;
+	}
+#if 0
+	selectedDisplayMode = -1;
+	while (displayModeIterator->Next(&displayMode) == S_OK)
+	{
+		if (g_videoModeIndex == displayModeCount)
+		{
+			selectedDisplayMode = displayMode->GetDisplayMode();
+			break;
+		}
+		displayModeCount++;
+		displayMode->Release();
+	}
+
+	if (selectedDisplayMode < 0)
+	{
+		fprintf(stderr, "Invalid mode %d specified\n", g_videoModeIndex);
+		initialized=false;
+		return;
+	}
+#endif
+
+
+	result = deckLinkInput->EnableVideoInput(selectedDisplayMode, bmdFormat8BitYUV, 0);
+	if(result != S_OK)
+	{
+		fprintf(stderr, "Failed to enable video input. Is another application using the card?\n");
+		initialized=false;
+		return;
+	}
+
+
+
+
+#if 0
+	if (M_NULL==MappAlloc(M_DEFAULT, &UserStruct.MilApplication)){
+		cerr << "ERROR: failed to allocate MIL application!"<<endl;
+		return;
+	}
+	if (M_NULL==MsysAlloc(M_SYSTEM_VIO, M_DEV0, M_DEFAULT, &UserStruct.MilSystem)){
+		cerr << "ERROR: failed to allocate MIL system!"<<endl;
+		return;
+	}
+
+	if (M_NULL==MdigAlloc(UserStruct.MilSystem, M_DEV0, "M_DEFAULT", M_DEFAULT, &UserStruct.MilDigitizer)){
+		//if (M_NULL==MdigAlloc(UserStruct.MilSystem, M_DEV0, MIL_TEXT("/opt/matrox_imaging/drivers/vio/dcf/standard/hd_sdi_1280x720P_60Hz.dcf"), M_DEFAULT, &UserStruct.MilDigitizer)){
+		//if (M_NULL==MdigAlloc(UserStruct.MilSystem, M_DEV0, MIL_TEXT("/opt/matrox_imaging/drivers/vio/dcf/standard/hd_sdi_1920x1080i_30Hz.dcf"), M_DEFAULT, &UserStruct.MilDigitizer)){
+		//if (M_NULL==MdigAlloc(UserStruct.MilSystem, M_DEV0, MIL_TEXT("/opt/matrox_imaging/drivers/vio/dcf/standard/hd_rgb_1280x720p_50Hz.dcf"), M_DEFAULT, &UserStruct.MilDigitizer)){
+		//if (M_NULL==MdigAlloc(UserStruct.MilSystem, M_DEV0, MIL_TEXT("/opt/matrox_imaging/drivers/vio/dcf/standard/ntsc.dcf"), M_DEFAULT, &UserStruct.MilDigitizer)){
+		cerr << "ERROR: could not allocate digitizer"<<endl;
+		return;
+	}
+
+	width = MdigInquire(UserStruct.MilDigitizer, M_SIZE_X, M_NULL);
+	height= MdigInquire(UserStruct.MilDigitizer, M_SIZE_Y, M_NULL);
+	cerr << "DeckLinkGrabber: Info: grabber dimensions are "<< width<<"x"<<height<<endl;
+#endif
+
+}
+
+void DeckLinkGrabber::open(){
+	massert(!startBlockSem);
+	massert(!runthread); // we don't want to start a second thread
+	// for a grabber object
+	startBlockSem = new Semaphore();
+	initBlockSem = new Semaphore();
+	runthread = new Thread(this);
+
+	initBlockSem->dec(); // wait for init to complete
+	initBlockSem=NULL;
+
+}
+
+bool DeckLinkGrabber::setImageChroma( uint32_t chroma ){
+	cerr << "Warning: ignoring setImageChroma request for chroma "<< chroma <<endl;
+	return true;
+}
+
+void DeckLinkGrabber::start(){
+	//	UserStruct.stopped = false;
+	doStop=false;
+	massert(startBlockSem);
+	startBlockSem->inc();
+}
+
+void DeckLinkGrabber::stop(){
+	//Note: this can be called even if open has not been done.
+	//	UserStruct.stopped = true;
+	doStop=true;
+	if (runthread){
+		runthread->join();
+		runthread=NULL;
+
+	}
+}
+
+/*loop that reads from the card (and calls handler->handle()) until stop() is called*/
+void DeckLinkGrabber::run(){
+#ifdef DEBUG_OUTPUT
+	setThreadName("DeckLinkGrabber::run");
+#endif
+	//	UserStruct.stopped = false;
+	doStop=false;
+
+	if (!initialized)
+		init();
+#if 0
+
+	/* Initialize hook structure. */
+	UserStruct.MilImage     = MilImage;
+	UserStruct.NbGrabStart  = 0;
+
+	MdigHookFunction(UserStruct.MilDigitizer, M_GRAB_END,   GrabEnd,   (void *)(&UserStruct));
+#endif
+
+	initBlockSem->inc(); // tell thread blocking in "open()" to continue.
+
+
+	startBlockSem->dec(); // wait until start() has been called
+	startBlockSem=NULL; // free
+
+	read( handler );
+}
+
+void DeckLinkGrabber::setHandler( ImageHandler * handler ){
+	grabberLock.lock();
+	this->handler = handler;
+	grabberLock.unlock();
+}
+
+void DeckLinkGrabber::read( ImageHandler * handler ){
+	if (localDisplay){
+		localDisplay->setIsLocalVideo(true);
+		localDisplay->start();
+	}
+
+	HRESULT result = deckLinkInput->StartStreams();
+	if(result != S_OK)
+	{
+		cerr<<"ERROR: could not start DeckLink capturing"<<endl;
+		return;
+	}
+
+	while (!doStop){
+
+		static int i=0;
+		i++;
+		//			if (i%50==1){ //grabber does 50fps. We send 25fps.
+
+		MImage*frame = capture->getImage();
+		handler->handle( frame );
+		if (localDisplay){
+			//localDisplay->handle(frame);
+		}
+		//			}
+
+		if (i%200==0){
+			static struct timespec last_wallt;
+			static struct timespec last_cput;
+
+			struct timespec now_cpu;
+			struct timespec now_wall;
+			clock_gettime(CLOCK_THREAD_CPUTIME_ID, &now_cpu);
+			clock_gettime(CLOCK_REALTIME, &now_wall);
+			cerr <<"cpusec="<<now_cpu.tv_sec<<" lastsec="<<last_cput.tv_sec<<endl;
+			uint64_t delta_cpu = (now_cpu.tv_sec-last_cput.tv_sec)*1000000000LL+(now_cpu.tv_nsec-last_cput.tv_nsec);
+			uint64_t delta_wall = (now_wall.tv_sec-last_wallt.tv_sec)*1000000000LL+(now_wall.tv_nsec-last_wallt.tv_nsec);
+
+			cerr <<"DeckLinkGrabber:: CPU USAGE: "<< now_cpu.tv_sec<<"."<<now_cpu.tv_nsec<<endl;
+			cerr <<"delta_cpu="<<delta_cpu/1000<<" delta_wall="<<delta_wall/1000<<endl;
+			cerr <<"========> DeckLinkGrabber: CPU usage: "<< ((float)delta_cpu/(float)delta_wall)*100.0<<"%"<<endl;
+			last_cput=now_cpu;
+			last_wallt=now_wall;
+
+		}
+
+
+	}
+
+	result = deckLinkInput->StopStreams();
+	deckLinkInput->FlushStreams();
+
+	if (localDisplay){
+		localDisplay->stop();
+	}
+
+
+	if (displayModeIterator != NULL)
+	{
+		displayModeIterator->Release();
+		displayModeIterator = NULL;
+	}
+
+	if (deckLinkInput != NULL)
+	{
+		deckLinkInput->Release();
+		deckLinkInput = NULL;
+	}
+
+	if (deckLink != NULL)
+	{
+		deckLink->Release();
+		deckLink = NULL;
+	}
+
+	if (deckLinkIterator != NULL)
+		deckLinkIterator->Release();
+
+	initialized=false;
+
+#if 0
+	/* Allocate and clear sequence and display images. */
+	MappControl(M_ERROR, M_PRINT_DISABLE);
+	for (UserStruct.NbFrames=0; UserStruct.NbFrames<NB_GRAB_MAX+2; UserStruct.NbFrames++)
+	{
+		MbufAllocColor(UserStruct.MilSystem, 
+				MdigInquire(UserStruct.MilDigitizer, M_SIZE_BAND, M_NULL), 
+				MdigInquire(UserStruct.MilDigitizer, M_SIZE_X, M_NULL), 
+				MdigInquire(UserStruct.MilDigitizer, M_SIZE_Y, M_NULL), 
+				8L+M_UNSIGNED, 
+				M_IMAGE + M_GRAB + M_NON_PAGED + M_BGR32 + M_HOST_MEMORY, 
+				&MilImage[UserStruct.NbFrames]); //Allocate grab buffer with three bands for RGB24 capture
+
+		if (MilImage[UserStruct.NbFrames])
+		{
+			MbufClear(MilImage[UserStruct.NbFrames], 0xFF);
+		}
+		else{
+			cerr << "EEEE: ERROR: could not allocate image buffer"<<endl;
+			break;
+		}	
+	}
+
+
+	MappControl(M_ERROR, M_PRINT_ENABLE);
+
+	/* Free buffers to leave space for possible temporary buffers. */
+	int n;
+	for (n=0; n<2 && UserStruct.NbFrames; n++)
+	{
+		UserStruct.NbFrames--;
+		MbufFree(MilImage[UserStruct.NbFrames]);
+	}
+
+	/* MIL event allocation for grab end hook. */
+	MthrAlloc(UserStruct.MilSystem, M_EVENT, M_DEFAULT, M_NULL, M_NULL, &UserStruct.GrabEndEvent);
+
+	/* Put digitizer in asynchronous mode. */
+	MdigControl(UserStruct.MilDigitizer, M_GRAB_MODE, M_ASYNCHRONOUS);
+	/* Start sequence with a grab in the first buffer. */
+	MdigGrab(UserStruct.MilDigitizer, UserStruct.MilImage[0]);
+
+	MImage *frame = new MImage;
+
+	frame->data[0] = new uint8_t[ width * height * 4 ];
+	frame->data[1] = NULL;
+	frame->data[2] = NULL;
+	frame->linesize[0] = width*4;
+	frame->linesize[1] = 0;
+	frame->linesize[2] = 0;
+	frame->width=width;
+	frame->height=height;
+	frame->chroma = M_CHROMA_RV32;
+	frame->width=width;
+	frame->height=height;
+
+
+	while (!UserStruct.stopped)
+	{
+		/* Wait end of grab event */
+		MthrWait(UserStruct.GrabEndEvent, M_EVENT_WAIT, M_NULL);
+
+		int frameindex = UserStruct.NbGrabStart;
+
+		UserStruct.NbGrabStart = (UserStruct.NbGrabStart+1) % NB_GRAB_MAX;
+
+		MdigGrab(UserStruct.MilDigitizer, UserStruct.MilImage[ UserStruct.NbGrabStart] );
+
+		MIL_INT line_delta=-33;
+		uint8_t *rgb32ptr;
+
+		MbufInquire( UserStruct.MilImage[ frameindex ], M_PITCH_BYTE, &line_delta ); //FIXME: copy from correct index
+		MbufInquire(UserStruct.MilImage[ frameindex ], M_HOST_ADDRESS, &rgb32ptr);
+		memcpy(frame->data[0], rgb32ptr, width * height * 4 );
+		frame->mTime = mtime();
+		if (!UserStruct.stopped){
+			static int i=0;
+			i++;
+			//			if (i%50==1){ //grabber does 50fps. We send 25fps.
+
+			handler->handle( frame );
+			if (localDisplay){
+				localDisplay->handle(frame);
+			}
+			//			}
+
+			if (i%200==0){
+				static struct timespec last_wallt;
+				static struct timespec last_cput;
+
+				struct timespec now_cpu;
+				struct timespec now_wall;
+				clock_gettime(CLOCK_THREAD_CPUTIME_ID, &now_cpu);
+				clock_gettime(CLOCK_REALTIME, &now_wall);
+				cerr <<"cpusec="<<now_cpu.tv_sec<<" lastsec="<<last_cput.tv_sec<<endl;
+				uint64_t delta_cpu = (now_cpu.tv_sec-last_cput.tv_sec)*1000000000LL+(now_cpu.tv_nsec-last_cput.tv_nsec);
+				uint64_t delta_wall = (now_wall.tv_sec-last_wallt.tv_sec)*1000000000LL+(now_wall.tv_nsec-last_wallt.tv_nsec);
+
+				cerr <<"DeckLinkGrabber:: CPU USAGE: "<< now_cpu.tv_sec<<"."<<now_cpu.tv_nsec<<endl;
+				cerr <<"delta_cpu="<<delta_cpu/1000<<" delta_wall="<<delta_wall/1000<<endl;
+				cerr <<"========> DeckLinkGrabber: CPU usage: "<< ((float)delta_cpu/(float)delta_wall)*100.0<<"%"<<endl;
+				last_cput=now_cpu;
+				last_wallt=now_wall;
+
+			}
+
+		}
+	}
+	if (localDisplay){
+		localDisplay->stop();
+	}
+
+	/* Wait for end of last grab. */
+	MdigGrabWait(UserStruct.MilDigitizer, M_GRAB_END);
+
+
+	/* Unhook functions. */
+	//	MdigHookFunction(UserStruct.MilDigitizer, M_GRAB_START+M_UNHOOK, GrabStart, (void *)(&UserStruct));
+	MdigHookFunction(UserStruct.MilDigitizer, M_GRAB_END+M_UNHOOK, GrabEnd, (void *)(&UserStruct));
+
+	/* Free event. */
+	MthrFree(UserStruct.GrabEndEvent);
+
+	/* Free allocations. */
+	for (n=0; n<UserStruct.NbFrames; n++)
+	{
+		MbufFree(UserStruct.MilImage[n]);
+	}
+	//XXX: TODO: free resources
+	MappFreeDefault(UserStruct.MilApplication, UserStruct.MilSystem, M_NULL, UserStruct.MilDigitizer, M_NULL);
+
+	initialized=false;
+#endif
+}
+
+void DeckLinkGrabber::close(){
+	stop();
+}
+
+
+MRef<Grabber *> DeckLinkPlugin::create( const std::string &device ) const{
+	return new DeckLinkGrabber( device );
+}
+

Added: trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.h
===================================================================
--- trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.h	                        (rev 0)
+++ trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.h	2010-01-27 05:39:32 UTC (rev 3756)
@@ -0,0 +1,155 @@
+/*
+ Copyright (C) 2010 Erik Eliasson
+ 
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ 
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+
+/* Copyright (C) 2010
+ *
+ * Authors: Erik Eliasson <ere at kth.se>
+*/
+
+#ifndef DECKLINKGRABBER_INCLUDE_HEADER
+#define DECKLINKGRABBER_INCLUDE_HEADER
+
+#include<libminisip/libminisip_config.h>
+
+#include<stdint.h>
+#include<libmutil/Mutex.h>
+#include<libmutil/Semaphore.h>
+#include<libminisip/media/video/grabber/Grabber.h>
+
+#include"decklinksdk/DeckLinkAPI.h"
+
+class ImageHandler;
+
+//#define NB_GRAB_MAX 3
+
+#if 0
+typedef struct {
+	MIL_ID        *MilImage;
+	MIL_ID        MilDigitizer;
+	MIL_ID        GrabEndEvent;
+	int 	      stopped;
+	long          NbFrames;
+	long          NbGrabStart;
+	MIL_ID   MilApplication;
+	MIL_ID   MilSystem;
+} UserDataStruct;
+#endif
+
+
+class DeckLinkCaptureDelegate : public IDeckLinkInputCallback {
+	public:
+		DeckLinkCaptureDelegate();
+		
+		virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, LPVOID *ppv) { return E_NOINTERFACE; }
+		virtual ULONG STDMETHODCALLTYPE AddRef(void) { return 1; }
+		virtual ULONG STDMETHODCALLTYPE  Release(void) { return 1; }
+		virtual HRESULT STDMETHODCALLTYPE VideoInputFormatChanged(BMDVideoInputFormatChangedEvents, IDeckLinkDisplayMode*, BMDDetectedVideoInputFormatFlags);
+		virtual HRESULT STDMETHODCALLTYPE VideoInputFrameArrived(IDeckLinkVideoInputFrame*, IDeckLinkAudioInputPacket*);
+		MImage* getImage();
+		int getWidth(){return width;}
+		int getHeight(){return height;}
+	private:
+		void allocateImage();
+		long unsigned int frameCount;
+
+		void putImage(IDeckLinkVideoInputFrame* videoFrame);
+		
+
+
+		Mutex bufferLock;
+		Semaphore bufferSem;
+		//image *
+		bool filled;
+		int width;
+		int height;
+		MImage *frame;
+};
+
+
+
+class DeckLinkGrabber : public Grabber{
+	public:
+		DeckLinkGrabber( std::string deviceId );
+
+		void open();
+		void getCapabilities();
+		bool setImageChroma( uint32_t chroma );
+
+
+		void read( ImageHandler * );
+		//void read();
+		virtual void run();
+		virtual void stop();
+		virtual void start();
+
+		virtual void close();
+
+		uint32_t getHeight();//{ return height; };
+		uint32_t getWidth();//{ return width; };
+
+		void setHandler( ImageHandler * handler );
+
+		virtual void setLocalDisplay(MRef<VideoDisplay*>);
+
+	private:
+		void init();
+		bool doStop;
+
+		DeckLinkCaptureDelegate* capture;
+
+		IDeckLinkInput                  *deckLinkInput;
+		IDeckLinkIterator           *deckLinkIterator;
+		IDeckLink                       *deckLink;
+		IDeckLinkDisplayModeIterator    *displayModeIterator;
+
+		std::string device;
+//		MIL_ID   MilImage[NB_GRAB_MAX];
+//		MIL_TEXT_CHAR FrameIndex[10];
+//		UserDataStruct UserStruct;
+
+
+//		uint32_t height;
+//		uint32_t width;
+
+		Mutex grabberLock;
+		ImageHandler * handler;
+		MRef<VideoDisplay*> localDisplay;
+		
+		bool initialized;
+		MRef<Thread*> runthread;
+		MRef<Semaphore*> startBlockSem;
+		MRef<Semaphore*> initBlockSem;
+};
+
+class DeckLinkPlugin : public GrabberPlugin{
+	public:
+		DeckLinkPlugin( MRef<Library *> lib ) : GrabberPlugin( lib ){}
+
+		virtual MRef<Grabber *> create( const std::string &device ) const;
+
+		virtual std::string getMemObjectType() const { return "DeckLinkPlugin"; }
+
+		virtual std::string getName() const { return "decklink"; }
+
+		virtual uint32_t getVersion() const { return 0x00000001; }
+
+		virtual std::string getDescription() const { return "DeckLink grabber"; }
+
+};
+
+#endif

Added: trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/DeckLinkAPI.h
===================================================================
--- trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/DeckLinkAPI.h	                        (rev 0)
+++ trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/DeckLinkAPI.h	2010-01-27 05:39:32 UTC (rev 3756)
@@ -0,0 +1,838 @@
+/* -LICENSE-START-
+** Copyright (c) 2009 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+** 
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+** 
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+/* DeckLinkAPI.h */
+		
+#ifndef __DeckLink_API_h__
+#define __DeckLink_API_h__
+		
+#include <stdint.h>
+#include "LinuxCOM.h"
+
+/* Type Declarations */
+
+typedef int64_t BMDTimeValue;
+typedef int64_t BMDTimeScale;
+typedef uint32_t BMDTimecodeBCD;
+
+/* End Type Declarations */
+
+/* Interface ID Declarations */
+
+#define IID_IDeckLinkVideoOutputCallback                 /* E763A626-4A3C-49D1-BF13-E7AD3692AE52 */ (REFIID){0xE7,0x63,0xA6,0x26,0x4A,0x3C,0x49,0xD1,0xBF,0x13,0xE7,0xAD,0x36,0x92,0xAE,0x52}
+#define IID_IDeckLinkInputCallback                       /* 31D28EE7-88B6-4CB1-897A-CDBF79A26414 */ (REFIID){0x31,0xD2,0x8E,0xE7,0x88,0xB6,0x4C,0xB1,0x89,0x7A,0xCD,0xBF,0x79,0xA2,0x64,0x14}
+#define IID_IDeckLinkMemoryAllocator                     /* B36EB6E7-9D29-4AA8-92EF-843B87A289E8 */ (REFIID){0xB3,0x6E,0xB6,0xE7,0x9D,0x29,0x4A,0xA8,0x92,0xEF,0x84,0x3B,0x87,0xA2,0x89,0xE8}
+#define IID_IDeckLinkAudioOutputCallback                 /* 403C681B-7F46-4A12-B993-2BB127084EE6 */ (REFIID){0x40,0x3C,0x68,0x1B,0x7F,0x46,0x4A,0x12,0xB9,0x93,0x2B,0xB1,0x27,0x08,0x4E,0xE6}
+#define IID_IDeckLinkIterator                            /* 74E936FC-CC28-4A67-81A0-1E94E52D4E69 */ (REFIID){0x74,0xE9,0x36,0xFC,0xCC,0x28,0x4A,0x67,0x81,0xA0,0x1E,0x94,0xE5,0x2D,0x4E,0x69}
+#define IID_IDeckLinkAPIInformation                      /* 7BEA3C68-730D-4322-AF34-8A7152B532A4 */ (REFIID){0x7B,0xEA,0x3C,0x68,0x73,0x0D,0x43,0x22,0xAF,0x34,0x8A,0x71,0x52,0xB5,0x32,0xA4}
+#define IID_IDeckLinkDisplayModeIterator                 /* 455D741F-1779-4800-86F5-0B5D13D79751 */ (REFIID){0x45,0x5D,0x74,0x1F,0x17,0x79,0x48,0x00,0x86,0xF5,0x0B,0x5D,0x13,0xD7,0x97,0x51}
+#define IID_IDeckLinkDisplayMode                         /* 87451E84-2B7E-439E-A629-4393EA4A8550 */ (REFIID){0x87,0x45,0x1E,0x84,0x2B,0x7E,0x43,0x9E,0xA6,0x29,0x43,0x93,0xEA,0x4A,0x85,0x50}
+#define IID_IDeckLink                                    /* 62BFF75D-6569-4E55-8D4D-66AA03829ABC */ (REFIID){0x62,0xBF,0xF7,0x5D,0x65,0x69,0x4E,0x55,0x8D,0x4D,0x66,0xAA,0x03,0x82,0x9A,0xBC}
+#define IID_IDeckLinkOutput                              /* 29228142-EB8C-4141-A621-F74026450955 */ (REFIID){0x29,0x22,0x81,0x42,0xEB,0x8C,0x41,0x41,0xA6,0x21,0xF7,0x40,0x26,0x45,0x09,0x55}
+#define IID_IDeckLinkInput                               /* 300C135A-9F43-48E2-9906-6D7911D93CF1 */ (REFIID){0x30,0x0C,0x13,0x5A,0x9F,0x43,0x48,0xE2,0x99,0x06,0x6D,0x79,0x11,0xD9,0x3C,0xF1}
+#define IID_IDeckLinkTimecode                            /* EFB9BCA6-A521-44F7-BD69-2332F24D9EE6 */ (REFIID){0xEF,0xB9,0xBC,0xA6,0xA5,0x21,0x44,0xF7,0xBD,0x69,0x23,0x32,0xF2,0x4D,0x9E,0xE6}
+#define IID_IDeckLinkVideoFrame                          /* A8D8238E-6B18-4196-99E1-5AF717B83D32 */ (REFIID){0xA8,0xD8,0x23,0x8E,0x6B,0x18,0x41,0x96,0x99,0xE1,0x5A,0xF7,0x17,0xB8,0x3D,0x32}
+#define IID_IDeckLinkMutableVideoFrame                   /* 46FCEE00-B4E6-43D0-91C0-023A7FCEB34F */ (REFIID){0x46,0xFC,0xEE,0x00,0xB4,0xE6,0x43,0xD0,0x91,0xC0,0x02,0x3A,0x7F,0xCE,0xB3,0x4F}
+#define IID_IDeckLinkVideoInputFrame                     /* 9A74FA41-AE9F-47AC-8CF4-01F42DD59965 */ (REFIID){0x9A,0x74,0xFA,0x41,0xAE,0x9F,0x47,0xAC,0x8C,0xF4,0x01,0xF4,0x2D,0xD5,0x99,0x65}
+#define IID_IDeckLinkVideoFrameAncillary                 /* 732E723C-D1A4-4E29-9E8E-4A88797A0004 */ (REFIID){0x73,0x2E,0x72,0x3C,0xD1,0xA4,0x4E,0x29,0x9E,0x8E,0x4A,0x88,0x79,0x7A,0x00,0x04}
+#define IID_IDeckLinkAudioInputPacket                    /* E43D5870-2894-11DE-8C30-0800200C9A66 */ (REFIID){0xE4,0x3D,0x58,0x70,0x28,0x94,0x11,0xDE,0x8C,0x30,0x08,0x00,0x20,0x0C,0x9A,0x66}
+#define IID_IDeckLinkScreenPreviewCallback               /* 373F499D-4B4D-4518-AD22-6354E5A5825E */ (REFIID){0x37,0x3F,0x49,0x9D,0x4B,0x4D,0x45,0x18,0xAD,0x22,0x63,0x54,0xE5,0xA5,0x82,0x5E}
+#define IID_IDeckLinkGLScreenPreviewHelper               /* BA575CD9-A15E-497B-B2C2-F9AFE7BE4EBA */ (REFIID){0xBA,0x57,0x5C,0xD9,0xA1,0x5E,0x49,0x7B,0xB2,0xC2,0xF9,0xAF,0xE7,0xBE,0x4E,0xBA}
+#define IID_IDeckLinkConfiguration                       /* B8EAD569-B764-47F0-A73F-AE40DF6CBF10 */ (REFIID){0xB8,0xEA,0xD5,0x69,0xB7,0x64,0x47,0xF0,0xA7,0x3F,0xAE,0x40,0xDF,0x6C,0xBF,0x10}
+#define IID_IDeckLinkAttributes                          /* ABC11843-D966-44CB-96E2-A1CB5D3135C4 */ (REFIID){0xAB,0xC1,0x18,0x43,0xD9,0x66,0x44,0xCB,0x96,0xE2,0xA1,0xCB,0x5D,0x31,0x35,0xC4}
+#define IID_IDeckLinkKeyer                               /* 89AFCAF5-65F8-421E-98F7-96FE5F5BFBA3 */ (REFIID){0x89,0xAF,0xCA,0xF5,0x65,0xF8,0x42,0x1E,0x98,0xF7,0x96,0xFE,0x5F,0x5B,0xFB,0xA3}
+
+/* End Interface ID Declarations */
+
+/* Enum BMDDisplayMode - Video display modes */
+
+typedef uint32_t BMDDisplayMode;
+enum _BMDDisplayMode {
+    bmdModeNTSC                                        = /* 'ntsc' */ 0x6E747363,
+    bmdModeNTSC2398                                    = /* 'nt23' */ 0x6E743233, // 3:2 pulldown
+    bmdModePAL                                         = /* 'pal ' */ 0x70616C20,
+
+    /* HD 1080 Modes */
+
+    bmdModeHD1080p2398                                 = /* '23ps' */ 0x32337073,
+    bmdModeHD1080p24                                   = /* '24ps' */ 0x32347073,
+    bmdModeHD1080p25                                   = /* 'Hp25' */ 0x48703235,
+    bmdModeHD1080p2997                                 = /* 'Hp29' */ 0x48703239,
+    bmdModeHD1080p30                                   = /* 'Hp30' */ 0x48703330,
+    bmdModeHD1080i50                                   = /* 'Hi50' */ 0x48693530,
+    bmdModeHD1080i5994                                 = /* 'Hi59' */ 0x48693539,
+    bmdModeHD1080i6000                                 = /* 'Hi60' */ 0x48693630, // N.B. This _really_ is 60.00 Hz.
+    bmdModeHD1080p50                                   = /* 'Hp50' */ 0x48703530,
+    bmdModeHD1080p5994                                 = /* 'Hp59' */ 0x48703539,
+    bmdModeHD1080p6000                                 = /* 'Hp60' */ 0x48703630, // N.B. This _really_ is 60.00 Hz.
+
+    /* HD 720 Modes */
+
+    bmdModeHD720p50                                    = /* 'hp50' */ 0x68703530,
+    bmdModeHD720p5994                                  = /* 'hp59' */ 0x68703539,
+    bmdModeHD720p60                                    = /* 'hp60' */ 0x68703630,
+
+    /* 2k Modes */
+
+    bmdMode2k2398                                      = /* '2k23' */ 0x326B3233,
+    bmdMode2k24                                        = /* '2k24' */ 0x326B3234,
+    bmdMode2k25                                        = /* '2k25' */ 0x326B3235
+};
+
+/* End Enum BMDDisplayMode */
+
+/* Enum BMDFieldDominance - Video field dominance */
+
+typedef uint32_t BMDFieldDominance;
+enum _BMDFieldDominance {
+    bmdUnknownFieldDominance                           = 0,
+    bmdLowerFieldFirst                                 = /* 'lowr' */ 0x6C6F7772,
+    bmdUpperFieldFirst                                 = /* 'uppr' */ 0x75707072,
+    bmdProgressiveFrame                                = /* 'prog' */ 0x70726F67,
+    bmdProgressiveSegmentedFrame                       = /* 'psf ' */ 0x70736620
+};
+
+/* End Enum BMDFieldDominance */
+
+/* Enum BMDPixelFormat - Video pixel formats supported for output/input */
+
+typedef uint32_t BMDPixelFormat;
+enum _BMDPixelFormat {
+    bmdFormat8BitYUV                                   = /* '2vuy' */ 0x32767579,
+    bmdFormat10BitYUV                                  = /* 'v210' */ 0x76323130,
+    bmdFormat8BitARGB                                  = 0x20,
+    bmdFormat8BitBGRA                                  = /* 'BGRA' */ 0x42475241,
+    bmdFormat10BitRGB                                  = /* 'r210' */ 0x72323130
+};
+
+/* End Enum BMDPixelFormat */
+
+/* Enum BMDVideoOutputFlags - Flags to control the output of ancillary data along with video. */
+
+typedef uint32_t BMDVideoOutputFlags;
+enum _BMDVideoOutputFlags {
+    bmdVideoOutputFlagDefault                          = 0,
+    bmdVideoOutputRP188                                = 1 << 0,
+    bmdVideoOutputVANC                                 = 1 << 1
+};
+
+/* End Enum BMDVideoOutputFlags */
+
+/* Enum BMDFrameFlags - Frame flags */
+
+typedef uint32_t BMDFrameFlags;
+enum _BMDFrameFlags {
+    bmdFrameFlagDefault                                = 0,
+    bmdFrameFlagFlipVertical                           = 1 << 0,
+
+    /* Flags that are valid only for frames returned through IDeckLinkInput */
+
+    bmdFrameHasNoInputSource                           = 1 << 31
+};
+
+/* End Enum BMDFrameFlags */
+
+/* Enum BMDVideoInputFlags - Flags applicable to video input */
+
+typedef uint32_t BMDVideoInputFlags;
+enum _BMDVideoInputFlags {
+    bmdVideoInputFlagDefault                           = 0,
+    bmdVideoInputEnableFormatDetection                 = 1 << 0
+};
+
+/* End Enum BMDVideoInputFlags */
+
+/* Enum BMDVideoInputFormatChangedEvents - Bitmask passed to the VideoInputFormatChanged notification to identify the properties of the input signal that have changed */
+
+typedef uint32_t BMDVideoInputFormatChangedEvents;
+enum _BMDVideoInputFormatChangedEvents {
+    bmdVideoInputDisplayModeChanged                    = 1 << 0,
+    bmdVideoInputFieldDominanceChanged                 = 1 << 1,
+    bmdVideoInputColorspaceChanged                     = 1 << 2
+};
+
+/* End Enum BMDVideoInputFormatChangedEvents */
+
+/* Enum BMDDetectedVideoInputFormatFlags - Flags passed to the VideoInputFormatChanged notification to describe the detected video input signal */
+
+typedef uint32_t BMDDetectedVideoInputFormatFlags;
+enum _BMDDetectedVideoInputFormatFlags {
+    bmdDetectedVideoInputYCbCr422                      = 1 << 0,
+    bmdDetectedVideoInputRGB444                        = 1 << 1
+};
+
+/* End Enum BMDDetectedVideoInputFormatFlags */
+
+/* Enum BMDOutputFrameCompletionResult - Frame Completion Callback */
+
+typedef uint32_t BMDOutputFrameCompletionResult;
+enum _BMDOutputFrameCompletionResult {
+    bmdOutputFrameCompleted,                          
+    bmdOutputFrameDisplayedLate,                      
+    bmdOutputFrameDropped,                            
+    bmdOutputFrameFlushed                             
+};
+
+/* End Enum BMDOutputFrameCompletionResult */
+
+/* Enum BMDAudioSampleRate - Audio sample rates supported for output/input */
+
+typedef uint32_t BMDAudioSampleRate;
+enum _BMDAudioSampleRate {
+    bmdAudioSampleRate48kHz                            = 48000
+};
+
+/* End Enum BMDAudioSampleRate */
+
+/* Enum BMDAudioSampleType - Audio sample sizes supported for output/input */
+
+typedef uint32_t BMDAudioSampleType;
+enum _BMDAudioSampleType {
+    bmdAudioSampleType16bitInteger                     = 16,
+    bmdAudioSampleType32bitInteger                     = 32
+};
+
+/* End Enum BMDAudioSampleType */
+
+/* Enum BMDAudioOutputStreamType - Audio output stream type */
+
+typedef uint32_t BMDAudioOutputStreamType;
+enum _BMDAudioOutputStreamType {
+    bmdAudioOutputStreamContinuous,                   
+    bmdAudioOutputStreamContinuousDontResample,       
+    bmdAudioOutputStreamTimestamped                   
+};
+
+/* End Enum BMDAudioOutputStreamType */
+
+/* Enum BMDDisplayModeSupport - Output mode supported flags */
+
+typedef uint32_t BMDDisplayModeSupport;
+enum _BMDDisplayModeSupport {
+    bmdDisplayModeNotSupported                         = 0,
+    bmdDisplayModeSupported,                          
+    bmdDisplayModeSupportedWithConversion             
+};
+
+/* End Enum BMDDisplayModeSupport */
+
+/* Enum BMDTimecodeFormat - Timecode formats for frame metadata */
+
+typedef uint32_t BMDTimecodeFormat;
+enum _BMDTimecodeFormat {
+    bmdTimecodeRP188                                   = /* 'rp18' */ 0x72703138,
+    bmdTimecodeVITC                                    = /* 'vitc' */ 0x76697463,
+    bmdTimecodeSerial                                  = /* 'seri' */ 0x73657269
+};
+
+/* End Enum BMDTimecodeFormat */
+
+/* Enum BMDTimecodeFlags - Timecode flags */
+
+typedef uint32_t BMDTimecodeFlags;
+enum _BMDTimecodeFlags {
+    bmdTimecodeFlagDefault                             = 0,
+    bmdTimecodeIsDropFrame                             = 1 << 0
+};
+
+/* End Enum BMDTimecodeFlags */
+
+/* Enum BMDVideoConnection - Video connection types */
+
+typedef uint32_t BMDVideoConnection;
+enum _BMDVideoConnection {
+    bmdVideoConnectionSDI                              = /* 'sdi ' */ 0x73646920,
+    bmdVideoConnectionHDMI                             = /* 'hdmi' */ 0x68646D69,
+    bmdVideoConnectionOpticalSDI                       = /* 'opti' */ 0x6F707469,
+    bmdVideoConnectionComponent                        = /* 'cpnt' */ 0x63706E74,
+    bmdVideoConnectionComposite                        = /* 'cmst' */ 0x636D7374,
+    bmdVideoConnectionSVideo                           = /* 'svid' */ 0x73766964
+};
+
+/* End Enum BMDVideoConnection */
+
+/* Enum BMDAnalogVideoFlags - Analog video display flags */
+
+typedef uint32_t BMDAnalogVideoFlags;
+enum _BMDAnalogVideoFlags {
+    bmdAnalogVideoFlagCompositeSetup75                 = 1 << 0,
+    bmdAnalogVideoFlagComponentBetacamLevels           = 1 << 1
+};
+
+/* End Enum BMDAnalogVideoFlags */
+
+/* Enum BMDAudioConnection - Audio connection types */
+
+typedef uint32_t BMDAudioConnection;
+enum _BMDAudioConnection {
+    bmdAudioConnectionEmbedded                         = /* 'embd' */ 0x656D6264,
+    bmdAudioConnectionAESEBU                           = /* 'aes ' */ 0x61657320,
+    bmdAudioConnectionAnalog                           = /* 'anlg' */ 0x616E6C67
+};
+
+/* End Enum BMDAudioConnection */
+
+/* Enum BMDVideoOutputConversionMode - Video/audio conversion mode */
+
+typedef uint32_t BMDVideoOutputConversionMode;
+enum _BMDVideoOutputConversionMode {
+    bmdNoVideoOutputConversion                         = /* 'none' */ 0x6E6F6E65,
+    bmdVideoOutputLetterboxDownonversion               = /* 'ltbx' */ 0x6C746278,
+    bmdVideoOutputAnamorphicDownonversion              = /* 'amph' */ 0x616D7068,
+    bmdVideoOutputHD720toHD1080Conversion              = /* '720c' */ 0x37323063,
+    bmdVideoOutputHardwareLetterboxDownconversion      = /* 'HWlb' */ 0x48576C62,
+    bmdVideoOutputHardwareAnamorphicDownconversion     = /* 'HWam' */ 0x4857616D,
+    bmdVideoOutputHardwareCenterCutDownconversion      = /* 'HWcc' */ 0x48576363
+};
+
+/* End Enum BMDVideoOutputConversionMode */
+
+/* Enum BMDVideoInputConversionMode - Video input conversion mode */
+
+typedef uint32_t BMDVideoInputConversionMode;
+enum _BMDVideoInputConversionMode {
+    bmdNoVideoInputConversion                          = /* 'none' */ 0x6E6F6E65,
+    bmdVideoInputLetterboxDownconversionFromHD1080     = /* '10lb' */ 0x31306C62,
+    bmdVideoInputAnamorphicDownconversionFromHD1080    = /* '10am' */ 0x3130616D,
+    bmdVideoInputLetterboxDownconversionFromHD720      = /* '72lb' */ 0x37326C62,
+    bmdVideoInputAnamorphicDownconversionFromHD720     = /* '72am' */ 0x3732616D,
+    bmdVideoInputLetterboxUpconversion                 = /* 'lbup' */ 0x6C627570,
+    bmdVideoInputAnamorphicUpconversion                = /* 'amup' */ 0x616D7570
+};
+
+/* End Enum BMDVideoInputConversionMode */
+
+/* Enum BMDDeckLinkAttributeID - DeckLink Atribute ID */
+
+typedef uint32_t BMDDeckLinkAttributeID;
+enum _BMDDeckLinkAttributeID {
+
+    /* Flags */
+
+    BMDDeckLinkSupportsInternalKeying                  = /* 'keyi' */ 0x6B657969,
+    BMDDeckLinkSupportsExternalKeying                  = /* 'keye' */ 0x6B657965,
+    BMDDeckLinkSupportsHDKeying                        = /* 'keyh' */ 0x6B657968,
+    BMDDeckLinkSupportsInputFormatDetection            = /* 'infd' */ 0x696E6664,
+    BMDDeckLinkHasSerialPort                           = /* 'hspt' */ 0x68737074,
+
+    /* Integers */
+
+    BMDDeckLinkMaximumAudioChannels                    = /* 'mach' */ 0x6D616368,
+
+    /* Strings */
+
+    BMDDeckLinkSerialPortDeviceName                    = /* 'slpn' */ 0x736C706E
+};
+
+/* End Enum BMDDeckLinkAttributeID */
+
+/* Enum BMDDeckLinkAPIInformationID - DeckLinkAPI information ID */
+
+typedef uint32_t BMDDeckLinkAPIInformationID;
+enum _BMDDeckLinkAPIInformationID {
+    BMDDeckLinkAPIVersion                              = /* 'vers' */ 0x76657273
+};
+
+/* End Enum BMDDeckLinkAPIInformationID */
+
+#if defined(__cplusplus)
+
+/* Forward Declarations */
+
+class IDeckLinkVideoOutputCallback;
+class IDeckLinkInputCallback;
+class IDeckLinkMemoryAllocator;
+class IDeckLinkAudioOutputCallback;
+class IDeckLinkIterator;
+class IDeckLinkAPIInformation;
+class IDeckLinkDisplayModeIterator;
+class IDeckLinkDisplayMode;
+class IDeckLink;
+class IDeckLinkOutput;
+class IDeckLinkInput;
+class IDeckLinkTimecode;
+class IDeckLinkVideoFrame;
+class IDeckLinkMutableVideoFrame;
+class IDeckLinkVideoInputFrame;
+class IDeckLinkVideoFrameAncillary;
+class IDeckLinkAudioInputPacket;
+class IDeckLinkScreenPreviewCallback;
+class IDeckLinkGLScreenPreviewHelper;
+class IDeckLinkConfiguration;
+class IDeckLinkAttributes;
+class IDeckLinkKeyer;
+
+/* End Forward Declarations */
+
+/* Interface IDeckLinkVideoOutputCallback - Frame completion callback. */
+
+class IDeckLinkVideoOutputCallback : public IUnknown
+{
+public:
+    virtual HRESULT ScheduledFrameCompleted (/* in */ IDeckLinkVideoFrame *completedFrame, /* in */ BMDOutputFrameCompletionResult result) = 0;
+    virtual HRESULT ScheduledPlaybackHasStopped (void) = 0;
+
+protected:
+    virtual ~IDeckLinkVideoOutputCallback () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkVideoOutputCallback */
+
+/* Interface IDeckLinkInputCallback - Frame arrival callback. */
+
+class IDeckLinkInputCallback : public IUnknown
+{
+public:
+    virtual HRESULT VideoInputFormatChanged (/* in */ BMDVideoInputFormatChangedEvents notificationEvents, /* in */ IDeckLinkDisplayMode *newDisplayMode, /* in */ BMDDetectedVideoInputFormatFlags detectedSignalFlags) = 0;
+    virtual HRESULT VideoInputFrameArrived (/* in */ IDeckLinkVideoInputFrame *videoFrame, /* in */ IDeckLinkAudioInputPacket *audioPacket) = 0;
+
+protected:
+    virtual ~IDeckLinkInputCallback () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkInputCallback */
+
+/* Interface IDeckLinkMemoryAllocator - Memory allocator for video frames. */
+
+class IDeckLinkMemoryAllocator : public IUnknown
+{
+public:
+    virtual HRESULT AllocateBuffer (uint32_t bufferSize, /* out */ void **allocatedBuffer) = 0;
+    virtual HRESULT ReleaseBuffer (/* in */ void *buffer) = 0;
+
+    virtual HRESULT Commit (void) = 0;
+    virtual HRESULT Decommit (void) = 0;
+};
+
+/* End Interface IDeckLinkMemoryAllocator */
+
+/* Interface IDeckLinkAudioOutputCallback - Optional callback to allow audio samples to be pulled as required. */
+
+class IDeckLinkAudioOutputCallback : public IUnknown
+{
+public:
+    virtual HRESULT RenderAudioSamples (bool preroll) = 0;
+};
+
+/* End Interface IDeckLinkAudioOutputCallback */
+
+/* Interface IDeckLinkIterator - enumerates installed DeckLink hardware */
+
+class IDeckLinkIterator : public IUnknown
+{
+public:
+    virtual HRESULT Next (/* out */ IDeckLink **deckLinkInstance) = 0;
+};
+
+/* End Interface IDeckLinkIterator */
+
+/* Interface IDeckLinkAPIInformation - DeckLinkAPI attribute interface */
+
+class IDeckLinkAPIInformation : public IUnknown
+{
+public:
+    virtual HRESULT GetFlag (/* in */ BMDDeckLinkAPIInformationID cfgID, /* out */ bool *value) = 0;
+    virtual HRESULT GetInt (/* in */ BMDDeckLinkAPIInformationID cfgID, /* out */ int64_t *value) = 0;
+    virtual HRESULT GetFloat (/* in */ BMDDeckLinkAPIInformationID cfgID, /* out */ double *value) = 0;
+    virtual HRESULT GetString (/* in */ BMDDeckLinkAPIInformationID cfgID, /* out */ const char **value) = 0;
+
+protected:
+    virtual ~IDeckLinkAPIInformation () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkAPIInformation */
+
+/* Interface IDeckLinkDisplayModeIterator - enumerates over supported input/output display modes. */
+
+class IDeckLinkDisplayModeIterator : public IUnknown
+{
+public:
+    virtual HRESULT Next (/* out */ IDeckLinkDisplayMode **deckLinkDisplayMode) = 0;
+
+protected:
+    virtual ~IDeckLinkDisplayModeIterator () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkDisplayModeIterator */
+
+/* Interface IDeckLinkDisplayMode - represents a display mode */
+
+class IDeckLinkDisplayMode : public IUnknown
+{
+public:
+    virtual HRESULT GetName (/* out */ const char **name) = 0;
+    virtual BMDDisplayMode GetDisplayMode (void) = 0;
+    virtual long GetWidth (void) = 0;
+    virtual long GetHeight (void) = 0;
+    virtual HRESULT GetFrameRate (/* out */ BMDTimeValue *frameDuration, /* out */ BMDTimeScale *timeScale) = 0;
+    virtual BMDFieldDominance GetFieldDominance (void) = 0;
+
+protected:
+    virtual ~IDeckLinkDisplayMode () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkDisplayMode */
+
+/* Interface IDeckLink - represents a DeckLink device */
+
+class IDeckLink : public IUnknown
+{
+public:
+    virtual HRESULT GetModelName (/* out */ const char **modelName) = 0;
+};
+
+/* End Interface IDeckLink */
+
+/* Interface IDeckLinkOutput - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkOutput : public IUnknown
+{
+public:
+    virtual HRESULT DoesSupportVideoMode (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, /* out */ BMDDisplayModeSupport *result) = 0;
+    virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator **iterator) = 0;
+
+    virtual HRESULT SetScreenPreviewCallback (/* in */ IDeckLinkScreenPreviewCallback *previewCallback) = 0;
+
+    /* Video Output */
+
+    virtual HRESULT EnableVideoOutput (BMDDisplayMode displayMode, BMDVideoOutputFlags flags) = 0;
+    virtual HRESULT DisableVideoOutput (void) = 0;
+
+    virtual HRESULT SetVideoOutputFrameMemoryAllocator (/* in */ IDeckLinkMemoryAllocator *theAllocator) = 0;
+    virtual HRESULT CreateVideoFrame (int32_t width, int32_t height, int32_t rowBytes, BMDPixelFormat pixelFormat, BMDFrameFlags flags, /* out */ IDeckLinkMutableVideoFrame **outFrame) = 0;
+    virtual HRESULT CreateAncillaryData (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, /* out */ IDeckLinkVideoFrameAncillary **outBuffer) = 0;
+
+    virtual HRESULT DisplayVideoFrameSync (/* in */ IDeckLinkVideoFrame *theFrame) = 0;
+    virtual HRESULT ScheduleVideoFrame (/* in */ IDeckLinkVideoFrame *theFrame, BMDTimeValue displayTime, BMDTimeValue displayDuration, BMDTimeScale timeScale) = 0;
+    virtual HRESULT SetScheduledFrameCompletionCallback (/* in */ IDeckLinkVideoOutputCallback *theCallback) = 0;
+    virtual HRESULT GetBufferedVideoFrameCount (/* out */ uint32_t *bufferedFrameCount) = 0;
+
+    /* Audio Output */
+
+    virtual HRESULT EnableAudioOutput (BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, uint32_t channelCount, BMDAudioOutputStreamType streamType) = 0;
+    virtual HRESULT DisableAudioOutput (void) = 0;
+
+    virtual HRESULT WriteAudioSamplesSync (/* in */ void *buffer, uint32_t sampleFrameCount, /* out */ uint32_t *sampleFramesWritten) = 0;
+
+    virtual HRESULT BeginAudioPreroll (void) = 0;
+    virtual HRESULT EndAudioPreroll (void) = 0;
+    virtual HRESULT ScheduleAudioSamples (/* in */ void *buffer, uint32_t sampleFrameCount, BMDTimeValue streamTime, BMDTimeScale timeScale, /* out */ uint32_t *sampleFramesWritten) = 0;
+
+    virtual HRESULT GetBufferedAudioSampleFrameCount (/* out */ uint32_t *bufferedSampleFrameCount) = 0;
+    virtual HRESULT FlushBufferedAudioSamples (void) = 0;
+
+    virtual HRESULT SetAudioCallback (/* in */ IDeckLinkAudioOutputCallback *theCallback) = 0;
+
+    /* Output Control */
+
+    virtual HRESULT StartScheduledPlayback (BMDTimeValue playbackStartTime, BMDTimeScale timeScale, double playbackSpeed) = 0;
+    virtual HRESULT StopScheduledPlayback (BMDTimeValue stopPlaybackAtTime, /* out */ BMDTimeValue *actualStopTime, BMDTimeScale timeScale) = 0;
+    virtual HRESULT IsScheduledPlaybackRunning (/* out */ bool *active) = 0;
+    virtual HRESULT GetScheduledStreamTime (BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *streamTime, /* out */ double *playbackSpeed) = 0;
+
+    /* Hardware Timing */
+
+    virtual HRESULT GetHardwareReferenceClock (BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *hardwareTime, /* out */ BMDTimeValue *timeInFrame, /* out */ BMDTimeValue *ticksPerFrame) = 0;
+
+protected:
+    virtual ~IDeckLinkOutput () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkOutput */
+
+/* Interface IDeckLinkInput - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkInput : public IUnknown
+{
+public:
+    virtual HRESULT DoesSupportVideoMode (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, /* out */ BMDDisplayModeSupport *result) = 0;
+    virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator **iterator) = 0;
+
+    virtual HRESULT SetScreenPreviewCallback (/* in */ IDeckLinkScreenPreviewCallback *previewCallback) = 0;
+
+    /* Video Input */
+
+    virtual HRESULT EnableVideoInput (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, BMDVideoInputFlags flags) = 0;
+    virtual HRESULT DisableVideoInput (void) = 0;
+    virtual HRESULT GetAvailableVideoFrameCount (/* out */ uint32_t *availableFrameCount) = 0;
+
+    /* Audio Input */
+
+    virtual HRESULT EnableAudioInput (BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, uint32_t channelCount) = 0;
+    virtual HRESULT DisableAudioInput (void) = 0;
+    virtual HRESULT GetAvailableAudioSampleFrameCount (/* out */ uint32_t *availableSampleFrameCount) = 0;
+
+    /* Input Control */
+
+    virtual HRESULT StartStreams (void) = 0;
+    virtual HRESULT StopStreams (void) = 0;
+    virtual HRESULT PauseStreams (void) = 0;
+    virtual HRESULT FlushStreams (void) = 0;
+    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback *theCallback) = 0;
+
+    /* Hardware Timing */
+
+    virtual HRESULT GetHardwareReferenceClock (BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *hardwareTime, /* out */ BMDTimeValue *timeInFrame, /* out */ BMDTimeValue *ticksPerFrame) = 0;
+
+protected:
+    virtual ~IDeckLinkInput () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkInput */
+
+/* Interface IDeckLinkTimecode - Used for video frame timecode representation. */
+
+class IDeckLinkTimecode : public IUnknown
+{
+public:
+    virtual BMDTimecodeBCD GetBCD (void) = 0;
+    virtual HRESULT GetComponents (/* out */ uint8_t *hours, /* out */ uint8_t *minutes, /* out */ uint8_t *seconds, /* out */ uint8_t *frames) = 0;
+    virtual HRESULT GetString (/* out */ const char **timecode) = 0;
+    virtual BMDTimecodeFlags GetFlags (void) = 0;
+
+protected:
+    virtual ~IDeckLinkTimecode () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkTimecode */
+
+/* Interface IDeckLinkVideoFrame - Interface to encapsulate a video frame; can be caller-implemented. */
+
+class IDeckLinkVideoFrame : public IUnknown
+{
+public:
+    virtual long GetWidth (void) = 0;
+    virtual long GetHeight (void) = 0;
+    virtual long GetRowBytes (void) = 0;
+    virtual BMDPixelFormat GetPixelFormat (void) = 0;
+    virtual BMDFrameFlags GetFlags (void) = 0;
+    virtual HRESULT GetBytes (/* out */ void **buffer) = 0;
+
+    virtual HRESULT GetTimecode (BMDTimecodeFormat format, /* out */ IDeckLinkTimecode **timecode) = 0;
+    virtual HRESULT GetAncillaryData (/* out */ IDeckLinkVideoFrameAncillary **ancillary) = 0;
+
+protected:
+    virtual ~IDeckLinkVideoFrame () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkVideoFrame */
+
+/* Interface IDeckLinkMutableVideoFrame - Created by IDeckLinkOutput::CreateVideoFrame. */
+
+class IDeckLinkMutableVideoFrame : public IDeckLinkVideoFrame
+{
+public:
+    virtual HRESULT SetFlags (BMDFrameFlags newFlags) = 0;
+
+    virtual HRESULT SetTimecode (BMDTimecodeFormat format, /* in */ IDeckLinkTimecode *timecode) = 0;
+    virtual HRESULT SetTimecodeFromComponents (BMDTimecodeFormat format, uint8_t hours, uint8_t minutes, uint8_t seconds, uint8_t frames, BMDTimecodeFlags flags) = 0;
+    virtual HRESULT SetAncillaryData (/* in */ IDeckLinkVideoFrameAncillary *ancillary) = 0;
+
+protected:
+    virtual ~IDeckLinkMutableVideoFrame () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkMutableVideoFrame */
+
+/* Interface IDeckLinkVideoInputFrame - Provided by the IDeckLinkVideoInput frame arrival callback. */
+
+class IDeckLinkVideoInputFrame : public IDeckLinkVideoFrame
+{
+public:
+    virtual HRESULT GetStreamTime (/* out */ BMDTimeValue *frameTime, /* out */ BMDTimeValue *frameDuration, BMDTimeScale timeScale) = 0;
+    virtual HRESULT GetHardwareReferenceTimestamp (BMDTimeScale timeScale, /* out */ BMDTimeValue *frameTime, /* out */ BMDTimeValue *frameDuration) = 0;
+
+protected:
+    virtual ~IDeckLinkVideoInputFrame () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkVideoInputFrame */
+
+/* Interface IDeckLinkVideoFrameAncillary - Obtained through QueryInterface() on an IDeckLinkVideoFrame object. */
+
+class IDeckLinkVideoFrameAncillary : public IUnknown
+{
+public:
+
+    virtual HRESULT GetBufferForVerticalBlankingLine (uint32_t lineNumber, /* out */ void **buffer) = 0;
+    virtual BMDPixelFormat GetPixelFormat (void) = 0;
+    virtual BMDDisplayMode GetDisplayMode (void) = 0;
+
+protected:
+    virtual ~IDeckLinkVideoFrameAncillary () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkVideoFrameAncillary */
+
+/* Interface IDeckLinkAudioInputPacket - Provided by the IDeckLinkInput callback. */
+
+class IDeckLinkAudioInputPacket : public IUnknown
+{
+public:
+    virtual long GetSampleFrameCount (void) = 0;
+    virtual HRESULT GetBytes (/* out */ void **buffer) = 0;
+    virtual HRESULT GetPacketTime (/* out */ BMDTimeValue *packetTime, BMDTimeScale timeScale) = 0;
+
+protected:
+    virtual ~IDeckLinkAudioInputPacket () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkAudioInputPacket */
+
+/* Interface IDeckLinkScreenPreviewCallback - Screen preview callback */
+
+class IDeckLinkScreenPreviewCallback : public IUnknown
+{
+public:
+    virtual HRESULT DrawFrame (/* in */ IDeckLinkVideoFrame *theFrame) = 0;
+
+protected:
+    virtual ~IDeckLinkScreenPreviewCallback () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkScreenPreviewCallback */
+
+/* Interface IDeckLinkGLScreenPreviewHelper - Created with CoCreateInstance(). */
+
+class IDeckLinkGLScreenPreviewHelper : public IUnknown
+{
+public:
+
+    /* Methods must be called with OpenGL context set */
+
+    virtual HRESULT InitializeGL (void) = 0;
+    virtual HRESULT PaintGL (void) = 0;
+    virtual HRESULT SetFrame (/* in */ IDeckLinkVideoFrame *theFrame) = 0;
+
+protected:
+    virtual ~IDeckLinkGLScreenPreviewHelper () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkGLScreenPreviewHelper */
+
+/* Interface IDeckLinkConfiguration - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkConfiguration : public IUnknown
+{
+public:
+    virtual HRESULT GetConfigurationValidator (/* out */ IDeckLinkConfiguration **configObject) = 0;
+    virtual HRESULT WriteConfigurationToPreferences (void) = 0;
+
+    /* Video Output Configuration */
+
+    virtual HRESULT SetVideoOutputFormat (BMDVideoConnection videoOutputConnection) = 0;
+    virtual HRESULT IsVideoOutputActive (BMDVideoConnection videoOutputConnection, /* out */ bool *active) = 0;
+
+    virtual HRESULT SetAnalogVideoOutputFlags (BMDAnalogVideoFlags analogVideoFlags) = 0;
+    virtual HRESULT GetAnalogVideoOutputFlags (/* out */ BMDAnalogVideoFlags *analogVideoFlags) = 0;
+
+    virtual HRESULT EnableFieldFlickerRemovalWhenPaused (bool enable) = 0;
+    virtual HRESULT IsEnabledFieldFlickerRemovalWhenPaused (/* out */ bool *enabled) = 0;
+
+    virtual HRESULT Set444And3GBpsVideoOutput (bool enable444VideoOutput, bool enable3GbsOutput) = 0;
+    virtual HRESULT Get444And3GBpsVideoOutput (/* out */ bool *is444VideoOutputEnabled, /* out */ bool *threeGbsOutputEnabled) = 0;
+
+    virtual HRESULT SetVideoOutputConversionMode (BMDVideoOutputConversionMode conversionMode) = 0;
+    virtual HRESULT GetVideoOutputConversionMode (/* out */ BMDVideoOutputConversionMode *conversionMode) = 0;
+
+    virtual HRESULT Set_HD1080p24_to_HD1080i5994_Conversion (bool enable) = 0;
+    virtual HRESULT Get_HD1080p24_to_HD1080i5994_Conversion (/* out */ bool *enabled) = 0;
+
+    /* Video Input Configuration */
+
+    virtual HRESULT SetVideoInputFormat (BMDVideoConnection videoInputFormat) = 0;
+    virtual HRESULT GetVideoInputFormat (/* out */ BMDVideoConnection *videoInputFormat) = 0;
+
+    virtual HRESULT SetAnalogVideoInputFlags (BMDAnalogVideoFlags analogVideoFlags) = 0;
+    virtual HRESULT GetAnalogVideoInputFlags (/* out */ BMDAnalogVideoFlags *analogVideoFlags) = 0;
+
+    virtual HRESULT SetVideoInputConversionMode (BMDVideoInputConversionMode conversionMode) = 0;
+    virtual HRESULT GetVideoInputConversionMode (/* out */ BMDVideoInputConversionMode *conversionMode) = 0;
+
+    virtual HRESULT SetBlackVideoOutputDuringCapture (bool blackOutInCapture) = 0;
+    virtual HRESULT GetBlackVideoOutputDuringCapture (/* out */ bool *blackOutInCapture) = 0;
+
+    virtual HRESULT Set32PulldownSequenceInitialTimecodeFrame (uint32_t aFrameTimecode) = 0;
+    virtual HRESULT Get32PulldownSequenceInitialTimecodeFrame (/* out */ uint32_t *aFrameTimecode) = 0;
+
+    virtual HRESULT SetVancSourceLineMapping (uint32_t activeLine1VANCsource, uint32_t activeLine2VANCsource, uint32_t activeLine3VANCsource) = 0;
+    virtual HRESULT GetVancSourceLineMapping (/* out */ uint32_t *activeLine1VANCsource, /* out */ uint32_t *activeLine2VANCsource, /* out */ uint32_t *activeLine3VANCsource) = 0;
+
+    /* Audio Input Configuration */
+
+    virtual HRESULT SetAudioInputFormat (BMDAudioConnection audioInputFormat) = 0;
+    virtual HRESULT GetAudioInputFormat (/* out */ BMDAudioConnection *audioInputFormat) = 0;
+};
+
+/* End Interface IDeckLinkConfiguration */
+
+/* Interface IDeckLinkAttributes - DeckLink Attribute interface */
+
+class IDeckLinkAttributes : public IUnknown
+{
+public:
+    virtual HRESULT GetFlag (/* in */ BMDDeckLinkAttributeID cfgID, /* out */ bool *value) = 0;
+    virtual HRESULT GetInt (/* in */ BMDDeckLinkAttributeID cfgID, /* out */ int64_t *value) = 0;
+    virtual HRESULT GetFloat (/* in */ BMDDeckLinkAttributeID cfgID, /* out */ double *value) = 0;
+    virtual HRESULT GetString (/* in */ BMDDeckLinkAttributeID cfgID, /* out */ const char **value) = 0;
+
+protected:
+    virtual ~IDeckLinkAttributes () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkAttributes */
+
+/* Interface IDeckLinkKeyer - DeckLink Keyer interface */
+
+class IDeckLinkKeyer : public IUnknown
+{
+public:
+    virtual HRESULT Enable (/* in */ bool isExternal) = 0;
+    virtual HRESULT SetLevel (/* in */ uint8_t level) = 0;
+    virtual HRESULT RampUp (/* in */ uint32_t numberOfFrames) = 0;
+    virtual HRESULT RampDown (/* in */ uint32_t numberOfFrames) = 0;
+    virtual HRESULT Disable (void) = 0;
+
+protected:
+    virtual ~IDeckLinkKeyer () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkKeyer */
+
+/* Functions */
+
+extern "C" {
+
+    IDeckLinkIterator *CreateDeckLinkIteratorInstance (void);
+    IDeckLinkGLScreenPreviewHelper *CreateOpenGLScreenPreviewHelper (void);
+
+};
+
+/* End Functions */
+
+#endif      // defined(__cplusplus)
+#endif      // __DeckLink_API_h__

Added: trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/DeckLinkAPIDispatch.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/DeckLinkAPIDispatch.cxx	                        (rev 0)
+++ trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/DeckLinkAPIDispatch.cxx	2010-01-27 05:39:32 UTC (rev 3756)
@@ -0,0 +1,94 @@
+/* -LICENSE-START-
+** Copyright (c) 2009 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+** 
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+** 
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+**/
+
+#include <stdio.h>
+#include <pthread.h>
+#include <dlfcn.h>
+
+#include "DeckLinkAPI.h"
+
+#define kDeckLinkAPI_Name "libDeckLinkAPI.so"
+#define KDeckLinkPreviewAPI_Name "libDeckLinkPreviewAPI.so"
+
+typedef IDeckLinkIterator* (*CreateIteratorFunc)(void);
+typedef IDeckLinkGLScreenPreviewHelper* (*CreateOpenGLScreenPreviewHelperFunc)(void);
+
+static pthread_once_t					gDeckLinkOnceControl = PTHREAD_ONCE_INIT;
+static pthread_once_t					gPreviewOnceControl = PTHREAD_ONCE_INIT;
+
+static CreateIteratorFunc				gCreateIteratorFunc = NULL;
+static CreateOpenGLScreenPreviewHelperFunc	gCreateOpenGLPreviewFunc = NULL;
+
+void	InitDeckLinkAPI (void)
+{
+	void *libraryHandle;
+	
+	libraryHandle = dlopen(kDeckLinkAPI_Name, RTLD_NOW|RTLD_GLOBAL);
+	if (!libraryHandle)
+	{
+		fprintf(stderr, "%s\n", dlerror());
+		return;
+	}
+	gCreateIteratorFunc = (CreateIteratorFunc)dlsym(libraryHandle, "CreateDeckLinkIteratorInstance");
+	if (!gCreateIteratorFunc)
+		fprintf(stderr, "%s\n", dlerror());
+}
+
+void	InitDeckLinkPreviewAPI (void)
+{
+	void *libraryHandle;
+	
+	libraryHandle = dlopen(KDeckLinkPreviewAPI_Name, RTLD_NOW|RTLD_GLOBAL);
+	if (!libraryHandle)
+	{
+		fprintf(stderr, "%s\n", dlerror());
+		return;
+	}
+	gCreateOpenGLPreviewFunc = (CreateOpenGLScreenPreviewHelperFunc)dlsym(libraryHandle, "CreateOpenGLScreenPreviewHelper");
+	if (!gCreateOpenGLPreviewFunc)
+		fprintf(stderr, "%s\n", dlerror());
+}
+
+IDeckLinkIterator*		CreateDeckLinkIteratorInstance (void)
+{
+	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI);
+	
+	if (gCreateIteratorFunc == NULL)
+		return NULL;
+	return gCreateIteratorFunc();
+}
+
+IDeckLinkGLScreenPreviewHelper*		CreateOpenGLScreenPreviewHelper (void)
+{
+	pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI);
+	pthread_once(&gPreviewOnceControl, InitDeckLinkPreviewAPI);
+	
+	if (gCreateOpenGLPreviewFunc == NULL)
+		return NULL;
+	return gCreateOpenGLPreviewFunc();
+}
+

Added: trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/DeckLinkAPI_v7_1.h
===================================================================
--- trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/DeckLinkAPI_v7_1.h	                        (rev 0)
+++ trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/DeckLinkAPI_v7_1.h	2010-01-27 05:39:32 UTC (rev 3756)
@@ -0,0 +1,198 @@
+/* -LICENSE-START-
+** Copyright (c) 2009 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+** 
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+** 
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+/* DeckLinkAPI_v7_1.h */
+
+#ifndef __DeckLink_API_v7_1_h__
+#define __DeckLink_API_v7_1_h__
+
+#include "DeckLinkAPI.h"
+
+// "B28131B6-59AC-4857-B5AC-CD75D5883E2F"
+#define IID_IDeckLinkDisplayModeIterator_v7_1	(REFIID){0xB2,0x81,0x31,0xB6,0x59,0xAC,0x48,0x57,0xB5,0xAC,0xCD,0x75,0xD5,0x88,0x3E,0x2F}
+
+// "AF0CD6D5-8376-435E-8433-54F9DD530AC3"
+#define IID_IDeckLinkDisplayMode_v7_1			(REFIID){0xAF,0x0C,0xD6,0xD5,0x83,0x76,0x43,0x5E,0x84,0x33,0x54,0xF9,0xDD,0x53,0x0A,0xC3}
+
+// "EBD01AFA-E4B0-49C6-A01D-EDB9D1B55FD9"
+#define IID_IDeckLinkVideoOutputCallback_v7_1	(REFIID){0xEB,0xD0,0x1A,0xFA,0xE4,0xB0,0x49,0xC6,0xA0,0x1D,0xED,0xB9,0xD1,0xB5,0x5F,0xD9}
+
+// "7F94F328-5ED4-4E9F-9729-76A86BDC99CC"
+#define IID_IDeckLinkInputCallback_v7_1			(REFIID){0x7F,0x94,0xF3,0x28,0x5E,0xD4,0x4E,0x9F,0x97,0x29,0x76,0xA8,0x6B,0xDC,0x99,0xCC}
+
+// "AE5B3E9B-4E1E-4535-B6E8-480FF52F6CE5"
+#define IID_IDeckLinkOutput_v7_1				(REFIID){0xAE,0x5B,0x3E,0x9B,0x4E,0x1E,0x45,0x35,0xB6,0xE8,0x48,0x0F,0xF5,0x2F,0x6C,0xE5}
+
+// "2B54EDEF-5B32-429F-BA11-BB990596EACD"
+#define IID_IDeckLinkInput_v7_1					(REFIID){0x2B,0x54,0xED,0xEF,0x5B,0x32,0x42,0x9F,0xBA,0x11,0xBB,0x99,0x05,0x96,0xEA,0xCD}
+
+// "333F3A10-8C2D-43CF-B79D-46560FEEA1CE"
+#define IID_IDeckLinkVideoFrame_v7_1			(REFIID){0x33,0x3F,0x3A,0x10,0x8C,0x2D,0x43,0xCF,0xB7,0x9D,0x46,0x56,0x0F,0xEE,0xA1,0xCE}
+
+// "C8B41D95-8848-40EE-9B37-6E3417FB114B"
+#define IID_IDeckLinkVideoInputFrame_v7_1		(REFIID){0xC8,0xB4,0x1D,0x95,0x88,0x48,0x40,0xEE,0x9B,0x37,0x6E,0x34,0x17,0xFB,0x11,0x4B}
+
+// "C86DE4F6-A29F-42E3-AB3A-1363E29F0788"
+#define IID_IDeckLinkAudioInputPacket_v7_1		(REFIID){0xC8,0x6D,0xE4,0xF6,0xA2,0x9F,0x42,0xE3,0xAB,0x3A,0x13,0x63,0xE2,0x9F,0x07,0x88}
+
+#if defined(__cplusplus)
+
+class IDeckLinkDisplayModeIterator_v7_1;
+class IDeckLinkDisplayMode_v7_1;
+class IDeckLinkVideoFrame_v7_1;
+class IDeckLinkVideoInputFrame_v7_1;
+class IDeckLinkAudioInputPacket_v7_1;
+
+class IDeckLinkDisplayModeIterator_v7_1 : public IUnknown
+{
+public:
+	virtual	HRESULT	STDMETHODCALLTYPE	Next (IDeckLinkDisplayMode_v7_1* *deckLinkDisplayMode) = 0;
+};
+
+
+class IDeckLinkDisplayMode_v7_1 : public IUnknown
+{
+public:
+	virtual	HRESULT			STDMETHODCALLTYPE	GetName (const char **name) = 0;
+	virtual	BMDDisplayMode	STDMETHODCALLTYPE	GetDisplayMode () = 0;
+	virtual	long			STDMETHODCALLTYPE	GetWidth () = 0;
+	virtual	long			STDMETHODCALLTYPE	GetHeight () = 0;
+	virtual	HRESULT			STDMETHODCALLTYPE	GetFrameRate (BMDTimeValue *frameDuration, BMDTimeScale *timeScale) = 0;
+};
+
+class IDeckLinkVideoOutputCallback_v7_1 : public IUnknown
+{
+public:
+	virtual HRESULT STDMETHODCALLTYPE	ScheduledFrameCompleted (IDeckLinkVideoFrame_v7_1* completedFrame, BMDOutputFrameCompletionResult result) = 0;
+};
+
+class IDeckLinkInputCallback_v7_1 : public IUnknown
+{
+public:
+	virtual HRESULT STDMETHODCALLTYPE	VideoInputFrameArrived (IDeckLinkVideoInputFrame_v7_1* videoFrame, IDeckLinkAudioInputPacket_v7_1* audioPacket) = 0;
+};
+
+// IDeckLinkOutput_v7_1.  Created by QueryInterface from IDeckLink.
+class IDeckLinkOutput_v7_1 : public IUnknown
+{
+public:
+	// Display mode predicates
+	virtual	HRESULT	STDMETHODCALLTYPE	DoesSupportVideoMode (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, BMDDisplayModeSupport *result) = 0;
+	virtual HRESULT	STDMETHODCALLTYPE	GetDisplayModeIterator (IDeckLinkDisplayModeIterator_v7_1* *iterator) = 0;
+	
+	
+	// Video output
+	virtual HRESULT STDMETHODCALLTYPE	EnableVideoOutput (BMDDisplayMode displayMode) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	DisableVideoOutput () = 0;
+	
+	virtual HRESULT STDMETHODCALLTYPE	SetVideoOutputFrameMemoryAllocator (IDeckLinkMemoryAllocator* theAllocator) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	CreateVideoFrame (int32_t width, int32_t height, int32_t rowBytes, BMDPixelFormat pixelFormat, BMDFrameFlags flags, IDeckLinkVideoFrame_v7_1* *outFrame) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	CreateVideoFrameFromBuffer (void* buffer, int32_t width, int32_t height, int32_t rowBytes, BMDPixelFormat pixelFormat, BMDFrameFlags flags, IDeckLinkVideoFrame_v7_1* *outFrame) = 0;
+	
+	virtual HRESULT STDMETHODCALLTYPE	DisplayVideoFrameSync (IDeckLinkVideoFrame_v7_1* theFrame) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	ScheduleVideoFrame (IDeckLinkVideoFrame_v7_1* theFrame, BMDTimeValue displayTime, BMDTimeValue displayDuration, BMDTimeScale timeScale) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	SetScheduledFrameCompletionCallback (IDeckLinkVideoOutputCallback_v7_1* theCallback) = 0;
+	
+	
+	// Audio output
+	virtual HRESULT STDMETHODCALLTYPE	EnableAudioOutput (BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, uint32_t channelCount) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	DisableAudioOutput () = 0;
+	
+	virtual HRESULT STDMETHODCALLTYPE	WriteAudioSamplesSync (void* buffer, uint32_t sampleFrameCount, uint32_t *sampleFramesWritten) = 0;
+	
+	virtual HRESULT STDMETHODCALLTYPE	BeginAudioPreroll () = 0;
+	virtual HRESULT STDMETHODCALLTYPE	EndAudioPreroll () = 0;
+	virtual HRESULT STDMETHODCALLTYPE	ScheduleAudioSamples (void* buffer, uint32_t sampleFrameCount, BMDTimeValue streamTime, BMDTimeScale timeScale, uint32_t *sampleFramesWritten) = 0;
+	
+	virtual HRESULT STDMETHODCALLTYPE	GetBufferedAudioSampleFrameCount (uint32_t *bufferedSampleCount) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	FlushBufferedAudioSamples () = 0;
+	
+	virtual HRESULT STDMETHODCALLTYPE	SetAudioCallback (IDeckLinkAudioOutputCallback* theCallback) = 0;
+	
+	
+	// Output control
+	virtual HRESULT STDMETHODCALLTYPE	StartScheduledPlayback (BMDTimeValue playbackStartTime, BMDTimeScale timeScale, double playbackSpeed) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	StopScheduledPlayback (BMDTimeValue stopPlaybackAtTime, BMDTimeValue *actualStopTime, BMDTimeScale timeScale) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	GetHardwareReferenceClock (BMDTimeScale desiredTimeScale, BMDTimeValue *elapsedTimeSinceSchedulerBegan) = 0;
+};
+
+// IDeckLinkInput_v7_1.  Created by QueryInterface from IDeckLink.
+class IDeckLinkInput_v7_1 : public IUnknown
+{
+public:
+	virtual	HRESULT	STDMETHODCALLTYPE	DoesSupportVideoMode (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, BMDDisplayModeSupport *result) = 0;
+	virtual HRESULT	STDMETHODCALLTYPE	GetDisplayModeIterator (IDeckLinkDisplayModeIterator_v7_1 **iterator) = 0;
+	
+	// Video input
+	virtual HRESULT STDMETHODCALLTYPE	EnableVideoInput (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, BMDVideoInputFlags flags) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	DisableVideoInput () = 0;
+	
+	// Audio input
+	virtual HRESULT STDMETHODCALLTYPE	EnableAudioInput (BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, uint32_t channelCount) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	DisableAudioInput () = 0;
+	virtual HRESULT STDMETHODCALLTYPE	ReadAudioSamples (void* buffer, uint32_t sampleFrameCount, uint32_t *sampleFramesRead, BMDTimeValue *audioPacketTime, BMDTimeScale timeScale) = 0;
+	virtual HRESULT STDMETHODCALLTYPE	GetBufferedAudioSampleFrameCount (uint32_t *bufferedSampleCount) = 0;
+	
+	// Input control
+	virtual HRESULT	STDMETHODCALLTYPE	StartStreams () = 0;
+	virtual HRESULT	STDMETHODCALLTYPE	StopStreams () = 0;
+	virtual HRESULT	STDMETHODCALLTYPE	PauseStreams () = 0;
+	virtual HRESULT STDMETHODCALLTYPE	SetCallback (IDeckLinkInputCallback_v7_1* theCallback) = 0;
+};
+
+// IDeckLinkVideoFrame_v7_1.  Created by IDeckLinkOutput::CreateVideoFrame.
+class IDeckLinkVideoFrame_v7_1 : public IUnknown
+{
+public:
+	virtual long STDMETHODCALLTYPE					GetWidth () = 0;
+	virtual long STDMETHODCALLTYPE					GetHeight () = 0;
+	virtual long STDMETHODCALLTYPE					GetRowBytes () = 0;
+	virtual BMDPixelFormat STDMETHODCALLTYPE		GetPixelFormat () = 0;
+	virtual BMDFrameFlags STDMETHODCALLTYPE			GetFlags () = 0;
+	virtual HRESULT STDMETHODCALLTYPE				GetBytes (void* *buffer) = 0;
+};
+
+// IDeckLinkVideoInputFrame_v7_1.  Provided by the IDeckLinkInput_v7_1 frame arrival callback.
+class IDeckLinkVideoInputFrame_v7_1 : public IDeckLinkVideoFrame_v7_1
+{
+public:
+	virtual HRESULT STDMETHODCALLTYPE			GetFrameTime (BMDTimeValue *frameTime, BMDTimeValue *frameDuration, BMDTimeScale timeScale) = 0;
+};
+
+// IDeckLinkAudioInputPacket_v7_1.  Provided by the IDeckLinkInput_v7_1 callback.
+class IDeckLinkAudioInputPacket_v7_1 : public IUnknown
+{
+public:
+	virtual long STDMETHODCALLTYPE				GetSampleCount () = 0;
+	virtual HRESULT STDMETHODCALLTYPE			GetBytes (void* *buffer) = 0;
+	
+	virtual HRESULT STDMETHODCALLTYPE			GetAudioPacketTime (BMDTimeValue *packetTime, BMDTimeScale timeScale) = 0;
+};
+
+#endif		// defined(__cplusplus)
+
+#endif		// __DeckLink_API_v7_1_h__
+

Added: trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/DeckLinkAPI_v7_3.h
===================================================================
--- trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/DeckLinkAPI_v7_3.h	                        (rev 0)
+++ trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/DeckLinkAPI_v7_3.h	2010-01-27 05:39:32 UTC (rev 3756)
@@ -0,0 +1,172 @@
+/* -LICENSE-START-
+** Copyright (c) 2009 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+** 
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+** 
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+/* DeckLinkAPI_v7_3.h */
+
+#ifndef __DeckLink_API_v7_3_h__
+#define __DeckLink_API_v7_3_h__
+
+#include "DeckLinkAPI.h"
+
+/* Interface ID Declarations */
+
+#define IID_IDeckLinkInputCallback_v7_3                  /* FD6F311D-4D00-444B-9ED4-1F25B5730AD0 */ (REFIID){0xFD,0x6F,0x31,0x1D,0x4D,0x00,0x44,0x4B,0x9E,0xD4,0x1F,0x25,0xB5,0x73,0x0A,0xD0}
+#define IID_IDeckLinkOutput_v7_3                         /* 271C65E3-C323-4344-A30F-D908BCB20AA3 */ (REFIID){0x27,0x1C,0x65,0xE3,0xC3,0x23,0x43,0x44,0xA3,0x0F,0xD9,0x08,0xBC,0xB2,0x0A,0xA3}
+#define IID_IDeckLinkInput_v7_3                          /* 4973F012-9925-458C-871C-18774CDBBECB */ (REFIID){0x49,0x73,0xF0,0x12,0x99,0x25,0x45,0x8C,0x87,0x1C,0x18,0x77,0x4C,0xDB,0xBE,0xCB}
+#define IID_IDeckLinkVideoInputFrame_v7_3                /* CF317790-2894-11DE-8C30-0800200C9A66 */ (REFIID){0xCF,0x31,0x77,0x90,0x28,0x94,0x11,0xDE,0x8C,0x30,0x08,0x00,0x20,0x0C,0x9A,0x66}
+
+/* End Interface ID Declarations */
+
+#if defined(__cplusplus)
+
+/* Forward Declarations */
+
+class IDeckLinkVideoInputFrame_v7_3;
+
+/* End Forward Declarations */
+
+
+/* Interface IDeckLinkOutput - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkOutput_v7_3 : public IUnknown
+{
+public:
+    virtual HRESULT DoesSupportVideoMode (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, /* out */ BMDDisplayModeSupport *result) = 0;
+    virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator **iterator) = 0;
+
+    virtual HRESULT SetScreenPreviewCallback (/* in */ IDeckLinkScreenPreviewCallback *previewCallback) = 0;
+
+    /* Video Output */
+
+    virtual HRESULT EnableVideoOutput (BMDDisplayMode displayMode, BMDVideoOutputFlags flags) = 0;
+    virtual HRESULT DisableVideoOutput (void) = 0;
+
+    virtual HRESULT SetVideoOutputFrameMemoryAllocator (/* in */ IDeckLinkMemoryAllocator *theAllocator) = 0;
+    virtual HRESULT CreateVideoFrame (int32_t width, int32_t height, int32_t rowBytes, BMDPixelFormat pixelFormat, BMDFrameFlags flags, /* out */ IDeckLinkMutableVideoFrame **outFrame) = 0;
+    virtual HRESULT CreateAncillaryData (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, /* out */ IDeckLinkVideoFrameAncillary **outBuffer) = 0;
+
+    virtual HRESULT DisplayVideoFrameSync (/* in */ IDeckLinkVideoFrame *theFrame) = 0;
+    virtual HRESULT ScheduleVideoFrame (/* in */ IDeckLinkVideoFrame *theFrame, BMDTimeValue displayTime, BMDTimeValue displayDuration, BMDTimeScale timeScale) = 0;
+    virtual HRESULT SetScheduledFrameCompletionCallback (/* in */ IDeckLinkVideoOutputCallback *theCallback) = 0;
+    virtual HRESULT GetBufferedVideoFrameCount (/* out */ uint32_t *bufferedFrameCount) = 0;
+
+    /* Audio Output */
+
+    virtual HRESULT EnableAudioOutput (BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, uint32_t channelCount, BMDAudioOutputStreamType streamType) = 0;
+    virtual HRESULT DisableAudioOutput (void) = 0;
+
+    virtual HRESULT WriteAudioSamplesSync (/* in */ void *buffer, uint32_t sampleFrameCount, /* out */ uint32_t *sampleFramesWritten) = 0;
+
+    virtual HRESULT BeginAudioPreroll (void) = 0;
+    virtual HRESULT EndAudioPreroll (void) = 0;
+    virtual HRESULT ScheduleAudioSamples (/* in */ void *buffer, uint32_t sampleFrameCount, BMDTimeValue streamTime, BMDTimeScale timeScale, /* out */ uint32_t *sampleFramesWritten) = 0;
+
+    virtual HRESULT GetBufferedAudioSampleFrameCount (/* out */ uint32_t *bufferedSampleFrameCount) = 0;
+    virtual HRESULT FlushBufferedAudioSamples (void) = 0;
+
+    virtual HRESULT SetAudioCallback (/* in */ IDeckLinkAudioOutputCallback *theCallback) = 0;
+
+    /* Output Control */
+
+    virtual HRESULT StartScheduledPlayback (BMDTimeValue playbackStartTime, BMDTimeScale timeScale, double playbackSpeed) = 0;
+    virtual HRESULT StopScheduledPlayback (BMDTimeValue stopPlaybackAtTime, /* out */ BMDTimeValue *actualStopTime, BMDTimeScale timeScale) = 0;
+    virtual HRESULT IsScheduledPlaybackRunning (/* out */ bool *active) = 0;
+    virtual HRESULT GetHardwareReferenceClock (BMDTimeScale desiredTimeScale, /* out */ BMDTimeValue *elapsedTimeSinceSchedulerBegan) = 0;
+
+protected:
+    virtual ~IDeckLinkOutput_v7_3 () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkOutput */
+
+
+/* Interface IDeckLinkInputCallback - Frame arrival callback. */
+
+class IDeckLinkInputCallback_v7_3 : public IUnknown
+{
+public:
+    virtual HRESULT VideoInputFormatChanged (/* in */ BMDVideoInputFormatChangedEvents notificationEvents, /* in */ IDeckLinkDisplayMode *newDisplayMode, /* in */ BMDDetectedVideoInputFormatFlags detectedSignalFlags) = 0;
+    virtual HRESULT VideoInputFrameArrived (/* in */ IDeckLinkVideoInputFrame_v7_3 *videoFrame, /* in */ IDeckLinkAudioInputPacket *audioPacket) = 0;
+
+protected:
+    virtual ~IDeckLinkInputCallback_v7_3 () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkInputCallback */
+
+
+/* Interface IDeckLinkInput - Created by QueryInterface from IDeckLink. */
+
+class IDeckLinkInput_v7_3 : public IUnknown
+{
+public:
+    virtual HRESULT DoesSupportVideoMode (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, /* out */ BMDDisplayModeSupport *result) = 0;
+    virtual HRESULT GetDisplayModeIterator (/* out */ IDeckLinkDisplayModeIterator **iterator) = 0;
+
+    virtual HRESULT SetScreenPreviewCallback (/* in */ IDeckLinkScreenPreviewCallback *previewCallback) = 0;
+
+    /* Video Input */
+
+    virtual HRESULT EnableVideoInput (BMDDisplayMode displayMode, BMDPixelFormat pixelFormat, BMDVideoInputFlags flags) = 0;
+    virtual HRESULT DisableVideoInput (void) = 0;
+    virtual HRESULT GetAvailableVideoFrameCount (/* out */ uint32_t *availableFrameCount) = 0;
+
+    /* Audio Input */
+
+    virtual HRESULT EnableAudioInput (BMDAudioSampleRate sampleRate, BMDAudioSampleType sampleType, uint32_t channelCount) = 0;
+    virtual HRESULT DisableAudioInput (void) = 0;
+    virtual HRESULT GetAvailableAudioSampleFrameCount (/* out */ uint32_t *availableSampleFrameCount) = 0;
+
+    /* Input Control */
+
+    virtual HRESULT StartStreams (void) = 0;
+    virtual HRESULT StopStreams (void) = 0;
+    virtual HRESULT PauseStreams (void) = 0;
+    virtual HRESULT FlushStreams (void) = 0;
+    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback_v7_3 *theCallback) = 0;
+
+protected:
+    virtual ~IDeckLinkInput_v7_3 () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkInput */
+
+/* Interface IDeckLinkVideoInputFrame - Provided by the IDeckLinkVideoInput frame arrival callback. */
+
+class IDeckLinkVideoInputFrame_v7_3 : public IDeckLinkVideoFrame
+{
+public:
+    virtual HRESULT GetStreamTime (/* out */ BMDTimeValue *frameTime, /* out */ BMDTimeValue *frameDuration, BMDTimeScale timeScale) = 0;
+
+protected:
+    virtual ~IDeckLinkVideoInputFrame_v7_3 () {}; // call Release method to drop reference count
+};
+
+/* End Interface IDeckLinkVideoInputFrame */
+
+#endif      // defined(__cplusplus)
+#endif      // __DeckLink_API_v7_3_h__

Added: trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/LinuxCOM.h
===================================================================
--- trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/LinuxCOM.h	                        (rev 0)
+++ trunk/libminisip/source/subsystem_media/video/grabber/decklinksdk/LinuxCOM.h	2010-01-27 05:39:32 UTC (rev 3756)
@@ -0,0 +1,99 @@
+/* -LICENSE-START-
+** Copyright (c) 2009 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+** 
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+** 
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef __LINUX_COM_H_
+#define __LINUX_COM_H_
+
+struct REFIID
+{	
+	unsigned char byte0;
+	unsigned char byte1;
+	unsigned char byte2;
+	unsigned char byte3;
+	unsigned char byte4;
+	unsigned char byte5;
+	unsigned char byte6;
+	unsigned char byte7;
+	unsigned char byte8;
+	unsigned char byte9;
+	unsigned char byte10;
+	unsigned char byte11;
+	unsigned char byte12;
+	unsigned char byte13;
+	unsigned char byte14;
+	unsigned char byte15;
+};
+
+typedef REFIID CFUUIDBytes;
+#define CFUUIDGetUUIDBytes(x)	x
+
+typedef int HRESULT;
+typedef unsigned long ULONG;
+typedef void *LPVOID;
+
+#define SUCCEEDED(Status) ((HRESULT)(Status) >= 0)
+#define FAILED(Status) ((HRESULT)(Status)<0)
+
+#define IS_ERROR(Status) ((unsigned long)(Status) >> 31 == SEVERITY_ERROR)
+#define HRESULT_CODE(hr) ((hr) & 0xFFFF)
+#define HRESULT_FACILITY(hr) (((hr) >> 16) & 0x1fff)
+#define HRESULT_SEVERITY(hr) (((hr) >> 31) & 0x1)
+#define SEVERITY_SUCCESS 0
+#define SEVERITY_ERROR 1
+
+#define MAKE_HRESULT(sev,fac,code) ((HRESULT) (((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | ((unsigned long)(code))) )
+
+#define S_OK ((HRESULT)0x00000000L)
+#define S_FALSE ((HRESULT)0x00000001L)
+#define E_UNEXPECTED ((HRESULT)0x8000FFFFL)
+#define E_NOTIMPL ((HRESULT)0x80000001L)
+#define E_OUTOFMEMORY ((HRESULT)0x80000002L)
+#define E_INVALIDARG ((HRESULT)0x80000003L)
+#define E_NOINTERFACE ((HRESULT)0x80000004L)
+#define E_POINTER ((HRESULT)0x80000005L)
+#define E_HANDLE ((HRESULT)0x80000006L)
+#define E_ABORT ((HRESULT)0x80000007L)
+#define E_FAIL ((HRESULT)0x80000008L)
+#define E_ACCESSDENIED ((HRESULT)0x80000009L)
+
+#define STDMETHODCALLTYPE
+
+#define IID_IUnknown		(REFIID){0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}
+#define IUnknownUUID		IID_IUnknown
+
+#ifdef __cplusplus
+class IUnknown
+{
+    public:
+    	virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, LPVOID *ppv) = 0;
+    	virtual ULONG STDMETHODCALLTYPE AddRef(void) = 0;
+    	virtual ULONG STDMETHODCALLTYPE Release(void) = 0;
+};
+#endif
+
+#endif 
+


From erik at minisip.org  Wed Jan 27 07:58:19 2010
From: erik at minisip.org (erik at minisip.org)
Date: Wed, 27 Jan 2010 07:58:19 +0100 (CET)
Subject: r3757 - in trunk/libminisip/source/subsystem_media/video: display
	grabber
Message-ID: <20100127065819.768FD1AC4C@mail.minisip.org>

Author: erik
Date: 2010-01-27 07:58:19 +0100 (Wed, 27 Jan 2010)
New Revision: 3757

Modified:
   trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.cxx
   trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.cxx
   trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.h
Log:
 * Added displaying local video



Modified: trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.cxx	2010-01-27 05:39:32 UTC (rev 3756)
+++ trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.cxx	2010-01-27 06:58:19 UTC (rev 3757)
@@ -3092,12 +3092,9 @@
 
 	if (cmd.getOp()=="make_proxy"){	//if we will not display any video
 		window->removeDisplay(this);
-		
-
 	}
 
 	if (cmd.getOp()=="wait_quit"){
-		cerr <<"EEEE: ?????????????????????????????????waiting for window quit"<<endl;
 		window->join();
 	}
 

Modified: trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.cxx	2010-01-27 05:39:32 UTC (rev 3756)
+++ trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.cxx	2010-01-27 06:58:19 UTC (rev 3757)
@@ -68,6 +68,151 @@
 #endif
 
 
+void yuv420p_to_bgra(int width, int height,
+                        const unsigned char *srcy, int linesizey, 
+			const unsigned char *srcu, int linesizeu, 
+			const unsigned char *srcv, int linesizev,
+                        unsigned char *dst)
+{
+        int line, col, linewidth;
+        int y, u, v, yy, vr, ug, vg, ub;
+        int r, g, b;
+        const unsigned char *py, *pu, *pv;
+        unsigned char *origdst=dst;
+
+        linewidth = width >> 1;
+/*
+        py = src;
+        pu = py + (width * height);
+        pv = pu + (width * height) / 4;
+*/
+        py = srcy;
+        pu = srcu;
+        pv = srcv;
+
+        y = *py++;
+        yy = y << 8;
+        u = *pu - 128;
+        ug =   88 * u;
+        ub =  454 * u;
+        v = *pv - 128;
+        vg =  183 * v;
+        vr =  359 * v;
+
+        for (line = 0; line < height; line++) {
+                for (col = 0; col < width; col++) {
+                        r = (yy +      vr) >> 8;
+                        g = (yy - ug - vg) >> 8;
+                        b = (yy + ub     ) >> 8;
+
+                        // Clamp values (truncate)
+                        if (r < 0)   r = 0;
+                        if (r > 255) r = 255;
+                        if (g < 0)   g = 0;
+                        if (g > 255) g = 255;
+                        if (b < 0)   b = 0;
+                        if (b > 255) b = 255;
+
+                        *dst++ = r;
+                        *dst++ = g;
+                        *dst++ = b;
+
+                        y = *py++;
+                        yy = y << 8;
+                        if (col & 1) {
+                                pu++;
+                                pv++;
+
+                                u = *pu - 128;
+                                ug =   88 * u;
+                                ub =  454 * u;
+                                v = *pv - 128;
+                                vg =  183 * v;
+                                vr =  359 * v;
+                        }
+                } /* ..for col */
+                if ((line & 1) == 0) { // even line: rewind
+                        pu -= linewidth;
+                        pv -= linewidth;
+                }else{
+                        pu+=(linesizeu-linewidth);
+                        pv+=(linesizeu-linewidth);
+                }
+                py+=(linesizey-width);
+        } /* ..for line */
+}
+
+
+void yuv2rgb(const unsigned char* y,
+                int linesizey,
+                const unsigned char* u,
+                int linesizeu,
+                const unsigned char* v,
+                int linesizev,
+                int width,
+                int height,
+                unsigned char *rgb){
+//        cerr <<"EEEE: doing yuv2rgb for data of size "<<width<<"x"<<height<<endl;
+        massert(y);
+        massert(u);
+        massert(v);
+        massert(rgb);
+
+
+        static const int precision=32768;
+
+        static const int coefficientY=(int)(1.164*precision+0.5);
+        static const int coefficientRV = (int)(1.596*precision+0.5);
+        static const int coefficientGU = (int)(0.391*precision+0.5);
+        static const int coefficientGV = (int)(0.813*precision+0.5);
+        static const int coefficientBU = (int)(2.018*precision+0.5);
+       // cerr <<"EEEE: doing loop"<<endl;
+
+        for (int h=0; h<height; h++){
+                for (int w=0; w<width; w++){
+
+                        //int k=h*width+w;
+                        int k=h*linesizey+w;
+                        //int i=(h/2)*(width/2)+(w/2);
+                        int i=(h/2)*(linesizeu)+(w/2);
+                        int Y=y[k];
+                        int U=u[i];
+                        int V=v[i];
+
+                        if (!(i&0x0F)){
+                                __builtin_prefetch (&y[k+32], 0); // prefetch for read
+                                __builtin_prefetch (&u[i+32], 0); // prefetch for read
+                                __builtin_prefetch (&v[i+32], 0); // prefetch for read
+                                //__builtin_prefetch (&rgb[(h*width+w)+32], 1); // prefetch for write
+                        }
+
+                        int R = coefficientY*(Y-16)+coefficientRV*(V-128);
+                        int G = coefficientY*(Y-16)-coefficientGU*(U-128)-coefficientGV*(V-128);
+                        int B = coefficientY*(Y-16)+coefficientBU*(U-128);
+
+                        R = (R+precision/2)/precision;
+                        G = (G+precision/2)/precision;
+                        B = (B+precision/2)/precision;
+                        if (R<0) R=0;
+                        if (G<0) G=0;
+                        if (B<0) B=0;
+                        if (R>255) R=255;
+                        if (G>255) G=255;
+                        if (B>255) B=255;
+                        rgb[(h*width+w)*3+0]=R;
+                        rgb[(h*width+w)*3+1]=G;
+                        rgb[(h*width+w)*3+2]=B;
+                        //rgb[k*4+0]=R;
+                        //rgb[k*4+1]=G;
+                        //rgb[k*4+2]=B;
+                        //cerr <<"EEEE: w=" << w <<" h="<<h<<" k3="<<k*3<<" i="<<i<<endl;
+                }
+        }
+//        cerr<<"EEEE: yuv2rgb done!"<<endl;
+}
+
+
+
 void uyvy_to_yuv420p(int w, int h, byte_t *in, byte_t* outy, byte_t* outu, byte_t* outv){
 	int x;
 	int y;
@@ -219,6 +364,7 @@
 	device=dev;
 	capture=NULL;
 	initialized=false;
+	localRgb=NULL;
 	//	memset(&UserStruct,0,sizeof(UserStruct));
 }
 
@@ -415,6 +561,56 @@
 	grabberLock.unlock();
 }
 
+void DeckLinkGrabber::displayLocal(MImage* frame){
+#define SCALE 1
+//	cerr <<"EEEE: displayLocal: running "<<endl;
+	int targetWidth = frame->width/SCALE;
+	int targetHeight = frame->height/SCALE;
+
+	if (!localRgb || localRgb->width!=targetWidth || localRgb->height!=targetHeight){
+//		cerr << "EEEE: displayLocal: allocating size "<< targetWidth<<"x"<<targetHeight<<endl;
+		//FIXME: delete if not NULL
+		localRgb = new MImage;
+
+		localRgb->data[0] = new uint8_t[ targetWidth * targetHeight * 4 ];
+		localRgb->data[1] = NULL;
+		localRgb->data[2] = NULL;
+		localRgb->linesize[0] = targetWidth*3;
+		localRgb->linesize[1] = 0;
+		localRgb->linesize[2] = 0;
+		localRgb->width=targetWidth;
+		localRgb->height=targetHeight;
+		localRgb->chroma = M_CHROMA_RV24;
+	}
+	
+
+//	cerr << "EEEE: starting conversion.."<<endl;
+#if 0
+	yuv420p_to_bgra(frame->width, frame->height,
+			&frame->data[0][0], frame->linesize[0],
+			&frame->data[1][0],frame->linesize[1],
+			&frame->data[2][0],frame->linesize[2],
+			&localRgb->data[0][0]
+		       );
+#endif
+#if 1
+	yuv2rgb(  
+			&frame->data[0][0], frame->linesize[0],
+			&frame->data[1][0],frame->linesize[1],
+			&frame->data[2][0],frame->linesize[2],
+			frame->width,
+			frame->height,
+			&localRgb->data[0][0]
+	       );
+#endif
+//	cerr << "EEEE: conversion done"<<endl;
+
+
+
+	localDisplay->handle(localRgb);
+
+}
+
 void DeckLinkGrabber::read( ImageHandler * handler ){
 	if (localDisplay){
 		localDisplay->setIsLocalVideo(true);
@@ -435,12 +631,15 @@
 		//			if (i%50==1){ //grabber does 50fps. We send 25fps.
 
 		MImage*frame = capture->getImage();
-		handler->handle( frame );
-		if (localDisplay){
-			//localDisplay->handle(frame);
-		}
-		//			}
+//		if (i%2==0){
+			handler->handle( frame );
 
+			if (localDisplay){
+				displayLocal(frame);
+				//localDisplay->handle(frame);
+			}
+//		}
+
 		if (i%200==0){
 			static struct timespec last_wallt;
 			static struct timespec last_cput;

Modified: trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.h
===================================================================
--- trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.h	2010-01-27 05:39:32 UTC (rev 3756)
+++ trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.h	2010-01-27 06:58:19 UTC (rev 3757)
@@ -108,6 +108,9 @@
 
 	private:
 		void init();
+		void displayLocal(MImage* frame);
+		MImage* localRgb;
+
 		bool doStop;
 
 		DeckLinkCaptureDelegate* capture;


From erik at minisip.org  Wed Jan 27 13:25:09 2010
From: erik at minisip.org (erik at minisip.org)
Date: Wed, 27 Jan 2010 13:25:09 +0100 (CET)
Subject: r3758 - in trunk: libmcrypto/m4
	libminisip/source/subsystem_media/video/display
	libminisip/source/subsystem_media/video/grabber libmnetutil
	libmnetutil/m4 minisip/minisip/gui/openglgui
Message-ID: <20100127122509.A656F1ACBA@mail.minisip.org>

Author: erik
Date: 2010-01-27 13:25:09 +0100 (Wed, 27 Jan 2010)
New Revision: 3758

Modified:
   trunk/libmcrypto/m4/libmcrypto.m4
   trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.cxx
   trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.cxx
   trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.h
   trunk/libmnetutil/configure.ac
   trunk/libmnetutil/m4/libmnetutil.m4
   trunk/minisip/minisip/gui/openglgui/OpenGlGui.cxx
Log:
 status messages


Modified: trunk/libmcrypto/m4/libmcrypto.m4
===================================================================
--- trunk/libmcrypto/m4/libmcrypto.m4	2010-01-27 06:58:19 UTC (rev 3757)
+++ trunk/libmcrypto/m4/libmcrypto.m4	2010-01-27 12:25:09 UTC (rev 3758)
@@ -108,13 +108,13 @@
 ], [dtls1=yes],[have_dtls=no;dtls1=no])
 AC_MSG_RESULT([$dtls1])
 
-AC_CHECK_FUNC([DTLSv1_method], , [have_dtls=no])
-if test x$have_dtls = xyes; then
-	AC_DEFINE([USE_DTLS], 1, [Define to 1 if you have OpenSSL 0.9.8f or later])
-	ifelse([$1], , :, [$1])
-else
-	ifelse([$2], , :, [$2])
-fi
+ AC_CHECK_FUNC([DTLSv1_method], , [have_dtls=no])
+ if test x$have_dtls = xyes; then
+ 	AC_DEFINE(USE_DTLS, "1", [Define to 1 if you have OpenSSL 0.9.8f or later])dnl
+ 	ifelse([$1], , :, [$1])
+ else
+ 	ifelse([$2], , :, [$2])
+ fi
 
 dnl AM_CONDITIONAL(HAVE_OPENSSL, test "x${HAVE_OPENSSL}" = "x1")
 
@@ -196,9 +196,7 @@
 	LDFLAGS="$LDFLAGS $LIBMCRYPTO_LDFLAGS"
 	LIBS="$MINISIP_LIBS $LIBS"
 	CPPFLAGS="$CPPFLAGS $MINISIP_CFLAGS"
-	AM_MINISIP_CHECK_WINFUNCS(["DTLSSocket::create(0,0,0)"],,[mcrypto_dtls_found=no],[dnl
-#include<libmcrypto/DtlsSocket.h>
-])
+	AM_MINISIP_CHECK_WINFUNC(["DTLSSocket::create(0,0,0)"],[mcrypto_dtls_found=yes], [mcrypto_dtls_found=no],[ #include<libmcrypto/DtlsSocket.h> ])
 	LIBS="$mcrypto_save_LIBS"
 	LDFLAGS="$mcrypto_save_LDFLAGS"
 	CPPFLAGS="$mcrypto_save_CPPFLAGS"

Modified: trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.cxx	2010-01-27 06:58:19 UTC (rev 3757)
+++ trunk/libminisip/source/subsystem_media/video/display/OpenGLDisplay.cxx	2010-01-27 12:25:09 UTC (rev 3758)
@@ -105,12 +105,18 @@
 
 class Notification{
 	public:
-		Notification(string message, Text* _text, int _textureGray){
+		Notification(string message, Text* _text, int _textureGray, int timeout){
 			gfx = new struct mgl_gfx;
 			memset(gfx,0, sizeof(struct mgl_gfx) );
 			gfx->name = strdup(message.c_str());
 			text=_text;
 			textureGray=_textureGray;
+			if (timeout)
+				gfx->alpha = new Animate(5000, 0.7, 0, ANIMATE_EXPONENTIAL);
+			else
+				gfx->alpha = new Animate(0.5);
+			
+			gfx->alpha->start();
 		}
 		~Notification(){
 			delete gfx;
@@ -130,7 +136,7 @@
 	static const SDL_Color white={255,255,255};
 	static const SDL_Color black={0,0,0};
 
-	glColor4f(1.0,1.0,1.0, 0.3);
+	glColor4f(1.0,1.0,1.0, gfx->alpha->getVal() );
 	glBindTexture( GL_TEXTURE_2D, textureGray);
 	massert(glGetError()==GL_NO_ERROR);
 
@@ -151,8 +157,8 @@
 	glEnd();
 	massert(glGetError()==GL_NO_ERROR);
 
-	cerr <<"EEEE: doing text->draw3d x1="<<x1<< " x2="<<x2<<" y1="<<y1<<" y2="<<y2<<endl;
-	text->draw3D( x1,0,0,  x2,y2,0, gfx->name, 16, white, black, TEXT_ALIGN_LEFT);
+//	cerr <<"EEEE: doing text->draw3d x1="<<x1<< " x2="<<x2<<" y1="<<y1<<" y2="<<y2<<endl;
+	text->draw3D( x1,y1,0,  x2,y2,0, gfx->name, 16, white, black, TEXT_ALIGN_CENTER);
 }
 
 
@@ -573,7 +579,8 @@
 			displaysChanged=true;
 		}
 	
-		void showNotification(string message);
+		void showNotification(string message, int timeout);
+		void clearNotifications();
 
 		void notificationsDraw();
 
@@ -708,10 +715,15 @@
 		list<Notification*> notifications;
 };
 
+void OpenGLWindow::clearNotifications(){
+	notificationLock.lock();
+	notifications.clear( );
+	notificationLock.unlock();
+}
 
-void OpenGLWindow::showNotification(string message){
+void OpenGLWindow::showNotification(string message, int timeout){
 
-	Notification* n = new Notification(message, text, textureGray);
+	Notification* n = new Notification(message, text, textureGray, timeout);
 
 	notificationLock.lock();
 	notifications.push_back( n );
@@ -1007,6 +1019,9 @@
 			
 		}
 		if (key=="KEY_PLAY"){
+
+			clearNotifications();
+
 			menuLock.lock();
 			string cmd = menuItemCur->command.getOp();
 			cerr <<"EEEE: MENU SELECTED: "<< cmd<<endl;
@@ -1024,6 +1039,7 @@
 					//addressBookMenu.keyUp();
 					//addressBookMenu.keyDown();
 				}else{
+					notifications.clear();
 					CommandString cmd = menuItemCur->command;
 					menuLock.unlock();
 					send( menuItemCur->command );
@@ -2179,17 +2195,27 @@
 	static const SDL_Color black={0,0,0};
 	notificationLock.lock();
 
+	int j=0;
 	for (i=notifications.begin(); i!=notifications.end(); i++){
-		cerr <<"EEEE: Notification draw: " << (*i)->gfx->name << endl;
-		float x1= windowX0;
+//		cerr <<"EEEE: Notification draw: " << (*i)->gfx->name << endl;
+		float x1= windowX0/3;
 		float y1= windowY0;
-		float x2= -windowX0;
+		float x2= -windowX0/3;
 		float y2= -windowY0;
+		float voffset=(y2-y1)/4;
+		float delta=voffset/6;
 
-		(*i)->draw( x1,0, x2,y2/20 );
 
+		(*i)->draw( x1,0+voffset+j*delta, x2,y2/15+voffset+j*delta );
+		j++;
 
+		if ( (*i)->gfx->alpha->ended()){
+			notifications.erase(i);
+			break;
+		}
 
+
+
 	}
 
 	notificationLock.unlock();
@@ -2449,7 +2475,7 @@
 
 					if (event.key.keysym.sym == SDLK_n){
 						cerr <<"EEEE: showing notification"<<endl;
-						showNotification("hello");
+						showNotification("hello",1000);
 						cerr <<"EEEE: done show notification"<<endl;
 					}
 
@@ -3089,6 +3115,7 @@
 
 bool OpenGLDisplay::handleCommand(CommandString cmd){
 	bool handled=false;
+	cerr <<"EEEE: OpenGLDisplay::handleCommand: got: "<< cmd.getString() << endl;
 
 	if (cmd.getOp()=="make_proxy"){	//if we will not display any video
 		window->removeDisplay(this);
@@ -3112,6 +3139,20 @@
 			handled=true;
 	}
 
+	if (cmd.getOp()=="remote_user_not_found" ){
+		window->showNotification("User not found", 5000);
+	}
+
+	if (cmd.getOp()=="remote_ringing" ){
+		window->showNotification("Ringing", 0);
+	}
+
+	if (cmd.getOp()=="invite_ok" ){
+		window->clearNotifications();
+	}
+
+
+
 	if (cmd.getOp()=="incoming_available"){
 		string fromuri = cmd.getParam();
 		string callid  = cmd.getDestinationId();

Modified: trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.cxx	2010-01-27 06:58:19 UTC (rev 3757)
+++ trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.cxx	2010-01-27 12:25:09 UTC (rev 3758)
@@ -68,81 +68,7 @@
 #endif
 
 
-void yuv420p_to_bgra(int width, int height,
-                        const unsigned char *srcy, int linesizey, 
-			const unsigned char *srcu, int linesizeu, 
-			const unsigned char *srcv, int linesizev,
-                        unsigned char *dst)
-{
-        int line, col, linewidth;
-        int y, u, v, yy, vr, ug, vg, ub;
-        int r, g, b;
-        const unsigned char *py, *pu, *pv;
-        unsigned char *origdst=dst;
 
-        linewidth = width >> 1;
-/*
-        py = src;
-        pu = py + (width * height);
-        pv = pu + (width * height) / 4;
-*/
-        py = srcy;
-        pu = srcu;
-        pv = srcv;
-
-        y = *py++;
-        yy = y << 8;
-        u = *pu - 128;
-        ug =   88 * u;
-        ub =  454 * u;
-        v = *pv - 128;
-        vg =  183 * v;
-        vr =  359 * v;
-
-        for (line = 0; line < height; line++) {
-                for (col = 0; col < width; col++) {
-                        r = (yy +      vr) >> 8;
-                        g = (yy - ug - vg) >> 8;
-                        b = (yy + ub     ) >> 8;
-
-                        // Clamp values (truncate)
-                        if (r < 0)   r = 0;
-                        if (r > 255) r = 255;
-                        if (g < 0)   g = 0;
-                        if (g > 255) g = 255;
-                        if (b < 0)   b = 0;
-                        if (b > 255) b = 255;
-
-                        *dst++ = r;
-                        *dst++ = g;
-                        *dst++ = b;
-
-                        y = *py++;
-                        yy = y << 8;
-                        if (col & 1) {
-                                pu++;
-                                pv++;
-
-                                u = *pu - 128;
-                                ug =   88 * u;
-                                ub =  454 * u;
-                                v = *pv - 128;
-                                vg =  183 * v;
-                                vr =  359 * v;
-                        }
-                } /* ..for col */
-                if ((line & 1) == 0) { // even line: rewind
-                        pu -= linewidth;
-                        pv -= linewidth;
-                }else{
-                        pu+=(linesizeu-linewidth);
-                        pv+=(linesizeu-linewidth);
-                }
-                py+=(linesizey-width);
-        } /* ..for line */
-}
-
-
 void yuv2rgb(const unsigned char* y,
                 int linesizey,
                 const unsigned char* u,
@@ -249,6 +175,7 @@
 	height=0;
 	frame=NULL;
 	filled=false;
+	doStop=false;
 	allocateImage();
 }
 
@@ -277,6 +204,9 @@
 //	cerr <<"EEEE: doing DeckLinkCaptureDelegate::putImage()"<<endl;
 	int pw = videoFrame->GetWidth();
 	int ph = videoFrame->GetHeight();
+//	if (doStop)
+//		return;
+
 //	cerr <<"EEEE: size: "<<pw<<"x"<<ph<<endl;
 	if (pw!=width || ph!=height){
 		width=pw;
@@ -311,6 +241,8 @@
 //	cerr <<"EEEE: VideoInputFrameArrived called..."<<endl;
 	void *frameBytes;
 	void *audioFrameBytes;
+//	if (doStop)
+//		return S_OK;
 
 	// Handle Video Frame
 	if(videoFrame)
@@ -396,7 +328,7 @@
 	deckLinkIterator = CreateDeckLinkIteratorInstance();
 	HRESULT                     result;
 
-	BMDDisplayMode              selectedDisplayMode = bmdModeHD720p50;
+	BMDDisplayMode              selectedDisplayMode = bmdModeHD1080i50;
 	IDeckLinkDisplayMode        *displayMode;
 
 	if (!deckLinkIterator)
@@ -512,6 +444,8 @@
 void DeckLinkGrabber::start(){
 	//	UserStruct.stopped = false;
 	doStop=false;
+	if (capture)
+		capture->doStop=false;
 	massert(startBlockSem);
 	startBlockSem->inc();
 }
@@ -520,6 +454,8 @@
 	//Note: this can be called even if open has not been done.
 	//	UserStruct.stopped = true;
 	doStop=true;
+	if (capture)
+		capture->stop();
 	if (runthread){
 		runthread->join();
 		runthread=NULL;
@@ -585,15 +521,6 @@
 	
 
 //	cerr << "EEEE: starting conversion.."<<endl;
-#if 0
-	yuv420p_to_bgra(frame->width, frame->height,
-			&frame->data[0][0], frame->linesize[0],
-			&frame->data[1][0],frame->linesize[1],
-			&frame->data[2][0],frame->linesize[2],
-			&localRgb->data[0][0]
-		       );
-#endif
-#if 1
 	yuv2rgb(  
 			&frame->data[0][0], frame->linesize[0],
 			&frame->data[1][0],frame->linesize[1],
@@ -602,7 +529,6 @@
 			frame->height,
 			&localRgb->data[0][0]
 	       );
-#endif
 //	cerr << "EEEE: conversion done"<<endl;
 
 
@@ -665,6 +591,7 @@
 
 	result = deckLinkInput->StopStreams();
 	deckLinkInput->FlushStreams();
+	Thread::msleep(100);
 
 	if (localDisplay){
 		localDisplay->stop();

Modified: trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.h
===================================================================
--- trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.h	2010-01-27 06:58:19 UTC (rev 3757)
+++ trunk/libminisip/source/subsystem_media/video/grabber/DeckLinkGrabber.h	2010-01-27 12:25:09 UTC (rev 3758)
@@ -63,6 +63,8 @@
 		MImage* getImage();
 		int getWidth(){return width;}
 		int getHeight(){return height;}
+		void stop(){doStop=true;}
+		bool doStop;
 	private:
 		void allocateImage();
 		long unsigned int frameCount;

Modified: trunk/libmnetutil/configure.ac
===================================================================
--- trunk/libmnetutil/configure.ac	2010-01-27 06:58:19 UTC (rev 3757)
+++ trunk/libmnetutil/configure.ac	2010-01-27 12:25:09 UTC (rev 3758)
@@ -74,12 +74,12 @@
 AC_CHECK_LIB([ws2_32], [main])
 
 dnl Check if some WinXP function declarations are present in the header files
-AM_MINISIP_CHECK_WINFUNCS(["getaddrinfo(0,0,0,0)" "freeaddrinfo(0)" "GetAdaptersAddresses(0,0,0,0,0)" "getnameinfo(0,0,0,0,0,0,0)"],,,[dnl
-#define _WIN32_WINNT 0x0501
-#include<windows.h>
-#include<iphlpapi.h>
-#include<ws2tcpip.h>
-])
+dnl AM_MINISIP_CHECK_WINFUNCS(["getaddrinfo(0,0,0,0)" "freeaddrinfo(0)" "GetAdaptersAddresses(0,0,0,0,0)" "getnameinfo(0,0,0,0,0,0,0)"],,,[dnl
+dnl #define _WIN32_WINNT 0x0501
+dnl #include<windows.h>
+dnl #include<iphlpapi.h>
+dnl #include<ws2tcpip.h>
+dnl ])
 else
 AC_CHECK_FUNCS([getifaddrs getnameinfo getaddrinfo freeaddrinfo])
 fi

Modified: trunk/libmnetutil/m4/libmnetutil.m4
===================================================================
--- trunk/libmnetutil/m4/libmnetutil.m4	2010-01-27 06:58:19 UTC (rev 3757)
+++ trunk/libmnetutil/m4/libmnetutil.m4	2010-01-27 12:25:09 UTC (rev 3758)
@@ -76,7 +76,7 @@
 	LDFLAGS="$LDFLAGS $LIBMNETUTIL_LDFLAGS"
 	LIBS="$MINISIP_LIBS $LIBS"
 	CPPFLAGS="$CPPFLAGS $MINISIP_CFLAGS"
-	AM_MINISIP_CHECK_WINFUNCS(["new SctpSocket(0,0,0)"],,[mnetutil_sctp_found=no],[dnl
+	AM_MINISIP_CHECK_WINFUNC(["adsfasdfasdf()"],,[mnetutil_sctp_found=no],[dnl
 #include<libmnetutil/SctpSocket.h>
 ])
 	LIBS="$mnetutil_save_LIBS"

Modified: trunk/minisip/minisip/gui/openglgui/OpenGlGui.cxx
===================================================================
--- trunk/minisip/minisip/gui/openglgui/OpenGlGui.cxx	2010-01-27 06:58:19 UTC (rev 3757)
+++ trunk/minisip/minisip/gui/openglgui/OpenGlGui.cxx	2010-01-27 12:25:09 UTC (rev 3758)
@@ -236,6 +236,10 @@
 		display->handleCommand(cmd);
 	}
 
+	if (cmd.getOp()=="remote_ringing"){	
+		display->handleCommand(cmd);
+	}
+
 	if (cmd.getOp()=="remote_presence_update"){
 		display->handleCommand(cmd);
 	}
@@ -254,6 +258,7 @@
 				MediaCommandString::set_session_sound_settings,
 				"senders", "ON");
 		sendCommand("media", cmdstr);
+		display->handleCommand(cmd);
 	}