diff --git a/src/JT1078.Flv/Audio/FaacEncoder.cs b/src/JT1078.Flv/Audio/FaacEncoder.cs index f0423d6..ba93867 100644 --- a/src/JT1078.Flv/Audio/FaacEncoder.cs +++ b/src/JT1078.Flv/Audio/FaacEncoder.cs @@ -65,7 +65,7 @@ namespace JT1078.Flv.Audio - const string DLLFile = @"Libs/libfaac.dll"; + const string DLLFile = @"/nativelibs/x64/libfaac.dll"; [DllImport(DLLFile, EntryPoint = "faacEncGetVersion", CallingConvention = CallingConvention.StdCall)] //int FAACAPI faacEncGetVersion(char **faac_id_string, char **faac_copyright_string); diff --git a/src/JT1078.Flv/JT1078.Flv.csproj b/src/JT1078.Flv/JT1078.Flv.csproj index c5ef381..2003d3f 100644 --- a/src/JT1078.Flv/JT1078.Flv.csproj +++ b/src/JT1078.Flv/JT1078.Flv.csproj @@ -42,11 +42,17 @@ - + - - PreserveNewest - + + /nativelibs/x64/libfaac.dll + true + + + + true + /nativelibs/x86/libfaac.dll + diff --git a/src/JT1078.Flv/Libs/libfaac.dll b/src/JT1078.Flv/Libs/libfaac.dll deleted file mode 100644 index a67c71f..0000000 Binary files a/src/JT1078.Flv/Libs/libfaac.dll and /dev/null differ diff --git a/src/JT1078.sln b/src/JT1078.sln index c7784e6..aa96edf 100644 --- a/src/JT1078.sln +++ b/src/JT1078.sln @@ -37,57 +37,157 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {F060F379-C8E4-4CA6-A54C-938A9780ACD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F060F379-C8E4-4CA6-A54C-938A9780ACD2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F060F379-C8E4-4CA6-A54C-938A9780ACD2}.Debug|x64.ActiveCfg = Debug|x64 + {F060F379-C8E4-4CA6-A54C-938A9780ACD2}.Debug|x64.Build.0 = Debug|x64 + {F060F379-C8E4-4CA6-A54C-938A9780ACD2}.Debug|x86.ActiveCfg = Debug|x86 + {F060F379-C8E4-4CA6-A54C-938A9780ACD2}.Debug|x86.Build.0 = Debug|x86 {F060F379-C8E4-4CA6-A54C-938A9780ACD2}.Release|Any CPU.ActiveCfg = Release|Any CPU {F060F379-C8E4-4CA6-A54C-938A9780ACD2}.Release|Any CPU.Build.0 = Release|Any CPU + {F060F379-C8E4-4CA6-A54C-938A9780ACD2}.Release|x64.ActiveCfg = Release|x64 + {F060F379-C8E4-4CA6-A54C-938A9780ACD2}.Release|x64.Build.0 = Release|x64 + {F060F379-C8E4-4CA6-A54C-938A9780ACD2}.Release|x86.ActiveCfg = Release|x86 + {F060F379-C8E4-4CA6-A54C-938A9780ACD2}.Release|x86.Build.0 = Release|x86 {2F987285-EB7A-4934-909E-50E42A2D1140}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2F987285-EB7A-4934-909E-50E42A2D1140}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2F987285-EB7A-4934-909E-50E42A2D1140}.Debug|x64.ActiveCfg = Debug|x64 + {2F987285-EB7A-4934-909E-50E42A2D1140}.Debug|x64.Build.0 = Debug|x64 + {2F987285-EB7A-4934-909E-50E42A2D1140}.Debug|x86.ActiveCfg = Debug|x86 + {2F987285-EB7A-4934-909E-50E42A2D1140}.Debug|x86.Build.0 = Debug|x86 {2F987285-EB7A-4934-909E-50E42A2D1140}.Release|Any CPU.ActiveCfg = Release|Any CPU {2F987285-EB7A-4934-909E-50E42A2D1140}.Release|Any CPU.Build.0 = Release|Any CPU + {2F987285-EB7A-4934-909E-50E42A2D1140}.Release|x64.ActiveCfg = Release|x64 + {2F987285-EB7A-4934-909E-50E42A2D1140}.Release|x64.Build.0 = Release|x64 + {2F987285-EB7A-4934-909E-50E42A2D1140}.Release|x86.ActiveCfg = Release|x86 + {2F987285-EB7A-4934-909E-50E42A2D1140}.Release|x86.Build.0 = Release|x86 {60CAC24B-7317-48BF-9DBF-7F3ECA3689A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {60CAC24B-7317-48BF-9DBF-7F3ECA3689A4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {60CAC24B-7317-48BF-9DBF-7F3ECA3689A4}.Debug|x64.ActiveCfg = Debug|x64 + {60CAC24B-7317-48BF-9DBF-7F3ECA3689A4}.Debug|x64.Build.0 = Debug|x64 + {60CAC24B-7317-48BF-9DBF-7F3ECA3689A4}.Debug|x86.ActiveCfg = Debug|x86 + {60CAC24B-7317-48BF-9DBF-7F3ECA3689A4}.Debug|x86.Build.0 = Debug|x86 {60CAC24B-7317-48BF-9DBF-7F3ECA3689A4}.Release|Any CPU.ActiveCfg = Release|Any CPU {60CAC24B-7317-48BF-9DBF-7F3ECA3689A4}.Release|Any CPU.Build.0 = Release|Any CPU + {60CAC24B-7317-48BF-9DBF-7F3ECA3689A4}.Release|x64.ActiveCfg = Release|x64 + {60CAC24B-7317-48BF-9DBF-7F3ECA3689A4}.Release|x64.Build.0 = Release|x64 + {60CAC24B-7317-48BF-9DBF-7F3ECA3689A4}.Release|x86.ActiveCfg = Release|x86 + {60CAC24B-7317-48BF-9DBF-7F3ECA3689A4}.Release|x86.Build.0 = Release|x86 {C6A43FDF-C609-40BB-B598-87F0BF7B944B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C6A43FDF-C609-40BB-B598-87F0BF7B944B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C6A43FDF-C609-40BB-B598-87F0BF7B944B}.Debug|x64.ActiveCfg = Debug|x64 + {C6A43FDF-C609-40BB-B598-87F0BF7B944B}.Debug|x64.Build.0 = Debug|x64 + {C6A43FDF-C609-40BB-B598-87F0BF7B944B}.Debug|x86.ActiveCfg = Debug|x86 + {C6A43FDF-C609-40BB-B598-87F0BF7B944B}.Debug|x86.Build.0 = Debug|x86 {C6A43FDF-C609-40BB-B598-87F0BF7B944B}.Release|Any CPU.ActiveCfg = Release|Any CPU {C6A43FDF-C609-40BB-B598-87F0BF7B944B}.Release|Any CPU.Build.0 = Release|Any CPU + {C6A43FDF-C609-40BB-B598-87F0BF7B944B}.Release|x64.ActiveCfg = Release|x64 + {C6A43FDF-C609-40BB-B598-87F0BF7B944B}.Release|x64.Build.0 = Release|x64 + {C6A43FDF-C609-40BB-B598-87F0BF7B944B}.Release|x86.ActiveCfg = Release|x86 + {C6A43FDF-C609-40BB-B598-87F0BF7B944B}.Release|x86.Build.0 = Release|x86 {E9FF2716-EF30-4180-879B-E8AB979ACFF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E9FF2716-EF30-4180-879B-E8AB979ACFF3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E9FF2716-EF30-4180-879B-E8AB979ACFF3}.Debug|x64.ActiveCfg = Debug|x64 + {E9FF2716-EF30-4180-879B-E8AB979ACFF3}.Debug|x64.Build.0 = Debug|x64 + {E9FF2716-EF30-4180-879B-E8AB979ACFF3}.Debug|x86.ActiveCfg = Debug|x86 + {E9FF2716-EF30-4180-879B-E8AB979ACFF3}.Debug|x86.Build.0 = Debug|x86 {E9FF2716-EF30-4180-879B-E8AB979ACFF3}.Release|Any CPU.ActiveCfg = Release|Any CPU {E9FF2716-EF30-4180-879B-E8AB979ACFF3}.Release|Any CPU.Build.0 = Release|Any CPU + {E9FF2716-EF30-4180-879B-E8AB979ACFF3}.Release|x64.ActiveCfg = Release|x64 + {E9FF2716-EF30-4180-879B-E8AB979ACFF3}.Release|x64.Build.0 = Release|x64 + {E9FF2716-EF30-4180-879B-E8AB979ACFF3}.Release|x86.ActiveCfg = Release|x86 + {E9FF2716-EF30-4180-879B-E8AB979ACFF3}.Release|x86.Build.0 = Release|x86 {9ADD82F9-E0B2-4263-8573-151F673BB33F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9ADD82F9-E0B2-4263-8573-151F673BB33F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9ADD82F9-E0B2-4263-8573-151F673BB33F}.Debug|x64.ActiveCfg = Debug|x64 + {9ADD82F9-E0B2-4263-8573-151F673BB33F}.Debug|x64.Build.0 = Debug|x64 + {9ADD82F9-E0B2-4263-8573-151F673BB33F}.Debug|x86.ActiveCfg = Debug|x86 + {9ADD82F9-E0B2-4263-8573-151F673BB33F}.Debug|x86.Build.0 = Debug|x86 {9ADD82F9-E0B2-4263-8573-151F673BB33F}.Release|Any CPU.ActiveCfg = Release|Any CPU {9ADD82F9-E0B2-4263-8573-151F673BB33F}.Release|Any CPU.Build.0 = Release|Any CPU + {9ADD82F9-E0B2-4263-8573-151F673BB33F}.Release|x64.ActiveCfg = Release|x64 + {9ADD82F9-E0B2-4263-8573-151F673BB33F}.Release|x64.Build.0 = Release|x64 + {9ADD82F9-E0B2-4263-8573-151F673BB33F}.Release|x86.ActiveCfg = Release|x86 + {9ADD82F9-E0B2-4263-8573-151F673BB33F}.Release|x86.Build.0 = Release|x86 {77402142-54E5-4E64-8F9E-BCAAC2CD0E8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {77402142-54E5-4E64-8F9E-BCAAC2CD0E8D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {77402142-54E5-4E64-8F9E-BCAAC2CD0E8D}.Debug|x64.ActiveCfg = Debug|x64 + {77402142-54E5-4E64-8F9E-BCAAC2CD0E8D}.Debug|x64.Build.0 = Debug|x64 + {77402142-54E5-4E64-8F9E-BCAAC2CD0E8D}.Debug|x86.ActiveCfg = Debug|x86 + {77402142-54E5-4E64-8F9E-BCAAC2CD0E8D}.Debug|x86.Build.0 = Debug|x86 {77402142-54E5-4E64-8F9E-BCAAC2CD0E8D}.Release|Any CPU.ActiveCfg = Release|Any CPU {77402142-54E5-4E64-8F9E-BCAAC2CD0E8D}.Release|Any CPU.Build.0 = Release|Any CPU + {77402142-54E5-4E64-8F9E-BCAAC2CD0E8D}.Release|x64.ActiveCfg = Release|x64 + {77402142-54E5-4E64-8F9E-BCAAC2CD0E8D}.Release|x64.Build.0 = Release|x64 + {77402142-54E5-4E64-8F9E-BCAAC2CD0E8D}.Release|x86.ActiveCfg = Release|x86 + {77402142-54E5-4E64-8F9E-BCAAC2CD0E8D}.Release|x86.Build.0 = Release|x86 {33E54FFC-7D91-42E5-9DC1-853738AB8980}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {33E54FFC-7D91-42E5-9DC1-853738AB8980}.Debug|Any CPU.Build.0 = Debug|Any CPU + {33E54FFC-7D91-42E5-9DC1-853738AB8980}.Debug|x64.ActiveCfg = Debug|x64 + {33E54FFC-7D91-42E5-9DC1-853738AB8980}.Debug|x64.Build.0 = Debug|x64 + {33E54FFC-7D91-42E5-9DC1-853738AB8980}.Debug|x86.ActiveCfg = Debug|x86 + {33E54FFC-7D91-42E5-9DC1-853738AB8980}.Debug|x86.Build.0 = Debug|x86 {33E54FFC-7D91-42E5-9DC1-853738AB8980}.Release|Any CPU.ActiveCfg = Release|Any CPU {33E54FFC-7D91-42E5-9DC1-853738AB8980}.Release|Any CPU.Build.0 = Release|Any CPU + {33E54FFC-7D91-42E5-9DC1-853738AB8980}.Release|x64.ActiveCfg = Release|x64 + {33E54FFC-7D91-42E5-9DC1-853738AB8980}.Release|x64.Build.0 = Release|x64 + {33E54FFC-7D91-42E5-9DC1-853738AB8980}.Release|x86.ActiveCfg = Release|x86 + {33E54FFC-7D91-42E5-9DC1-853738AB8980}.Release|x86.Build.0 = Release|x86 {D13FE092-1D11-4545-A322-9F06BCDAC0FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D13FE092-1D11-4545-A322-9F06BCDAC0FD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D13FE092-1D11-4545-A322-9F06BCDAC0FD}.Debug|x64.ActiveCfg = Debug|x64 + {D13FE092-1D11-4545-A322-9F06BCDAC0FD}.Debug|x64.Build.0 = Debug|x64 + {D13FE092-1D11-4545-A322-9F06BCDAC0FD}.Debug|x86.ActiveCfg = Debug|x86 + {D13FE092-1D11-4545-A322-9F06BCDAC0FD}.Debug|x86.Build.0 = Debug|x86 {D13FE092-1D11-4545-A322-9F06BCDAC0FD}.Release|Any CPU.ActiveCfg = Release|Any CPU {D13FE092-1D11-4545-A322-9F06BCDAC0FD}.Release|Any CPU.Build.0 = Release|Any CPU + {D13FE092-1D11-4545-A322-9F06BCDAC0FD}.Release|x64.ActiveCfg = Release|x64 + {D13FE092-1D11-4545-A322-9F06BCDAC0FD}.Release|x64.Build.0 = Release|x64 + {D13FE092-1D11-4545-A322-9F06BCDAC0FD}.Release|x86.ActiveCfg = Release|x86 + {D13FE092-1D11-4545-A322-9F06BCDAC0FD}.Release|x86.Build.0 = Release|x86 {5BBA68D4-53C6-4356-AAAE-ECC21B0BB8FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5BBA68D4-53C6-4356-AAAE-ECC21B0BB8FF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5BBA68D4-53C6-4356-AAAE-ECC21B0BB8FF}.Debug|x64.ActiveCfg = Debug|x64 + {5BBA68D4-53C6-4356-AAAE-ECC21B0BB8FF}.Debug|x64.Build.0 = Debug|x64 + {5BBA68D4-53C6-4356-AAAE-ECC21B0BB8FF}.Debug|x86.ActiveCfg = Debug|x86 + {5BBA68D4-53C6-4356-AAAE-ECC21B0BB8FF}.Debug|x86.Build.0 = Debug|x86 {5BBA68D4-53C6-4356-AAAE-ECC21B0BB8FF}.Release|Any CPU.ActiveCfg = Release|Any CPU {5BBA68D4-53C6-4356-AAAE-ECC21B0BB8FF}.Release|Any CPU.Build.0 = Release|Any CPU + {5BBA68D4-53C6-4356-AAAE-ECC21B0BB8FF}.Release|x64.ActiveCfg = Release|x64 + {5BBA68D4-53C6-4356-AAAE-ECC21B0BB8FF}.Release|x64.Build.0 = Release|x64 + {5BBA68D4-53C6-4356-AAAE-ECC21B0BB8FF}.Release|x86.ActiveCfg = Release|x86 + {5BBA68D4-53C6-4356-AAAE-ECC21B0BB8FF}.Release|x86.Build.0 = Release|x86 {C98AD4CE-D7F5-4F7F-BAB5-D1AD50DDF14F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C98AD4CE-D7F5-4F7F-BAB5-D1AD50DDF14F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C98AD4CE-D7F5-4F7F-BAB5-D1AD50DDF14F}.Debug|x64.ActiveCfg = Debug|x64 + {C98AD4CE-D7F5-4F7F-BAB5-D1AD50DDF14F}.Debug|x64.Build.0 = Debug|x64 + {C98AD4CE-D7F5-4F7F-BAB5-D1AD50DDF14F}.Debug|x86.ActiveCfg = Debug|x86 + {C98AD4CE-D7F5-4F7F-BAB5-D1AD50DDF14F}.Debug|x86.Build.0 = Debug|x86 {C98AD4CE-D7F5-4F7F-BAB5-D1AD50DDF14F}.Release|Any CPU.ActiveCfg = Release|Any CPU {C98AD4CE-D7F5-4F7F-BAB5-D1AD50DDF14F}.Release|Any CPU.Build.0 = Release|Any CPU + {C98AD4CE-D7F5-4F7F-BAB5-D1AD50DDF14F}.Release|x64.ActiveCfg = Release|x64 + {C98AD4CE-D7F5-4F7F-BAB5-D1AD50DDF14F}.Release|x64.Build.0 = Release|x64 + {C98AD4CE-D7F5-4F7F-BAB5-D1AD50DDF14F}.Release|x86.ActiveCfg = Release|x86 + {C98AD4CE-D7F5-4F7F-BAB5-D1AD50DDF14F}.Release|x86.Build.0 = Release|x86 {5564C20B-BFF4-4A2A-BDF2-C7427E93E993}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5564C20B-BFF4-4A2A-BDF2-C7427E93E993}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5564C20B-BFF4-4A2A-BDF2-C7427E93E993}.Debug|x64.ActiveCfg = Debug|x64 + {5564C20B-BFF4-4A2A-BDF2-C7427E93E993}.Debug|x64.Build.0 = Debug|x64 + {5564C20B-BFF4-4A2A-BDF2-C7427E93E993}.Debug|x86.ActiveCfg = Debug|x86 + {5564C20B-BFF4-4A2A-BDF2-C7427E93E993}.Debug|x86.Build.0 = Debug|x86 {5564C20B-BFF4-4A2A-BDF2-C7427E93E993}.Release|Any CPU.ActiveCfg = Release|Any CPU {5564C20B-BFF4-4A2A-BDF2-C7427E93E993}.Release|Any CPU.Build.0 = Release|Any CPU + {5564C20B-BFF4-4A2A-BDF2-C7427E93E993}.Release|x64.ActiveCfg = Release|x64 + {5564C20B-BFF4-4A2A-BDF2-C7427E93E993}.Release|x64.Build.0 = Release|x64 + {5564C20B-BFF4-4A2A-BDF2-C7427E93E993}.Release|x86.ActiveCfg = Release|x86 + {5564C20B-BFF4-4A2A-BDF2-C7427E93E993}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE