project: Update for 2.7 merge.

ShiftMediaProject · Feb 25, 2018 · 4e86824 · 4e86824
1 parent 51a6124
commit 4e86824
Show file tree

Hide file tree

Showing 7 changed files with 188 additions and 179 deletions.
diff --git a/SMP/appveyor.yml b/SMP/appveyor.yml
@@ -105,13 +105,12 @@ before_build:
     } else {
         $env:VCTargetsPath="$env:MSBUILDDIR\..\..\..\Microsoft.Cpp\v4.0\V${env:MSVC_VER}0"
     }
-
-# Download and install yasm integration
-- ps: (New-Object Net.WebClient).DownloadFile('https://github.com/ShiftMediaProject/VSYASM/releases/download/0.1/VSYASM.zip', "$pwd\yasm.zip")
-- ps: Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory("$pwd\yasm.zip", "$pwd\TempYASMUnpack")
-- cmd: call ".\TempYASMUnpack\install_script.bat"
-# Additional yasm location in order to fix gitlink error
-- ps: if ($env:MSVC_VER -ne 15) { Copy-Item -Force "TempYASMUnpack\*.*" "$env:VCTargetsPath\..\BuildCustomizations" }
+# Download and install nasm integration
+- ps: (New-Object Net.WebClient).DownloadFile('https://github.com/ShiftMediaProject/VSNASM/releases/download/0.3/VSNASM.zip', "$pwd\nasm.zip")
+- ps: Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory("$pwd\nasm.zip", "$pwd\TempNASMUnpack")
+- cmd: call ".\TempNASMUnpack\install_script.bat"
+# Additional nasm location in order to fix gitlink error
+- ps: if ($env:MSVC_VER -ne 15) { Copy-Item -Force "TempNASMUnpack\*.*" "$env:VCTargetsPath\..\BuildCustomizations" }
 
 build:
   project: build.vcxproj

diff --git a/SMP/libx265.def b/SMP/libx265.def
@@ -1,5 +1,5 @@
 EXPORTS
-x265_encoder_open_146
+x265_encoder_open_151
 x265_param_default
 x265_param_default_preset
 x265_param_parse
@@ -20,7 +20,7 @@ x265_encoder_get_stats
 x265_encoder_log
 x265_encoder_close
 x265_cleanup
-x265_api_get_146
+x265_api_get_151
 x265_api_query
 x265_encoder_intra_refresh
 x265_encoder_ctu_info

diff --git a/SMP/libx265.vcxproj b/SMP/libx265.vcxproj
diff --git a/SMP/libx265.vcxproj.filters b/SMP/libx265.vcxproj.filters
@@ -422,65 +422,80 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <YASM Include="..\source\common\x86\intrapred8.asm">
+    <NASM Include="..\source\common\x86\h4-ipfilter16.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
-    <YASM Include="..\source\common\x86\ipfilter8.asm">
+    </NASM>
+    <NASM Include="..\source\common\x86\h-ipfilter16.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
-    <YASM Include="..\source\common\x86\loopfilter.asm">
+    </NASM>
+    <NASM Include="..\source\common\x86\v4-ipfilter16.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
-    <YASM Include="..\source\common\x86\mc-a.asm">
+    </NASM>
+    <NASM Include="..\source\common\x86\h-ipfilter8.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
-    <YASM Include="..\source\common\x86\mc-a2.asm">
+    </NASM>
+    <NASM Include="..\source\common\x86\v4-ipfilter8.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
-    <YASM Include="..\source\common\x86\pixel-32.asm">
+    </NASM>
+    <NASM Include="..\source\common\x86\blockcopy8.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
-    <YASM Include="..\source\common\x86\pixel-a.asm">
+    </NASM>
+    <NASM Include="..\source\common\x86\const-a.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
-    <YASM Include="..\source\common\x86\pixeladd8.asm">
+    </NASM>
+    <NASM Include="..\source\common\x86\cpu-a.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
-    <YASM Include="..\source\common\x86\pixel-util8.asm">
+    </NASM>
+    <NASM Include="..\source\common\x86\dct8.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
-    <YASM Include="..\source\common\x86\sad-a.asm">
+    </NASM>
+    <NASM Include="..\source\common\x86\intrapred8.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
-    <YASM Include="..\source\common\x86\ssd-a.asm">
+    </NASM>
+    <NASM Include="..\source\common\x86\intrapred8_allangs.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
-    <YASM Include="..\source\common\x86\blockcopy8.asm">
+    </NASM>
+    <NASM Include="..\source\common\x86\intrapred16.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
-    <YASM Include="..\source\common\x86\const-a.asm">
+    </NASM>
+    <NASM Include="..\source\common\x86\ipfilter8.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
-    <YASM Include="..\source\common\x86\cpu-a.asm">
+    </NASM>
+    <NASM Include="..\source\common\x86\ipfilter16.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
-    <YASM Include="..\source\common\x86\dct8.asm">
+    </NASM>
+    <NASM Include="..\source\common\x86\loopfilter.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
-    <YASM Include="..\source\common\x86\intrapred8_allangs.asm">
+    </NASM>
+    <NASM Include="..\source\common\x86\mc-a.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
-    <YASM Include="..\source\common\x86\intrapred16.asm">
+    </NASM>
+    <NASM Include="..\source\common\x86\mc-a2.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
-    <YASM Include="..\source\common\x86\sad16-a.asm">
+    </NASM>
+    <NASM Include="..\source\common\x86\pixel-32.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
-    <YASM Include="..\source\common\x86\ipfilter16.asm">
+    </NASM>
+    <NASM Include="..\source\common\x86\pixel-a.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
-    <YASM Include="..\source\common\x86\seaintegral.asm">
+    </NASM>
+    <NASM Include="..\source\common\x86\pixeladd8.asm">
       <Filter>Source Files\common\x86</Filter>
-    </YASM>
+    </NASM>
+    <NASM Include="..\source\common\x86\pixel-util8.asm">
+      <Filter>Source Files\common\x86</Filter>
+    </NASM>
+    <NASM Include="..\source\common\x86\sad16-a.asm">
+      <Filter>Source Files\common\x86</Filter>
+    </NASM>
+    <NASM Include="..\source\common\x86\sad-a.asm">
+      <Filter>Source Files\common\x86</Filter>
+    </NASM>
+    <NASM Include="..\source\common\x86\seaintegral.asm">
+      <Filter>Source Files\common\x86</Filter>
+    </NASM>
+    <NASM Include="..\source\common\x86\ssd-a.asm">
+      <Filter>Source Files\common\x86</Filter>
+    </NASM>
   </ItemGroup>
 </Project>
diff --git a/SMP/readme.txt b/SMP/readme.txt
@@ -5,11 +5,11 @@ The project contains Release and Debug builds for static lib files (Debug/Releas
   as well as dynamic shared dll files (DebugDLL/ReleaseDLL).
 Choose whichever project configuration meets your requirements.
 
-*** Building with YASM ***
+*** Building with NASM ***
 
-In order to build gmp using msvc you must first download and install YASM.
-YASM is required to compile all gmp assembly files.
+In order to build x265 using msvc you must first download and install NASM.
+NASM is required to compile all x265 assembly files.
 
-1) Visual Studio YASM integration can be downloaded from https://github.com/ShiftMediaProject/VSYASM/releases/latest
+1) Visual Studio NASM integration can be downloaded from https://github.com/ShiftMediaProject/VSNASM/releases/latest
 
 2) Once downloaded simply follow the install instructions included in the download.
diff --git a/SMP/x265.rc b/SMP/x265.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION    2,6,0,0
-  PRODUCTVERSION 2,6,0,0
+  FILEVERSION    2,7,0,0
+  PRODUCTVERSION 2,7,0,0
   FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
   FILEOS         VOS_NT_WINDOWS32
 #ifdef OPENOBEX_EXPORTS
@@ -17,12 +17,12 @@ VS_VERSION_INFO VERSIONINFO
       BLOCK "04090000"
       BEGIN
         VALUE "FileDescription",  "HEVC video encoder"
-        VALUE "FileVersion",      "2.6"
+        VALUE "FileVersion",      "2.7"
         VALUE "InternalName",     "x265"
         VALUE "LegalCopyright",   "Multicoreware: GPLv2 or commercial"
         VALUE "OriginalFilename", "libx265.dll"
         VALUE "ProductName",      "x265"
-        VALUE "ProductVersion",   "2.6"
+        VALUE "ProductVersion",   "2.7"
       END
     END
     BLOCK "VarFileInfo"

diff --git a/SMP/x265_config.h b/SMP/x265_config.h
@@ -29,6 +29,6 @@
 /* Incremented each time public API is changed, X265_BUILD is used as
  * the shared library SONAME on platforms which support it. It also
  * prevents linking against a different version of the static lib */
-#define X265_BUILD 146
+#define X265_BUILD 151
 
 #endif