← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linphone/quantal

« back to all changes in this revision

Viewing changes to mediastreamer2/tests/videodisplay.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Elie Mamane, Kilian Krause, Lionel Elie Mamane
  • Date: 2009-05-27 11:39:51 UTC
  • mfrom: (5.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20090527113951-jd525e5rlwluh617
http://bugs.debian.org/528076
[ Kilian Krause ]
* Remove -N from wget args in get-orig-source target as -O is already
  used.

[ Lionel Elie Mamane ]
* linphone: Fix file conflict with linphone-common (<= 3.1.2-1)
  (Closes: #528076)

Show diffs side-by-side

added added

removed removed

Lines of Context:
mediastreamer2/tests/videodisplay.c
24
24
int main(int argc, char *argv[]){
25
25
        VideoStream *vs;
26
26
        MSWebCam *cam;
 
27
        MSVideoSize vsize;
27
28
        int i;
 
29
 
 
30
        vsize.width=MS_VIDEO_SIZE_CIF_W;
 
31
        vsize.height=MS_VIDEO_SIZE_CIF_H;
 
32
 
28
33
        ortp_init();
29
34
        ortp_set_log_level_mask(ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
30
35
        ms_init();
32
37
        /* this is to test the sequence start/stop */
33
38
        for(i=0;i<1;++i){
34
39
                int n;
35
 
                vs=video_preview_start(cam);
 
40
                vs=video_preview_start(cam,vsize);
36
41
 
37
42
                for(n=0;n<1000;++n){
38
43
#ifdef WIN32
51
56
                        if (vs) video_stream_iterate(vs);
52
57
#endif
53
58
 
54
 
#if 0 /* test code */
55
 
                        if (n==300)
56
 
                          {
57
 
                            ms_filter_call_method_noarg (vs->source, MS_V4L_STOP);
58
 
                          }
 
59
/* test code */
59
60
                        if (n==400)
60
61
                          {
61
62
                            ms_ticker_detach (vs->ticker, vs->source);
105
106
                            ms_filter_link(vs->pixconv,0, vs->output,0);
106
107
 
107
108
                            
108
 
                            //ms_filter_unlink(vs->tee,0,vs->output,0);
109
109
                            ms_ticker_attach (vs->ticker, vs->source);
110
110
                          }
111
 
#endif
112
111
                }
113
112
                video_preview_stop(vs);
114
113
        }