Skip to content

Commit b66b5ac

Browse files
mzanatymzanaty
committed
Added interpolated reference frames, updated constrained low pass filter and smaller misc changes.
1 parent 1bbc861 commit b66b5ac

Some content is hidden

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

56 files changed

+7062
-3291
lines changed

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ COMMON_SOURCES = \
2525
common/inter_prediction.c \
2626
common/common_kernels.c \
2727
common/snr.c \
28-
common/simd.c
28+
common/simd.c \
29+
common/temporal_interp.c
2930

3031
ENCODER_SOURCES = \
3132
enc/encode_block.c \

‎build/Thor.sln‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 10.00
3-
# Visual Studio 2008
4-
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "THORenc", "enc\THORenc.icproj", "{2C761F44-937E-4C86-8086-B9BC76CF481E}"
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.23107.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ThorEnc", "ThorEnc\ThorEnc.vcxproj", "{5E9B8B8F-B656-4ADA-A4D4-DD36379BB8C9}"
57
EndProject
6-
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "THORdec", "dec\THORdec.icproj", "{5CAC3A62-2D5D-4A26-B17A-673A427E4CA8}"
8+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ThorDec", "ThorDec\ThorDec.vcxproj", "{3DEF2CEC-29EC-4579-8B6D-6B0DB75EC609}"
79
EndProject
810
Global
911
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10-
Debug|Win32 = Debug|Win32
11-
Release|Win32 = Release|Win32
12+
Debug|x64 = Debug|x64
13+
Debug|x86 = Debug|x86
14+
Release|x64 = Release|x64
15+
Release|x86 = Release|x86
1216
EndGlobalSection
1317
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{2C761F44-937E-4C86-8086-B9BC76CF481E}.Debug|Win32.ActiveCfg = Debug|Win32
15-
{2C761F44-937E-4C86-8086-B9BC76CF481E}.Debug|Win32.Build.0 = Debug|Win32
16-
{2C761F44-937E-4C86-8086-B9BC76CF481E}.Release|Win32.ActiveCfg = Release|Win32
17-
{2C761F44-937E-4C86-8086-B9BC76CF481E}.Release|Win32.Build.0 = Release|Win32
18-
{5CAC3A62-2D5D-4A26-B17A-673A427E4CA8}.Debug|Win32.ActiveCfg = Debug|Win32
19-
{5CAC3A62-2D5D-4A26-B17A-673A427E4CA8}.Debug|Win32.Build.0 = Debug|Win32
20-
{5CAC3A62-2D5D-4A26-B17A-673A427E4CA8}.Release|Win32.ActiveCfg = Release|Win32
21-
{5CAC3A62-2D5D-4A26-B17A-673A427E4CA8}.Release|Win32.Build.0 = Release|Win32
22-
{9F952487-2A1E-4B0A-A752-1E2CFE8D9595}.Release|Win32.Build.0 = Release|Win32
23-
{9F952487-2A1E-4B0A-A752-1E2CFE8D9595}.Release|Win32.ActiveCfg = Release|Win32
24-
{9F952487-2A1E-4B0A-A752-1E2CFE8D9595}.Debug|Win32.Build.0 = Debug|Win32
25-
{9F952487-2A1E-4B0A-A752-1E2CFE8D9595}.Debug|Win32.ActiveCfg = Debug|Win32
26-
{34F3703D-9DCB-42AD-9286-82BCE07F2D94}.Release|Win32.Build.0 = Release|Win32
27-
{34F3703D-9DCB-42AD-9286-82BCE07F2D94}.Release|Win32.ActiveCfg = Release|Win32
28-
{34F3703D-9DCB-42AD-9286-82BCE07F2D94}.Debug|Win32.Build.0 = Debug|Win32
29-
{34F3703D-9DCB-42AD-9286-82BCE07F2D94}.Debug|Win32.ActiveCfg = Debug|Win32
18+
{5E9B8B8F-B656-4ADA-A4D4-DD36379BB8C9}.Debug|x64.ActiveCfg = Debug|x64
19+
{5E9B8B8F-B656-4ADA-A4D4-DD36379BB8C9}.Debug|x64.Build.0 = Debug|x64
20+
{5E9B8B8F-B656-4ADA-A4D4-DD36379BB8C9}.Debug|x86.ActiveCfg = Debug|Win32
21+
{5E9B8B8F-B656-4ADA-A4D4-DD36379BB8C9}.Debug|x86.Build.0 = Debug|Win32
22+
{5E9B8B8F-B656-4ADA-A4D4-DD36379BB8C9}.Release|x64.ActiveCfg = Release|x64
23+
{5E9B8B8F-B656-4ADA-A4D4-DD36379BB8C9}.Release|x64.Build.0 = Release|x64
24+
{5E9B8B8F-B656-4ADA-A4D4-DD36379BB8C9}.Release|x86.ActiveCfg = Release|Win32
25+
{5E9B8B8F-B656-4ADA-A4D4-DD36379BB8C9}.Release|x86.Build.0 = Release|Win32
26+
{3DEF2CEC-29EC-4579-8B6D-6B0DB75EC609}.Debug|x64.ActiveCfg = Debug|x64
27+
{3DEF2CEC-29EC-4579-8B6D-6B0DB75EC609}.Debug|x64.Build.0 = Debug|x64
28+
{3DEF2CEC-29EC-4579-8B6D-6B0DB75EC609}.Debug|x86.ActiveCfg = Debug|Win32
29+
{3DEF2CEC-29EC-4579-8B6D-6B0DB75EC609}.Debug|x86.Build.0 = Debug|Win32
30+
{3DEF2CEC-29EC-4579-8B6D-6B0DB75EC609}.Release|x64.ActiveCfg = Release|x64
31+
{3DEF2CEC-29EC-4579-8B6D-6B0DB75EC609}.Release|x64.Build.0 = Release|x64
32+
{3DEF2CEC-29EC-4579-8B6D-6B0DB75EC609}.Release|x86.ActiveCfg = Release|Win32
33+
{3DEF2CEC-29EC-4579-8B6D-6B0DB75EC609}.Release|x86.Build.0 = Release|Win32
3034
EndGlobalSection
3135
GlobalSection(SolutionProperties) = preSolution
3236
HideSolutionNode = FALSE

