Changeset 626


Ignore:
Timestamp:
Apr 30, 2016, 7:08:34 AM (7 years ago)
Author:
roman
Message:
 
Location:
trunk/Utilities/MediaFoundation/SimultaneousCapture
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Utilities/MediaFoundation/SimultaneousCapture

    • Property svn:ignore set to
      alax.info

  • trunk/Utilities/MediaFoundation/SimultaneousCapture/Capture.vcxproj

    r625 r626  
    9999      <SDLCheck>true</SDLCheck>
    100100      <ExceptionHandling>Async</ExceptionHandling>
    101     </ClCompile>
    102     <Link>
    103       <SubSystem>Console</SubSystem>
    104       <GenerateDebugInformation>true</GenerateDebugInformation>
    105     </Link>
     101      <AdditionalIncludeDirectories>.;alax.info</AdditionalIncludeDirectories>
     102    </ClCompile>
     103    <Link>
     104      <SubSystem>Console</SubSystem>
     105      <GenerateDebugInformation>true</GenerateDebugInformation>
     106    </Link>
     107    <ResourceCompile>
     108      <AdditionalIncludeDirectories>.;alax.info</AdditionalIncludeDirectories>
     109    </ResourceCompile>
    106110  </ItemDefinitionGroup>
    107111  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    … …  
    113117      <SDLCheck>true</SDLCheck>
    114118      <ExceptionHandling>Async</ExceptionHandling>
    115     </ClCompile>
    116     <Link>
    117       <SubSystem>Console</SubSystem>
    118       <GenerateDebugInformation>true</GenerateDebugInformation>
    119     </Link>
     119      <AdditionalIncludeDirectories>.;alax.info</AdditionalIncludeDirectories>
     120    </ClCompile>
     121    <Link>
     122      <SubSystem>Console</SubSystem>
     123      <GenerateDebugInformation>true</GenerateDebugInformation>
     124    </Link>
     125    <ResourceCompile>
     126      <AdditionalIncludeDirectories>.;alax.info</AdditionalIncludeDirectories>
     127    </ResourceCompile>
    120128  </ItemDefinitionGroup>
    121129  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    … …  
    135143      <ExceptionHandling>Async</ExceptionHandling>
    136144      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     145      <AdditionalIncludeDirectories>.;alax.info</AdditionalIncludeDirectories>
    137146    </ClCompile>
    138147    <Link>
    … …  
    142151      <OptimizeReferences>true</OptimizeReferences>
    143152    </Link>
     153    <ResourceCompile>
     154      <AdditionalIncludeDirectories>.;alax.info</AdditionalIncludeDirectories>
     155    </ResourceCompile>
    144156  </ItemDefinitionGroup>
    145157  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    … …  
    159171      <ExceptionHandling>Async</ExceptionHandling>
    160172      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     173      <AdditionalIncludeDirectories>.;alax.info</AdditionalIncludeDirectories>
    161174    </ClCompile>
    162175    <Link>
    … …  
    166179      <OptimizeReferences>true</OptimizeReferences>
    167180    </Link>
     181    <ResourceCompile>
     182      <AdditionalIncludeDirectories>.;alax.info</AdditionalIncludeDirectories>
     183    </ResourceCompile>
    168184  </ItemDefinitionGroup>
    169185  <ItemGroup>

  • trunk/Utilities/MediaFoundation/SimultaneousCapture/Module.h

    r625 r626  
    691691                AtlTraceSetDefaultSettings();
    692692                _Z4_THIS();
    693                 _W(CExceptionFilter::Initialize());
     693                //_W(CExceptionFilter::Initialize());
    694694                m_nBitrate = 0;
    695695                m_nDuration = 10;
    … …  
    698698        {
    699699                _Z4_THIS();
    700                 CExceptionFilter::Terminate();
     700                //CExceptionFilter::Terminate();
    701701        }
    702702        bool ParseCommandLine(LPCTSTR pszCommandLine, HRESULT* pnResult)
    … …  
    856856                _tprintf(_T("Path: %s\n"), Session.m_sPath);
    857857                CSessionT<CSecondaryVideoMediaType, CSecondaryAudioMediaType> SecondarySession;
    858                 SecondarySession.Initialize(
    859                         _T("\\\\?\\usb#vid_1908&pid_2311&mi_00#6&3694d24c&1&0000#{e5323777-f976-4f5b-9b55-b94699c46e44}\\global"), 0, // USB2.0 PC CAMERA
    860                         _T("{0.0.1.00000000}.{d7e99b5b-4d9b-437f-9f72-7adb7cdb2e1f}"), // Microphone (Realtek High Definition Audio)
    861                         AtlFormatString(_T("%s - Secondary.mp4"), Session.m_sPath));
     858//              SecondarySession.Initialize(
     859//                      _T("\\\\?\\usb#vid_1908&pid_2311&mi_00#6&3694d24c&1&0000#{e5323777-f976-4f5b-9b55-b94699c46e44}\\global"), 0, // USB2.0 PC CAMERA
     860//                      _T("{0.0.1.00000000}.{d7e99b5b-4d9b-437f-9f72-7adb7cdb2e1f}"), // Microphone (Realtek High Definition Audio)
     861//                      AtlFormatString(_T("%s - Secondary.mp4"), Session.m_sPath));
    862862                if(SecondarySession.m_pSinkWriter)
    863863                        _tprintf(_T("Secondary Path: %s\n"), SecondarySession.m_sPath);

  • trunk/Utilities/MediaFoundation/SimultaneousCapture/_Bin

    • Property svn:ignore

      •  

        old new  
        11Win32
         2x64

  • trunk/Utilities/MediaFoundation/SimultaneousCapture/stdafx.h

    r625 r626  
    7171#include "roatlpersist.h"
    7272#include "roatlmisc.h"
    73 #include "roatlexceptionfilter.h"
     73//#include "roatlexceptionfilter.h"
    7474#include "rowtlapp.h"
    7575#include "rofiles.h"
Note: See TracChangeset for help on using the changeset viewer.