Show
Ignore:
Timestamp:
03/21/12 18:36:20 (3 years ago)
Author:
robert
Message:

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/directshow/DirectShowTexture.cpp

    r12902 r13041  
    1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 2009 Tharsis Software  
     1/* -*-c++-*- OpenSceneGraph - Copyright (C) 2009 Tharsis Software 
    22 * 
    3  * This library is open source and may be redistributed and/or modified under   
    4  * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or  
     3 * This library is open source and may be redistributed and/or modified under 
     4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
    55 * (at your option) any later version.  The full license is in LICENSE file 
    66 * included with this distribution, and on the openscenegraph.org website. 
    7  *  
     7 * 
    88 * This library is distributed in the hope that it will be useful, 
    99 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
    10  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
     10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1111 * OpenSceneGraph Public License for more details. 
    1212 * 
     
    3838}; 
    3939 
    40 // 73646976-0000-0010-8000-00AA00389B71  'vids' == WMMEDIATYPE_Video  
    41 EXTERN_GUID(WMMEDIATYPE_Video,  
    42 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);  
    43 // 73647561-0000-0010-8000-00AA00389B71  'auds' == WMMEDIATYPE_Audio  
    44 EXTERN_GUID(WMMEDIATYPE_Audio,  
    45 0x73647561, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);  
    46 // 73636d64-0000-0010-8000-00AA00389B71  'scmd' == MEDIATYPE_Script  
    47 EXTERN_GUID(WMMEDIATYPE_Script,  
    48 0x73636d64, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);  
    49 // 34A50FD8-8AA5-4386-81FE-A0EFE0488E31            WMMEDIATYPE_Image  
    50 EXTERN_GUID(WMMEDIATYPE_Image,  
    51 0x34a50fd8, 0x8aa5, 0x4386, 0x81, 0xfe, 0xa0, 0xef, 0xe0, 0x48, 0x8e, 0x31);  
    52 // D9E47579-930E-4427-ADFC-AD80F290E470  'fxfr' == WMMEDIATYPE_FileTransfer  
    53 EXTERN_GUID(WMMEDIATYPE_FileTransfer,  
    54 0xd9e47579, 0x930e, 0x4427, 0xad, 0xfc, 0xad, 0x80, 0xf2, 0x90, 0xe4, 0x70);  
    55 // 9BBA1EA7-5AB2-4829-BA57-0940209BCF3E      'text' == WMMEDIATYPE_Text  
    56 EXTERN_GUID(WMMEDIATYPE_Text,  
    57 0x9bba1ea7, 0x5ab2, 0x4829, 0xba, 0x57, 0x9, 0x40, 0x20, 0x9b, 0xcf, 0x3e);  
    58  
    59 // 00000000-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_Base  
    60 EXTERN_GUID(WMMEDIASUBTYPE_Base,  
    61 0x00000000, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);  
    62 // e436eb78-524f-11ce-9f53-0020af0ba770            MEDIASUBTYPE_RGB1  
    63 EXTERN_GUID(WMMEDIASUBTYPE_RGB1,  
    64 0xe436eb78, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70);  
    65 // e436eb79-524f-11ce-9f53-0020af0ba770            MEDIASUBTYPE_RGB4  
    66 EXTERN_GUID(WMMEDIASUBTYPE_RGB4,  
    67 0xe436eb79, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70);  
    68 // e436eb7a-524f-11ce-9f53-0020af0ba770            MEDIASUBTYPE_RGB8  
    69 EXTERN_GUID(WMMEDIASUBTYPE_RGB8,  
    70 0xe436eb7a, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70);  
    71 // e436eb7b-524f-11ce-9f53-0020af0ba770            MEDIASUBTYPE_RGB565  
    72 EXTERN_GUID(WMMEDIASUBTYPE_RGB565,  
    73 0xe436eb7b, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70);  
    74 // e436eb7c-524f-11ce-9f53-0020af0ba770            MEDIASUBTYPE_RGB555  
    75 EXTERN_GUID(WMMEDIASUBTYPE_RGB555,  
    76 0xe436eb7c, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70);  
    77 // e436eb7d-524f-11ce-9f53-0020af0ba770            MEDIASUBTYPE_RGB24  
    78 EXTERN_GUID(WMMEDIASUBTYPE_RGB24,  
    79 0xe436eb7d, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70);  
    80 // e436eb7e-524f-11ce-9f53-0020af0ba770            MEDIASUBTYPE_RGB32  
    81 EXTERN_GUID(WMMEDIASUBTYPE_RGB32,  
    82 0xe436eb7e, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70);  
    83 // 30323449-0000-0010-8000-00AA00389B71  'YV12' ==  MEDIASUBTYPE_I420  
    84 EXTERN_GUID(WMMEDIASUBTYPE_I420,  
    85 0x30323449, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);  
    86 // 56555949-0000-0010-8000-00AA00389B71  'YV12' ==  MEDIASUBTYPE_IYUV  
    87 EXTERN_GUID(WMMEDIASUBTYPE_IYUV,  
    88 0x56555949, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);  
    89 // 31313259-0000-0010-8000-00AA00389B71  'YV12' ==  MEDIASUBTYPE_YV12  
    90 EXTERN_GUID(WMMEDIASUBTYPE_YV12,  
    91 0x32315659, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);  
    92 // 32595559-0000-0010-8000-00AA00389B71  'YUY2' == MEDIASUBTYPE_YUY2  
    93 EXTERN_GUID(WMMEDIASUBTYPE_YUY2,  
    94 0x32595559, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);  
    95 // 59565955-0000-0010-8000-00AA00389B71  'UYVY' ==  MEDIASUBTYPE_UYVY  
    96 EXTERN_GUID(WMMEDIASUBTYPE_UYVY,  
    97 0x59565955, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);  
    98 // 55595659-0000-0010-8000-00AA00389B71  'YVYU' == MEDIASUBTYPE_YVYU  
    99 EXTERN_GUID(WMMEDIASUBTYPE_YVYU,  
    100 0x55595659, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);  
    101 // 39555659-0000-0010-8000-00AA00389B71  'YVU9' == MEDIASUBTYPE_YVU9  
    102 EXTERN_GUID(WMMEDIASUBTYPE_YVU9,  
    103 0x39555659, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);  
    104 // 3334504D-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_MP43  
    105 EXTERN_GUID(WMMEDIASUBTYPE_MP43,  
    106 0x3334504D, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);  
    107 // 5334504D-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_MP4S  
    108 EXTERN_GUID(WMMEDIASUBTYPE_MP4S,  
    109 0x5334504D, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);  
    110 // 31564D57-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_WMV1  
    111 EXTERN_GUID(WMMEDIASUBTYPE_WMV1,  
    112 0x31564D57, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);  
    113 // 32564D57-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_WMV2  
    114 EXTERN_GUID(WMMEDIASUBTYPE_WMV2,  
    115 0x32564D57, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);  
    116 // 3153534D-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_MSS1  
    117 EXTERN_GUID(WMMEDIASUBTYPE_MSS1,  
    118 0x3153534D, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);  
    119 // e06d8026-db46-11cf-b4d1-00805f6cbbea            WMMEDIASUBTYPE_MPEG2_VIDEO  
    120 EXTERN_GUID(WMMEDIASUBTYPE_MPEG2_VIDEO,  
    121 0xe06d8026, 0xdb46, 0x11cf, 0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea);  
    122 // 00000001-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_PCM  
    123 EXTERN_GUID(WMMEDIASUBTYPE_PCM,  
    124 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);  
    125 // 00000009-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_DRM  
    126 EXTERN_GUID(WMMEDIASUBTYPE_DRM,  
    127 0x00000009, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);  
    128 // 00000162-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_WMAudioV9  
    129 EXTERN_GUID(WMMEDIASUBTYPE_WMAudioV9,  
    130 0x00000162, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);  
    131 // 00000163-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_WMAudio_Lossless  
    132 EXTERN_GUID(WMMEDIASUBTYPE_WMAudio_Lossless,  
    133 0x00000163, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);  
    134 // 3253534D-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_MSS2  
    135 EXTERN_GUID(WMMEDIASUBTYPE_MSS2,  
    136 0x3253534D, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);  
    137 // 0000000A-0000-0010-8000-00AA00389B71        WMMEDIASUBTYPE_WMSP1  
    138 EXTERN_GUID( WMMEDIASUBTYPE_WMSP1,  
    139 0x0000000A,0x0000,0x0010,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71);  
    140 // 33564D57-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_WMV3  
    141 EXTERN_GUID(WMMEDIASUBTYPE_WMV3,  
    142 0x33564D57, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);  
    143 // 00000161-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_WMAudioV8  
    144 EXTERN_GUID(WMMEDIASUBTYPE_WMAudioV8,  
    145 0x00000161, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);  
    146 // 00000161-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_WMAudioV7  
    147 EXTERN_GUID(WMMEDIASUBTYPE_WMAudioV7,  
    148 0x00000161, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);  
    149 // 00000161-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_WMAudioV2  
    150 EXTERN_GUID(WMMEDIASUBTYPE_WMAudioV2,  
    151 0x00000161, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);  
    152 // 00000130-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_ACELPnet  
    153 EXTERN_GUID(WMMEDIASUBTYPE_ACELPnet,  
    154 0x00000130, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);  
    155 // 00000050-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_MP3  
    156 EXTERN_GUID(WMMEDIASUBTYPE_MP3,  
    157 0x00000055, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);  
    158 // 776257d4-c627-41cb-8f81-7ac7ff1c40cc            WMMEDIASUBTYPE_WebStream  
    159 EXTERN_GUID(WMMEDIASUBTYPE_WebStream,  
    160 0x776257d4, 0xc627, 0x41cb, 0x8f, 0x81, 0x7a, 0xc7, 0xff, 0x1c, 0x40, 0xcc);  
    161  
    162 // 05589f80-c356-11ce-bf01-00aa0055595a        WMFORMAT_VideoInfo  
    163 EXTERN_GUID(WMFORMAT_VideoInfo,  
    164 0x05589f80, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a);  
    165 // 05589f81-c356-11ce-bf01-00aa0055595a        WMFORMAT_WaveFormatEx  
    166 EXTERN_GUID(WMFORMAT_WaveFormatEx,  
    167 0x05589f81, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a);  
    168 // 5C8510F2-DEBE-4ca7-BBA5-F07A104F8DFF        WMFORMAT_Script  
    169 EXTERN_GUID(WMFORMAT_Script,  
    170 0x5c8510f2, 0xdebe, 0x4ca7, 0xbb, 0xa5, 0xf0, 0x7a, 0x10, 0x4f, 0x8d, 0xff);  
    171  
    172 // 82f38a70-c29f-11d1-97ad-00a0c95ea850        WMSCRIPTTYPE_TwoStrings  
    173 EXTERN_GUID( WMSCRIPTTYPE_TwoStrings,  
    174 0x82f38a70,0xc29f,0x11d1,0x97,0xad,0x00,0xa0,0xc9,0x5e,0xa8,0x50);  
    175  
    176 // e06d80e3-db46-11cf-b4d1-00805f6cbbea        WMFORMAT_MPEG2Video  
    177 EXTERN_GUID(WMFORMAT_MPEG2Video,  
    178 0xe06d80e3, 0xdb46, 0x11cf, 0xb4, 0xd1, 0x00, 0x80, 0x05f, 0x6c, 0xbb, 0xea);  
     40// 73646976-0000-0010-8000-00AA00389B71  'vids' == WMMEDIATYPE_Video 
     41EXTERN_GUID(WMMEDIATYPE_Video, 
     420x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); 
     43// 73647561-0000-0010-8000-00AA00389B71  'auds' == WMMEDIATYPE_Audio 
     44EXTERN_GUID(WMMEDIATYPE_Audio, 
     450x73647561, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); 
     46// 73636d64-0000-0010-8000-00AA00389B71  'scmd' == MEDIATYPE_Script 
     47EXTERN_GUID(WMMEDIATYPE_Script, 
     480x73636d64, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); 
     49// 34A50FD8-8AA5-4386-81FE-A0EFE0488E31            WMMEDIATYPE_Image 
     50EXTERN_GUID(WMMEDIATYPE_Image, 
     510x34a50fd8, 0x8aa5, 0x4386, 0x81, 0xfe, 0xa0, 0xef, 0xe0, 0x48, 0x8e, 0x31); 
     52// D9E47579-930E-4427-ADFC-AD80F290E470  'fxfr' == WMMEDIATYPE_FileTransfer 
     53EXTERN_GUID(WMMEDIATYPE_FileTransfer, 
     540xd9e47579, 0x930e, 0x4427, 0xad, 0xfc, 0xad, 0x80, 0xf2, 0x90, 0xe4, 0x70); 
     55// 9BBA1EA7-5AB2-4829-BA57-0940209BCF3E      'text' == WMMEDIATYPE_Text 
     56EXTERN_GUID(WMMEDIATYPE_Text, 
     570x9bba1ea7, 0x5ab2, 0x4829, 0xba, 0x57, 0x9, 0x40, 0x20, 0x9b, 0xcf, 0x3e); 
     58 
     59// 00000000-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_Base 
     60EXTERN_GUID(WMMEDIASUBTYPE_Base, 
     610x00000000, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); 
     62// e436eb78-524f-11ce-9f53-0020af0ba770            MEDIASUBTYPE_RGB1 
     63EXTERN_GUID(WMMEDIASUBTYPE_RGB1, 
     640xe436eb78, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70); 
     65// e436eb79-524f-11ce-9f53-0020af0ba770            MEDIASUBTYPE_RGB4 
     66EXTERN_GUID(WMMEDIASUBTYPE_RGB4, 
     670xe436eb79, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70); 
     68// e436eb7a-524f-11ce-9f53-0020af0ba770            MEDIASUBTYPE_RGB8 
     69EXTERN_GUID(WMMEDIASUBTYPE_RGB8, 
     700xe436eb7a, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70); 
     71// e436eb7b-524f-11ce-9f53-0020af0ba770            MEDIASUBTYPE_RGB565 
     72EXTERN_GUID(WMMEDIASUBTYPE_RGB565, 
     730xe436eb7b, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70); 
     74// e436eb7c-524f-11ce-9f53-0020af0ba770            MEDIASUBTYPE_RGB555 
     75EXTERN_GUID(WMMEDIASUBTYPE_RGB555, 
     760xe436eb7c, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70); 
     77// e436eb7d-524f-11ce-9f53-0020af0ba770            MEDIASUBTYPE_RGB24 
     78EXTERN_GUID(WMMEDIASUBTYPE_RGB24, 
     790xe436eb7d, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70); 
     80// e436eb7e-524f-11ce-9f53-0020af0ba770            MEDIASUBTYPE_RGB32 
     81EXTERN_GUID(WMMEDIASUBTYPE_RGB32, 
     820xe436eb7e, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70); 
     83// 30323449-0000-0010-8000-00AA00389B71  'YV12' ==  MEDIASUBTYPE_I420 
     84EXTERN_GUID(WMMEDIASUBTYPE_I420, 
     850x30323449, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); 
     86// 56555949-0000-0010-8000-00AA00389B71  'YV12' ==  MEDIASUBTYPE_IYUV 
     87EXTERN_GUID(WMMEDIASUBTYPE_IYUV, 
     880x56555949, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); 
     89// 31313259-0000-0010-8000-00AA00389B71  'YV12' ==  MEDIASUBTYPE_YV12 
     90EXTERN_GUID(WMMEDIASUBTYPE_YV12, 
     910x32315659, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); 
     92// 32595559-0000-0010-8000-00AA00389B71  'YUY2' == MEDIASUBTYPE_YUY2 
     93EXTERN_GUID(WMMEDIASUBTYPE_YUY2, 
     940x32595559, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); 
     95// 59565955-0000-0010-8000-00AA00389B71  'UYVY' ==  MEDIASUBTYPE_UYVY 
     96EXTERN_GUID(WMMEDIASUBTYPE_UYVY, 
     970x59565955, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); 
     98// 55595659-0000-0010-8000-00AA00389B71  'YVYU' == MEDIASUBTYPE_YVYU 
     99EXTERN_GUID(WMMEDIASUBTYPE_YVYU, 
     1000x55595659, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); 
     101// 39555659-0000-0010-8000-00AA00389B71  'YVU9' == MEDIASUBTYPE_YVU9 
     102EXTERN_GUID(WMMEDIASUBTYPE_YVU9, 
     1030x39555659, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); 
     104// 3334504D-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_MP43 
     105EXTERN_GUID(WMMEDIASUBTYPE_MP43, 
     1060x3334504D, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); 
     107// 5334504D-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_MP4S 
     108EXTERN_GUID(WMMEDIASUBTYPE_MP4S, 
     1090x5334504D, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); 
     110// 31564D57-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_WMV1 
     111EXTERN_GUID(WMMEDIASUBTYPE_WMV1, 
     1120x31564D57, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); 
     113// 32564D57-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_WMV2 
     114EXTERN_GUID(WMMEDIASUBTYPE_WMV2, 
     1150x32564D57, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); 
     116// 3153534D-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_MSS1 
     117EXTERN_GUID(WMMEDIASUBTYPE_MSS1, 
     1180x3153534D, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); 
     119// e06d8026-db46-11cf-b4d1-00805f6cbbea            WMMEDIASUBTYPE_MPEG2_VIDEO 
     120EXTERN_GUID(WMMEDIASUBTYPE_MPEG2_VIDEO, 
     1210xe06d8026, 0xdb46, 0x11cf, 0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea); 
     122// 00000001-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_PCM 
     123EXTERN_GUID(WMMEDIASUBTYPE_PCM, 
     1240x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); 
     125// 00000009-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_DRM 
     126EXTERN_GUID(WMMEDIASUBTYPE_DRM, 
     1270x00000009, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); 
     128// 00000162-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_WMAudioV9 
     129EXTERN_GUID(WMMEDIASUBTYPE_WMAudioV9, 
     1300x00000162, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); 
     131// 00000163-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_WMAudio_Lossless 
     132EXTERN_GUID(WMMEDIASUBTYPE_WMAudio_Lossless, 
     1330x00000163, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); 
     134// 3253534D-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_MSS2 
     135EXTERN_GUID(WMMEDIASUBTYPE_MSS2, 
     1360x3253534D, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); 
     137// 0000000A-0000-0010-8000-00AA00389B71        WMMEDIASUBTYPE_WMSP1 
     138EXTERN_GUID( WMMEDIASUBTYPE_WMSP1, 
     1390x0000000A,0x0000,0x0010,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71); 
     140// 33564D57-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_WMV3 
     141EXTERN_GUID(WMMEDIASUBTYPE_WMV3, 
     1420x33564D57, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); 
     143// 00000161-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_WMAudioV8 
     144EXTERN_GUID(WMMEDIASUBTYPE_WMAudioV8, 
     1450x00000161, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); 
     146// 00000161-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_WMAudioV7 
     147EXTERN_GUID(WMMEDIASUBTYPE_WMAudioV7, 
     1480x00000161, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); 
     149// 00000161-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_WMAudioV2 
     150EXTERN_GUID(WMMEDIASUBTYPE_WMAudioV2, 
     1510x00000161, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); 
     152// 00000130-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_ACELPnet 
     153EXTERN_GUID(WMMEDIASUBTYPE_ACELPnet, 
     1540x00000130, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); 
     155// 00000050-0000-0010-8000-00AA00389B71            WMMEDIASUBTYPE_MP3 
     156EXTERN_GUID(WMMEDIASUBTYPE_MP3, 
     1570x00000055, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); 
     158// 776257d4-c627-41cb-8f81-7ac7ff1c40cc            WMMEDIASUBTYPE_WebStream 
     159EXTERN_GUID(WMMEDIASUBTYPE_WebStream, 
     1600x776257d4, 0xc627, 0x41cb, 0x8f, 0x81, 0x7a, 0xc7, 0xff, 0x1c, 0x40, 0xcc); 
     161 
     162// 05589f80-c356-11ce-bf01-00aa0055595a        WMFORMAT_VideoInfo 
     163EXTERN_GUID(WMFORMAT_VideoInfo, 
     1640x05589f80, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a); 
     165// 05589f81-c356-11ce-bf01-00aa0055595a        WMFORMAT_WaveFormatEx 
     166EXTERN_GUID(WMFORMAT_WaveFormatEx, 
     1670x05589f81, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a); 
     168// 5C8510F2-DEBE-4ca7-BBA5-F07A104F8DFF        WMFORMAT_Script 
     169EXTERN_GUID(WMFORMAT_Script, 
     1700x5c8510f2, 0xdebe, 0x4ca7, 0xbb, 0xa5, 0xf0, 0x7a, 0x10, 0x4f, 0x8d, 0xff); 
     171 
     172// 82f38a70-c29f-11d1-97ad-00a0c95ea850        WMSCRIPTTYPE_TwoStrings 
     173EXTERN_GUID( WMSCRIPTTYPE_TwoStrings, 
     1740x82f38a70,0xc29f,0x11d1,0x97,0xad,0x00,0xa0,0xc9,0x5e,0xa8,0x50); 
     175 
     176// e06d80e3-db46-11cf-b4d1-00805f6cbbea        WMFORMAT_MPEG2Video 
     177EXTERN_GUID(WMFORMAT_MPEG2Video, 
     1780xe06d80e3, 0xdb46, 0x11cf, 0xb4, 0xd1, 0x00, 0x80, 0x05f, 0x6c, 0xbb, 0xea); 
    179179 
    180180EXTERN_GUID( CLSID_WMMUTEX_Language, 0xD6E22A00,0x35DA,0x11D1,0x90,0x34,0x00,0xA0,0xC9,0x03,0x49,0xBE ); 
     
    185185EXTERN_GUID( CLSID_WMBandwidthSharing_Partial, 0xaf6060ab,0x5197,0x11d2,0xb6,0xaf,0x00,0xc0,0x4f,0xd9,0x08,0xe9 ); 
    186186 
    187 const NamedGuid MediaType[]=  
     187const NamedGuid MediaType[]= 
    188188{ 
    189189    {&MEDIASUBTYPE_AIFF, TEXT("AIFF\0")}, 
     
    703703        hr = E_INVALIDARG; 
    704704    } 
    705      
     705 
    706706    return hr; 
    707707} 
     
    811811    hr = _graphBuilder->QueryInterface( IID_IBasicAudio, (void **)&_basicAudio); 
    812812    checkError(prefixForMessage, hr); //May be no sound so dont effect return result 
    813      
     813 
    814814    return true; 
    815815} 
     
    827827    std::vector<DeviceEntry> _listDevice; 
    828828    IEnumMoniker* _enumMoniker; 
    829     ListDeviceAvailable(IEnumMoniker *enumMoniker) : _enumMoniker(enumMoniker)  
     829    ListDeviceAvailable(IEnumMoniker *enumMoniker) : _enumMoniker(enumMoniker) 
    830830    { 
    831831        createList(); 
     
    878878 
    879879            // Associate moniker with a file 
    880             hr = device->BindToStorage(0, 0, IID_IPropertyBag,  
     880            hr = device->BindToStorage(0, 0, IID_IPropertyBag, 
    881881                                         (void **)&pPropBag); 
    882882 
     
    906906                else if (hr == E_PROP_ID_UNSUPPORTED) 
    907907                { 
    908                     clsidFilter = GUID_NULL; // No CLSID is listed.  
     908                    clsidFilter = GUID_NULL; // No CLSID is listed. 
    909909                    hr = S_OK; 
    910910                } 
     
    942942    } 
    943943 
    944      
     944 
    945945}; 
    946946 
     
    951951    std::vector<CapEntry> _capsList; 
    952952    IAMStreamConfig* _config; 
    953     ListCapDeviceAvailable(IAMStreamConfig* config) : _config(config)  
     953    ListCapDeviceAvailable(IAMStreamConfig* config) : _config(config) 
    954954    { 
    955955        createList(); 
     
    10271027        if (first != nullCapEntry) 
    10281028            return first; 
    1029          
     1029 
    10301030        if (!_capsList.empty()) 
    10311031            return _capsList.front(); 
     
    10541054                if (pmt->formattype == FORMAT_VideoInfo && pmt->cbFormat >= sizeof(VIDEOINFOHEADER)) 
    10551055                { 
    1056                     VIDEOINFOHEADER *video=  
     1056                    VIDEOINFOHEADER *video= 
    10571057                        reinterpret_cast<VIDEOINFOHEADER*>(pmt->pbFormat); 
    10581058                    _capsList.push_back(CapEntry(pmt, video)); 
     
    10821082    HRESULT hr; 
    10831083    std::string outputdevice = "Default DirectSound Device"; 
    1084     IEnumMoniker*   audioRenderer = 0; hr = devs?devs->CreateClassEnumerator (CLSID_AudioRendererCategory, &audioRenderer, 0):0;   
     1084    IEnumMoniker*   audioRenderer = 0; hr = devs?devs->CreateClassEnumerator (CLSID_AudioRendererCategory, &audioRenderer, 0):0; 
    10851085    if (!checkError(prefixForMessage, hr)) 
    10861086        return false; 
     
    11281128        return false; 
    11291129 
    1130     IEnumMoniker*   cams = 0; hr = devs?devs->CreateClassEnumerator (CLSID_VideoInputDeviceCategory, &cams, 0):0;   
     1130    IEnumMoniker*   cams = 0; hr = devs?devs->CreateClassEnumerator (CLSID_VideoInputDeviceCategory, &cams, 0):0; 
    11311131    if (!checkError(prefixForMessage, hr)) 
    11321132        return false; 
     
    11401140    ListDeviceAvailable::DeviceEntry device = deviceFinder.getDevice(capture); 
    11411141 
    1142     if (!device._device)  
     1142    if (!device._device) 
    11431143    { 
    11441144        OSG_WARN << _imageStream.get() << " no capture device \"" << capture << "\" found" << std::endl; 
     
    11611161        return false; 
    11621162 
    1163     IEnumPins* pins = 0; hr = _videoCaptureDevice?_videoCaptureDevice->EnumPins(&pins):0;  
     1163    IEnumPins* pins = 0; hr = _videoCaptureDevice?_videoCaptureDevice->EnumPins(&pins):0; 
    11641164    if (!checkError(prefixForMessage, hr)) 
    11651165        return false; 
     
    11891189        return false; 
    11901190 
    1191     IPin*           rnd  = 0;  
     1191    IPin*           rnd  = 0; 
    11921192    hr = FindPin(L"In", &rnd); 
    11931193    if (!checkError(prefixForMessage, hr)) 
     
    12181218        return false; 
    12191219 
    1220     IEnumMoniker*   captureDevices = 0; hr = devs?devs->CreateClassEnumerator (CLSID_AudioInputDeviceCategory, &captureDevices, 0):0;   
     1220    IEnumMoniker*   captureDevices = 0; hr = devs?devs->CreateClassEnumerator (CLSID_AudioInputDeviceCategory, &captureDevices, 0):0; 
    12211221    if (!checkError(prefixForMessage, hr)) 
    12221222        return false; 
     
    12301230    ListDeviceAvailable::DeviceEntry device = deviceFinder.getDevice(capture); 
    12311231 
    1232     if (!device._device)  
     1232    if (!device._device) 
    12331233    { 
    12341234        OSG_WARN << _imageStream.get() << " no sound capture device \"" << capture << "\" found" << std::endl; 
     
    12781278                { 
    12791279                    TCHAR buffer[32]; 
    1280                      
     1280 
    12811281                    ZeroMemory(buffer, sizeof(buffer)); 
    12821282 
     
    13121312            OSG_WARN << prefixForMessage << " can t retrieve informations pins" << std::endl; 
    13131313        } 
    1314     }     
     1314    } 
    13151315    if (pISC) pISC->Release(); pISC = 0; 
    13161316    IPin* captureOutputDevicePinOut = 0; hr = _soundCaptureDevice? ::GetPin(_soundCaptureDevice,L"Capture",&captureOutputDevicePinOut) : 0; 
     
    14611461    if (!checkError(prefixForMessage, hr)) 
    14621462        return false; 
    1463      
     1463 
    14641464    //Find the video pin 
    14651465    hr = _fileSource? ::GetPin(_fileSource, &MEDIATYPE_Video, PINDIR_OUTPUT, &videoOutputPin):0; 
     
    14681468        return false; 
    14691469 
    1470     IPin*           rnd  = 0;  
     1470    IPin*           rnd  = 0; 
    14711471    hr = FindPin(L"In", &rnd); 
    14721472    if (!checkError(prefixForMessage, hr)) 
     
    15631563CTextureRenderer::CTextureRenderer( DirectShowImageStream* is, HRESULT* valid) 
    15641564    : CBaseVideoRenderer(__uuidof(CLSID_TextureRenderer), 
    1565                          NAME("Texture Renderer"),  
    1566                          NULL,  
     1565                         NAME("Texture Renderer"), 
     1566                         NULL, 
    15671567                         valid) 
    15681568{ 
     
    17431743        return false; 
    17441744    } 
    1745      
     1745 
    17461746    return true; 
    17471747} 
     
    18191819} 
    18201820 
    1821 double DirectShowImageStream::getCurrentTime() const  
     1821double DirectShowImageStream::getCurrentTime() const 
    18221822{ 
    18231823    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex); 
    18241824    double currentTime = -1; 
    18251825    if (_renderer.valid() && _renderer->_mediaSeeking) 
    1826     {       
    1827         
     1826    { 
     1827 
    18281828       LONGLONG curTimeLL = 0; 
    18291829       HRESULT hr = _renderer->_mediaSeeking->GetCurrentPosition(&curTimeLL); 
    18301830       if (FAILED(hr)) 
    18311831       { 
    1832             OSG_NOTICE << this << " " << getErrorMessage(hr) << std::endl;             
    1833        }  
    1834        else  
     1832            OSG_NOTICE << this << " " << getErrorMessage(hr) << std::endl; 
     1833       } 
     1834       else 
    18351835       { 
    18361836           currentTime = static_cast<double>(curTimeLL); 
    1837            currentTime = currentTime * (100.0 * 1e-9); // default unit in directshow IMediaSeeking  
     1837           currentTime = currentTime * (100.0 * 1e-9); // default unit in directshow IMediaSeeking 
    18381838       } 
    18391839    } 
     
    18471847} 
    18481848 
    1849 void DirectShowImageStream::quit(bool waitForThreadToExit)  
     1849void DirectShowImageStream::quit(bool waitForThreadToExit) 
    18501850{ 
    18511851    stop(); 
    18521852} 
    18531853 
    1854 double DirectShowImageStream::getLength() const  
     1854double DirectShowImageStream::getLength() const 
    18551855{ 
    18561856    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex); 
     
    18661866} 
    18671867 
    1868 double DirectShowImageStream::getFrameRate() const  
     1868double DirectShowImageStream::getFrameRate() const 
    18691869{ 
    18701870    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex); 
     
    18721872    if (_renderer.valid()) 
    18731873        _renderer->get_AvgFrameRate(&frameRate); 
    1874     return static_cast<double>(frameRate) * 1e-2;  
    1875 }  
     1874    return static_cast<double>(frameRate) * 1e-2; 
     1875} 
    18761876 
    18771877void DirectShowImageStream::setTimeMultiplier(double rate) 
     
    18821882} 
    18831883 
    1884 double DirectShowImageStream::getTimeMultiplier() const  
     1884double DirectShowImageStream::getTimeMultiplier() const 
    18851885{ 
    18861886    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex); 
     
    18881888    if (_renderer.valid() && _renderer->_mediaSeeking) 
    18891889        _renderer->_mediaSeeking->GetRate(&rate); 
    1890     return rate;  
    1891 } 
    1892  
    1893 void DirectShowImageStream::setVolume(float vol) {   
    1894    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);     
    1895    if (_renderer.valid() && _renderer->_basicAudio)  
    1896    {     
    1897      _renderer->_basicAudio->put_Volume(vol);      
    1898    }    
     1890    return rate; 
     1891} 
     1892 
     1893void DirectShowImageStream::setVolume(float vol) { 
     1894   OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex); 
     1895   if (_renderer.valid() && _renderer->_basicAudio) 
     1896   { 
     1897     _renderer->_basicAudio->put_Volume(vol); 
     1898   } 
    18991899} 
    19001900 
    19011901float DirectShowImageStream::getVolume() const { 
    1902   OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);       
    1903   double vol = 0;   
    1904   if (_renderer.valid() && _renderer->_basicAudio)  
    1905   {    
     1902  OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex); 
     1903  double vol = 0; 
     1904  if (_renderer.valid() && _renderer->_basicAudio) 
     1905  { 
    19061906    long d = 0; 
    1907     _renderer->_basicAudio->get_Volume(&d);     
    1908     vol = static_cast<double>(d);     
    1909   }     
     1907    _renderer->_basicAudio->get_Volume(&d); 
     1908    vol = static_cast<double>(d); 
     1909  } 
    19101910  return vol; 
    19111911}