← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linphone/trusty-proposed

« back to all changes in this revision

Viewing changes to mediastreamer2/src/videofilters/extdisplay.c

  • Committer: Package Import Robot
  • Author(s): Mark Purcell, Felix Lechner, Mark Purcell
  • Date: 2013-07-31 20:25:44 UTC
  • mfrom: (1.3.9) (15.1.6 experimental)
  • Revision ID: package-import@ubuntu.com-20130731202544-365xxf1ovlgwcexc
Tags: 3.6.1-1
http://bugs.debian.org/710638
http://bugs.debian.org/709860
* New upstream release
 - NEW packages liblinphone5, libmediastreamer-base3, libortp9 - match soname

[ Felix Lechner ]
* New upstream version
* Update Standards-Version: 3.9.4
* Port Linphone to the new libeXosip API v4
  - Fixes "FTBFS: sal_eXosip2.c:49:2: error: too few arguments to function
  'eXosip_guess_localip'" (Closes: #710638)
  - Fixes "FTBFS for libexosip2-4 API" (Closes: #709860)
* Add dh_autoreconf (while upstream patch is pending)
* Enable IPv6
* Install documentation README.Debian about 'cv_addr_book.pl'
* Update package names to reflect library SONAMEs
* Drop Build-Depends: libsdl1.2-dev, libsamplerate0-dev, libglib2.0-dev
* Add Build-Depends: automake, quilt, libudev-dev, libpcap-dev, libsoup2.4,
  libupnp-dev, libssl-dev, libxext-dev, mesa-common-dev, libcunit1-dev,
  libspandsp-dev, vim-common, sgmltools-lite, libsqlite3-dev, libpulse-dev,
  libopus-dev

[ Mark Purcell ]
* Add additional Build-Dpends:
 

Show diffs side-by-side

added added

removed removed

Lines of Context:
mediastreamer2/src/videofilters/extdisplay.c
 
1
/*
 
2
mediastreamer2 library - modular sound and video processing and streaming
 
3
Copyright (C) 2010  Belledonne Communications SARL <simon.morlat@linphone.org>
 
4
 
 
5
This program is free software; you can redistribute it and/or
 
6
modify it under the terms of the GNU General Public License
 
7
as published by the Free Software Foundation; either version 2
 
8
of the License, or (at your option) any later version.
 
9
 
 
10
This program is distributed in the hope that it will be useful,
 
11
but WITHOUT ANY WARRANTY; without even the implied warranty of
 
12
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
13
GNU General Public License for more details.
 
14
 
 
15
You should have received a copy of the GNU General Public License
 
16
along with this program; if not, write to the Free Software
 
17
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
18
*/
 
19
 
 
20
#if defined(HAVE_CONFIG_H)
 
21
#include "mediastreamer-config.h"
 
22
#endif
 
23
 
 
24
#include "mediastreamer2/msextdisplay.h"
 
25
 
 
26
static void ext_display_init(MSFilter *f){
 
27
}
 
28
 
 
29
static void ext_display_uninit(MSFilter *f){
 
30
}
 
31
 
 
32
static void ext_display_process(MSFilter *f){
 
33
        MSExtDisplayOutput output;
 
34
        mblk_t *main_im=NULL;
 
35
        mblk_t *local_im=NULL;
 
36
 
 
37
        memset(&output,0,sizeof(output));
 
38
        
 
39
        /*get most recent message and draw it*/
 
40
        if ( f->inputs[1]!=NULL && (local_im=ms_queue_peek_last(f->inputs[1]))!=NULL) {
 
41
                if (ms_yuv_buf_init_from_mblk(&output.local_view,local_im)==0){
 
42
                }
 
43
        }
 
44
        
 
45
        if (f->inputs[0]!=NULL && (main_im=ms_queue_peek_last(f->inputs[0]))!=NULL) {
 
46
                if (ms_yuv_buf_init_from_mblk(&output.remote_view,main_im)==0){
 
47
                }
 
48
        }
 
49
 
 
50
        ms_filter_notify_synchronous(f,MS_EXT_DISPLAY_ON_DRAW,&output);
 
51
        
 
52
        if (f->inputs[0]!=NULL)
 
53
                ms_queue_flush(f->inputs[0]);
 
54
        if (f->inputs[1]!=NULL)
 
55
                ms_queue_flush(f->inputs[1]);
 
56
}
 
57
 
 
58
 
 
59
#ifdef _MSC_VER
 
60
 
 
61
MSFilterDesc ms_ext_display_desc={
 
62
        MS_EXT_DISPLAY_ID,
 
63
        "MSExtDisplay",
 
64
        N_("A display filter sending the buffers to draw to the upper layer"),
 
65
        MS_FILTER_OTHER,
 
66
        NULL,
 
67
        2,
 
68
        0,
 
69
        ext_display_init,
 
70
        NULL,
 
71
        ext_display_process,
 
72
        NULL,
 
73
        ext_display_uninit,
 
74
};
 
75
 
 
76
#else
 
77
 
 
78
MSFilterDesc ms_ext_display_desc={
 
79
        .id=MS_EXT_DISPLAY_ID,
 
80
        .name="MSExtDisplay",
 
81
        .text=N_("A display filter sending the buffers to draw to the upper layer"),
 
82
        .category=MS_FILTER_OTHER,
 
83
        .ninputs=2,
 
84
        .noutputs=0,
 
85
        .init=ext_display_init,
 
86
        .process=ext_display_process,
 
87
        .uninit=ext_display_uninit,
 
88
};
 
89
 
 
90
#endif
 
91
 
 
92
MS_FILTER_DESC_EXPORT(ms_ext_display_desc)