Skip to content

Commit 3a65349

Browse files
simonbuehlersimonbuehler
committed
Merge remote-tracking branch 'upstream/master'
# Conflicts: # Hudl.FFmpeg/Hudl.Ffmpeg.csproj
2 parents 141d831 + 1e8e66d commit 3a65349

28 files changed

+229
-1079
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ bin/
44
obj/
55
Bin/
66
Obj/
7+
.vs/
78
hudl-jobs/Quartz.NET-1.0.2/build/
89
WebApp/WebApp.Publish.xml
910
ProTools/Pro Quagic/obj/*

‎Hudl.FFmpeg.Core/Hudl.FFmpeg.Core.csproj

+22-150
Original file line numberDiff line numberDiff line change
@@ -1,155 +1,27 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{FA5D683B-0EEA-4086-B71D-88A8360AE8F0}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>Hudl.FFmpeg</RootNamespace>
11-
<AssemblyName>Hudl.FFmpeg.Core</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
15-
<RestorePackages>true</RestorePackages>
16-
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18-
<DebugSymbols>true</DebugSymbols>
4+
<VersionPrefix>7.0.0</VersionPrefix>
5+
<FileVersion>7.0.0</FileVersion>
6+
<!-- The AssemblyVersion should only be updated on a Major version bump -->
7+
<AssemblyVersion>2.0.0.0</AssemblyVersion>
8+
<TargetFramework>netstandard2.0</TargetFramework>
199
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>pdbonly</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>TRACE</DefineConstants>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
10+
<AssemblyName>Hudl.FFmpeg.Core</AssemblyName>
11+
<PackageId>Hudl.FFmpeg.Core</PackageId>
12+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
13+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
14+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
15+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
16+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
17+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
18+
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
19+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
20+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
3321
</PropertyGroup>
22+
3423
<ItemGroup>
35-
<Reference Include="log4net">
36-
<HintPath>..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
37-
</Reference>
38-
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Newtonsoft.Json.5.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
40-
<Private>True</Private>
41-
</Reference>
42-
<Reference Include="System" />
43-
<Reference Include="System.Core" />
44-
<Reference Include="System.Drawing" />
45-
<Reference Include="System.Xml.Linq" />
46-
<Reference Include="System.Data.DataSetExtensions" />
47-
<Reference Include="Microsoft.CSharp" />
48-
<Reference Include="System.Data" />
49-
<Reference Include="System.Xml" />
50-
</ItemGroup>
51-
<ItemGroup>
52-
<Compile Include="Attributes\AttributeRetrieval.cs" />
53-
<Compile Include="Attributes\AttributeValidation.cs" />
54-
<Compile Include="Attributes\ContainsStreamAttribute.cs" />
55-
<Compile Include="Attributes\SerializedAsAttribute.cs" />
56-
<Compile Include="Attributes\Utility\ValidationUtility.cs" />
57-
<Compile Include="Attributes\ValidateAttribute.cs" />
58-
<Compile Include="Attributes\ForStreamAttribute.cs" />
59-
<Compile Include="Collections\ForStreamCollection.cs" />
60-
<Compile Include="Command\StreamReaders\BaseStandardStreamReader.cs" />
61-
<Compile Include="Command\StreamReaders\StandardOutputAsyncStreamReader.cs" />
62-
<Compile Include="Command\StreamReaders\StandardErrorAsyncStreamReader.cs" />
63-
<Compile Include="Enums\FfmpegMergeOptionType.cs" />
64-
<Compile Include="Enums\SettingsCollectionResourceType.cs" />
65-
<Compile Include="Exceptions\FfmpegTimeoutException.cs" />
66-
<Compile Include="Exceptions\FfmpegProcessingException.cs" />
67-
<Compile Include="Exceptions\FfmpegRenderingException.cs" />
68-
<Compile Include="Exceptions\ForStreamInvalidException.cs" />
69-
<Compile Include="Exceptions\StreamNotFoundException.cs" />
70-
<Compile Include="Command\BaseTypes\CommandConfigurationFlagTypes.cs" />
71-
<Compile Include="Command\BaseTypes\ICommandBuilder.cs" />
72-
<Compile Include="Command\CommandConfiguration.cs" />
73-
<Compile Include="Command\CommandProcessorStatus.cs" />
74-
<Compile Include="Command\Models\FFCommandBase.cs" />
75-
<Compile Include="Command\BaseTypes\ICommandFactory.cs" />
76-
<Compile Include="Command\BaseTypes\ICommand.cs" />
77-
<Compile Include="Command\BaseTypes\ICommandProcessor.cs" />
78-
<Compile Include="Command\Models\FFCommandBuilderBase.cs" />
79-
<Compile Include="Command\Models\FFmpegCommandBuilder.cs" />
80-
<Compile Include="DataTypes\DecimalScale.cs" />
81-
<Compile Include="DataTypes\DecimalScaleRgb.cs" />
82-
<Compile Include="DataTypes\Fraction.cs" />
83-
<Compile Include="DataTypes\Ratio.cs" />
84-
<Compile Include="DataTypes\TwoPartNumericalBase.cs" />
85-
<Compile Include="Enums\LogicalOperators.cs" />
86-
<Compile Include="Extensions\ArrayExtensions.cs" />
87-
<Compile Include="Extensions\ObjectExtensions.cs" />
88-
<Compile Include="Extensions\ProcessExtensions.cs" />
89-
<Compile Include="Extensions\TimeSpanExtensions.cs" />
90-
<Compile Include="Filters\Attributes\FilterAttribute.cs" />
91-
<Compile Include="Filters\Attributes\FilterParameterAttribute.cs" />
92-
<Compile Include="Filters\Contexts\FilterBindingContext.cs" />
93-
<Compile Include="Filters\Contexts\FilterMultiOutputContext.cs" />
94-
<Compile Include="Filters\Contexts\FilterProcessorContext.cs" />
95-
<Compile Include="Filters\Contexts\FilterValidatorContext.cs" />
96-
<Compile Include="Filters\Interfaces\IFilterchain.cs" />
97-
<Compile Include="Filters\Interfaces\IFilter.cs" />
98-
<Compile Include="Filters\Interfaces\IFilterMultiOutput.cs" />
99-
<Compile Include="Filters\Interfaces\IFilterParameterBinding.cs" />
100-
<Compile Include="Filters\Interfaces\IFilterProcessor.cs" />
101-
<Compile Include="Filters\Interfaces\IFilterValidator.cs" />
102-
<Compile Include="Filters\Serialization\FilterSerializerWriter.cs" />
103-
<Compile Include="Filters\Serialization\FilterSerializer.cs" />
104-
<Compile Include="Filters\Serialization\FilterSerializerAttributeParser.cs" />
105-
<Compile Include="Filters\Serialization\FilterSerializerDataParameter.cs" />
106-
<Compile Include="Filters\Serialization\FilterSerializerData.cs" />
107-
<Compile Include="Formatters\BoolToInt32Formatter.cs" />
108-
<Compile Include="Formatters\EnumParameterFormatter.cs" />
109-
<Compile Include="Formatters\EnumParameterSlashFormatter.cs" />
110-
<Compile Include="Formatters\Int32ToKbs.cs" />
111-
<Compile Include="Formatters\MapSettingsFormatter.cs" />
112-
<Compile Include="Formatters\RatioFractionalStringFormatter.cs" />
113-
<Compile Include="Formatters\RatioStringFormatter.cs" />
114-
<Compile Include="Formatters\SingleQuoteFormatter.cs" />
115-
<Compile Include="Formatters\SizeFormatter.cs" />
116-
<Compile Include="Formatters\SizeHeightFormatter.cs" />
117-
<Compile Include="Formatters\SizeWidthFormatter.cs" />
118-
<Compile Include="Formatters\TimeSpanFormatter.cs" />
119-
<Compile Include="Formatters\Utility\FormattingUtility.cs" />
120-
<Compile Include="Interfaces\IValidator.cs" />
121-
<Compile Include="Interfaces\IFormatter.cs" />
122-
<Compile Include="Logging\LogUtility.cs" />
123-
<Compile Include="Properties\AssemblyInfo.cs" />
124-
<Compile Include="ResourceManagement.cs" />
125-
<Compile Include="Resources\Interfaces\IContainer.cs" />
126-
<Compile Include="Resources\Interfaces\IStream.cs" />
127-
<Compile Include="Settings\Attributes\SettingParameterAttribute.cs" />
128-
<Compile Include="Settings\Attributes\SettingAttribute.cs" />
129-
<Compile Include="Formatters\LocalUriFormatterNoWrap.cs" />
130-
<Compile Include="Formatters\LocalUriFormatter.cs" />
131-
<Compile Include="Settings\Interfaces\ISetting.cs" />
132-
<Compile Include="Settings\Input.cs" />
133-
<Compile Include="Settings\Serialization\SettingSerializerDataValue.cs" />
134-
<Compile Include="Settings\Serialization\SettingSerializer.cs" />
135-
<Compile Include="Settings\Serialization\SettingSerializerAttributeParser.cs" />
136-
<Compile Include="Settings\Serialization\SettingSerializerData.cs" />
137-
<Compile Include="Settings\Serialization\SettingSerializerWriter.cs" />
138-
<Compile Include="Settings\Extensions\SettingsExtensions.cs" />
139-
<Compile Include="Validators\TimeSpanGreterThanZeroValidator.cs" />
140-
<Compile Include="Validators\NullOrWhitespaceValidator.cs" />
141-
</ItemGroup>
142-
<ItemGroup />
143-
<ItemGroup>
144-
<None Include="packages.config" />
24+
<PackageReference Include="log4net" Version="2.0.8" />
14525
</ItemGroup>
146-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
147-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
148-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
149-
Other similar extension points exist, see Microsoft.Common.targets.
150-
<Target Name="BeforeBuild">
151-
</Target>
152-
<Target Name="AfterBuild">
153-
</Target>
154-
-->
155-
</Project>
26+
27+
</Project>

‎Hudl.FFmpeg.Core/Logging/LogUtility.cs

+3-8
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ public class LogUtility
99
{
1010
private readonly ILog _log;
1111

12-
private LogUtility(string loggerName)
12+
private LogUtility(Type loggerType)
1313
{
14-
_log = LogManager.GetLogger(loggerName);
14+
_log = LogManager.GetLogger(loggerType);
1515
LogAttributes = new Dictionary<string, string>();
1616

1717
}
@@ -79,14 +79,9 @@ private Dictionary<string, string> GetLogMessage(string message)
7979
};
8080
}
8181

82-
public static LogUtility GetLogger(string loggerName)
83-
{
84-
return new LogUtility(loggerName);
85-
}
86-
8782
public static LogUtility GetLogger(Type loggerType)
8883
{
89-
return new LogUtility(loggerType.Name);
84+
return new LogUtility(loggerType);
9085
}
9186

9287
private static string JoinDictionary(Dictionary<string, string> dict)

‎Hudl.FFmpeg.Core/Properties/AssemblyInfo.cs

-37
This file was deleted.

‎Hudl.FFmpeg/AssemblyInfo.cs

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
using System.Runtime.CompilerServices;
2+
[assembly: InternalsVisibleToAttribute("Hudl.FFmpeg.Tests")]
3+
[assembly: InternalsVisibleToAttribute("Hudl.FFmpeg.Samples")]

‎Hudl.FFmpeg/Command/CommandFactory.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Hudl.FFmpeg.Command
1313
/// </summary>
1414
public class CommandFactory : ICommandFactory
1515
{
16-
private static readonly ILog Log = LogManager.GetLogger(typeof(CommandFactory).Name);
16+
private static readonly ILog Log = LogManager.GetLogger(typeof(CommandFactory));
1717

1818
private CommandFactory()
1919
{

‎Hudl.FFmpeg/Command/FFmpegCommandBuilder.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
namespace Hudl.FFmpeg.Command
1717
{
18-
internal class FFmpegCommandBuilder: FFCommandBuilderBase, ICommandBuilder
18+
public class FFmpegCommandBuilder: FFCommandBuilderBase, ICommandBuilder
1919
{
2020
public void WriteCommand(ICommand command)
2121
{

‎Hudl.FFmpeg/Common/Validate.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace Hudl.FFmpeg.Common
1010
/// <summary>
1111
/// helper class that helps with validation of objects in a ffmpeg project
1212
/// </summary>
13-
internal class Validate
13+
public class Validate
1414
{
1515
/// <summary>
1616
/// returns a boolean indicating if <cref name="objectType"/> is applicable to <cref name="restrictedType"/>

‎Hudl.FFmpeg/Filters/SetDar.cs

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
using System;
2-
using System.Text;
3-
using Hudl.FFmpeg.Attributes;
1+
using Hudl.FFmpeg.Attributes;
42
using Hudl.FFmpeg.DataTypes;
53
using Hudl.FFmpeg.Filters.Attributes;
6-
using Hudl.FFmpeg.Filters.BaseTypes;
74
using Hudl.FFmpeg.Filters.Interfaces;
85
using Hudl.FFmpeg.Formatters;
96
using Hudl.FFmpeg.Resources.BaseTypes;
10-
using Microsoft.SqlServer.Server;
7+
using System;
118

129
namespace Hudl.FFmpeg.Filters
1310
{

0 commit comments

Comments
 (0)