Skip to content

Commit 9f54930

Browse files
committed
uci 0.612 binaries
1 parent 3cd5678 commit 9f54930

Some content is hidden

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

44 files changed

+50
-44
lines changed

.gitignore

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
/vs2017/.vs/
2-
/vs2017/Release/
3-
/vs2017/x64/
4-
/vs2017/*.user
5-
/vs2017/*.db
6-
/vs2017/*.opendb
7-
/vs2017/*.a
8-
/vs2017/*.exp
9-
/vs2017/*.pdb
1+
/vs2019/.vs/
2+
/vs2019/Release/
3+
/vs2019/x64/
4+
/vs2019/*.user
5+
/vs2019/*.db
6+
/vs2019/*.opendb
7+
/vs2019/*.a
8+
/vs2019/*.exp
9+
/vs2019/*.pdb
10+
/vs2019/*.iobj
11+
/vs2019/*.ipdb

define.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
22

3-
#define UCI_VERSION "0.611"
4-
#define UCI_VERSION_W L"0.611"
5-
#define UCI_DATE_W L"2018-11-08"
3+
#define UCI_VERSION "0.612"
4+
#define UCI_VERSION_W L"0.612"
5+
#define UCI_DATE_W L"2020-12-25"

make_mingw.bat

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ mode con cols=120 lines=3000
44
pushd %~dp0
55

66
rem mingw-gcc: http://files.1f0.de/mingw/
7-
rem jdk: http://www.oracle.com/technetwork/java/javase/downloads/index.html
8-
rem ffmpeg: git://source.ffmpeg.org/ffmpeg.git
7+
rem jdk: https://adoptopenjdk.net/
8+
rem ffmpeg: https://git.ffmpeg.org/ffmpeg.git
99
rem ./configure --cpu=i686 --disable-all --enable-swscale-alpha --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-pthreads --disable-w32threads --disable-os2threads --disable-network --disable-dct --disable-dwt --disable-lsp --disable-lzo --disable-mdct --disable-rdft --disable-fft --disable-everything --enable-avcodec --enable-avutil --enable-swscale --enable-decoder=h264 --enable-decoder=hevc --enable-lto --disable-debug --disable-dxva2 --disable-iconv
1010
rem ffbuild/config.mak: -O3 => -Ofast -ffat-lto-objects
1111
rem config.h: #define HAVE_BCRYPT 1 => 0
@@ -14,8 +14,8 @@ rem ffbuild/config.mak: -O2 => -O2 -Ob2 -Oi -Ot -Oy -GF -GS- -MT; -flto => -GL /
1414
rem config.h: #define HAVE_BCRYPT 1 => 0
1515

1616
set MINGW_HOME=C:\mingw
17-
set FFMPEG_HOME=C:\ffmpeg-4.1
18-
rem set JAVA_HOME=C:\jdk-11.0.1
17+
set FFMPEG_HOME=C:\ffmpeg
18+
rem set JAVA_HOME=C:\jdk-11.0.9
1919

2020
set GCCEXE=%MINGW_HOME%\bin\gcc.exe
2121
set GPPEXE=%MINGW_HOME%\bin\g++.exe

make_mingw64.bat

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ mode con cols=120 lines=3000
44
pushd %~dp0
55

66
rem mingw-gcc: http://files.1f0.de/mingw/
7-
rem jdk: http://www.oracle.com/technetwork/java/javase/downloads/index.html
8-
rem ffmpeg: git://source.ffmpeg.org/ffmpeg.git
7+
rem jdk: https://adoptopenjdk.net/
8+
rem ffmpeg: https://git.ffmpeg.org/ffmpeg.git
99
rem ./configure --arch=x86_64 --disable-all --enable-asm --enable-x86asm --enable-swscale-alpha --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-pthreads --disable-w32threads --disable-os2threads --disable-network --disable-dct --disable-dwt --disable-lsp --disable-lzo --disable-mdct --disable-rdft --disable-fft --disable-everything --enable-avcodec --enable-avutil --enable-swscale --enable-decoder=h264 --enable-decoder=hevc --disable-debug --disable-dxva2 --disable-iconv --cross-prefix=x86_64-w64-mingw32- --target-os=win64
1010
rem ffbuild/config.mak: -O3 => -Ofast
1111
rem config.h: #define HAVE_BCRYPT 1 => 0
@@ -14,8 +14,8 @@ rem ffbuild/config.mak: -O2 => -O2 -Ob2 -Oi -Ot -Oy -GF -GS- -MT; -flto => -GL /
1414
rem config.h: #define HAVE_BCRYPT 1 => 0
1515

1616
set MINGW_HOME=C:\mingw
17-
set FFMPEG_HOME=C:\ffmpeg-4.1
18-
rem set JAVA_HOME=C:\jdk-11.0.1
17+
set FFMPEG_HOME=C:\ffmpeg
18+
rem set JAVA_HOME=C:\jdk-11.0.9
1919

2020
set GCCEXE=%MINGW_HOME%\bin\x86_64-w64-mingw32-gcc.exe
2121
set GPPEXE=%MINGW_HOME%\bin\x86_64-w64-mingw32-g++.exe

readme.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
UCI (Ultra Compact Image) 0.611 by dwing 2018-11-08
1+
UCI (Ultra Compact Image) 0.612 by dwing 2020-12-25
22

33

44
* 简介
@@ -15,7 +15,7 @@ UCI是一种基于H.264/HEVC intra帧压缩算法和数据流格式的静态图
1515

1616

1717
* 文件
18-
ucienc.exe --- 编码工具,支持BMP=>UCI的转换(需要在当前目录能够访问到x264.exe/x265.exe作为编码内核,可在x264.nl和msystem.waw.pl/x265/网站上下载到最新版本)
18+
ucienc.exe --- 编码工具,支持BMP=>UCI的转换(需要在当前目录能够访问到x264.exe/x265.exe作为编码内核,可在 http://msystem.waw.pl/x265/ 下载到最新版本)
1919
ucidec.exe --- 解码工具,支持UCI=>BMP的转换(需要ucidec.dll内核)
2020
ucidec.dll --- 解码内核,可用于二次开发
2121
改名为Xuci.usr并放入XnView的Plugins目录中即可作为XnView读取UCI图像的插件
@@ -82,6 +82,7 @@ void __stdcall UCIDebug(int level);
8282

8383
* 更新历史(以下版本的UCI格式及解码器均向后兼容)
8484

85+
0.612(2020-12-25) 更新FFmpeg至4.3.x,使用MinGW-GCC 9.3和VC2019(16.8.3)编译,默认二进制发布版本使用VC2019编译
8586
0.611(2018-11-08) 更新FFmpeg至4.1 ,使用MinGW-GCC 8.2和VC2017(15.8.9)编译,默认二进制发布版本使用VC2017编译(不再附带x265)
8687
0.61 (2018-02-13) 更新FFmpeg至3.4.2,使用MinGW-GCC 7.3和VC2017(15.5.6)编译,默认二进制发布版本使用VC2017编译(发布附带x265 8-bit 2.6+37),增加64位编译版本
8788
0.602(2017-06-08) 更新FFmpeg至3.3.2,使用MinGW-GCC 7.1和VC2017编译,默认二进制发布版本使用VC2017编译(发布附带x265 8-bit 2.4+14)

ucidec.dll

74 KB
Binary file not shown.

ucidec.exe

512 Bytes
Binary file not shown.

ucidec.lib

0 Bytes
Binary file not shown.

ucidec64.dll

144 KB
Binary file not shown.

ucidec64.exe

0 Bytes
Binary file not shown.

ucidec64.lib

0 Bytes
Binary file not shown.

ucienc.exe

3.5 KB
Binary file not shown.

ucienc64.exe

5 KB
Binary file not shown.

vs2017/ucidec.dll

-1.92 MB
Binary file not shown.

vs2017/ucidec.exe

-135 KB
Binary file not shown.

vs2017/ucidec64.dll

-2.93 MB
Binary file not shown.

vs2017/ucidec64.exe

-155 KB
Binary file not shown.

vs2017/ucienc.exe

-165 KB
Binary file not shown.

vs2017/ucienc64.exe

-190 KB
Binary file not shown.

vs2017/yuv2bmp.exe

-139 KB
Binary file not shown.

vs2017/yuv2bmp64.exe

-160 KB
Binary file not shown.

vs2017/dummy.c vs2019/dummy.c

+3
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ void ff_yuv2rgb_init_ppc() {}
5252
void ff_yuv2rgb_init_tables_ppc() {}
5353

5454
void ff_hevc_dsp_init_ppc() {}
55+
void ff_get_cpu_flags_mips() {}
56+
void ff_get_cpu_max_align_mips() {}
57+
void rgb2rgb_init_aarch64() {}
5558

5659
#ifndef _WIN64
5760

File renamed without changes.

vs2019/ucidec.dll

1.93 MB
Binary file not shown.

vs2019/ucidec.exe

148 KB
Binary file not shown.
4.96 KB
Binary file not shown.

vs2017/ucidec.vcxproj vs2019/ucidec.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@
1414
<ProjectGuid>{BC4B0EAC-00E9-40A7-94F9-F07F20E2F03C}</ProjectGuid>
1515
<Keyword>Win32Proj</Keyword>
1616
<RootNamespace>ucidec</RootNamespace>
17-
<WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
17+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1818
</PropertyGroup>
1919
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2020
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2121
<ConfigurationType>Application</ConfigurationType>
2222
<UseDebugLibraries>false</UseDebugLibraries>
23-
<PlatformToolset>v141_xp</PlatformToolset>
23+
<PlatformToolset>v142</PlatformToolset>
2424
<WholeProgramOptimization>true</WholeProgramOptimization>
2525
<CharacterSet>Unicode</CharacterSet>
2626
</PropertyGroup>
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
2828
<ConfigurationType>Application</ConfigurationType>
2929
<UseDebugLibraries>false</UseDebugLibraries>
30-
<PlatformToolset>v141_xp</PlatformToolset>
30+
<PlatformToolset>v142</PlatformToolset>
3131
<WholeProgramOptimization>true</WholeProgramOptimization>
3232
<CharacterSet>Unicode</CharacterSet>
3333
</PropertyGroup>
@@ -61,7 +61,7 @@
6161
<WarningLevel>Level4</WarningLevel>
6262
<PrecompiledHeader>NotUsing</PrecompiledHeader>
6363
<Optimization>MaxSpeed</Optimization>
64-
<FunctionLevelLinking>false</FunctionLevelLinking>
64+
<FunctionLevelLinking>true</FunctionLevelLinking>
6565
<IntrinsicFunctions>true</IntrinsicFunctions>
6666
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6767
<DebugInformationFormat>None</DebugInformationFormat>
@@ -88,7 +88,7 @@
8888
<PrecompiledHeader>
8989
</PrecompiledHeader>
9090
<Optimization>MaxSpeed</Optimization>
91-
<FunctionLevelLinking>false</FunctionLevelLinking>
91+
<FunctionLevelLinking>true</FunctionLevelLinking>
9292
<IntrinsicFunctions>true</IntrinsicFunctions>
9393
<PreprocessorDefinitions>NDEBUG;_CONSOLE;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9494
<DebugInformationFormat>None</DebugInformationFormat>
File renamed without changes.

vs2019/ucidec64.dll

2.99 MB
Binary file not shown.

vs2019/ucidec64.exe

172 KB
Binary file not shown.
4.67 KB
Binary file not shown.

vs2017/ucidec_dll.vcxproj vs2019/ucidec_dll.vcxproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@
1414
<ProjectGuid>{108300CD-A39B-4AB5-9F15-CAD69F39ED3A}</ProjectGuid>
1515
<Keyword>Win32Proj</Keyword>
1616
<RootNamespace>ucidec_dll</RootNamespace>
17-
<WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
17+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1818
</PropertyGroup>
1919
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2020
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2121
<ConfigurationType>DynamicLibrary</ConfigurationType>
2222
<UseDebugLibraries>false</UseDebugLibraries>
23-
<PlatformToolset>v141_xp</PlatformToolset>
23+
<PlatformToolset>v142</PlatformToolset>
2424
<WholeProgramOptimization>true</WholeProgramOptimization>
2525
<CharacterSet>Unicode</CharacterSet>
2626
</PropertyGroup>
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
2828
<ConfigurationType>DynamicLibrary</ConfigurationType>
2929
<UseDebugLibraries>false</UseDebugLibraries>
30-
<PlatformToolset>v141_xp</PlatformToolset>
30+
<PlatformToolset>v142</PlatformToolset>
3131
<WholeProgramOptimization>true</WholeProgramOptimization>
3232
<CharacterSet>Unicode</CharacterSet>
3333
</PropertyGroup>
@@ -62,7 +62,7 @@
6262
<WarningLevel>Level4</WarningLevel>
6363
<PrecompiledHeader>NotUsing</PrecompiledHeader>
6464
<Optimization>MaxSpeed</Optimization>
65-
<FunctionLevelLinking>false</FunctionLevelLinking>
65+
<FunctionLevelLinking>true</FunctionLevelLinking>
6666
<IntrinsicFunctions>true</IntrinsicFunctions>
6767
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6868
<DebugInformationFormat>None</DebugInformationFormat>
@@ -72,7 +72,7 @@
7272
<StringPooling>true</StringPooling>
7373
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
7474
<BufferSecurityCheck>false</BufferSecurityCheck>
75-
<AdditionalIncludeDirectories>C:\jdk-11.0.1\include;C:\jdk-11.0.1\include\win32;C:\ffmpeg-4.1;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
75+
<AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;C:\ffmpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7676
</ClCompile>
7777
<Link>
7878
<SubSystem>Windows</SubSystem>
@@ -91,7 +91,7 @@
9191
<PrecompiledHeader>
9292
</PrecompiledHeader>
9393
<Optimization>MaxSpeed</Optimization>
94-
<FunctionLevelLinking>false</FunctionLevelLinking>
94+
<FunctionLevelLinking>true</FunctionLevelLinking>
9595
<IntrinsicFunctions>true</IntrinsicFunctions>
9696
<PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9797
<DebugInformationFormat>None</DebugInformationFormat>
@@ -101,7 +101,7 @@
101101
<StringPooling>true</StringPooling>
102102
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
103103
<BufferSecurityCheck>false</BufferSecurityCheck>
104-
<AdditionalIncludeDirectories>C:\jdk-11.0.1\include;C:\jdk-11.0.1\include\win32;C:\ffmpeg-4.1;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
104+
<AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;C:\ffmpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
105105
</ClCompile>
106106
<Link>
107107
<SubSystem>Console</SubSystem>
File renamed without changes.

vs2019/ucienc.exe

173 KB
Binary file not shown.

vs2017/ucienc.vcxproj vs2019/ucienc.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@
1414
<ProjectGuid>{0300EF26-B0D4-447C-953A-DA9A0D5DE9B9}</ProjectGuid>
1515
<Keyword>Win32Proj</Keyword>
1616
<RootNamespace>ucienc</RootNamespace>
17-
<WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
17+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1818
</PropertyGroup>
1919
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2020
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2121
<ConfigurationType>Application</ConfigurationType>
2222
<UseDebugLibraries>false</UseDebugLibraries>
23-
<PlatformToolset>v141_xp</PlatformToolset>
23+
<PlatformToolset>v142</PlatformToolset>
2424
<WholeProgramOptimization>true</WholeProgramOptimization>
2525
<CharacterSet>Unicode</CharacterSet>
2626
</PropertyGroup>
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
2828
<ConfigurationType>Application</ConfigurationType>
2929
<UseDebugLibraries>false</UseDebugLibraries>
30-
<PlatformToolset>v141_xp</PlatformToolset>
30+
<PlatformToolset>v142</PlatformToolset>
3131
<WholeProgramOptimization>true</WholeProgramOptimization>
3232
<CharacterSet>Unicode</CharacterSet>
3333
</PropertyGroup>
@@ -61,7 +61,7 @@
6161
<WarningLevel>Level4</WarningLevel>
6262
<PrecompiledHeader>NotUsing</PrecompiledHeader>
6363
<Optimization>MaxSpeed</Optimization>
64-
<FunctionLevelLinking>false</FunctionLevelLinking>
64+
<FunctionLevelLinking>true</FunctionLevelLinking>
6565
<IntrinsicFunctions>true</IntrinsicFunctions>
6666
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6767
<DebugInformationFormat>None</DebugInformationFormat>
@@ -88,7 +88,7 @@
8888
<PrecompiledHeader>
8989
</PrecompiledHeader>
9090
<Optimization>MaxSpeed</Optimization>
91-
<FunctionLevelLinking>false</FunctionLevelLinking>
91+
<FunctionLevelLinking>true</FunctionLevelLinking>
9292
<IntrinsicFunctions>true</IntrinsicFunctions>
9393
<PreprocessorDefinitions>NDEBUG;_CONSOLE;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9494
<DebugInformationFormat>None</DebugInformationFormat>
File renamed without changes.

vs2019/ucienc64.exe

199 KB
Binary file not shown.
File renamed without changes.

vs2019/yuv2bmp.exe

151 KB
Binary file not shown.

vs2017/yuv2bmp.vcxproj vs2019/yuv2bmp.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@
1414
<ProjectGuid>{06EBD770-774E-4482-810C-885ABEF36FDF}</ProjectGuid>
1515
<Keyword>Win32Proj</Keyword>
1616
<RootNamespace>yuv2bmp</RootNamespace>
17-
<WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
17+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1818
</PropertyGroup>
1919
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2020
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2121
<ConfigurationType>Application</ConfigurationType>
2222
<UseDebugLibraries>false</UseDebugLibraries>
23-
<PlatformToolset>v141_xp</PlatformToolset>
23+
<PlatformToolset>v142</PlatformToolset>
2424
<WholeProgramOptimization>true</WholeProgramOptimization>
2525
<CharacterSet>Unicode</CharacterSet>
2626
</PropertyGroup>
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
2828
<ConfigurationType>Application</ConfigurationType>
2929
<UseDebugLibraries>false</UseDebugLibraries>
30-
<PlatformToolset>v141_xp</PlatformToolset>
30+
<PlatformToolset>v142</PlatformToolset>
3131
<WholeProgramOptimization>true</WholeProgramOptimization>
3232
<CharacterSet>Unicode</CharacterSet>
3333
</PropertyGroup>
@@ -61,7 +61,7 @@
6161
<WarningLevel>Level4</WarningLevel>
6262
<PrecompiledHeader>NotUsing</PrecompiledHeader>
6363
<Optimization>MaxSpeed</Optimization>
64-
<FunctionLevelLinking>false</FunctionLevelLinking>
64+
<FunctionLevelLinking>true</FunctionLevelLinking>
6565
<IntrinsicFunctions>true</IntrinsicFunctions>
6666
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6767
<DebugInformationFormat>None</DebugInformationFormat>
@@ -88,7 +88,7 @@
8888
<PrecompiledHeader>
8989
</PrecompiledHeader>
9090
<Optimization>MaxSpeed</Optimization>
91-
<FunctionLevelLinking>false</FunctionLevelLinking>
91+
<FunctionLevelLinking>true</FunctionLevelLinking>
9292
<IntrinsicFunctions>true</IntrinsicFunctions>
9393
<PreprocessorDefinitions>NDEBUG;_CONSOLE;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9494
<DebugInformationFormat>None</DebugInformationFormat>
File renamed without changes.

vs2019/yuv2bmp64.exe

177 KB
Binary file not shown.

yuv2bmp.exe

512 Bytes
Binary file not shown.

yuv2bmp64.exe

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)