‎build/ThorDec/ThorDec.vcxproj‎

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|x64">
13+
<Configuration>Debug</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<ItemGroup>
22+
<ClCompile Include="..\..\common\common_block.c" />
23+
<ClCompile Include="..\..\common\common_frame.c" />
24+
<ClCompile Include="..\..\common\common_kernels.c" />
25+
<ClCompile Include="..\..\common\inter_prediction.c" />
26+
<ClCompile Include="..\..\common\intra_prediction.c" />
27+
<ClCompile Include="..\..\common\simd.c" />
28+
<ClCompile Include="..\..\common\snr.c" />
29+
<ClCompile Include="..\..\common\temporal_interp.c" />
30+
<ClCompile Include="..\..\common\transform.c" />
31+
<ClCompile Include="..\..\dec\decode_block.c" />
32+
<ClCompile Include="..\..\dec\decode_frame.c" />
33+
<ClCompile Include="..\..\dec\getbits.c" />
34+
<ClCompile Include="..\..\dec\getvlc.c" />
35+
<ClCompile Include="..\..\dec\maindec.c" />
36+
<ClCompile Include="..\..\dec\read_bits.c" />
37+
</ItemGroup>
38+
<ItemGroup>
39+
<ClInclude Include="..\..\common\common_block.h" />
40+
<ClInclude Include="..\..\common\common_frame.h" />
41+
<ClInclude Include="..\..\common\common_kernels.h" />
42+
<ClInclude Include="..\..\common\global.h" />
43+
<ClInclude Include="..\..\common\inter_prediction.h" />
44+
<ClInclude Include="..\..\common\intra_prediction.h" />
45+
<ClInclude Include="..\..\common\simd.h" />
46+
<ClInclude Include="..\..\common\snr.h" />
47+
<ClInclude Include="..\..\common\temporal_interp.h" />
48+
<ClInclude Include="..\..\common\transform.h" />
49+
<ClInclude Include="..\..\common\types.h" />
50+
<ClInclude Include="..\..\dec\decode_block.h" />
51+
<ClInclude Include="..\..\dec\decode_frame.h" />
52+
<ClInclude Include="..\..\dec\getbits.h" />
53+
<ClInclude Include="..\..\dec\getvlc.h" />
54+
<ClInclude Include="..\..\dec\maindec.h" />
55+
<ClInclude Include="..\..\dec\read_bits.h" />
56+
</ItemGroup>
57+
<PropertyGroup Label="Globals">
58+
<ProjectGuid>{3DEF2CEC-29EC-4579-8B6D-6B0DB75EC609}</ProjectGuid>
59+
<RootNamespace>ThorDec</RootNamespace>
60+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
61+
</PropertyGroup>
62+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
63+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
64+
<ConfigurationType>Application</ConfigurationType>
65+
<UseDebugLibraries>true</UseDebugLibraries>
66+
<PlatformToolset>v140</PlatformToolset>
67+
<CharacterSet>MultiByte</CharacterSet>
68+
</PropertyGroup>
69+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
70+
<ConfigurationType>Application</ConfigurationType>
71+
<UseDebugLibraries>false</UseDebugLibraries>
72+
<PlatformToolset>v140</PlatformToolset>
73+
<WholeProgramOptimization>true</WholeProgramOptimization>
74+
<CharacterSet>MultiByte</CharacterSet>
75+
</PropertyGroup>
76+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
77+
<ConfigurationType>Application</ConfigurationType>
78+
<UseDebugLibraries>true</UseDebugLibraries>
79+
<PlatformToolset>v140</PlatformToolset>
80+
<CharacterSet>MultiByte</CharacterSet>
81+
</PropertyGroup>
82+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
83+
<ConfigurationType>Application</ConfigurationType>
84+
<UseDebugLibraries>false</UseDebugLibraries>
85+
<PlatformToolset>v140</PlatformToolset>
86+
<WholeProgramOptimization>true</WholeProgramOptimization>
87+
<CharacterSet>MultiByte</CharacterSet>
88+
</PropertyGroup>
89+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
90+
<ImportGroup Label="ExtensionSettings">
91+
</ImportGroup>
92+
<ImportGroup Label="Shared">
93+
</ImportGroup>
94+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
95+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
96+
</ImportGroup>
97+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
98+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
99+
</ImportGroup>
100+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
101+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
102+
</ImportGroup>
103+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
104+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
105+
</ImportGroup>
106+
<PropertyGroup Label="UserMacros" />
107+
<PropertyGroup />
108+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
109+
<ClCompile>
110+
<WarningLevel>Level3</WarningLevel>
111+
<Optimization>Disabled</Optimization>
112+
<SDLCheck>true</SDLCheck>
113+
<AdditionalIncludeDirectories>..\..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
114+
<PreprocessorDefinitions>VS_2015;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
115+
</ClCompile>
116+
<Link>
117+
<GenerateDebugInformation>true</GenerateDebugInformation>
118+
</Link>
119+
</ItemDefinitionGroup>
120+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
121+
<ClCompile>
122+
<WarningLevel>Level3</WarningLevel>
123+
<Optimization>Disabled</Optimization>
124+
<SDLCheck>true</SDLCheck>
125+
<AdditionalIncludeDirectories>..\..\common</AdditionalIncludeDirectories>
126+
<PreprocessorDefinitions>_MBCS;VS_2015;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
127+
</ClCompile>
128+
<Link>
129+
<GenerateDebugInformation>true</GenerateDebugInformation>
130+
</Link>
131+
</ItemDefinitionGroup>
132+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
133+
<ClCompile>
134+
<WarningLevel>Level3</WarningLevel>
135+
<Optimization>MaxSpeed</Optimization>
136+
<FunctionLevelLinking>true</FunctionLevelLinking>
137+
<IntrinsicFunctions>true</IntrinsicFunctions>
138+
<SDLCheck>true</SDLCheck>
139+
<AdditionalIncludeDirectories>..\..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
140+
<PreprocessorDefinitions>VS_2015;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
141+
</ClCompile>
142+
<Link>
143+
<GenerateDebugInformation>true</GenerateDebugInformation>
144+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
145+
<OptimizeReferences>true</OptimizeReferences>
146+
</Link>
147+
</ItemDefinitionGroup>
148+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
149+
<ClCompile>
150+
<WarningLevel>Level3</WarningLevel>
151+
<Optimization>MaxSpeed</Optimization>
152+
<FunctionLevelLinking>true</FunctionLevelLinking>
153+
<IntrinsicFunctions>true</IntrinsicFunctions>
154+
<SDLCheck>true</SDLCheck>
155+
<AdditionalIncludeDirectories>..\..\common</AdditionalIncludeDirectories>
156+
<PreprocessorDefinitions>_MBCS;VS_2015;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
157+
</ClCompile>
158+
<Link>
159+
<GenerateDebugInformation>true</GenerateDebugInformation>
160+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
161+
<OptimizeReferences>true</OptimizeReferences>
162+
</Link>
163+
</ItemDefinitionGroup>
164+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
165+
<ImportGroup Label="ExtensionTargets">
166+
</ImportGroup>
167+
</Project>

