Changeset 779:95bdc77e7ffe in mediastreamer2
- Timestamp:
- Nov 20, 2009 7:38:05 PM (4 years ago)
- Branch:
- default
- Location:
- linphone/mediastreamer2
- Files:
-
- 3 edited
-
include/mediastreamer2/msvideo.h (modified) (2 diffs)
-
src/msvideo.c (modified) (3 diffs)
-
src/winvideods.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
linphone/mediastreamer2/include/mediastreamer2/msvideo.h
r776 r779 24 24 25 25 /* some global constants for video MSFilter(s) */ 26 #define MS_VIDEO_SIZE_SQCIF_W 128 27 #define MS_VIDEO_SIZE_SQCIF_H 96 28 #define MS_VIDEO_SIZE_QCIF_W 176 29 #define MS_VIDEO_SIZE_QCIF_H 144 26 30 #define MS_VIDEO_SIZE_CIF_W 352 27 31 #define MS_VIDEO_SIZE_CIF_H 288 28 #define MS_VIDEO_SIZE_ QCIF_W 17629 #define MS_VIDEO_SIZE_ QCIF_H 14432 #define MS_VIDEO_SIZE_ICIF_W 352 33 #define MS_VIDEO_SIZE_ICIF_H 576 30 34 #define MS_VIDEO_SIZE_4CIF_W 704 31 35 #define MS_VIDEO_SIZE_4CIF_H 576 36 37 #define MS_VIDEO_SIZE_QQVGA_W 160 38 #define MS_VIDEO_SIZE_QQVGA_H 120 39 #define MS_VIDEO_SIZE_QVGA_W 320 40 #define MS_VIDEO_SIZE_QVGA_H 240 41 #define MS_VIDEO_SIZE_VGA_W 640 42 #define MS_VIDEO_SIZE_VGA_H 480 43 #define MS_VIDEO_SIZE_SVGA_W 800 44 #define MS_VIDEO_SIZE_SVGA_H 600 45 46 #define MS_VIDEO_SIZE_NS1_W 324 47 #define MS_VIDEO_SIZE_NS1_H 248 32 48 33 49 #define MS_VIDEO_SIZE_QSIF_W 176 … … 35 51 #define MS_VIDEO_SIZE_SIF_W 352 36 52 #define MS_VIDEO_SIZE_SIF_H 240 53 #define MS_VIDEO_SIZE_ISIF_W 352 54 #define MS_VIDEO_SIZE_ISIF_H 480 37 55 #define MS_VIDEO_SIZE_4SIF_W 704 38 56 #define MS_VIDEO_SIZE_4SIF_H 480 39 57 40 #define MS_VIDEO_SIZE_QQVGA_W 160 41 #define MS_VIDEO_SIZE_QQVGA_H 120 42 43 #define MS_VIDEO_SIZE_QVGA_W 320 44 #define MS_VIDEO_SIZE_QVGA_H 240 45 46 #define MS_VIDEO_SIZE_VGA_W 640 47 #define MS_VIDEO_SIZE_VGA_H 480 48 58 #define MS_VIDEO_SIZE_288P_W 512 59 #define MS_VIDEO_SIZE_288P_H 288 60 #define MS_VIDEO_SIZE_448P_W 768 61 #define MS_VIDEO_SIZE_448P_H 448 62 #define MS_VIDEO_SIZE_576P_W 1024 63 #define MS_VIDEO_SIZE_576P_H 576 49 64 #define MS_VIDEO_SIZE_720P_W 1280 50 65 #define MS_VIDEO_SIZE_720P_H 720 66 #define MS_VIDEO_SIZE_1080P_W 1920 67 #define MS_VIDEO_SIZE_1080P_H 1080 51 68 52 #define MS_VIDEO_SIZE_NS1_W 324 53 #define MS_VIDEO_SIZE_NS1_H 248 54 55 #define MS_VIDEO_SIZE_SVGA_W 800 56 #define MS_VIDEO_SIZE_SVGA_H 600 69 #define MS_VIDEO_SIZE_SDTV_W 768 70 #define MS_VIDEO_SIZE_SDTV_H 576 71 #define MS_VIDEO_SIZE_HDTVP_W 1920 72 #define MS_VIDEO_SIZE_HDTVP_H 1200 57 73 58 74 #define MS_VIDEO_SIZE_XGA_W 1024 59 75 #define MS_VIDEO_SIZE_XGA_H 768 76 #define MS_VIDEO_SIZE_WXGA_W 1080 77 #define MS_VIDEO_SIZE_WXGA_H 768 60 78 61 79 #define MS_VIDEO_SIZE_MAX_W MS_VIDEO_SIZE_1024_W -
linphone/mediastreamer2/src/msvideo.c
r776 r779 45 45 w=MS_VIDEO_SIZE_CIF_W; 46 46 h=MS_VIDEO_SIZE_CIF_H; 47 }else if (size==(MS_VIDEO_SIZE_QQVGA_W*MS_VIDEO_SIZE_QQVGA_H*3)/2){48 w=MS_VIDEO_SIZE_QQVGA_W;49 h=MS_VIDEO_SIZE_QQVGA_H;50 47 }else if (size==(MS_VIDEO_SIZE_QVGA_W*MS_VIDEO_SIZE_QVGA_H*3)/2){ 51 48 w=MS_VIDEO_SIZE_QVGA_W; … … 57 54 w=MS_VIDEO_SIZE_4CIF_W; 58 55 h=MS_VIDEO_SIZE_4CIF_H; 59 }else if (size==(MS_VIDEO_SIZE_720P_W*MS_VIDEO_SIZE_720P_H*3)/2){ 60 w=MS_VIDEO_SIZE_720P_W; 61 h=MS_VIDEO_SIZE_720P_H; 56 }else if (size==(MS_VIDEO_SIZE_SVGA_W*MS_VIDEO_SIZE_SVGA_H*3)/2){ 57 w=MS_VIDEO_SIZE_SVGA_W; 58 h=MS_VIDEO_SIZE_SVGA_H; 59 }else if (size==(MS_VIDEO_SIZE_SQCIF_W*MS_VIDEO_SIZE_SQCIF_H*3)/2){ 60 w=MS_VIDEO_SIZE_SQCIF_W; 61 h=MS_VIDEO_SIZE_SQCIF_H; 62 }else if (size==(MS_VIDEO_SIZE_QQVGA_W*MS_VIDEO_SIZE_QQVGA_H*3)/2){ 63 w=MS_VIDEO_SIZE_QQVGA_W; 64 h=MS_VIDEO_SIZE_QQVGA_H; 62 65 }else if (size==(MS_VIDEO_SIZE_NS1_W*MS_VIDEO_SIZE_NS1_H*3)/2){ 63 66 w=MS_VIDEO_SIZE_NS1_W; 64 67 h=MS_VIDEO_SIZE_NS1_H; 65 }else if (size==(MS_VIDEO_SIZE_1024_W*MS_VIDEO_SIZE_1024_H*3)/2){66 w=MS_VIDEO_SIZE_1024_W;67 h=MS_VIDEO_SIZE_1024_H;68 }else if (size==(MS_VIDEO_SIZE_800X600_W*MS_VIDEO_SIZE_800X600_H*3)/2){69 w=MS_VIDEO_SIZE_800X600_W;70 h=MS_VIDEO_SIZE_800X600_H;71 68 }else if (size==(MS_VIDEO_SIZE_QSIF_W*MS_VIDEO_SIZE_QSIF_H*3)/2){ 72 69 w=MS_VIDEO_SIZE_QSIF_W; … … 78 75 w=MS_VIDEO_SIZE_4SIF_W; 79 76 h=MS_VIDEO_SIZE_4SIF_H; 77 }else if (size==(MS_VIDEO_SIZE_288P_W*MS_VIDEO_SIZE_288P_H*3)/2){ 78 w=MS_VIDEO_SIZE_288P_W; 79 h=MS_VIDEO_SIZE_288P_H; 80 }else if (size==(MS_VIDEO_SIZE_448P_W*MS_VIDEO_SIZE_448P_H*3)/2){ 81 w=MS_VIDEO_SIZE_448P_W; 82 h=MS_VIDEO_SIZE_448P_H; 83 }else if (size==(MS_VIDEO_SIZE_576P_W*MS_VIDEO_SIZE_576P_H*3)/2){ 84 w=MS_VIDEO_SIZE_576P_W; 85 h=MS_VIDEO_SIZE_576P_H; 86 }else if (size==(MS_VIDEO_SIZE_720P_W*MS_VIDEO_SIZE_720P_H*3)/2){ 87 w=MS_VIDEO_SIZE_720P_W; 88 h=MS_VIDEO_SIZE_720P_H; 89 }else if (size==(MS_VIDEO_SIZE_1080P_W*MS_VIDEO_SIZE_1080P_H*3)/2){ 90 w=MS_VIDEO_SIZE_1080P_W; 91 h=MS_VIDEO_SIZE_1080P_H; 92 }else if (size==(MS_VIDEO_SIZE_SDTV_W*MS_VIDEO_SIZE_SDTV_H*3)/2){ 93 w=MS_VIDEO_SIZE_SDTV_W; 94 h=MS_VIDEO_SIZE_SDTV_H; 95 }else if (size==(MS_VIDEO_SIZE_HDTVP_W*MS_VIDEO_SIZE_HDTVP_H*3)/2){ 96 w=MS_VIDEO_SIZE_HDTVP_W; 97 h=MS_VIDEO_SIZE_HDTVP_H; 98 }else if (size==(MS_VIDEO_SIZE_XGA_W*MS_VIDEO_SIZE_XGA_H*3)/2){ 99 w=MS_VIDEO_SIZE_XGA_W; 100 h=MS_VIDEO_SIZE_XGA_H; 101 }else if (size==(MS_VIDEO_SIZE_WXGA_W*MS_VIDEO_SIZE_WXGA_H*3)/2){ 102 w=MS_VIDEO_SIZE_WXGA_W; 103 h=MS_VIDEO_SIZE_WXGA_H; 80 104 }else if (size==(160*112*3)/2){/*format used by econf*/ 81 105 w=160; -
linphone/mediastreamer2/src/winvideods.c
r679 r779 544 544 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_4CIF_W, MS_VIDEO_SIZE_4CIF_H, &pPinCategory)==0) 545 545 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_4CIF_W, MS_VIDEO_SIZE_4CIF_H); 546 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_VGA_W, MS_VIDEO_SIZE_VGA_H, &pPinCategory)==0)547 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_VGA_W, MS_VIDEO_SIZE_VGA_H);548 546 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_QVGA_W, MS_VIDEO_SIZE_QVGA_H, &pPinCategory)==0) 549 547 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_QVGA_W, MS_VIDEO_SIZE_QVGA_H); … … 552 550 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_NS1_W, MS_VIDEO_SIZE_NS1_H, &pPinCategory)==0) 553 551 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_NS1_W, MS_VIDEO_SIZE_NS1_H); 552 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_QSIF_W, MS_VIDEO_SIZE_QSIF_H, &pPinCategory)==0) 553 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_QSIF_W, MS_VIDEO_SIZE_QSIF_H); 554 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_SIF_W, MS_VIDEO_SIZE_SIF_H, &pPinCategory)==0) 555 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_SIF_W, MS_VIDEO_SIZE_SIF_H); 556 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_VGA_W, MS_VIDEO_SIZE_VGA_H, &pPinCategory)==0) 557 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_VGA_W, MS_VIDEO_SIZE_VGA_H); 558 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_SDTV_W, MS_VIDEO_SIZE_SDTV_H, &pPinCategory)==0) 559 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_SDTV_W, MS_VIDEO_SIZE_SDTV_H); 560 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_288P_W, MS_VIDEO_SIZE_288P_H, &pPinCategory)==0) 561 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_288P_W, MS_VIDEO_SIZE_288P_H); 562 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_448P_W, MS_VIDEO_SIZE_448P_H, &pPinCategory)==0) 563 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_448P_W, MS_VIDEO_SIZE_448P_H); 564 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_576P_W, MS_VIDEO_SIZE_576P_H, &pPinCategory)==0) 565 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_576P_W, MS_VIDEO_SIZE_576P_H); 554 566 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_720P_W, MS_VIDEO_SIZE_720P_H, &pPinCategory)==0) 555 567 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_720P_W, MS_VIDEO_SIZE_720P_H); 556 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_800X600_W, MS_VIDEO_SIZE_800X600_H, &pPinCategory)==0) 557 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_800X600_W, MS_VIDEO_SIZE_800X600_H); 558 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_1024_W, MS_VIDEO_SIZE_1024_H, &pPinCategory)==0) 559 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_1024_W, MS_VIDEO_SIZE_1024_H); 568 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_1080P_W, MS_VIDEO_SIZE_1080P_H, &pPinCategory)==0) 569 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_1080P_W, MS_VIDEO_SIZE_1080P_H); 570 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_4SIF_W, MS_VIDEO_SIZE_4SIF_H, &pPinCategory)==0) 571 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_4SIF_W, MS_VIDEO_SIZE_4SIF_H); 572 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_SVGA_W, MS_VIDEO_SIZE_SVGA_H, &pPinCategory)==0) 573 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_SVGA_W, MS_VIDEO_SIZE_SVGA_H); 574 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_XGA_W, MS_VIDEO_SIZE_XGA_H, &pPinCategory)==0) 575 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_XGA_W, MS_VIDEO_SIZE_XGA_H); 576 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_WXGA_W, MS_VIDEO_SIZE_WXGA_H, &pPinCategory)==0) 577 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_WXGA_W, MS_VIDEO_SIZE_WXGA_H); 578 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_HDTVP_W, MS_VIDEO_SIZE_HDTVP_H, &pPinCategory)==0) 579 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_HDTVP_W, MS_VIDEO_SIZE_HDTVP_H); 560 580 else 561 581 { … … 719 739 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_4CIF_W, MS_VIDEO_SIZE_4CIF_H, &pPinCategory)==0) 720 740 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_4CIF_W, MS_VIDEO_SIZE_4CIF_H); 721 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_VGA_W, MS_VIDEO_SIZE_VGA_H, &pPinCategory)==0)722 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_VGA_W, MS_VIDEO_SIZE_VGA_H);723 741 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_QVGA_W, MS_VIDEO_SIZE_QVGA_H, &pPinCategory)==0) 724 742 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_QVGA_W, MS_VIDEO_SIZE_QVGA_H); … … 727 745 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_NS1_W, MS_VIDEO_SIZE_NS1_H, &pPinCategory)==0) 728 746 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_NS1_W, MS_VIDEO_SIZE_NS1_H); 747 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_QSIF_W, MS_VIDEO_SIZE_QSIF_H, &pPinCategory)==0) 748 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_QSIF_W, MS_VIDEO_SIZE_QSIF_H); 749 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_SIF_W, MS_VIDEO_SIZE_SIF_H, &pPinCategory)==0) 750 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_SIF_W, MS_VIDEO_SIZE_SIF_H); 751 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_VGA_W, MS_VIDEO_SIZE_VGA_H, &pPinCategory)==0) 752 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_VGA_W, MS_VIDEO_SIZE_VGA_H); 753 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_SDTV_W, MS_VIDEO_SIZE_SDTV_H, &pPinCategory)==0) 754 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_SDTV_W, MS_VIDEO_SIZE_SDTV_H); 755 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_288P_W, MS_VIDEO_SIZE_288P_H, &pPinCategory)==0) 756 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_288P_W, MS_VIDEO_SIZE_288P_H); 757 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_448P_W, MS_VIDEO_SIZE_448P_H, &pPinCategory)==0) 758 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_448P_W, MS_VIDEO_SIZE_448P_H); 759 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_576P_W, MS_VIDEO_SIZE_576P_H, &pPinCategory)==0) 760 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_576P_W, MS_VIDEO_SIZE_576P_H); 729 761 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_720P_W, MS_VIDEO_SIZE_720P_H, &pPinCategory)==0) 730 762 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_720P_W, MS_VIDEO_SIZE_720P_H); 731 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_800X600_W, MS_VIDEO_SIZE_800X600_H, &pPinCategory)==0) 732 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_800X600_W, MS_VIDEO_SIZE_800X600_H); 733 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_1024_W, MS_VIDEO_SIZE_1024_H, &pPinCategory)==0) 734 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_1024_W, MS_VIDEO_SIZE_1024_H); 763 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_1080P_W, MS_VIDEO_SIZE_1080P_H, &pPinCategory)==0) 764 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_1080P_W, MS_VIDEO_SIZE_1080P_H); 765 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_4SIF_W, MS_VIDEO_SIZE_4SIF_H, &pPinCategory)==0) 766 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_4SIF_W, MS_VIDEO_SIZE_4SIF_H); 767 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_SVGA_W, MS_VIDEO_SIZE_SVGA_H, &pPinCategory)==0) 768 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_SVGA_W, MS_VIDEO_SIZE_SVGA_H); 769 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_XGA_W, MS_VIDEO_SIZE_XGA_H, &pPinCategory)==0) 770 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_XGA_W, MS_VIDEO_SIZE_XGA_H); 771 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_WXGA_W, MS_VIDEO_SIZE_WXGA_H, &pPinCategory)==0) 772 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_WXGA_W, MS_VIDEO_SIZE_WXGA_H); 773 else if (try_format_size(s, s->pix_fmt, MS_VIDEO_SIZE_HDTVP_W, MS_VIDEO_SIZE_HDTVP_H, &pPinCategory)==0) 774 ms_message("Selected Size: %ix%i.", MS_VIDEO_SIZE_HDTVP_W, MS_VIDEO_SIZE_HDTVP_H); 735 775 else 736 776 {
Note: See TracChangeset
for help on using the changeset viewer.
