Skip to content

Commit 99fceb1

Browse files
author
tnarine-amd
committed
AMF Version 1.4.7
1 parent 89c9edc commit 99fceb1

File tree

102 files changed

+20923
-289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+20923
-289
lines changed

‎README.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
AMF is a light-weight, portable multimedia framework that abstracts away most of the platform and API-specific details and allows for easy implementation of multimedia applications using a variety of technologies, such as DirectX 11, OpenGL, and OpenCL and facilitates an efficient interop between them.
44

5-
These features are a part of the initial 1.3 version of AMF.
6-
* Version 1.4 of the AMF SDK includes support for the H.265 encoder(HEVC) and bug fixes.
7-
* Version 1.4.4 has support for FFmpeg 3.3.1.
8-
* Version 1.4.6 has support for game dvr
5+
These features are a part of the initial 1.3 version of AMF. Version 1.4 of the AMF SDK includes support for the H.265 encoder(HEVC) and bug fixes. Version 1.4.4 has support for FFmpeg 3.3.1. Version 1.4.6 has support for game dvr. Version 1.4.7 has support for 360 video stitch.
96

107
<div>
118
<a href="https://github.com/GPUOpen-LibrariesAndSDKs/AMF/releases/latest/"><img src="http://gpuopen-librariesandsdks.github.io/media/latest-release-button.svg" alt="Latest release" title="Latest release"></a>
@@ -14,6 +11,7 @@ These features are a part of the initial 1.3 version of AMF.
1411
### Prerequisites
1512
* Windows&reg; 7 (SP1 with the [Platform Update](https://msdn.microsoft.com/en-us/library/windows/desktop/jj863687.aspx)), Windows&reg; 8.1, or Windows&reg; 10
1613
* Visual Studio&reg; 2013, Visual Studio&reg; 2015 or Visual Studio&reg; 2017
14+
* Version 1.4.7: AMD Radeon Software Adrenalin Edition 18.3.4 (17.50.33) or newer
1715
* Version 1.4.6: AMD Radeon Software Crimson Edition 17.12.1 (17.50.02) or newer
1816
* Version 1.4.4: AMD Radeon Software Crimson Edition 17.7.2 (17.30.1041) or newer
1917
* Version 1.4: AMD Radeon Software Crimson Edition 17.1.1 (16.50.2611) or newer

‎amf/doc/Readme.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
//
2929

3030
New features are available in
31-
Driver: Radeon Software Edition Crimson; 17.12.2 Software: 17.50 and later
31+
Driver: Radeon Software Adrenalin Edition 18.3.4 Software: 17.50 and later
32+
33+
1.4.7.0 (04.12.2018) version
34+
--------------------------
35+
- 360 video stitch sample
3236

3337
1.4.6.0 (11.30.2017) version
3438
--------------------------

‎amf/public/proj/vs2013/ComponentsFFMPEG/ComponentsFFMPEG.vcxproj‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
</ImportGroup>
6868
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
6969
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
70-
<Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
70+
<Import Project="..\..\..\..\public\props\AMF_VS2013.props" />
7171
</ImportGroup>
7272
<PropertyGroup Label="UserMacros" />
7373
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -85,25 +85,27 @@
8585
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8686
<LinkIncremental>false</LinkIncremental>
8787
<TargetName>amf-component-ffmpeg$(PlatformArchitecture)</TargetName>
88+
<OutDir>$(ProjectDir)..\..\..\..\bin\vs2013x$(PlatformArchitecture)$(Configuration)\</OutDir>
89+
<IntDir>$(ProjectDir)..\..\..\..\bin\obj\vs2013x$(PlatformArchitecture)$(Configuration)\$(ProjectName)\</IntDir>
8890
</PropertyGroup>
8991
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9092
<ClCompile>
9193
<PrecompiledHeader>NotUsing</PrecompiledHeader>
9294
<WarningLevel>Level3</WarningLevel>
9395
<Optimization>Disabled</Optimization>
9496
<PreprocessorDefinitions>WIN32;AMF_COMPONENT_FFMPEG_EXPORTS;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
95-
<AdditionalIncludeDirectories>$(SolutionDir)../../;$(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
97+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\;$(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9698
<ExceptionHandling>Async</ExceptionHandling>
9799
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
98100
</ClCompile>
99101
<Link>
100102
<SubSystem>Windows</SubSystem>
101103
<GenerateDebugInformation>true</GenerateDebugInformation>
102104
<AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;avresample.lib;%(AdditionalDependencies)</AdditionalDependencies>
103-
<AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\lib</AdditionalLibraryDirectories>
105+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\lib</AdditionalLibraryDirectories>
104106
</Link>
105107
<PreBuildEvent>
106-
<Command>xcopy /Y /R $(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\Release\bin\*.dll $(OutDir)</Command>
108+
<Command>xcopy /Y /R $(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\Release\bin\*.dll $(OutDir)</Command>
107109
</PreBuildEvent>
108110
<PreBuildEvent>
109111
<Message>Copying FFMPEG...</Message>
@@ -115,18 +117,18 @@
115117
<WarningLevel>Level3</WarningLevel>
116118
<Optimization>Disabled</Optimization>
117119
<PreprocessorDefinitions>WIN32;AMF_COMPONENT_FFMPEG_EXPORTS;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118-
<AdditionalIncludeDirectories>$(SolutionDir)../../;$(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
120+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\;$(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
119121
<ExceptionHandling>Async</ExceptionHandling>
120122
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
121123
</ClCompile>
122124
<Link>
123125
<SubSystem>Windows</SubSystem>
124126
<GenerateDebugInformation>true</GenerateDebugInformation>
125127
<AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;avresample.lib;%(AdditionalDependencies)</AdditionalDependencies>
126-
<AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\lib</AdditionalLibraryDirectories>
128+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\lib</AdditionalLibraryDirectories>
127129
</Link>
128130
<PreBuildEvent>
129-
<Command>xcopy /Y /R $(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\Release\bin\*.dll $(OutDir)</Command>
131+
<Command>xcopy /Y /R $(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\Release\bin\*.dll $(OutDir)</Command>
130132
</PreBuildEvent>
131133
<PreBuildEvent>
132134
<Message>Copying FFMPEG...</Message>
@@ -140,7 +142,7 @@
140142
<FunctionLevelLinking>true</FunctionLevelLinking>
141143
<IntrinsicFunctions>true</IntrinsicFunctions>
142144
<PreprocessorDefinitions>WIN32;AMF_COMPONENT_FFMPEG_EXPORTS;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
143-
<AdditionalIncludeDirectories>$(SolutionDir)../../;$(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
145+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\;$(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
144146
<ExceptionHandling>Async</ExceptionHandling>
145147
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
146148
</ClCompile>
@@ -150,10 +152,10 @@
150152
<EnableCOMDATFolding>true</EnableCOMDATFolding>
151153
<OptimizeReferences>true</OptimizeReferences>
152154
<AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;avresample.lib;%(AdditionalDependencies)</AdditionalDependencies>
153-
<AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\lib</AdditionalLibraryDirectories>
155+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\lib</AdditionalLibraryDirectories>
154156
</Link>
155157
<PreBuildEvent>
156-
<Command>xcopy /Y /R $(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\Release\bin\*.dll $(OutDir)</Command>
158+
<Command>xcopy /Y /R $(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\Release\bin\*.dll $(OutDir)</Command>
157159
</PreBuildEvent>
158160
<PreBuildEvent>
159161
<Message>Copying FFMPEG...</Message>
@@ -167,7 +169,7 @@
167169
<FunctionLevelLinking>true</FunctionLevelLinking>
168170
<IntrinsicFunctions>true</IntrinsicFunctions>
169171
<PreprocessorDefinitions>WIN32;AMF_COMPONENT_FFMPEG_EXPORTS;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
170-
<AdditionalIncludeDirectories>$(SolutionDir)../../;$(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
172+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\;$(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
171173
<ExceptionHandling>Async</ExceptionHandling>
172174
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
173175
</ClCompile>
@@ -177,10 +179,10 @@
177179
<EnableCOMDATFolding>true</EnableCOMDATFolding>
178180
<OptimizeReferences>true</OptimizeReferences>
179181
<AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;avresample.lib;%(AdditionalDependencies)</AdditionalDependencies>
180-
<AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\lib</AdditionalLibraryDirectories>
182+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\release\lib</AdditionalLibraryDirectories>
181183
</Link>
182184
<PreBuildEvent>
183-
<Command>xcopy /Y /R $(SolutionDir)..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\Release\bin\*.dll $(OutDir)</Command>
185+
<Command>xcopy /Y /R $(ProjectDir)..\..\..\..\..\Thirdparty\ffmpeg\ffmpeg-3.3.1\$(Platform)\Release\bin\*.dll $(OutDir)</Command>
184186
</PreBuildEvent>
185187
<PreBuildEvent>
186188
<Message>Copying FFMPEG...</Message>

0 commit comments

Comments
 (0)