‎build/ThorDec/ThorDec.vcxproj.filters‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Source Files">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="Header Files">
9+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
11+
</Filter>
12+
<Filter Include="Resource Files">
13+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15+
</Filter>
16+
</ItemGroup>
17+
<ItemGroup>
18+
<ClCompile Include="..\..\dec\decode_block.c">
19+
<Filter>Source Files</Filter>
20+
</ClCompile>
21+
<ClCompile Include="..\..\dec\decode_frame.c">
22+
<Filter>Source Files</Filter>
23+
</ClCompile>
24+
<ClCompile Include="..\..\dec\getbits.c">
25+
<Filter>Source Files</Filter>
26+
</ClCompile>
27+
<ClCompile Include="..\..\dec\getvlc.c">
28+
<Filter>Source Files</Filter>
29+
</ClCompile>
30+
<ClCompile Include="..\..\dec\maindec.c">
31+
<Filter>Source Files</Filter>
32+
</ClCompile>
33+
<ClCompile Include="..\..\dec\read_bits.c">
34+
<Filter>Source Files</Filter>
35+
</ClCompile>
36+
<ClCompile Include="..\..\common\common_block.c">
37+
<Filter>Source Files</Filter>
38+
</ClCompile>
39+
<ClCompile Include="..\..\common\common_frame.c">
40+
<Filter>Source Files</Filter>
41+
</ClCompile>
42+
<ClCompile Include="..\..\common\common_kernels.c">
43+
<Filter>Source Files</Filter>
44+
</ClCompile>
45+
<ClCompile Include="..\..\common\inter_prediction.c">
46+
<Filter>Source Files</Filter>
47+
</ClCompile>
48+
<ClCompile Include="..\..\common\intra_prediction.c">
49+
<Filter>Source Files</Filter>
50+
</ClCompile>
51+
<ClCompile Include="..\..\common\simd.c">
52+
<Filter>Source Files</Filter>
53+
</ClCompile>
54+
<ClCompile Include="..\..\common\snr.c">
55+
<Filter>Source Files</Filter>
56+
</ClCompile>
57+
<ClCompile Include="..\..\common\temporal_interp.c">
58+
<Filter>Source Files</Filter>
59+
</ClCompile>
60+
<ClCompile Include="..\..\common\transform.c">
61+
<Filter>Source Files</Filter>
62+
</ClCompile>
63+
</ItemGroup>
64+
<ItemGroup>
65+
<ClInclude Include="..\..\dec\decode_block.h">
66+
<Filter>Header Files</Filter>
67+
</ClInclude>
68+
<ClInclude Include="..\..\dec\decode_frame.h">
69+
<Filter>Header Files</Filter>
70+
</ClInclude>
71+
<ClInclude Include="..\..\dec\getbits.h">
72+
<Filter>Header Files</Filter>
73+
</ClInclude>
74+
<ClInclude Include="..\..\dec\getvlc.h">
75+
<Filter>Header Files</Filter>
76+
</ClInclude>
77+
<ClInclude Include="..\..\dec\maindec.h">
78+
<Filter>Header Files</Filter>
79+
</ClInclude>
80+
<ClInclude Include="..\..\dec\read_bits.h">
81+
<Filter>Header Files</Filter>
82+
</ClInclude>
83+
<ClInclude Include="..\..\common\common_block.h">
84+
<Filter>Header Files</Filter>
85+
</ClInclude>
86+
<ClInclude Include="..\..\common\common_frame.h">
87+
<Filter>Header Files</Filter>
88+
</ClInclude>
89+
<ClInclude Include="..\..\common\common_kernels.h">
90+
<Filter>Header Files</Filter>
91+
</ClInclude>
92+
<ClInclude Include="..\..\common\global.h">
93+
<Filter>Header Files</Filter>
94+
</ClInclude>
95+
<ClInclude Include="..\..\common\inter_prediction.h">
96+
<Filter>Header Files</Filter>
97+
</ClInclude>
98+
<ClInclude Include="..\..\common\intra_prediction.h">
99+
<Filter>Header Files</Filter>
100+
</ClInclude>
101+
<ClInclude Include="..\..\common\simd.h">
102+
<Filter>Header Files</Filter>
103+
</ClInclude>
104+
<ClInclude Include="..\..\common\snr.h">
105+
<Filter>Header Files</Filter>
106+
</ClInclude>
107+
<ClInclude Include="..\..\common\temporal_interp.h">
108+
<Filter>Header Files</Filter>
109+
</ClInclude>
110+
<ClInclude Include="..\..\common\transform.h">
111+
<Filter>Header Files</Filter>
112+
</ClInclude>
113+
<ClInclude Include="..\..\common\types.h">
114+
<Filter>Header Files</Filter>
115+
</ClInclude>
116+
</ItemGroup>
117+
</Project>

0 commit comments

Comments
 (0)