We truncated the diff of some files because they were too big.
If you want to see the full diff for every file, click here.
Changes of Revision 26
x265.changes
Changed
x
1
2
-------------------------------------------------------------------3
+Thu Mar 1 23:14:47 UTC 2018 - zaitor@opensuse.org4
+5
+- Update to version 2.7:6
+ * New features:7
+ - option:`--gop-lookahead` can be used to extend the gop8
+ boundary(set by `--keyint`). The GOP will be extended, if a9
+ scene-cut frame is found within this many number of frames.10
+ - Support for RADL pictures added in x265.11
+ - option:`--radl` can be used to decide number of RADL pictures12
+ preceding the IDR picture.13
+ * Encoder enhancements:14
+ - Moved from YASM to NASM assembler. Supports NASM assembler15
+ version 2.13 and greater.16
+ - Enable analysis save and load in a single run. Introduces two17
+ new cli options `--analysis-save <filename>` and18
+ `--analysis-load <filename>`.19
+ - Comply to HDR10+ LLC specification.20
+ - Reduced x265 build time by more than 50% by re-factoring21
+ ipfilter.asm.22
+ * Bug fixes:23
+ - Fixed inconsistent output issue in deblock filter and24
+ --const-vbv.25
+ - Fixed Mac OS build warnings.26
+ - Fixed inconsistency in pass-2 when weightp and cutree are27
+ enabled.28
+ - Fixed deadlock issue due to dropping of BREF frames, while29
+ forcing slice types through qp file.30
+- Bump soname to 151, also in baselibs.conf following upstream31
+ changes.32
+33
+-------------------------------------------------------------------34
Fri Dec 01 16:40:13 UTC 2017 - joerg.lorenzen@ki.tng.de35
36
- Update to version 2.637
x265.spec
Changed
23
1
2
# based on the spec file from https://build.opensuse.org/package/view_file/home:Simmphonie/libx265/3
4
Name: x2655
-%define soname 1466
+%define soname 1517
%define libname lib%{name}8
%define libsoname %{libname}-%{soname}9
-Version: 2.610
+Version: 2.711
Release: 012
License: GPL-2.0+13
Summary: A free h265/HEVC encoder - encoder binary14
15
streams. 16
17
%prep18
-%setup -q -n %{name}_v%{version}19
+%setup -q -n %{name}_%{version}20
%patch0 -p121
%patch1 -p122
23
baselibs.conf
Changed
4
1
2
-libx265-1303
+libx265-1514
x265_2.6.tar.gz/source/cmake/CMakeASM_YASMInformation.cmake
Deleted
70
1
2
-set(ASM_DIALECT "_YASM")3
-set(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS asm)4
-5
-if(X64)6
- list(APPEND ASM_FLAGS -DARCH_X86_64=1)7
- if(ENABLE_PIC)8
- list(APPEND ASM_FLAGS -DPIC)9
- endif()10
- if(APPLE)11
- set(ARGS -f macho64 -m amd64 -DPREFIX)12
- elseif(UNIX AND NOT CYGWIN)13
- set(ARGS -f elf64 -m amd64)14
- else()15
- set(ARGS -f win64 -m amd64)16
- endif()17
-else()18
- list(APPEND ASM_FLAGS -DARCH_X86_64=0)19
- if(APPLE)20
- set(ARGS -f macho -DPREFIX)21
- elseif(UNIX AND NOT CYGWIN)22
- set(ARGS -f elf32)23
- else()24
- set(ARGS -f win32 -DPREFIX)25
- endif()26
-endif()27
-28
-if(GCC)29
- list(APPEND ASM_FLAGS -DHAVE_ALIGNED_STACK=1)30
-else()31
- list(APPEND ASM_FLAGS -DHAVE_ALIGNED_STACK=0)32
-endif()33
-34
-if(HIGH_BIT_DEPTH)35
- if(MAIN12)36
- list(APPEND ASM_FLAGS -DHIGH_BIT_DEPTH=1 -DBIT_DEPTH=12 -DX265_NS=${X265_NS})37
- else()38
- list(APPEND ASM_FLAGS -DHIGH_BIT_DEPTH=1 -DBIT_DEPTH=10 -DX265_NS=${X265_NS})39
- endif()40
-else()41
- list(APPEND ASM_FLAGS -DHIGH_BIT_DEPTH=0 -DBIT_DEPTH=8 -DX265_NS=${X265_NS})42
-endif()43
-44
-list(APPEND ASM_FLAGS "${CMAKE_ASM_YASM_FLAGS}")45
-46
-if(CMAKE_BUILD_TYPE MATCHES Release)47
- list(APPEND ASM_FLAGS "${CMAKE_ASM_YASM_FLAGS_RELEASE}")48
-elseif(CMAKE_BUILD_TYPE MATCHES Debug)49
- list(APPEND ASM_FLAGS "${CMAKE_ASM_YASM_FLAGS_DEBUG}")50
-elseif(CMAKE_BUILD_TYPE MATCHES MinSizeRel)51
- list(APPEND ASM_FLAGS "${CMAKE_ASM_YASM_FLAGS_MINSIZEREL}")52
-elseif(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)53
- list(APPEND ASM_FLAGS "${CMAKE_ASM_YASM_FLAGS_RELWITHDEBINFO}")54
-endif()55
-56
-set(YASM_FLAGS ${ARGS} ${ASM_FLAGS} PARENT_SCOPE)57
-string(REPLACE ";" " " CMAKE_ASM_YASM_COMPILER_ARG1 "${ARGS}")58
-59
-# This section exists to override the one in CMakeASMInformation.cmake60
-# (the default Information file). This removes the <FLAGS>61
-# thing so that your C compiler flags that have been set via62
-# set_target_properties don't get passed to yasm and confuse it.63
-if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT)64
- string(REPLACE ";" " " STR_ASM_FLAGS "${ASM_FLAGS}")65
- set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> ${STR_ASM_FLAGS} -o <OBJECT> <SOURCE>")66
-endif()67
-68
-include(CMakeASMInformation)69
-set(ASM_DIALECT)70
x265_2.6.tar.gz/source/cmake/CMakeDetermineASM_YASMCompiler.cmake
Deleted
7
1
2
-set(ASM_DIALECT "_YASM")3
-set(CMAKE_ASM${ASM_DIALECT}_COMPILER ${YASM_EXECUTABLE})4
-set(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT ${_CMAKE_TOOLCHAIN_PREFIX}yasm)5
-include(CMakeDetermineASMCompiler)6
-set(ASM_DIALECT)7
x265_2.6.tar.gz/source/cmake/CMakeTestASM_YASMCompiler.cmake
Deleted
5
1
2
-set(ASM_DIALECT "_YASM")3
-include(CMakeTestASMCompiler)4
-set(ASM_DIALECT)5
x265_2.6.tar.gz/source/cmake/FindYasm.cmake
Deleted
27
1
2
-include(FindPackageHandleStandardArgs)3
-4
-# Simple path search with YASM_ROOT environment variable override5
-find_program(YASM_EXECUTABLE 6
- NAMES yasm yasm-1.2.0-win32 yasm-1.2.0-win64 yasm yasm-1.3.0-win32 yasm-1.3.0-win647
- HINTS $ENV{YASM_ROOT} ${YASM_ROOT}8
- PATH_SUFFIXES bin9
-)10
-11
-if(YASM_EXECUTABLE)12
- execute_process(COMMAND ${YASM_EXECUTABLE} --version13
- OUTPUT_VARIABLE yasm_version14
- ERROR_QUIET15
- OUTPUT_STRIP_TRAILING_WHITESPACE16
- )17
- if(yasm_version MATCHES "^yasm ([0-9\\.]*)")18
- set(YASM_VERSION_STRING "${CMAKE_MATCH_1}")19
- endif()20
- unset(yasm_version)21
-endif()22
-23
-# Provide standardized success/failure messages24
-find_package_handle_standard_args(yasm25
- REQUIRED_VARS YASM_EXECUTABLE26
- VERSION_VAR YASM_VERSION_STRING)27
x265_2.6.tar.gz/.hg_archival.txt -> x265_2.7.tar.gz/.hg_archival.txt
Changed
8
1
2
repo: 09fe40627f03a0f9c3e6ac78b22ac93da23f9fdf3
-node: 0e9ea76945c89962cd46cee6537586e2054b29354
+node: e41a9bf2bac4a7af2bec2bbadf91e63752d320ef5
branch: stable6
-tag: 2.67
+tag: 2.78
x265_2.6.tar.gz/.hgtags -> x265_2.7.tar.gz/.hgtags
Changed
6
1
2
3037c1448549ca920967831482c653e5892fa8ed 2.33
e7a4dd48293b7956d4a20df257d23904cc78e376 2.44
64b2d0bf45a52511e57a6b7299160b961ca3d51c 2.55
+0e9ea76945c89962cd46cee6537586e2054b2935 2.66
x265_2.6.tar.gz/build/README.txt -> x265_2.7.tar.gz/build/README.txt
Changed
36
1
2
3
= Optional Prerequisites =4
5
-1. Yasm 1.2.0 or later, to compile assembly primitives (performance)6
+1. To compile assembly primitives (performance) 7
+ a) If you are using release 2.6 or older, download and install Yasm 1.2.0 or later, 8
9
For Windows, download the latest yasm executable10
http://yasm.tortall.net/Download.html and copy the EXE into11
12
If cpu capabilities line says 'none!', then the encoder was built13
without yasm.14
15
+ b) If you are building from the default branch after release 2.6, download and install nasm 2.13 or newer16
+ 17
+ For windows and linux, you can download the nasm installer from http://www.nasm.us/pub/nasm/releasebuilds/?C=M;O=D.18
+ Make sure that it is in your PATH environment variable (%PATH% in windows, and $PATH in linux) so that cmake19
+ can find it.20
+21
+ Once NASM is properly installed, run cmake to regenerate projects. If you22
+ do not see the below line in the cmake output, NASM is not in the PATH.23
+24
+ -- Found Nasm 2.13 to build assembly primitives25
+26
+ Now build the encoder and run x265 -V:27
+28
+ x265 [info]: using cpu capabilities: MMX, SSE2, ...29
+30
+ If cpu capabilities line says 'none!', then the encoder was built31
+ without nasm and will be considerably slower for performance.32
+33
2. VisualLeakDetector (Windows Only)34
35
Download from https://vld.codeplex.com/releases and install. May need36
x265_2.6.tar.gz/doc/reST/api.rst -> x265_2.7.tar.gz/doc/reST/api.rst
Changed
10
1
2
/* x265_get_ref_frame_list:3
* returns negative on error, 0 when access unit were output.4
* This API must be called after(poc >= lookaheadDepth + bframes + 2) condition check */5
- int x265_get_ref_frame_list(x265_encoder *encoder, x265_picyuv**, x265_picyuv**, int, int);6
+ int x265_get_ref_frame_list(x265_encoder *encoder, x265_picyuv**, x265_picyuv**, int, int, int*, int*);7
8
**x265_encoder_ctu_info** may be used to provide additional CTU-specific information to the encoder::9
10
x265_2.6.tar.gz/doc/reST/cli.rst -> x265_2.7.tar.gz/doc/reST/cli.rst
Changed
91
1
2
sequence multiple times (presumably at varying bitrates). The encoder3
will not reuse analysis if slice type parameters do not match.4
5
-.. option:: --analysis-reuse-mode <string|int>6
+.. option:: --analysis-save <filename>7
8
- This option allows reuse of analysis information from first pass to second pass.9
- :option:`--analysis-reuse-mode save` specifies that encoder outputs analysis information of each frame.10
- :option:`--analysis-reuse-mode load` specifies that encoder reuses analysis information from first pass.11
- There is no benefit using load mode without running encoder in save mode. Analysis data from save mode is12
- written to a file specified by :option:`--analysis-reuse-file`. The amount of analysis data stored/reused13
- is determined by :option:`--analysis-reuse-level`. By reading the analysis data writen by an earlier encode14
- of the same sequence, substantial redundant work may be avoided. Requires cutree, pmode to be off. Default 0.15
+ Encoder outputs analysis information of each frame. Analysis data from save mode is16
+ written to the file specified. Requires cutree, pmode to be off. Default disabled.17
+ 18
+.. option:: --analysis-load <filename>19
+20
+ Encoder reuses analysis information from the file specified. By reading the analysis data writen by21
+ an earlier encode of the same sequence, substantial redundant work may be avoided. Requires cutree, pmode22
+ to be off. Default disabled.23
24
- **Values:** off(0), save(1): dump analysis data, load(2): read analysis data25
+ The amount of analysis data stored/reused is determined by :option:`--analysis-reuse-level`.26
27
.. option:: --analysis-reuse-file <filename>28
29
- Specify a filename for analysis data (see :option:`--analysis-reuse-mode`)30
+ Specify a filename for `multi-pass-opt-analysis` and `multi-pass-opt-distortion`.31
If no filename is specified, x265_analysis.dat is used.32
33
.. option:: --analysis-reuse-level <1..10>34
35
Level 4 - uses the depth of the neighbouring/ co-located CUs TU depth 36
to limit the 1st subTU depth. The 1st subTU depth is taken as the 37
limiting depth for the other subTUs.38
-39
+ 40
+ Enabling levels 3 or 4 may cause a mismatch in the output bitstreams 41
+ between option:`--analysis-save` and option:`--analysis-load`42
+ as all neighbouring CUs TU depth may not be available in the 43
+ option:`--analysis-load` run as only the best mode's information is 44
+ available to it.45
+ 46
Default: 047
48
.. option:: --nr-intra <integer>, --nr-inter <integer>49
50
This value represents the percentage difference between the inter cost and51
intra cost of a frame used in scenecut detection. For example, a value of 5 indicates,52
if the inter cost of a frame is greater than or equal to 95 percent of the intra cost of the frame,53
- then detect this frame as scenecut. Values between 5 and 15 are recommended. Default 5. 54
+ then detect this frame as scenecut. Values between 5 and 15 are recommended. Default 5.55
+ 56
+.. option:: --radl <integer>57
+ 58
+ Number of RADL pictures allowed infront of IDR. Requires fixed keyframe interval.59
+ Recommended value is 2-3. Default 0 (disabled).60
+ 61
+ **Range of values: Between 0 and `--bframes`62
63
.. option:: --ctu-info <0, 1, 2, 4, 6>64
65
66
Default 2067
68
**Range of values:** Between the maximum consecutive bframe count (:option:`--bframes`) and 25069
+.. option:: --gop-lookahead <integer>70
+71
+ Number of frames for GOP boundary decision lookahead. If a scenecut frame is found72
+ within this from the gop boundary set by `--keyint`, the GOP will be extented until such a point,73
+ otherwise the GOP will be terminated as set by `--keyint`. Default 0.74
+75
+ **Range of values:** Between 0 and (`--rc-lookahead` - mini-GOP length)76
+77
+ It is recommended to have `--gop-lookahaed` less than `--min-keyint` as scenecuts beyond78
+ `--min-keyint` are already being coded as keyframes.79
80
.. option:: --lookahead-slices <0..16>81
82
83
Example for MaxCLL=1000 candela per square meter, MaxFALL=40084
candela per square meter:85
86
- --max-cll 1000,40087
+ --max-cll "1000,400"88
89
Note that this string value will need to be escaped or quoted to90
protect against shell expansion on many platforms. No default.91
x265_2.6.tar.gz/doc/reST/releasenotes.rst -> x265_2.7.tar.gz/doc/reST/releasenotes.rst
Changed
34
1
2
Release Notes3
*************4
5
+Version 2.76
+===========7
+8
+Release date - 21st Feb, 2018.9
+10
+New features11
+------------12
+1. :option:`--gop-lookahead` can be used to extend the gop boundary(set by `--keyint`). The GOP will be extended, if a scene-cut frame is found within this many number of frames. 13
+2. Support for RADL pictures added in x265.14
+ :option:`--radl` can be used to decide number of RADL pictures preceding the IDR picture.15
+16
+Encoder enhancements17
+--------------------18
+1. Moved from YASM to NASM assembler. Supports NASM assembler version 2.13 and greater.19
+2. Enable analysis save and load in a single run. Introduces two new cli options `--analysis-save <filename>` and `--analysis-load <filename>`.20
+3. Comply to HDR10+ LLC specification.21
+4. Reduced x265 build time by more than 50% by re-factoring ipfilter.asm. 22
+23
+Bug fixes24
+---------25
+1. Fixed inconsistent output issue in deblock filter and --const-vbv.26
+2. Fixed Mac OS build warnings.27
+3. Fixed inconsistency in pass-2 when weightp and cutree are enabled.28
+4. Fixed deadlock issue due to dropping of BREF frames, while forcing slice types through qp file.29
+30
+31
Version 2.632
===========33
34
x265_2.6.tar.gz/source/CMakeLists.txt -> x265_2.7.tar.gz/source/CMakeLists.txt
Changed
104
1
2
option(STATIC_LINK_CRT "Statically link C runtime for release builds" OFF)3
mark_as_advanced(FPROFILE_USE FPROFILE_GENERATE NATIVE_BUILD)4
# X265_BUILD must be incremented each time the public API is changed5
-set(X265_BUILD 146)6
+set(X265_BUILD 151)7
configure_file("${PROJECT_SOURCE_DIR}/x265.def.in"8
"${PROJECT_BINARY_DIR}/x265.def")9
configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in"10
11
execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE CC_VERSION)12
endif(GCC)13
14
-find_package(Yasm)15
+find_package(Nasm)16
if(ARM OR CROSS_COMPILE_ARM)17
option(ENABLE_ASSEMBLY "Enable use of assembly coded primitives" ON)18
-elseif(YASM_FOUND AND X86)19
- if (YASM_VERSION_STRING VERSION_LESS "1.2.0")20
- message(STATUS "Yasm version ${YASM_VERSION_STRING} is too old. 1.2.0 or later required")21
+elseif(NASM_FOUND AND X86)22
+ if (NASM_VERSION_STRING VERSION_LESS "2.13.0")23
+ message(STATUS "Nasm version ${NASM_VERSION_STRING} is too old. 2.13.0 or later required")24
option(ENABLE_ASSEMBLY "Enable use of assembly coded primitives" OFF)25
else()26
- message(STATUS "Found Yasm ${YASM_VERSION_STRING} to build assembly primitives")27
+ message(STATUS "Found Nasm ${NASM_VERSION_STRING} to build assembly primitives")28
option(ENABLE_ASSEMBLY "Enable use of assembly coded primitives" ON)29
endif()30
else()31
32
list(APPEND ASM_OBJS ${ASM}.${SUFFIX})33
add_custom_command(34
OUTPUT ${ASM}.${SUFFIX}35
- COMMAND ${YASM_EXECUTABLE} ARGS ${YASM_FLAGS} ${ASM_SRC} -o ${ASM}.${SUFFIX}36
+ COMMAND ${NASM_EXECUTABLE} ARGS ${NASM_FLAGS} ${ASM_SRC} -o ${ASM}.${SUFFIX}37
DEPENDS ${ASM_SRC})38
endforeach()39
endif()40
endif()41
source_group(ASM FILES ${ASM_SRCS})42
if(ENABLE_HDR10_PLUS)43
- add_library(x265-static STATIC $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> $<TARGET_OBJECTS:dynamicHDR10> ${ASM_OBJS} ${ASM_SRCS})44
+ add_library(x265-static STATIC $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> $<TARGET_OBJECTS:dynamicHDR10> ${ASM_OBJS})45
add_library(hdr10plus-static STATIC $<TARGET_OBJECTS:dynamicHDR10>)46
set_target_properties(hdr10plus-static PROPERTIES OUTPUT_NAME hdr10plus)47
else()48
- add_library(x265-static STATIC $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> ${ASM_OBJS} ${ASM_SRCS})49
+ add_library(x265-static STATIC $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> ${ASM_OBJS})50
endif()51
if(NOT MSVC)52
set_target_properties(x265-static PROPERTIES OUTPUT_NAME x265)53
54
ARCHIVE DESTINATION ${LIB_INSTALL_DIR})55
endif()56
install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)57
-58
if(WIN32)59
- install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)60
- install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)61
- install(FILES "${PROJECT_BINARY_DIR}/Debug/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug OPTIONAL NAMELINK_ONLY)62
- install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo OPTIONAL NAMELINK_ONLY)63
+ if(MSVC_IDE)64
+ install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)65
+ install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)66
+ install(FILES "${PROJECT_BINARY_DIR}/Debug/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug OPTIONAL NAMELINK_ONLY)67
+ install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo OPTIONAL NAMELINK_ONLY)68
+ else()69
+ install(FILES "${PROJECT_BINARY_DIR}/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)70
+ install(FILES "${PROJECT_BINARY_DIR}/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)71
+ install(FILES "${PROJECT_BINARY_DIR}/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug OPTIONAL NAMELINK_ONLY)72
+ install(FILES "${PROJECT_BINARY_DIR}/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo OPTIONAL NAMELINK_ONLY)73
+ endif()74
endif()75
-76
if(CMAKE_RC_COMPILER)77
# The resource compiler does not need CFLAGS or macro defines. It78
# often breaks them79
80
endforeach()81
if(PLIBLIST)82
# blacklist of libraries that should not be in Libs.private83
- list(REMOVE_ITEM PLIBLIST "-lc" "-lpthread")84
+ list(REMOVE_ITEM PLIBLIST "-lc" "-lpthread" "-lmingwex" "-lmingwthrd"85
+ "-lmingw32" "-lmoldname" "-lmsvcrt" "-ladvapi32" "-lshell32"86
+ "-luser32" "-lkernel32")87
string(REPLACE ";" " " PRIVATE_LIBS "${PLIBLIST}")88
else()89
set(PRIVATE_LIBS "")90
91
if(ENABLE_HDR10_PLUS)92
add_executable(cli ../COPYING ${InputFiles} ${OutputFiles} ${GETOPT}93
x265.cpp x265.h x265cli.h94
- $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> $<TARGET_OBJECTS:dynamicHDR10> ${ASM_OBJS} ${ASM_SRCS})95
+ $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> $<TARGET_OBJECTS:dynamicHDR10> ${ASM_OBJS})96
else()97
add_executable(cli ../COPYING ${InputFiles} ${OutputFiles} ${GETOPT}98
x265.cpp x265.h x265cli.h99
- $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> ${ASM_OBJS} ${ASM_SRCS})100
+ $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> ${ASM_OBJS})101
endif()102
else()103
add_executable(cli ../COPYING ${InputFiles} ${OutputFiles} ${GETOPT} ${X265_RC_FILE}104
x265_2.7.tar.gz/source/cmake/CMakeASM_NASMInformation.cmake
Added
70
1
2
+set(ASM_DIALECT "_NASM")3
+set(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS asm)4
+5
+if(X64)6
+ list(APPEND ASM_FLAGS -DARCH_X86_64=1 -I ${CMAKE_CURRENT_SOURCE_DIR}/../common/x86/)7
+ if(ENABLE_PIC)8
+ list(APPEND ASM_FLAGS -DPIC)9
+ endif()10
+ if(APPLE)11
+ set(ARGS -f macho64 -DPREFIX)12
+ elseif(UNIX AND NOT CYGWIN)13
+ set(ARGS -f elf64)14
+ else()15
+ set(ARGS -f win64)16
+ endif()17
+else()18
+ list(APPEND ASM_FLAGS -DARCH_X86_64=0 -I ${CMAKE_CURRENT_SOURCE_DIR}/../common/x86/)19
+ if(APPLE)20
+ set(ARGS -f macho32 -DPREFIX)21
+ elseif(UNIX AND NOT CYGWIN)22
+ set(ARGS -f elf32)23
+ else()24
+ set(ARGS -f win32 -DPREFIX)25
+ endif()26
+endif()27
+28
+if(GCC)29
+ list(APPEND ASM_FLAGS -DHAVE_ALIGNED_STACK=1)30
+else()31
+ list(APPEND ASM_FLAGS -DHAVE_ALIGNED_STACK=0)32
+endif()33
+34
+if(HIGH_BIT_DEPTH)35
+ if(MAIN12)36
+ list(APPEND ASM_FLAGS -DHIGH_BIT_DEPTH=1 -DBIT_DEPTH=12 -DX265_NS=${X265_NS})37
+ else()38
+ list(APPEND ASM_FLAGS -DHIGH_BIT_DEPTH=1 -DBIT_DEPTH=10 -DX265_NS=${X265_NS})39
+ endif()40
+else()41
+ list(APPEND ASM_FLAGS -DHIGH_BIT_DEPTH=0 -DBIT_DEPTH=8 -DX265_NS=${X265_NS})42
+endif()43
+44
+list(APPEND ASM_FLAGS "${CMAKE_ASM_NASM_FLAGS}")45
+46
+if(CMAKE_BUILD_TYPE MATCHES Release)47
+ list(APPEND ASM_FLAGS "${CMAKE_ASM_NASM_FLAGS_RELEASE}")48
+elseif(CMAKE_BUILD_TYPE MATCHES Debug)49
+ list(APPEND ASM_FLAGS "${CMAKE_ASM_NASM_FLAGS_DEBUG}")50
+elseif(CMAKE_BUILD_TYPE MATCHES MinSizeRel)51
+ list(APPEND ASM_FLAGS "${CMAKE_ASM_NASM_FLAGS_MINSIZEREL}")52
+elseif(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)53
+ list(APPEND ASM_FLAGS "${CMAKE_ASM_NASM_FLAGS_RELWITHDEBINFO}")54
+endif()55
+56
+set(NASM_FLAGS ${ARGS} ${ASM_FLAGS} PARENT_SCOPE)57
+string(REPLACE ";" " " CMAKE_ASM_NASM_COMPILER_ARG1 "${ARGS}")58
+59
+# This section exists to override the one in CMakeASMInformation.cmake60
+# (the default Information file). This removes the <FLAGS>61
+# thing so that your C compiler flags that have been set via62
+# set_target_properties don't get passed to nasm and confuse it.63
+if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT)64
+ string(REPLACE ";" " " STR_ASM_FLAGS "${ASM_FLAGS}")65
+ set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> ${STR_ASM_FLAGS} -o <OBJECT> <SOURCE>")66
+endif()67
+68
+include(CMakeASMInformation)69
+set(ASM_DIALECT)70
x265_2.7.tar.gz/source/cmake/CMakeDetermineASM_NASMCompiler.cmake
Added
7
1
2
+set(ASM_DIALECT "_NASM")3
+set(CMAKE_ASM${ASM_DIALECT}_COMPILER ${NASM_EXECUTABLE})4
+set(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT ${_CMAKE_TOOLCHAIN_PREFIX}nasm)5
+include(CMakeDetermineASMCompiler)6
+set(ASM_DIALECT)7
x265_2.7.tar.gz/source/cmake/CMakeTestASM_NASMCompiler.cmake
Added
5
1
2
+set(ASM_DIALECT "_NASM")3
+include(CMakeTestASMCompiler)4
+set(ASM_DIALECT)5
x265_2.7.tar.gz/source/cmake/FindNasm.cmake
Added
27
1
2
+include(FindPackageHandleStandardArgs)3
+4
+# Simple path search with YASM_ROOT environment variable override5
+find_program(NASM_EXECUTABLE 6
+ NAMES nasm nasm-2.13.0-win32 nasm-2.13.0-win64 nasm nasm-2.13.0-win32 nasm-2.13.0-win647
+ HINTS $ENV{NASM_ROOT} ${NASM_ROOT}8
+ PATH_SUFFIXES bin9
+)10
+11
+if(NASM_EXECUTABLE)12
+ execute_process(COMMAND ${NASM_EXECUTABLE} -version13
+ OUTPUT_VARIABLE nasm_version14
+ ERROR_QUIET15
+ OUTPUT_STRIP_TRAILING_WHITESPACE16
+ )17
+ if(nasm_version MATCHES "^NASM version ([0-9\\.]*)")18
+ set(NASM_VERSION_STRING "${CMAKE_MATCH_1}")19
+ endif()20
+ unset(nasm_version)21
+endif()22
+23
+# Provide standardized success/failure messages24
+find_package_handle_standard_args(nasm25
+ REQUIRED_VARS NASM_EXECUTABLE26
+ VERSION_VAR NASM_VERSION_STRING)27
x265_2.6.tar.gz/source/cmake/version.cmake -> x265_2.7.tar.gz/source/cmake/version.cmake
Changed
17
1
2
set(hg_${key} ${value})3
endforeach()4
if(DEFINED hg_tag)5
- set(X265_VERSION ${hg_tag})6
set(X265_LATEST_TAG ${hg_tag})7
- set(X265_TAG_DISTANCE "0")8
elseif(DEFINED hg_node)9
- string(SUBSTRING "${hg_node}" 0 16 hg_id)10
- set(X265_VERSION "${hg_latesttag}+${hg_latesttagdistance}-${hg_id}")11
+ set(X265_LATEST_TAG ${hg_latesttag})12
+ set(X265_TAG_DISTANCE ${hg_latesttagdistance})13
+ string(SUBSTRING "${hg_node}" 0 12 X265_REVISION_ID)14
endif()15
elseif(HG_EXECUTABLE AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.hg)16
if(EXISTS "${HG_EXECUTABLE}.bat")17
x265_2.6.tar.gz/source/common/CMakeLists.txt -> x265_2.7.tar.gz/source/common/CMakeLists.txt
Changed
35
1
2
endif()3
set(VEC_PRIMITIVES vec/vec-primitives.cpp ${PRIMITIVES})4
source_group(Intrinsics FILES ${VEC_PRIMITIVES})5
-6
set(C_SRCS asm-primitives.cpp pixel.h mc.h ipfilter8.h blockcopy8.h dct8.h loopfilter.h seaintegral.h)7
set(A_SRCS pixel-a.asm const-a.asm cpu-a.asm ssd-a.asm mc-a.asm8
mc-a2.asm pixel-util8.asm blockcopy8.asm9
pixeladd8.asm dct8.asm seaintegral.asm)10
if(HIGH_BIT_DEPTH)11
- set(A_SRCS ${A_SRCS} sad16-a.asm intrapred16.asm ipfilter16.asm loopfilter.asm)12
+ set(A_SRCS ${A_SRCS} sad16-a.asm intrapred16.asm v4-ipfilter16.asm h4-ipfilter16.asm h-ipfilter16.asm ipfilter16.asm loopfilter.asm)13
else()14
- set(A_SRCS ${A_SRCS} sad-a.asm intrapred8.asm intrapred8_allangs.asm ipfilter8.asm loopfilter.asm)15
+ set(A_SRCS ${A_SRCS} sad-a.asm intrapred8.asm intrapred8_allangs.asm v4-ipfilter8.asm h-ipfilter8.asm ipfilter8.asm loopfilter.asm)16
endif()17
-18
if(NOT X64)19
set(A_SRCS ${A_SRCS} pixel-32.asm)20
endif()21
22
if(MSVC_IDE OR XCODE)23
- # MSVC requires custom build rules in the main cmake script for yasm24
- set(MSVC_ASMS "${A_SRCS}" CACHE INTERNAL "yasm sources")25
+ # MSVC requires custom build rules in the main cmake script for nasm26
+ set(MSVC_ASMS "${A_SRCS}" CACHE INTERNAL "nasm sources")27
set(A_SRCS)28
endif()29
30
- enable_language(ASM_YASM)31
+ enable_language(ASM_NASM)32
33
foreach(SRC ${A_SRCS} ${C_SRCS})34
set(ASM_PRIMITIVES ${ASM_PRIMITIVES} x86/${SRC})35
x265_2.6.tar.gz/source/common/common.h -> x265_2.7.tar.gz/source/common/common.h
Changed
25
1
2
#define ALIGN_VAR_8(T, var) T var __attribute__((aligned(8)))3
#define ALIGN_VAR_16(T, var) T var __attribute__((aligned(16)))4
#define ALIGN_VAR_32(T, var) T var __attribute__((aligned(32)))5
-6
#if defined(__MINGW32__)7
#define fseeko fseeko648
+#define ftello ftello649
#endif10
-11
#elif defined(_MSC_VER)12
13
#define ALIGN_VAR_4(T, var) __declspec(align(4)) T var14
15
#define ALIGN_VAR_16(T, var) __declspec(align(16)) T var16
#define ALIGN_VAR_32(T, var) __declspec(align(32)) T var17
#define fseeko _fseeki6418
-19
+#define ftello _ftelli6420
#endif // if defined(__GNUC__)21
-22
#if HAVE_INT_TYPES_H23
#define __STDC_FORMAT_MACROS24
#include <inttypes.h>25
x265_2.6.tar.gz/source/common/cudata.cpp -> x265_2.7.tar.gz/source/common/cudata.cpp
Changed
19
1
2
dir |= (1 << list);3
candMvField[count][list].mv = colmv;4
candMvField[count][list].refIdx = refIdx;5
- if (m_encData->m_param->scaleFactor && m_encData->m_param->analysisReuseMode == X265_ANALYSIS_SAVE && m_log2CUSize[0] < 4)6
+ if (m_encData->m_param->scaleFactor && m_encData->m_param->analysisSave && m_log2CUSize[0] < 4)7
{8
MV dist(MAX_MV, MAX_MV);9
candMvField[count][list].mv = dist;10
11
int curRefPOC = m_slice->m_refPOCList[picList][refIdx];12
int curPOC = m_slice->m_poc;13
14
- if (m_encData->m_param->scaleFactor && m_encData->m_param->analysisReuseMode == X265_ANALYSIS_SAVE && (m_log2CUSize[0] < 4))15
+ if (m_encData->m_param->scaleFactor && m_encData->m_param->analysisSave && (m_log2CUSize[0] < 4))16
{17
MV dist(MAX_MV, MAX_MV);18
pmv[numMvc++] = amvpCand[num++] = dist;19
x265_2.6.tar.gz/source/common/deblock.cpp -> x265_2.7.tar.gz/source/common/deblock.cpp
Changed
27
1
2
static const MV zeroMv(0, 0);3
const Slice* const sliceQ = cuQ->m_slice;4
const Slice* const sliceP = cuP->m_slice;5
-6
- const Frame* refP0 = sliceP->m_refFrameList[0][cuP->m_refIdx[0][partP]];7
- const Frame* refQ0 = sliceQ->m_refFrameList[0][cuQ->m_refIdx[0][partQ]];8
+ const Frame* refP0 = (cuP->m_refIdx[0][partP] >= 0) ? sliceP->m_refFrameList[0][cuP->m_refIdx[0][partP]] : NULL;9
+ const Frame* refQ0 = (cuQ->m_refIdx[0][partQ] >= 0) ? sliceQ->m_refFrameList[0][cuQ->m_refIdx[0][partQ]] : NULL;10
const MV& mvP0 = refP0 ? cuP->m_mv[0][partP] : zeroMv;11
const MV& mvQ0 = refQ0 ? cuQ->m_mv[0][partQ] : zeroMv;12
-13
if (sliceQ->isInterP() && sliceP->isInterP())14
{15
return ((refP0 != refQ0) ||16
(abs(mvQ0.x - mvP0.x) >= 4) || (abs(mvQ0.y - mvP0.y) >= 4)) ? 1 : 0;17
}18
-19
// (sliceQ->isInterB() || sliceP->isInterB())20
- const Frame* refP1 = sliceP->m_refFrameList[1][cuP->m_refIdx[1][partP]];21
- const Frame* refQ1 = sliceQ->m_refFrameList[1][cuQ->m_refIdx[1][partQ]];22
+ const Frame* refP1 = (cuP->m_refIdx[1][partP] >= 0) ? sliceP->m_refFrameList[1][cuP->m_refIdx[1][partP]] : NULL;23
+ const Frame* refQ1 = (cuQ->m_refIdx[1][partQ] >= 0) ? sliceQ->m_refFrameList[1][cuQ->m_refIdx[1][partQ]] : NULL;24
const MV& mvP1 = refP1 ? cuP->m_mv[1][partP] : zeroMv;25
const MV& mvQ1 = refQ1 ? cuQ->m_mv[1][partQ] : zeroMv;26
27
x265_2.6.tar.gz/source/common/frame.h -> x265_2.7.tar.gz/source/common/frame.h
Changed
9
1
2
3
float* m_quantOffsets; // points to quantOffsets in x265_picture4
x265_sei m_userSEI;5
- Event m_reconEncoded;6
7
/* Frame Parallelism - notification between FrameEncoders of available motion reference rows */8
ThreadSafeInteger* m_reconRowFlag; // flag of CTU rows completely reconstructed and extended for motion reference9
x265_2.6.tar.gz/source/common/framedata.cpp -> x265_2.7.tar.gz/source/common/framedata.cpp
Changed
40
1
2
m_spsrpsIdx = -1;3
if (param.rc.bStatWrite)4
m_spsrps = const_cast<RPS*>(sps.spsrps);5
-6
- m_cuMemPool.create(0, param.internalCsp, sps.numCUsInFrame, param);7
- for (uint32_t ctuAddr = 0; ctuAddr < sps.numCUsInFrame; ctuAddr++)8
- m_picCTU[ctuAddr].initialize(m_cuMemPool, 0, param, ctuAddr);9
-10
+ bool isallocated = m_cuMemPool.create(0, param.internalCsp, sps.numCUsInFrame, param);11
+ if (isallocated)12
+ for (uint32_t ctuAddr = 0; ctuAddr < sps.numCUsInFrame; ctuAddr++)13
+ m_picCTU[ctuAddr].initialize(m_cuMemPool, 0, param, ctuAddr);14
+ else15
+ return false;16
CHECKED_MALLOC_ZERO(m_cuStat, RCStatCU, sps.numCUsInFrame);17
CHECKED_MALLOC(m_rowStat, RCStatRow, sps.numCuInHeight);18
reinit(sps);19
20
21
X265_FREE(m_cuStat);22
X265_FREE(m_rowStat);23
-24
- if (m_meBuffer)25
+ for (int i = 0; i < INTEGRAL_PLANE_NUM; i++)26
{27
- for (int i = 0; i < INTEGRAL_PLANE_NUM; i++)28
+ if (m_meBuffer[i] != NULL)29
{30
- if (m_meBuffer[i] != NULL)31
- {32
- X265_FREE(m_meBuffer[i]);33
- m_meBuffer[i] = NULL;34
- }35
+ X265_FREE(m_meBuffer[i]);36
+ m_meBuffer[i] = NULL;37
}38
}39
}40
x265_2.6.tar.gz/source/common/lowres.cpp -> x265_2.7.tar.gz/source/common/lowres.cpp
Changed
28
1
2
}3
}4
5
- for (int i = 0; i < bframes + 1; i++)6
+ for (int i = 0; i < bframes + 2; i++)7
{8
CHECKED_MALLOC(lowresMvs[0][i], MV, cuCount);9
CHECKED_MALLOC(lowresMvs[1][i], MV, cuCount);10
11
}12
}13
14
- for (int i = 0; i < bframes + 1; i++)15
+ for (int i = 0; i < bframes + 2; i++)16
{17
X265_FREE(lowresMvs[0][i]);18
X265_FREE(lowresMvs[1][i]);19
20
for (int x = 0; x < bframes + 2; x++)21
rowSatds[y][x][0] = -1;22
23
- for (int i = 0; i < bframes + 1; i++)24
+ for (int i = 0; i < bframes + 2; i++)25
{26
lowresMvs[0][i][0].x = 0x7FFF;27
lowresMvs[1][i][0].x = 0x7FFF;28
x265_2.6.tar.gz/source/common/lowres.h -> x265_2.7.tar.gz/source/common/lowres.h
Changed
14
1
2
uint8_t* intraMode;3
int64_t satdCost;4
uint16_t* lowresCostForRc;5
- uint16_t(*lowresCosts[X265_BFRAME_MAX + 2][X265_BFRAME_MAX + 2]);6
- int32_t* lowresMvCosts[2][X265_BFRAME_MAX + 1];7
- MV* lowresMvs[2][X265_BFRAME_MAX + 1];8
+ uint16_t* lowresCosts[X265_BFRAME_MAX + 2][X265_BFRAME_MAX + 2];9
+ int32_t* lowresMvCosts[2][X265_BFRAME_MAX + 2];10
+ MV* lowresMvs[2][X265_BFRAME_MAX + 2];11
uint32_t maxBlocksInRow;12
uint32_t maxBlocksInCol;13
uint32_t maxBlocksInRowFullRes;14
x265_2.6.tar.gz/source/common/param.cpp -> x265_2.7.tar.gz/source/common/param.cpp
Changed
139
1
2
/* Coding Structure */3
param->keyframeMin = 0;4
param->keyframeMax = 250;5
+ param->gopLookahead = 0;6
param->bOpenGOP = 1;7
param->bframes = 4;8
param->lookaheadDepth = 20;9
10
param->lookaheadSlices = 8;11
param->lookaheadThreads = 0;12
param->scenecutBias = 5.0;13
+ param->radl = 0;14
/* Intra Coding Tools */15
param->bEnableConstrainedIntra = 0;16
param->bEnableStrongIntraSmoothing = 1;17
18
param->rdPenalty = 0;19
param->psyRd = 2.0;20
param->psyRdoq = 0.0;21
- param->analysisReuseMode = 0;22
+ param->analysisReuseMode = 0; /*DEPRECATED*/23
param->analysisMultiPassRefine = 0;24
param->analysisMultiPassDistortion = 0;25
param->analysisReuseFileName = NULL;26
+ param->analysisSave = NULL;27
+ param->analysisLoad = NULL;28
param->bIntraInBFrames = 0;29
param->bLossless = 0;30
param->bCULossless = 0;31
32
p->rc.bStrictCbr = atobool(value);33
p->rc.pbFactor = 1.0;34
}35
- OPT("analysis-reuse-mode") p->analysisReuseMode = parseName(value, x265_analysis_names, bError);36
+ OPT("analysis-reuse-mode") p->analysisReuseMode = parseName(value, x265_analysis_names, bError); /*DEPRECATED*/37
OPT("sar")38
{39
p->vui.aspectRatioIdc = parseName(value, x265_sar_names, bError);40
41
bError = true;42
}43
}44
+ OPT("gop-lookahead") p->gopLookahead = atoi(value);45
+ OPT("analysis-save") p->analysisSave = strdup(value);46
+ OPT("analysis-load") p->analysisLoad = strdup(value);47
+ OPT("radl") p->radl = atoi(value);48
else49
return X265_PARAM_BAD_NAME;50
}51
52
"scenecutThreshold must be greater than 0");53
CHECK(param->scenecutBias < 0 || 100 < param->scenecutBias,54
"scenecut-bias must be between 0 and 100");55
+ CHECK(param->radl < 0 || param->radl > param->bframes,56
+ "radl must be between 0 and bframes");57
CHECK(param->rdPenalty < 0 || param->rdPenalty > 2,58
"Valid penalty for 32x32 intra TU in non-I slices. 0:disabled 1:RD-penalty 2:maximum");59
CHECK(param->keyframeMax < -1,60
"Invalid max IDR period in frames. value should be greater than -1");61
+ CHECK(param->gopLookahead < -1,62
+ "GOP lookahead must be greater than -1");63
CHECK(param->decodedPictureHashSEI < 0 || param->decodedPictureHashSEI > 3,64
"Invalid hash option. Decoded Picture Hash SEI 0: disabled, 1: MD5, 2: CRC, 3: Checksum");65
CHECK(param->rc.vbvBufferSize < 0,66
67
"Constant QP is incompatible with 2pass");68
CHECK(param->rc.bStrictCbr && (param->rc.bitrate <= 0 || param->rc.vbvBufferSize <=0),69
"Strict-cbr cannot be applied without specifying target bitrate or vbv bufsize");70
- CHECK(param->analysisReuseMode && (param->analysisReuseMode < X265_ANALYSIS_OFF || param->analysisReuseMode > X265_ANALYSIS_LOAD),71
- "Invalid analysis mode. Analysis mode 0: OFF 1: SAVE : 2 LOAD");72
- CHECK(param->analysisReuseMode && (param->analysisReuseLevel < 1 || param->analysisReuseLevel > 10),73
+ CHECK((param->analysisSave || param->analysisLoad) && (param->analysisReuseLevel < 1 || param->analysisReuseLevel > 10),74
"Invalid analysis refine level. Value must be between 1 and 10 (inclusive)");75
CHECK(param->scaleFactor > 2, "Invalid scale-factor. Supports factor <= 2");76
CHECK(param->rc.qpMax < QP_MIN || param->rc.qpMax > QP_MAX_MAX,77
78
char *x265_param2string(x265_param* p, int padx, int pady)79
{80
char *buf, *s;81
+ size_t bufSize = 4000 + p->rc.zoneCount * 64;82
+ if (p->numaPools)83
+ bufSize += strlen(p->numaPools);84
+ if (p->masteringDisplayColorVolume)85
+ bufSize += strlen(p->masteringDisplayColorVolume);86
87
- buf = s = X265_MALLOC(char, MAXPARAMSIZE);88
+ buf = s = X265_MALLOC(char, bufSize);89
if (!buf)90
return NULL;91
-92
#define BOOL(param, cliopt) \93
s += sprintf(s, " %s", (param) ? cliopt : "no-" cliopt);94
95
96
BOOL(p->bEnableSsim, "ssim");97
s += sprintf(s, " log-level=%d", p->logLevel);98
if (p->csvfn)99
- s += sprintf(s, " csvfn=%s csv-log-level=%d", p->csvfn, p->csvLogLevel);100
+ s += sprintf(s, " csv csv-log-level=%d", p->csvLogLevel);101
s += sprintf(s, " bitdepth=%d", p->internalBitDepth);102
s += sprintf(s, " input-csp=%d", p->internalCsp);103
s += sprintf(s, " fps=%u/%u", p->fpsNum, p->fpsDenom);104
105
BOOL(p->bOpenGOP, "open-gop");106
s += sprintf(s, " min-keyint=%d", p->keyframeMin);107
s += sprintf(s, " keyint=%d", p->keyframeMax);108
+ s += sprintf(s, " gop-lookahead=%d", p->gopLookahead);109
s += sprintf(s, " bframes=%d", p->bframes);110
s += sprintf(s, " b-adapt=%d", p->bFrameAdaptive);111
BOOL(p->bBPyramid, "b-pyramid");112
113
s += sprintf(s, " rc-lookahead=%d", p->lookaheadDepth);114
s += sprintf(s, " lookahead-slices=%d", p->lookaheadSlices);115
s += sprintf(s, " scenecut=%d", p->scenecutThreshold);116
+ s += sprintf(s, " radl=%d", p->radl);117
BOOL(p->bIntraRefresh, "intra-refresh");118
s += sprintf(s, " ctu=%d", p->maxCUSize);119
s += sprintf(s, " min-cu-size=%d", p->minCUSize);120
121
s += sprintf(s, " psy-rd=%.2f", p->psyRd);122
s += sprintf(s, " psy-rdoq=%.2f", p->psyRdoq);123
BOOL(p->bEnableRdRefine, "rd-refine");124
- s += sprintf(s, " analysis-reuse-mode=%d", p->analysisReuseMode);125
BOOL(p->bLossless, "lossless");126
s += sprintf(s, " cbqpoffs=%d", p->cbQpOffset);127
s += sprintf(s, " crqpoffs=%d", p->crQpOffset);128
129
BOOL(p->bEmitHDRSEI, "hdr");130
BOOL(p->bHDROpt, "hdr-opt");131
BOOL(p->bDhdr10opt, "dhdr10-opt");132
+ if (p->analysisSave)133
+ s += sprintf(s, " analysis-save");134
+ if (p->analysisLoad)135
+ s += sprintf(s, " analysis-load");136
s += sprintf(s, " analysis-reuse-level=%d", p->analysisReuseLevel);137
s += sprintf(s, " scale-factor=%d", p->scaleFactor);138
s += sprintf(s, " refine-intra=%d", p->intraRefine);139
x265_2.6.tar.gz/source/common/param.h -> x265_2.7.tar.gz/source/common/param.h
Changed
10
1
2
int x265_param_parse(x265_param *p, const char *name, const char *value);3
#define PARAM_NS X265_NS4
#endif5
-6
-#define MAXPARAMSIZE 20007
}8
-9
#endif // ifndef X265_PARAM_H10
x265_2.6.tar.gz/source/common/picyuv.cpp -> x265_2.7.tar.gz/source/common/picyuv.cpp
Changed
30
1
2
pixel *uPic = m_picOrg[1];3
pixel *vPic = m_picOrg[2];4
5
- for (int r = 0; r < height; r++)6
+ if (param.csvLogLevel >= 2 || param.maxCLL || param.maxFALL)7
{8
- for (int c = 0; c < width; c++)9
+ for (int r = 0; r < height; r++)10
{11
- m_maxLumaLevel = X265_MAX(yPic[c], m_maxLumaLevel);12
- m_minLumaLevel = X265_MIN(yPic[c], m_minLumaLevel);13
- lumaSum += yPic[c];14
+ for (int c = 0; c < width; c++)15
+ {16
+ m_maxLumaLevel = X265_MAX(yPic[c], m_maxLumaLevel);17
+ m_minLumaLevel = X265_MIN(yPic[c], m_minLumaLevel);18
+ lumaSum += yPic[c];19
+ }20
+ yPic += m_stride;21
}22
- yPic += m_stride;23
+ m_avgLumaLevel = (double)lumaSum / (m_picHeight * m_picWidth);24
}25
- m_avgLumaLevel = (double)lumaSum / (m_picHeight * m_picWidth);26
-27
if (param.csvLogLevel >= 2)28
{29
if (param.internalCsp != X265_CSP_I400)30
x265_2.6.tar.gz/source/common/x86/asm-primitives.cpp -> x265_2.7.tar.gz/source/common/x86/asm-primitives.cpp
Changed
9
1
2
#include "dct8.h"3
#include "seaintegral.h"4
}5
-6
#define ALL_LUMA_CU_TYPED(prim, fncdef, fname, cpu) \7
p.cu[BLOCK_8x8].prim = fncdef PFX(fname ## _8x8_ ## cpu); \8
p.cu[BLOCK_16x16].prim = fncdef PFX(fname ## _16x16_ ## cpu); \9
x265_2.6.tar.gz/source/common/x86/blockcopy8.asm -> x265_2.7.tar.gz/source/common/x86/blockcopy8.asm
Changed
37
1
2
mov r4d, %2/43
add r1, r14
add r3, r35
-.loop6
+.loop:7
movu m0, [r2]8
movu m1, [r2 + 16]9
movu m2, [r2 + 32]10
11
lea r5, [3 * r3]12
lea r6, [3 * r1]13
14
-.loop15
+.loop:16
movu m0, [r2]17
movu xm1, [r2 + 32]18
movu [r0], m019
20
pxor m4, m421
pxor m5, m522
23
-.loop24
+.loop:25
; row 026
movu m0, [r1]27
movu m1, [r1 + 16]28
29
pxor m4, m430
pxor m5, m531
32
-.loop33
+.loop:34
; row 035
movu m0, [r1]36
movu m1, [r1 + 16]37
x265_2.7.tar.gz/source/common/x86/h-ipfilter16.asm
Added
201
1
2
+;*****************************************************************************3
+;* Copyright (C) 2013-2017 MulticoreWare, Inc4
+;*5
+;* Authors: Nabajit Deka <nabajit@multicorewareinc.com>6
+;* Murugan Vairavel <murugan@multicorewareinc.com>7
+;* Min Chen <chenm003@163.com>8
+;*9
+;* This program is free software; you can redistribute it and/or modify10
+;* it under the terms of the GNU General Public License as published by11
+;* the Free Software Foundation; either version 2 of the License, or12
+;* (at your option) any later version.13
+;*14
+;* This program is distributed in the hope that it will be useful,15
+;* but WITHOUT ANY WARRANTY; without even the implied warranty of16
+;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the17
+;* GNU General Public License for more details.18
+;*19
+;* You should have received a copy of the GNU General Public License20
+;* along with this program; if not, write to the Free Software21
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.22
+;*23
+;* This program is also available under a commercial proprietary license.24
+;* For more information, contact us at license @ x265.com.25
+;*****************************************************************************/26
+%include "x86inc.asm"27
+%include "x86util.asm"28
+29
+30
+%define INTERP_OFFSET_PP pd_3231
+%define INTERP_SHIFT_PP 632
+33
+%if BIT_DEPTH == 1034
+ %define INTERP_SHIFT_PS 235
+ %define INTERP_OFFSET_PS pd_n3276836
+ %define INTERP_SHIFT_SP 1037
+ %define INTERP_OFFSET_SP h_pd_52480038
+%elif BIT_DEPTH == 1239
+ %define INTERP_SHIFT_PS 440
+ %define INTERP_OFFSET_PS pd_n13107241
+ %define INTERP_SHIFT_SP 842
+ %define INTERP_OFFSET_SP pd_52441643
+%else44
+ %error Unsupport bit depth!45
+%endif46
+47
+SECTION_RODATA 3248
+49
+h_pd_524800: times 8 dd 52480050
+ 51
+tab_LumaCoeff: dw 0, 0, 0, 64, 0, 0, 0, 052
+ dw -1, 4, -10, 58, 17, -5, 1, 053
+ dw -1, 4, -11, 40, 40, -11, 4, -154
+ dw 0, 1, -5, 17, 58, -10, 4, -155
+ 56
+ALIGN 3257
+h_tab_LumaCoeffV: times 4 dw 0, 058
+ times 4 dw 0, 6459
+ times 4 dw 0, 060
+ times 4 dw 0, 061
+62
+ times 4 dw -1, 463
+ times 4 dw -10, 5864
+ times 4 dw 17, -565
+ times 4 dw 1, 066
+67
+ times 4 dw -1, 468
+ times 4 dw -11, 4069
+ times 4 dw 40, -1170
+ times 4 dw 4, -171
+72
+ times 4 dw 0, 173
+ times 4 dw -5, 1774
+ times 4 dw 58, -1075
+ times 4 dw 4, -176
+ 77
+const interp8_hps_shuf, dd 0, 4, 1, 5, 2, 6, 3, 7 78
+79
+const interp8_hpp_shuf, db 0, 1, 2, 3, 4, 5, 6, 7, 2, 3, 4, 5, 6, 7, 8, 980
+ db 4, 5, 6, 7, 8, 9, 10, 11, 6, 7, 8, 9, 10, 11, 12, 13 81
+82
+const interp8_hpp_shuf_new, db 0, 1, 2, 3, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8, 983
+ db 4, 5, 6, 7, 6, 7, 8, 9, 8, 9, 10, 11, 10, 11, 12, 13 84
+ 85
+SECTION .text86
+cextern pd_887
+cextern pd_3288
+cextern pw_pixel_max89
+cextern pd_52441690
+cextern pd_n3276891
+cextern pd_n13107292
+cextern pw_200093
+cextern idct8_shuf294
+95
+%macro FILTER_LUMA_HOR_4_sse2 196
+ movu m4, [r0 + %1] ; m4 = src[0-7]97
+ movu m5, [r0 + %1 + 2] ; m5 = src[1-8]98
+ pmaddwd m4, m099
+ pmaddwd m5, m0100
+ pshufd m2, m4, q2301101
+ paddd m4, m2102
+ pshufd m2, m5, q2301103
+ paddd m5, m2104
+ pshufd m4, m4, q3120105
+ pshufd m5, m5, q3120106
+ punpcklqdq m4, m5107
+108
+ movu m5, [r0 + %1 + 4] ; m5 = src[2-9]109
+ movu m3, [r0 + %1 + 6] ; m3 = src[3-10]110
+ pmaddwd m5, m0111
+ pmaddwd m3, m0112
+ pshufd m2, m5, q2301113
+ paddd m5, m2114
+ pshufd m2, m3, q2301115
+ paddd m3, m2116
+ pshufd m5, m5, q3120117
+ pshufd m3, m3, q3120118
+ punpcklqdq m5, m3119
+120
+ pshufd m2, m4, q2301121
+ paddd m4, m2122
+ pshufd m2, m5, q2301123
+ paddd m5, m2124
+ pshufd m4, m4, q3120125
+ pshufd m5, m5, q3120126
+ punpcklqdq m4, m5127
+ paddd m4, m1128
+%endmacro129
+130
+%macro FILTER_LUMA_HOR_8_sse2 1131
+ movu m4, [r0 + %1] ; m4 = src[0-7]132
+ movu m5, [r0 + %1 + 2] ; m5 = src[1-8]133
+ pmaddwd m4, m0134
+ pmaddwd m5, m0135
+ pshufd m2, m4, q2301136
+ paddd m4, m2137
+ pshufd m2, m5, q2301138
+ paddd m5, m2139
+ pshufd m4, m4, q3120140
+ pshufd m5, m5, q3120141
+ punpcklqdq m4, m5142
+143
+ movu m5, [r0 + %1 + 4] ; m5 = src[2-9]144
+ movu m3, [r0 + %1 + 6] ; m3 = src[3-10]145
+ pmaddwd m5, m0146
+ pmaddwd m3, m0147
+ pshufd m2, m5, q2301148
+ paddd m5, m2149
+ pshufd m2, m3, q2301150
+ paddd m3, m2151
+ pshufd m5, m5, q3120152
+ pshufd m3, m3, q3120153
+ punpcklqdq m5, m3154
+155
+ pshufd m2, m4, q2301156
+ paddd m4, m2157
+ pshufd m2, m5, q2301158
+ paddd m5, m2159
+ pshufd m4, m4, q3120160
+ pshufd m5, m5, q3120161
+ punpcklqdq m4, m5162
+ paddd m4, m1163
+164
+ movu m5, [r0 + %1 + 8] ; m5 = src[4-11]165
+ movu m6, [r0 + %1 + 10] ; m6 = src[5-12]166
+ pmaddwd m5, m0167
+ pmaddwd m6, m0168
+ pshufd m2, m5, q2301169
+ paddd m5, m2170
+ pshufd m2, m6, q2301171
+ paddd m6, m2172
+ pshufd m5, m5, q3120173
+ pshufd m6, m6, q3120174
+ punpcklqdq m5, m6175
+176
+ movu m6, [r0 + %1 + 12] ; m6 = src[6-13]177
+ movu m3, [r0 + %1 + 14] ; m3 = src[7-14]178
+ pmaddwd m6, m0179
+ pmaddwd m3, m0180
+ pshufd m2, m6, q2301181
+ paddd m6, m2182
+ pshufd m2, m3, q2301183
+ paddd m3, m2184
+ pshufd m6, m6, q3120185
+ pshufd m3, m3, q3120186
+ punpcklqdq m6, m3187
+188
+ pshufd m2, m5, q2301189
+ paddd m5, m2190
+ pshufd m2, m6, q2301191
+ paddd m6, m2192
+ pshufd m5, m5, q3120193
+ pshufd m6, m6, q3120194
+ punpcklqdq m5, m6195
+ paddd m5, m1196
+%endmacro197
+198
+;------------------------------------------------------------------------------------------------------------199
+; void interp_8tap_horiz_p%3_%1x%2(pixel *src, intptr_t srcStride, pixel *dst, intptr_t dstStride, int coeffIdx)200
+;------------------------------------------------------------------------------------------------------------201
x265_2.7.tar.gz/source/common/x86/h-ipfilter8.asm
Added
201
1
2
+;*****************************************************************************3
+;* Copyright (C) 2013-2017 MulticoreWare, Inc4
+;*5
+;* Authors: Min Chen <chenm003@163.com>6
+;* Nabajit Deka <nabajit@multicorewareinc.com>7
+;* Praveen Kumar Tiwari <praveen@multicorewareinc.com>8
+;*9
+;* This program is free software; you can redistribute it and/or modify10
+;* it under the terms of the GNU General Public License as published by11
+;* the Free Software Foundation; either version 2 of the License, or12
+;* (at your option) any later version.13
+;*14
+;* This program is distributed in the hope that it will be useful,15
+;* but WITHOUT ANY WARRANTY; without even the implied warranty of16
+;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the17
+;* GNU General Public License for more details.18
+;*19
+;* You should have received a copy of the GNU General Public License20
+;* along with this program; if not, write to the Free Software21
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.22
+;*23
+;* This program is also available under a commercial proprietary license.24
+;* For more information, contact us at license @ x265.com.25
+;*****************************************************************************/26
+27
+%include "x86inc.asm"28
+%include "x86util.asm"29
+30
+SECTION_RODATA 3231
+32
+const h_tabw_LumaCoeff, dw 0, 0, 0, 64, 0, 0, 0, 033
+ dw -1, 4, -10, 58, 17, -5, 1, 034
+ dw -1, 4, -11, 40, 40, -11, 4, -135
+ dw 0, 1, -5, 17, 58, -10, 4, -136
+37
+const h_tabw_ChromaCoeff, dw 0, 64, 0, 038
+ dw -2, 58, 10, -239
+ dw -4, 54, 16, -240
+ dw -6, 46, 28, -441
+ dw -4, 36, 36, -442
+ dw -4, 28, 46, -643
+ dw -2, 16, 54, -444
+ dw -2, 10, 58, -245
+46
+const h_tab_ChromaCoeff, db 0, 64, 0, 047
+ db -2, 58, 10, -248
+ db -4, 54, 16, -249
+ db -6, 46, 28, -450
+ db -4, 36, 36, -451
+ db -4, 28, 46, -652
+ db -2, 16, 54, -453
+ db -2, 10, 58, -254
+55
+const h_tab_LumaCoeff, db 0, 0, 0, 64, 0, 0, 0, 056
+ db -1, 4, -10, 58, 17, -5, 1, 057
+ db -1, 4, -11, 40, 40, -11, 4, -158
+ db 0, 1, -5, 17, 58, -10, 4, -159
+60
+const h_tab_Tm, db 0, 1, 2, 3, 1, 2, 3, 4, 2, 3, 4, 5, 3, 4, 5, 661
+ db 4, 5, 6, 7, 5, 6, 7, 8, 6, 7, 8, 9, 7, 8, 9, 1062
+ db 8, 9,10,11, 9,10,11,12,10,11,12,13,11,12,13, 1463
+64
+65
+const h_tab_Lm, db 0, 1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7, 866
+ db 2, 3, 4, 5, 6, 7, 8, 9, 3, 4, 5, 6, 7, 8, 9, 1067
+ db 4, 5, 6, 7, 8, 9, 10, 11, 5, 6, 7, 8, 9, 10, 11, 1268
+ db 6, 7, 8, 9, 10, 11, 12, 13, 7, 8, 9, 10, 11, 12, 13, 1469
+70
+const interp4_shuf, times 2 db 0, 1, 8, 9, 4, 5, 12, 13, 2, 3, 10, 11, 6, 7, 14, 1571
+72
+const h_interp8_hps_shuf, dd 0, 4, 1, 5, 2, 6, 3, 773
+74
+const interp4_hpp_shuf, times 2 db 0, 1, 2, 3, 1, 2, 3, 4, 8, 9, 10, 11, 9, 10, 11, 1275
+76
+const interp4_horiz_shuf1, db 0, 1, 2, 3, 1, 2, 3, 4, 2, 3, 4, 5, 3, 4, 5, 677
+ db 8, 9, 10, 11, 9, 10, 11, 12, 10, 11, 12, 13, 11, 12, 13, 1478
+79
+const h_pd_526336, times 8 dd 8192*64+204880
+81
+const pb_LumaCoeffVer, times 16 db 0, 082
+ times 16 db 0, 6483
+ times 16 db 0, 084
+ times 16 db 0, 085
+86
+ times 16 db -1, 487
+ times 16 db -10, 5888
+ times 16 db 17, -589
+ times 16 db 1, 090
+91
+ times 16 db -1, 492
+ times 16 db -11, 4093
+ times 16 db 40, -1194
+ times 16 db 4, -195
+96
+ times 16 db 0, 197
+ times 16 db -5, 1798
+ times 16 db 58, -1099
+ times 16 db 4, -1100
+101
+const h_pw_LumaCoeffVer, times 8 dw 0, 0102
+ times 8 dw 0, 64103
+ times 8 dw 0, 0104
+ times 8 dw 0, 0105
+106
+ times 8 dw -1, 4107
+ times 8 dw -10, 58108
+ times 8 dw 17, -5109
+ times 8 dw 1, 0110
+111
+ times 8 dw -1, 4112
+ times 8 dw -11, 40113
+ times 8 dw 40, -11114
+ times 8 dw 4, -1115
+116
+ times 8 dw 0, 1117
+ times 8 dw -5, 17118
+ times 8 dw 58, -10119
+ times 8 dw 4, -1120
+121
+const pb_8tap_hps_0, times 2 db 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8122
+ times 2 db 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10123
+ times 2 db 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11,12124
+ times 2 db 6, 7, 7, 8, 8, 9, 9,10,10,11,11,12,12,13,13,14125
+126
+ALIGN 32127
+interp4_hps_shuf: times 2 db 0, 1, 2, 3, 1, 2, 3, 4, 8, 9, 10, 11, 9, 10, 11, 12128
+129
+SECTION .text130
+131
+cextern pw_1132
+cextern pw_32133
+cextern pw_2000134
+cextern pw_512135
+136
+%macro PROCESS_LUMA_AVX2_W8_16R 1137
+ movu xm0, [r0] ; m0 = row 0138
+ movu xm1, [r0 + r1] ; m1 = row 1139
+ punpckhwd xm2, xm0, xm1140
+ punpcklwd xm0, xm1141
+ vinserti128 m0, m0, xm2, 1142
+ pmaddwd m0, [r5]143
+ movu xm2, [r0 + r1 * 2] ; m2 = row 2144
+ punpckhwd xm3, xm1, xm2145
+ punpcklwd xm1, xm2146
+ vinserti128 m1, m1, xm3, 1147
+ pmaddwd m1, [r5]148
+ movu xm3, [r0 + r4] ; m3 = row 3149
+ punpckhwd xm4, xm2, xm3150
+ punpcklwd xm2, xm3151
+ vinserti128 m2, m2, xm4, 1152
+ pmaddwd m4, m2, [r5 + 1 * mmsize]153
+ paddd m0, m4154
+ pmaddwd m2, [r5]155
+ lea r7, [r0 + r1 * 4]156
+ movu xm4, [r7] ; m4 = row 4157
+ punpckhwd xm5, xm3, xm4158
+ punpcklwd xm3, xm4159
+ vinserti128 m3, m3, xm5, 1160
+ pmaddwd m5, m3, [r5 + 1 * mmsize]161
+ paddd m1, m5162
+ pmaddwd m3, [r5]163
+ movu xm5, [r7 + r1] ; m5 = row 5164
+ punpckhwd xm6, xm4, xm5165
+ punpcklwd xm4, xm5166
+ vinserti128 m4, m4, xm6, 1167
+ pmaddwd m6, m4, [r5 + 2 * mmsize]168
+ paddd m0, m6169
+ pmaddwd m6, m4, [r5 + 1 * mmsize]170
+ paddd m2, m6171
+ pmaddwd m4, [r5]172
+ movu xm6, [r7 + r1 * 2] ; m6 = row 6173
+ punpckhwd xm7, xm5, xm6174
+ punpcklwd xm5, xm6175
+ vinserti128 m5, m5, xm7, 1176
+ pmaddwd m7, m5, [r5 + 2 * mmsize]177
+ paddd m1, m7178
+ pmaddwd m7, m5, [r5 + 1 * mmsize]179
+ paddd m3, m7180
+ pmaddwd m5, [r5]181
+ movu xm7, [r7 + r4] ; m7 = row 7182
+ punpckhwd xm8, xm6, xm7183
+ punpcklwd xm6, xm7184
+ vinserti128 m6, m6, xm8, 1185
+ pmaddwd m8, m6, [r5 + 3 * mmsize]186
+ paddd m0, m8187
+ pmaddwd m8, m6, [r5 + 2 * mmsize]188
+ paddd m2, m8189
+ pmaddwd m8, m6, [r5 + 1 * mmsize]190
+ paddd m4, m8191
+ pmaddwd m6, [r5]192
+ lea r7, [r7 + r1 * 4]193
+ movu xm8, [r7] ; m8 = row 8194
+ punpckhwd xm9, xm7, xm8195
+ punpcklwd xm7, xm8196
+ vinserti128 m7, m7, xm9, 1197
+ pmaddwd m9, m7, [r5 + 3 * mmsize]198
+ paddd m1, m9199
+ pmaddwd m9, m7, [r5 + 2 * mmsize]200
+ paddd m3, m9201
x265_2.7.tar.gz/source/common/x86/h4-ipfilter16.asm
Added
201
1
2
+;*****************************************************************************3
+;* Copyright (C) 2013-2017 MulticoreWare, Inc4
+;*5
+;* Authors: Nabajit Deka <nabajit@multicorewareinc.com>6
+;* Murugan Vairavel <murugan@multicorewareinc.com>7
+;* Min Chen <chenm003@163.com>8
+;*9
+;* This program is free software; you can redistribute it and/or modify10
+;* it under the terms of the GNU General Public License as published by11
+;* the Free Software Foundation; either version 2 of the License, or12
+;* (at your option) any later version.13
+;*14
+;* This program is distributed in the hope that it will be useful,15
+;* but WITHOUT ANY WARRANTY; without even the implied warranty of16
+;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the17
+;* GNU General Public License for more details.18
+;*19
+;* You should have received a copy of the GNU General Public License20
+;* along with this program; if not, write to the Free Software21
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.22
+;*23
+;* This program is also available under a commercial proprietary license.24
+;* For more information, contact us at license @ x265.com.25
+;*****************************************************************************/26
+27
+%include "x86inc.asm"28
+%include "x86util.asm"29
+30
+31
+%define INTERP_OFFSET_PP pd_3232
+%define INTERP_SHIFT_PP 633
+34
+%if BIT_DEPTH == 1035
+ %define INTERP_SHIFT_PS 236
+ %define INTERP_OFFSET_PS pd_n3276837
+ %define INTERP_SHIFT_SP 1038
+ %define INTERP_OFFSET_SP h4_pd_52480039
+%elif BIT_DEPTH == 1240
+ %define INTERP_SHIFT_PS 441
+ %define INTERP_OFFSET_PS pd_n13107242
+ %define INTERP_SHIFT_SP 843
+ %define INTERP_OFFSET_SP pd_52441644
+%else45
+ %error Unsupport bit depth!46
+%endif47
+48
+49
+SECTION_RODATA 3250
+51
+tab_c_32: times 8 dd 3252
+h4_pd_524800: times 8 dd 52480053
+54
+tab_Tm16: db 0, 1, 2, 3, 4, 5, 6, 7, 2, 3, 4, 5, 6, 7, 8, 955
+56
+tab_ChromaCoeff: dw 0, 64, 0, 057
+ dw -2, 58, 10, -258
+ dw -4, 54, 16, -259
+ dw -6, 46, 28, -460
+ dw -4, 36, 36, -461
+ dw -4, 28, 46, -662
+ dw -2, 16, 54, -463
+ dw -2, 10, 58, -264
+65
+const h4_interp8_hpp_shuf, db 0, 1, 2, 3, 4, 5, 6, 7, 2, 3, 4, 5, 6, 7, 8, 966
+ db 4, 5, 6, 7, 8, 9, 10, 11, 6, 7, 8, 9, 10, 11, 12, 1367
+68
+SECTION .text69
+cextern pd_870
+cextern pd_3271
+cextern pw_pixel_max72
+cextern pd_52441673
+cextern pd_n3276874
+cextern pd_n13107275
+cextern pw_200076
+cextern idct8_shuf277
+78
+%macro FILTERH_W2_4_sse3 279
+ movh m3, [r0 + %1]80
+ movhps m3, [r0 + %1 + 2]81
+ pmaddwd m3, m082
+ movh m4, [r0 + r1 + %1]83
+ movhps m4, [r0 + r1 + %1 + 2]84
+ pmaddwd m4, m085
+ pshufd m2, m3, q230186
+ paddd m3, m287
+ pshufd m2, m4, q230188
+ paddd m4, m289
+ pshufd m3, m3, q312090
+ pshufd m4, m4, q312091
+ punpcklqdq m3, m492
+ paddd m3, m193
+ movh m5, [r0 + 2 * r1 + %1]94
+ movhps m5, [r0 + 2 * r1 + %1 + 2]95
+ pmaddwd m5, m096
+ movh m4, [r0 + r4 + %1]97
+ movhps m4, [r0 + r4 + %1 + 2]98
+ pmaddwd m4, m099
+ pshufd m2, m5, q2301100
+ paddd m5, m2101
+ pshufd m2, m4, q2301102
+ paddd m4, m2103
+ pshufd m5, m5, q3120104
+ pshufd m4, m4, q3120105
+ punpcklqdq m5, m4106
+ paddd m5, m1107
+%ifidn %2, pp108
+ psrad m3, 6109
+ psrad m5, 6110
+ packssdw m3, m5111
+ CLIPW m3, m7, m6112
+%else113
+ psrad m3, INTERP_SHIFT_PS114
+ psrad m5, INTERP_SHIFT_PS115
+ packssdw m3, m5116
+%endif117
+ movd [r2 + %1], m3118
+ psrldq m3, 4119
+ movd [r2 + r3 + %1], m3120
+ psrldq m3, 4121
+ movd [r2 + r3 * 2 + %1], m3122
+ psrldq m3, 4123
+ movd [r2 + r5 + %1], m3124
+%endmacro125
+126
+%macro FILTERH_W2_3_sse3 1127
+ movh m3, [r0 + %1]128
+ movhps m3, [r0 + %1 + 2]129
+ pmaddwd m3, m0130
+ movh m4, [r0 + r1 + %1]131
+ movhps m4, [r0 + r1 + %1 + 2]132
+ pmaddwd m4, m0133
+ pshufd m2, m3, q2301134
+ paddd m3, m2135
+ pshufd m2, m4, q2301136
+ paddd m4, m2137
+ pshufd m3, m3, q3120138
+ pshufd m4, m4, q3120139
+ punpcklqdq m3, m4140
+ paddd m3, m1141
+142
+ movh m5, [r0 + 2 * r1 + %1]143
+ movhps m5, [r0 + 2 * r1 + %1 + 2]144
+ pmaddwd m5, m0145
+146
+ pshufd m2, m5, q2301147
+ paddd m5, m2148
+ pshufd m5, m5, q3120149
+ paddd m5, m1150
+151
+ psrad m3, INTERP_SHIFT_PS152
+ psrad m5, INTERP_SHIFT_PS153
+ packssdw m3, m5154
+155
+ movd [r2 + %1], m3156
+ psrldq m3, 4157
+ movd [r2 + r3 + %1], m3158
+ psrldq m3, 4159
+ movd [r2 + r3 * 2 + %1], m3160
+%endmacro161
+162
+%macro FILTERH_W4_2_sse3 2163
+ movh m3, [r0 + %1]164
+ movhps m3, [r0 + %1 + 2]165
+ pmaddwd m3, m0166
+ movh m4, [r0 + %1 + 4]167
+ movhps m4, [r0 + %1 + 6]168
+ pmaddwd m4, m0169
+ pshufd m2, m3, q2301170
+ paddd m3, m2171
+ pshufd m2, m4, q2301172
+ paddd m4, m2173
+ pshufd m3, m3, q3120174
+ pshufd m4, m4, q3120175
+ punpcklqdq m3, m4176
+ paddd m3, m1177
+178
+ movh m5, [r0 + r1 + %1]179
+ movhps m5, [r0 + r1 + %1 + 2]180
+ pmaddwd m5, m0181
+ movh m4, [r0 + r1 + %1 + 4]182
+ movhps m4, [r0 + r1 + %1 + 6]183
+ pmaddwd m4, m0184
+ pshufd m2, m5, q2301185
+ paddd m5, m2186
+ pshufd m2, m4, q2301187
+ paddd m4, m2188
+ pshufd m5, m5, q3120189
+ pshufd m4, m4, q3120190
+ punpcklqdq m5, m4191
+ paddd m5, m1192
+%ifidn %2, pp193
+ psrad m3, 6194
+ psrad m5, 6195
+ packssdw m3, m5196
+ CLIPW m3, m7, m6197
+%else198
+ psrad m3, INTERP_SHIFT_PS199
+ psrad m5, INTERP_SHIFT_PS200
+ packssdw m3, m5201
x265_2.6.tar.gz/source/common/x86/intrapred8.asm -> x265_2.7.tar.gz/source/common/x86/intrapred8.asm
Changed
10
1
2
paddw m0, m13
packuswb m0, m04
5
- movd r2, m06
+ movd r2d, m07
mov [r0], r2b8
shr r2, 89
mov [r0 + r1], r2b10
x265_2.6.tar.gz/source/common/x86/ipfilter16.asm -> x265_2.7.tar.gz/source/common/x86/ipfilter16.asm
Changed
201
1
2
3
SECTION_RODATA 324
5
-tab_c_32: times 8 dd 326
tab_c_524800: times 4 dd 5248007
tab_c_n8192: times 8 dw -81928
pd_524800: times 8 dd 5248009
10
-tab_Tm16: db 0, 1, 2, 3, 4, 5, 6, 7, 2, 3, 4, 5, 6, 7, 8, 911
-12
-tab_ChromaCoeff: dw 0, 64, 0, 013
- dw -2, 58, 10, -214
- dw -4, 54, 16, -215
- dw -6, 46, 28, -416
- dw -4, 36, 36, -417
- dw -4, 28, 46, -618
- dw -2, 16, 54, -419
- dw -2, 10, 58, -220
-21
-const tab_ChromaCoeffV, times 8 dw 0, 6422
- times 8 dw 0, 023
-24
- times 8 dw -2, 5825
- times 8 dw 10, -226
-27
- times 8 dw -4, 5428
- times 8 dw 16, -229
-30
- times 8 dw -6, 4631
- times 8 dw 28, -432
-33
- times 8 dw -4, 3634
- times 8 dw 36, -435
-36
- times 8 dw -4, 2837
- times 8 dw 46, -638
-39
- times 8 dw -2, 1640
- times 8 dw 54, -441
-42
- times 8 dw -2, 1043
- times 8 dw 58, -244
-45
-tab_ChromaCoeffVer: times 8 dw 0, 6446
- times 8 dw 0, 047
-48
- times 8 dw -2, 5849
- times 8 dw 10, -250
-51
- times 8 dw -4, 5452
- times 8 dw 16, -253
-54
- times 8 dw -6, 4655
- times 8 dw 28, -456
-57
- times 8 dw -4, 3658
- times 8 dw 36, -459
-60
- times 8 dw -4, 2861
- times 8 dw 46, -662
-63
- times 8 dw -2, 1664
- times 8 dw 54, -465
-66
- times 8 dw -2, 1067
- times 8 dw 58, -268
-69
-tab_LumaCoeff: dw 0, 0, 0, 64, 0, 0, 0, 070
- dw -1, 4, -10, 58, 17, -5, 1, 071
- dw -1, 4, -11, 40, 40, -11, 4, -172
- dw 0, 1, -5, 17, 58, -10, 4, -173
-74
ALIGN 3275
tab_LumaCoeffV: times 4 dw 0, 076
times 4 dw 0, 6477
78
times 8 dw 58, -1079
times 8 dw 4, -180
81
-const interp8_hps_shuf, dd 0, 4, 1, 5, 2, 6, 3, 782
-83
-const interp8_hpp_shuf, db 0, 1, 2, 3, 4, 5, 6, 7, 2, 3, 4, 5, 6, 7, 8, 984
- db 4, 5, 6, 7, 8, 9, 10, 11, 6, 7, 8, 9, 10, 11, 12, 1385
-86
-const interp8_hpp_shuf_new, db 0, 1, 2, 3, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8, 987
- db 4, 5, 6, 7, 6, 7, 8, 9, 8, 9, 10, 11, 10, 11, 12, 1388
-89
SECTION .text90
cextern pd_891
cextern pd_3292
93
cextern pw_200094
cextern idct8_shuf295
96
-%macro FILTER_LUMA_HOR_4_sse2 197
- movu m4, [r0 + %1] ; m4 = src[0-7]98
- movu m5, [r0 + %1 + 2] ; m5 = src[1-8]99
- pmaddwd m4, m0100
- pmaddwd m5, m0101
- pshufd m2, m4, q2301102
- paddd m4, m2103
- pshufd m2, m5, q2301104
- paddd m5, m2105
- pshufd m4, m4, q3120106
- pshufd m5, m5, q3120107
- punpcklqdq m4, m5108
-109
- movu m5, [r0 + %1 + 4] ; m5 = src[2-9]110
- movu m3, [r0 + %1 + 6] ; m3 = src[3-10]111
- pmaddwd m5, m0112
- pmaddwd m3, m0113
- pshufd m2, m5, q2301114
- paddd m5, m2115
- pshufd m2, m3, q2301116
- paddd m3, m2117
- pshufd m5, m5, q3120118
- pshufd m3, m3, q3120119
- punpcklqdq m5, m3120
-121
- pshufd m2, m4, q2301122
- paddd m4, m2123
- pshufd m2, m5, q2301124
- paddd m5, m2125
- pshufd m4, m4, q3120126
- pshufd m5, m5, q3120127
- punpcklqdq m4, m5128
- paddd m4, m1129
-%endmacro130
-131
-%macro FILTER_LUMA_HOR_8_sse2 1132
- movu m4, [r0 + %1] ; m4 = src[0-7]133
- movu m5, [r0 + %1 + 2] ; m5 = src[1-8]134
- pmaddwd m4, m0135
- pmaddwd m5, m0136
- pshufd m2, m4, q2301137
- paddd m4, m2138
- pshufd m2, m5, q2301139
- paddd m5, m2140
- pshufd m4, m4, q3120141
- pshufd m5, m5, q3120142
- punpcklqdq m4, m5143
-144
- movu m5, [r0 + %1 + 4] ; m5 = src[2-9]145
- movu m3, [r0 + %1 + 6] ; m3 = src[3-10]146
- pmaddwd m5, m0147
- pmaddwd m3, m0148
- pshufd m2, m5, q2301149
- paddd m5, m2150
- pshufd m2, m3, q2301151
- paddd m3, m2152
- pshufd m5, m5, q3120153
- pshufd m3, m3, q3120154
- punpcklqdq m5, m3155
-156
- pshufd m2, m4, q2301157
- paddd m4, m2158
- pshufd m2, m5, q2301159
- paddd m5, m2160
- pshufd m4, m4, q3120161
- pshufd m5, m5, q3120162
- punpcklqdq m4, m5163
- paddd m4, m1164
-165
- movu m5, [r0 + %1 + 8] ; m5 = src[4-11]166
- movu m6, [r0 + %1 + 10] ; m6 = src[5-12]167
- pmaddwd m5, m0168
- pmaddwd m6, m0169
- pshufd m2, m5, q2301170
- paddd m5, m2171
- pshufd m2, m6, q2301172
- paddd m6, m2173
- pshufd m5, m5, q3120174
- pshufd m6, m6, q3120175
- punpcklqdq m5, m6176
-177
- movu m6, [r0 + %1 + 12] ; m6 = src[6-13]178
- movu m3, [r0 + %1 + 14] ; m3 = src[7-14]179
- pmaddwd m6, m0180
- pmaddwd m3, m0181
- pshufd m2, m6, q2301182
- paddd m6, m2183
- pshufd m2, m3, q2301184
- paddd m3, m2185
- pshufd m6, m6, q3120186
- pshufd m3, m3, q3120187
- punpcklqdq m6, m3188
-189
- pshufd m2, m5, q2301190
- paddd m5, m2191
- pshufd m2, m6, q2301192
- paddd m6, m2193
- pshufd m5, m5, q3120194
- pshufd m6, m6, q3120195
- punpcklqdq m5, m6196
- paddd m5, m1197
-%endmacro198
-199
-;------------------------------------------------------------------------------------------------------------200
-; void interp_8tap_horiz_p%3_%1x%2(pixel *src, intptr_t srcStride, pixel *dst, intptr_t dstStride, int coeffIdx)201
x265_2.6.tar.gz/source/common/x86/ipfilter8.asm -> x265_2.7.tar.gz/source/common/x86/ipfilter8.asm
Changed
201
1
2
3
const interp4_vpp_shuf, times 2 db 0, 4, 1, 5, 2, 6, 3, 7, 8, 12, 9, 13, 10, 14, 11, 154
5
-const interp_vert_shuf, times 2 db 0, 2, 1, 3, 2, 4, 3, 5, 4, 6, 5, 7, 6, 8, 7, 96
- times 2 db 4, 6, 5, 7, 6, 8, 7, 9, 8, 10, 9, 11, 10, 12, 11, 137
-8
const interp4_vpp_shuf1, dd 0, 1, 1, 2, 2, 3, 3, 49
dd 2, 3, 3, 4, 4, 5, 5, 610
11
-const pb_8tap_hps_0, times 2 db 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 812
- times 2 db 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,1013
- times 2 db 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11,1214
- times 2 db 6, 7, 7, 8, 8, 9, 9,10,10,11,11,12,12,13,13,1415
-16
const tab_Lm, db 0, 1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7, 817
db 2, 3, 4, 5, 6, 7, 8, 9, 3, 4, 5, 6, 7, 8, 9, 1018
db 4, 5, 6, 7, 8, 9, 10, 11, 5, 6, 7, 8, 9, 10, 11, 1219
db 6, 7, 8, 9, 10, 11, 12, 13, 7, 8, 9, 10, 11, 12, 13, 1420
21
-const tab_Vm, db 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 122
- db 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 323
-24
-const tab_Cm, db 0, 2, 1, 3, 0, 2, 1, 3, 0, 2, 1, 3, 0, 2, 1, 325
-26
const pd_526336, times 8 dd 8192*64+204827
28
-const tab_ChromaCoeff, db 0, 64, 0, 029
- db -2, 58, 10, -230
- db -4, 54, 16, -231
- db -6, 46, 28, -432
- db -4, 36, 36, -433
- db -4, 28, 46, -634
- db -2, 16, 54, -435
- db -2, 10, 58, -236
-37
-const tabw_ChromaCoeff, dw 0, 64, 0, 038
- dw -2, 58, 10, -239
- dw -4, 54, 16, -240
- dw -6, 46, 28, -441
- dw -4, 36, 36, -442
- dw -4, 28, 46, -643
- dw -2, 16, 54, -444
- dw -2, 10, 58, -245
-46
-const tab_ChromaCoeff_V, times 8 db 0, 6447
- times 8 db 0, 048
-49
- times 8 db -2, 5850
- times 8 db 10, -251
-52
- times 8 db -4, 5453
- times 8 db 16, -254
-55
- times 8 db -6, 4656
- times 8 db 28, -457
-58
- times 8 db -4, 3659
- times 8 db 36, -460
-61
- times 8 db -4, 2862
- times 8 db 46, -663
-64
- times 8 db -2, 1665
- times 8 db 54, -466
-67
- times 8 db -2, 1068
- times 8 db 58, -269
-70
-const tab_ChromaCoeffV, times 4 dw 0, 6471
- times 4 dw 0, 072
-73
- times 4 dw -2, 5874
- times 4 dw 10, -275
-76
- times 4 dw -4, 5477
- times 4 dw 16, -278
-79
- times 4 dw -6, 4680
- times 4 dw 28, -481
-82
- times 4 dw -4, 3683
- times 4 dw 36, -484
-85
- times 4 dw -4, 2886
- times 4 dw 46, -687
-88
- times 4 dw -2, 1689
- times 4 dw 54, -490
-91
- times 4 dw -2, 1092
- times 4 dw 58, -293
-94
-const pw_ChromaCoeffV, times 8 dw 0, 6495
- times 8 dw 0, 096
-97
- times 8 dw -2, 5898
- times 8 dw 10, -299
-100
- times 8 dw -4, 54101
- times 8 dw 16, -2102
-103
- times 8 dw -6, 46104
- times 8 dw 28, -4105
-106
- times 8 dw -4, 36107
- times 8 dw 36, -4108
-109
- times 8 dw -4, 28110
- times 8 dw 46, -6111
-112
- times 8 dw -2, 16113
- times 8 dw 54, -4114
-115
- times 8 dw -2, 10116
- times 8 dw 58, -2117
-118
const tab_LumaCoeff, db 0, 0, 0, 64, 0, 0, 0, 0119
db -1, 4, -10, 58, 17, -5, 1, 0120
db -1, 4, -11, 40, 40, -11, 4, -1121
122
times 8 dw 58, -10123
times 8 dw 4, -1124
125
-const pb_LumaCoeffVer, times 16 db 0, 0126
- times 16 db 0, 64127
- times 16 db 0, 0128
- times 16 db 0, 0129
-130
- times 16 db -1, 4131
- times 16 db -10, 58132
- times 16 db 17, -5133
- times 16 db 1, 0134
-135
- times 16 db -1, 4136
- times 16 db -11, 40137
- times 16 db 40, -11138
- times 16 db 4, -1139
-140
- times 16 db 0, 1141
- times 16 db -5, 17142
- times 16 db 58, -10143
- times 16 db 4, -1144
-145
const tab_LumaCoeffVer, times 8 db 0, 0146
times 8 db 0, 64147
times 8 db 0, 0148
149
times 16 db 58, -10150
times 16 db 4, -1151
152
-const tab_ChromaCoeffVer_32, times 16 db 0, 64153
- times 16 db 0, 0154
-155
- times 16 db -2, 58156
- times 16 db 10, -2157
-158
- times 16 db -4, 54159
- times 16 db 16, -2160
-161
- times 16 db -6, 46162
- times 16 db 28, -4163
-164
- times 16 db -4, 36165
- times 16 db 36, -4166
-167
- times 16 db -4, 28168
- times 16 db 46, -6169
-170
- times 16 db -2, 16171
- times 16 db 54, -4172
-173
- times 16 db -2, 10174
- times 16 db 58, -2175
-176
const tab_c_64_n64, times 8 db 64, -64177
178
-const interp4_shuf, times 2 db 0, 1, 8, 9, 4, 5, 12, 13, 2, 3, 10, 11, 6, 7, 14, 15179
-180
-const interp4_horiz_shuf1, db 0, 1, 2, 3, 1, 2, 3, 4, 2, 3, 4, 5, 3, 4, 5, 6181
- db 8, 9, 10, 11, 9, 10, 11, 12, 10, 11, 12, 13, 11, 12, 13, 14182
-183
-const interp4_hpp_shuf, times 2 db 0, 1, 2, 3, 1, 2, 3, 4, 8, 9, 10, 11, 9, 10, 11, 12184
-185
const interp8_hps_shuf, dd 0, 4, 1, 5, 2, 6, 3, 7186
187
-ALIGN 32188
-interp4_hps_shuf: times 2 db 0, 1, 2, 3, 1, 2, 3, 4, 8, 9, 10, 11, 9, 10, 11, 12189
-190
SECTION .text191
192
cextern pb_128193
194
cextern pw_2000195
cextern pw_8192196
197
-%macro FILTER_H4_w2_2_sse2 0198
- pxor m3, m3199
- movd m0, [srcq - 1]200
- movd m2, [srcq]201
x265_2.6.tar.gz/source/common/x86/loopfilter.asm -> x265_2.7.tar.gz/source/common/x86/loopfilter.asm
Changed
197
1
2
pxor m0, m0 ; m0 = 03
mova m6, [pb_2] ; m6 = [2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2]4
shr r4d, 45
-.loop6
+.loop:7
movu m7, [r0]8
movu m5, [r0 + 16]9
movu m3, [r0 + r3]10
11
mova m6, [pb_2] ; m6 = [2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2]12
mova m7, [pb_128]13
shr r4d, 414
-.loop15
+.loop:16
movu m1, [r0] ; m1 = pRec[x]17
movu m2, [r0 + r3] ; m2 = pRec[x + iStride]18
19
20
mova m4, [pb_2]21
shr r4d, 422
mova m0, [pw_pixel_max]23
-.loop24
+.loop:25
movu m5, [r0]26
movu m3, [r0 + r3]27
28
29
mova xm6, [pb_2] ; xm6 = [2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2]30
mova xm7, [pb_128]31
shr r4d, 432
-.loop33
+.loop:34
movu xm1, [r0] ; xm1 = pRec[x]35
movu xm2, [r0 + r3] ; xm2 = pRec[x + iStride]36
37
38
mov r5d, r4d39
shr r4d, 440
mov r6, r041
-.loop42
+.loop:43
movu m7, [r0]44
movu m5, [r0 + 16]45
movu m3, [r0 + r3]46
47
pxor m0, m0 ; m0 = 048
mova m7, [pb_128]49
shr r4d, 450
-.loop51
+.loop:52
movu m1, [r0] ; m1 = pRec[x]53
movu m2, [r0 + r3] ; m2 = pRec[x + iStride]54
55
56
mova m4, [pw_pixel_max]57
vbroadcasti128 m6, [r2] ; m6 = m_iOffsetEo58
shr r4d, 459
-.loop60
+.loop:61
movu m7, [r0]62
movu m5, [r0 + r3]63
movu m1, [r0 + r3 * 2]64
65
vbroadcasti128 m5, [pb_128]66
vbroadcasti128 m6, [r2] ; m6 = m_iOffsetEo67
shr r4d, 468
-.loop69
+.loop:70
movu xm1, [r0] ; m1 = pRec[x]71
movu xm2, [r0 + r3] ; m2 = pRec[x + iStride]72
vinserti128 m1, m1, xm2, 173
74
movh m6, [r0 + r4 * 2]75
movhps m6, [r1 + r4]76
77
-.loop78
+.loop:79
movu m7, [r0]80
movu m5, [r0 + 16]81
movu m3, [r0 + r5 + 2]82
83
movh m5, [r0 + r4]84
movhps m5, [r1 + r4]85
86
-.loop87
+.loop:88
movu m1, [r0] ; m1 = rec[x]89
movu m2, [r0 + r5 + 1] ; m2 = rec[x + stride + 1]90
pxor m3, m1, m791
92
movhps xm4, [r1 + r4]93
vbroadcasti128 m5, [r3]94
mova m6, [pw_pixel_max]95
-.loop96
+.loop:97
movu m1, [r0]98
movu m3, [r0 + r5 + 2]99
100
101
movhps xm4, [r1 + r4]102
vbroadcasti128 m5, [r3]103
104
-.loop105
+.loop:106
movu m1, [r0]107
movu m7, [r0 + 32]108
movu m3, [r0 + r5 + 2]109
110
movu m4, [r1 + 16] ; offset[16-31]111
pxor m7, m7112
113
-.loopH114
+.loopH:115
mov r5d, r2d116
xor r6, r6117
118
-.loopW119
+.loopW:120
movu m2, [r0 + r6]121
movu m5, [r0 + r6 + 16]122
psrlw m0, m2, (BIT_DEPTH - 5)123
124
movu m3, [r1 + 0] ; offset[0-15]125
movu m4, [r1 + 16] ; offset[16-31]126
pxor m7, m7 ; m7 =[0]127
-.loopH128
+.loopH:129
mov r5d, r2d130
xor r6, r6131
132
-.loopW133
+.loopW:134
movu m2, [r0 + r6] ; m0 = [rec]135
psrlw m1, m2, 3136
pand m1, [pb_31] ; m1 = [index]137
138
mov r6d, r3d139
shr r3d, 1140
141
-.loopH142
+.loopH:143
mov r5d, r2d144
-.loopW145
+.loopW:146
movu m2, [r0]147
movu m5, [r0 + r4]148
psrlw m0, m2, (BIT_DEPTH - 5)149
150
shr r2d, 4151
mov r1d, r3d152
shr r3d, 1153
-.loopH154
+.loopH:155
mov r5d, r2d156
-.loopW157
+.loopW:158
movu xm2, [r0] ; m2 = [rec]159
vinserti128 m2, m2, [r0 + r4], 1160
psrlw m1, m2, 3161
162
test r1b, 1163
jz .end164
mov r5d, r2d165
-.loopW1166
+.loopW1:167
movu xm2, [r0] ; m2 = [rec]168
psrlw xm1, xm2, 3169
pand xm1, xm7 ; m1 = [index]170
171
add r0, 16172
dec r5d173
jnz .loopW1174
-.end175
+.end:176
RET177
%endif178
179
180
add r3d, 1181
mov r5, r0182
movu m4, [r0 + r4]183
-.loop184
+.loop:185
movu m1, [r1] ; m2 = pRec[x]186
movu m2, [r2] ; m3 = pTmpU[x]187
188
189
mov r5, r0190
movu m4, [r0 + r4]191
192
-.loop193
+.loop:194
movu m1, [r1] ; m2 = pRec[x]195
movu m2, [r2] ; m3 = pTmpU[x]196
197
x265_2.6.tar.gz/source/common/x86/mc-a.asm -> x265_2.7.tar.gz/source/common/x86/mc-a.asm
Changed
154
1
2
lea r7, [r5 * 3]3
lea r8, [r1 * 3]4
mov r9d, 45
-.loop6
+.loop:7
pixel_avg_W88
dec r9d9
jnz .loop10
11
lea r7, [r5 * 3]12
lea r8, [r1 * 3]13
mov r9d, 814
-.loop15
+.loop:16
pixel_avg_W817
dec r9d18
jnz .loop19
20
lea r8, [r1 * 3]21
mov r9d, 422
23
-.loop24
+.loop:25
movu m0, [r2]26
movu m1, [r4]27
pavgw m0, m128
29
lea r7, [r5 * 3]30
lea r8, [r1 * 3]31
mov r9d, 432
-.loop33
+.loop:34
pixel_avg_H1635
dec r9d36
jnz .loop37
38
lea r7, [r5 * 3]39
lea r8, [r1 * 3]40
mov r9d, 441
-.loop42
+.loop:43
pixel_avg_H1644
pixel_avg_H1645
dec r9d46
47
lea r7, [r5 * 3]48
lea r8, [r1 * 3]49
mov r9d, 450
-.loop51
+.loop:52
pixel_avg_H1653
pixel_avg_H1654
pixel_avg_H1655
56
lea r8, [r1 * 3]57
mov r9d, 858
59
-.loop60
+.loop:61
movu m0, [r2]62
movu m1, [r4]63
pavgw m0, m164
65
lea r7, [r5 * 3]66
lea r8, [r1 * 3]67
mov r9d, 268
-.loop69
+.loop:70
pixel_avg_W3271
dec r9d72
jnz .loop73
74
lea r7, [r5 * 3]75
lea r8, [r1 * 3]76
mov r9d, 477
-.loop78
+.loop:79
pixel_avg_W3280
dec r9d81
jnz .loop82
83
lea r7, [r5 * 3]84
lea r8, [r1 * 3]85
mov r9d, 686
-.loop87
+.loop:88
pixel_avg_W3289
dec r9d90
jnz .loop91
92
lea r7, [r5 * 3]93
lea r8, [r1 * 3]94
mov r9d, 895
-.loop96
+.loop:97
pixel_avg_W3298
dec r9d99
jnz .loop100
101
lea r7, [r5 * 3]102
lea r8, [r1 * 3]103
mov r9d, 16104
-.loop105
+.loop:106
pixel_avg_W32107
dec r9d108
jnz .loop109
110
lea r7, [r5 * 3]111
lea r8, [r1 * 3]112
mov r9d, 4113
-.loop114
+.loop:115
pixel_avg_W64116
dec r9d117
jnz .loop118
119
lea r7, [r5 * 3]120
lea r8, [r1 * 3]121
mov r9d, 8122
-.loop123
+.loop:124
pixel_avg_W64125
dec r9d126
jnz .loop127
128
lea r7, [r5 * 3]129
lea r8, [r1 * 3]130
mov r9d, 12131
-.loop132
+.loop:133
pixel_avg_W64134
dec r9d135
jnz .loop136
137
lea r7, [r5 * 3]138
lea r8, [r1 * 3]139
mov r9d, 16140
-.loop141
+.loop:142
pixel_avg_W64143
dec r9d144
jnz .loop145
146
lea r8, [r1 * 3]147
mov r9d, 16148
149
-.loop150
+.loop:151
movu m0, [r2]152
movu m1, [r4]153
pavgw m0, m1154
x265_2.6.tar.gz/source/common/x86/pixel-util8.asm -> x265_2.7.tar.gz/source/common/x86/pixel-util8.asm
Changed
37
1
2
movu [r1], xm73
je .nextH4
5
-.width66
+.width6:7
cmp r6d, 68
jl .width49
movq [r1], xm710
11
lea r9, [r4 * 3]12
lea r8, [r5 * 3]13
14
-.loop15
+.loop:16
pmovzxbw m0, [r2]17
pmovzxbw m1, [r3]18
pmovzxbw m2, [r2 + r4]19
20
lea r7, [r4 * 3]21
lea r8, [r5 * 3]22
23
-.loop24
+.loop:25
movu m0, [r2]26
movu m1, [r2 + 32]27
movu m2, [r3]28
29
lea r7, [r4 * 3]30
lea r8, [r5 * 3]31
32
-.loop33
+.loop:34
movu m0, [r2]35
movu m1, [r2 + 32]36
movu m2, [r2 + 64]37
x265_2.6.tar.gz/source/common/x86/sad-a.asm -> x265_2.7.tar.gz/source/common/x86/sad-a.asm
Changed
82
1
2
xorps m5, m53
mov r4d, 44
5
-.loop6
+.loop:7
movu m1, [r0] ; row 0 of pix08
movu m2, [r2] ; row 0 of pix19
movu m3, [r0 + r1] ; row 1 of pix010
11
mov r4d, 612
lea r5, [r1 * 3]13
lea r6, [r3 * 3]14
-.loop15
+.loop:16
movu m1, [r0] ; row 0 of pix017
movu m2, [r2] ; row 0 of pix118
movu m3, [r0 + r1] ; row 1 of pix019
20
lea r5, [r1 * 3]21
lea r6, [r3 * 3]22
23
-.loop24
+.loop:25
movu m1, [r0] ; row 0 of pix026
movu m2, [r2] ; row 0 of pix127
movu m3, [r0 + r1] ; row 1 of pix028
29
lea r5, [r1 * 3]30
lea r6, [r3 * 3]31
32
-.loop33
+.loop:34
movu m1, [r0] ; row 0 of pix035
movu m2, [r2] ; row 0 of pix136
movu m3, [r0 + r1] ; row 1 of pix037
38
mov r4d, 64/439
lea r5, [r1 * 3]40
lea r6, [r3 * 3]41
-.loop42
+.loop:43
movu m1, [r0] ; row 0 of pix044
movu m2, [r2] ; row 0 of pix145
movu m3, [r0 + r1] ; row 1 of pix046
47
xorps m0, m048
xorps m5, m549
mov r4d, 450
-.loop51
+.loop:52
movu m1, [r0] ; first 32 of row 0 of pix053
movu m2, [r2] ; first 32 of row 0 of pix154
movu m3, [r0 + 32] ; second 32 of row 0 of pix055
56
xorps m0, m057
xorps m5, m558
mov r4d, 1659
-.loop60
+.loop:61
movu m1, [r0] ; first 32 of row 0 of pix062
movu m2, [r2] ; first 32 of row 0 of pix163
movu m3, [r0 + 32] ; second 32 of row 0 of pix064
65
mov r4d, 1266
lea r5, [r1 * 3]67
lea r6, [r3 * 3]68
-.loop69
+.loop:70
movu m1, [r0] ; first 32 of row 0 of pix071
movu m2, [r2] ; first 32 of row 0 of pix172
movu m3, [r0 + 32] ; second 32 of row 0 of pix073
74
mov r4d, 875
lea r5, [r1 * 3]76
lea r6, [r3 * 3]77
-.loop78
+.loop:79
movu m1, [r0] ; first 32 of row 0 of pix080
movu m2, [r2] ; first 32 of row 0 of pix181
movu m3, [r0 + 32] ; second 32 of row 0 of pix082
x265_2.6.tar.gz/source/common/x86/seaintegral.asm -> x265_2.7.tar.gz/source/common/x86/seaintegral.asm
Changed
107
1
2
mov r2, r13
shl r2, 44
5
-.loop6
+.loop:7
movu m0, [r0]8
movu m1, [r0 + r2]9
psubd m1, m010
11
mov r2, r112
shl r2, 513
14
-.loop15
+.loop:16
movu m0, [r0]17
movu m1, [r0 + r2]18
psubd m1, m019
20
shl r3, 421
add r2, r322
23
-.loop24
+.loop:25
movu m0, [r0]26
movu m1, [r0 + r2]27
psubd m1, m028
29
mov r2, r130
shl r2, 631
32
-.loop33
+.loop:34
movu m0, [r0]35
movu m1, [r0 + r2]36
psubd m1, m037
38
shl r3, 539
add r2, r340
41
-.loop42
+.loop:43
movu m0, [r0]44
movu m1, [r0 + r2]45
psubd m1, m046
47
mov r2, r148
shl r2, 749
50
-.loop51
+.loop:52
movu m0, [r0]53
movu m1, [r0 + r2]54
psubd m1, m055
56
movu [r0 + r3], xm057
jmp .end58
59
-.end60
+.end:61
RET62
%endif63
64
65
movu [r0 + r3], m066
jmp .end67
68
-.end69
+.end:70
RET71
%endif72
73
74
movu [r0 + r3], xm075
jmp .end76
77
-.end78
+.end:79
RET80
%endif81
82
83
movu [r0 + r3], m084
jmp .end85
86
-.end87
+.end:88
RET89
%endif90
91
92
movu [r0 + r3], m093
jmp .end94
95
-.end96
+.end:97
RET98
99
%macro INTEGRAL_THIRTYTWO_HORIZONTAL_16 0100
101
movu [r0 + r3], m0102
jmp .end103
104
-.end105
+.end:106
RET107
x265_2.7.tar.gz/source/common/x86/v4-ipfilter16.asm
Added
201
1
2
+;*****************************************************************************3
+;* Copyright (C) 2013-2017 MulticoreWare, Inc4
+;*5
+;* Authors: Nabajit Deka <nabajit@multicorewareinc.com>6
+;* Murugan Vairavel <murugan@multicorewareinc.com>7
+;* Min Chen <chenm003@163.com>8
+;*9
+;* This program is free software; you can redistribute it and/or modify10
+;* it under the terms of the GNU General Public License as published by11
+;* the Free Software Foundation; either version 2 of the License, or12
+;* (at your option) any later version.13
+;*14
+;* This program is distributed in the hope that it will be useful,15
+;* but WITHOUT ANY WARRANTY; without even the implied warranty of16
+;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the17
+;* GNU General Public License for more details.18
+;*19
+;* You should have received a copy of the GNU General Public License20
+;* along with this program; if not, write to the Free Software21
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.22
+;*23
+;* This program is also available under a commercial proprietary license.24
+;* For more information, contact us at license @ x265.com.25
+;*****************************************************************************/26
+27
+%include "x86inc.asm"28
+%include "x86util.asm"29
+30
+31
+%define INTERP_OFFSET_PP pd_3232
+%define INTERP_SHIFT_PP 633
+34
+%if BIT_DEPTH == 1035
+ %define INTERP_SHIFT_PS 236
+ %define INTERP_OFFSET_PS pd_n3276837
+ %define INTERP_SHIFT_SP 1038
+ %define INTERP_OFFSET_SP v4_pd_52480039
+%elif BIT_DEPTH == 1240
+ %define INTERP_SHIFT_PS 441
+ %define INTERP_OFFSET_PS pd_n13107242
+ %define INTERP_SHIFT_SP 843
+ %define INTERP_OFFSET_SP pd_52441644
+%else45
+ %error Unsupport bit depth!46
+%endif47
+48
+49
+SECTION_RODATA 3250
+51
+v4_pd_524800: times 8 dd 52480052
+tab_c_n8192: times 8 dw -819253
+54
+const tab_ChromaCoeffV, times 8 dw 0, 6455
+ times 8 dw 0, 056
+57
+ times 8 dw -2, 5858
+ times 8 dw 10, -259
+60
+ times 8 dw -4, 5461
+ times 8 dw 16, -262
+63
+ times 8 dw -6, 4664
+ times 8 dw 28, -465
+66
+ times 8 dw -4, 3667
+ times 8 dw 36, -468
+69
+ times 8 dw -4, 2870
+ times 8 dw 46, -671
+72
+ times 8 dw -2, 1673
+ times 8 dw 54, -474
+75
+ times 8 dw -2, 1076
+ times 8 dw 58, -277
+ 78
+tab_ChromaCoeffVer: times 8 dw 0, 6479
+ times 8 dw 0, 080
+81
+ times 8 dw -2, 5882
+ times 8 dw 10, -283
+84
+ times 8 dw -4, 5485
+ times 8 dw 16, -286
+87
+ times 8 dw -6, 4688
+ times 8 dw 28, -489
+90
+ times 8 dw -4, 3691
+ times 8 dw 36, -492
+93
+ times 8 dw -4, 2894
+ times 8 dw 46, -695
+96
+ times 8 dw -2, 1697
+ times 8 dw 54, -498
+99
+ times 8 dw -2, 10100
+ times 8 dw 58, -2101
+ 102
+SECTION .text103
+cextern pd_8104
+cextern pd_32105
+cextern pw_pixel_max106
+cextern pd_524416107
+cextern pd_n32768108
+cextern pd_n131072109
+cextern pw_2000110
+cextern idct8_shuf2111
+112
+%macro PROCESS_CHROMA_SP_W4_4R 0113
+ movq m0, [r0]114
+ movq m1, [r0 + r1]115
+ punpcklwd m0, m1 ;m0=[0 1]116
+ pmaddwd m0, [r6 + 0 *32] ;m0=[0+1] Row1117
+118
+ lea r0, [r0 + 2 * r1]119
+ movq m4, [r0]120
+ punpcklwd m1, m4 ;m1=[1 2]121
+ pmaddwd m1, [r6 + 0 *32] ;m1=[1+2] Row2122
+123
+ movq m5, [r0 + r1]124
+ punpcklwd m4, m5 ;m4=[2 3]125
+ pmaddwd m2, m4, [r6 + 0 *32] ;m2=[2+3] Row3126
+ pmaddwd m4, [r6 + 1 * 32]127
+ paddd m0, m4 ;m0=[0+1+2+3] Row1 done128
+129
+ lea r0, [r0 + 2 * r1]130
+ movq m4, [r0]131
+ punpcklwd m5, m4 ;m5=[3 4]132
+ pmaddwd m3, m5, [r6 + 0 *32] ;m3=[3+4] Row4133
+ pmaddwd m5, [r6 + 1 * 32]134
+ paddd m1, m5 ;m1 = [1+2+3+4] Row2135
+136
+ movq m5, [r0 + r1]137
+ punpcklwd m4, m5 ;m4=[4 5]138
+ pmaddwd m4, [r6 + 1 * 32]139
+ paddd m2, m4 ;m2=[2+3+4+5] Row3140
+141
+ movq m4, [r0 + 2 * r1]142
+ punpcklwd m5, m4 ;m5=[5 6]143
+ pmaddwd m5, [r6 + 1 * 32]144
+ paddd m3, m5 ;m3=[3+4+5+6] Row4145
+%endmacro146
+147
+;-----------------------------------------------------------------------------------------------------------------148
+; void interp_4tap_vert_%3_%1x%2(int16_t *src, intptr_t srcStride, int16_t *dst, intptr_t dstStride, int coeffIdx)149
+;-----------------------------------------------------------------------------------------------------------------150
+%macro FILTER_VER_CHROMA_SS 4151
+INIT_XMM sse2152
+cglobal interp_4tap_vert_%3_%1x%2, 5, 7, %4 ,0-gprsize153
+154
+ add r1d, r1d155
+ add r3d, r3d156
+ sub r0, r1157
+ shl r4d, 6158
+159
+%ifdef PIC160
+ lea r5, [tab_ChromaCoeffV]161
+ lea r6, [r5 + r4]162
+%else163
+ lea r6, [tab_ChromaCoeffV + r4]164
+%endif165
+166
+ mov dword [rsp], %2/4167
+168
+%ifnidn %3, ss169
+ %ifnidn %3, ps170
+ mova m7, [pw_pixel_max]171
+ %ifidn %3, pp172
+ mova m6, [INTERP_OFFSET_PP]173
+ %else174
+ mova m6, [INTERP_OFFSET_SP]175
+ %endif176
+ %else177
+ mova m6, [INTERP_OFFSET_PS]178
+ %endif179
+%endif180
+181
+.loopH:182
+ mov r4d, (%1/4)183
+.loopW:184
+ PROCESS_CHROMA_SP_W4_4R185
+186
+%ifidn %3, ss187
+ psrad m0, 6188
+ psrad m1, 6189
+ psrad m2, 6190
+ psrad m3, 6191
+192
+ packssdw m0, m1193
+ packssdw m2, m3194
+%elifidn %3, ps195
+ paddd m0, m6196
+ paddd m1, m6197
+ paddd m2, m6198
+ paddd m3, m6199
+ psrad m0, INTERP_SHIFT_PS200
+ psrad m1, INTERP_SHIFT_PS201
x265_2.7.tar.gz/source/common/x86/v4-ipfilter8.asm
Added
201
1
2
+;*****************************************************************************3
+;* Copyright (C) 2013-2017 MulticoreWare, Inc4
+;*5
+;* Authors: Min Chen <chenm003@163.com>6
+;* Nabajit Deka <nabajit@multicorewareinc.com>7
+;* Praveen Kumar Tiwari <praveen@multicorewareinc.com>8
+;*9
+;* This program is free software; you can redistribute it and/or modify10
+;* it under the terms of the GNU General Public License as published by11
+;* the Free Software Foundation; either version 2 of the License, or12
+;* (at your option) any later version.13
+;*14
+;* This program is distributed in the hope that it will be useful,15
+;* but WITHOUT ANY WARRANTY; without even the implied warranty of16
+;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the17
+;* GNU General Public License for more details.18
+;*19
+;* You should have received a copy of the GNU General Public License20
+;* along with this program; if not, write to the Free Software21
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.22
+;*23
+;* This program is also available under a commercial proprietary license.24
+;* For more information, contact us at license @ x265.com.25
+;*****************************************************************************/26
+27
+%include "x86inc.asm"28
+%include "x86util.asm"29
+30
+SECTION_RODATA 3231
+32
+const v4_pd_526336, times 8 dd 8192*64+204833
+34
+const tab_Vm, db 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 135
+ db 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 336
+37
+const tab_Cm, db 0, 2, 1, 3, 0, 2, 1, 3, 0, 2, 1, 3, 0, 2, 1, 338
+39
+const interp_vert_shuf, times 2 db 0, 2, 1, 3, 2, 4, 3, 5, 4, 6, 5, 7, 6, 8, 7, 940
+ times 2 db 4, 6, 5, 7, 6, 8, 7, 9, 8, 10, 9, 11, 10, 12, 11, 1341
+42
+const v4_interp4_vpp_shuf, times 2 db 0, 4, 1, 5, 2, 6, 3, 7, 8, 12, 9, 13, 10, 14, 11, 1543
+44
+const v4_interp4_vpp_shuf1, dd 0, 1, 1, 2, 2, 3, 3, 445
+ dd 2, 3, 3, 4, 4, 5, 5, 646
+47
+const tab_ChromaCoeff, db 0, 64, 0, 048
+ db -2, 58, 10, -249
+ db -4, 54, 16, -250
+ db -6, 46, 28, -451
+ db -4, 36, 36, -452
+ db -4, 28, 46, -653
+ db -2, 16, 54, -454
+ db -2, 10, 58, -255
+56
+const tabw_ChromaCoeff, dw 0, 64, 0, 057
+ dw -2, 58, 10, -258
+ dw -4, 54, 16, -259
+ dw -6, 46, 28, -460
+ dw -4, 36, 36, -461
+ dw -4, 28, 46, -662
+ dw -2, 16, 54, -463
+ dw -2, 10, 58, -264
+65
+const tab_ChromaCoeffV, times 4 dw 0, 6466
+ times 4 dw 0, 067
+68
+ times 4 dw -2, 5869
+ times 4 dw 10, -270
+71
+ times 4 dw -4, 5472
+ times 4 dw 16, -273
+74
+ times 4 dw -6, 4675
+ times 4 dw 28, -476
+77
+ times 4 dw -4, 3678
+ times 4 dw 36, -479
+80
+ times 4 dw -4, 2881
+ times 4 dw 46, -682
+83
+ times 4 dw -2, 1684
+ times 4 dw 54, -485
+86
+ times 4 dw -2, 1087
+ times 4 dw 58, -288
+89
+const tab_ChromaCoeff_V, times 8 db 0, 6490
+ times 8 db 0, 091
+92
+ times 8 db -2, 5893
+ times 8 db 10, -294
+95
+ times 8 db -4, 5496
+ times 8 db 16, -297
+98
+ times 8 db -6, 4699
+ times 8 db 28, -4100
+101
+ times 8 db -4, 36102
+ times 8 db 36, -4103
+104
+ times 8 db -4, 28105
+ times 8 db 46, -6106
+107
+ times 8 db -2, 16108
+ times 8 db 54, -4109
+110
+ times 8 db -2, 10111
+ times 8 db 58, -2112
+113
+const tab_ChromaCoeffVer_32, times 16 db 0, 64114
+ times 16 db 0, 0115
+116
+ times 16 db -2, 58117
+ times 16 db 10, -2118
+119
+ times 16 db -4, 54120
+ times 16 db 16, -2121
+122
+ times 16 db -6, 46123
+ times 16 db 28, -4124
+125
+ times 16 db -4, 36126
+ times 16 db 36, -4127
+128
+ times 16 db -4, 28129
+ times 16 db 46, -6130
+131
+ times 16 db -2, 16132
+ times 16 db 54, -4133
+134
+ times 16 db -2, 10135
+ times 16 db 58, -2136
+137
+const pw_ChromaCoeffV, times 8 dw 0, 64138
+ times 8 dw 0, 0139
+140
+ times 8 dw -2, 58141
+ times 8 dw 10, -2142
+143
+ times 8 dw -4, 54144
+ times 8 dw 16, -2145
+146
+ times 8 dw -6, 46147
+ times 8 dw 28, -4148
+149
+ times 8 dw -4, 36150
+ times 8 dw 36, -4151
+152
+ times 8 dw -4, 28153
+ times 8 dw 46, -6154
+155
+ times 8 dw -2, 16156
+ times 8 dw 54, -4157
+158
+ times 8 dw -2, 10159
+ times 8 dw 58, -2160
+161
+const v4_interp8_hps_shuf, dd 0, 4, 1, 5, 2, 6, 3, 7162
+163
+SECTION .text164
+165
+cextern pw_32166
+cextern pw_512167
+cextern pw_2000168
+169
+%macro WORD_TO_DOUBLE 1170
+%if ARCH_X86_64171
+ punpcklbw %1, m8172
+%else173
+ punpcklbw %1, %1174
+ psrlw %1, 8175
+%endif176
+%endmacro177
+178
+;-----------------------------------------------------------------------------179
+; void interp_4tap_vert_%1_2x%2(pixel *src, intptr_t srcStride, pixel *dst, intptr_t dstStride, int coeffIdx)180
+;-----------------------------------------------------------------------------181
+%macro FILTER_V4_W2_H4_sse2 2182
+INIT_XMM sse2183
+%if ARCH_X86_64184
+cglobal interp_4tap_vert_%1_2x%2, 4, 6, 9185
+ pxor m8, m8186
+%else187
+cglobal interp_4tap_vert_%1_2x%2, 4, 6, 8188
+%endif189
+ mov r4d, r4m190
+ sub r0, r1191
+192
+%ifidn %1,pp193
+ mova m1, [pw_32]194
+%elifidn %1,ps195
+ mova m1, [pw_2000]196
+ add r3d, r3d197
+%endif198
+199
+%ifdef PIC200
+ lea r5, [tabw_ChromaCoeff]201
x265_2.6.tar.gz/source/common/x86/x86inc.asm -> x265_2.7.tar.gz/source/common/x86/x86inc.asm
Changed
112
1
2
%endif3
%endif4
5
+%define FORMAT_ELF 06
+%ifidn __OUTPUT_FORMAT__,elf7
+ %define FORMAT_ELF 18
+%elifidn __OUTPUT_FORMAT__,elf329
+ %define FORMAT_ELF 110
+%elifidn __OUTPUT_FORMAT__,elf6411
+ %define FORMAT_ELF 112
+%endif13
+14
%ifdef PREFIX15
%define mangle(x) _ %+ x16
%else17
18
default rel19
%endif20
21
+%ifdef __NASM_VER__22
+ %use smartalign23
+%endif24
+25
; Macros to eliminate most code duplication between x86_32 and x86_64:26
; Currently this works only for leaf functions which load all their arguments27
; into registers at the start, and make no other use of the stack. Luckily that28
29
CAT_XDEFINE cglobaled_, %2, 130
%endif31
%xdefine current_function %232
- %ifidn __OUTPUT_FORMAT__,elf33
+ %if FORMAT_ELF34
global %2:function %%VISIBILITY35
%else36
global %237
38
39
; like cextern, but without the prefix40
%macro cextern_naked 141
- %xdefine %1 mangle(%1)42
+ %ifdef PREFIX43
+ %xdefine %1 mangle(%1)44
+ %endif45
CAT_XDEFINE cglobaled_, %1, 146
extern %147
%endmacro48
49
%macro const 1-2+50
%xdefine %1 mangle(private_prefix %+ _ %+ %1)51
- %ifidn __OUTPUT_FORMAT__,elf52
+ %if FORMAT_ELF53
global %1:data hidden54
%else55
global %156
57
%1: %258
%endmacro59
60
-; This is needed for ELF, otherwise the GNU linker assumes the stack is61
-; executable by default.62
-%ifidn __OUTPUT_FORMAT__,elf63
+; This is needed for ELF, otherwise the GNU linker assumes the stack is executable by default.64
+%if FORMAT_ELF65
[SECTION .note.GNU-stack noalloc noexec nowrite progbits]66
%endif67
68
69
%endif70
71
%if ARCH_X86_64 || cpuflag(sse2)72
- CPU amdnop73
+ %ifdef __NASM_VER__74
+ ALIGNMODE p675
+ %else76
+ CPU amdnop77
+ %endif78
%else79
- CPU basicnop80
+ %ifdef __NASM_VER__81
+ ALIGNMODE nop82
+ %else83
+ CPU basicnop84
+ %endif85
%endif86
%endmacro87
88
89
v%5%6 %1, %2, %3, %490
%elifidn %1, %291
; If %3 or %4 is a memory operand it needs to be encoded as the last operand.92
- %ifid %393
+ %ifnum sizeof%394
v%{5}213%6 %2, %3, %495
%else96
v%{5}132%6 %2, %4, %397
98
FMA4_INSTR fmsubadd, pd, ps99
FMA4_INSTR fnmadd, pd, ps, sd, ss100
FMA4_INSTR fnmsub, pd, ps, sd, ss101
-102
-; workaround: vpbroadcastq is broken in x86_32 due to a yasm bug (fixed in 1.3.0)103
-%if __YASM_VERSION_ID__ < 0x01030000 && ARCH_X86_64 == 0104
- %macro vpbroadcastq 2105
- %if sizeof%1 == 16106
- movddup %1, %2107
- %else108
- vbroadcastsd %1, %2109
- %endif110
- %endmacro111
-%endif112
x265_2.6.tar.gz/source/dynamicHDR10/JsonHelper.cpp -> x265_2.7.tar.gz/source/dynamicHDR10/JsonHelper.cpp
Changed
62
1
2
return JsonObject();3
}4
5
- ifstream tfile;6
- string json_str;7
- string json_str2;8
+ std::ifstream ifs(path);9
+ const std::string json_str2((std::istreambuf_iterator<char>(ifs)),10
+ (std::istreambuf_iterator<char>()));11
+12
string err = "";13
- tfile.open(path);14
- while(tfile)15
- {16
- std::getline(tfile, json_str);17
- json_str2.append(json_str);18
- }19
20
- tfile.close();21
- size_t beginning = json_str2.find_first_of("{");22
- int fixchar = json_str2[json_str2.size() - 2] == '}' ? 1 : 0;23
- return Json::parse(json_str2.substr(beginning,json_str2.size() - fixchar),err).object_items();24
+ return Json::parse(json_str2,err, JsonParse::COMMENTS).object_items();25
}26
27
JsonArray JsonHelper::readJsonArray(const string &path)28
29
return JsonArray();30
}31
32
- ifstream tfile;33
- string json_str;34
- string json_str2;35
- string err = "";36
- tfile.open(path);37
- while(tfile)38
- {39
- std::getline(tfile, json_str);40
- json_str2.append(json_str);41
- }42
+ std::ifstream ifs(path);43
+ const std::string json_str2((std::istreambuf_iterator<char>(ifs)),44
+ (std::istreambuf_iterator<char>()));45
46
- tfile.close();47
+ string err = "";48
49
- vector<Json> data;50
- if (json_str2.size() != 0)51
- {52
- size_t beginning = json_str2.find_first_of("[");53
- int fixchar = json_str2[json_str2.size() - 2] == ']' ? 1 : 0;54
- return Json::parse(json_str2.substr(beginning, json_str2.size() - fixchar), err).array_items();55
- }56
- else57
- return data;58
+ return Json::parse(json_str2,err, JsonParse::COMMENTS).array_items();59
}60
61
bool JsonHelper::validatePathExtension(string &path)62
x265_2.6.tar.gz/source/dynamicHDR10/SeiMetadataDictionary.cpp -> x265_2.7.tar.gz/source/dynamicHDR10/SeiMetadataDictionary.cpp
Changed
9
1
2
3
const std::string JsonDataKeys::LocalParameters = std::string("LocalParameters");4
const std::string JsonDataKeys::TargetDisplayLuminance = std::string("TargetedSystemDisplayMaximumLuminance");5
+const std::string JsonDataKeys::NumberOfWindows = std::string("NumberOfWindows");6
7
const std::string BezierCurveNames::TagName = std::string("BezierCurveData");8
const std::string BezierCurveNames::NumberOfAnchors = std::string("NumberOfAnchors");9
x265_2.6.tar.gz/source/dynamicHDR10/SeiMetadataDictionary.h -> x265_2.7.tar.gz/source/dynamicHDR10/SeiMetadataDictionary.h
Changed
9
1
2
public:3
static const std::string LocalParameters;4
static const std::string TargetDisplayLuminance;5
+ static const std::string NumberOfWindows; 6
};7
8
//Bezier Curve Data9
x265_2.6.tar.gz/source/dynamicHDR10/metadataFromJson.cpp -> x265_2.7.tar.gz/source/dynamicHDR10/metadataFromJson.cpp
Changed
120
1
2
const uint16_t terminalProviderCode = 0x003C;3
const uint16_t terminalProviderOrientedCode = 0x0001;4
const uint8_t applicationIdentifier = 4;5
- const uint8_t applicationVersion = 0;6
+ const uint8_t applicationVersion = 1;7
8
mPimpl->appendBits(metadata, countryCode, 8);9
mPimpl->appendBits(metadata, terminalProviderCode, 16);10
11
//Note: Validated only add up to two local selections, ignore the rest12
JsonArray jsonArray = fileData[frame][JsonDataKeys::LocalParameters].array_items();13
int ellipsesNum = static_cast<int>(jsonArray.size() > 2 ? 2 : jsonArray.size());14
-15
- uint16_t numWindows = 1 + static_cast<uint16_t>(ellipsesNum);16
-17
+ uint16_t numWindows = (uint16_t)fileData[frame][JsonDataKeys::NumberOfWindows].int_value();18
mPimpl->appendBits(metadata, numWindows, 2);19
for (int i = 0; i < ellipsesNum; ++i)20
{21
22
23
mPimpl->appendBits(metadata, semimajorExternalAxis, 16);24
mPimpl->appendBits(metadata, semiminorExternalAxis, 16);25
- /*bool*/ uint8_t overlapProcessOption = static_cast<uint8_t>(ellipseJsonObject[EllipseNames::OverlapProcessOption].int_value()); //1; 26
+ uint8_t overlapProcessOption = static_cast<uint8_t>(ellipseJsonObject[EllipseNames::OverlapProcessOption].int_value());27
//TODO: Uses Layering method, the value is "1"28
mPimpl->appendBits(metadata, overlapProcessOption, 1);29
}30
/* Targeted System Display Data */31
- uint32_t TEMPmonitorPeak = fileData[frame][JsonDataKeys::TargetDisplayLuminance].int_value(); //500;32
- mPimpl->appendBits(metadata, TEMPmonitorPeak, 27);33
-34
+ uint32_t monitorPeak = fileData[frame][JsonDataKeys::TargetDisplayLuminance].int_value(); //500;35
+ mPimpl->appendBits(metadata, monitorPeak, 27);36
//NOTE: Set as false for now, as requested37
- /*bool*/uint8_t targetedSystemDisplayActualPeakLuminanceFlag = 0; /*false*/38
+ uint8_t targetedSystemDisplayActualPeakLuminanceFlag = 0;39
mPimpl->appendBits(metadata, targetedSystemDisplayActualPeakLuminanceFlag, 1);40
if (targetedSystemDisplayActualPeakLuminanceFlag)41
{42
43
mPimpl->appendBits(metadata, static_cast<uint16_t>((int)luminanceData.maxGLuminance & 0xFFFF), 16);44
mPimpl->appendBits(metadata, static_cast<uint8_t>(((int)luminanceData.maxBLuminance & 0x10000) >> 16), 1);45
mPimpl->appendBits(metadata, static_cast<uint16_t>((int)luminanceData.maxBLuminance & 0xFFFF), 16);46
- /* changed from maxRGBLuminance to average luminance to match stms implementation */47
mPimpl->appendBits(metadata, static_cast<uint8_t>(((int)luminanceData.averageLuminance & 0x10000) >> 16), 1);48
mPimpl->appendBits(metadata, static_cast<uint16_t>((int)luminanceData.averageLuminance & 0xFFFF), 16);49
50
51
uint8_t distributionMaxrgbPercentage = static_cast<uint8_t>(percentilPercentages.at(i));52
mPimpl->appendBits(metadata, distributionMaxrgbPercentage, 7);53
54
- // 17bits: 1bit then 1655
+ /* 17bits: 1bit then 16 */56
unsigned int ithPercentile = luminanceData.percentiles.at(i);57
uint8_t highValue = static_cast<uint8_t>((ithPercentile & 0x10000) >> 16);58
uint16_t lowValue = static_cast<uint16_t>(ithPercentile & 0xFFFF);59
60
{61
//TODO62
}63
- // BEZIER CURVE DATA64
+ /* Bezier Curve Data */65
for (int w = 0; w < numWindows; ++w)66
{67
- //TODO: 68
uint8_t toneMappingFlag = 1;69
- mPimpl->appendBits(metadata, toneMappingFlag, 1);70
- if (toneMappingFlag)71
+ /* Check if the window contains tone mapping bezier curve data and set toneMappingFlag appropriately */72
+ //Json bezierData = fileData[frame][BezierCurveNames::TagName];73
+ BezierCurveData curveData;74
+ /* Select curve data based on global window */75
+ if (w == 0)76
{77
- Json bezierData = fileData[frame][BezierCurveNames::TagName];78
- BezierCurveData curveData;79
-80
- /* Select curve data based on global window or local window */81
- if (w == 0)82
+ if (!mPimpl->bezierCurveFromJson(fileData[frame][BezierCurveNames::TagName], curveData))83
{84
- if (!mPimpl->bezierCurveFromJson(bezierData, curveData))85
- {86
- std::cout << "error parsing bezierCurve frame: " << w << std::endl;87
- }88
+ toneMappingFlag = 0;89
}90
- else91
+ }92
+ /* Select curve data based on local window */93
+ else94
+ {95
+ if (!mPimpl->bezierCurveFromJson(jsonArray[w - 1][BezierCurveNames::TagName], curveData))96
{97
- if (!mPimpl->bezierCurveFromJson(jsonArray[w - 1][BezierCurveNames::TagName], curveData))98
- {99
- std::cout << "error parsing bezierCurve ellipse: " << w - 1 << std::endl;100
- }101
+ toneMappingFlag = 0;102
}103
-104
+ } 105
+ mPimpl->appendBits(metadata, toneMappingFlag, 1);106
+ if (toneMappingFlag)107
+ {108
uint16_t kneePointX = static_cast<uint16_t>(curveData.sPx);109
mPimpl->appendBits(metadata, kneePointX, 12);110
uint16_t kneePointY = static_cast<uint16_t>(curveData.sPy);111
112
mPimpl->appendBits(metadata, anchor, 10);113
}114
}115
- }116
+ }117
/* Set to false as requested */118
bool colorSaturationMappingFlag = 0;119
mPimpl->appendBits(metadata, colorSaturationMappingFlag, 1);120
x265_2.6.tar.gz/source/encoder/analysis.cpp -> x265_2.7.tar.gz/source/encoder/analysis.cpp
Changed
201
1
2
for (uint32_t depth = 0; depth <= m_param->maxCUDepth; depth++, cuSize >>= 1)3
{4
ModeDepth &md = m_modeDepth[depth];5
-6
- md.cuMemPool.create(depth, csp, MAX_PRED_TYPES, *m_param);7
+ ok &= md.cuMemPool.create(depth, csp, MAX_PRED_TYPES, *m_param);8
ok &= md.fencYuv.create(cuSize, csp);9
-10
- for (int j = 0; j < MAX_PRED_TYPES; j++)11
+ if (ok)12
{13
- md.pred[j].cu.initialize(md.cuMemPool, depth, *m_param, j);14
- ok &= md.pred[j].predYuv.create(cuSize, csp);15
- ok &= md.pred[j].reconYuv.create(cuSize, csp);16
- md.pred[j].fencYuv = &md.fencYuv;17
+ for (int j = 0; j < MAX_PRED_TYPES; j++)18
+ {19
+ md.pred[j].cu.initialize(md.cuMemPool, depth, *m_param, j);20
+ ok &= md.pred[j].predYuv.create(cuSize, csp);21
+ ok &= md.pred[j].reconYuv.create(cuSize, csp);22
+ md.pred[j].fencYuv = &md.fencYuv;23
+ }24
}25
}26
if (m_param->sourceHeight >= 1080)27
28
if (m_param->bCTUInfo && (*m_frame->m_ctuInfo + ctu.m_cuAddr))29
{30
x265_ctu_info_t* ctuTemp = *m_frame->m_ctuInfo + ctu.m_cuAddr;31
- if (ctuTemp->ctuPartitions)32
- {33
- int32_t depthIdx = 0;34
- uint32_t maxNum8x8Partitions = 64;35
- uint8_t* depthInfoPtr = m_frame->m_addOnDepth[ctu.m_cuAddr];36
- uint8_t* contentInfoPtr = m_frame->m_addOnCtuInfo[ctu.m_cuAddr];37
- int* prevCtuInfoChangePtr = m_frame->m_addOnPrevChange[ctu.m_cuAddr];38
- do39
- {40
- uint8_t depth = (uint8_t)ctuTemp->ctuPartitions[depthIdx];41
- uint8_t content = (uint8_t)(*((int32_t *)ctuTemp->ctuInfo + depthIdx));42
- int prevCtuInfoChange = m_frame->m_prevCtuInfoChange[ctu.m_cuAddr * maxNum8x8Partitions + depthIdx];43
- memset(depthInfoPtr, depth, sizeof(uint8_t) * numPartition >> 2 * depth);44
- memset(contentInfoPtr, content, sizeof(uint8_t) * numPartition >> 2 * depth);45
- memset(prevCtuInfoChangePtr, 0, sizeof(int) * numPartition >> 2 * depth);46
- for (uint32_t l = 0; l < numPartition >> 2 * depth; l++)47
- prevCtuInfoChangePtr[l] = prevCtuInfoChange;48
- depthInfoPtr += ctu.m_numPartitions >> 2 * depth;49
- contentInfoPtr += ctu.m_numPartitions >> 2 * depth;50
- prevCtuInfoChangePtr += ctu.m_numPartitions >> 2 * depth;51
- depthIdx++;52
- } while (ctuTemp->ctuPartitions[depthIdx] != 0);53
-54
- m_additionalCtuInfo = m_frame->m_addOnCtuInfo[ctu.m_cuAddr];55
- m_prevCtuInfoChange = m_frame->m_addOnPrevChange[ctu.m_cuAddr];56
- memcpy(ctu.m_cuDepth, m_frame->m_addOnDepth[ctu.m_cuAddr], sizeof(uint8_t) * numPartition);57
- //Calculate log2CUSize from depth58
- for (uint32_t i = 0; i < cuGeom.numPartitions; i++)59
- ctu.m_log2CUSize[i] = (uint8_t)m_param->maxLog2CUSize - ctu.m_cuDepth[i];60
- }61
+ int32_t depthIdx = 0;62
+ uint32_t maxNum8x8Partitions = 64;63
+ uint8_t* depthInfoPtr = m_frame->m_addOnDepth[ctu.m_cuAddr];64
+ uint8_t* contentInfoPtr = m_frame->m_addOnCtuInfo[ctu.m_cuAddr];65
+ int* prevCtuInfoChangePtr = m_frame->m_addOnPrevChange[ctu.m_cuAddr];66
+ do67
+ {68
+ uint8_t depth = (uint8_t)ctuTemp->ctuPartitions[depthIdx];69
+ uint8_t content = (uint8_t)(*((int32_t *)ctuTemp->ctuInfo + depthIdx));70
+ int prevCtuInfoChange = m_frame->m_prevCtuInfoChange[ctu.m_cuAddr * maxNum8x8Partitions + depthIdx];71
+ memset(depthInfoPtr, depth, sizeof(uint8_t) * numPartition >> 2 * depth);72
+ memset(contentInfoPtr, content, sizeof(uint8_t) * numPartition >> 2 * depth);73
+ memset(prevCtuInfoChangePtr, 0, sizeof(int) * numPartition >> 2 * depth);74
+ for (uint32_t l = 0; l < numPartition >> 2 * depth; l++)75
+ prevCtuInfoChangePtr[l] = prevCtuInfoChange;76
+ depthInfoPtr += ctu.m_numPartitions >> 2 * depth;77
+ contentInfoPtr += ctu.m_numPartitions >> 2 * depth;78
+ prevCtuInfoChangePtr += ctu.m_numPartitions >> 2 * depth;79
+ depthIdx++;80
+ } while (ctuTemp->ctuPartitions[depthIdx] != 0);81
+82
+ m_additionalCtuInfo = m_frame->m_addOnCtuInfo[ctu.m_cuAddr];83
+ m_prevCtuInfoChange = m_frame->m_addOnPrevChange[ctu.m_cuAddr];84
+ memcpy(ctu.m_cuDepth, m_frame->m_addOnDepth[ctu.m_cuAddr], sizeof(uint8_t) * numPartition);85
+ //Calculate log2CUSize from depth86
+ for (uint32_t i = 0; i < cuGeom.numPartitions; i++)87
+ ctu.m_log2CUSize[i] = (uint8_t)m_param->maxLog2CUSize - ctu.m_cuDepth[i];88
}89
-90
if (m_param->analysisMultiPassRefine && m_param->rc.bStatRead)91
{92
m_multipassAnalysis = (analysis2PassFrameData*)m_frame->m_analysis2Pass.analysisFramedata;93
94
}95
}96
97
- if (m_param->analysisReuseMode && m_slice->m_sliceType != I_SLICE && m_param->analysisReuseLevel > 1 && m_param->analysisReuseLevel < 10)98
+ if ((m_param->analysisSave || m_param->analysisLoad) && m_slice->m_sliceType != I_SLICE && m_param->analysisReuseLevel > 1 && m_param->analysisReuseLevel < 10)99
{100
int numPredDir = m_slice->isInterP() ? 1 : 2;101
m_reuseInterDataCTU = (analysis_inter_data*)m_frame->m_analysisData.interData;102
- m_reuseRef = &m_reuseInterDataCTU->ref[ctu.m_cuAddr * X265_MAX_PRED_MODE_PER_CTU * numPredDir];103
+ m_reuseRef = &m_reuseInterDataCTU->ref [ctu.m_cuAddr * X265_MAX_PRED_MODE_PER_CTU * numPredDir];104
m_reuseDepth = &m_reuseInterDataCTU->depth[ctu.m_cuAddr * ctu.m_numPartitions];105
m_reuseModes = &m_reuseInterDataCTU->modes[ctu.m_cuAddr * ctu.m_numPartitions];106
if (m_param->analysisReuseLevel > 4)107
108
m_reusePartSize = &m_reuseInterDataCTU->partSize[ctu.m_cuAddr * ctu.m_numPartitions];109
m_reuseMergeFlag = &m_reuseInterDataCTU->mergeFlag[ctu.m_cuAddr * ctu.m_numPartitions];110
}111
- if (m_param->analysisReuseMode == X265_ANALYSIS_SAVE)112
+ if (m_param->analysisSave && !m_param->analysisLoad)113
for (int i = 0; i < X265_MAX_PRED_MODE_PER_CTU * numPredDir; i++)114
m_reuseRef[i] = -1;115
}116
117
if (m_slice->m_sliceType == I_SLICE)118
{119
analysis_intra_data* intraDataCTU = (analysis_intra_data*)m_frame->m_analysisData.intraData;120
- if (m_param->analysisReuseMode == X265_ANALYSIS_LOAD && m_param->analysisReuseLevel > 1)121
+ if (m_param->analysisLoad && m_param->analysisReuseLevel > 1)122
{123
memcpy(ctu.m_cuDepth, &intraDataCTU->depth[ctu.m_cuAddr * numPartition], sizeof(uint8_t) * numPartition);124
memcpy(ctu.m_lumaIntraDir, &intraDataCTU->modes[ctu.m_cuAddr * numPartition], sizeof(uint8_t) * numPartition);125
126
}127
else128
{129
- bool bCopyAnalysis = ((m_param->analysisReuseMode == X265_ANALYSIS_LOAD && m_param->analysisReuseLevel == 10) || (m_param->bMVType && m_param->analysisReuseLevel >= 7 && ctu.m_numPartitions <= 16));130
+ bool bCopyAnalysis = ((m_param->analysisLoad && m_param->analysisReuseLevel == 10) || (m_param->bMVType && m_param->analysisReuseLevel >= 7 && ctu.m_numPartitions <= 16));131
bool BCompressInterCUrd0_4 = (m_param->bMVType && m_param->analysisReuseLevel >= 7 && m_param->rdLevel <= 4);132
bool BCompressInterCUrd5_6 = (m_param->bMVType && m_param->analysisReuseLevel >= 7 && m_param->rdLevel >= 5 && m_param->rdLevel <= 6);133
bCopyAnalysis = bCopyAnalysis || BCompressInterCUrd0_4 || BCompressInterCUrd5_6;134
135
/* generate residual for entire CTU at once and copy to reconPic */136
encodeResidue(ctu, cuGeom);137
}138
- else if ((m_param->analysisReuseMode == X265_ANALYSIS_LOAD && m_param->analysisReuseLevel == 10) || ((m_param->bMVType == AVC_INFO) && m_param->analysisReuseLevel >= 7))139
+ else if ((m_param->analysisLoad && m_param->analysisReuseLevel == 10) || ((m_param->bMVType == AVC_INFO) && m_param->analysisReuseLevel >= 7 && ctu.m_numPartitions <= 16))140
{141
analysis_inter_data* interDataCTU = (analysis_inter_data*)m_frame->m_analysisData.interData;142
int posCTU = ctu.m_cuAddr * numPartition;143
144
145
int bestCUQP = qp;146
int lambdaQP = lqp;147
-148
bool doQPRefine = (bDecidedDepth && depth <= m_slice->m_pps->maxCuDQPDepth) || (!bDecidedDepth && depth == m_slice->m_pps->maxCuDQPDepth);149
- if (m_param->analysisReuseLevel == 10)150
+ if (m_param->analysisReuseLevel >= 7)151
doQPRefine = false;152
-153
if (doQPRefine)154
{155
uint64_t bestCUCost, origCUCost, cuCost, cuPrevCost;156
157
cacheCost[cuIdx] = md.bestMode->rdCost;158
}159
160
- /* Save Intra CUs TU depth only when analysis mode is OFF */161
- if ((m_limitTU & X265_TU_LIMIT_NEIGH) && cuGeom.log2CUSize >= 4 && !m_param->analysisReuseMode)162
+ if ((m_limitTU & X265_TU_LIMIT_NEIGH) && cuGeom.log2CUSize >= 4)163
{164
CUData* ctu = md.bestMode->cu.m_encData->getPicCTU(parentCTU.m_cuAddr);165
int8_t maxTUDepth = -1;166
for (uint32_t i = 0; i < cuGeom.numPartitions; i++)167
- maxTUDepth = X265_MAX(maxTUDepth, md.pred[PRED_INTRA].cu.m_tuDepth[i]);168
+ maxTUDepth = X265_MAX(maxTUDepth, md.bestMode->cu.m_tuDepth[i]);169
ctu->m_refTuDepth[cuGeom.geomRecurId] = maxTUDepth;170
}171
172
173
mightSplit &= !bDecidedDepth;174
}175
}176
- if ((m_param->analysisReuseMode == X265_ANALYSIS_LOAD && m_param->analysisReuseLevel > 1 && m_param->analysisReuseLevel != 10))177
+ if ((m_param->analysisLoad && m_param->analysisReuseLevel > 1 && m_param->analysisReuseLevel != 10))178
{179
if (mightNotSplit && depth == m_reuseDepth[cuGeom.absPartIdx])180
{181
182
}183
}184
}185
-186
/* Step 1. Evaluate Merge/Skip candidates for likely early-outs, if skip mode was not set above */187
- if ((mightNotSplit && depth >= minDepth && !md.bestMode && !bCtuInfoCheck) || (m_param->bMVType && (m_modeFlag[0] || m_modeFlag[1]))) /* TODO: Re-evaluate if analysis load/save still works */188
+ if ((mightNotSplit && depth >= minDepth && !md.bestMode && !bCtuInfoCheck) || (m_param->bMVType && m_param->analysisReuseLevel == 7 && (m_modeFlag[0] || m_modeFlag[1]))) /* TODO: Re-evaluate if analysis load/save still works */189
{190
/* Compute Merge Cost */191
md.pred[PRED_MERGE].cu.initSubCU(parentCTU, cuGeom, qp);192
193
skipModes = (m_param->bEnableEarlySkip || m_param->interRefine == 2)194
&& md.bestMode && md.bestMode->cu.isSkipped(0); // TODO: sa8d threshold per depth195
}196
-197
- if (md.bestMode && m_param->bEnableRecursionSkip && !bCtuInfoCheck && !(m_param->bMVType && (m_modeFlag[0] || m_modeFlag[1])))198
+ if (md.bestMode && m_param->bEnableRecursionSkip && !bCtuInfoCheck && !(m_param->bMVType && m_param->analysisReuseLevel == 7 && (m_modeFlag[0] || m_modeFlag[1])))199
{200
skipRecursion = md.bestMode->cu.isSkipped(0);201
x265_2.6.tar.gz/source/encoder/api.cpp -> x265_2.7.tar.gz/source/encoder/api.cpp
Changed
201
1
2
"Y PSNR, U PSNR, V PSNR, Global PSNR, SSIM, SSIM (dB), "3
"I count, I ave-QP, I kbps, I-PSNR Y, I-PSNR U, I-PSNR V, I-SSIM (dB), "4
"P count, P ave-QP, P kbps, P-PSNR Y, P-PSNR U, P-PSNR V, P-SSIM (dB), "5
- "B count, B ave-QP, B kbps, B-PSNR Y, B-PSNR U, B-PSNR V, B-SSIM (dB), "6
- "MaxCLL, MaxFALL, Version\n";7
-8
+ "B count, B ave-QP, B kbps, B-PSNR Y, B-PSNR U, B-PSNR V, B-SSIM (dB), ";9
x265_encoder *x265_encoder_open(x265_param *p)10
{11
if (!p)12
13
{14
if (!enc || !param_in)15
return -1;16
-17
x265_param save;18
Encoder* encoder = static_cast<Encoder*>(enc);19
+ if (encoder->m_param->csvfn == NULL && param_in->csvfpt != NULL)20
+ encoder->m_param->csvfpt = param_in->csvfpt;21
if (encoder->m_latestParam->forceFlush != param_in->forceFlush)22
return encoder->reconfigureParam(encoder->m_latestParam, param_in);23
bool isReconfigureRc = encoder->isReconfigureRc(encoder->m_latestParam, param_in);24
25
Encoder *encoder = static_cast<Encoder*>(enc);26
x265_stats stats;27
encoder->fetchStats(&stats, sizeof(stats));28
- x265_csvlog_encode(enc, &stats, argc, argv);29
+ int padx = encoder->m_sps.conformanceWindow.rightOffset;30
+ int pady = encoder->m_sps.conformanceWindow.bottomOffset;31
+ x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);32
}33
}34
35
36
return -1;37
}38
39
-int x265_get_ref_frame_list(x265_encoder *enc, x265_picyuv** l0, x265_picyuv** l1, int sliceType, int poc)40
+int x265_get_ref_frame_list(x265_encoder *enc, x265_picyuv** l0, x265_picyuv** l1, int sliceType, int poc, int* pocL0, int* pocL1)41
{42
if (!enc)43
return -1;44
45
Encoder *encoder = static_cast<Encoder*>(enc);46
- return encoder->getRefFrameList((PicYuv**)l0, (PicYuv**)l1, sliceType, poc);47
+ return encoder->getRefFrameList((PicYuv**)l0, (PicYuv**)l1, sliceType, poc, pocL0, pocL1);48
}49
50
int x265_set_analysis_data(x265_encoder *enc, x265_analysis_data *analysis_data, int poc, uint32_t cuBytes)51
52
pic->userSEI.payloads = NULL;53
pic->userSEI.numPayloads = 0;54
55
- if (param->analysisReuseMode || (param->bMVType == AVC_INFO))56
+ if ((param->analysisSave || param->analysisLoad) || (param->bMVType == AVC_INFO))57
{58
uint32_t widthInCU = (param->sourceWidth + param->maxCUSize - 1) >> param->maxLog2CUSize;59
uint32_t heightInCU = (param->sourceHeight + param->maxCUSize - 1) >> param->maxLog2CUSize;60
61
fprintf(csvfp, "\n");62
}63
else64
+ {65
fputs(summaryCSVHeader, csvfp);66
+ if (param->csvLogLevel >= 2 || param->maxCLL || param->maxFALL)67
+ fputs("MaxCLL, MaxFALL,", csvfp);68
+ fputs(" Version\n", csvfp);69
+ }70
}71
return csvfp;72
}73
74
fflush(stderr);75
}76
77
-void x265_csvlog_encode(x265_encoder *enc, const x265_stats* stats, int argc, char** argv)78
+void x265_csvlog_encode(const x265_param *p, const x265_stats *stats, int padx, int pady, int argc, char** argv)79
{80
- if (enc)81
+ if (p && p->csvfpt)82
{83
- Encoder *encoder = static_cast<Encoder*>(enc);84
- int padx = encoder->m_sps.conformanceWindow.rightOffset;85
- int pady = encoder->m_sps.conformanceWindow.bottomOffset;86
const x265_api * api = x265_api_get(0);87
88
- if (!encoder->m_param->csvfpt)89
- return;90
-91
- if (encoder->m_param->csvLogLevel)92
+ if (p->csvLogLevel)93
{94
// adding summary to a per-frame csv log file, so it needs a summary header95
- fprintf(encoder->m_param->csvfpt, "\nSummary\n");96
- fputs(summaryCSVHeader, encoder->m_param->csvfpt);97
+ fprintf(p->csvfpt, "\nSummary\n");98
+ fputs(summaryCSVHeader, p->csvfpt);99
+ if (p->csvLogLevel >= 2 || p->maxCLL || p->maxFALL)100
+ fputs("MaxCLL, MaxFALL,", p->csvfpt);101
+ fputs(" Version\n",p->csvfpt);102
}103
-104
// CLI arguments or other105
if (argc)106
{107
- fputc('"', encoder->m_param->csvfpt);108
+ fputc('"', p->csvfpt);109
for (int i = 1; i < argc; i++)110
{111
- fputc(' ', encoder->m_param->csvfpt);112
- fputs(argv[i], encoder->m_param->csvfpt);113
+ fputc(' ', p->csvfpt);114
+ fputs(argv[i], p->csvfpt);115
}116
- fputc('"', encoder->m_param->csvfpt);117
+ fputc('"', p->csvfpt);118
}119
else120
{121
- const x265_param* paramTemp = encoder->m_param;122
- char *opts = x265_param2string((x265_param*)paramTemp, padx, pady);123
+ char *opts = x265_param2string((x265_param*)p, padx, pady);124
if (opts)125
{126
- fputc('"', encoder->m_param->csvfpt);127
- fputs(opts, encoder->m_param->csvfpt);128
- fputc('"', encoder->m_param->csvfpt);129
+ fputc('"', p->csvfpt);130
+ fputs(opts, p->csvfpt);131
+ fputc('"', p->csvfpt);132
}133
}134
135
136
timeinfo = localtime(&now);137
char buffer[200];138
strftime(buffer, 128, "%c", timeinfo);139
- fprintf(encoder->m_param->csvfpt, ", %s, ", buffer);140
+ fprintf(p->csvfpt, ", %s, ", buffer);141
142
// elapsed time, fps, bitrate143
- fprintf(encoder->m_param->csvfpt, "%.2f, %.2f, %.2f,",144
+ fprintf(p->csvfpt, "%.2f, %.2f, %.2f,",145
stats->elapsedEncodeTime, stats->encodedPictureCount / stats->elapsedEncodeTime, stats->bitrate);146
147
- if (encoder->m_param->bEnablePsnr)148
- fprintf(encoder->m_param->csvfpt, " %.3lf, %.3lf, %.3lf, %.3lf,",149
+ if (p->bEnablePsnr)150
+ fprintf(p->csvfpt, " %.3lf, %.3lf, %.3lf, %.3lf,",151
stats->globalPsnrY / stats->encodedPictureCount, stats->globalPsnrU / stats->encodedPictureCount,152
stats->globalPsnrV / stats->encodedPictureCount, stats->globalPsnr);153
else154
- fprintf(encoder->m_param->csvfpt, " -, -, -, -,");155
- if (encoder->m_param->bEnableSsim)156
- fprintf(encoder->m_param->csvfpt, " %.6f, %6.3f,", stats->globalSsim, x265_ssim2dB(stats->globalSsim));157
+ fprintf(p->csvfpt, " -, -, -, -,");158
+ if (p->bEnableSsim)159
+ fprintf(p->csvfpt, " %.6f, %6.3f,", stats->globalSsim, x265_ssim2dB(stats->globalSsim));160
else161
- fprintf(encoder->m_param->csvfpt, " -, -,");162
+ fprintf(p->csvfpt, " -, -,");163
164
if (stats->statsI.numPics)165
{166
- fprintf(encoder->m_param->csvfpt, " %-6u, %2.2lf, %-8.2lf,", stats->statsI.numPics, stats->statsI.avgQp, stats->statsI.bitrate);167
- if (encoder->m_param->bEnablePsnr)168
- fprintf(encoder->m_param->csvfpt, " %.3lf, %.3lf, %.3lf,", stats->statsI.psnrY, stats->statsI.psnrU, stats->statsI.psnrV);169
+ fprintf(p->csvfpt, " %-6u, %2.2lf, %-8.2lf,", stats->statsI.numPics, stats->statsI.avgQp, stats->statsI.bitrate);170
+ if (p->bEnablePsnr)171
+ fprintf(p->csvfpt, " %.3lf, %.3lf, %.3lf,", stats->statsI.psnrY, stats->statsI.psnrU, stats->statsI.psnrV);172
else173
- fprintf(encoder->m_param->csvfpt, " -, -, -,");174
- if (encoder->m_param->bEnableSsim)175
- fprintf(encoder->m_param->csvfpt, " %.3lf,", stats->statsI.ssim);176
+ fprintf(p->csvfpt, " -, -, -,");177
+ if (p->bEnableSsim)178
+ fprintf(p->csvfpt, " %.3lf,", stats->statsI.ssim);179
else180
- fprintf(encoder->m_param->csvfpt, " -,");181
+ fprintf(p->csvfpt, " -,");182
}183
else184
- fprintf(encoder->m_param->csvfpt, " -, -, -, -, -, -, -,");185
+ fprintf(p->csvfpt, " -, -, -, -, -, -, -,");186
187
if (stats->statsP.numPics)188
{189
- fprintf(encoder->m_param->csvfpt, " %-6u, %2.2lf, %-8.2lf,", stats->statsP.numPics, stats->statsP.avgQp, stats->statsP.bitrate);190
- if (encoder->m_param->bEnablePsnr)191
- fprintf(encoder->m_param->csvfpt, " %.3lf, %.3lf, %.3lf,", stats->statsP.psnrY, stats->statsP.psnrU, stats->statsP.psnrV);192
+ fprintf(p->csvfpt, " %-6u, %2.2lf, %-8.2lf,", stats->statsP.numPics, stats->statsP.avgQp, stats->statsP.bitrate);193
+ if (p->bEnablePsnr)194
+ fprintf(p->csvfpt, " %.3lf, %.3lf, %.3lf,", stats->statsP.psnrY, stats->statsP.psnrU, stats->statsP.psnrV);195
else196
- fprintf(encoder->m_param->csvfpt, " -, -, -,");197
- if (encoder->m_param->bEnableSsim)198
- fprintf(encoder->m_param->csvfpt, " %.3lf,", stats->statsP.ssim);199
+ fprintf(p->csvfpt, " -, -, -,");200
+ if (p->bEnableSsim)201
x265_2.6.tar.gz/source/encoder/dpb.cpp -> x265_2.7.tar.gz/source/encoder/dpb.cpp
Changed
57
1
2
m_freeList.pushBack(*curFrame);3
curFrame->m_encData->m_freeListNext = m_frameDataFreeList;4
m_frameDataFreeList = curFrame->m_encData;5
-6
- if (curFrame->m_encData->m_meBuffer)7
+ for (int i = 0; i < INTEGRAL_PLANE_NUM; i++)8
{9
- for (int i = 0; i < INTEGRAL_PLANE_NUM; i++)10
+ if (curFrame->m_encData->m_meBuffer[i] != NULL)11
{12
- if (curFrame->m_encData->m_meBuffer[i] != NULL)13
- {14
- X265_FREE(curFrame->m_encData->m_meBuffer[i]);15
- curFrame->m_encData->m_meBuffer[i] = NULL;16
- }17
+ X265_FREE(curFrame->m_encData->m_meBuffer[i]);18
+ curFrame->m_encData->m_meBuffer[i] = NULL;19
}20
}21
-22
if (curFrame->m_ctuInfo != NULL)23
{24
uint32_t widthInCU = (curFrame->m_param->sourceWidth + curFrame->m_param->maxCUSize - 1) >> curFrame->m_param->maxLog2CUSize;25
26
// Mark pictures in m_piclist as unreferenced if they are not included in RPS27
applyReferencePictureSet(&slice->m_rps, pocCurr);28
29
- slice->m_numRefIdx[0] = X265_MIN(newFrame->m_param->maxNumReferences, slice->m_rps.numberOfNegativePictures); // Ensuring L0 contains just the -ve POC30
+ if (slice->m_sliceType != I_SLICE)31
+ slice->m_numRefIdx[0] = x265_clip3(1, newFrame->m_param->maxNumReferences, slice->m_rps.numberOfNegativePictures);32
+ else33
+ slice->m_numRefIdx[0] = X265_MIN(newFrame->m_param->maxNumReferences, slice->m_rps.numberOfNegativePictures); // Ensuring L0 contains just the -ve POC34
slice->m_numRefIdx[1] = X265_MIN(newFrame->m_param->bBPyramid ? 2 : 1, slice->m_rps.numberOfPositivePictures);35
slice->setRefPicList(m_picList);36
37
38
{39
if ((iterPic->m_poc != curPoc) && iterPic->m_encData->m_bHasReferences)40
{41
- rps->poc[poci] = iterPic->m_poc;42
- rps->deltaPOC[poci] = rps->poc[poci] - curPoc;43
- (rps->deltaPOC[poci] < 0) ? numNeg++ : numPos++;44
- rps->bUsed[poci] = !isRAP;45
- poci++;46
+ if ((m_lastIDR >= curPoc) || (m_lastIDR <= iterPic->m_poc))47
+ {48
+ rps->poc[poci] = iterPic->m_poc;49
+ rps->deltaPOC[poci] = rps->poc[poci] - curPoc;50
+ (rps->deltaPOC[poci] < 0) ? numNeg++ : numPos++;51
+ rps->bUsed[poci] = !isRAP;52
+ poci++;53
+ }54
}55
iterPic = iterPic->m_next;56
}57
x265_2.6.tar.gz/source/encoder/encoder.cpp -> x265_2.7.tar.gz/source/encoder/encoder.cpp
Changed
201
1
2
3
/* Threshold for motion vection, based on expermental result.4
* TODO: come up an algorithm for adoptive threshold */5
-6
-#define MVTHRESHOLD 107
+#define MVTHRESHOLD (10*10)8
#define PU_2Nx2N 19
-10
static const char* defaultAnalysisFileName = "x265_analysis.dat";11
12
using namespace X265_NS;13
14
m_param = NULL;15
m_latestParam = NULL;16
m_threadPool = NULL;17
- m_analysisFile = NULL;18
m_analysisFileIn = NULL;19
m_analysisFileOut = NULL;20
m_offsetEmergency = NULL;21
22
m_aborted = true;23
if (!m_lookahead->create())24
m_aborted = true;25
-26
initRefIdx();27
-28
- if (m_param->analysisReuseMode)29
+ if (m_param->analysisSave && m_param->bUseAnalysisFile)30
{31
- const char* name = m_param->analysisReuseFileName;32
- if (!name)33
- name = defaultAnalysisFileName;34
- const char* mode = m_param->analysisReuseMode == X265_ANALYSIS_LOAD ? "rb" : "wb";35
- m_analysisFile = x265_fopen(name, mode);36
- if (!m_analysisFile)37
+ char* temp = strcatFilename(m_param->analysisSave, ".temp");38
+ if (!temp)39
+ m_aborted = true;40
+ else41
{42
- x265_log_file(NULL, X265_LOG_ERROR, "Analysis load/save: failed to open file %s\n", name);43
+ m_analysisFileOut = x265_fopen(temp, "wb");44
+ X265_FREE(temp);45
+ }46
+ if (!m_analysisFileOut)47
+ {48
+ x265_log_file(NULL, X265_LOG_ERROR, "Analysis save: failed to open file %s.temp\n", m_param->analysisSave);49
+ m_aborted = true;50
+ }51
+ }52
+ if (m_param->analysisLoad && m_param->bUseAnalysisFile)53
+ {54
+ m_analysisFileIn = x265_fopen(m_param->analysisLoad, "rb");55
+ if (!m_analysisFileIn)56
+ {57
+ x265_log_file(NULL, X265_LOG_ERROR, "Analysis load: failed to open file %s\n", m_param->analysisLoad);58
m_aborted = true;59
}60
}61
62
return 0;63
}64
65
-int Encoder::getRefFrameList(PicYuv** l0, PicYuv** l1, int sliceType, int poc)66
+int Encoder::getRefFrameList(PicYuv** l0, PicYuv** l1, int sliceType, int poc, int* pocL0, int* pocL1)67
{68
if (!(IS_X265_TYPE_I(sliceType)))69
{70
71
if (framePtr->m_encData->m_slice->m_refFrameList[0][j] && framePtr->m_encData->m_slice->m_refFrameList[0][j]->m_reconPic != NULL)72
{73
int l0POC = framePtr->m_encData->m_slice->m_refFrameList[0][j]->m_poc;74
+ pocL0[j] = l0POC;75
Frame* l0Fp = m_dpb->m_picList.getPOC(l0POC);76
- if (l0Fp->m_reconPic->m_picOrg[0] == NULL)77
- l0Fp->m_reconEncoded.wait(); /* If recon is not ready, current frame encoder need to wait. */78
+ while (l0Fp->m_reconRowFlag[l0Fp->m_numRows - 1].get() == 0)79
+ l0Fp->m_reconRowFlag[l0Fp->m_numRows - 1].waitForChange(0); /* If recon is not ready, current frame encoder has to wait. */80
l0[j] = l0Fp->m_reconPic;81
}82
}83
84
if (framePtr->m_encData->m_slice->m_refFrameList[1][j] && framePtr->m_encData->m_slice->m_refFrameList[1][j]->m_reconPic != NULL)85
{86
int l1POC = framePtr->m_encData->m_slice->m_refFrameList[1][j]->m_poc;87
+ pocL1[j] = l1POC;88
Frame* l1Fp = m_dpb->m_picList.getPOC(l1POC);89
- if (l1Fp->m_reconPic->m_picOrg[0] == NULL)90
- l1Fp->m_reconEncoded.wait(); /* If recon is not ready, current frame encoder need to wait. */91
+ while (l1Fp->m_reconRowFlag[l1Fp->m_numRows - 1].get() == 0)92
+ l1Fp->m_reconRowFlag[l1Fp->m_numRows - 1].waitForChange(0); /* If recon is not ready, current frame encoder has to wait. */93
l1[j] = l1Fp->m_reconPic;94
}95
}96
}97
else98
- x265_log(NULL, X265_LOG_WARNING, "Refrence List is not in piclist\n");99
+ {100
+ x265_log(NULL, X265_LOG_WARNING, "Current frame is not in DPB piclist.\n");101
+ return 1;102
+ }103
}104
else105
{106
107
{108
int cuOffset = cuI * bytes + pu;109
(interData)->mergeFlag[cuPos + cuOffset] = (srcInterData)->mergeFlag[(mbIndex * 16) + cuOffset];110
-111
+ (interData)->sadCost[cuPos + cuOffset] = (srcInterData)->sadCost[(mbIndex * 16) + cuOffset];112
(interData)->interDir[cuPos + cuOffset] = (srcInterData)->interDir[(mbIndex * 16) + cuOffset];113
for (uint32_t k = 0; k < numDir; k++)114
{115
(interData)->mvpIdx[k][cuPos + cuOffset] = (srcInterData)->mvpIdx[k][(mbIndex * 16) + cuOffset];116
(interData)->refIdx[k][cuPos + cuOffset] = (srcInterData)->refIdx[k][(mbIndex * 16) + cuOffset];117
memcpy(&(interData)->mv[k][cuPos + cuOffset], &(srcInterData)->mv[k][(mbIndex * 16) + cuOffset], sizeof(MV));118
- if (m_param->analysisReuseLevel == 7)119
+ if (m_param->analysisReuseLevel == 7 && numPU == PU_2Nx2N &&120
+ ((interData)->depth[cuPos + cuOffset] == (m_param->maxCUSize >> 5)))121
{122
- int mv_x = ((analysis_inter_data *)curFrame->m_analysisData.interData)->mv[k][(mbIndex * 16) + cuOffset].x;123
- int mv_y = ((analysis_inter_data *)curFrame->m_analysisData.interData)->mv[k][(mbIndex * 16) + cuOffset].y;124
- double mv = sqrt(mv_x*mv_x + mv_y*mv_y);125
- if (numPU == PU_2Nx2N && ((srcInterData)->depth[cuPos + cuOffset] == (m_param->maxCUSize >> 5)) && mv <= MVTHRESHOLD)126
+ int mv_x = (interData)->mv[k][cuPos + cuOffset].x;127
+ int mv_y = (interData)->mv[k][cuPos + cuOffset].y;128
+ if ((mv_x*mv_x + mv_y*mv_y) <= MVTHRESHOLD)129
memset(&curFrame->m_analysisData.modeFlag[k][cuPos + cuOffset], 1, bytes);130
}131
}132
133
if (m_param->analysisReuseLevel > 4)134
{135
memset(&(currInterData)->partSize[count], (interData)->partSize[d], bytes);136
- int numPU = nbPartsTable[(currInterData)->partSize[d]];137
- for (int pu = 0; pu < numPU; pu++, d++)138
+ int numPU = nbPartsTable[(interData)->partSize[d]];139
+ for (int pu = 0; pu < numPU; pu++)140
{141
+ if (pu) d++;142
(currInterData)->mergeFlag[count + pu] = (interData)->mergeFlag[d];143
if (m_param->analysisReuseLevel >= 7)144
{145
146
(currInterData)->mvpIdx[i][count + pu] = (interData)->mvpIdx[i][d];147
(currInterData)->refIdx[i][count + pu] = (interData)->refIdx[i][d];148
memcpy(&(currInterData)->mv[i][count + pu], &(interData)->mv[i][d], sizeof(MV));149
- if (m_param->analysisReuseLevel == 7)150
+ if (m_param->analysisReuseLevel == 7 && numPU == PU_2Nx2N && m_param->num4x4Partitions <= 16)151
{152
- int mv_x = ((analysis_inter_data *)curFrame->m_analysisData.interData)->mv[i][count + pu].x;153
- int mv_y = ((analysis_inter_data *)curFrame->m_analysisData.interData)->mv[i][count + pu].y;154
- double mv = sqrt(mv_x*mv_x + mv_y*mv_y);155
- if (numPU == PU_2Nx2N && m_param->num4x4Partitions <= 16 && mv <= MVTHRESHOLD)156
+ int mv_x = (currInterData)->mv[i][count + pu].x;157
+ int mv_y = (currInterData)->mv[i][count + pu].y;158
+ if ((mv_x*mv_x + mv_y*mv_y) <= MVTHRESHOLD)159
memset(&curFrame->m_analysisData.modeFlag[i][count + pu], 1, bytes);160
}161
}162
163
164
X265_FREE(m_offsetEmergency);165
166
- if (m_analysisFile)167
- fclose(m_analysisFile);168
-169
if (m_latestParam != NULL && m_latestParam != m_param)170
{171
if (m_latestParam->scalingLists != m_param->scalingLists)172
173
{174
int bError = 1;175
fclose(m_analysisFileOut);176
- const char* name = m_param->analysisReuseFileName;177
+ const char* name = m_param->analysisSave ? m_param->analysisSave : m_param->analysisReuseFileName;178
if (!name)179
name = defaultAnalysisFileName;180
char* temp = strcatFilename(name, ".temp");181
182
free((char*)m_param->numaPools);183
free((char*)m_param->masteringDisplayColorVolume);184
free((char*)m_param->toneMapFile);185
+ free((char*)m_param->analysisSave);186
+ free((char*)m_param->analysisLoad);187
PARAM_NS::x265_param_free(m_param);188
}189
}190
191
192
if (m_exportedPic)193
{194
- if (!m_param->bUseAnalysisFile && m_param->analysisReuseMode == X265_ANALYSIS_SAVE)195
+ if (!m_param->bUseAnalysisFile && m_param->analysisSave)196
freeAnalysis(&m_exportedPic->m_analysisData);197
ATOMIC_DEC(&m_exportedPic->m_countRefEncoders);198
m_exportedPic = NULL;199
200
201
x265_2.6.tar.gz/source/encoder/encoder.h -> x265_2.7.tar.gz/source/encoder/encoder.h
Changed
18
1
2
FrameEncoder* m_frameEncoder[X265_MAX_FRAME_THREADS];3
DPB* m_dpb;4
Frame* m_exportedPic;5
- FILE* m_analysisFile;6
FILE* m_analysisFileIn;7
FILE* m_analysisFileOut;8
x265_param* m_param;9
10
11
int copySlicetypePocAndSceneCut(int *slicetype, int *poc, int *sceneCut);12
13
- int getRefFrameList(PicYuv** l0, PicYuv** l1, int sliceType, int poc);14
+ int getRefFrameList(PicYuv** l0, PicYuv** l1, int sliceType, int poc, int* pocL0, int* pocL1);15
16
int setAnalysisDataAfterZScan(x265_analysis_data *analysis_data, Frame* curFrame);17
18
x265_2.6.tar.gz/source/encoder/frameencoder.cpp -> x265_2.7.tar.gz/source/encoder/frameencoder.cpp
Changed
74
1
2
while (!m_frame->m_ctuInfo)3
m_frame->m_copied.wait();4
}5
- if ((m_param->bMVType == AVC_INFO) && !m_param->analysisReuseMode && !(IS_X265_TYPE_I(m_frame->m_lowres.sliceType)))6
+ if ((m_param->bMVType == AVC_INFO) && !m_param->analysisSave && !m_param->analysisLoad && !(IS_X265_TYPE_I(m_frame->m_lowres.sliceType)))7
{8
while (((m_frame->m_analysisData.interData == NULL && m_frame->m_analysisData.intraData == NULL) || (uint32_t)m_frame->m_poc != m_frame->m_analysisData.poc))9
m_frame->m_copyMVType.wait();10
}11
compressFrame();12
m_done.trigger(); /* FrameEncoder::getEncodedPicture() blocks for this event */13
- if (m_frame != NULL)14
- m_frame->m_reconEncoded.trigger();15
m_enable.wait();16
}17
}18
19
bool bUseWeightB = slice->m_sliceType == B_SLICE && slice->m_pps->bUseWeightedBiPred;20
21
WeightParam* reuseWP = NULL;22
- if (m_param->analysisReuseMode && (bUseWeightP || bUseWeightB))23
+ if (m_param->analysisLoad && (bUseWeightP || bUseWeightB))24
reuseWP = (WeightParam*)m_frame->m_analysisData.wt;25
26
if (bUseWeightP || bUseWeightB)27
28
m_cuStats.countWeightAnalyze++;29
ScopedElapsedTime time(m_cuStats.weightAnalyzeTime);30
#endif31
- if (m_param->analysisReuseMode == X265_ANALYSIS_LOAD)32
+ if (m_param->analysisLoad)33
{34
for (int list = 0; list < slice->isInterB() + 1; list++) 35
{36
37
else38
slice->disableWeights();39
40
+ if (m_param->analysisSave && (bUseWeightP || bUseWeightB))41
+ reuseWP = (WeightParam*)m_frame->m_analysisData.wt;42
// Generate motion references43
int numPredDir = slice->isInterP() ? 1 : slice->isInterB() ? 2 : 0;44
for (int l = 0; l < numPredDir; l++)45
46
slice->m_refReconPicList[l][ref] = slice->m_refFrameList[l][ref]->m_reconPic;47
m_mref[l][ref].init(slice->m_refReconPicList[l][ref], w, *m_param);48
}49
- if (m_param->analysisReuseMode == X265_ANALYSIS_SAVE && (bUseWeightP || bUseWeightB))50
+ if (m_param->analysisSave && (bUseWeightP || bUseWeightB))51
{52
for (int i = 0; i < (m_param->internalCsp != X265_CSP_I400 ? 3 : 1); i++)53
*(reuseWP++) = slice->m_weightPredTable[l][0][i];54
55
/* TODO: use defines from slicetype.h for lowres block size */56
uint32_t block_y = (ctu->m_cuPelY >> m_param->maxLog2CUSize) * noOfBlocks;57
uint32_t block_x = (ctu->m_cuPelX >> m_param->maxLog2CUSize) * noOfBlocks;58
- if (m_param->analysisReuseMode != X265_ANALYSIS_LOAD || !m_param->bDisableLookahead)59
+ if (!m_param->analysisLoad || !m_param->bDisableLookahead)60
{61
cuStat.vbvCost = 0;62
cuStat.intraVbvCost = 0;63
64
if (rowInSlice == rowCount)65
{66
m_rowSliceTotalBits[sliceId] = 0;67
- if (bIsVbv)68
- { 69
+ if (bIsVbv && !(m_param->rc.bEnableConstVbv && m_param->bEnableWavefront))70
+ { 71
for (uint32_t i = m_sliceBaseRow[sliceId]; i < rowCount + m_sliceBaseRow[sliceId]; i++)72
m_rowSliceTotalBits[sliceId] += curEncData.m_rowStat[i].encodedBits;73
}74
x265_2.6.tar.gz/source/encoder/framefilter.cpp -> x265_2.7.tar.gz/source/encoder/framefilter.cpp
Changed
10
1
2
void FrameFilter::computeMEIntegral(int row)3
{4
int lastRow = row == (int)m_frame->m_encData->m_slice->m_sps->numCuInHeight - 1;5
- if (m_frame->m_encData->m_meIntegral && m_frame->m_lowres.sliceType != X265_TYPE_B)6
+ if (m_frame->m_lowres.sliceType != X265_TYPE_B)7
{8
/* If WPP, other than first row, integral calculation for current row needs to wait till the9
* integral for the previous row is computed */10
x265_2.6.tar.gz/source/encoder/ratecontrol.cpp -> x265_2.7.tar.gz/source/encoder/ratecontrol.cpp
Changed
26
1
2
m_param->rc.vbvMaxBitrate = x265_clip3(0, 2000000, m_param->rc.vbvMaxBitrate);3
m_param->rc.vbvBufferInit = x265_clip3(0.0, 2000000.0, m_param->rc.vbvBufferInit);4
m_param->vbvBufferEnd = x265_clip3(0.0, 2000000.0, m_param->vbvBufferEnd);5
+ m_initVbv = false;6
m_singleFrameVbv = 0;7
m_rateTolerance = 1.0;8
9
10
11
bool RateControl::init(const SPS& sps)12
{13
- if (m_isVbv)14
+ if (m_isVbv && !m_initVbv)15
{16
/* We don't support changing the ABR bitrate right now,17
* so if the stream starts as CBR, keep it CBR. */18
19
m_bufferFillFinal = m_bufferSize * m_param->rc.vbvBufferInit;20
m_bufferFillActual = m_bufferFillFinal;21
m_bufferExcess = 0;22
+ m_initVbv = true;23
}24
25
m_totalBits = 0;26
x265_2.6.tar.gz/source/encoder/ratecontrol.h -> x265_2.7.tar.gz/source/encoder/ratecontrol.h
Changed
9
1
2
bool m_isGrainEnabled;3
bool m_isAbrReset;4
bool m_isNextGop;5
+ bool m_initVbv;6
int m_lastAbrResetPoc;7
8
double m_rateTolerance;9
x265_2.6.tar.gz/source/encoder/sao.h -> x265_2.7.tar.gz/source/encoder/sao.h
Changed
16
1
2
enum { NUM_EDGETYPE = 5 };3
enum { NUM_PLANE = 3 };4
enum { SAO_DEPTHRATE_SIZE = 4 };5
-6
static const uint32_t s_eoTable[NUM_EDGETYPE];7
-8
- typedef int32_t (PerClass[MAX_NUM_SAO_TYPE][MAX_NUM_SAO_CLASS]);9
- typedef int32_t (PerPlane[NUM_PLANE][MAX_NUM_SAO_TYPE][MAX_NUM_SAO_CLASS]);10
-11
+ typedef int32_t PerClass[MAX_NUM_SAO_TYPE][MAX_NUM_SAO_CLASS];12
+ typedef int32_t PerPlane[NUM_PLANE][MAX_NUM_SAO_TYPE][MAX_NUM_SAO_CLASS];13
protected:14
15
/* allocated per part */16
x265_2.6.tar.gz/source/encoder/search.cpp -> x265_2.7.tar.gz/source/encoder/search.cpp
Changed
37
1
2
/* poc difference is out of range for lookahead */3
return 0;4
5
- MV* mvs = m_frame->m_lowres.lowresMvs[list][diffPoc - 1];6
+ MV* mvs = m_frame->m_lowres.lowresMvs[list][diffPoc];7
if (mvs[0].x == 0x7FFF)8
/* this motion search was not estimated by lookahead */9
return 0;10
11
int mvpIdx = selectMVP(interMode.cu, pu, amvp, list, ref);12
MV mvmin, mvmax, outmv, mvp = amvp[mvpIdx];13
14
- if (!m_param->analysisReuseMode) /* Prevents load/save outputs from diverging if lowresMV is not available */15
+ if (!m_param->analysisSave && !m_param->analysisLoad) /* Prevents load/save outputs from diverging if lowresMV is not available */16
{17
MV lmv = getLowresMV(interMode.cu, pu, list, ref);18
if (lmv.notZero())19
20
cu.getNeighbourMV(puIdx, pu.puAbsPartIdx, interMode.interNeighbours);21
22
/* Uni-directional prediction */23
- if ((m_param->analysisReuseMode == X265_ANALYSIS_LOAD && m_param->analysisReuseLevel > 1 && m_param->analysisReuseLevel != 10)24
+ if ((m_param->analysisLoad && m_param->analysisReuseLevel > 1 && m_param->analysisReuseLevel != 10)25
|| (m_param->analysisMultiPassRefine && m_param->rc.bStatRead) || (m_param->bMVType == AVC_INFO))26
{27
for (int list = 0; list < numPredDir; list++)28
29
int mvpIdx = selectMVP(cu, pu, amvp, list, ref);30
MV mvmin, mvmax, outmv, mvp = amvp[mvpIdx];31
32
- if (!m_param->analysisReuseMode) /* Prevents load/save outputs from diverging when lowresMV is not available */33
+ if (!m_param->analysisSave && !m_param->analysisLoad) /* Prevents load/save outputs from diverging when lowresMV is not available */34
{35
MV lmv = getLowresMV(cu, pu, list, ref);36
if (lmv.notZero())37
x265_2.6.tar.gz/source/encoder/slicetype.cpp -> x265_2.7.tar.gz/source/encoder/slicetype.cpp
Changed
201
1
2
int blockXY = 0;3
int blockX = 0, blockY = 0;4
double strength = 0.f;5
- if (param->rc.aqMode == X265_AQ_NONE || param->rc.aqStrength == 0)6
+ if ((param->rc.aqMode == X265_AQ_NONE || param->rc.aqStrength == 0) || (param->rc.bStatRead && param->rc.cuTree && IS_REFERENCED(curFrame)))7
{8
/* Need to init it anyways for CU tree */9
int cuCount = blockCount;10
11
m_outputSignalRequired = false;12
m_isActive = true;13
m_inputCount = 0;14
-15
+ m_extendGopBoundary = false;16
m_8x8Height = ((m_param->sourceHeight / 2) + X265_LOWRES_CU_SIZE - 1) >> X265_LOWRES_CU_BITS;17
m_8x8Width = ((m_param->sourceWidth / 2) + X265_LOWRES_CU_SIZE - 1) >> X265_LOWRES_CU_BITS;18
m_cuCount = m_8x8Width * m_8x8Height;19
20
m_numRowsPerSlice = m_8x8Height;21
m_numCoopSlices = 1;22
}23
-24
+ if (param->gopLookahead && (param->gopLookahead > (param->lookaheadDepth - param->bframes - 2)))25
+ {26
+ param->gopLookahead = X265_MAX(0, param->lookaheadDepth - param->bframes - 2);27
+ x265_log(param, X265_LOG_WARNING, "Gop-lookahead cannot be greater than (rc-lookahead - length of the mini-gop); Clipping gop-lookahead to %d\n", param->gopLookahead);28
+ }29
#if DETAILED_CU_STATS30
m_slicetypeDecideElapsedTime = 0;31
m_preLookaheadElapsedTime = 0;32
33
/* Called by API thread */34
void Lookahead::addPicture(Frame& curFrame, int sliceType)35
{36
- if (m_param->analysisReuseMode == X265_ANALYSIS_LOAD && m_param->bDisableLookahead)37
+ if (m_param->analysisLoad && m_param->bDisableLookahead)38
{39
if (!m_filled)40
m_filled = true;41
42
return out;43
}44
45
- if (m_param->analysisReuseMode == X265_ANALYSIS_LOAD && m_param->bDisableLookahead)46
+ if (m_param->analysisLoad && m_param->bDisableLookahead)47
return NULL;48
49
findJob(-1); /* run slicetypeDecide() if necessary */50
51
Slice *slice = curFrame->m_encData->m_slice;52
int p0 = 0, p1, b;53
int poc = slice->m_poc;54
- int l0poc = slice->m_refPOCList[0][0];55
+ int l0poc = slice->m_rps.numberOfNegativePictures ? slice->m_refPOCList[0][0] : -1;56
int l1poc = slice->m_refPOCList[1][0];57
58
switch (slice->m_sliceType)59
60
break;61
62
case B_SLICE:63
- b = poc - l0poc;64
- p1 = b + l1poc - poc;65
- frames[p0] = &slice->m_refFrameList[0][0]->m_lowres;66
- frames[b] = &curFrame->m_lowres;67
- frames[p1] = &slice->m_refFrameList[1][0]->m_lowres;68
+ if (l0poc >= 0)69
+ {70
+ b = poc - l0poc;71
+ p1 = b + l1poc - poc;72
+ frames[p0] = &slice->m_refFrameList[0][0]->m_lowres;73
+ frames[b] = &curFrame->m_lowres;74
+ frames[p1] = &slice->m_refFrameList[1][0]->m_lowres;75
+ }76
+ else 77
+ {78
+ p0 = b = 0;79
+ p1 = b + l1poc - poc;80
+ frames[p0] = frames[b] = &curFrame->m_lowres;81
+ frames[p1] = &slice->m_refFrameList[1][0]->m_lowres;82
+ }83
+ 84
break;85
86
default:87
return;88
}89
- if (m_param->analysisReuseMode != X265_ANALYSIS_LOAD || !m_param->bDisableLookahead)90
+ if (!m_param->analysisLoad || !m_param->bDisableLookahead)91
{92
X265_CHECK(curFrame->m_lowres.costEst[b - p0][p1 - b] > 0, "Slice cost not estimated\n")93
if (m_param->rc.cuTree && !m_param->rc.bStatRead)94
/* update row satds based on cutree offsets */95
curFrame->m_lowres.satdCost = frameCostRecalculate(frames, p0, p1, b);96
- else if (m_param->analysisReuseMode != X265_ANALYSIS_LOAD || m_param->scaleFactor)97
+ else if (!m_param->analysisLoad || m_param->scaleFactor)98
{99
if (m_param->rc.aqMode)100
curFrame->m_lowres.satdCost = curFrame->m_lowres.costEstAq[b - p0][p1 - b];101
102
ProfileLookaheadTime(m_lookahead.m_preLookaheadElapsedTime, m_lookahead.m_countPreLookahead);103
ProfileScopeEvent(prelookahead);104
m_lock.release();105
-106
preFrame->m_lowres.init(preFrame->m_fencPic, preFrame->m_poc);107
- if (m_lookahead.m_param->rc.bStatRead && m_lookahead.m_param->rc.cuTree && IS_REFERENCED(preFrame))108
- /* cu-tree offsets were read from stats file */;109
- else if (m_lookahead.m_bAdaptiveQuant)110
+ if (m_lookahead.m_bAdaptiveQuant)111
tld.calcAdaptiveQuantFrame(preFrame, m_lookahead.m_param);112
tld.lowresIntraEstimate(preFrame->m_lowres, m_lookahead.m_param->rc.qgSize);113
preFrame->m_lowresInit = true;114
115
{116
slicetypeAnalyse(frames, false);117
bool bIsVbv = m_param->rc.vbvBufferSize > 0 && m_param->rc.vbvMaxBitrate > 0;118
- if (m_param->analysisReuseMode == X265_ANALYSIS_LOAD && m_param->scaleFactor && bIsVbv)119
+ if (m_param->analysisLoad && m_param->scaleFactor && bIsVbv)120
{121
int numFrames;122
for (numFrames = 0; numFrames < maxSearch; numFrames++)123
124
x265_log(m_param, X265_LOG_WARNING, "B-ref at frame %d incompatible with B-pyramid and %d reference frames\n",125
frm.sliceType, m_param->maxNumReferences);126
}127
- if ((!m_param->bIntraRefresh || frm.frameNum == 0) && frm.frameNum - m_lastKeyframe >= m_param->keyframeMax)128
+ if ((!m_param->bIntraRefresh || frm.frameNum == 0) && frm.frameNum - m_lastKeyframe >= m_param->keyframeMax &&129
+ (!m_extendGopBoundary || frm.frameNum - m_lastKeyframe >= m_param->keyframeMax + m_param->gopLookahead))130
{131
if (frm.sliceType == X265_TYPE_AUTO || frm.sliceType == X265_TYPE_I)132
frm.sliceType = m_param->bOpenGOP && m_lastKeyframe >= 0 ? X265_TYPE_I : X265_TYPE_IDR;133
134
/* Closed GOP */135
m_lastKeyframe = frm.frameNum;136
frm.bKeyframe = true;137
- if (bframes > 0)138
+ if (bframes > 0 && !m_param->radl)139
{140
list[bframes - 1]->m_lowres.sliceType = X265_TYPE_P;141
bframes--;142
}143
}144
+ if (m_param->radl && !m_param->bOpenGOP && list[bframes + 1])145
+ {146
+ if ((frm.frameNum - m_lastKeyframe) > (m_param->keyframeMax - m_param->radl - 1) && (frm.frameNum - m_lastKeyframe) < m_param->keyframeMax)147
+ frm.sliceType = X265_TYPE_B;148
+ if ((frm.frameNum - m_lastKeyframe) == (m_param->keyframeMax - m_param->radl - 1))149
+ frm.sliceType = X265_TYPE_P;150
+ }151
+152
if (bframes == m_param->bframes || !list[bframes + 1])153
{154
if (IS_X265_TYPE_B(frm.sliceType))155
156
if (bframes)157
{158
p0 = 0; // last nonb159
+ bool isp0available = frames[bframes + 1]->sliceType == X265_TYPE_IDR ? false : true;160
+161
for (b = 1; b <= bframes; b++)162
{163
+ if (!isp0available)164
+ p0 = b;165
+166
if (frames[b]->sliceType == X265_TYPE_B)167
for (p1 = b; frames[p1]->sliceType == X265_TYPE_B; p1++)168
; // find new nonb or bref169
170
estGroup.singleCost(p0, p1, b);171
172
if (frames[b]->sliceType == X265_TYPE_BREF)173
+ {174
p0 = b;175
+ isp0available = true;176
+ }177
}178
}179
}180
181
int idx = 0;182
list[bframes]->m_reorderedPts = pts[idx++];183
m_outputQueue.pushBack(*list[bframes]);184
-185
/* Add B-ref frame next to P frame in output queue, the B-ref encode before non B-ref frame */186
- if (bframes > 1 && m_param->bBPyramid)187
+ if (brefs)188
{189
for (int i = 0; i < bframes; i++)190
{191
192
frames[j + 1] = NULL;193
slicetypeAnalyse(frames, true);194
bool bIsVbv = m_param->rc.vbvBufferSize > 0 && m_param->rc.vbvMaxBitrate > 0;195
- if (m_param->analysisReuseMode == X265_ANALYSIS_LOAD && m_param->scaleFactor && bIsVbv)196
+ if (m_param->analysisLoad && m_param->scaleFactor && bIsVbv)197
{198
int numFrames;199
for (numFrames = 0; numFrames < maxSearch; numFrames++)200
201
x265_2.6.tar.gz/source/encoder/slicetype.h -> x265_2.7.tar.gz/source/encoder/slicetype.h
Changed
9
1
2
bool m_filled;3
bool m_isSceneTransition;4
int m_numPools;5
+ bool m_extendGopBoundary;6
Lookahead(x265_param *param, ThreadPool *pool);7
#if DETAILED_CU_STATS8
int64_t m_slicetypeDecideElapsedTime;9
x265_2.6.tar.gz/source/encoder/weightPrediction.cpp -> x265_2.7.tar.gz/source/encoder/weightPrediction.cpp
Changed
10
1
2
3
if (!plane && diffPoc <= param.bframes + 1)4
{5
- mvs = fenc.lowresMvs[list][diffPoc - 1];6
+ mvs = fenc.lowresMvs[list][diffPoc];7
8
/* test whether this motion search was performed by lookahead */9
if (mvs[0].x != 0x7FFF)10
x265_2.6.tar.gz/source/input/y4m.cpp -> x265_2.7.tar.gz/source/input/y4m.cpp
Changed
201
1
2
* This program is also available under a commercial proprietary license.3
* For more information, contact us at license @ x265.com.4
*****************************************************************************/5
-6
+#define _FILE_OFFSET_BITS 647
+#define _LARGEFILE_SOURCE8
#include "y4m.h"9
#include "common.h"10
11
12
13
using namespace X265_NS;14
using namespace std;15
-16
-static const char header[] = "FRAME";17
-18
+static const char header[] = {'F','R','A','M','E'};19
Y4MInput::Y4MInput(InputFileInfo& info)20
{21
for (int i = 0; i < QUEUE_SIZE; i++)22
23
ifs = NULL;24
if (!strcmp(info.filename, "-"))25
{26
- ifs = &cin;27
+ ifs = stdin;28
#if _WIN3229
setmode(fileno(stdin), O_BINARY);30
#endif31
}32
else33
- ifs = new ifstream(info.filename, ios::binary | ios::in);34
-35
- if (ifs && ifs->good() && parseHeader())36
+ ifs = x265_fopen(info.filename, "rb");37
+ if (ifs && !ferror(ifs) && parseHeader())38
{39
int pixelbytes = depth > 8 ? 2 : 1;40
for (int i = 0; i < x265_cli_csps[colorSpace].planes; i++)41
42
}43
if (!threadActive)44
{45
- if (ifs && ifs != &cin)46
- delete ifs;47
+ if (ifs && ifs != stdin)48
+ fclose(ifs);49
ifs = NULL;50
return;51
}52
53
info.csp = colorSpace;54
info.depth = depth;55
info.frameCount = -1;56
-57
- size_t estFrameSize = framesize + strlen(header) + 1; /* assume basic FRAME\n headers */58
-59
+ size_t estFrameSize = framesize + sizeof(header) + 1; /* assume basic FRAME\n headers */60
/* try to estimate frame count, if this is not stdin */61
- if (ifs != &cin)62
+ if (ifs != stdin)63
{64
- istream::pos_type cur = ifs->tellg();65
-66
-#if defined(_MSC_VER) && _MSC_VER < 170067
- /* Older MSVC versions cannot handle 64bit file sizes properly, so go native */68
- HANDLE hFile = CreateFileA(info.filename, GENERIC_READ,69
- FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING,70
- FILE_ATTRIBUTE_NORMAL, NULL);71
- if (hFile != INVALID_HANDLE_VALUE)72
- {73
- LARGE_INTEGER size;74
- if (GetFileSizeEx(hFile, &size))75
- info.frameCount = (int)((size.QuadPart - (int64_t)cur) / estFrameSize);76
- CloseHandle(hFile);77
- }78
-#else // if defined(_MSC_VER) && _MSC_VER < 170079
+ int64_t cur = ftello(ifs);80
if (cur >= 0)81
{82
- ifs->seekg(0, ios::end);83
- istream::pos_type size = ifs->tellg();84
- ifs->seekg(cur, ios::beg);85
+ fseeko(ifs, 0, SEEK_END);86
+ int64_t size = ftello(ifs);87
+ fseeko(ifs, cur, SEEK_SET);88
if (size > 0)89
info.frameCount = (int)((size - cur) / estFrameSize);90
}91
-#endif // if defined(_MSC_VER) && _MSC_VER < 170092
}93
-94
if (info.skipFrames)95
{96
-#if X86_6497
- if (ifs != &cin)98
- ifs->seekg((uint64_t)estFrameSize * info.skipFrames, ios::cur);99
+ if (ifs != stdin)100
+ fseeko(ifs, (int64_t)estFrameSize * info.skipFrames, SEEK_CUR);101
else102
for (int i = 0; i < info.skipFrames; i++)103
- {104
- ifs->read(buf[0], estFrameSize - framesize);105
- ifs->read(buf[0], framesize);106
- }107
-#else108
- for (int i = 0; i < info.skipFrames; i++)109
- ifs->ignore(estFrameSize);110
-#endif111
+ if (fread(buf[0], estFrameSize - framesize, 1, ifs) + fread(buf[0], framesize, 1, ifs) != 2)112
+ break;113
}114
}115
-116
Y4MInput::~Y4MInput()117
{118
- if (ifs && ifs != &cin)119
- delete ifs;120
-121
+ if (ifs && ifs != stdin)122
+ fclose(ifs);123
for (int i = 0; i < QUEUE_SIZE; i++)124
X265_FREE(buf[i]);125
}126
127
128
int csp = 0;129
int d = 0;130
-131
- while (ifs->good())132
+ int c;133
+ while ((c = fgetc(ifs)) != EOF)134
{135
// Skip Y4MPEG string136
- int c = ifs->get();137
- while (ifs->good() && (c != ' ') && (c != '\n'))138
- c = ifs->get();139
-140
- while (c == ' ' && ifs->good())141
+ while ((c != EOF) && (c != ' ') && (c != '\n'))142
+ c = fgetc(ifs);143
+ while (c == ' ')144
{145
// read parameter identifier146
- switch (ifs->get())147
+ switch (fgetc(ifs))148
{149
case 'W':150
width = 0;151
- while (ifs->good())152
+ while ((c = fgetc(ifs)) != EOF)153
{154
- c = ifs->get();155
-156
if (c == ' ' || c == '\n')157
break;158
else159
width = width * 10 + (c - '0');160
}161
break;162
-163
case 'H':164
height = 0;165
- while (ifs->good())166
+ while ((c = fgetc(ifs)) != EOF)167
{168
- c = ifs->get();169
if (c == ' ' || c == '\n')170
break;171
else172
173
case 'F':174
rateNum = 0;175
rateDenom = 0;176
- while (ifs->good())177
+ while ((c = fgetc(ifs)) != EOF)178
{179
- c = ifs->get();180
if (c == '.')181
{182
rateDenom = 1;183
- while (ifs->good())184
+ while ((c = fgetc(ifs)) != EOF)185
{186
- c = ifs->get();187
if (c == ' ' || c == '\n')188
break;189
else190
191
}192
else if (c == ':')193
{194
- while (ifs->good())195
+ while ((c = fgetc(ifs)) != EOF)196
{197
- c = ifs->get();198
if (c == ' ' || c == '\n')199
break;200
else201
x265_2.6.tar.gz/source/input/y4m.h -> x265_2.7.tar.gz/source/input/y4m.h
Changed
34
1
2
ThreadSafeInteger readCount;3
4
ThreadSafeInteger writeCount;5
-6
char* buf[QUEUE_SIZE];7
-8
- std::istream *ifs;9
-10
+ FILE *ifs;11
bool parseHeader();12
-13
void threadMain();14
15
bool populateFrameQueue();16
17
Y4MInput(InputFileInfo& info);18
19
virtual ~Y4MInput();20
-21
void release();22
-23
- bool isEof() const { return ifs && ifs->eof(); }24
-25
- bool isFail() { return !(ifs && !ifs->fail() && threadActive); }26
-27
+ bool isEof() const { return ifs && feof(ifs); }28
+ bool isFail() { return !(ifs && !ferror(ifs) && threadActive); }29
void startReader();30
-31
bool readPicture(x265_picture&);32
33
const char *getName() const { return "y4m"; }34
x265_2.6.tar.gz/source/input/yuv.cpp -> x265_2.7.tar.gz/source/input/yuv.cpp
Changed
133
1
2
* This program is also available under a commercial proprietary license.3
* For more information, contact us at license @ x265.com.4
*****************************************************************************/5
-6
+#define _FILE_OFFSET_BITS 647
+#define _LARGEFILE_SOURCE8
#include "yuv.h"9
#include "common.h"10
11
12
x265_log(NULL, X265_LOG_ERROR, "yuv: width, height, and FPS must be specified\n");13
return;14
}15
-16
if (!strcmp(info.filename, "-"))17
{18
- ifs = &cin;19
+ ifs = stdin;20
#if _WIN3221
setmode(fileno(stdin), O_BINARY);22
#endif23
}24
else25
- ifs = new ifstream(info.filename, ios::binary | ios::in);26
-27
- if (ifs && ifs->good())28
+ ifs = x265_fopen(info.filename, "rb");29
+ if (ifs && !ferror(ifs))30
threadActive = true;31
else32
{33
- if (ifs && ifs != &cin)34
- delete ifs;35
+ if (ifs && ifs != stdin)36
+ fclose(ifs);37
ifs = NULL;38
return;39
}40
41
}42
43
info.frameCount = -1;44
-45
/* try to estimate frame count, if this is not stdin */46
- if (ifs != &cin)47
+ if (ifs != stdin)48
{49
- istream::pos_type cur = ifs->tellg();50
-51
-#if defined(_MSC_VER) && _MSC_VER < 170052
- /* Older MSVC versions cannot handle 64bit file sizes properly, so go native */53
- HANDLE hFile = CreateFileA(info.filename, GENERIC_READ,54
- FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING,55
- FILE_ATTRIBUTE_NORMAL, NULL);56
- if (hFile != INVALID_HANDLE_VALUE)57
- {58
- LARGE_INTEGER size;59
- if (GetFileSizeEx(hFile, &size))60
- info.frameCount = (int)((size.QuadPart - (int64_t)cur) / framesize);61
- CloseHandle(hFile);62
- }63
-#else // if defined(_MSC_VER) && _MSC_VER < 170064
+ int64_t cur = ftello(ifs);65
if (cur >= 0)66
{67
- ifs->seekg(0, ios::end);68
- istream::pos_type size = ifs->tellg();69
- ifs->seekg(cur, ios::beg);70
+ fseeko(ifs, 0, SEEK_END);71
+ int64_t size = ftello(ifs);72
+ fseeko(ifs, cur, SEEK_SET);73
if (size > 0)74
info.frameCount = (int)((size - cur) / framesize);75
}76
-#endif // if defined(_MSC_VER) && _MSC_VER < 170077
}78
-79
if (info.skipFrames)80
{81
-#if X86_6482
- if (ifs != &cin)83
- ifs->seekg((uint64_t)framesize * info.skipFrames, ios::cur);84
+ if (ifs != stdin)85
+ fseeko(ifs, (int64_t)framesize * info.skipFrames, SEEK_CUR);86
else87
for (int i = 0; i < info.skipFrames; i++)88
- ifs->read(buf[0], framesize);89
-#else90
- for (int i = 0; i < info.skipFrames; i++)91
- ifs->ignore(framesize);92
-#endif93
+ if (fread(buf[0], framesize, 1, ifs) != 1)94
+ break;95
}96
}97
-98
YUVInput::~YUVInput()99
{100
- if (ifs && ifs != &cin)101
- delete ifs;102
+ if (ifs && ifs != stdin)103
+ fclose(ifs);104
for (int i = 0; i < QUEUE_SIZE; i++)105
X265_FREE(buf[i]);106
}107
108
threadActive = false;109
writeCount.poke();110
}111
-112
bool YUVInput::populateFrameQueue()113
{114
- if (!ifs || ifs->fail())115
+ if (!ifs || ferror(ifs))116
return false;117
-118
/* wait for room in the ring buffer */119
int written = writeCount.get();120
int read = readCount.get();121
122
// release() has been called123
return false;124
}125
-126
ProfileScopeEvent(frameRead);127
- ifs->read(buf[written % QUEUE_SIZE], framesize);128
- if (ifs->good())129
+ if (fread(buf[written % QUEUE_SIZE], framesize, 1, ifs) == 1)130
{131
writeCount.incr();132
return true;133
x265_2.6.tar.gz/source/input/yuv.h -> x265_2.7.tar.gz/source/input/yuv.h
Changed
32
1
2
ThreadSafeInteger readCount;3
4
ThreadSafeInteger writeCount;5
-6
char* buf[QUEUE_SIZE];7
-8
- std::istream *ifs;9
-10
+ FILE *ifs;11
int guessFrameCount();12
-13
void threadMain();14
15
bool populateFrameQueue();16
17
YUVInput(InputFileInfo& info);18
19
virtual ~YUVInput();20
-21
void release();22
-23
- bool isEof() const { return ifs && ifs->eof(); }24
-25
- bool isFail() { return !(ifs && !ifs->fail() && threadActive); }26
-27
+ bool isEof() const { return ifs && feof(ifs); }28
+ bool isFail() { return !(ifs && !ferror(ifs) && threadActive); }29
void startReader();30
31
bool readPicture(x265_picture&);32
x265_2.6.tar.gz/source/output/raw.cpp -> x265_2.7.tar.gz/source/output/raw.cpp
Changed
30
1
2
* This program is also available under a commercial proprietary license.3
* For more information, contact us at license @ x265.com.4
*****************************************************************************/5
-6
#include "raw.h"7
+#if _WIN328
+#include <io.h>9
+#include <fcntl.h>10
+#if defined(_MSC_VER)11
+#pragma warning(disable: 4996) // POSIX setmode and fileno deprecated12
+#endif13
+#endif14
15
using namespace X265_NS;16
using namespace std;17
-18
RAWOutput::RAWOutput(const char* fname, InputFileInfo&)19
{20
b_fail = false;21
if (!strcmp(fname, "-"))22
{23
ofs = stdout;24
+#if _WIN3225
+ setmode(fileno(stdout), O_BINARY);26
+#endif27
return;28
}29
ofs = x265_fopen(fname, "wb");30
x265_2.6.tar.gz/source/test/CMakeLists.txt -> x265_2.7.tar.gz/source/test/CMakeLists.txt
Changed
48
1
2
3
# add X86 assembly files4
if(X86)5
-enable_language(ASM_YASM)6
+enable_language(ASM_NASM)7
8
if(MSVC_IDE)9
- set(YASM_SRC checkasm-a.obj)10
+ set(NASM_SRC checkasm-a.obj)11
add_custom_command(12
OUTPUT checkasm-a.obj13
- COMMAND ${YASM_EXECUTABLE}14
- ARGS ${YASM_FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/checkasm-a.asm -o checkasm-a.obj15
+ COMMAND ${NASM_EXECUTABLE}16
+ ARGS ${NASM_FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/checkasm-a.asm -o checkasm-a.obj17
DEPENDS checkasm-a.asm)18
else()19
- set(YASM_SRC checkasm-a.asm)20
+ set(NASM_SRC checkasm-a.asm)21
endif()22
endif(X86)23
24
# add ARM assembly files25
if(ARM OR CROSS_COMPILE_ARM)26
enable_language(ASM)27
- set(YASM_SRC checkasm-arm.S)28
+ set(NASM_SRC checkasm-arm.S)29
add_custom_command(30
OUTPUT checkasm-arm.obj31
COMMAND ${CMAKE_CXX_COMPILER}32
- ARGS ${YASM_FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/checkasm-arm.S -o checkasm-arm.obj33
+ ARGS ${NASM_FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/checkasm-arm.S -o checkasm-arm.obj34
DEPENDS checkasm-arm.S)35
endif(ARM OR CROSS_COMPILE_ARM)36
37
# add PowerPC assembly files38
if(POWER)39
- set(YASM_SRC)40
+ set(NASM_SRC)41
endif(POWER)42
43
-add_executable(TestBench ${YASM_SRC}44
+add_executable(TestBench ${NASM_SRC}45
testbench.cpp testharness.h46
pixelharness.cpp pixelharness.h47
mbdstharness.cpp mbdstharness.h48
x265_2.6.tar.gz/source/test/checkasm-a.asm -> x265_2.7.tar.gz/source/test/checkasm-a.asm
Changed
84
1
2
;* For more information, contact us at license @ x265.com.3
;*****************************************************************************4
5
-%include "../common/x86/x86inc.asm"6
+%include "x86inc.asm"7
8
SECTION_RODATA9
10
11
%if ARCH_X86_6412
; just random numbers to reduce the chance of incidental match13
ALIGN 1614
-x6: ddq 0x79445c159ce790641a1b2550a612b48c15
-x7: ddq 0x86b2536fcd8cf6362eed899d5a28ddcd16
-x8: ddq 0x3f2bf84fc0fcca4eb0856806085e794317
-x9: ddq 0xd229e1f5b281303facbd382dcf5b8de218
-x10: ddq 0xab63e2e11fa38ed971aeaff20b095fd919
-x11: ddq 0x77d410d5c42c882d89b0c0765892729a20
-x12: ddq 0x24b3c1d2a024048bc45ea11a955d8dd521
-x13: ddq 0xdd7b8919edd427862e8ec680de14b47c22
-x14: ddq 0x11e53e2b2ac655ef135ce6888fa02cbf23
-x15: ddq 0x6de8f4c914c334d5011ff554472a7a1024
-n7: dq 0x21f86d66c8ca00ce25
-n8: dq 0x75b6ba21077c48ad26
-n9: dq 0xed56bb2dcb3c773627
-n10: dq 0x8bda43d3fd1a7e0628
-n11: dq 0xb64a9c9e5d31840829
-n12: dq 0xdf9a54b303f1d3a330
-n13: dq 0x4a75479abd64e09731
-n14: dq 0x249214109d5d1c8832
+x6: dq 0x1a1b2550a612b48c,0x79445c159ce7906433
+x7: dq 0x2eed899d5a28ddcd,0x86b2536fcd8cf63634
+x8: dq 0xb0856806085e7943,0x3f2bf84fc0fcca4e35
+x9: dq 0xacbd382dcf5b8de2,0xd229e1f5b281303f36
+x10: dq 0x71aeaff20b095fd9,0xab63e2e11fa38ed937
+x11: dq 0x89b0c0765892729a,0x77d410d5c42c882d38
+x12: dq 0xc45ea11a955d8dd5,0x24b3c1d2a024048b39
+x13: dq 0x2e8ec680de14b47c,0xdd7b8919edd4278640
+x14: dq 0x135ce6888fa02cbf,0x11e53e2b2ac655ef41
+x15: dq 0x011ff554472a7a10,0x6de8f4c914c334d542
+n7: dq 0x21f86d66c8ca00ce43
+n8: dq 0x75b6ba21077c48ad44
+n9: dq 0xed56bb2dcb3c773645
+n10: dq 0x8bda43d3fd1a7e0646
+n11: dq 0xb64a9c9e5d31840847
+n12: dq 0xdf9a54b303f1d3a348
+n13: dq 0x4a75479abd64e09749
+n14: dq 0x249214109d5d1c8850
%endif51
52
SECTION .text53
54
;-----------------------------------------------------------------------------55
cglobal checkasm_stack_clobber, 1,256
; Clobber the stack with junk below the stack pointer57
- %define size (max_args+6)*858
- SUB rsp, size59
- mov r1, size-860
+ %define argsize (max_args+6)*861
+ SUB rsp, argsize62
+ mov r1, argsize-863
.loop:64
mov [rsp+r1], r065
sub r1, 866
jge .loop67
- ADD rsp, size68
+ ADD rsp, argsize69
RET70
71
%if WIN6472
73
mov r9, rax74
mov r10, rdx75
lea r0, [error_message]76
+%if FORMAT_ELF77
+ call puts wrt ..plt78
+%else79
call puts80
+%endif81
mov r1, [rsp+max_args*8]82
mov dword [r1], 083
mov rdx, r1084
x265_2.6.tar.gz/source/test/regression-tests.txt -> x265_2.7.tar.gz/source/test/regression-tests.txt
Changed
61
1
2
BasketballDrive_1920x1080_50.y4m,--preset faster --aq-strength 2 --merange 190 --slices 33
BasketballDrive_1920x1080_50.y4m,--preset medium --ctu 16 --max-tu-size 8 --subme 7 --qg-size 16 --cu-lossless --tu-inter-depth 3 --limit-tu 14
BasketballDrive_1920x1080_50.y4m,--preset medium --keyint -1 --nr-inter 100 -F4 --no-sao5
-BasketballDrive_1920x1080_50.y4m,--preset medium --no-cutree --analysis-reuse-mode=save --analysis-reuse-level 2 --bitrate 7000 --limit-modes::--preset medium --no-cutree --analysis-reuse-mode=load --analysis-reuse-level 2 --bitrate 7000 --limit-modes6
+BasketballDrive_1920x1080_50.y4m,--preset medium --no-cutree --analysis-save x265_analysis.dat --analysis-reuse-level 2 --bitrate 7000 --limit-modes::--preset medium --no-cutree --analysis-load x265_analysis.dat --analysis-reuse-level 2 --bitrate 7000 --limit-modes7
BasketballDrive_1920x1080_50.y4m,--preset slow --nr-intra 100 -F4 --aq-strength 3 --qg-size 16 --limit-refs 18
BasketballDrive_1920x1080_50.y4m,--preset slower --lossless --chromaloc 3 --subme 0 --limit-tu 49
-BasketballDrive_1920x1080_50.y4m,--preset slower --no-cutree --analysis-reuse-mode=save --analysis-reuse-level 10 --bitrate 7000 --limit-tu 0::--preset slower --no-cutree --analysis-reuse-mode=load --analysis-reuse-level 10 --bitrate 7000 --limit-tu 010
+BasketballDrive_1920x1080_50.y4m,--preset slower --no-cutree --analysis-save x265_analysis.dat --analysis-reuse-level 10 --bitrate 7000 --limit-tu 0::--preset slower --no-cutree --analysis-load x265_analysis.dat --analysis-reuse-level 10 --bitrate 7000 --limit-tu 011
BasketballDrive_1920x1080_50.y4m,--preset veryslow --crf 4 --cu-lossless --pmode --limit-refs 1 --aq-mode 3 --limit-tu 312
-BasketballDrive_1920x1080_50.y4m,--preset veryslow --no-cutree --analysis-reuse-mode=save --bitrate 7000 --tskip-fast --limit-tu 4::--preset veryslow --no-cutree --analysis-reuse-mode=load --bitrate 7000 --tskip-fast --limit-tu 413
+BasketballDrive_1920x1080_50.y4m,--preset veryslow --no-cutree --analysis-save x265_analysis.dat --bitrate 7000 --tskip-fast --limit-tu 2::--preset veryslow --no-cutree --analysis-load x265_analysis.dat --bitrate 7000 --tskip-fast --limit-tu 214
BasketballDrive_1920x1080_50.y4m,--preset veryslow --recon-y4m-exec "ffplay -i pipe:0 -autoexit"15
Coastguard-4k.y4m,--preset ultrafast --recon-y4m-exec "ffplay -i pipe:0 -autoexit"16
Coastguard-4k.y4m,--preset superfast --tune grain --overscan=crop17
Coastguard-4k.y4m,--preset superfast --tune grain --pme --aq-strength 2 --merange 19018
-Coastguard-4k.y4m,--preset veryfast --no-cutree --analysis-reuse-mode=save --analysis-reuse-level 1 --bitrate 15000::--preset veryfast --no-cutree --analysis-reuse-mode=load --analysis-reuse-level 1 --bitrate 1500019
+Coastguard-4k.y4m,--preset veryfast --no-cutree --analysis-save x265_analysis.dat --analysis-reuse-level 1 --bitrate 15000::--preset veryfast --no-cutree --analysis-load x265_analysis.dat --analysis-reuse-level 1 --bitrate 1500020
Coastguard-4k.y4m,--preset medium --rdoq-level 1 --tune ssim --no-signhide --me umh --slices 221
Coastguard-4k.y4m,--preset slow --tune psnr --cbqpoffs -1 --crqpoffs 1 --limit-refs 122
CrowdRun_1920x1080_50_10bit_422.yuv,--preset ultrafast --weightp --tune zerolatency --qg-size 1623
24
DucksAndLegs_1920x1080_60_10bit_444.yuv,--preset veryfast --weightp --nr-intra 1000 -F425
DucksAndLegs_1920x1080_60_10bit_444.yuv,--preset medium --nr-inter 500 -F4 --no-psy-rdoq26
DucksAndLegs_1920x1080_60_10bit_444.yuv,--preset slower --no-weightp --rdoq-level 0 --limit-refs 3 --tu-inter-depth 4 --limit-tu 327
-DucksAndLegs_1920x1080_60_10bit_422.yuv,--preset fast --no-cutree --analysis-reuse-mode=save --bitrate 3000 --early-skip --tu-inter-depth 3 --limit-tu 1::--preset fast --no-cutree --analysis-reuse-mode=load --bitrate 3000 --early-skip --tu-inter-depth 3 --limit-tu 128
+DucksAndLegs_1920x1080_60_10bit_422.yuv,--preset fast --no-cutree --analysis-save x265_analysis.dat --bitrate 3000 --early-skip --tu-inter-depth 3 --limit-tu 1::--preset fast --no-cutree --analysis-load x265_analysis.dat --bitrate 3000 --early-skip --tu-inter-depth 3 --limit-tu 129
FourPeople_1280x720_60.y4m,--preset superfast --no-wpp --lookahead-slices 230
FourPeople_1280x720_60.y4m,--preset veryfast --aq-mode 2 --aq-strength 1.5 --qg-size 831
FourPeople_1280x720_60.y4m,--preset medium --qp 38 --no-psy-rd32
33
KristenAndSara_1280x720_60.y4m,--preset slower --pmode --max-tu-size 8 --limit-refs 0 --limit-modes --limit-tu 134
NebutaFestival_2560x1600_60_10bit_crop.yuv,--preset superfast --tune psnr35
NebutaFestival_2560x1600_60_10bit_crop.yuv,--preset medium --tune grain --limit-refs 236
-NebutaFestival_2560x1600_60_10bit_crop.yuv,--preset slow --no-cutree --analysis-reuse-mode=save --rd 5 --analysis-reuse-level 10 --bitrate 9000::--preset slow --no-cutree --analysis-reuse-mode=load --rd 5 --analysis-reuse-level 10 --bitrate 900037
-News-4k.y4m,--preset ultrafast --no-cutree --analysis-reuse-mode=save --analysis-reuse-level 2 --bitrate 15000::--preset ultrafast --no-cutree --analysis-reuse-mode=load --analysis-reuse-level 2 --bitrate 1500038
+NebutaFestival_2560x1600_60_10bit_crop.yuv,--preset slow --no-cutree --analysis-save x265_analysis.dat --rd 5 --analysis-reuse-level 10 --bitrate 9000::--preset slow --no-cutree --analysis-load x265_analysis.dat --rd 5 --analysis-reuse-level 10 --bitrate 900039
+News-4k.y4m,--preset ultrafast --no-cutree --analysis-save x265_analysis.dat --analysis-reuse-level 2 --bitrate 15000::--preset ultrafast --no-cutree --analysis-load x265_analysis.dat --analysis-reuse-level 2 --bitrate 1500040
News-4k.y4m,--preset superfast --lookahead-slices 6 --aq-mode 041
News-4k.y4m,--preset superfast --slices 4 --aq-mode 0 42
News-4k.y4m,--preset medium --tune ssim --no-sao --qg-size 1643
44
old_town_cross_444_720p50.y4m,--preset superfast --weightp --min-cu 16 --limit-modes45
old_town_cross_444_720p50.y4m,--preset veryfast --qp 1 --tune ssim46
old_town_cross_444_720p50.y4m,--preset faster --rd 1 --tune zero-latency47
-old_town_cross_444_720p50.y4m,--preset fast --no-cutree --analysis-reuse-mode=save --analysis-reuse-level 1 --bitrate 3000 --early-skip::--preset fast --no-cutree --analysis-reuse-mode=load --analysis-reuse-level 1 --bitrate 3000 --early-skip48
+old_town_cross_444_720p50.y4m,--preset fast --no-cutree --analysis-save pass1_analysis.dat --analysis-reuse-level 1 --bitrate 3000 --early-skip::--preset fast --no-cutree --analysis-load pass1_analysis.dat --analysis-save pass2_analysis.dat --analysis-reuse-level 1 --bitrate 3000 --early-skip::--preset fast --no-cutree --analysis-load pass2_analysis.dat --analysis-reuse-level 1 --bitrate 3000 --early-skip49
old_town_cross_444_720p50.y4m,--preset medium --keyint -1 --no-weightp --ref 650
old_town_cross_444_720p50.y4m,--preset slow --rdoq-level 1 --early-skip --ref 7 --no-b-pyramid51
old_town_cross_444_720p50.y4m,--preset slower --crf 4 --cu-lossless52
53
Kimono1_1920x1080_24_400.yuv,--preset medium --rdoq-level 0 --limit-refs 3 --slices 254
Kimono1_1920x1080_24_400.yuv,--preset veryslow --crf 4 --cu-lossless --slices 2 --limit-refs 3 --limit-modes55
Kimono1_1920x1080_24_400.yuv,--preset placebo --ctu 32 --max-tu-size 8 --limit-tu 256
+big_buck_bunny_360p24.y4m, --keyint 60 --min-keyint 40 --gop-lookahead 1457
+BasketballDrive_1920x1080_50.y4m, --preset medium --no-open-gop --keyint 50 --min-keyint 50 --radl 258
59
# Main12 intraCost overflow bug test60
720p50_parkrun_ter.y4m,--preset medium61
x265_2.6.tar.gz/source/x265.cpp -> x265_2.7.tar.gz/source/x265.cpp
Changed
30
1
2
if (!this->qpfile)3
x265_log_file(param, X265_LOG_ERROR, "%s qpfile not found or error in opening qp file\n", optarg);4
}5
+ OPT("fullhelp")6
+ {7
+ param->logLevel = X265_LOG_FULL;8
+ printVersion(param, api);9
+ showHelp(param);10
+ break;11
+ }12
else13
bError |= !!api->param_parse(param, long_options[long_options_index].name, optarg);14
-15
if (bError)16
{17
const char *name = long_options_index > 0 ? long_options[long_options_index].name : argv[optind - 2];18
19
20
x265_picture pic_orig, pic_out;21
x265_picture *pic_in = &pic_orig;22
- /* Allocate recon picture if analysisReuseMode is enabled */23
+ /* Allocate recon picture if analysis save/load is enabled */24
std::priority_queue<int64_t>* pts_queue = cliopt.output->needPTS() ? new std::priority_queue<int64_t>() : NULL;25
- x265_picture *pic_recon = (cliopt.recon || !!param->analysisReuseMode || pts_queue || reconPlay || param->csvLogLevel) ? &pic_out : NULL;26
+ x265_picture *pic_recon = (cliopt.recon || param->analysisSave || param->analysisLoad || pts_queue || reconPlay || param->csvLogLevel) ? &pic_out : NULL;27
uint32_t inFrameCount = 0;28
uint32_t outFrameCount = 0;29
x265_nal *p_nal;30
x265_2.6.tar.gz/source/x265.h -> x265_2.7.tar.gz/source/x265.h
Changed
128
1
2
* to allow the encoder to determine base QP */3
int forceqp;4
5
- /* If param.analysisReuseMode is X265_ANALYSIS_OFF this field is ignored on input6
- * and output. Else the user must call x265_alloc_analysis_data() to7
- * allocate analysis buffers for every picture passed to the encoder.8
+ /* If param.analysisLoad and param.analysisSave are disabled, this field is9
+ * ignored on input and output. Else the user must call x265_alloc_analysis_data()10
+ * to allocate analysis buffers for every picture passed to the encoder.11
*12
- * On input when param.analysisReuseMode is X265_ANALYSIS_LOAD and analysisData13
+ * On input when param.analysisLoad is enabled and analysisData14
* member pointers are valid, the encoder will use the data stored here to15
* reduce encoder work.16
*17
- * On output when param.analysisReuseMode is X265_ANALYSIS_SAVE and analysisData18
+ * On output when param.analysisSave is enabled and analysisData19
* member pointers are valid, the encoder will write output analysis into20
* this data structure */21
x265_analysis_data analysisData;22
23
#define X265_CSP_BGRA 7 /* packed bgr 32bits */24
#define X265_CSP_RGB 8 /* packed rgb 24bits */25
#define X265_CSP_MAX 9 /* end of list */26
-27
#define X265_EXTENDED_SAR 255 /* aspect ratio explicitly specified as width:height */28
-29
/* Analysis options */30
#define X265_ANALYSIS_OFF 031
#define X265_ANALYSIS_SAVE 132
33
* Default disabled */34
int bEnableRdRefine;35
36
- /* If X265_ANALYSIS_SAVE, write per-frame analysis information into analysis37
- * buffers. if X265_ANALYSIS_LOAD, read analysis information into analysis38
- * buffer and use this analysis information to reduce the amount of work39
- * the encoder must perform. Default X265_ANALYSIS_OFF */40
+ /* If save, write per-frame analysis information into analysis buffers.41
+ * If load, read analysis information into analysis buffer and use this42
+ * analysis information to reduce the amount of work the encoder must perform.43
+ * Default disabled. Now deprecated*/44
int analysisReuseMode;45
46
- /* Filename for analysisReuseMode save/load. Default name is "x265_analysis.dat" */47
+ /* Filename for multi-pass-opt-analysis/distortion. Default name is "x265_analysis.dat" */48
const char* analysisReuseFileName;49
50
/*== Rate Control ==*/51
52
53
/* internally enable if tune grain is set */54
int bEnableConstVbv;55
+56
} rc;57
58
/*== Video Usability Information ==*/59
60
int bHDROpt;61
62
/* A value between 1 and 10 (both inclusive) determines the level of63
- * information stored/reused in save/load analysis-reuse-mode. Higher the refine64
+ * information stored/reused in analysis save/load. Higher the refine65
* level higher the information stored/reused. Default is 5 */66
int analysisReuseLevel;67
68
69
70
/* Reuse MV information obtained through API */71
int bMVType;72
-73
/* Allow the encoder to have a copy of the planes of x265_picture in Frame */74
int bCopyPicToFrame;75
+76
+ /*Number of frames for GOP boundary decision lookahead.If a scenecut frame is found77
+ * within this from the gop boundary set by keyint, the GOP will be extented until such a point,78
+ * otherwise the GOP will be terminated as set by keyint*/79
+ int gopLookahead;80
+81
+ /*Write per-frame analysis information into analysis buffers. Default disabled. */82
+ const char* analysisSave;83
+84
+ /* Read analysis information into analysis buffer and use this analysis information85
+ * to reduce the amount of work the encoder must perform. Default disabled. */86
+ const char* analysisLoad;87
+88
+ /*Number of RADL pictures allowed in front of IDR*/89
+ int radl;90
} x265_param;91
92
/* x265_param_alloc:93
94
/* x265_get_ref_frame_list:95
* returns negative on error, 0 when access unit were output.96
* This API must be called after(poc >= lookaheadDepth + bframes + 2) condition check */97
-int x265_get_ref_frame_list(x265_encoder *encoder, x265_picyuv**, x265_picyuv**, int, int);98
+int x265_get_ref_frame_list(x265_encoder *encoder, x265_picyuv**, x265_picyuv**, int, int, int*, int*);99
100
/* x265_set_analysis_data:101
* set the analysis data. The incoming analysis_data structure is assumed to be AVC-sized blocks.102
103
void x265_csvlog_frame(const x265_param *, const x265_picture *);104
105
/* Log final encode statistics to the CSV file handle. 'argc' and 'argv' are106
- * intended to be command line arguments passed to the encoder. Encode107
+ * intended to be command line arguments passed to the encoder. padx and pady are108
+ * padding offsets for conformance and can be given from sps settings. Encode109
* statistics should be queried from the encoder just prior to closing it. */110
-void x265_csvlog_encode(x265_encoder *encoder, const x265_stats *, int argc, char** argv);111
+void x265_csvlog_encode(const x265_param*, const x265_stats *, int padx, int pady, int argc, char** argv);112
113
/* In-place downshift from a bit-depth greater than 8 to a bit-depth of 8, using114
* the residual bits to dither each row. */115
116
int (*encoder_intra_refresh)(x265_encoder*);117
int (*encoder_ctu_info)(x265_encoder*, int, x265_ctu_info_t**);118
int (*get_slicetype_poc_and_scenecut)(x265_encoder*, int*, int*, int*);119
- int (*get_ref_frame_list)(x265_encoder*, x265_picyuv**, x265_picyuv**, int, int);120
+ int (*get_ref_frame_list)(x265_encoder*, x265_picyuv**, x265_picyuv**, int, int, int*, int*);121
FILE* (*csvlog_open)(const x265_param*);122
void (*csvlog_frame)(const x265_param*, const x265_picture*);123
- void (*csvlog_encode)(x265_encoder*, const x265_stats*, int, char**);124
+ void (*csvlog_encode)(const x265_param*, const x265_stats *, int, int, int, char**);125
void (*dither_image)(x265_picture*, int, int, int16_t*, int);126
int (*set_analysis_data)(x265_encoder *encoder, x265_analysis_data *analysis_data, int poc, uint32_t cuBytes);127
/* add new pointers to the end, or increment X265_MAJOR_VERSION */128
x265_2.6.tar.gz/source/x265cli.h -> x265_2.7.tar.gz/source/x265cli.h
Changed
89
1
2
static const struct option long_options[] =3
{4
{ "help", no_argument, NULL, 'h' },5
+ { "fullhelp", no_argument, NULL, 0 },6
{ "version", no_argument, NULL, 'V' },7
{ "asm", required_argument, NULL, 0 },8
{ "no-asm", no_argument, NULL, 0 },9
10
{ "open-gop", no_argument, NULL, 0 },11
{ "keyint", required_argument, NULL, 'I' },12
{ "min-keyint", required_argument, NULL, 'i' },13
+ { "gop-lookahead", required_argument, NULL, 0 },14
{ "scenecut", required_argument, NULL, 0 },15
{ "no-scenecut", no_argument, NULL, 0 },16
{ "scenecut-bias", required_argument, NULL, 0 },17
+ { "radl", required_argument, NULL, 0 },18
{ "ctu-info", required_argument, NULL, 0 },19
{ "intra-refresh", no_argument, NULL, 0 },20
{ "rc-lookahead", required_argument, NULL, 0 },21
22
{ "no-slow-firstpass", no_argument, NULL, 0 },23
{ "multi-pass-opt-rps", no_argument, NULL, 0 },24
{ "no-multi-pass-opt-rps", no_argument, NULL, 0 },25
- { "analysis-reuse-mode", required_argument, NULL, 0 },26
- { "analysis-reuse-file", required_argument, NULL, 0 },27
+ { "analysis-reuse-mode", required_argument, NULL, 0 }, /* DEPRECATED */28
+ { "analysis-reuse-file", required_argument, NULL, 0 },29
{ "analysis-reuse-level", required_argument, NULL, 0 },30
+ { "analysis-save", required_argument, NULL, 0 },31
+ { "analysis-load", required_argument, NULL, 0 },32
{ "scale-factor", required_argument, NULL, 0 },33
{ "refine-intra", required_argument, NULL, 0 },34
{ "refine-inter", required_argument, NULL, 0 },35
36
H0(" outfile is raw HEVC bitstream\n");37
H0("\nExecutable Options:\n");38
H0("-h/--help Show this help text and exit\n");39
+ H0(" --fullhelp Show all options and exit\n");40
H0("-V/--version Show version info and exit\n");41
H0("\nOutput Options:\n");42
H0("-o/--output <filename> Bitstream output file name\n");43
44
H0(" --[no-]open-gop Enable open-GOP, allows I slices to be non-IDR. Default %s\n", OPT(param->bOpenGOP));45
H0("-I/--keyint <integer> Max IDR period in frames. -1 for infinite-gop. Default %d\n", param->keyframeMax);46
H0("-i/--min-keyint <integer> Scenecuts closer together than this are coded as I, not IDR. Default: auto\n");47
+ H0(" --gop-lookahead <integer> Extends gop boundary if a scenecut is found within this from keyint boundary. Default 0\n");48
H0(" --no-scenecut Disable adaptive I-frame decision\n");49
H0(" --scenecut <integer> How aggressively to insert extra I-frames. Default %d\n", param->scenecutThreshold);50
H1(" --scenecut-bias <0..100.0> Bias for scenecut detection. Default %.2f\n", param->scenecutBias);51
+ H0(" --radl <integer> Number of RADL pictures allowed in front of IDR. Default %d\n", param->radl);52
H0(" --intra-refresh Use Periodic Intra Refresh instead of IDR frames\n");53
H0(" --rc-lookahead <integer> Number of frames for frame-type lookahead (determines encoder latency) Default %d\n", param->lookaheadDepth);54
H1(" --lookahead-slices <0..16> Number of slices to use per lookahead cost estimate. Default %d\n", param->lookaheadSlices);55
56
H0(" --[no-]analyze-src-pics Motion estimation uses source frame planes. Default disable\n");57
H0(" --[no-]slow-firstpass Enable a slow first pass in a multipass rate control mode. Default %s\n", OPT(param->rc.bEnableSlowFirstPass));58
H0(" --[no-]strict-cbr Enable stricter conditions and tolerance for bitrate deviations in CBR mode. Default %s\n", OPT(param->rc.bStrictCbr));59
- H0(" --analysis-reuse-mode <string|int> save - Dump analysis info into file, load - Load analysis buffers from the file. Default %d\n", param->analysisReuseMode);60
+ H0(" --analysis-save <filename> Dump analysis info into the specified file. Default Disabled\n");61
+ H0(" --analysis-load <filename> Load analysis buffers from the file specified. Default Disabled\n");62
H0(" --analysis-reuse-file <filename> Specify file name used for either dumping or reading analysis data. Deault x265_analysis.dat\n");63
H0(" --analysis-reuse-level <1..10> Level of analysis reuse indicates amount of info stored/reused in save/load mode, 1:least..10:most. Default %d\n", param->analysisReuseLevel);64
H0(" --refine-mv-type <string> Reuse MV information received through API call. Supported option is avc. Default disabled - %d\n", param->bMVType);65
H0(" --scale-factor <int> Specify factor by which input video is scaled down for analysis save mode. Default %d\n", param->scaleFactor);66
- H0(" --refine-intra <0..3> Enable intra refinement for encode that uses analysis-reuse-mode=load.\n"67
+ H0(" --refine-intra <0..3> Enable intra refinement for encode that uses analysis-load.\n"68
" - 0 : Forces both mode and depth from the save encode.\n"69
" - 1 : Functionality of (0) + evaluate all intra modes at min-cu-size's depth when current depth is one smaller than min-cu-size's depth.\n"70
" - 2 : Functionality of (1) + irrespective of size evaluate all angular modes when the save encode decides the best mode as angular.\n"71
" - 3 : Functionality of (1) + irrespective of size evaluate all intra modes.\n"72
" Default:%d\n", param->intraRefine);73
- H0(" --refine-inter <0..3> Enable inter refinement for encode that uses analysis-reuse-mode=load.\n"74
+ H0(" --refine-inter <0..3> Enable inter refinement for encode that uses analysis-load.\n"75
" - 0 : Forces both mode and depth from the save encode.\n"76
" - 1 : Functionality of (0) + evaluate all inter modes at min-cu-size's depth when current depth is one smaller than\n"77
" min-cu-size's depth. When save encode decides the current block as skip(for all sizes) evaluate skip/merge.\n"78
79
#undef OPT80
#undef H081
#undef H182
-83
if (level < X265_LOG_DEBUG)84
- printf("\nUse --log-level full --help for a full listing\n");85
+ printf("\nUse --fullhelp for a full listing (or --log-level full --help)\n");86
printf("\n\nComplete documentation may be found at http://x265.readthedocs.org/en/default/cli.html\n");87
exit(1);88
}89