Changeset 594 for trunk/Utilities/FFmpeg


Ignore:
Timestamp:
Feb 28, 2016, 5:11:22 AM (8 years ago)
Author:
roman
Message:
 
Location:
trunk/Utilities/FFmpeg/DecodeMpeg4Video02
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Utilities/FFmpeg/DecodeMpeg4Video02/Application.cpp

    r593 r594  
    116116                return pnDestinationDataPointer - pnDestinationData;
    117117        }
    118         static INT CompareMediaSampleFileNames(LPCTSTR pszNameA, LPCTSTR pszNameB, INT)
     118        static INT_PTR CompareMediaSampleFileNames(LPCTSTR pszNameA, LPCTSTR pszNameB, INT)
    119119        {
    120120                return _tcscmp(pszNameA, pszNameB);
    … …  
    223223                                        A += 5;
    224224                                        BYTE* pnSequenceParameterSetCount = A++;
    225                                         *pnSequenceParameterSetCount = 0xE0 | SpsBlobList.GetCount();
     225                                        *pnSequenceParameterSetCount = 0xE0 | (BYTE) SpsBlobList.GetCount();
    226226                                        for(auto&& pSpsBlob: SpsBlobList)
    227227                                        {
    … …  
    232232                                        }
    233233                                        BYTE* pnPictureParameterSetCount = A++;
    234                                         *pnPictureParameterSetCount = 0x00 | PpsBlobList.GetCount();
     234                                        *pnPictureParameterSetCount = 0x00 | (BYTE) PpsBlobList.GetCount();
    235235                                        for(auto&& pPpsBlob: PpsBlobList)
    236236                                        {
    … …  
    310310                        AvPacket.dts = AV_NOPTS_VALUE;
    311311                        AvPacket.pts = AV_NOPTS_VALUE;
    312                         DWORD nDataSize;
     312                        SIZE_T nDataSize;
    313313                        const BOOL bFrameAvailable = pAvCodecContext.DecodeVideo(pAvFrame, &AvPacket, nDataSize);
    314314                        _A(!nDataSize);
    315                         if(bFrameAvailable)
    316                                 ProcessFrame(pAvFrame);
     315                        if(!bFrameAvailable)
     316                                break;
     317                        ProcessFrame(pAvFrame);
    317318                }
    318319        }

  • trunk/Utilities/FFmpeg/DecodeMpeg4Video02/DecodeMpeg4Video02.sln

    r591 r594  
    11
    2 Microsoft Visual Studio Solution File, Format Version 11.00
    3 # Visual Studio 2012
     2Microsoft Visual Studio Solution File, Format Version 12.00
     3# Visual Studio 2013
    44Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DecodeMpeg4Video02", "DecodeMpeg4Video02.vcxproj", "{7F308D39-6E31-4021-AF44-036A37ABE53A}"
    55EndProject
    … …  
    77        GlobalSection(SolutionConfigurationPlatforms) = preSolution
    88                Debug|Win32 = Debug|Win32
     9                Debug|x64 = Debug|x64
    910                Release|Win32 = Release|Win32
     11                Release|x64 = Release|x64
    1012        EndGlobalSection
    1113        GlobalSection(ProjectConfigurationPlatforms) = postSolution
    1214                {7F308D39-6E31-4021-AF44-036A37ABE53A}.Debug|Win32.ActiveCfg = Debug|Win32
    1315                {7F308D39-6E31-4021-AF44-036A37ABE53A}.Debug|Win32.Build.0 = Debug|Win32
     16                {7F308D39-6E31-4021-AF44-036A37ABE53A}.Debug|x64.ActiveCfg = Debug|x64
     17                {7F308D39-6E31-4021-AF44-036A37ABE53A}.Debug|x64.Build.0 = Debug|x64
    1418                {7F308D39-6E31-4021-AF44-036A37ABE53A}.Release|Win32.ActiveCfg = Release|Win32
    1519                {7F308D39-6E31-4021-AF44-036A37ABE53A}.Release|Win32.Build.0 = Release|Win32
     20                {7F308D39-6E31-4021-AF44-036A37ABE53A}.Release|x64.ActiveCfg = Release|x64
     21                {7F308D39-6E31-4021-AF44-036A37ABE53A}.Release|x64.Build.0 = Release|x64
    1622        EndGlobalSection
    1723        GlobalSection(SolutionProperties) = preSolution

  • trunk/Utilities/FFmpeg/DecodeMpeg4Video02/DecodeMpeg4Video02.vcxproj

    r591 r594  
    66      <Platform>Win32</Platform>
    77    </ProjectConfiguration>
     8    <ProjectConfiguration Include="Debug|x64">
     9      <Configuration>Debug</Configuration>
     10      <Platform>x64</Platform>
     11    </ProjectConfiguration>
    812    <ProjectConfiguration Include="Release|Win32">
    913      <Configuration>Release</Configuration>
    1014      <Platform>Win32</Platform>
     15    </ProjectConfiguration>
     16    <ProjectConfiguration Include="Release|x64">
     17      <Configuration>Release</Configuration>
     18      <Platform>x64</Platform>
    1119    </ProjectConfiguration>
    1220  </ItemGroup>
    … …  
    2432    <PlatformToolset>v120</PlatformToolset>
    2533  </PropertyGroup>
     34  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     35    <ConfigurationType>Application</ConfigurationType>
     36    <UseDebugLibraries>true</UseDebugLibraries>
     37    <CharacterSet>Unicode</CharacterSet>
     38    <PlatformToolset>v120</PlatformToolset>
     39  </PropertyGroup>
    2640  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     41    <ConfigurationType>Application</ConfigurationType>
     42    <UseDebugLibraries>false</UseDebugLibraries>
     43    <WholeProgramOptimization>true</WholeProgramOptimization>
     44    <CharacterSet>Unicode</CharacterSet>
     45    <PlatformToolset>v120</PlatformToolset>
     46  </PropertyGroup>
     47  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    2748    <ConfigurationType>Application</ConfigurationType>
    2849    <UseDebugLibraries>false</UseDebugLibraries>
    … …  
    3758    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    3859  </ImportGroup>
     60  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     61    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     62  </ImportGroup>
    3963  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     64    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     65  </ImportGroup>
     66  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    4067    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    4168  </ImportGroup>
    … …  
    4673    <IntDir>$(SolutionDir)..\_Bin\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
    4774  </PropertyGroup>
     75  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     76    <LinkIncremental>true</LinkIncremental>
     77    <OutDir>$(SolutionDir)..\_Bin\$(PlatformName)\$(Configuration)\</OutDir>
     78    <IntDir>$(SolutionDir)..\_Bin\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
     79  </PropertyGroup>
    4880  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     81    <LinkIncremental>false</LinkIncremental>
     82    <OutDir>$(SolutionDir)..\_Bin\$(PlatformName)\$(Configuration)\</OutDir>
     83    <IntDir>$(SolutionDir)..\_Bin\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
     84  </PropertyGroup>
     85  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    4986    <LinkIncremental>false</LinkIncremental>
    5087    <OutDir>$(SolutionDir)..\_Bin\$(PlatformName)\$(Configuration)\</OutDir>
    … …  
    5895      <Optimization>Disabled</Optimization>
    5996      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    60       <AdditionalIncludeDirectories>.;..\zeranoe.com\dev\include</AdditionalIncludeDirectories>
     97      <AdditionalIncludeDirectories>.;..\zeranoe.com\dev\include-;..\private-msvc\$(PlatformName)\include</AdditionalIncludeDirectories>
     98      <ExceptionHandling>Async</ExceptionHandling>
    6199    </ClCompile>
    62100    <Link>
    63101      <SubSystem>Console</SubSystem>
    64102      <GenerateDebugInformation>true</GenerateDebugInformation>
    65       <AdditionalLibraryDirectories>.;..\zeranoe.com\dev\lib</AdditionalLibraryDirectories>
     103      <AdditionalLibraryDirectories>.;..\zeranoe.com\dev\lib-;..\private-msvc\$(PlatformName)\lib</AdditionalLibraryDirectories>
     104    </Link>
     105  </ItemDefinitionGroup>
     106  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     107    <ClCompile>
     108      <PrecompiledHeader>
     109      </PrecompiledHeader>
     110      <WarningLevel>Level3</WarningLevel>
     111      <Optimization>Disabled</Optimization>
     112      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     113      <AdditionalIncludeDirectories>.;..\zeranoe.com\dev\include-;..\private-msvc\$(PlatformName)\include</AdditionalIncludeDirectories>
     114      <ExceptionHandling>Async</ExceptionHandling>
     115    </ClCompile>
     116    <Link>
     117      <SubSystem>Console</SubSystem>
     118      <GenerateDebugInformation>true</GenerateDebugInformation>
     119      <AdditionalLibraryDirectories>.;..\zeranoe.com\dev\lib-;..\private-msvc\$(PlatformName)\lib</AdditionalLibraryDirectories>
    66120    </Link>
    67121  </ItemDefinitionGroup>
    … …  
    75129      <IntrinsicFunctions>true</IntrinsicFunctions>
    76130      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    77       <AdditionalIncludeDirectories>.;..\zeranoe.com\dev\include</AdditionalIncludeDirectories>
     131      <AdditionalIncludeDirectories>.;..\zeranoe.com\dev\include-;..\private-msvc\$(PlatformName)\include</AdditionalIncludeDirectories>
    78132      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
    79133      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
    … …  
    82136      <StringPooling>true</StringPooling>
    83137      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     138      <ExceptionHandling>Async</ExceptionHandling>
    84139    </ClCompile>
    85140    <Link>
    … …  
    88143      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    89144      <OptimizeReferences>true</OptimizeReferences>
    90       <AdditionalLibraryDirectories>.;..\zeranoe.com\dev\lib</AdditionalLibraryDirectories>
     145      <AdditionalLibraryDirectories>.;..\zeranoe.com\dev\lib-;..\private-msvc\$(PlatformName)\lib</AdditionalLibraryDirectories>
     146    </Link>
     147  </ItemDefinitionGroup>
     148  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     149    <ClCompile>
     150      <WarningLevel>Level3</WarningLevel>
     151      <PrecompiledHeader>
     152      </PrecompiledHeader>
     153      <Optimization>Full</Optimization>
     154      <FunctionLevelLinking>true</FunctionLevelLinking>
     155      <IntrinsicFunctions>true</IntrinsicFunctions>
     156      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     157      <AdditionalIncludeDirectories>.;..\zeranoe.com\dev\include-;..\private-msvc\$(PlatformName)\include</AdditionalIncludeDirectories>
     158      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
     159      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
     160      <OmitFramePointers>true</OmitFramePointers>
     161      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
     162      <StringPooling>true</StringPooling>
     163      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     164      <ExceptionHandling>Async</ExceptionHandling>
     165    </ClCompile>
     166    <Link>
     167      <SubSystem>Console</SubSystem>
     168      <GenerateDebugInformation>true</GenerateDebugInformation>
     169      <EnableCOMDATFolding>true</EnableCOMDATFolding>
     170      <OptimizeReferences>true</OptimizeReferences>
     171      <AdditionalLibraryDirectories>.;..\zeranoe.com\dev\lib-;..\private-msvc\$(PlatformName)\lib</AdditionalLibraryDirectories>
    91172    </Link>
    92173  </ItemDefinitionGroup>
Note: See TracChangeset for help on using the changeset viewer.