Overview
Submit package home:enzokiel:branches:Essentials / x265 to package Essentials / x265
x265.changes
Changed
x
1
2
-------------------------------------------------------------------3
+Thu Apr 27 14:15:13 UTC 2017 - joerg.lorenzen@ki.tng.de4
+5
+- Update to version 2.46
+ Encoder enhancements7
+ * HDR10+ supported. Dynamic metadata may be either supplied as a8
+ bitstream via the userSEI field of x265_picture, or as a json9
+ jile that can be parsed by x265 and inserted into the bitstream;10
+ use --dhdr10-info to specify json file name, and --dhdr10-opt11
+ to enable optimization of inserting tone-map information only12
+ at IDR frames, or when the tone map information changes.13
+ * Lambda tables for 8, 10, and 12-bit encoding revised, resulting14
+ in significant enhancement to subjective visual quality.15
+ * Enhanced HDR10 encoding with HDR-specific QP optimzations for16
+ chroma, and luma planes of WCG content enabled; use --hdr-opt17
+ to activate.18
+ * Ability to accept analysis information from other previous19
+ encodes (that may or may not be x265), and selectively reuse20
+ and refine analysis for encoding subsequent passes enabled with21
+ the --refine-level option.22
+ * Slow and veryslow presets receive a 20% speed boost at23
+ iso-quality by enabling the --limit-tu option.24
+ * The bitrate target for x265 can now be dynamically reconfigured25
+ via the reconfigure API.26
+ * Performance optimized SAO algorithm introduced via the27
+ --limit-sao option; seeing 10% speed benefits at faster presets.28
+ API changes29
+ * x265_reconfigure API now also accepts rate-control parameters30
+ for dynamic reconfiguration.31
+ * Several additions to data fields in x265_analysis to support32
+ --refine-level: see x265.h for more details.33
+ Bug fixes34
+ * Avoid negative offsets in x265 lambda2 table with SAO enabled.35
+ * Fix mingw32 build error.36
+ * Seek now enabled for pipe input, in addition to file-based input.37
+ * Fix issue of statically linking core-utils not working in linux.38
+ * Fix visual artifacts with --multi-pass-opt-distortion with VBV.39
+ * Fix bufferFill stats reported in csv.40
+- soname bump to 116.41
+42
+-------------------------------------------------------------------43
Fri Feb 24 14:03:24 UTC 2017 - ismail@i10z.com44
45
- Update to version 2.346
x265.spec
Changed
14
1
2
# based on the spec file from https://build.opensuse.org/package/view_file/home:Simmphonie/libx265/3
4
Name: x2655
-%define soname 1106
+%define soname 1167
%define libname lib%{name}8
%define libsoname %{libname}-%{soname}9
-Version: 2.310
+Version: 2.411
Release: 012
License: GPL-2.0+13
Summary: A free h265/HEVC encoder - encoder binary14
baselibs.conf
Changed
4
1
2
-libx265-1103
+libx265-1164
x265_2.3.tar.gz/.hg_archival.txt -> x265_2.4.tar.gz/.hg_archival.txt
Changed
8
1
2
repo: 09fe40627f03a0f9c3e6ac78b22ac93da23f9fdf3
-node: 3037c1448549ca920967831482c653e5892fa8ed4
+node: e7a4dd48293b7956d4a20df257d23904cc78e3765
branch: stable6
-tag: 2.37
+tag: 2.48
x265_2.3.tar.gz/.hgtags -> x265_2.4.tar.gz/.hgtags
Changed
6
1
2
960c9991d0dcf46559c32e070418d3cbb7e8aa2f 2.03
981e3bfef16a997bce6f46ce1b15631a0e234747 2.14
be14a7e9755e54f0fd34911c72bdfa66981220bc 2.25
+3037c1448549ca920967831482c653e5892fa8ed 2.36
x265_2.3.tar.gz/doc/reST/cli.rst -> x265_2.4.tar.gz/doc/reST/cli.rst
Changed
67
1
2
Specify a filename for analysis data (see :option:`--analysis-mode`)3
If no filename is specified, x265_analysis.dat is used.4
5
+.. option:: --refine-level <1..10>6
+7
+ Amount of information stored/reused in :option:`--analysis-mode` is distributed across levels.8
+ Higher the value, higher the information stored/reused, faster the encode. Default 5.9
+10
+ Note that --refine-level must be paired with analysis-mode.11
+12
+ +--------+-----------------------------------------+13
+ | Level | Description |14
+ +========+=========================================+15
+ | 1 | Lookahead information |16
+ +--------+-----------------------------------------+17
+ | 2 to 4 | Level 1 + intra/inter modes, ref's |18
+ +--------+-----------------------------------------+19
+ | 5 to 9 | Level 2 + rect-amp |20
+ +--------+-----------------------------------------+21
+ | 10 | Level 5 + Full CU analysis-info |22
+ +--------+-----------------------------------------+23
+24
Options which affect the transform unit quad-tree, sometimes referred to25
as the residual quad-tree (RQT).26
27
28
disabled, SAO analysis skips the right/bottom boundary areas.29
Default disabled30
31
+.. option:: --limit-sao, --no-limit-sao32
+33
+ Limit SAO filter computation by early terminating SAO process based34
+ on inter prediction mode, CTU spatial-domain correlations, and relations35
+ between luma and chroma.36
+ Default disabled37
+38
VUI (Video Usability Information) options39
=========================================40
-41
x265 emits a VUI with only the timing info by default. If the SAR is42
specified (or read from a Y4M header) it is also included. All other43
VUI fields must be manually specified.44
45
automatically when :option`--master-display` or :option`--max-cll` is46
specified. Useful when there is a desire to signal 0 values for max-cll47
and max-fall. Default disabled.48
+ 49
+.. option:: --hdr-opt, --no-hdr-opt50
+51
+ Add luma and chroma offsets for HDR/WCG content.52
+ Input video should be 10 bit 4:2:0. Applicable for HDR content.53
+ Default disabled. **Experimental Feature**54
+ 55
+.. option:: --dhdr10-info <filename>56
+57
+ Inserts tone mapping information as an SEI message.58
+ 59
+.. option:: --dhdr10-opt, --no-dhdr10-opt60
+61
+ Limits the frames for which tone mapping information is inserted as 62
+ SEI message. Inserts SEI only for IDR frames and for frames where tone63
+ mapping information has changed.64
65
.. option:: --min-luma <integer>66
67
x265_2.3.tar.gz/doc/reST/presets.rst -> x265_2.4.tar.gz/doc/reST/presets.rst
Changed
10
1
2
+-----------------+-----+-----+-----+-----+-----+-----+------+------+------+------+3
| tu-inter | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 2 | 3 | 4 |4
+-----------------+-----+-----+-----+-----+-----+-----+------+------+------+------+5
+| limit-tu | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 4 | 4 | 0 |6
++-----------------+-----+-----+-----+-----+-----+-----+------+------+------+------+7
8
.. _tunings:9
10
x265_2.3.tar.gz/doc/reST/releasenotes.rst -> x265_2.4.tar.gz/doc/reST/releasenotes.rst
Changed
40
1
2
Release Notes3
*************4
5
+Release Notes6
+*************7
+8
+Version 2.49
+===========10
+11
+Release date - 22nd April, 2017.12
+13
+Encoder enhancements14
+--------------------15
+1. HDR10+ supported. Dynamic metadata may be either supplied as a bitstream via the userSEI field of x265_picture, or as a json jile that can be parsed by x265 and inserted into the bitstream; use :option:`--dhdr10-info` to specify json file name, and :option:`--dhdr10-opt` to enable optimization of inserting tone-map information only at IDR frames, or when the tone map information changes.16
+2. Lambda tables for 8, 10, and 12-bit encoding revised, resulting in significant enhancement to subjective visual quality.17
+3. Enhanced HDR10 encoding with HDR-specific QP optimzations for chroma, and luma planes of WCG content enabled; use :option:`--hdr-opt` to activate.18
+4. Ability to accept analysis information from other previous encodes (that may or may not be x265), and selectively reuse and refine analysis for encoding subsequent passes enabled with the :option:`--refine-level` option. 19
+5. Slow and veryslow presets receive a 20% speed boost at iso-quality by enabling the :option:`--limit-tu` option.20
+6. The bitrate target for x265 can now be dynamically reconfigured via the reconfigure API.21
+7. Performance optimized SAO algorithm introduced via the :option:`--limit-sao` option; seeing 10% speed benefits at faster presets.22
+23
+API changes24
+-----------25
+1. x265_reconfigure API now also accepts rate-control parameters for dynamic reconfiguration.26
+2. Several additions to data fields in x265_analysis to support :option:`--refine-level`: see x265.h for more details.27
+28
+Bug fixes29
+---------30
+1. Avoid negative offsets in x265 lambda2 table with SAO enabled.31
+2. Fix mingw32 build error.32
+3. Seek now enabled for pipe input, in addition to file-based input33
+4. Fix issue of statically linking core-utils not working in linux.34
+5. Fix visual artifacts with :option:`--multi-pass-opt-distortion` with VBV.35
+6. Fix bufferFill stats reported in csv.36
+37
Version 2.338
===========39
40
x265_2.3.tar.gz/source/CMakeLists.txt -> x265_2.4.tar.gz/source/CMakeLists.txt
Changed
89
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 110)6
+set(X265_BUILD 116)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
endif(FPROFILE_USE)12
if(STATIC_LINK_CRT)13
add_definitions(-static)14
- list(APPEND LINKER_OPTIONS "-static")15
+ list(APPEND LINKER_OPTIONS "-static-libgcc")16
endif(STATIC_LINK_CRT)17
check_cxx_compiler_flag(-Wno-strict-overflow CC_HAS_NO_STRICT_OVERFLOW)18
check_cxx_compiler_flag(-Wno-narrowing CC_HAS_NO_NARROWING) 19
20
else(HIGH_BIT_DEPTH)21
add_definitions(-DHIGH_BIT_DEPTH=0 -DX265_DEPTH=8)22
endif(HIGH_BIT_DEPTH)23
+# this option is to enable the inclusion of dynamic HDR10 library to the libx265 compilation24
+option(ENABLE_DYNAMIC_HDR10 "Enable dynamic HDR10 compilation" OFF)25
+if (ENABLE_DYNAMIC_HDR10)26
+ add_subdirectory(dynamicHDR10)27
+ include_directories(dynamicHDR10)28
+ add_definitions(-DENABLE_DYNAMIC_HDR10)29
+endif(ENABLE_DYNAMIC_HDR10)30
31
# this option can only be used when linking multiple libx265 libraries32
# together, and some alternate API access method is implemented.33
34
endforeach()35
endif()36
endif()37
-38
source_group(ASM FILES ${ASM_SRCS})39
-add_library(x265-static STATIC $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> ${ASM_OBJS} ${ASM_SRCS})40
+if(ENABLE_DYNAMIC_HDR10)41
+ add_library(x265-static STATIC $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> $<TARGET_OBJECTS:dynamicHDR10> ${ASM_OBJS} ${ASM_SRCS})42
+else()43
+ add_library(x265-static STATIC $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> ${ASM_OBJS} ${ASM_SRCS})44
+endif()45
if(NOT MSVC)46
set_target_properties(x265-static PROPERTIES OUTPUT_NAME x265)47
endif()48
49
if(NOT (MSVC_IDE OR XCODE))50
add_custom_target(clean-generated COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/clean-generated.cmake)51
endif()52
-53
option(ENABLE_SHARED "Build shared library" ON)54
if(ENABLE_SHARED)55
- add_library(x265-shared SHARED "${PROJECT_BINARY_DIR}/x265.def" ${ASM_OBJS}56
- ${X265_RC_FILE} $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common>)57
+58
+ if(ENABLE_DYNAMIC_HDR10)59
+ add_library(x265-shared SHARED "${PROJECT_BINARY_DIR}/x265.def" ${ASM_OBJS}60
+ ${X265_RC_FILE} $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> $<TARGET_OBJECTS:dynamicHDR10>)61
+ else()62
+ add_library(x265-shared SHARED "${PROJECT_BINARY_DIR}/x265.def" ${ASM_OBJS}63
+ ${X265_RC_FILE} $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common>)64
+ endif()65
if(EXTRA_LIB)66
target_link_libraries(x265-shared ${EXTRA_LIB})67
endif()68
69
if(WIN32)70
set(ExportDefs "${PROJECT_BINARY_DIR}/x265.def")71
endif(WIN32)72
-73
if(XCODE)74
# Xcode seems unable to link the CLI with libs, so link as one targget75
+ if(ENABLE_DYNAMIC_HDR10)76
add_executable(cli ../COPYING ${InputFiles} ${OutputFiles} ${GETOPT}77
- x265.cpp x265.h x265cli.h x265-extras.h x265-extras.cpp78
- $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> ${ASM_OBJS} ${ASM_SRCS})79
+ x265.cpp x265.h x265cli.h x265-extras.h x265-extras.cpp80
+ $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> $<TARGET_OBJECTS:dynamicHDR10> ${ASM_OBJS} ${ASM_SRCS})81
+ else()82
+ add_executable(cli ../COPYING ${InputFiles} ${OutputFiles} ${GETOPT}83
+ x265.cpp x265.h x265cli.h x265-extras.h x265-extras.cpp84
+ $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> ${ASM_OBJS} ${ASM_SRCS})85
+ endif()86
else()87
add_executable(cli ../COPYING ${InputFiles} ${OutputFiles} ${GETOPT} ${X265_RC_FILE}88
${ExportDefs} x265.cpp x265.h x265cli.h x265-extras.h x265-extras.cpp)89
x265_2.3.tar.gz/source/cmake/FindNuma.cmake -> x265_2.4.tar.gz/source/cmake/FindNuma.cmake
Changed
10
1
2
# NUMA_LIBRARY3
# Points to the libnuma that can be passed to target_link_libararies.4
#5
-# Copyright (c) 2015 Steve Borho6
+# Copyright (c) 2013-2017 MulticoreWare, Inc7
8
include(FindPackageHandleStandardArgs)9
10
x265_2.3.tar.gz/source/cmake/FindVLD.cmake -> x265_2.4.tar.gz/source/cmake/FindVLD.cmake
Changed
10
1
2
# target_link_libararies.3
#4
#5
-# Copyright (c) 2012 Sergiu Dotenco6
+# Copyright (c) 2013-2017 MulticoreWare, Inc7
#8
# Permission is hereby granted, free of charge, to any person obtaining a copy9
# of this software and associated documentation files (the "Software"), to deal10
x265_2.3.tar.gz/source/cmake/FindVtune.cmake -> x265_2.4.tar.gz/source/cmake/FindVtune.cmake
Changed
10
1
2
# VTUNE_INCLUDE_DIR: Points to the vtunes include dir3
# VTUNE_LIBRARY_DIR: Points to the directory with libraries4
#5
-# Copyright (c) 2015 Pradeep Ramachandran6
+# Copyright (c) 2013-2017 MulticoreWare, Inc7
8
include(FindPackageHandleStandardArgs)9
10
x265_2.3.tar.gz/source/common/arm/asm-primitives.cpp -> x265_2.4.tar.gz/source/common/arm/asm-primitives.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2016 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Praveen Kumar Tiwari <praveen@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/arm/asm.S -> x265_2.4.tar.gz/source/common/arm/asm.S
Changed
10
1
2
/*****************************************************************************3
* asm.S: arm utility macros4
*****************************************************************************5
- * Copyright (C) 2016 x265 project6
+ * Copyright (C) 2013-2017 MulticoreWare, Inc7
*8
* Authors: Mans Rullgard <mans@mansr.com>9
* David Conrad <lessen42@gmail.com>10
x265_2.3.tar.gz/source/common/arm/blockcopy8.S -> x265_2.4.tar.gz/source/common/arm/blockcopy8.S
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2016 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Radhakrishnan VR <radhakrishnan@multicorewareinc.com>7
* 8
x265_2.3.tar.gz/source/common/arm/blockcopy8.h -> x265_2.4.tar.gz/source/common/arm/blockcopy8.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2016 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/arm/cpu-a.S -> x265_2.4.tar.gz/source/common/arm/cpu-a.S
Changed
10
1
2
/*****************************************************************************3
* cpu-a.S: arm cpu detection4
*****************************************************************************5
- * Copyright (C) 2016 x265 project6
+ * Copyright (C) 2013-2017 MulticoreWare, Inc7
*8
* Authors: David Conrad <lessen42@gmail.com>9
* Dnyaneshwar Gorade <dnyaneshwar@multicorewareinc.com>10
x265_2.3.tar.gz/source/common/arm/dct-a.S -> x265_2.4.tar.gz/source/common/arm/dct-a.S
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2016 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Min Chen <chenm003@163.com>7
* 8
x265_2.3.tar.gz/source/common/arm/dct8.h -> x265_2.4.tar.gz/source/common/arm/dct8.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2016 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Min Chen <chenm003@163.com>7
* Dnyaneshwar Gorade <dnyaneshwar@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/arm/intrapred.h -> x265_2.4.tar.gz/source/common/arm/intrapred.h
Changed
10
1
2
/*****************************************************************************3
* intrapred.h: Intra Prediction metrics4
*****************************************************************************5
- * Copyright (C) 2003-2013 x264 project6
+ * Copyright (C) 2013-2017 MulticoreWare, Inc7
*8
* Authors: Min Chen <chenm003@163.com> <min.chen@multicorewareinc.com>9
* Praveen Kumar Tiwari <praveen@multicorewareinc.com>10
x265_2.3.tar.gz/source/common/arm/ipfilter8.S -> x265_2.4.tar.gz/source/common/arm/ipfilter8.S
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2016 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Dnyaneshwar G <dnyaneshwar@multicorewareinc.com>7
* Radhakrishnan VR <radhakrishnan@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/arm/ipfilter8.h -> x265_2.4.tar.gz/source/common/arm/ipfilter8.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2016 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Dnyaneshwar Gorade <dnyaneshwar@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/arm/loopfilter.h -> x265_2.4.tar.gz/source/common/arm/loopfilter.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2016 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Dnyaneshwar Gorade <dnyaneshwar@multicorewareinc.com>7
* Praveen Kumar Tiwari <praveen@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/arm/mc-a.S -> x265_2.4.tar.gz/source/common/arm/mc-a.S
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2016 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Dnyaneshwar Gorade <dnyaneshwar@multicorewareinc.com>7
* Radhakrishnan <radhakrishnan@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/arm/mc.h -> x265_2.4.tar.gz/source/common/arm/mc.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2016 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/common/arm/pixel-util.S -> x265_2.4.tar.gz/source/common/arm/pixel-util.S
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2016 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Dnyaneshwar G <dnyaneshwar@multicorewareinc.com>7
* Radhakrishnan VR <radhakrishnan@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/arm/pixel-util.h -> x265_2.4.tar.gz/source/common/arm/pixel-util.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2016 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
;* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/arm/pixel.h -> x265_2.4.tar.gz/source/common/arm/pixel.h
Changed
12
1
2
/*****************************************************************************3
* pixel.h: x86 pixel metrics4
*****************************************************************************5
- * Copyright (C) 2003-2013 x264 project6
- * Copyright (C) 2013-2016 x265 project7
+ * Copyright (C) 2003-2017 x265 project8
+ * Copyright (C) 2013-2017 MulticoreWare, Inc9
*10
* Authors: Laurent Aimar <fenrir@via.ecp.fr>11
* Loren Merritt <lorenm@u.washington.edu>12
x265_2.3.tar.gz/source/common/arm/sad-a.S -> x265_2.4.tar.gz/source/common/arm/sad-a.S
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2016 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: David Conrad <lessen42@gmail.com>7
* Janne Grunau <janne-x264@jannau.net>8
x265_2.3.tar.gz/source/common/arm/ssd-a.S -> x265_2.4.tar.gz/source/common/arm/ssd-a.S
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2016 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Dnyaneshwar G <dnyaneshwar@multicorewareinc.com>7
* 8
x265_2.3.tar.gz/source/common/bitstream.cpp -> x265_2.4.tar.gz/source/common/bitstream.cpp
Changed
14
1
2
3
switch (writeBytes)4
{5
- case 4: push_back(write_bits >> 24);6
- case 3: push_back(write_bits >> 16);7
- case 2: push_back(write_bits >> 8);8
+ case 4: push_back(write_bits >> 24); // fall-through9
+ case 3: push_back(write_bits >> 16); // fall-through10
+ case 2: push_back(write_bits >> 8); // fall-through11
case 1: push_back(write_bits);12
}13
14
x265_2.3.tar.gz/source/common/bitstream.h -> x265_2.4.tar.gz/source/common/bitstream.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Author: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/common.cpp -> x265_2.4.tar.gz/source/common/common.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Deepthi Nandakumar <deepthi@multicorewareinc.com>7
*8
x265_2.3.tar.gz/source/common/common.h -> x265_2.4.tar.gz/source/common/common.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Deepthi Nandakumar <deepthi@multicorewareinc.com>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/constants.cpp -> x265_2.4.tar.gz/source/common/constants.cpp
Changed
125
1
2
/*****************************************************************************3
-* Copyright (C) 2015 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
9
7298.2423, 8192.0000, 9195.2091, 10321.2732, 11585.237510
};11
12
-// lambda2 = pow(lambda, 2) * scale (0.85);13
+// lambda2 = 0.038 * EXP(0.234 * QP) * 256;14
double x265_lambda2_tab[QP_MAX_MAX + 1] =15
{16
- 13.6000, 17.1349, 21.5887, 27.2000, 34.2699,17
- 43.1773, 54.4000, 68.5397, 86.3546, 108.8000,18
- 137.0794, 172.7092, 217.6000, 274.1588, 345.4185,19
- 435.2000, 548.3176, 690.8369, 870.4000, 1096.6353,20
- 1381.6739, 1740.8000, 2193.2706, 2763.3478, 3481.6000,21
- 4386.5411, 5526.6955, 6963.2000, 8773.0822, 11053.3910,22
- 13926.4000, 17546.1645, 22106.7819, 27852.8000, 35092.3291,23
- 44213.5641, 55705.6000, 70184.6579, 88427.1282, 111411.2000,24
- 140369.3159, 176854.2563, 222822.4000, 280738.6324, 353708.5127,25
- 445644.8001, 561477.2648, 707417.0237, 891289.6000, 1122954.5277,26
- 1414834.0484, 1782579.2003, 2245909.0566, 2829668.0981, 3565158.4000,27
- 4491818.1146, 5659336.1938, 7130316.8013, 8983636.2264, 11318672.3923,28
- 14260633.6000, 17967272.4585, 22637344.7751, 28521267.1953, 35934544.9165,29
- 45274689.5567, 57042534.4000, 71869089.8338, 90549379.1181, 114085068.800830
+ 9.7280, 12.2880, 15.5136, 19.6096, 24.7808, 31
+ 31.3344, 39.6032, 50.0480, 63.2320, 79.8976, 32
+ 100.9664, 127.5904, 161.2544, 203.7504, 257.4848, 33
+ 325.3760, 411.1616, 519.5520, 656.5376, 829.6448, 34
+ 1048.3712, 1324.7744, 1674.0608, 2115.4048, 2673.1264, 35
+ 3377.8944, 4268.4416, 5393.7920, 6815.8464, 8612.8128, 36
+ 10883.5328, 13752.9344, 17378.8160, 21960.6528, 27750.4768, 37
+ 35066.7264, 44311.8848, 55994.4704, 70757.0944, 89411.8144, 38
+ 112984.7552, 142772.5824, 180413.7728, 227978.8800, 288084.2496, 39
+ 364036.0960, 460012.2112, 581291.8784, 734546.3040, 928205.3888, 40
+ 1172921.6256, 1482155.9552, 1872918.2208, 2366702.7968, 2990670.9504, 41
+ 3779144.8832, 4775495.6288, 6034528.7424, 7625499.0080, 9635919.8464, 42
+ 12176377.0368, 15386611.7888, 19443207.2448, 24569301.7344, 31046862.8224, 43
+ 39232197.1968, 49575549.9264, 62645870.6176, 79162109.3632, 100032763.468844
};45
46
#elif X265_DEPTH == 1047
48
1824.5606, 2048.0000, 2298.8023, 2580.3183, 2896.3094,49
};50
51
-// lambda2 = pow(lambda, 2) * scale (0.85);52
+// lambda2 = 0.038 * exp(0.234 * QP) * 16;53
double x265_lambda2_tab[QP_MAX_MAX + 1] =54
{55
- 0.8500, 1.0709, 1.3493, 1.7000, 2.1419, 56
- 2.6986, 3.4000, 4.2837, 5.3972, 6.8000, 57
- 8.5675, 10.7943, 13.6000, 17.1349, 21.5887, 58
- 27.2000, 34.2699, 43.1773, 54.4000, 68.5397, 59
- 86.3546, 108.8000, 137.0794, 172.7092, 217.6000, 60
- 274.1588, 345.4185, 435.2000, 548.3176, 690.8369, 61
- 870.4000, 1096.6353, 1381.6739, 1740.8000, 2193.2706, 62
- 2763.3478, 3481.6000, 4386.5411, 5526.6955, 6963.2000, 63
- 8773.0823, 11053.3910, 13926.4000, 17546.1645, 22106.7820, 64
- 27852.8000, 35092.3290, 44213.5640, 55705.6000, 70184.6580, 65
- 88427.1280, 111411.2000, 140369.3161, 176854.2561, 222822.4000, 66
- 280738.6321, 353708.5122, 445644.8000, 561477.2643, 707417.0243, 67
- 891289.6000, 1122954.5286, 1414834.0486, 1782579.2000, 2245909.0572, 68
- 2829668.0973, 3565158.4000, 4491818.1144, 5659336.1946, 7130316.8000, 69
+ 0.6080, 0.7680, 0.9696, 1.2256, 1.5488, 70
+ 1.9584, 2.4752, 3.1280, 3.9520, 4.9936, 71
+ 6.3104, 7.9744, 10.0784, 12.7344, 16.0928, 72
+ 20.3360, 25.6976, 32.4720, 41.0336, 51.8528, 73
+ 65.5232, 82.7984, 104.6288, 132.2128, 167.0704, 74
+ 211.1184, 266.7776, 337.1120, 425.9904, 538.3008, 75
+ 680.2208, 859.5584, 1086.1760, 1372.5408, 1734.4048, 76
+ 2191.6704, 2769.4928, 3499.6544, 4422.3184, 5588.2384, 77
+ 7061.5472, 8923.2864, 11275.8608, 14248.6800, 18005.2656, 78
+ 22752.2560, 28750.7632, 36330.7424, 45909.1440, 58012.8368, 79
+ 73307.6016, 92634.7472, 117057.3888, 147918.9248, 186916.9344, 80
+ 236196.5552, 298468.4768, 377158.0464, 476593.6880, 602244.9904, 81
+ 761023.5648, 961663.2368, 1215200.4528, 1535581.3584, 1940428.9264, 82
+ 2452012.3248, 3098471.8704, 3915366.9136, 4947631.8352, 6252047.716883
};84
85
#else /* !HIGH_BIT_DEPTH */86
87
456.1401, 512.0000, 574.7006, 645.0796, 724.077388
};89
90
-// lambda2 = pow(lambda, 2) * scale (0.85);91
+// lambda2 = 0.038 * exp(0.234 * QP)92
double x265_lambda2_tab[QP_MAX_MAX + 1] =93
{94
- 0.0531, 0.0669, 0.0843, 0.1063, 0.1339,95
- 0.1687, 0.2125, 0.2677, 0.3373, 0.4250,96
- 0.5355, 0.6746, 0.8500, 1.0709, 1.3493,97
- 1.7000, 2.1419, 2.6986, 3.4000, 4.2837,98
- 5.3970, 6.8000, 8.5675, 10.7943, 13.6000,99
- 17.1345, 21.5887, 27.2004, 34.2699, 43.1773,100
- 54.4000, 68.5397, 86.3551, 108.7998, 137.0792,101
- 172.7097, 217.6000, 274.1590, 345.4172, 435.1993,102
- 548.3169, 690.8389, 870.4000, 1096.6362, 1381.6757,103
- 1740.7974, 2193.2676, 2763.3460, 3481.6000, 4386.5446,104
- 5526.6890, 6963.2049, 8773.0879, 11053.3840, 13926.4000,105
- 17546.1542, 22106.7835, 27852.7889, 35092.3170, 44213.5749,106
- 55705.6000, 70184.6657, 88427.1342, 111411.2172, 140369.3373,107
- 176854.2222, 222822.4000, 280738.6627, 353708.5368, 445644.7459108
+ 0.0380, 0.0480, 0.0606, 0.0766, 0.0968,109
+ 0.1224, 0.1547, 0.1955, 0.2470, 0.3121,110
+ 0.3944, 0.4984, 0.6299, 0.7959, 1.0058,111
+ 1.2710, 1.6061, 2.0295, 2.5646, 3.2408,112
+ 4.0952, 5.1749, 6.5393, 8.2633, 10.4419,113
+ 13.1949, 16.6736, 21.0695, 26.6244, 33.6438,114
+ 42.5138, 53.7224, 67.8860, 85.7838, 108.4003,115
+ 136.9794, 173.0933, 218.7284, 276.3949, 349.2649,116
+ 441.3467, 557.7054, 704.7413, 890.5425, 1125.3291,117
+ 1422.0160, 1796.9227, 2270.6714, 2869.3215, 3625.8023,118
+ 4581.7251, 5789.6717, 7316.0868, 9244.9328, 11682.3084,119
+ 14762.2847, 18654.2798, 23572.3779, 29787.1055, 37640.3119,120
+ 47563.9728, 60103.9523, 75950.0283, 95973.8349, 121276.8079,121
+ 153250.7703, 193654.4919, 244710.4321, 309226.9897, 390752.9823122
};123
124
#endif125
x265_2.3.tar.gz/source/common/constants.h -> x265_2.4.tar.gz/source/common/constants.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/contexts.h -> x265_2.4.tar.gz/source/common/contexts.h
Changed
8
1
2
/*****************************************************************************3
-* Copyright (C) 2015 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/cpu.cpp -> x265_2.4.tar.gz/source/common/cpu.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Loren Merritt <lorenm@u.washington.edu>7
* Laurent Aimar <fenrir@via.ecp.fr>8
x265_2.3.tar.gz/source/common/cpu.h -> x265_2.4.tar.gz/source/common/cpu.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Loren Merritt <lorenm@u.washington.edu>7
* Steve Borho <steve@borho.org>8
x265_2.3.tar.gz/source/common/cudata.cpp -> x265_2.4.tar.gz/source/common/cudata.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/cudata.h -> x265_2.4.tar.gz/source/common/cudata.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/common/dct.cpp -> x265_2.4.tar.gz/source/common/dct.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Mandar Gurav <mandar@multicorewareinc.com>7
* Deepthi Devaki Akkoorath <deepthidevaki@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/deblock.cpp -> x265_2.4.tar.gz/source/common/deblock.cpp
Changed
8
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Author: Gopu Govindaswamy <gopu@multicorewareinc.com>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/deblock.h -> x265_2.4.tar.gz/source/common/deblock.h
Changed
8
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Author: Gopu Govindaswamy <gopu@multicorewareinc.com>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/frame.cpp -> x265_2.4.tar.gz/source/common/frame.cpp
Changed
16
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Author: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
9
memset(&m_lowres, 0, sizeof(m_lowres));10
m_rcData = NULL;11
m_encodeStartTime = 0;12
+ m_reconfigureRc = false;13
}14
15
bool Frame::create(x265_param *param, float* quantOffsets)16
x265_2.3.tar.gz/source/common/frame.h -> x265_2.4.tar.gz/source/common/frame.h
Changed
29
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Author: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
9
int encodeOrder;10
int sliceType;11
int keptAsRef;12
+ double wantedBitsWindow;13
+ double cplxrSum;14
+ double shortTermCplxSum;15
+ double shortTermCplxCount;16
+ int64_t totalBits;17
+ int64_t encodedBits;18
};19
20
class Frame21
22
Lowres m_lowres;23
bool m_lowresInit; // lowres init complete (pre-analysis)24
bool m_bChromaExtended; // orig chroma planes motion extended for weight analysis25
+ bool m_reconfigureRc;26
27
float* m_quantOffsets; // points to quantOffsets in x265_picture28
x265_sei m_userSEI;29
x265_2.3.tar.gz/source/common/framedata.cpp -> x265_2.4.tar.gz/source/common/framedata.cpp
Changed
8
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Author: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/common/framedata.h -> x265_2.4.tar.gz/source/common/framedata.h
Changed
25
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Author: Steve Borho <steve@borho.org>7
*8
9
/* Stores inter analysis data for a single frame */10
struct analysis_inter_data11
{12
- WeightParam* wt;13
int32_t* ref;14
uint8_t* depth;15
uint8_t* modes;16
uint8_t* partSize;17
uint8_t* mergeFlag;18
+ uint8_t* interDir;19
+ uint8_t* mvpIdx[2];20
+ int8_t* refIdx[2];21
+ MV* mv[2];22
};23
24
struct analysis2PassFrameData25
x265_2.3.tar.gz/source/common/intrapred.cpp -> x265_2.4.tar.gz/source/common/intrapred.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Min Chen <chenm003@163.com>7
*8
x265_2.3.tar.gz/source/common/ipfilter.cpp -> x265_2.4.tar.gz/source/common/ipfilter.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Deepthi Devaki <deepthidevaki@multicorewareinc.com>,7
* Rajesh Paulraj <rajesh@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/loopfilter.cpp -> x265_2.4.tar.gz/source/common/loopfilter.cpp
Changed
8
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Praveen Kumar Tiwari <praveen@multicorewareinc.com>7
* Dnyaneshwar Gorade <dnyaneshwar@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/lowres.cpp -> x265_2.4.tar.gz/source/common/lowres.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Gopu Govindaswamy <gopu@multicorewareinc.com>7
*8
x265_2.3.tar.gz/source/common/lowres.h -> x265_2.4.tar.gz/source/common/lowres.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Gopu Govindaswamy <gopu@multicorewareinc.com>7
*8
x265_2.3.tar.gz/source/common/md5.cpp -> x265_2.4.tar.gz/source/common/md5.cpp
Changed
10
1
2
/*****************************************************************************3
* md5.cpp: Calculate MD5 for SEI4
*****************************************************************************5
- * Copyright (C) 2011-2012 x265 project6
+ * Copyright (C) 2013-2017 MulticoreWare, Inc7
*8
* Authors: Min Chen <chenm003@163.com>9
*10
x265_2.3.tar.gz/source/common/md5.h -> x265_2.4.tar.gz/source/common/md5.h
Changed
10
1
2
/*****************************************************************************3
* md5.h: Calculate MD54
*****************************************************************************5
- * Copyright (C) 2011-2012 x265 project6
+ * Copyright (C) 2013-2017 MulticoreWare, Inc7
*8
* Authors: Min Chen <chenm003@163.com>9
*10
x265_2.3.tar.gz/source/common/mv.h -> x265_2.4.tar.gz/source/common/mv.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/common/param.cpp -> x265_2.4.tar.gz/source/common/param.cpp
Changed
123
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Deepthi Nandakumar <deepthi@multicorewareinc.com>7
* Min Chen <min.chen@multicorewareinc.com>8
9
/* SAO Loop Filter */10
param->bEnableSAO = 1;11
param->bSaoNonDeblocked = 0;12
-13
+ param->bLimitSAO = 0;14
/* Coding Quality */15
param->cbQpOffset = 0;16
param->crQpOffset = 0;17
18
param->bOptRefListLengthPPS = 1;19
param->bOptCUDeltaQP = 0;20
param->bAQMotion = 0;21
+ param->bHDROpt = 0;22
+ param->analysisRefineLevel = 5;23
24
+ param->toneMapFile = NULL;25
+ param->bDhdr10opt = 0;26
}27
28
int x265_param_default_preset(x265_param* param, const char* preset, const char* tune)29
30
param->limitModes = 1;31
param->bIntraInBFrames = 1;32
param->lookaheadSlices = 4; // limit parallelism as already enough work exists33
+ param->limitTU = 4;34
}35
else if (!strcmp(preset, "veryslow"))36
{37
38
param->limitModes = 1;39
param->bIntraInBFrames = 1;40
param->lookaheadSlices = 0; // disabled for best quality41
+ param->limitTU = 4;42
}43
else if (!strcmp(preset, "placebo"))44
{45
46
OPT("multi-pass-opt-distortion") p->analysisMultiPassDistortion = atobool(value);47
OPT("aq-motion") p->bAQMotion = atobool(value);48
OPT("dynamic-rd") p->dynamicRd = atof(value);49
+ OPT("refine-level") p->analysisRefineLevel = atoi(value);50
OPT("ssim-rd")51
{52
int bval = atobool(value);53
54
}55
}56
OPT("hdr") p->bEmitHDRSEI = atobool(value);57
+ OPT("hdr-opt") p->bHDROpt = atobool(value);58
+ OPT("limit-sao") p->bLimitSAO = atobool(value);59
+ OPT("dhdr10-info") p->toneMapFile = strdup(value);60
+ OPT("dhdr10-opt") p->bDhdr10opt = atobool(value);61
else62
return X265_PARAM_BAD_NAME;63
}64
65
"Strict-cbr cannot be applied without specifying target bitrate or vbv bufsize");66
CHECK(param->analysisMode && (param->analysisMode < X265_ANALYSIS_OFF || param->analysisMode > X265_ANALYSIS_LOAD),67
"Invalid analysis mode. Analysis mode 0: OFF 1: SAVE : 2 LOAD");68
+ CHECK(param->analysisMode && (param->analysisRefineLevel < 1 || param->analysisRefineLevel > 10),69
+ "Invalid analysis refine level. Value must be between 1 and 10 (inclusive)");70
CHECK(param->rc.qpMax < QP_MIN || param->rc.qpMax > QP_MAX_MAX,71
"qpmax exceeds supported range (0 to 69)");72
CHECK(param->rc.qpMin < QP_MIN || param->rc.qpMin > QP_MAX_MAX,73
74
TOOLOPT(param->limitModes, "limit-modes");75
TOOLVAL(param->rdLevel, "rd=%d");76
TOOLVAL(param->dynamicRd, "dynamic-rd=%.2f");77
+ TOOLOPT(param->bSsimRd, "ssim-rd");78
TOOLVAL(param->psyRd, "psy-rd=%.2lf");79
TOOLVAL(param->rdoqLevel, "rdoq=%d");80
TOOLVAL(param->psyRdoq, "psy-rdoq=%.2lf");81
82
TOOLOPT(!param->bSaoNonDeblocked && param->bEnableSAO, "sao");83
TOOLOPT(param->rc.bStatWrite, "stats-write");84
TOOLOPT(param->rc.bStatRead, "stats-read");85
+#if ENABLE_DYNAMIC_HDR1086
+ TOOLVAL(param->toneMapFile != NULL, "dhdr10-info");87
+#endif88
x265_log(param, X265_LOG_INFO, "tools:%s\n", buf);89
fflush(stderr);90
}91
92
s += sprintf(s, " limit-tu=%d", p->limitTU);93
s += sprintf(s, " rdoq-level=%d", p->rdoqLevel);94
s += sprintf(s, " dynamic-rd=%.2f", p->dynamicRd);95
+ BOOL(p->bSsimRd, "ssim-rd");96
BOOL(p->bEnableSignHiding, "signhide");97
BOOL(p->bEnableTransformSkip, "tskip");98
s += sprintf(s, " nr-intra=%d", p->noiseReductionIntra);99
100
BOOL(p->bOptCUDeltaQP, "opt-cu-delta-qp");101
BOOL(p->bAQMotion, "aq-motion");102
BOOL(p->bEmitHDRSEI, "hdr");103
+ BOOL(p->bHDROpt, "hdr-opt");104
+ BOOL(p->bDhdr10opt, "dhdr10-opt");105
+ s += sprintf(s, " refine-level=%d", p->analysisRefineLevel);106
+ BOOL(p->bLimitSAO, "limit-sao");107
#undef BOOL108
return buf;109
}110
111
if (!param->rc.lambdaFileName)112
return false;113
114
- FILE *lfn = fopen(param->rc.lambdaFileName, "r");115
+ FILE *lfn = x265_fopen(param->rc.lambdaFileName, "r");116
if (!lfn)117
{118
- x265_log(param, X265_LOG_ERROR, "unable to read lambda file <%s>\n", param->rc.lambdaFileName);119
+ x265_log_file(param, X265_LOG_ERROR, "unable to read lambda file <%s>\n", param->rc.lambdaFileName);120
return true;121
}122
123
x265_2.3.tar.gz/source/common/param.h -> x265_2.4.tar.gz/source/common/param.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Deepthi Nandakumar <deepthi@multicorewareinc.com>7
* Praveen Kumar Tiwari <praveen@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/piclist.cpp -> x265_2.4.tar.gz/source/common/piclist.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Gopu Govindaswamy <gopu@multicorewareinc.com>7
*8
x265_2.3.tar.gz/source/common/piclist.h -> x265_2.4.tar.gz/source/common/piclist.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Gopu Govindaswamy <gopu@multicorewareinc.com>7
*8
x265_2.3.tar.gz/source/common/picyuv.cpp -> x265_2.4.tar.gz/source/common/picyuv.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/picyuv.h -> x265_2.4.tar.gz/source/common/picyuv.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/common/pixel.cpp -> x265_2.4.tar.gz/source/common/pixel.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Mandar Gurav <mandar@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/ppc/dct_altivec.cpp -> x265_2.4.tar.gz/source/common/ppc/dct_altivec.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Roger Moussalli <rmoussal@us.ibm.com>7
* Min Chen <min.chen@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/ppc/intrapred_altivec.cpp -> x265_2.4.tar.gz/source/common/ppc/intrapred_altivec.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Roger Moussalli <rmoussal@us.ibm.com>7
* Min Chen <min.chen@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/ppc/ipfilter_altivec.cpp -> x265_2.4.tar.gz/source/common/ppc/ipfilter_altivec.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Roger Moussalli <rmoussal@us.ibm.com>7
* Min Chen <min.chen@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/ppc/pixel_altivec.cpp -> x265_2.4.tar.gz/source/common/ppc/pixel_altivec.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Mandar Gurav <mandar@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/ppc/ppccommon.h -> x265_2.4.tar.gz/source/common/ppc/ppccommon.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Min Chen <min.chen@multicorewareinc.com>7
*8
x265_2.3.tar.gz/source/common/predict.cpp -> x265_2.4.tar.gz/source/common/predict.cpp
Changed
8
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Deepthi Nandakumar <deepthi@multicorewareinc.com>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/predict.h -> x265_2.4.tar.gz/source/common/predict.h
Changed
8
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Deepthi Nandakumar <deepthi@multicorewareinc.com>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/primitives.cpp -> x265_2.4.tar.gz/source/common/primitives.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/common/primitives.h -> x265_2.4.tar.gz/source/common/primitives.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Mandar Gurav <mandar@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/quant.cpp -> x265_2.4.tar.gz/source/common/quant.cpp
Changed
19
1
2
/*****************************************************************************3
- * Copyright (C) 2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
9
m_rdoqLevel = ctu.m_encData->m_param->rdoqLevel;10
if (ctu.m_chromaFormat != X265_CSP_I400)11
{12
- setChromaQP(qp + ctu.m_slice->m_pps->chromaQpOffset[0], TEXT_CHROMA_U, ctu.m_chromaFormat);13
- setChromaQP(qp + ctu.m_slice->m_pps->chromaQpOffset[1], TEXT_CHROMA_V, ctu.m_chromaFormat);14
+ setChromaQP(qp + ctu.m_slice->m_pps->chromaQpOffset[0] + ctu.m_slice->m_chromaQpOffset[0], TEXT_CHROMA_U, ctu.m_chromaFormat);15
+ setChromaQP(qp + ctu.m_slice->m_pps->chromaQpOffset[1] + ctu.m_slice->m_chromaQpOffset[1], TEXT_CHROMA_V, ctu.m_chromaFormat);16
}17
}18
19
x265_2.3.tar.gz/source/common/quant.h -> x265_2.4.tar.gz/source/common/quant.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/scalinglist.cpp -> x265_2.4.tar.gz/source/common/scalinglist.cpp
Changed
57
1
2
/*****************************************************************************3
- * Copyright (C) 2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
9
10
bool ScalingList::parseScalingList(const char* filename)11
{12
- FILE *fp = fopen(filename, "r");13
+ FILE *fp = x265_fopen(filename, "r");14
if (!fp)15
{16
- x265_log(NULL, X265_LOG_ERROR, "can't open scaling list file %s\n", filename);17
+ x265_log_file(NULL, X265_LOG_ERROR, "can't open scaling list file %s\n", filename);18
return true;19
}20
21
22
char *ret = fgets(line, 1024, fp);23
if (!ret || (!strstr(line, MatrixType[sizeIdc][listIdc]) && feof(fp)))24
{25
- x265_log(NULL, X265_LOG_ERROR, "can't read matrix from %s\n", filename);26
+ x265_log_file(NULL, X265_LOG_ERROR, "can't read matrix from %s\n", filename);27
return true;28
}29
}30
31
int data;32
if (fscanf(fp, "%d,", &data) != 1)33
{34
- x265_log(NULL, X265_LOG_ERROR, "can't read matrix from %s\n", filename);35
+ x265_log_file(NULL, X265_LOG_ERROR, "can't read matrix from %s\n", filename);36
return true;37
}38
src[i] = data;39
40
char *ret = fgets(line, 1024, fp);41
if (!ret || (!strstr(line, MatrixType_DC[sizeIdc][listIdc]) && feof(fp)))42
{43
- x265_log(NULL, X265_LOG_ERROR, "can't read DC from %s\n", filename);44
+ x265_log_file(NULL, X265_LOG_ERROR, "can't read DC from %s\n", filename);45
return true;46
}47
}48
49
int data;50
if (fscanf(fp, "%d,", &data) != 1)51
{52
- x265_log(NULL, X265_LOG_ERROR, "can't read matrix from %s\n", filename);53
+ x265_log_file(NULL, X265_LOG_ERROR, "can't read matrix from %s\n", filename);54
return true;55
}56
57
x265_2.3.tar.gz/source/common/scalinglist.h -> x265_2.4.tar.gz/source/common/scalinglist.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/common/shortyuv.cpp -> x265_2.4.tar.gz/source/common/shortyuv.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Deepthi Nandakumar <deepthi@multicorewareinc.com>7
*8
x265_2.3.tar.gz/source/common/shortyuv.h -> x265_2.4.tar.gz/source/common/shortyuv.h
Changed
10
1
2
/*****************************************************************************3
* x265: ShortYUV class for short sized YUV-style frames4
*****************************************************************************5
- * Copyright (C) 2013 x265 project6
+ * Copyright (C) 2013-2017 MulticoreWare, Inc7
*8
* Authors: Deepthi Nandakumar <deepthi@multicorewareinc.com>9
*10
x265_2.3.tar.gz/source/common/slice.cpp -> x265_2.4.tar.gz/source/common/slice.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/common/slice.h -> x265_2.4.tar.gz/source/common/slice.h
Changed
32
1
2
/*****************************************************************************3
- * Copyright (C) 2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
9
bool bPicDisableDeblockingFilter;10
11
int numRefIdxDefault[2];12
+ bool pps_slice_chroma_qp_offsets_present_flag;13
};14
15
struct WeightParam16
17
NalUnitType m_nalUnitType;18
SliceType m_sliceType;19
int m_sliceQp;20
+ int m_chromaQpOffset[2];21
int m_poc;22
int m_lastIDR;23
int m_rpsIdx;24
25
numRefIdxDefault[0] = 1;26
numRefIdxDefault[1] = 1;27
m_rpsIdx = -1;28
+ m_chromaQpOffset[0] = m_chromaQpOffset[1] = 0;29
}30
31
void disableWeights();32
x265_2.3.tar.gz/source/common/threading.cpp -> x265_2.4.tar.gz/source/common/threading.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/common/threading.h -> x265_2.4.tar.gz/source/common/threading.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/threadpool.cpp -> x265_2.4.tar.gz/source/common/threadpool.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/threadpool.h -> x265_2.4.tar.gz/source/common/threadpool.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/common/vec/dct-sse3.cpp -> x265_2.4.tar.gz/source/common/vec/dct-sse3.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Mandar Gurav <mandar@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/vec/dct-sse41.cpp -> x265_2.4.tar.gz/source/common/vec/dct-sse41.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Mandar Gurav <mandar@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/vec/dct-ssse3.cpp -> x265_2.4.tar.gz/source/common/vec/dct-ssse3.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Mandar Gurav <mandar@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/vec/vec-primitives.cpp -> x265_2.4.tar.gz/source/common/vec/vec-primitives.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/common/version.cpp -> x265_2.4.tar.gz/source/common/version.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/wavefront.cpp -> x265_2.4.tar.gz/source/common/wavefront.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/wavefront.h -> x265_2.4.tar.gz/source/common/wavefront.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/winxp.cpp -> x265_2.4.tar.gz/source/common/winxp.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/common/winxp.h -> x265_2.4.tar.gz/source/common/winxp.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/common/x86/asm-primitives.cpp -> x265_2.4.tar.gz/source/common/x86/asm-primitives.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Praveen Kumar Tiwari <praveen@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/x86/blockcopy8.asm -> x265_2.4.tar.gz/source/common/x86/blockcopy8.asm
Changed
8
1
2
;*****************************************************************************3
-;* Copyright (C) 2013 x265 project4
+;* Copyright (C) 2013-2017 MulticoreWare, Inc5
;*6
;* Authors: Praveen Kumar Tiwari <praveen@multicorewareinc.com>7
;* Murugan Vairavel <murugan@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/x86/blockcopy8.h -> x265_2.4.tar.gz/source/common/x86/blockcopy8.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
;* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/x86/const-a.asm -> x265_2.4.tar.gz/source/common/x86/const-a.asm
Changed
12
1
2
;*****************************************************************************3
;* const-a.asm: x86 global constants4
;*****************************************************************************5
-;* Copyright (C) 2010-2013 x264 project6
-;* Copyright (C) 2013-2015 x265 project7
+;* Copyright (C) 2003-2013 x264 project8
+;* Copyright (C) 2013-2017 MulticoreWare, Inc9
;*10
;* Authors: Loren Merritt <lorenm@u.washington.edu>11
;* Fiona Glaser <fiona@x264.com>12
x265_2.3.tar.gz/source/common/x86/cpu-a.asm -> x265_2.4.tar.gz/source/common/x86/cpu-a.asm
Changed
10
1
2
;* cpu-a.asm: x86 cpu utilities3
;*****************************************************************************4
;* Copyright (C) 2003-2013 x264 project5
-;* Copyright (C) 2013-2015 x265 project6
+;* Copyright (C) 2013-2017 MulticoreWare, Inc7
;*8
;* Authors: Laurent Aimar <fenrir@via.ecp.fr>9
;* Loren Merritt <lorenm@u.washington.edu>10
x265_2.3.tar.gz/source/common/x86/dct8.asm -> x265_2.4.tar.gz/source/common/x86/dct8.asm
Changed
8
1
2
;*****************************************************************************3
-;* Copyright (C) 2013 x265 project4
+;* Copyright (C) 2013-2017 MulticoreWare, Inc5
;*6
;* Authors: Nabajit Deka <nabajit@multicorewareinc.com>7
;* Min Chen <chenm003@163.com> <min.chen@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/x86/dct8.h -> x265_2.4.tar.gz/source/common/x86/dct8.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Nabajit Deka <nabajit@multicorewareinc.com>7
;* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/x86/intrapred.h -> x265_2.4.tar.gz/source/common/x86/intrapred.h
Changed
9
1
2
* intrapred.h: Intra Prediction metrics3
*****************************************************************************4
* Copyright (C) 2003-2013 x264 project5
+ * Copyright (C) 2013-2017 MulticoreWare, Inc6
*7
* Authors: Min Chen <chenm003@163.com> <min.chen@multicorewareinc.com>8
* Praveen Kumar Tiwari <praveen@multicorewareinc.com>9
x265_2.3.tar.gz/source/common/x86/intrapred16.asm -> x265_2.4.tar.gz/source/common/x86/intrapred16.asm
Changed
8
1
2
;*****************************************************************************3
-;* Copyright (C) 2013 x265 project4
+;* Copyright (C) 2013-2017 MulticoreWare, Inc5
;*6
;* Authors: Dnyaneshwar Gorade <dnyaneshwar@multicorewareinc.com>7
;* Yuvaraj Venkatesh <yuvaraj@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/x86/intrapred8.asm -> x265_2.4.tar.gz/source/common/x86/intrapred8.asm
Changed
8
1
2
;*****************************************************************************3
-;* Copyright (C) 2013 x265 project4
+;* Copyright (C) 2013-2017 MulticoreWare, Inc5
;*6
;* Authors: Min Chen <chenm003@163.com> <min.chen@multicorewareinc.com>7
;* Praveen Kumar Tiwari <praveen@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/x86/intrapred8_allangs.asm -> x265_2.4.tar.gz/source/common/x86/intrapred8_allangs.asm
Changed
8
1
2
;*****************************************************************************3
-;* Copyright (C) 2013 x265 project4
+;* Copyright (C) 2013-2017 MulticoreWare, Inc5
;*6
;* Authors: Min Chen <chenm003@163.com> <min.chen@multicorewareinc.com>7
;* Praveen Tiwari <praveen@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/x86/ipfilter16.asm -> x265_2.4.tar.gz/source/common/x86/ipfilter16.asm
Changed
8
1
2
;*****************************************************************************3
-;* Copyright (C) 2013 x265 project4
+;* Copyright (C) 2013-2017 MulticoreWare, Inc5
;*6
;* Authors: Nabajit Deka <nabajit@multicorewareinc.com>7
;* Murugan Vairavel <murugan@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/x86/ipfilter8.asm -> x265_2.4.tar.gz/source/common/x86/ipfilter8.asm
Changed
8
1
2
;*****************************************************************************3
-;* Copyright (C) 2013 x265 project4
+;* Copyright (C) 2013-2017 MulticoreWare, Inc5
;*6
;* Authors: Min Chen <chenm003@163.com>7
;* Nabajit Deka <nabajit@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/x86/ipfilter8.h -> x265_2.4.tar.gz/source/common/x86/ipfilter8.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/common/x86/loopfilter.asm -> x265_2.4.tar.gz/source/common/x86/loopfilter.asm
Changed
8
1
2
;*****************************************************************************3
-;* Copyright (C) 2013 x265 project4
+;* Copyright (C) 2013-2017 MulticoreWare, Inc5
;*6
;* Authors: Min Chen <chenm001@163.com>7
;* Praveen Kumar Tiwari <praveen@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/x86/loopfilter.h -> x265_2.4.tar.gz/source/common/x86/loopfilter.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Dnyaneshwar Gorade <dnyaneshwar@multicorewareinc.com>7
* Praveen Kumar Tiwari <praveen@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/x86/mc-a.asm -> x265_2.4.tar.gz/source/common/x86/mc-a.asm
Changed
10
1
2
;* mc-a.asm: x86 motion compensation3
;*****************************************************************************4
;* Copyright (C) 2003-2013 x264 project5
-;* Copyright (C) 2013-2015 x265 project6
+;* Copyright (C) 2013-2017 MulticoreWare, Inc7
;*8
;* Authors: Loren Merritt <lorenm@u.washington.edu>9
;* Fiona Glaser <fiona@x264.com>10
x265_2.3.tar.gz/source/common/x86/mc-a2.asm -> x265_2.4.tar.gz/source/common/x86/mc-a2.asm
Changed
12
1
2
;*****************************************************************************3
;* mc-a2.asm: x86 motion compensation4
;*****************************************************************************5
-;* Copyright (C) 2005-2013 x264 project6
-;* Copyright (C) 2013-2015 x265 project7
+;* Copyright (C) 2003-2013 x264 project8
+;* Copyright (C) 2013-2017 MulticoreWare, Inc9
;*10
;* Authors: Loren Merritt <lorenm@u.washington.edu>11
;* Fiona Glaser <fiona@x264.com>12
x265_2.3.tar.gz/source/common/x86/mc.h -> x265_2.4.tar.gz/source/common/x86/mc.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/common/x86/pixel-32.asm -> x265_2.4.tar.gz/source/common/x86/pixel-32.asm
Changed
9
1
2
;* pixel-32.asm: x86_32 pixel metrics3
;*****************************************************************************4
;* Copyright (C) 2003-2013 x264 project5
+;* Copyright (C) 2013-2017 MulticoreWare, Inc6
;*7
;* Authors: Loren Merritt <lorenm@u.washington.edu>8
;* Laurent Aimar <fenrir@via.ecp.fr>9
x265_2.3.tar.gz/source/common/x86/pixel-a.asm -> x265_2.4.tar.gz/source/common/x86/pixel-a.asm
Changed
10
1
2
;* pixel.asm: x86 pixel metrics3
;*****************************************************************************4
;* Copyright (C) 2003-2013 x264 project5
-;* Copyright (C) 2013-2015 x265 project6
+;* Copyright (C) 2013-2017 MulticoreWare, Inc7
;*8
;* Authors: Loren Merritt <lorenm@u.washington.edu>9
;* Holger Lubitz <holger@lubitz.org>10
x265_2.3.tar.gz/source/common/x86/pixel-util.h -> x265_2.4.tar.gz/source/common/x86/pixel-util.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
;* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/x86/pixel-util8.asm -> x265_2.4.tar.gz/source/common/x86/pixel-util8.asm
Changed
8
1
2
;*****************************************************************************3
-;* Copyright (C) 2013 x265 project4
+;* Copyright (C) 2013-2017 MulticoreWare, Inc5
;*6
;* Authors: Min Chen <chenm003@163.com> <min.chen@multicorewareinc.com>7
;* Nabajit Deka <nabajit@multicorewareinc.com>8
x265_2.3.tar.gz/source/common/x86/pixel.h -> x265_2.4.tar.gz/source/common/x86/pixel.h
Changed
10
1
2
* pixel.h: x86 pixel metrics3
*****************************************************************************4
* Copyright (C) 2003-2013 x264 project5
- * Copyright (C) 2013-2015 x265 project6
+ * Copyright (C) 2013-2017 MulticoreWare, Inc7
*8
* Authors: Laurent Aimar <fenrir@via.ecp.fr>9
* Loren Merritt <lorenm@u.washington.edu>10
x265_2.3.tar.gz/source/common/x86/pixeladd8.asm -> x265_2.4.tar.gz/source/common/x86/pixeladd8.asm
Changed
8
1
2
;*****************************************************************************3
-;* Copyright (C) 2013 x265 project4
+;* Copyright (C) 2013-2017 MulticoreWare, Inc5
;*6
;* Authors: Praveen Kumar Tiwari <praveen@multicorewareinc.com>7
;* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/x86/sad-a.asm -> x265_2.4.tar.gz/source/common/x86/sad-a.asm
Changed
10
1
2
;* sad-a.asm: x86 sad functions3
;*****************************************************************************4
;* Copyright (C) 2003-2013 x264 project5
-;* Copyright (C) 2013-2015 x265 project6
+;* Copyright (C) 2013-2017 MulticoreWare, Inc7
;*8
;* Authors: Loren Merritt <lorenm@u.washington.edu>9
;* Fiona Glaser <fiona@x264.com>10
x265_2.3.tar.gz/source/common/x86/sad16-a.asm -> x265_2.4.tar.gz/source/common/x86/sad16-a.asm
Changed
11
1
2
;*****************************************************************************3
;* sad16-a.asm: x86 high depth sad functions4
;*****************************************************************************5
-;* Copyright (C) 2010-2013 x264 project6
+;* Copyright (C) 2003-2013 x264 project7
+;* Copyright (C) 2013-2017 MulticoreWare, Inc8
;*9
;* Authors: Oskar Arvidsson <oskar@irock.se>10
;* Henrik Gramner <henrik@gramner.com>11
x265_2.3.tar.gz/source/common/x86/ssd-a.asm -> x265_2.4.tar.gz/source/common/x86/ssd-a.asm
Changed
10
1
2
;* ssd-a.asm: x86 ssd functions3
;*****************************************************************************4
;* Copyright (C) 2003-2013 x264 project5
-;* Copyright (C) 2013-2015 x265 project6
+;* Copyright (C) 2013-2017 MulticoreWare, Inc7
;*8
;* Authors: Loren Merritt <lorenm@u.washington.edu>9
;* Fiona Glaser <fiona@x264.com>10
x265_2.3.tar.gz/source/common/x86/x86inc.asm -> x265_2.4.tar.gz/source/common/x86/x86inc.asm
Changed
12
1
2
;*****************************************************************************3
;* x86inc.asm: x264asm abstraction layer4
;*****************************************************************************5
-;* Copyright (C) 2005-2014 x264 project6
-;* 2013-2014 x265 project7
+;* Copyright (C) 2003-2013 x264 project8
+;* Copyright (C) 2013-2017 MulticoreWarae, Inc9
;*10
;* Authors: Loren Merritt <lorenm@u.washington.edu>11
;* Anton Mitrofanov <BugMaster@narod.ru>12
x265_2.3.tar.gz/source/common/x86/x86util.asm -> x265_2.4.tar.gz/source/common/x86/x86util.asm
Changed
11
1
2
;*****************************************************************************3
;* x86util.asm: x86 utility macros4
;*****************************************************************************5
-;* Copyright (C) 2008-2013 x264 project6
+;* Copyright (C) 2003-2013 x264 project7
+;* Copyright (C) 2013-2017 MulticoreWare, Inc8
;*9
;* Authors: Holger Lubitz <holger@lubitz.org>10
;* Loren Merritt <lorenm@u.washington.edu>11
x265_2.3.tar.gz/source/common/yuv.cpp -> x265_2.4.tar.gz/source/common/yuv.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/common/yuv.h -> x265_2.4.tar.gz/source/common/yuv.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.4.tar.gz/source/dynamicHDR10/BasicStructures.cpp
Added
42
1
2
+/**3
+ * @file BasicStructures.cpp4
+ * @brief Defines the structure of metadata parameters5
+ * @author Daniel Maximiliano Valenzuela, Seongnam Oh.6
+ * @create date 03/01/20177
+ * @version 0.0.18
+ *9
+ * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana10
+ *11
+ * This program is free software; you can redistribute it and/or12
+ * modify it under the terms of the GNU General Public License13
+ * as published by the Free Software Foundation; either version 214
+ * of the License, or (at your option) any later version.15
+ *16
+ * This program is distributed in the hope that it will be useful,17
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of18
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the19
+ * GNU General Public License for more details.20
+ *21
+ * You should have received a copy of the GNU General Public License22
+ * along with this program; if not, write to the Free Software23
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,24
+ * MA 02110-1301, USA.25
+**/26
+27
+#include "BasicStructures.h"28
+#include "vector"29
+30
+struct PercentileLuminance{31
+32
+ float averageLuminance = 0.0;33
+ float maxRLuminance = 0.0;34
+ float maxGLuminance = 0.0;35
+ float maxBLuminance = 0.0;36
+ int order;37
+ std::vector<unsigned int> percentiles;38
+};39
+40
+41
+42
x265_2.4.tar.gz/source/dynamicHDR10/BasicStructures.h
Added
52
1
2
+/**3
+ * @file BasicStructures.h4
+ * @brief Defines the structure of metadata parameters5
+ * @author Daniel Maximiliano Valenzuela, Seongnam Oh.6
+ * @create date 03/01/20177
+ * @version 0.0.18
+ *9
+ * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana10
+ *11
+ * This program is free software; you can redistribute it and/or12
+ * modify it under the terms of the GNU General Public License13
+ * as published by the Free Software Foundation; either version 214
+ * of the License, or (at your option) any later version.15
+ *16
+ * This program is distributed in the hope that it will be useful,17
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of18
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the19
+ * GNU General Public License for more details.20
+ *21
+ * You should have received a copy of the GNU General Public License22
+ * along with this program; if not, write to the Free Software23
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,24
+ * MA 02110-1301, USA.25
+**/26
+27
+#ifndef BASICSTRUCTURES_H28
+#define BASICSTRUCTURES_H29
+30
+#include <vector>31
+32
+33
+struct LuminanceParameters34
+{35
+ float averageLuminance = 0.0;36
+ float maxRLuminance = 0.0;37
+ float maxGLuminance = 0.0;38
+ float maxBLuminance = 0.0;39
+ int order;40
+ std::vector<unsigned int> percentiles;41
+};42
+43
+struct BezierCurveData44
+{45
+ int order;46
+ int sPx;47
+ int sPy;48
+ std::vector<int> coeff;49
+};50
+51
+#endif // BASICSTRUCTURES_H52
x265_2.4.tar.gz/source/dynamicHDR10/CMakeLists.txt
Added
178
1
2
+# vim: syntax=cmake3
+if(ENABLE_DYNAMIC_HDR10)4
+5
+add_library(dynamicHDR10 OBJECT 6
+ BasicStructures.cpp BasicStructures.h7
+ json11/json11.cpp json11/json11.h8
+ JsonHelper.cpp JsonHelper.h9
+ metadataFromJson.cpp metadataFromJson.h10
+ SeiMetadataDictionary.cpp SeiMetadataDictionary.h11
+ hdr10plus.h12
+ api.cpp )13
+14
+else()15
+cmake_minimum_required (VERSION 2.8.11)16
+project(dynamicHDR10)17
+include(CheckIncludeFiles)18
+include(CheckFunctionExists)19
+include(CheckSymbolExists)20
+include(CheckCXXCompilerFlag)21
+22
+SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")23
+24
+if(GCC)25
+ add_definitions(-Wall -Wextra -Wshadow)26
+ add_definitions(-D__STDC_LIMIT_MACROS=1)27
+ add_definitions(-std=c++11)28
+ if(ENABLE_PIC)29
+ add_definitions(-fPIC)30
+ endif(ENABLE_PIC)31
+ if(NATIVE_BUILD)32
+ if(INTEL_CXX)33
+ add_definitions(-xhost)34
+ else()35
+ add_definitions(-march=native)36
+ endif()37
+ elseif(X86 AND NOT X64)38
+ string(FIND "${CMAKE_CXX_FLAGS}" "-march" marchPos)39
+ if(marchPos LESS "0")40
+ add_definitions(-march=i686)41
+ if(WIN32 AND NOT INTEL_CXX AND NOT CLANG AND42
+ CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)43
+ add_definitions(-mpreferred-stack-boundary=2)44
+ endif()45
+ endif()46
+ endif()47
+ if(ARM AND CROSS_COMPILE_ARM)48
+ set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)49
+ elseif(ARM)50
+ find_package(Neon)51
+ if(CPU_HAS_NEON)52
+ set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)53
+ add_definitions(-DHAVE_NEON)54
+ else()55
+ set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)56
+ endif()57
+ endif()58
+ add_definitions(${ARM_ARGS})59
+ if(FPROFILE_GENERATE)60
+ if(INTEL_CXX)61
+ add_definitions(-prof-gen -prof-dir="${CMAKE_CURRENT_BINARY_DIR}")62
+ list(APPEND LINKER_OPTIONS "-prof-gen")63
+ else()64
+ check_cxx_compiler_flag(-fprofile-generate CC_HAS_PROFILE_GENERATE)65
+ if(CC_HAS_PROFILE_GENERATE)66
+ add_definitions(-fprofile-generate)67
+ list(APPEND LINKER_OPTIONS "-fprofile-generate")68
+ endif(CC_HAS_PROFILE_GENERATE)69
+ endif(INTEL_CXX)70
+ endif(FPROFILE_GENERATE)71
+ if(FPROFILE_USE)72
+ if(INTEL_CXX)73
+ add_definitions(-prof-use -prof-dir="${CMAKE_CURRENT_BINARY_DIR}")74
+ list(APPEND LINKER_OPTIONS "-prof-use")75
+ else()76
+ check_cxx_compiler_flag(-fprofile-use CC_HAS_PROFILE_USE)77
+ check_cxx_compiler_flag(-fprofile-correction CC_HAS_PROFILE_CORRECTION)78
+ check_cxx_compiler_flag(-Wno-error=coverage-mismatch CC_HAS_COVMISMATCH)79
+ if(CC_HAS_PROFILE_USE)80
+ add_definitions(-fprofile-use)81
+ list(APPEND LINKER_OPTIONS "-fprofile-use")82
+ endif(CC_HAS_PROFILE_USE)83
+ if(CC_HAS_PROFILE_CORRECTION)84
+ # auto-correct corrupted counters (happens a lot with x265)85
+ add_definitions(-fprofile-correction)86
+ endif(CC_HAS_PROFILE_CORRECTION)87
+ if(CC_HAS_COVMISMATCH)88
+ # ignore coverage mismatches (also happens a lot)89
+ add_definitions(-Wno-error=coverage-mismatch)90
+ endif(CC_HAS_COVMISMATCH)91
+ endif(INTEL_CXX)92
+ endif(FPROFILE_USE)93
+ if(STATIC_LINK_CRT)94
+ add_definitions(-static)95
+ list(APPEND LINKER_OPTIONS "-static")96
+ endif(STATIC_LINK_CRT)97
+ check_cxx_compiler_flag(-Wno-strict-overflow CC_HAS_NO_STRICT_OVERFLOW)98
+ check_cxx_compiler_flag(-Wno-narrowing CC_HAS_NO_NARROWING) 99
+ check_cxx_compiler_flag(-Wno-array-bounds CC_HAS_NO_ARRAY_BOUNDS) 100
+ if (CC_HAS_NO_ARRAY_BOUNDS)101
+ add_definitions(-Wno-array-bounds) # these are unhelpful102
+ endif()103
+ check_cxx_compiler_flag(-ffast-math CC_HAS_FAST_MATH) 104
+ if (CC_HAS_FAST_MATH)105
+ add_definitions(-ffast-math)106
+ endif()107
+ check_cxx_compiler_flag(-mstackrealign CC_HAS_STACK_REALIGN) 108
+ if (CC_HAS_STACK_REALIGN)109
+ add_definitions(-mstackrealign)110
+ endif()111
+ # Disable exceptions. Reduce executable size, increase compability.112
+ check_cxx_compiler_flag(-fno-exceptions CC_HAS_FNO_EXCEPTIONS_FLAG)113
+ if(CC_HAS_FNO_EXCEPTIONS_FLAG)114
+ add_definitions(-fno-exceptions)115
+ endif()116
+ set(FSANITIZE "" CACHE STRING "-fsanitize options for GCC/clang")117
+ if(FSANITIZE)118
+ add_definitions(-fsanitize=${FSANITIZE})119
+ # clang and gcc need the sanitize options to be passed at link120
+ # time so the appropriate ASAN/TSAN runtime libraries can be121
+ # linked.122
+ list(APPEND LINKER_OPTIONS "-fsanitize=${FSANITIZE}")123
+ endif()124
+ option(ENABLE_AGGRESSIVE_CHECKS "Enable stack protection and -ftrapv" OFF)125
+ if(ENABLE_AGGRESSIVE_CHECKS)126
+ # use with care, -ftrapv can cause testbench SIGILL exceptions127
+ # since it is testing corner cases of signed integer math128
+ add_definitions(-DUSING_FTRAPV=1)129
+ check_cxx_compiler_flag(-fsanitize=undefined-trap CC_HAS_CATCH_UNDEFINED) # clang130
+ check_cxx_compiler_flag(-ftrapv CC_HAS_FTRAPV) # gcc131
+ check_cxx_compiler_flag(-fstack-protector-all CC_HAS_STACK_PROTECT) # gcc132
+ if(CC_HAS_FTRAPV)133
+ add_definitions(-ftrapv)134
+ endif()135
+ if(CC_HAS_CATCH_UNDEFINED)136
+ add_definitions(-fsanitize=undefined-trap -fsanitize-undefined-trap-on-error)137
+ endif()138
+ if(CC_HAS_STACK_PROTECT)139
+ add_definitions(-fstack-protector-all)140
+ if(MINGW)141
+ list(APPEND PLATFORM_LIBS ssp)142
+ endif()143
+ endif()144
+ endif(ENABLE_AGGRESSIVE_CHECKS)145
+ execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE CC_VERSION)146
+endif(GCC)147
+148
+# Build options149
+set(LIB_INSTALL_DIR lib CACHE STRING "Install location of libraries")150
+set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables")151
+ 152
+option(ENABLE_SHARED "Build shared library" OFF)153
+154
+if(ENABLE_SHARED)155
+ add_library(dynamicHDR10 SHARED156
+ json11/json11.cpp json11/json11.h157
+ BasicStructures.cpp BasicStructures.h158
+ JsonHelper.cpp JsonHelper.h159
+ metadataFromJson.cpp metadataFromJson.h160
+ SeiMetadataDictionary.cpp SeiMetadataDictionary.h161
+ hdr10plus.h api.cpp )162
+else()163
+ add_library(dynamicHDR10 STATIC164
+ json11/json11.cpp json11/json11.h165
+ BasicStructures.cpp BasicStructures.h166
+ JsonHelper.cpp JsonHelper.h167
+ metadataFromJson.cpp metadataFromJson.h168
+ SeiMetadataDictionary.cpp SeiMetadataDictionary.h169
+ hdr10plus.h api.cpp )170
+endif()171
+172
+install (TARGETS dynamicHDR10173
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}174
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR})175
+install(FILES hdr10plus.h DESTINATION include)176
+endif()177
\ No newline at end of file178
x265_2.4.tar.gz/source/dynamicHDR10/JsonHelper.cpp
Added
223
1
2
+/**3
+ * @file JsonHelper.cpp4
+ * @brief Helper class for JSON parsing5
+ * @author Daniel Maximiliano Valenzuela, Seongnam Oh.6
+ * @create date 03/01/20177
+ * @version 0.0.18
+ *9
+ * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana10
+ *11
+ * This program is free software; you can redistribute it and/or12
+ * modify it under the terms of the GNU General Public License13
+ * as published by the Free Software Foundation; either version 214
+ * of the License, or (at your option) any later version.15
+ *16
+ * This program is distributed in the hope that it will be useful,17
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of18
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the19
+ * GNU General Public License for more details.20
+ *21
+ * You should have received a copy of the GNU General Public License22
+ * along with this program; if not, write to the Free Software23
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,24
+ * MA 02110-1301, USA.25
+**/26
+27
+#include "JsonHelper.h"28
+#include "sys/stat.h"29
+#include <fstream>30
+#include <iostream>31
+using namespace std;32
+33
+JsonObject JsonHelper::add(string key, string value, JsonObject &json)34
+{35
+36
+ json[key] = value;37
+ return json;38
+}39
+40
+bool JsonHelper::writeJson(JsonObject json, string path)41
+{42
+ if(!validatePathExtension(path))43
+ {44
+ return false;45
+ }46
+47
+ ofstream JsonSaveFile(path);48
+ string jsonString;49
+ jsonString = dump(json);50
+ JsonSaveFile << jsonString;51
+ JsonSaveFile.close();52
+ return true;53
+}54
+55
+bool JsonHelper::writeJson(JsonArray json, string path)56
+{57
+ if(!validatePathExtension(path))58
+ {59
+ return false;60
+ }61
+62
+ string arrayString = "[";63
+ size_t jsonSize = json.size();64
+ for(size_t i = 0; i < jsonSize; ++i)65
+ {66
+ arrayString += "\n" + dump(json.at(i).object_items(), 1);67
+ if(i != jsonSize - 1)68
+ {69
+ arrayString += ",";70
+ }71
+ }72
+ arrayString += "\n]";73
+74
+ ofstream JsonSaveFile(path);75
+ JsonSaveFile << arrayString;76
+ JsonSaveFile.close();77
+ return true;78
+}79
+80
+string JsonHelper::dump(JsonObject json, int extraTab)81
+{82
+ string dump = Json(json).dump();83
+ //[defensive programming] possibly check if dump returns a invalid string84
+ string out = "";85
+ unsigned int tabCounter = extraTab;86
+ printTabs(out,tabCounter);87
+ for(unsigned int i = 0; i < dump.size(); ++i)88
+ {89
+ if(dump[i] == '{' || dump[i] == '[')90
+ { 91
+ out += dump[i];92
+ out += '\n';93
+ ++tabCounter;94
+ printTabs(out, tabCounter);95
+ }96
+ else if(dump[i] == '}' || dump[i] == ']')97
+ {98
+ out += '\n';99
+ --tabCounter;100
+ printTabs(out, tabCounter);101
+ out += dump[i];102
+ }103
+ else if(dump[i] == ',')104
+ {105
+ out += dump[i];106
+ out += '\n';107
+ printTabs(out, tabCounter);108
+ ++i; //skip blank space following comma109
+ }110
+ else111
+ {112
+ out += dump[i];113
+ }114
+ }115
+ return out;116
+}117
+118
+void JsonHelper::printTabs(string &out, int tabCounter)119
+{120
+ for(int i = 0; i < tabCounter; ++i)121
+ {122
+ out += '\t';123
+ }124
+}125
+126
+JsonObject JsonHelper::readJson(string path)127
+{128
+ std::size_t ext = path.find_last_of('.');129
+ std::string extension = path.substr(ext+1);130
+131
+ if(extension.compare("json") && extension.compare("JSON"))132
+ {133
+ std::cout << "Fail open file, extension not valid!" << std::endl;134
+ return JsonObject();135
+ }136
+137
+ struct stat buffer;138
+ if(stat(path.c_str(),&buffer))139
+ {140
+ std::cout << "Fail open file, file doesn't exist" << std::endl;141
+ return JsonObject();142
+ }143
+144
+ ifstream tfile;145
+ string json_str;146
+ string json_str2;147
+ string err = "";148
+ tfile.open(path);149
+ while(tfile)150
+ {151
+ std::getline(tfile, json_str);152
+ json_str2.append(json_str);153
+ }154
+155
+ tfile.close();156
+ size_t beginning = json_str2.find_first_of("{");157
+ int fixchar = json_str2[json_str2.size() - 2] == '}' ? 1 : 0;158
+ return Json::parse(json_str2.substr(beginning,json_str2.size() - fixchar),err).object_items();159
+}160
+161
+JsonArray JsonHelper::readJsonArray(const string &path)162
+{163
+ std::size_t ext = path.find_last_of('.');164
+ std::string extension = path.substr(ext+1);165
+166
+ if(extension.compare("json") && extension.compare("JSON"))167
+ {168
+ std::cout << "Fail open file, extension not valid!" << std::endl;169
+ return JsonArray();170
+ }171
+172
+ struct stat buffer;173
+ if(stat(path.c_str(),&buffer))174
+ {175
+ std::cout << "Fail open file, file doesn't exist" << std::endl;176
+ return JsonArray();177
+ }178
+179
+ ifstream tfile;180
+ string json_str;181
+ string json_str2;182
+ string err = "";183
+ tfile.open(path);184
+ while(tfile)185
+ {186
+ std::getline(tfile, json_str);187
+ json_str2.append(json_str);188
+ }189
+190
+ tfile.close();191
+192
+ size_t beginning = json_str2.find_first_of("[");193
+ int fixchar = json_str2[json_str2.size() - 2] == ']' ? 1 : 0;194
+ return Json::parse(json_str2.substr(beginning,json_str2.size() - fixchar),err).array_items();195
+}196
+197
+bool JsonHelper::validatePathExtension(string &path)198
+{199
+200
+ if(path.empty())201
+ {202
+ std::cout << "Fail saving json file" << std::endl;203
+ return false;204
+ }205
+ std::size_t ext = path.find_last_of('.');206
+ std::string realFilePath = path;207
+ if(ext == std::string::npos)208
+ {209
+ realFilePath += ".json";210
+ }211
+ else212
+ {213
+ std::string extension = path.substr(ext+1);214
+ if(extension.compare("json") && extension.compare("JSON"))215
+ {216
+ std::cout << "Fail saving file, extension not valid!" << std::endl;217
+ return false;218
+ }219
+ }220
+ path = realFilePath;221
+ return true;222
+}223
x265_2.4.tar.gz/source/dynamicHDR10/JsonHelper.h
Added
56
1
2
+/**3
+ * @file JsonHelper.h4
+ * @brief Helper class for JSON parsing5
+ * @author Daniel Maximiliano Valenzuela, Seongnam Oh.6
+ * @create date 03/01/20177
+ * @version 0.0.18
+ *9
+ * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana10
+ *11
+ * This program is free software; you can redistribute it and/or12
+ * modify it under the terms of the GNU General Public License13
+ * as published by the Free Software Foundation; either version 214
+ * of the License, or (at your option) any later version.15
+ *16
+ * This program is distributed in the hope that it will be useful,17
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of18
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the19
+ * GNU General Public License for more details.20
+ *21
+ * You should have received a copy of the GNU General Public License22
+ * along with this program; if not, write to the Free Software23
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,24
+ * MA 02110-1301, USA.25
+**/26
+27
+#ifndef JSON_H28
+#define JSON_H29
+#include <string>30
+#include <iostream>31
+#include "json11/json11.h"32
+33
+using std::string;34
+using namespace json11;35
+typedef Json::object JsonObject;36
+typedef Json::array JsonArray;37
+38
+class JsonHelper39
+{40
+public:41
+ static JsonObject readJson(string path);42
+ static JsonArray readJsonArray(const string &path);43
+ static string dump(JsonArray json);44
+ static string dump(JsonObject json, int extraTab = 0);45
+46
+ static bool writeJson(JsonObject json , string path);47
+ static bool writeJson(JsonArray json, string path);48
+ static JsonObject add(string key, string value, JsonObject &json);49
+private:50
+ static void printTabs(string &out, int tabCounter);51
+ JsonObject mJson;52
+ static bool validatePathExtension(string &path);53
+};54
+55
+#endif // JSON_H56
x265_2.4.tar.gz/source/dynamicHDR10/LICENSE.txt
Added
23
1
2
+Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana3
+4
+This software is the confidential and proprietary information of Samsung Electronics, Inc. ("Confidential Information").5
+You shall not disclose such Confidential Information and shall use it only in accordance with the terms of the license agreement6
+you entered into with Samsung.7
+8
+This program is free software; you can redistribute it and/or9
+modify it under the terms of the GNU General Public License10
+as published by the Free Software Foundation; either version 211
+of the License, or (at your option) any later version.12
+13
+This program is distributed in the hope that it will be useful,14
+but WITHOUT ANY WARRANTY; without even the implied warranty of15
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
+GNU General Public License for more details.17
+18
+You should have received a copy of the GNU General Public License19
+along with this program; if not, write to the Free Software20
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 21
+MA 02110-1301, USA.22
\ No newline at end of file23
x265_2.4.tar.gz/source/dynamicHDR10/SeiMetadataDictionary.cpp
Added
115
1
2
+/**3
+ * @file SeiMetadataDictionary.cpp4
+ * @brief Defines the tagname for each metadata value in a JSON dynamic tone mapping file.5
+ * @author Daniel Maximiliano Valenzuela, Seongnam Oh.6
+ * @create date 03/01/20177
+ * @version 0.0.18
+ *9
+ * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana10
+ *11
+ * This program is free software; you can redistribute it and/or12
+ * modify it under the terms of the GNU General Public License13
+ * as published by the Free Software Foundation; either version 214
+ * of the License, or (at your option) any later version.15
+ *16
+ * This program is distributed in the hope that it will be useful,17
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of18
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the19
+ * GNU General Public License for more details.20
+ *21
+ * You should have received a copy of the GNU General Public License22
+ * along with this program; if not, write to the Free Software23
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,24
+ * MA 02110-1301, USA.25
+**/26
+27
+#include "SeiMetadataDictionary.h"28
+29
+using namespace SeiMetadataDictionary;30
+31
+const std::string JsonDataKeys::LocalParameters = std::string("LocalParameters");32
+const std::string JsonDataKeys::TargetDisplayLuminance = std::string("TargetedSystemDisplayMaximumLuminance");33
+34
+const std::string BezierCurveNames::TagName = std::string("BezierCurveData");35
+const std::string BezierCurveNames::NumberOfAnchors = std::string("NumberOfAnchors");36
+const std::string BezierCurveNames::KneePointX = std::string("KneePointX");37
+const std::string BezierCurveNames::KneePointY = std::string("KneePointY");38
+const std::string BezierCurveNames::Anchors[] = {std::string("Anchor0"),39
+ std::string("Anchor1"),40
+ std::string("Anchor2"),41
+ std::string("Anchor3"),42
+ std::string("Anchor4"),43
+ std::string("Anchor5"),44
+ std::string("Anchor6"),45
+ std::string("Anchor7"),46
+ std::string("Anchor8"),47
+ std::string("Anchor9"),48
+ std::string("Anchor10"),49
+ std::string("Anchor11"),50
+ std::string("Anchor12"),51
+ std::string("Anchor13")};52
+53
+54
+const std::string EllipseSelectionNames::WindowUpperLeftCornerX = std::string("WindowUpperLeftCornerX");55
+const std::string EllipseSelectionNames::WindowUpperLeftCornerY = std::string("WindowUpperLeftCornerY");56
+const std::string EllipseSelectionNames::WindowLowerRightCornerX = std::string("WindowLowerRightCornerX");57
+const std::string EllipseSelectionNames::WindowLowerRightCornerY = std::string("WindowLowerRightCornerY");58
+const std::string EllipseSelectionNames::WindowData = std::string("WindowData");59
+60
+61
+const std::string EllipseNames::TagName = std::string("EllipseData");62
+const std::string EllipseNames::RotationAngle = std::string("RotationAngle");63
+const std::string EllipseNames::CenterOfEllipseX = std::string("CenterOfEllipseX");64
+const std::string EllipseNames::CenterOfEllipseY = std::string("CenterOfEllipseY");65
+const std::string EllipseNames::OverlapProcessOption = std::string("OverlapProcessOption");66
+const std::string EllipseNames::SemiMajorAxisExternalEllipse = std::string("SemimajorAxisExternalEllipse");67
+const std::string EllipseNames::SemiMinorAxisExternalEllipse = std::string("SemiminorAxisExternalEllipse");68
+const std::string EllipseNames::SemiMajorAxisInternalEllipse = std::string("SemimajorAxisInternalEllipse");69
+70
+71
+const std::string PercentileNames::TagName = std::string("PercentileLuminance");72
+const std::string PercentileNames::NumberOfPercentiles = std::string("NumberOfPercentiles");73
+const std::string PercentileNames::PercentilePercentageValue[] = {std::string("PercentilePercentage0"),74
+ std::string("PercentilePercentage1"),75
+ std::string("PercentilePercentage2"),76
+ std::string("PercentilePercentage3"),77
+ std::string("PercentilePercentage4"),78
+ std::string("PercentilePercentage5"),79
+ std::string("PercentilePercentage6"),80
+ std::string("PercentilePercentage7"),81
+ std::string("PercentilePercentage8"),82
+ std::string("PercentilePercentage9"),83
+ std::string("PercentilePercentage10"),84
+ std::string("PercentilePercentage11"),85
+ std::string("PercentilePercentage12"),86
+ std::string("PercentilePercentage13"),87
+ std::string("PercentilePercentage14")};88
+89
+const std::string PercentileNames::PercentileLuminanceValue[] = {std::string("PercentileLuminance0"),90
+ std::string("PercentileLuminance1"),91
+ std::string("PercentileLuminance2"),92
+ std::string("PercentileLuminance3"),93
+ std::string("PercentileLuminance4"),94
+ std::string("PercentileLuminance5"),95
+ std::string("PercentileLuminance6"),96
+ std::string("PercentileLuminance7"),97
+ std::string("PercentileLuminance8"),98
+ std::string("PercentileLuminance9"),99
+ std::string("PercentileLuminance10"),100
+ std::string("PercentileLuminance11"),101
+ std::string("PercentileLuminance12"),102
+ std::string("PercentileLuminance13"),103
+ std::string("PercentileLuminance14")};104
+105
+106
+107
+const std::string LuminanceNames::TagName = std::string("LuminanceParameters");108
+const std::string LuminanceNames::AverageRGB = std::string("AverageRGB");109
+const std::string LuminanceNames::MaxSCL0 = std::string("MaxScl0");110
+const std::string LuminanceNames::MaxSCL1 = std::string("MaxScl1");111
+const std::string LuminanceNames::MaxSCL2 = std::string("MaxScl2");112
+113
+114
+115
x265_2.4.tar.gz/source/dynamicHDR10/SeiMetadataDictionary.h
Added
99
1
2
+/**3
+ * @file SeiMetadataDictionary.h4
+ * @brief Defines the tagname for each metadata value in a JSON dynamic tone mapping file.5
+ * @author Daniel Maximiliano Valenzuela, Seongnam Oh.6
+ * @create date 03/01/20177
+ * @version 0.0.18
+ *9
+ * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana10
+ *11
+ * This program is free software; you can redistribute it and/or12
+ * modify it under the terms of the GNU General Public License13
+ * as published by the Free Software Foundation; either version 214
+ * of the License, or (at your option) any later version.15
+ *16
+ * This program is distributed in the hope that it will be useful,17
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of18
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the19
+ * GNU General Public License for more details.20
+ *21
+ * You should have received a copy of the GNU General Public License22
+ * along with this program; if not, write to the Free Software23
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,24
+ * MA 02110-1301, USA.25
+**/26
+27
+#ifndef SEIMETADATADICTIONARY_H28
+#define SEIMETADATADICTIONARY_H29
+30
+#include "SeiMetadataDictionary.h"31
+32
+#include <string>33
+34
+namespace SeiMetadataDictionary35
+{36
+37
+ class JsonDataKeys38
+ {39
+ public:40
+ static const std::string LocalParameters;41
+ static const std::string TargetDisplayLuminance;42
+ };43
+44
+ //Bezier Curve Data45
+ class BezierCurveNames46
+ {47
+ public:48
+ static const std::string TagName;49
+ static const std::string NumberOfAnchors;50
+ static const std::string KneePointX;51
+ static const std::string KneePointY;52
+ static const std::string Anchors[14];53
+ };54
+ //Ellipse Selection Data55
+ class EllipseSelectionNames56
+ {57
+ public:58
+ static const std::string WindowUpperLeftCornerX;59
+ static const std::string WindowUpperLeftCornerY;60
+ static const std::string WindowLowerRightCornerX;61
+ static const std::string WindowLowerRightCornerY;62
+ static const std::string WindowData;63
+ };64
+ //Ellipse Data65
+ class EllipseNames66
+ {67
+ public:68
+ static const std::string TagName;69
+ static const std::string RotationAngle;70
+ static const std::string CenterOfEllipseX;71
+ static const std::string CenterOfEllipseY;72
+ static const std::string OverlapProcessOption;73
+ static const std::string SemiMajorAxisExternalEllipse;74
+ static const std::string SemiMinorAxisExternalEllipse;75
+ static const std::string SemiMajorAxisInternalEllipse;76
+ };77
+ //Percentile Luminance78
+ class PercentileNames79
+ {80
+ public:81
+ static const std::string TagName;82
+ static const std::string NumberOfPercentiles;83
+ static const std::string PercentilePercentageValue[15];84
+ static const std::string PercentileLuminanceValue[15];85
+ };86
+ //Luminance Parameters87
+ class LuminanceNames88
+ {89
+ public:90
+ static const std::string TagName;91
+ static const std::string AverageRGB;92
+ static const std::string MaxSCL0;93
+ static const std::string MaxSCL1;94
+ static const std::string MaxSCL2;95
+ };96
+}97
+98
+#endif // SEIMETADATADICTIONARY_H99
x265_2.4.tar.gz/source/dynamicHDR10/api.cpp
Added
81
1
2
+/**3
+ * @file api.cpp4
+ * @brief Implementation of hdr10plus API functions.5
+ * @author Daniel Maximiliano Valenzuela, Seongnam Oh.6
+ * @create date 03/01/20177
+ * @version 0.0.18
+ *9
+ * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana10
+ *11
+ * This program is free software; you can redistribute it and/or12
+ * modify it under the terms of the GNU General Public License13
+ * as published by the Free Software Foundation; either version 214
+ * of the License, or (at your option) any later version.15
+ *16
+ * This program is distributed in the hope that it will be useful,17
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of18
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the19
+ * GNU General Public License for more details.20
+ *21
+ * You should have received a copy of the GNU General Public License22
+ * along with this program; if not, write to the Free Software23
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 24
+ * MA 02110-1301, USA.25
+**/26
+27
+#include "hdr10plus.h"28
+#include "metadataFromJson.h"29
+30
+bool hdr10plus_json_to_frame_cim(const char* path, uint32_t frameNumber, uint8_t *&cim)31
+{32
+ metadataFromJson meta;33
+ return meta.frameMetadataFromJson(path,34
+ frameNumber,35
+ cim);36
+}37
+38
+int hdr10plus_json_to_movie_cim(const char* path, uint8_t **&cim)39
+{40
+ metadataFromJson meta;41
+ return meta.movieMetadataFromJson(path, cim);42
+}43
+44
+bool hdr10plus_json_to_frame_eif(const char* path, uint32_t frameNumber, uint8_t *&eif)45
+{46
+ metadataFromJson meta;47
+ return meta.extendedInfoFrameMetadataFromJson(path,48
+ frameNumber,49
+ eif);50
+}51
+52
+int hdr10plus_json_to_movie_eif(const char* path, uint8_t **&eif)53
+{54
+ metadataFromJson meta;55
+ return meta.movieExtendedInfoFrameMetadataFromJson(path, eif);56
+}57
+58
+59
+void hdr10plus_clear_movie(uint8_t **&metadata, const int numberOfFrames)60
+{61
+ if(metadata)62
+ {63
+ metadataFromJson meta;64
+ meta.clear(metadata, numberOfFrames);65
+ }66
+}67
+68
+static const hdr10plus_api libapi =69
+{70
+ &hdr10plus_json_to_frame_cim,71
+ &hdr10plus_json_to_movie_cim,72
+ &hdr10plus_json_to_frame_eif,73
+ &hdr10plus_json_to_movie_eif,74
+ &hdr10plus_clear_movie,75
+};76
+77
+const hdr10plus_api* hdr10plus_api_get()78
+{79
+ return &libapi;80
+}81
x265_2.4.tar.gz/source/dynamicHDR10/hdr10plus.h
Added
103
1
2
+/**3
+ * @file hdr10plus.h4
+ * @brief Definition of hdr10plus functions.5
+ * @author Daniel Maximiliano Valenzuela, Seongnam Oh.6
+ * @create date 03/01/20177
+ * @version 0.0.18
+ *9
+ * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana10
+ *11
+ * This program is free software; you can redistribute it and/or12
+ * modify it under the terms of the GNU General Public License13
+ * as published by the Free Software Foundation; either version 214
+ * of the License, or (at your option) any later version.15
+ *16
+ * This program is distributed in the hope that it will be useful,17
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of18
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the19
+ * GNU General Public License for more details.20
+ *21
+ * You should have received a copy of the GNU General Public License22
+ * along with this program; if not, write to the Free Software23
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,24
+ * MA 02110-1301, USA.25
+**/26
+27
+#include <stdint.h>28
+29
+#ifndef HDR10PLUS_H30
+#define HDR10PLUS_H31
+32
+33
+/* hdr10plus_json_to_frame_cim:34
+ * Parses the json file containing the Creative Intent Metadata DTM for a frame of 35
+ * video into a bytestream to be encoded into the resulting video stream. 36
+ * path is the file path of the JSON file containing the DTM for the video.37
+ * frameNumber is the number of the frame to get the metadata for.38
+ * cim will get filled with the byte array containing the actual metadata.39
+ * Returns true in case of success.40
+ */41
+bool hdr10plus_json_to_frame_cim(const char* path, uint32_t frameNumber, uint8_t *&cim);42
+43
+/* hdr10plus_json_to_movie_cim:44
+ * Parses the json file containing the Creative Intent Metadata DTM for the video 45
+ * into a bytestream to be encoded into the resulting video stream. 46
+ * path is the file path of the JSON file containing the DTM for the video.47
+ * frameNumber is the number of the frame to get the metadata for.48
+ * cim will get filled with the byte array containing the actual metadata.49
+ * return int: number of frames in the movie, -1 if the process fails to obtain the metadata. 50
+ */51
+int hdr10plus_json_to_movie_cim(const char* path, uint8_t **&cim);52
+53
+/* hdr10plus_json_to_frame_eif:54
+* Parses the json file containing the Extended InfoFrame metadata for a frame of video55
+* into a bytestream to be encoded into the resulting video stream.56
+* path is the file path of the JSON file containing the Extended InfoFrame metadata for the video.57
+* frameNumber is the number of the frame to get the metadata for.58
+* Extended InfoFrame will get filled with the byte array containing the actual metadata.59
+* Returns true in case of success.60
+*/61
+bool hdr10plus_json_to_frame_eif(const char* path, uint32_t frameNumber, uint8_t *&eif);62
+63
+/* hdr10plus_json_to_movie_eif:64
+* Parses the json file containing the Extended InfoFrame metadata for the video65
+* into a bytestream to be encoded into the resulting video stream.66
+* path is the file path of the JSON file containing the Extended InfoFrame metadata for the video.67
+* frameNumber is the number of the frame to get the metadata for.68
+* cim will get filled with the byte array containing the actual metadata.69
+* return int: number of frames in the movie, -1 if the process fails to obtain the metadata.70
+*/71
+int hdr10plus_json_to_movie_eif(const char* path, uint8_t **&eif);72
+73
+74
+/* hdr10plus_clear_movie_cim:75
+* This function clears the allocated memory for the movie metadata array76
+* clear: Clears the memory of the given array and size.77
+* metadata: metadata array to be cleared.78
+* numberOfFrames: number of frames in the metadata array.79
+* @return80
+*/81
+82
+void hdr10plus_clear_movie(uint8_t**& metadata, const int numberOfFrames);83
+84
+85
+typedef struct hdr10plus_api86
+{87
+ /* hdr10plus public API functions, documented above with hdr10plus_ prefixes */88
+ bool (*hdr10plus_json_to_frame_cim)(const char *, uint32_t, uint8_t *&);89
+ int (*hdr10plus_json_to_movie_cim)(const char *, uint8_t **&);90
+ bool (*hdr10plus_json_to_frame_eif)(const char *, uint32_t, uint8_t *&);91
+ int (*hdr10plus_json_to_movie_eif)(const char *, uint8_t **&);92
+ void (*hdr10plus_clear_movie)(uint8_t **&, const int);93
+} hdr10plus_api;94
+95
+/* hdr10plus_api:96
+ * Retrieve the programming interface for the linked hdr10plus library.97
+ */98
+const hdr10plus_api* hdr10plus_api_get();99
+100
+101
+#endif // HDR10PLUS_H102
+103
x265_2.4.tar.gz/source/dynamicHDR10/json11/LICENSE.txt
Added
21
1
2
+Copyright (c) 2013 Dropbox, Inc.3
+4
+Permission is hereby granted, free of charge, to any person obtaining a copy5
+of this software and associated documentation files (the "Software"), to deal6
+in the Software without restriction, including without limitation the rights7
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell8
+copies of the Software, and to permit persons to whom the Software is9
+furnished to do so, subject to the following conditions:10
+11
+The above copyright notice and this permission notice shall be included in12
+all copies or substantial portions of the Software.13
+14
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR15
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,16
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE17
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER18
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,19
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN20
+THE SOFTWARE.21
x265_2.4.tar.gz/source/dynamicHDR10/json11/json11.cpp
Added
782
1
2
+/* Copyright (c) 2013 Dropbox, Inc.3
+ *4
+ * Permission is hereby granted, free of charge, to any person obtaining a copy5
+ * of this software and associated documentation files (the "Software"), to deal6
+ * in the Software without restriction, including without limitation the rights7
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell8
+ * copies of the Software, and to permit persons to whom the Software is9
+ * furnished to do so, subject to the following conditions:10
+ *11
+ * The above copyright notice and this permission notice shall be included in12
+ * all copies or substantial portions of the Software.13
+ *14
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR15
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,16
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE17
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER18
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,19
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN20
+ * THE SOFTWARE.21
+ */22
+23
+#include "json11.h"24
+#include <cassert>25
+#include <cmath>26
+#include <cstdlib>27
+#include <cstdio>28
+#include <limits>29
+30
+namespace json11 {31
+32
+static const int max_depth = 200;33
+34
+using std::string;35
+using std::vector;36
+using std::map;37
+using std::make_shared;38
+using std::initializer_list;39
+using std::move;40
+41
+/* * * * * * * * * * * * * * * * * * * *42
+ * Serialization43
+ */44
+45
+static void dump(std::nullptr_t, string &out) {46
+ out += "null";47
+}48
+49
+static void dump(double value, string &out) {50
+ if (std::isfinite(value)) {51
+ char buf[32];52
+ snprintf(buf, sizeof buf, "%.17g", value);53
+ out += buf;54
+ } else {55
+ out += "null";56
+ }57
+}58
+59
+static void dump(int value, string &out) {60
+ char buf[32];61
+ snprintf(buf, sizeof buf, "%d", value);62
+ out += buf;63
+}64
+65
+static void dump(bool value, string &out) {66
+ out += value ? "true" : "false";67
+}68
+69
+static void dump(const string &value, string &out) {70
+ out += '"';71
+ for (size_t i = 0; i < value.length(); i++) {72
+ const char ch = value[i];73
+ if (ch == '\\') {74
+ out += "\\\\";75
+ } else if (ch == '"') {76
+ out += "\\\"";77
+ } else if (ch == '\b') {78
+ out += "\\b";79
+ } else if (ch == '\f') {80
+ out += "\\f";81
+ } else if (ch == '\n') {82
+ out += "\\n";83
+ } else if (ch == '\r') {84
+ out += "\\r";85
+ } else if (ch == '\t') {86
+ out += "\\t";87
+ } else if (static_cast<uint8_t>(ch) <= 0x1f) {88
+ char buf[8];89
+ snprintf(buf, sizeof buf, "\\u%04x", ch);90
+ out += buf;91
+ } else if (static_cast<uint8_t>(ch) == 0xe2 && static_cast<uint8_t>(value[i+1]) == 0x8092
+ && static_cast<uint8_t>(value[i+2]) == 0xa8) {93
+ out += "\\u2028";94
+ i += 2;95
+ } else if (static_cast<uint8_t>(ch) == 0xe2 && static_cast<uint8_t>(value[i+1]) == 0x8096
+ && static_cast<uint8_t>(value[i+2]) == 0xa9) {97
+ out += "\\u2029";98
+ i += 2;99
+ } else {100
+ out += ch;101
+ }102
+ }103
+ out += '"';104
+}105
+106
+static void dump(const Json::array &values, string &out) {107
+ bool first = true;108
+ out += "[";109
+ for (const auto &value : values) {110
+ if (!first)111
+ out += ", ";112
+ value.dump(out);113
+ first = false;114
+ }115
+ out += "]";116
+}117
+118
+static void dump(const Json::object &values, string &out) {119
+ bool first = true;120
+ out += "{";121
+ for (const auto &kv : values) {122
+ if (!first)123
+ out += ", ";124
+ dump(kv.first, out);125
+ out += ": ";126
+ kv.second.dump(out);127
+ first = false;128
+ }129
+ out += "}";130
+}131
+132
+void Json::dump(string &out) const {133
+ m_ptr->dump(out);134
+}135
+136
+/* * * * * * * * * * * * * * * * * * * *137
+ * Value wrappers138
+ */139
+140
+template <Json::Type tag, typename T>141
+class Value : public JsonValue {142
+protected:143
+144
+ // Constructors145
+ explicit Value(const T &value) : m_value(value) {}146
+ explicit Value(T &&value) : m_value(move(value)) {}147
+148
+ // Get type tag149
+ Json::Type type() const override {150
+ return tag;151
+ }152
+153
+ // Comparisons154
+ bool equals(const JsonValue * other) const override {155
+ return m_value == static_cast<const Value<tag, T> *>(other)->m_value;156
+ }157
+ bool less(const JsonValue * other) const override {158
+ return m_value < static_cast<const Value<tag, T> *>(other)->m_value;159
+ }160
+161
+ const T m_value;162
+ void dump(string &out) const override { json11::dump(m_value, out); }163
+};164
+165
+class JsonDouble final : public Value<Json::NUMBER, double> {166
+ double number_value() const override { return m_value; }167
+ int int_value() const override { return static_cast<int>(m_value); }168
+ bool equals(const JsonValue * other) const override { return m_value == other->number_value(); }169
+ bool less(const JsonValue * other) const override { return m_value < other->number_value(); }170
+public:171
+ explicit JsonDouble(double value) : Value(value) {}172
+};173
+174
+class JsonInt final : public Value<Json::NUMBER, int> {175
+ double number_value() const override { return m_value; }176
+ int int_value() const override { return m_value; }177
+ bool equals(const JsonValue * other) const override { return m_value == other->number_value(); }178
+ bool less(const JsonValue * other) const override { return m_value < other->number_value(); }179
+public:180
+ explicit JsonInt(int value) : Value(value) {}181
+};182
+183
+class JsonBoolean final : public Value<Json::BOOL, bool> {184
+ bool bool_value() const override { return m_value; }185
+public:186
+ explicit JsonBoolean(bool value) : Value(value) {}187
+};188
+189
+class JsonString final : public Value<Json::STRING, string> {190
+ const string &string_value() const override { return m_value; }191
+public:192
+ explicit JsonString(const string &value) : Value(value) {}193
+ explicit JsonString(string &&value) : Value(move(value)) {}194
+};195
+196
+class JsonArray final : public Value<Json::ARRAY, Json::array> {197
+ const Json::array &array_items() const override { return m_value; }198
+ const Json & operator[](size_t i) const override;199
+public:200
+ explicit JsonArray(const Json::array &value) : Value(value) {}201
+ explicit JsonArray(Json::array &&value) : Value(move(value)) {}202
+};203
+204
+class JsonObject final : public Value<Json::OBJECT, Json::object> {205
+ const Json::object &object_items() const override { return m_value; }206
+ const Json & operator[](const string &key) const override;207
+public:208
+ explicit JsonObject(const Json::object &value) : Value(value) {}209
+ explicit JsonObject(Json::object &&value) : Value(move(value)) {}210
+};211
+212
+class JsonNull final : public Value<Json::NUL, std::nullptr_t> {213
+public:214
+ JsonNull() : Value(nullptr) {}215
+};216
+217
+/* * * * * * * * * * * * * * * * * * * *218
+ * Static globals - static-init-safe219
+ */220
+struct Statics {221
+ const std::shared_ptr<JsonValue> null = make_shared<JsonNull>();222
+ const std::shared_ptr<JsonValue> t = make_shared<JsonBoolean>(true);223
+ const std::shared_ptr<JsonValue> f = make_shared<JsonBoolean>(false);224
+ const string empty_string;225
+ const vector<Json> empty_vector;226
+ const map<string, Json> empty_map;227
+ Statics() {}228
+};229
+230
+static const Statics & statics() {231
+ static const Statics s {};232
+ return s;233
+}234
+235
+static const Json & static_null() {236
+ // This has to be separate, not in Statics, because Json() accesses statics().null.237
+ static const Json json_null;238
+ return json_null;239
+}240
+241
+/* * * * * * * * * * * * * * * * * * * *242
+ * Constructors243
+ */244
+245
+Json::Json() noexcept : m_ptr(statics().null) {}246
+Json::Json(std::nullptr_t) noexcept : m_ptr(statics().null) {}247
+Json::Json(double value) : m_ptr(make_shared<JsonDouble>(value)) {}248
+Json::Json(int value) : m_ptr(make_shared<JsonInt>(value)) {}249
+Json::Json(bool value) : m_ptr(value ? statics().t : statics().f) {}250
+Json::Json(const string &value) : m_ptr(make_shared<JsonString>(value)) {}251
+Json::Json(string &&value) : m_ptr(make_shared<JsonString>(move(value))) {}252
+Json::Json(const char * value) : m_ptr(make_shared<JsonString>(value)) {}253
+Json::Json(const Json::array &values) : m_ptr(make_shared<JsonArray>(values)) {}254
+Json::Json(Json::array &&values) : m_ptr(make_shared<JsonArray>(move(values))) {}255
+Json::Json(const Json::object &values) : m_ptr(make_shared<JsonObject>(values)) {}256
+Json::Json(Json::object &&values) : m_ptr(make_shared<JsonObject>(move(values))) {}257
+258
+/* * * * * * * * * * * * * * * * * * * *259
+ * Accessors260
+ */261
+262
+Json::Type Json::type() const { return m_ptr->type(); }263
+double Json::number_value() const { return m_ptr->number_value(); }264
+int Json::int_value() const { return m_ptr->int_value(); }265
+bool Json::bool_value() const { return m_ptr->bool_value(); }266
+const string & Json::string_value() const { return m_ptr->string_value(); }267
+const vector<Json> & Json::array_items() const { return m_ptr->array_items(); }268
+const map<string, Json> & Json::object_items() const { return m_ptr->object_items(); }269
+const Json & Json::operator[] (size_t i) const { return (*m_ptr)[i]; }270
+const Json & Json::operator[] (const string &key) const { return (*m_ptr)[key]; }271
+272
+double JsonValue::number_value() const { return 0; }273
+int JsonValue::int_value() const { return 0; }274
+bool JsonValue::bool_value() const { return false; }275
+const string & JsonValue::string_value() const { return statics().empty_string; }276
+const vector<Json> & JsonValue::array_items() const { return statics().empty_vector; }277
+const map<string, Json> & JsonValue::object_items() const { return statics().empty_map; }278
+const Json & JsonValue::operator[] (size_t) const { return static_null(); }279
+const Json & JsonValue::operator[] (const string &) const { return static_null(); }280
+281
+const Json & JsonObject::operator[] (const string &key) const {282
+ auto iter = m_value.find(key);283
+ return (iter == m_value.end()) ? static_null() : iter->second;284
+}285
+const Json & JsonArray::operator[] (size_t i) const {286
+ if (i >= m_value.size()) return static_null();287
+ else return m_value[i];288
+}289
+290
+/* * * * * * * * * * * * * * * * * * * *291
+ * Comparison292
+ */293
+294
+bool Json::operator== (const Json &other) const {295
+ if (m_ptr->type() != other.m_ptr->type())296
+ return false;297
+298
+ return m_ptr->equals(other.m_ptr.get());299
+}300
+301
+bool Json::operator< (const Json &other) const {302
+ if (m_ptr->type() != other.m_ptr->type())303
+ return m_ptr->type() < other.m_ptr->type();304
+305
+ return m_ptr->less(other.m_ptr.get());306
+}307
+308
+/* * * * * * * * * * * * * * * * * * * *309
+ * Parsing310
+ */311
+312
+/* esc(c)313
+ *314
+ * Format char c suitable for printing in an error message.315
+ */316
+static inline string esc(char c) {317
+ char buf[12];318
+ if (static_cast<uint8_t>(c) >= 0x20 && static_cast<uint8_t>(c) <= 0x7f) {319
+ snprintf(buf, sizeof buf, "'%c' (%d)", c, c);320
+ } else {321
+ snprintf(buf, sizeof buf, "(%d)", c);322
+ }323
+ return string(buf);324
+}325
+326
+static inline bool in_range(long x, long lower, long upper) {327
+ return (x >= lower && x <= upper);328
+}329
+330
+namespace {331
+/* JsonParser332
+ *333
+ * Object that tracks all state of an in-progress parse.334
+ */335
+struct JsonParser final {336
+337
+ /* State338
+ */339
+ const string &str;340
+ size_t i;341
+ string &err;342
+ bool failed;343
+ const JsonParse strategy;344
+345
+ /* fail(msg, err_ret = Json())346
+ *347
+ * Mark this parse as failed.348
+ */349
+ Json fail(string &&msg) {350
+ return fail(move(msg), Json());351
+ }352
+353
+ template <typename T>354
+ T fail(string &&msg, const T err_ret) {355
+ if (!failed)356
+ err = std::move(msg);357
+ failed = true;358
+ return err_ret;359
+ }360
+361
+ /* consume_whitespace()362
+ *363
+ * Advance until the current character is non-whitespace.364
+ */365
+ void consume_whitespace() {366
+ while (str[i] == ' ' || str[i] == '\r' || str[i] == '\n' || str[i] == '\t')367
+ i++;368
+ }369
+370
+ /* consume_comment()371
+ *372
+ * Advance comments (c-style inline and multiline).373
+ */374
+ bool consume_comment() {375
+ bool comment_found = false;376
+ if (str[i] == '/') {377
+ i++;378
+ if (i == str.size())379
+ return fail("unexpected end of input inside comment", false);380
+ if (str[i] == '/') { // inline comment381
+ i++;382
+ if (i == str.size())383
+ return fail("unexpected end of input inside inline comment", false);384
+ // advance until next line385
+ while (str[i] != '\n') {386
+ i++;387
+ if (i == str.size())388
+ return fail("unexpected end of input inside inline comment", false);389
+ }390
+ comment_found = true;391
+ }392
+ else if (str[i] == '*') { // multiline comment393
+ i++;394
+ if (i > str.size()-2)395
+ return fail("unexpected end of input inside multi-line comment", false);396
+ // advance until closing tokens397
+ while (!(str[i] == '*' && str[i+1] == '/')) {398
+ i++;399
+ if (i > str.size()-2)400
+ return fail(401
+ "unexpected end of input inside multi-line comment", false);402
+ }403
+ i += 2;404
+ if (i == str.size())405
+ return fail(406
+ "unexpected end of input inside multi-line comment", false);407
+ comment_found = true;408
+ }409
+ else410
+ return fail("malformed comment", false);411
+ }412
+ return comment_found;413
+ }414
+415
+ /* consume_garbage()416
+ *417
+ * Advance until the current character is non-whitespace and non-comment.418
+ */419
+ void consume_garbage() {420
+ consume_whitespace();421
+ if(strategy == JsonParse::COMMENTS) {422
+ bool comment_found = false;423
+ do {424
+ comment_found = consume_comment();425
+ consume_whitespace();426
+ }427
+ while(comment_found);428
+ }429
+ }430
+431
+ /* get_next_token()432
+ *433
+ * Return the next non-whitespace character. If the end of the input is reached,434
+ * flag an error and return 0.435
+ */436
+ char get_next_token() {437
+ consume_garbage();438
+ if (i == str.size())439
+ return fail("unexpected end of input", 0);440
+441
+ return str[i++];442
+ }443
+444
+ /* encode_utf8(pt, out)445
+ *446
+ * Encode pt as UTF-8 and add it to out.447
+ */448
+ void encode_utf8(long pt, string & out) {449
+ if (pt < 0)450
+ return;451
+452
+ if (pt < 0x80) {453
+ out += static_cast<char>(pt);454
+ } else if (pt < 0x800) {455
+ out += static_cast<char>((pt >> 6) | 0xC0);456
+ out += static_cast<char>((pt & 0x3F) | 0x80);457
+ } else if (pt < 0x10000) {458
+ out += static_cast<char>((pt >> 12) | 0xE0);459
+ out += static_cast<char>(((pt >> 6) & 0x3F) | 0x80);460
+ out += static_cast<char>((pt & 0x3F) | 0x80);461
+ } else {462
+ out += static_cast<char>((pt >> 18) | 0xF0);463
+ out += static_cast<char>(((pt >> 12) & 0x3F) | 0x80);464
+ out += static_cast<char>(((pt >> 6) & 0x3F) | 0x80);465
+ out += static_cast<char>((pt & 0x3F) | 0x80);466
+ }467
+ }468
+469
+ /* parse_string()470
+ *471
+ * Parse a string, starting at the current position.472
+ */473
+ string parse_string() {474
+ string out;475
+ long last_escaped_codepoint = -1;476
+ while (true) {477
+ if (i == str.size())478
+ return fail("unexpected end of input in string", "");479
+480
+ char ch = str[i++];481
+482
+ if (ch == '"') {483
+ encode_utf8(last_escaped_codepoint, out);484
+ return out;485
+ }486
+487
+ if (in_range(ch, 0, 0x1f))488
+ return fail("unescaped " + esc(ch) + " in string", "");489
+490
+ // The usual case: non-escaped characters491
+ if (ch != '\\') {492
+ encode_utf8(last_escaped_codepoint, out);493
+ last_escaped_codepoint = -1;494
+ out += ch;495
+ continue;496
+ }497
+498
+ // Handle escapes499
+ if (i == str.size())500
+ return fail("unexpected end of input in string", "");501
+502
+ ch = str[i++];503
+504
+ if (ch == 'u') {505
+ // Extract 4-byte escape sequence506
+ string esc = str.substr(i, 4);507
+ // Explicitly check length of the substring. The following loop508
+ // relies on std::string returning the terminating NUL when509
+ // accessing str[length]. Checking here reduces brittleness.510
+ if (esc.length() < 4) {511
+ return fail("bad \\u escape: " + esc, "");512
+ }513
+ for (int j = 0; j < 4; j++) {514
+ if (!in_range(esc[j], 'a', 'f') && !in_range(esc[j], 'A', 'F')515
+ && !in_range(esc[j], '0', '9'))516
+ return fail("bad \\u escape: " + esc, "");517
+ }518
+519
+ long codepoint = strtol(esc.data(), nullptr, 16);520
+521
+ // JSON specifies that characters outside the BMP shall be encoded as a pair522
+ // of 4-hex-digit \u escapes encoding their surrogate pair components. Check523
+ // whether we're in the middle of such a beast: the previous codepoint was an524
+ // escaped lead (high) surrogate, and this is a trail (low) surrogate.525
+ if (in_range(last_escaped_codepoint, 0xD800, 0xDBFF)526
+ && in_range(codepoint, 0xDC00, 0xDFFF)) {527
+ // Reassemble the two surrogate pairs into one astral-plane character, per528
+ // the UTF-16 algorithm.529
+ encode_utf8((((last_escaped_codepoint - 0xD800) << 10)530
+ | (codepoint - 0xDC00)) + 0x10000, out);531
+ last_escaped_codepoint = -1;532
+ } else {533
+ encode_utf8(last_escaped_codepoint, out);534
+ last_escaped_codepoint = codepoint;535
+ }536
+537
+ i += 4;538
+ continue;539
+ }540
+541
+ encode_utf8(last_escaped_codepoint, out);542
+ last_escaped_codepoint = -1;543
+544
+ if (ch == 'b') {545
+ out += '\b';546
+ } else if (ch == 'f') {547
+ out += '\f';548
+ } else if (ch == 'n') {549
+ out += '\n';550
+ } else if (ch == 'r') {551
+ out += '\r';552
+ } else if (ch == 't') {553
+ out += '\t';554
+ } else if (ch == '"' || ch == '\\' || ch == '/') {555
+ out += ch;556
+ } else {557
+ return fail("invalid escape character " + esc(ch), "");558
+ }559
+ }560
+ }561
+562
+ /* parse_number()563
+ *564
+ * Parse a double.565
+ */566
+ Json parse_number() {567
+ size_t start_pos = i;568
+569
+ if (str[i] == '-')570
+ i++;571
+572
+ // Integer part573
+ if (str[i] == '0') {574
+ i++;575
+ if (in_range(str[i], '0', '9'))576
+ return fail("leading 0s not permitted in numbers");577
+ } else if (in_range(str[i], '1', '9')) {578
+ i++;579
+ while (in_range(str[i], '0', '9'))580
+ i++;581
+ } else {582
+ return fail("invalid " + esc(str[i]) + " in number");583
+ }584
+585
+ if (str[i] != '.' && str[i] != 'e' && str[i] != 'E'586
+ && (i - start_pos) <= static_cast<size_t>(std::numeric_limits<int>::digits10)) {587
+ return std::atoi(str.c_str() + start_pos);588
+ }589
+590
+ // Decimal part591
+ if (str[i] == '.') {592
+ i++;593
+ if (!in_range(str[i], '0', '9'))594
+ return fail("at least one digit required in fractional part");595
+596
+ while (in_range(str[i], '0', '9'))597
+ i++;598
+ }599
+600
+ // Exponent part601
+ if (str[i] == 'e' || str[i] == 'E') {602
+ i++;603
+604
+ if (str[i] == '+' || str[i] == '-')605
+ i++;606
+607
+ if (!in_range(str[i], '0', '9'))608
+ return fail("at least one digit required in exponent");609
+610
+ while (in_range(str[i], '0', '9'))611
+ i++;612
+ }613
+614
+ return std::strtod(str.c_str() + start_pos, nullptr);615
+ }616
+617
+ /* expect(str, res)618
+ *619
+ * Expect that 'str' starts at the character that was just read. If it does, advance620
+ * the input and return res. If not, flag an error.621
+ */622
+ Json expect(const string &expected, Json res) {623
+ assert(i != 0);624
+ i--;625
+ if (str.compare(i, expected.length(), expected) == 0) {626
+ i += expected.length();627
+ return res;628
+ } else {629
+ return fail("parse error: expected " + expected + ", got " + str.substr(i, expected.length()));630
+ }631
+ }632
+633
+ /* parse_json()634
+ *635
+ * Parse a JSON object.636
+ */637
+ Json parse_json(int depth) {638
+ if (depth > max_depth) {639
+ return fail("exceeded maximum nesting depth");640
+ }641
+642
+ char ch = get_next_token();643
+ if (failed)644
+ return Json();645
+646
+ if (ch == '-' || (ch >= '0' && ch <= '9')) {647
+ i--;648
+ return parse_number();649
+ }650
+651
+ if (ch == 't')652
+ return expect("true", true);653
+654
+ if (ch == 'f')655
+ return expect("false", false);656
+657
+ if (ch == 'n')658
+ return expect("null", Json());659
+660
+ if (ch == '"')661
+ return parse_string();662
+663
+ if (ch == '{') {664
+ map<string, Json> data;665
+ ch = get_next_token();666
+ if (ch == '}')667
+ return data;668
+669
+ while (1) {670
+ if (ch != '"')671
+ return fail("expected '\"' in object, got " + esc(ch));672
+673
+ string key = parse_string();674
+ if (failed)675
+ return Json();676
+677
+ ch = get_next_token();678
+ if (ch != ':')679
+ return fail("expected ':' in object, got " + esc(ch));680
+681
+ data[std::move(key)] = parse_json(depth + 1);682
+ if (failed)683
+ return Json();684
+685
+ ch = get_next_token();686
+ if (ch == '}')687
+ break;688
+ if (ch != ',')689
+ return fail("expected ',' in object, got " + esc(ch));690
+691
+ ch = get_next_token();692
+ }693
+ return data;694
+ }695
+696
+ if (ch == '[') {697
+ vector<Json> data;698
+ ch = get_next_token();699
+ if (ch == ']')700
+ return data;701
+702
+ while (1) {703
+ i--;704
+ data.push_back(parse_json(depth + 1));705
+ if (failed)706
+ return Json();707
+708
+ ch = get_next_token();709
+ if (ch == ']')710
+ break;711
+ if (ch != ',')712
+ return fail("expected ',' in list, got " + esc(ch));713
+714
+ ch = get_next_token();715
+ (void)ch;716
+ }717
+ return data;718
+ }719
+720
+ return fail("expected value, got " + esc(ch));721
+ }722
+};723
+}//namespace {724
+725
+Json Json::parse(const string &in, string &err, JsonParse strategy) {726
+ JsonParser parser { in, 0, err, false, strategy };727
+ Json result = parser.parse_json(0);728
+729
+ // Check for any trailing garbage730
+ parser.consume_garbage();731
+ if (parser.i != in.size())732
+ return parser.fail("unexpected trailing " + esc(in[parser.i]));733
+734
+ return result;735
+}736
+737
+// Documented in json11.hpp738
+vector<Json> Json::parse_multi(const string &in,739
+ std::string::size_type &parser_stop_pos,740
+ string &err,741
+ JsonParse strategy) {742
+ JsonParser parser { in, 0, err, false, strategy };743
+ parser_stop_pos = 0;744
+ vector<Json> json_vec;745
+ while (parser.i != in.size() && !parser.failed) {746
+ json_vec.push_back(parser.parse_json(0));747
+ // Check for another object748
+ parser.consume_garbage();749
+ if (!parser.failed)750
+ parser_stop_pos = parser.i;751
+ }752
+ return json_vec;753
+}754
+755
+/* * * * * * * * * * * * * * * * * * * *756
+ * Shape-checking757
+ */758
+759
+bool Json::has_shape(const shape & types, string & err) const {760
+ if (!is_object()) {761
+ err = "expected JSON object, got " + dump();762
+ return false;763
+ }764
+765
+ for (auto & item : types) {766
+ if ((*this)[item.first].type() != item.second) {767
+ err = "bad type for " + item.first + " in " + dump();768
+ return false;769
+ }770
+ }771
+772
+ return true;773
+}774
+//void Json::add(std::string &key, std::string value)775
+//{776
+// (*m_ptr)[key] = value;777
+//}778
+779
+} // namespace json11780
+781
+782
x265_2.4.tar.gz/source/dynamicHDR10/json11/json11.h
Added
237
1
2
+/* json113
+ *4
+ * json11 is a tiny JSON library for C++11, providing JSON parsing and serialization.5
+ *6
+ * The core object provided by the library is json11::Json. A Json object represents any JSON7
+ * value: null, bool, number (int or double), string (std::string), array (std::vector), or8
+ * object (std::map).9
+ *10
+ * Json objects act like values: they can be assigned, copied, moved, compared for equality or11
+ * order, etc. There are also helper methods Json::dump, to serialize a Json to a string, and12
+ * Json::parse (static) to parse a std::string as a Json object.13
+ *14
+ * Internally, the various types of Json object are represented by the JsonValue class15
+ * hierarchy.16
+ *17
+ * A note on numbers - JSON specifies the syntax of number formatting but not its semantics,18
+ * so some JSON implementations distinguish between integers and floating-point numbers, while19
+ * some don't. In json11, we choose the latter. Because some JSON implementations (namely20
+ * Javascript itself) treat all numbers as the same type, distinguishing the two leads21
+ * to JSON that will be *silently* changed by a round-trip through those implementations.22
+ * Dangerous! To avoid that risk, json11 stores all numbers as double internally, but also23
+ * provides integer helpers.24
+ *25
+ * Fortunately, double-precision IEEE754 ('double') can precisely store any integer in the26
+ * range +/-2^53, which includes every 'int' on most systems. (Timestamps often use int6427
+ * or long long to avoid the Y2038K problem; a double storing microseconds since some epoch28
+ * will be exact for +/- 275 years.)29
+ */30
+31
+/* Copyright (c) 2013 Dropbox, Inc.32
+ *33
+ * Permission is hereby granted, free of charge, to any person obtaining a copy34
+ * of this software and associated documentation files (the "Software"), to deal35
+ * in the Software without restriction, including without limitation the rights36
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell37
+ * copies of the Software, and to permit persons to whom the Software is38
+ * furnished to do so, subject to the following conditions:39
+ *40
+ * The above copyright notice and this permission notice shall be included in41
+ * all copies or substantial portions of the Software.42
+ *43
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR44
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,45
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE46
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER47
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,48
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN49
+ * THE SOFTWARE.50
+ */51
+52
+#pragma once53
+54
+#include <string>55
+#include <vector>56
+#include <map>57
+#include <memory>58
+#include <initializer_list>59
+60
+#ifdef _MSC_VER61
+ #if _MSC_VER <= 1800 // VS 201362
+ #ifndef noexcept63
+ #define noexcept throw()64
+ #endif65
+66
+ #ifndef snprintf67
+ #define snprintf _snprintf_s68
+ #endif69
+ #endif70
+#endif71
+72
+namespace json11 {73
+74
+enum JsonParse {75
+ STANDARD, COMMENTS76
+};77
+78
+class JsonValue;79
+80
+class Json final{ //final81
+public:82
+ // Types83
+ enum Type {84
+ NUL, NUMBER, BOOL, STRING, ARRAY, OBJECT85
+ };86
+87
+ // Array and object typedefs88
+ typedef std::vector<Json> array;89
+ typedef std::map<std::string, Json> object;90
+91
+ // Constructors for the various types of JSON value.92
+ Json() noexcept; // NUL93
+ Json(std::nullptr_t) noexcept; // NUL94
+ Json(double value); // NUMBER95
+ Json(int value); // NUMBER96
+ Json(bool value); // BOOL97
+ Json(const std::string &value); // STRING98
+ Json(std::string &&value); // STRING99
+ Json(const char * value); // STRING100
+ Json(const array &values); // ARRAY101
+ Json(array &&values); // ARRAY102
+ Json(const object &values); // OBJECT103
+ Json(object &&values); // OBJECT104
+ void add(std::string &key, std::string value);105
+106
+ // Implicit constructor: anything with a to_json() function.107
+ template <class T, class = decltype(&T::to_json)>108
+ Json(const T & t) : Json(t.to_json()) {}109
+110
+ // Implicit constructor: map-like objects (std::map, std::unordered_map, etc)111
+ template <class M, typename std::enable_if<112
+ std::is_constructible<std::string, typename M::key_type>::value113
+ && std::is_constructible<Json, typename M::mapped_type>::value,114
+ int>::type = 0>115
+ Json(const M & m) : Json(object(m.begin(), m.end())) {}116
+117
+ // Implicit constructor: vector-like objects (std::list, std::vector, std::set, etc)118
+ template <class V, typename std::enable_if<119
+ std::is_constructible<Json, typename V::value_type>::value,120
+ int>::type = 0>121
+ Json(const V & v) : Json(array(v.begin(), v.end())) {}122
+123
+ // This prevents Json(some_pointer) from accidentally producing a bool. Use124
+ // Json(bool(some_pointer)) if that behavior is desired.125
+ Json(void *) = delete;126
+127
+ // Accessors128
+ Type type() const;129
+130
+ bool is_null() const { return type() == NUL; }131
+ bool is_number() const { return type() == NUMBER; }132
+ bool is_bool() const { return type() == BOOL; }133
+ bool is_string() const { return type() == STRING; }134
+ bool is_array() const { return type() == ARRAY; }135
+ bool is_object() const { return type() == OBJECT; }136
+137
+138
+ // Return the enclosed value if this is a number, 0 otherwise. Note that json11 does not139
+ // distinguish between integer and non-integer numbers - number_value() and int_value()140
+ // can both be applied to a NUMBER-typed object.141
+ double number_value() const;142
+ int int_value() const;143
+144
+ // Return the enclosed value if this is a boolean, false otherwise.145
+ bool bool_value() const;146
+ // Return the enclosed string if this is a string, "" otherwise.147
+ const std::string &string_value() const;148
+ // Return the enclosed std::vector if this is an array, or an empty vector otherwise.149
+ const array &array_items() const;150
+ // Return the enclosed std::map if this is an object, or an empty map otherwise.151
+ const object &object_items() const;152
+153
+ // Return a reference to arr[i] if this is an array, Json() otherwise.154
+ const Json & operator[](size_t i) const;155
+ // Return a reference to obj[key] if this is an object, Json() otherwise.156
+ const Json & operator[](const std::string &key) const;157
+158
+ // Serialize.159
+ void dump(std::string &out) const;160
+ std::string dump() const {161
+ std::string out;162
+ dump(out);163
+ return out;164
+ }165
+166
+ // Parse. If parse fails, return Json() and assign an error message to err.167
+ static Json parse(const std::string & in,168
+ std::string & err,169
+ JsonParse strategy = JsonParse::STANDARD);170
+ static Json parse(const char * in,171
+ std::string & err,172
+ JsonParse strategy = JsonParse::STANDARD) {173
+ if (in) {174
+ return parse(std::string(in), err, strategy);175
+ } else {176
+ err = "null input";177
+ return nullptr;178
+ }179
+ }180
+ // Parse multiple objects, concatenated or separated by whitespace181
+ static std::vector<Json> parse_multi(182
+ const std::string & in,183
+ std::string::size_type & parser_stop_pos,184
+ std::string & err,185
+ JsonParse strategy = JsonParse::STANDARD);186
+187
+ static inline std::vector<Json> parse_multi(188
+ const std::string & in,189
+ std::string & err,190
+ JsonParse strategy = JsonParse::STANDARD) {191
+ std::string::size_type parser_stop_pos;192
+ return parse_multi(in, parser_stop_pos, err, strategy);193
+ }194
+195
+ bool operator== (const Json &rhs) const;196
+ bool operator< (const Json &rhs) const;197
+ bool operator!= (const Json &rhs) const { return !(*this == rhs); }198
+ bool operator<= (const Json &rhs) const { return !(rhs < *this); }199
+ bool operator> (const Json &rhs) const { return (rhs < *this); }200
+ bool operator>= (const Json &rhs) const { return !(*this < rhs); }201
+202
+ /* has_shape(types, err)203
+ *204
+ * Return true if this is a JSON object and, for each item in types, has a field of205
+ * the given type. If not, return false and set err to a descriptive message.206
+ */207
+ typedef std::initializer_list<std::pair<std::string, Type>> shape;208
+ bool has_shape(const shape & types, std::string & err) const;209
+210
+private:211
+ std::shared_ptr<JsonValue> m_ptr;212
+};213
+214
+// Internal class hierarchy - JsonValue objects are not exposed to users of this API.215
+class JsonValue {216
+protected:217
+ friend class Json;218
+ friend class JsonInt;219
+ friend class JsonDouble;220
+ virtual Json::Type type() const = 0;221
+ virtual bool equals(const JsonValue * other) const = 0;222
+ virtual bool less(const JsonValue * other) const = 0;223
+ virtual void dump(std::string &out) const = 0;224
+ virtual double number_value() const;225
+ virtual int int_value() const;226
+ virtual bool bool_value() const;227
+ virtual const std::string &string_value() const;228
+ virtual const Json::array &array_items() const;229
+ virtual const Json &operator[](size_t i) const;230
+ virtual const Json::object &object_items() const;231
+ virtual const Json &operator[](const std::string &key) const;232
+ virtual ~JsonValue() {}233
+234
+};235
+236
+} // namespace json11237
x265_2.4.tar.gz/source/dynamicHDR10/metadataFromJson.cpp
Added
580
1
2
+/**3
+ * @file metadataFromJson.cpp4
+ * @brief Reads a JSON file and produces a byte array containing the metadata to be embedded in different ways.5
+ * @author Daniel Maximiliano Valenzuela, Seongnam Oh.6
+ * @create date 03/01/20177
+ * @version 0.0.18
+ *9
+ * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana10
+ *11
+ * This program is free software; you can redistribute it and/or12
+ * modify it under the terms of the GNU General Public License13
+ * as published by the Free Software Foundation; either version 214
+ * of the License, or (at your option) any later version.15
+ *16
+ * This program is distributed in the hope that it will be useful,17
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of18
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the19
+ * GNU General Public License for more details.20
+ *21
+ * You should have received a copy of the GNU General Public License22
+ * along with this program; if not, write to the Free Software23
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,24
+ * MA 02110-1301, USA.25
+**/26
+27
+#include "metadataFromJson.h"28
+29
+#include <fstream>30
+#include <iostream>31
+#include <math.h>32
+#include "sstream"33
+#include "sys/stat.h"34
+35
+#include "BasicStructures.h"36
+#include "SeiMetadataDictionary.h"37
+38
+#define M_PI 3.1415926535897932384639
+40
+using namespace SeiMetadataDictionary;41
+42
+class metadataFromJson::DynamicMetaIO43
+{44
+public:45
+ DynamicMetaIO() :46
+ mCurrentStreamBit(8),47
+ mCurrentStreamByte(0)48
+ {}49
+50
+ ~DynamicMetaIO(){}51
+52
+ int mCurrentStreamBit;53
+ int mCurrentStreamByte;54
+55
+ bool luminanceParamFromJson(const Json &data, LuminanceParameters &obj)56
+ {57
+ JsonObject lumJsonData = data.object_items();58
+ if(!lumJsonData.empty())59
+ {60
+ JsonObject percentileData = lumJsonData[PercentileNames::TagName].object_items();61
+ obj.order = percentileData[PercentileNames::NumberOfPercentiles].int_value();62
+63
+ obj.averageLuminance = static_cast<float>(lumJsonData[LuminanceNames::AverageRGB].number_value());64
+ obj.maxRLuminance = static_cast<float>(lumJsonData[LuminanceNames::MaxSCL0].number_value());65
+ obj.maxGLuminance = static_cast<float>(lumJsonData[LuminanceNames::MaxSCL1].number_value());66
+ obj.maxBLuminance = static_cast<float>(lumJsonData[LuminanceNames::MaxSCL2].number_value());67
+68
+ if(!percentileData.empty())69
+ {70
+ obj.percentiles.resize(obj.order);71
+ for(int i = 0; i < obj.order; ++i)72
+ {73
+ std::string percentileTag = PercentileNames::TagName;74
+ percentileTag += std::to_string(i);75
+ obj.percentiles[i] = static_cast<unsigned int>(percentileData[percentileTag].int_value());76
+ }77
+ }78
+79
+ return true;80
+ }81
+ return false;82
+ }83
+84
+ bool percentagesFromJson(const Json &data, std::vector<unsigned int> &percentages)85
+ {86
+ JsonObject jsonData = data.object_items();87
+ if(!jsonData.empty())88
+ {89
+ JsonObject percentileData = jsonData[PercentileNames::TagName].object_items();90
+ int order = percentileData[PercentileNames::NumberOfPercentiles].int_value();91
+92
+ percentages.resize(order);93
+ for(int i = 0; i < order; ++i)94
+ {95
+ std::string percentileTag = PercentileNames::PercentilePercentageValue[i];96
+ percentages[i] = static_cast<unsigned int>(percentileData[percentileTag].int_value());97
+ }98
+99
+ return true;100
+ }101
+ return false;102
+ }103
+104
+ bool percentagesFromJson(const Json &data, unsigned int *percentages)105
+ {106
+ JsonObject jsonData = data.object_items();107
+ if(!jsonData.empty())108
+ {109
+ JsonObject percentileData = jsonData[PercentileNames::TagName].object_items();110
+ int order = percentileData[PercentileNames::NumberOfPercentiles].int_value();111
+112
+ for(int i = 0; i < order; ++i)113
+ {114
+ std::string percentileTag = PercentileNames::PercentilePercentageValue[i];115
+ percentages[i] = static_cast<unsigned int>(percentileData[percentileTag].int_value());116
+ }117
+118
+ return true;119
+ }120
+ return false;121
+ }122
+123
+ bool bezierCurveFromJson(const Json &data, BezierCurveData &obj)124
+ {125
+ JsonObject jsonData = data.object_items();126
+ if(!jsonData.empty())127
+ {128
+ obj.order = jsonData[BezierCurveNames::NumberOfAnchors].int_value();129
+ obj.coeff.resize(obj.order);130
+ obj.sPx = jsonData[BezierCurveNames::KneePointX].int_value();131
+ obj.sPy = jsonData[BezierCurveNames::KneePointY].int_value();132
+ for(int i = 0; i < obj.order; ++i)133
+ {134
+ obj.coeff[i] = jsonData[BezierCurveNames::Anchors[i]].int_value();135
+ }136
+137
+ return true;138
+ }139
+ return false;140
+ }141
+142
+ template<typename T>143
+ void appendBits(uint8_t *dataStream, T data, int bitsToWrite)144
+ {145
+ //TODO: Check if bitsToWrite is <= sizeOf(T);146
+ while (bitsToWrite > 0)147
+ {148
+ /* if all data to write fits inside the current byte */149
+ if (bitsToWrite < mCurrentStreamBit )150
+ {151
+ int bitshift = mCurrentStreamBit - bitsToWrite;152
+ dataStream[mCurrentStreamByte] += static_cast<uint8_t>(data << bitshift);153
+ mCurrentStreamBit -= bitsToWrite;154
+ bitsToWrite = 0;155
+ }156
+ /* if all data to write needs more than the current byte space */157
+ else158
+ {159
+ int bitshift = bitsToWrite - mCurrentStreamBit;160
+ dataStream[mCurrentStreamByte] += static_cast<uint8_t>(data >> bitshift);161
+ bitsToWrite -= mCurrentStreamBit ;162
+ mCurrentStreamBit = 8;163
+ mCurrentStreamByte++;164
+ }165
+ }166
+ }167
+168
+ void setPayloadSize(uint8_t *dataStream, int positionOnStream, int payload)169
+ {170
+ int payloadBytes = 1;171
+172
+ for(;payload > 0xFF; payload -= 0xFF, ++payloadBytes);173
+174
+ if(payloadBytes > 1)175
+ {176
+ shiftData(dataStream, payloadBytes-1, mCurrentStreamByte, positionOnStream);177
+ mCurrentStreamByte += payloadBytes-1;178
+179
+ for(int i = 0; i < payloadBytes; ++i)180
+ {181
+ if(payloadBytes-1 == i)182
+ {183
+ dataStream[positionOnStream++] = static_cast<uint8_t>(payload);184
+ }185
+ else186
+ {187
+ dataStream[positionOnStream++] = 0xFF;188
+ }189
+ }190
+ }191
+ else192
+ {193
+ dataStream[positionOnStream] = static_cast<uint8_t>(payload);194
+ }195
+ }196
+197
+ void shiftData(uint8_t *dataStream, int shiftSize, int streamSize, int startPoint = 0)198
+ {199
+ for(int i = streamSize; i > startPoint; --i)200
+ {201
+ dataStream[i + shiftSize] = dataStream[i];202
+ }203
+ }204
+205
+// const std::string LocalParameters = std::string("LocalParameters");206
+// const std::string TargetDisplayLuminance = std::string("TargetedSystemDisplayMaximumLuminance");207
+};208
+209
+metadataFromJson::metadataFromJson() :210
+ mPimpl(new DynamicMetaIO())211
+{212
+213
+}214
+215
+metadataFromJson::~metadataFromJson()216
+{217
+ delete mPimpl;218
+}219
+220
+221
+bool metadataFromJson::frameMetadataFromJson(const char* filePath,222
+ int frame,223
+ uint8_t *&metadata)224
+{225
+ std::string path(filePath);226
+ JsonArray fileData = JsonHelper::readJsonArray(path);227
+228
+ if(fileData.empty())229
+ {230
+ return false;231
+ }232
+233
+// frame = frame + 1; //index on the array start at 0 frames starts at 1234
+ int numFrames = static_cast<int>(fileData.size());235
+236
+ if(frame >= numFrames)237
+ {238
+ return false;239
+ }240
+241
+ int mSEIBytesToRead = 509;242
+243
+ if(metadata)244
+ {245
+ delete(metadata);246
+ }247
+ metadata = new uint8_t[mSEIBytesToRead];248
+ mPimpl->mCurrentStreamBit = 8;249
+ mPimpl->mCurrentStreamByte = 1;250
+251
+ for(int j = 0; j < mSEIBytesToRead; ++j)252
+ {253
+ (metadata)[j] = 0;254
+ }255
+256
+ fillMetadataArray(fileData, frame, metadata);257
+ mPimpl->setPayloadSize(metadata, 0, mPimpl->mCurrentStreamByte);258
+ return true;259
+}260
+261
+int metadataFromJson::movieMetadataFromJson(const char* filePath, uint8_t **&metadata)262
+{263
+ std::string path(filePath);264
+ JsonArray fileData = JsonHelper::readJsonArray(path);265
+ if (fileData.empty())266
+ {267
+ return -1;268
+ }269
+270
+ int numFrames = static_cast<int>(fileData.size());271
+ metadata = new uint8_t*[numFrames];272
+ for (int frame = 0; frame < numFrames; ++frame)273
+ {274
+ metadata[frame] = new uint8_t[509];275
+ for (int i = 0; i < 509; ++i)276
+ {277
+ metadata[frame][i] = 0;278
+ }279
+ mPimpl->mCurrentStreamBit = 8;280
+ mPimpl->mCurrentStreamByte = 1;281
+282
+ fillMetadataArray(fileData, frame, metadata[frame]);283
+284
+ mPimpl->setPayloadSize(metadata[frame], 0, mPimpl->mCurrentStreamByte);285
+286
+ }287
+288
+ return numFrames;289
+}290
+291
+bool metadataFromJson::extendedInfoFrameMetadataFromJson(const char* filePath,292
+ int frame,293
+ uint8_t *&metadata)294
+{295
+ std::string path(filePath);296
+ JsonArray fileData = JsonHelper::readJsonArray(path);297
+298
+ if (fileData.empty())299
+ {300
+ return false;301
+ }302
+303
+ int numFrames = static_cast<int>(fileData.size());304
+ if (frame >= numFrames)305
+ {306
+ return false;307
+ }308
+309
+ int mSEIBytesToRead = 509;310
+311
+ if (metadata)312
+ {313
+ delete(metadata);314
+ }315
+ metadata = new uint8_t[mSEIBytesToRead];316
+ mPimpl->mCurrentStreamBit = 8;317
+ mPimpl->mCurrentStreamByte = 0;318
+319
+ for (int j = 0; j < mSEIBytesToRead; ++j)320
+ {321
+ (metadata)[j] = 0;322
+ }323
+324
+ const uint16_t extendedInfoframeType = 0x0004;325
+ mPimpl->appendBits(metadata, extendedInfoframeType, 16);326
+327
+ /* NOTE: We leave TWO BYTES of space for the payload */328
+ mPimpl->mCurrentStreamByte += 2;329
+330
+ fillMetadataArray(fileData, frame, metadata);331
+332
+ /* Set payload in bytes 2 & 3 as indicated in Extended InfoFrame Type syntax */333
+ metadata[2] = (mPimpl->mCurrentStreamByte & 0xFF00) >> 8;334
+ metadata[3] = (mPimpl->mCurrentStreamByte & 0x00FF);335
+ return true;336
+}337
+338
+int metadataFromJson::movieExtendedInfoFrameMetadataFromJson(const char* filePath, uint8_t **&metadata)339
+{340
+ std::string path(filePath);341
+ JsonArray fileData = JsonHelper::readJsonArray(path);342
+ if(fileData.empty())343
+ {344
+ return -1;345
+ }346
+347
+ int numFrames = static_cast<int>(fileData.size());348
+ metadata = new uint8_t*[numFrames];349
+ for(int frame = 0; frame < numFrames; ++frame)350
+ {351
+ metadata[frame] = new uint8_t[509];352
+ for(int i = 0; i < 509; ++i) 353
+ {354
+ metadata[frame][i] = 0;355
+ }356
+ mPimpl->mCurrentStreamBit = 8;357
+ mPimpl->mCurrentStreamByte = 0;358
+359
+ const uint16_t extendedInfoframeType = 0x0004;360
+ mPimpl->appendBits(metadata[frame], extendedInfoframeType, 16);361
+362
+ /* NOTE: We leave TWO BYTES of space for the payload */363
+ mPimpl->mCurrentStreamByte += 2;364
+365
+ fillMetadataArray(fileData, frame, metadata[frame]);366
+367
+ /* Set payload in bytes 2 & 3 as indicated in Extended InfoFrame Type syntax */368
+ metadata[frame][2] = (mPimpl->mCurrentStreamByte & 0xFF00) >> 8;369
+ metadata[frame][3] = (mPimpl->mCurrentStreamByte & 0x00FF);370
+ }371
+372
+ return numFrames;373
+}374
+375
+void metadataFromJson::fillMetadataArray(const JsonArray &fileData, int frame, uint8_t *&metadata)376
+{377
+ const uint8_t countryCode = 0xB5;378
+ const uint16_t terminalProviderCode = 0x003C;379
+ const uint16_t terminalProviderOrientedCode = 0x0001;380
+ const uint8_t applicationIdentifier = 4;381
+ const uint8_t applicationVersion = 0;382
+383
+ mPimpl->appendBits(metadata, countryCode, 8);384
+ mPimpl->appendBits(metadata, terminalProviderCode, 16);385
+ mPimpl->appendBits(metadata, terminalProviderOrientedCode, 16);386
+387
+ mPimpl->appendBits(metadata, applicationIdentifier, 8);388
+ mPimpl->appendBits(metadata, applicationVersion, 8);389
+390
+ //Note: Validated only add up to two local selections, ignore the rest391
+ JsonArray jsonArray = fileData[frame][JsonDataKeys::LocalParameters].array_items();392
+ int ellipsesNum = static_cast<int>(jsonArray.size() > 2 ? 2 : jsonArray.size());393
+394
+ uint16_t numWindows = 1 + static_cast<uint16_t>(ellipsesNum);395
+396
+ mPimpl->appendBits(metadata, numWindows, 2);397
+ for (int i = 0; i < ellipsesNum; ++i)398
+ {399
+ mPimpl->appendBits(metadata, jsonArray[i][EllipseSelectionNames::WindowData]400
+ [EllipseSelectionNames::WindowUpperLeftCornerX].int_value(), 16);401
+ mPimpl->appendBits(metadata, jsonArray[i][EllipseSelectionNames::WindowData]402
+ [EllipseSelectionNames::WindowUpperLeftCornerY].int_value(), 16);403
+ mPimpl->appendBits(metadata, jsonArray[i][EllipseSelectionNames::WindowData]404
+ [EllipseSelectionNames::WindowLowerRightCornerX].int_value(), 16);405
+ mPimpl->appendBits(metadata, jsonArray[i][EllipseSelectionNames::WindowData]406
+ [EllipseSelectionNames::WindowLowerRightCornerY].int_value(), 16);407
+408
+ JsonObject ellipseJsonObject = jsonArray[i][EllipseNames::TagName].object_items();409
+410
+ mPimpl->appendBits(metadata,411
+ static_cast<uint16_t>(ellipseJsonObject[EllipseNames::CenterOfEllipseX].int_value()),412
+ 16);413
+414
+ mPimpl->appendBits(metadata,415
+ static_cast<uint16_t>(ellipseJsonObject[EllipseNames::CenterOfEllipseY].int_value()),416
+ 16);417
+418
+ int angle = ellipseJsonObject[EllipseNames::RotationAngle].int_value();419
+ uint8_t rotationAngle = static_cast<uint8_t>((angle > 180.0) ? angle - 180.0 : angle);420
+ mPimpl->appendBits(metadata, rotationAngle, 8);421
+422
+ uint16_t semimajorExternalAxis =423
+ static_cast<uint16_t>(ellipseJsonObject[EllipseNames::SemiMajorAxisExternalEllipse].int_value());424
+425
+ uint16_t semiminorExternalAxis =426
+ static_cast<uint16_t>(ellipseJsonObject[EllipseNames::SemiMinorAxisExternalEllipse].int_value());427
+428
+ uint16_t semimajorInternalEllipse =429
+ static_cast<uint16_t>(ellipseJsonObject[EllipseNames::SemiMajorAxisInternalEllipse].int_value());430
+431
+ mPimpl->appendBits(metadata, semimajorInternalEllipse, 16);432
+433
+ mPimpl->appendBits(metadata, semimajorExternalAxis, 16);434
+ mPimpl->appendBits(metadata, semiminorExternalAxis, 16);435
+ /*bool*/ uint8_t overlapProcessOption = static_cast<uint8_t>(ellipseJsonObject[EllipseNames::OverlapProcessOption].int_value()); //1; 436
+ //TODO: Uses Layering method, the value is "1"437
+ mPimpl->appendBits(metadata, overlapProcessOption, 1);438
+ }439
+ /* Targeted System Display Data */440
+ uint32_t TEMPmonitorPeak = fileData[frame][JsonDataKeys::TargetDisplayLuminance].int_value(); //500;441
+ mPimpl->appendBits(metadata, TEMPmonitorPeak, 27);442
+443
+ //NOTE: Set as false for now, as requested444
+ /*bool*/uint8_t targetedSystemDisplayActualPeakLuminanceFlag = 0; /*false*/445
+ mPimpl->appendBits(metadata, targetedSystemDisplayActualPeakLuminanceFlag, 1);446
+ if (targetedSystemDisplayActualPeakLuminanceFlag)447
+ {448
+ //TODO449
+ }450
+451
+ /* Max rgb values (maxScl)*/452
+ /* Luminance values/percentile for each window */453
+ for (int w = 0; w < numWindows; ++w)454
+ {455
+ Json lumObj = fileData[frame][LuminanceNames::TagName];456
+ LuminanceParameters luminanceData;457
+ if (!mPimpl->luminanceParamFromJson(lumObj, luminanceData))458
+ {459
+ std::cout << "error parsing luminance parameters frame: " << w << std::endl;460
+ }461
+462
+ /* NOTE: Maxscl from 0 t 100,000 based on data that says in values of 0.00001463
+ * one for each channel R,G,B464
+ */465
+466
+ mPimpl->appendBits(metadata, static_cast<uint8_t>(((int)luminanceData.maxRLuminance & 0x10000) >> 16), 1);467
+ mPimpl->appendBits(metadata, static_cast<uint16_t>((int)luminanceData.maxRLuminance & 0xFFFF), 16);468
+ mPimpl->appendBits(metadata, static_cast<uint8_t>(((int)luminanceData.maxGLuminance & 0x10000) >> 16), 1);469
+ mPimpl->appendBits(metadata, static_cast<uint16_t>((int)luminanceData.maxGLuminance & 0xFFFF), 16);470
+ mPimpl->appendBits(metadata, static_cast<uint8_t>(((int)luminanceData.maxBLuminance & 0x10000) >> 16), 1);471
+ mPimpl->appendBits(metadata, static_cast<uint16_t>((int)luminanceData.maxBLuminance & 0xFFFF), 16);472
+ /* changed from maxRGBLuminance to average luminance to match stms implementation */473
+ mPimpl->appendBits(metadata, static_cast<uint8_t>(((int)luminanceData.averageLuminance & 0x10000) >> 16), 1);474
+ mPimpl->appendBits(metadata, static_cast<uint16_t>((int)luminanceData.averageLuminance & 0xFFFF), 16);475
+476
+ /* Percentiles */477
+ uint8_t numDistributionMaxrgbPercentiles = static_cast<uint8_t>(luminanceData.order);478
+ mPimpl->appendBits(metadata, numDistributionMaxrgbPercentiles, 4);479
+480
+ std::vector<unsigned int>percentilPercentages;481
+ mPimpl->percentagesFromJson(lumObj, percentilPercentages);482
+ for (int i = 0; i < numDistributionMaxrgbPercentiles; ++i)483
+ {484
+ uint8_t distributionMaxrgbPercentage = static_cast<uint8_t>(percentilPercentages.at(i));485
+ mPimpl->appendBits(metadata, distributionMaxrgbPercentage, 7);486
+487
+ // 17bits: 1bit then 16488
+ unsigned int ithPercentile = luminanceData.percentiles.at(i);489
+ uint8_t highValue = static_cast<uint8_t>((ithPercentile & 0x10000) >> 16);490
+ uint16_t lowValue = static_cast<uint16_t>(ithPercentile & 0xFFFF);491
+ mPimpl->appendBits(metadata, highValue, 1);492
+ mPimpl->appendBits(metadata, lowValue, 16);493
+ }494
+495
+ /* 10bits: Fraction bright pixels */496
+ uint16_t fractionBrightPixels = 1;497
+ mPimpl->appendBits(metadata, fractionBrightPixels, 10);498
+499
+ }500
+501
+ /* Note: Set to false by now as requested */502
+ uint8_t masteringDisplayActualPeakLuminanceFlag = 0;503
+ mPimpl->appendBits(metadata, masteringDisplayActualPeakLuminanceFlag, 1);504
+ if (masteringDisplayActualPeakLuminanceFlag)505
+ {506
+ //TODO507
+ }508
+ // BEZIER CURVE DATA509
+ for (int w = 0; w < numWindows; ++w)510
+ {511
+ //TODO: 512
+ uint8_t toneMappingFlag = 1;513
+ mPimpl->appendBits(metadata, toneMappingFlag, 1);514
+ if (toneMappingFlag)515
+ {516
+ Json bezierData = fileData[frame][BezierCurveNames::TagName];517
+ BezierCurveData curveData;518
+519
+ /* Select curve data based on global window or local window */520
+ if (w == 0)521
+ {522
+ if (!mPimpl->bezierCurveFromJson(bezierData, curveData))523
+ {524
+ std::cout << "error parsing bezierCurve frame: " << w << std::endl;525
+ }526
+ }527
+ else528
+ {529
+ if (!mPimpl->bezierCurveFromJson(jsonArray[w - 1][BezierCurveNames::TagName], curveData))530
+ {531
+ std::cout << "error parsing bezierCurve ellipse: " << w - 1 << std::endl;532
+ }533
+ }534
+535
+ uint16_t kneePointX = static_cast<uint16_t>(curveData.sPx);536
+ mPimpl->appendBits(metadata, kneePointX, 12);537
+ uint16_t kneePointY = static_cast<uint16_t>(curveData.sPy);538
+ mPimpl->appendBits(metadata, kneePointY, 12);539
+540
+ uint8_t numBezierCurveAnchors = static_cast<uint8_t>(curveData.order);// - 1;541
+ mPimpl->appendBits(metadata, numBezierCurveAnchors, 4);542
+543
+ /* Curve anchors 10bits */544
+ for (int i = 0; i < numBezierCurveAnchors; ++i)545
+ {546
+ uint16_t anchor = static_cast<uint16_t>(curveData.coeff.at(i));547
+ mPimpl->appendBits(metadata, anchor, 10);548
+ }549
+ }550
+ }551
+ /* Set to false as requested */552
+ bool colorSaturationMappingFlag = 0;553
+ mPimpl->appendBits(metadata, colorSaturationMappingFlag, 1);554
+ if (colorSaturationMappingFlag)555
+ {556
+ //TODO557
+ }558
+559
+ if (mPimpl->mCurrentStreamBit == 8)560
+ {561
+ mPimpl->mCurrentStreamByte -= 1;562
+ }563
+}564
+565
+void metadataFromJson::clear(uint8_t **&metadata, const int numberOfFrames)566
+{567
+ if (metadata && numberOfFrames > 0)568
+ {569
+ for (int i = 0; i < numberOfFrames; ++i)570
+ {571
+ if (metadata[i])572
+ {573
+ delete[] metadata[i];574
+ }575
+ }576
+ delete[] metadata;577
+ metadata = NULL;578
+ }579
+}580
x265_2.4.tar.gz/source/dynamicHDR10/metadataFromJson.h
Added
108
1
2
+/**3
+ * @file metadataFromJson.h4
+ * @brief Reads a JSON file and produces a byte array containing the metadata to be embedded for a frame.5
+ * @author Daniel Maximiliano Valenzuela, Seongnam Oh.6
+ * @create date 03/01/20177
+ * @version 0.0.18
+ *9
+ * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana10
+ *11
+ * This program is free software; you can redistribute it and/or12
+ * modify it under the terms of the GNU General Public License13
+ * as published by the Free Software Foundation; either version 214
+ * of the License, or (at your option) any later version.15
+ *16
+ * This program is distributed in the hope that it will be useful,17
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of18
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the19
+ * GNU General Public License for more details.20
+ *21
+ * You should have received a copy of the GNU General Public License22
+ * along with this program; if not, write to the Free Software23
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,24
+ * MA 02110-1301, USA.25
+26
+**/27
+28
+#ifndef METADATAFROMJSON_H29
+#define METADATAFROMJSON_H30
+31
+#include<stdint.h>32
+#include "string"33
+#include "JsonHelper.h"34
+35
+class metadataFromJson36
+{37
+38
+public:39
+ metadataFromJson();40
+ ~metadataFromJson();41
+42
+43
+ /**44
+ * @brief frameMetadataFromJson: Generates a sigle frame metadata array from Json file with all45
+ * metadata information from movie.46
+ * @param filePath: path to Json file containing movie metadata information.47
+ * @param frame: frame Id number in respect to the movie.48
+ * @param metadata (output): receives an empty pointer that will be set to point to metadata49
+ * array. Note: if pointer is set it will be deleted.50
+ * @return True if succesful51
+ */52
+ bool frameMetadataFromJson(const char* filePath,53
+ int frame,54
+ uint8_t *&metadata);55
+ 56
+ /**57
+ * @brief movieMetadataFromJson: Generates metadata array from Json file with all metadata58
+ * information from movie.59
+ * @param filePath: path to Json file containing movie metadata information.60
+ * @param metadata (output): receives an empty pointer that will be set to point to metadata61
+ * array. Note: if pointer is set it will be deleted.62
+ * @return int: number of frames in the movie, -1 if the process fails to obtain the metadata.63
+ */64
+ int movieMetadataFromJson(const char* filePath,65
+ uint8_t **&metadata);66
+67
+ /**68
+ * @brief extendedInfoFrameMetadataFromJson: Generates Extended InfoFrame metadata array from Json file69
+ * with all metadata information from movie.70
+ * @param filePath: path to Json file containing movie metadata information.71
+ * @param metadata (output): receives an empty pointer that will be set to point to metadata72
+ * array. Note: if pointer is set it will be deleted.73
+ * @return int: number of frames in the movie, -1 if the process fails to obtain the metadata.74
+ */75
+ bool extendedInfoFrameMetadataFromJson(const char* filePath,76
+ int frame,77
+ uint8_t *&metadata);78
+79
+ /**80
+ * @brief movieMetadataFromJson: Generates Extended InfoFrame metadata array from Json file with all metadata81
+ * information from movie.82
+ * @param filePath: path to Json file containing movie Extended InfoFrame metadata information.83
+ * @param metadata (output): receives an empty pointer that will be set to point to metadata84
+ * array. Note: if pointer is set it will be deleted.85
+ * @return int: number of frames in the movie, -1 if the process fails to obtain the metadata.86
+ */87
+ int movieExtendedInfoFrameMetadataFromJson(const char* filePath,88
+ uint8_t **&metadata);89
+90
+ /**91
+92
+ * @brief clear: Clears the memory of the given array and size.93
+ * @param metadata: metadata array to be cleared.94
+ * @param numberOfFrames: number of frames in the metadata array.95
+ * @return96
+ */97
+ void clear(uint8_t **&metadata,98
+ const int numberOfFrames);99
+100
+private:101
+102
+ class DynamicMetaIO;103
+ DynamicMetaIO *mPimpl;104
+ void fillMetadataArray(const JsonArray &fileData, int frame, uint8_t *&metadata);105
+};106
+107
+#endif // METADATAFROMJSON_H108
x265_2.3.tar.gz/source/encoder/analysis.cpp -> x265_2.4.tar.gz/source/encoder/analysis.cpp
Changed
234
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Deepthi Nandakumar <deepthi@multicorewareinc.com>7
* Steve Borho <steve@borho.org>8
9
}10
}11
12
- if (m_param->analysisMode && m_slice->m_sliceType != I_SLICE)13
+ if (m_param->analysisMode && m_slice->m_sliceType != I_SLICE && m_param->analysisRefineLevel > 1 && m_param->analysisRefineLevel < 10)14
{15
int numPredDir = m_slice->isInterP() ? 1 : 2;16
m_reuseInterDataCTU = (analysis_inter_data*)m_frame->m_analysisData.interData;17
m_reuseRef = &m_reuseInterDataCTU->ref[ctu.m_cuAddr * X265_MAX_PRED_MODE_PER_CTU * numPredDir];18
m_reuseDepth = &m_reuseInterDataCTU->depth[ctu.m_cuAddr * ctu.m_numPartitions];19
m_reuseModes = &m_reuseInterDataCTU->modes[ctu.m_cuAddr * ctu.m_numPartitions];20
- m_reusePartSize = &m_reuseInterDataCTU->partSize[ctu.m_cuAddr * ctu.m_numPartitions];21
- m_reuseMergeFlag = &m_reuseInterDataCTU->mergeFlag[ctu.m_cuAddr * ctu.m_numPartitions];22
+ if (m_param->analysisRefineLevel > 4)23
+ {24
+ m_reusePartSize = &m_reuseInterDataCTU->partSize[ctu.m_cuAddr * ctu.m_numPartitions];25
+ m_reuseMergeFlag = &m_reuseInterDataCTU->mergeFlag[ctu.m_cuAddr * ctu.m_numPartitions];26
+ }27
if (m_param->analysisMode == X265_ANALYSIS_SAVE)28
for (int i = 0; i < X265_MAX_PRED_MODE_PER_CTU * numPredDir; i++)29
m_reuseRef[i] = -1;30
31
if (m_slice->m_sliceType == I_SLICE)32
{33
analysis_intra_data* intraDataCTU = (analysis_intra_data*)m_frame->m_analysisData.intraData;34
- if (m_param->analysisMode == X265_ANALYSIS_LOAD)35
+ if (m_param->analysisMode == X265_ANALYSIS_LOAD && m_param->analysisRefineLevel > 1)36
{37
memcpy(ctu.m_cuDepth, &intraDataCTU->depth[ctu.m_cuAddr * numPartition], sizeof(uint8_t) * numPartition);38
memcpy(ctu.m_lumaIntraDir, &intraDataCTU->modes[ctu.m_cuAddr * numPartition], sizeof(uint8_t) * numPartition);39
40
/* generate residual for entire CTU at once and copy to reconPic */41
encodeResidue(ctu, cuGeom);42
}43
+ else if (m_param->analysisMode == X265_ANALYSIS_LOAD && m_param->analysisRefineLevel == 10)44
+ {45
+ analysis_inter_data* interDataCTU = (analysis_inter_data*)m_frame->m_analysisData.interData;46
+ int posCTU = ctu.m_cuAddr * numPartition;47
+ memcpy(ctu.m_cuDepth, &interDataCTU->depth[posCTU], sizeof(uint8_t) * numPartition);48
+ memcpy(ctu.m_predMode, &interDataCTU->modes[posCTU], sizeof(uint8_t) * numPartition);49
+ memcpy(ctu.m_partSize, &interDataCTU->partSize[posCTU], sizeof(uint8_t) * numPartition);50
+ if (m_slice->m_sliceType == P_SLICE || m_param->bIntraInBFrames)51
+ {52
+ analysis_intra_data* intraDataCTU = (analysis_intra_data*)m_frame->m_analysisData.intraData;53
+ memcpy(ctu.m_lumaIntraDir, &intraDataCTU->modes[posCTU], sizeof(uint8_t) * numPartition);54
+ memcpy(ctu.m_chromaIntraDir, &intraDataCTU->chromaModes[posCTU], sizeof(uint8_t) * numPartition);55
+ }56
+ //Calculate log2CUSize from depth57
+ for (uint32_t i = 0; i < cuGeom.numPartitions; i++)58
+ ctu.m_log2CUSize[i] = (uint8_t)g_maxLog2CUSize - ctu.m_cuDepth[i];59
+60
+ qprdRefine (ctu, cuGeom, qp, qp);61
+ return *m_modeDepth[0].bestMode;62
+ }63
else if (m_param->bDistributeModeAnalysis && m_param->rdLevel >= 2)64
compressInterCU_dist(ctu, cuGeom, qp);65
else if (m_param->rdLevel <= 4)66
67
int lambdaQP = lqp;68
69
bool doQPRefine = (bDecidedDepth && depth <= m_slice->m_pps->maxCuDQPDepth) || (!bDecidedDepth && depth == m_slice->m_pps->maxCuDQPDepth);70
+ if (m_param->analysisRefineLevel == 10)71
+ doQPRefine = false;72
73
if (doQPRefine)74
{75
76
md.pred[PRED_2Nx2N].sa8dCost = 0;77
}78
79
- if (m_param->analysisMode == X265_ANALYSIS_LOAD)80
+ if (m_param->analysisMode == X265_ANALYSIS_LOAD && m_param->analysisRefineLevel > 1)81
{82
if (mightNotSplit && depth == m_reuseDepth[cuGeom.absPartIdx])83
{84
85
if (m_param->rdLevel)86
skipModes = m_param->bEnableEarlySkip && md.bestMode;87
}88
- if (m_reusePartSize[cuGeom.absPartIdx] == SIZE_2Nx2N)89
+ if (m_param->analysisRefineLevel > 4 && m_reusePartSize[cuGeom.absPartIdx] == SIZE_2Nx2N)90
{91
if (m_reuseModes[cuGeom.absPartIdx] != MODE_INTRA && m_reuseModes[cuGeom.absPartIdx] != 4)92
{93
94
splitData[3].initSplitCUData();95
uint32_t allSplitRefs = splitData[0].splitRefs | splitData[1].splitRefs | splitData[2].splitRefs | splitData[3].splitRefs;96
uint32_t refMasks[2];97
- if (m_param->analysisMode == X265_ANALYSIS_LOAD)98
+ if (m_param->analysisMode == X265_ANALYSIS_LOAD && m_param->analysisRefineLevel > 1)99
{100
if (mightNotSplit && depth == m_reuseDepth[cuGeom.absPartIdx])101
{102
103
if (m_param->bEnableRecursionSkip && depth && m_modeDepth[depth - 1].bestMode)104
skipRecursion = md.bestMode && !md.bestMode->cu.getQtRootCbf(0);105
}106
- if (m_reusePartSize[cuGeom.absPartIdx] == SIZE_2Nx2N)107
+ if (m_param->analysisRefineLevel > 4 && m_reusePartSize[cuGeom.absPartIdx] == SIZE_2Nx2N)108
skipRectAmp = true && !!md.bestMode;109
}110
}111
112
else113
{114
mode.cu.copyFromPic(parentCTU, cuGeom, m_csp, false);115
- for (int part = 0; part < (int)parentCTU.getNumPartInter(cuGeom.absPartIdx); part++)116
+ uint32_t numPU = parentCTU.getNumPartInter(cuGeom.absPartIdx);117
+ for (uint32_t part = 0; part < numPU; part++)118
{119
PredictionUnit pu(mode.cu, cuGeom, part);120
- motionCompensation(mode.cu, pu, mode.predYuv, true, true);121
+ if (m_param->analysisRefineLevel == 10)122
+ {123
+ analysis_inter_data* interDataCTU = (analysis_inter_data*)m_frame->m_analysisData.interData;124
+ int cuIdx = (mode.cu.m_cuAddr * parentCTU.m_numPartitions) + cuGeom.absPartIdx;125
+ mode.cu.m_mergeFlag[pu.puAbsPartIdx] = interDataCTU->mergeFlag[cuIdx + part];126
+ mode.cu.setPUInterDir(interDataCTU->interDir[cuIdx + part], pu.puAbsPartIdx, part);127
+ for (int dir = 0; dir < m_slice->isInterB() + 1; dir++)128
+ {129
+ mode.cu.setPUMv(dir, interDataCTU->mv[dir][cuIdx + part], pu.puAbsPartIdx, part);130
+ mode.cu.setPURefIdx(dir, interDataCTU->refIdx[dir][cuIdx + part], pu.puAbsPartIdx, part);131
+ mode.cu.m_mvpIdx[dir][pu.puAbsPartIdx] = interDataCTU->mvpIdx[dir][cuIdx + part];132
+ }133
+ if (!mode.cu.m_mergeFlag[pu.puAbsPartIdx])134
+ {135
+ //AMVP136
+ MV mvc[(MD_ABOVE_LEFT + 1) * 2 + 2];137
+ mode.cu.getNeighbourMV(part, pu.puAbsPartIdx, mode.interNeighbours);138
+ for (int list = 0; list < m_slice->isInterB() + 1; list++)139
+ {140
+ int ref = mode.cu.m_refIdx[list][pu.puAbsPartIdx];141
+ if (ref == -1)142
+ continue;143
+ mode.cu.getPMV(mode.interNeighbours, list, ref, mode.amvpCand[list][ref], mvc);144
+ MV mvp = mode.amvpCand[list][ref][mode.cu.m_mvpIdx[list][pu.puAbsPartIdx]];145
+ mode.cu.m_mvd[list][pu.puAbsPartIdx] = mode.cu.m_mv[list][pu.puAbsPartIdx] - mvp;146
+ }147
+ }148
+ }149
+ motionCompensation(mode.cu, pu, mode.predYuv, true, (m_csp != X265_CSP_I400 && m_frame->m_fencPic->m_picCsp != X265_CSP_I400));150
}151
152
if (parentCTU.isSkipped(cuGeom.absPartIdx))153
154
encodeResAndCalcRdInterCU(mode, cuGeom);155
156
/* checkMerge2Nx2N function performs checkDQP after encoding residual, do the same */157
- bool mergeInter2Nx2N = size == SIZE_2Nx2N && parentCTU.m_mergeFlag[cuGeom.absPartIdx];158
+ bool mergeInter2Nx2N = size == SIZE_2Nx2N && mode.cu.m_mergeFlag[0];159
if (parentCTU.isSkipped(cuGeom.absPartIdx) || mergeInter2Nx2N)160
checkDQP(mode, cuGeom);161
}162
163
164
if (mightSplit)165
addSplitFlagCost(*md.bestMode, cuGeom.depth);166
+167
+ if (mightSplit && m_param->rdLevel < 5)168
+ checkDQPForSplitPred(*md.bestMode, cuGeom);169
}170
else171
{172
173
if (m_slice->m_pps->bUseDQP && nextDepth <= m_slice->m_pps->maxCuDQPDepth)174
nextQP = setLambdaFromQP(parentCTU, calculateQpforCuSize(parentCTU, childGeom));175
176
- qprdRefine(parentCTU, childGeom, nextQP, lqp);177
+ int lamdaQP = m_param->analysisRefineLevel == 10 ? nextQP : lqp;178
+ qprdRefine(parentCTU, childGeom, nextQP, lamdaQP);179
180
// Save best CU and pred data for this sub CU181
splitCU->copyPartFrom(nd.bestMode->cu, childGeom, subPartIdx);182
183
interMode.cu.setPredModeSubParts(MODE_INTER);184
int numPredDir = m_slice->isInterP() ? 1 : 2;185
186
- if (m_param->analysisMode == X265_ANALYSIS_LOAD && m_reuseInterDataCTU)187
+ if (m_param->analysisMode == X265_ANALYSIS_LOAD && m_reuseInterDataCTU && m_param->analysisRefineLevel > 1)188
{189
int refOffset = cuGeom.geomRecurId * 16 * numPredDir + partSize * numPredDir * 2;190
int index = 0;191
192
}193
interMode.sa8dCost = m_rdCost.calcRdSADCost((uint32_t)interMode.distortion, interMode.sa8dBits);194
195
- if (m_param->analysisMode == X265_ANALYSIS_SAVE && m_reuseInterDataCTU)196
+ if (m_param->analysisMode == X265_ANALYSIS_SAVE && m_reuseInterDataCTU && m_param->analysisRefineLevel > 1)197
{198
int refOffset = cuGeom.geomRecurId * 16 * numPredDir + partSize * numPredDir * 2;199
int index = 0;200
201
interMode.cu.setPredModeSubParts(MODE_INTER);202
int numPredDir = m_slice->isInterP() ? 1 : 2;203
204
- if (m_param->analysisMode == X265_ANALYSIS_LOAD && m_reuseInterDataCTU)205
+ if (m_param->analysisMode == X265_ANALYSIS_LOAD && m_reuseInterDataCTU && m_param->analysisRefineLevel > 1)206
{207
int refOffset = cuGeom.geomRecurId * 16 * numPredDir + partSize * numPredDir * 2;208
int index = 0;209
210
/* predInterSearch sets interMode.sa8dBits, but this is ignored */211
encodeResAndCalcRdInterCU(interMode, cuGeom);212
213
- if (m_param->analysisMode == X265_ANALYSIS_SAVE && m_reuseInterDataCTU)214
+ if (m_param->analysisMode == X265_ANALYSIS_SAVE && m_reuseInterDataCTU && m_param->analysisRefineLevel > 1)215
{216
int refOffset = cuGeom.geomRecurId * 16 * numPredDir + partSize * numPredDir * 2;217
int index = 0;218
219
{220
FrameData& curEncData = *m_frame->m_encData;221
double qp = baseQp >= 0 ? baseQp : curEncData.m_cuStat[ctu.m_cuAddr].baseQp;222
+223
+ if (m_param->analysisMultiPassDistortion && m_param->rc.bStatRead)224
+ {225
+ m_multipassAnalysis = (analysis2PassFrameData*)m_frame->m_analysis2Pass.analysisFramedata;226
+ if ((m_multipassAnalysis->threshold[ctu.m_cuAddr] < 0.9 || m_multipassAnalysis->threshold[ctu.m_cuAddr] > 1.1)227
+ && m_multipassAnalysis->highDistortionCtuCount && m_multipassAnalysis->lowDistortionCtuCount)228
+ qp += m_multipassAnalysis->offset[ctu.m_cuAddr];229
+ }230
+231
int loopIncr;232
if (m_param->rc.qgSize == 8)233
loopIncr = 8;234
x265_2.3.tar.gz/source/encoder/analysis.h -> x265_2.4.tar.gz/source/encoder/analysis.h
Changed
8
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Deepthi Nandakumar <deepthi@multicorewareinc.com>7
* Steve Borho <steve@borho.org>8
x265_2.3.tar.gz/source/encoder/api.cpp -> x265_2.4.tar.gz/source/encoder/api.cpp
Changed
49
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
9
10
x265_param save;11
Encoder* encoder = static_cast<Encoder*>(enc);12
- if (encoder->m_reconfigure) /* Reconfigure in progress */13
+ if (encoder->m_reconfigure || encoder->m_reconfigureRc) /* Reconfigure in progress */14
return 1;15
memcpy(&save, encoder->m_latestParam, sizeof(x265_param));16
int ret = encoder->reconfigureParam(encoder->m_latestParam, param_in);17
18
return -1;19
}20
}21
- encoder->m_reconfigure = true;22
+ if (encoder->m_reconfigureRc)23
+ {24
+ VPS saveVPS;25
+ memcpy(&saveVPS.ptl, &encoder->m_vps.ptl, sizeof(saveVPS.ptl));26
+ determineLevel(*encoder->m_latestParam, encoder->m_vps);27
+ if (saveVPS.ptl.profileIdc != encoder->m_vps.ptl.profileIdc || saveVPS.ptl.levelIdc != encoder->m_vps.ptl.levelIdc28
+ || saveVPS.ptl.tierFlag != encoder->m_vps.ptl.tierFlag)29
+ {30
+ x265_log(encoder->m_param, X265_LOG_WARNING, "Profile/Level/Tier has changed from %d/%d/%s to %d/%d/%s.Cannot reconfigure rate-control.\n",31
+ saveVPS.ptl.profileIdc, saveVPS.ptl.levelIdc, saveVPS.ptl.tierFlag ? "High" : "Main", encoder->m_vps.ptl.profileIdc,32
+ encoder->m_vps.ptl.levelIdc, encoder->m_vps.ptl.tierFlag ? "High" : "Main");33
+ encoder->m_reconfigureRc = false;34
+ }35
+ }36
+ else37
+ encoder->m_reconfigure = true;38
encoder->printReconfigureParams();39
}40
return ret;41
42
// encoder now owns these analysisData buffers.43
if (pic_in)44
{45
+ pic_in->analysisData.wt = NULL;46
pic_in->analysisData.intraData = NULL;47
pic_in->analysisData.interData = NULL;48
pic_in->analysis2Pass.analysisFramedata = NULL;49
x265_2.3.tar.gz/source/encoder/bitcost.cpp -> x265_2.4.tar.gz/source/encoder/bitcost.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/encoder/bitcost.h -> x265_2.4.tar.gz/source/encoder/bitcost.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/encoder/dpb.cpp -> x265_2.4.tar.gz/source/encoder/dpb.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/encoder/dpb.h -> x265_2.4.tar.gz/source/encoder/dpb.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/encoder/encoder.cpp -> x265_2.4.tar.gz/source/encoder/encoder.cpp
Changed
836
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
9
{10
m_aborted = false;11
m_reconfigure = false;12
+ m_reconfigureRc = false;13
m_encodedFrameNum = 0;14
m_pocLast = -1;15
m_curEncoder = 0;16
17
m_iFrameNum = 0;18
m_iPPSQpMinus26 = 0;19
m_rpsInSpsCount = 0;20
+ m_cB = 1.0;21
+ m_cR = 1.0;22
for (int i = 0; i < X265_MAX_FRAME_THREADS; i++)23
m_frameEncoder[i] = NULL;24
-25
MotionEstimate::initScales();26
-}27
28
+#if ENABLE_DYNAMIC_HDR1029
+ m_hdr10plus_api = hdr10plus_api_get();30
+#endif31
+32
+ m_prevTonemapPayload.payload = NULL;33
+}34
inline char *strcatFilename(const char *input, const char *suffix)35
{36
char *output = X265_MALLOC(char, strlen(input) + strlen(suffix) + 1);37
38
if (!name)39
name = defaultAnalysisFileName;40
const char* mode = m_param->analysisMode == X265_ANALYSIS_LOAD ? "rb" : "wb";41
- m_analysisFile = fopen(name, mode);42
+ m_analysisFile = x265_fopen(name, mode);43
if (!m_analysisFile)44
{45
- x265_log(NULL, X265_LOG_ERROR, "Analysis load/save: failed to open file %s\n", name);46
+ x265_log_file(NULL, X265_LOG_ERROR, "Analysis load/save: failed to open file %s\n", name);47
m_aborted = true;48
}49
}50
51
m_aborted = true;52
else53
{54
- m_analysisFileOut = fopen(temp, "wb");55
+ m_analysisFileOut = x265_fopen(temp, "wb");56
X265_FREE(temp);57
}58
if (!m_analysisFileOut)59
{60
- x265_log(NULL, X265_LOG_ERROR, "Analysis 2 pass: failed to open file %s\n", temp);61
+ x265_log_file(NULL, X265_LOG_ERROR, "Analysis 2 pass: failed to open file %s.temp\n", name);62
m_aborted = true;63
}64
}65
if (m_param->rc.bStatRead)66
{67
- m_analysisFileIn = fopen(name, "rb");68
+ m_analysisFileIn = x265_fopen(name, "rb");69
if (!m_analysisFileIn)70
{71
- x265_log(NULL, X265_LOG_ERROR, "Analysis 2 pass: failed to open file %s\n", name);72
+ x265_log_file(NULL, X265_LOG_ERROR, "Analysis 2 pass: failed to open file %s\n", name);73
m_aborted = true;74
}75
}76
77
}78
if (bError)79
{80
- x265_log(m_param, X265_LOG_ERROR, "failed to rename analysis stats file to \"%s\"\n", name);81
+ x265_log_file(m_param, X265_LOG_ERROR, "failed to rename analysis stats file to \"%s\"\n", name);82
}83
X265_FREE(temp);84
}85
86
free((char*)m_param->scalingLists);87
free((char*)m_param->numaPools);88
free((char*)m_param->masteringDisplayColorVolume);89
-90
+ free((char*)m_param->toneMapFile);91
PARAM_NS::x265_param_free(m_param);92
}93
}94
95
m_exportedPic = NULL;96
m_dpb->recycleUnreferenced();97
}98
-99
if (pic_in)100
{101
+ x265_sei_payload toneMap;102
+ toneMap.payload = NULL;103
+#if ENABLE_DYNAMIC_HDR10104
+ if (m_bToneMap)105
+ {106
+ uint8_t *cim = NULL;107
+ if (m_hdr10plus_api->hdr10plus_json_to_frame_cim(m_param->toneMapFile, pic_in->poc, cim))108
+ {109
+ toneMap.payload = (uint8_t*)x265_malloc(sizeof(uint8_t) * cim[0]);110
+ toneMap.payloadSize = cim[0];111
+ toneMap.payloadType = USER_DATA_REGISTERED_ITU_T_T35;112
+ memcpy(toneMap.payload, cim, toneMap.payloadSize);113
+ }114
+ }115
+#endif116
+117
if (pic_in->bitDepth < 8 || pic_in->bitDepth > 16)118
{119
x265_log(m_param, X265_LOG_ERROR, "Input bit depth (%d) must be between 8 and 16\n",120
121
{122
inFrame = new Frame;123
inFrame->m_encodeStartTime = x265_mdate();124
- x265_param* p = m_reconfigure ? m_latestParam : m_param;125
+ x265_param* p = (m_reconfigure || m_reconfigureRc) ? m_latestParam : m_param;126
if (inFrame->create(p, pic_in->quantOffsets))127
{128
/* the first PicYuv created is asked to generate the CU and block unit offset129
130
inFrame->m_userData = pic_in->userData;131
inFrame->m_pts = pic_in->pts;132
inFrame->m_forceqp = pic_in->forceqp;133
- inFrame->m_param = m_reconfigure ? m_latestParam : m_param;134
+ inFrame->m_param = (m_reconfigure || m_reconfigureRc) ? m_latestParam : m_param;135
136
- if (pic_in->userSEI.numPayloads)137
+ int toneMapEnable = 0;138
+ if (m_bToneMap && toneMap.payload)139
+ toneMapEnable = 1;140
+ int numPayloads = pic_in->userSEI.numPayloads + toneMapEnable;141
+ inFrame->m_userSEI.numPayloads = numPayloads;142
+143
+ if (inFrame->m_userSEI.numPayloads)144
{145
- int numPayloads = inFrame->m_userSEI.numPayloads = pic_in->userSEI.numPayloads;146
inFrame->m_userSEI.payloads = new x265_sei_payload[numPayloads];147
for (int i = 0; i < numPayloads; i++)148
{149
- int size = inFrame->m_userSEI.payloads[i].payloadSize = pic_in->userSEI.payloads[i].payloadSize;150
- inFrame->m_userSEI.payloads[i].payloadType = pic_in->userSEI.payloads[i].payloadType;151
+ x265_sei_payload input;152
+ if (i == (numPayloads - 1))153
+ input = toneMap;154
+ else155
+ input = pic_in->userSEI.payloads[i];156
+ int size = inFrame->m_userSEI.payloads[i].payloadSize = input.payloadSize;157
+ inFrame->m_userSEI.payloads[i].payloadType = input.payloadType;158
inFrame->m_userSEI.payloads[i].payload = new uint8_t[size];159
- memcpy(inFrame->m_userSEI.payloads[i].payload, pic_in->userSEI.payloads[i].payload, size);160
+ memcpy(inFrame->m_userSEI.payloads[i].payload, input.payload, size);161
}162
+ if (toneMap.payload)163
+ x265_free(toneMap.payload);164
}165
166
if (pic_in->quantOffsets != NULL)167
168
inFrame->m_analysisData.satdCost = inputPic->analysisData.satdCost;169
inFrame->m_analysisData.numCUsInFrame = inputPic->analysisData.numCUsInFrame;170
inFrame->m_analysisData.numPartitions = inputPic->analysisData.numPartitions;171
+ inFrame->m_analysisData.wt = inputPic->analysisData.wt;172
inFrame->m_analysisData.interData = inputPic->analysisData.interData;173
inFrame->m_analysisData.intraData = inputPic->analysisData.intraData;174
sliceType = inputPic->analysisData.sliceType;175
inFrame->m_lowres.bScenecut = !!inFrame->m_analysisData.bScenecut;176
inFrame->m_lowres.satdCost = inFrame->m_analysisData.satdCost;177
}178
+ if (m_reconfigureRc)179
+ inFrame->m_reconfigureRc = true;180
181
m_lookahead->addPicture(*inFrame, sliceType);182
m_numDelayedPic++;183
184
pic_out->analysisData.satdCost = outFrame->m_lowres.satdCost; 185
pic_out->analysisData.numCUsInFrame = outFrame->m_analysisData.numCUsInFrame;186
pic_out->analysisData.numPartitions = outFrame->m_analysisData.numPartitions;187
+ pic_out->analysisData.wt = outFrame->m_analysisData.wt;188
pic_out->analysisData.interData = outFrame->m_analysisData.interData;189
pic_out->analysisData.intraData = outFrame->m_analysisData.intraData;190
writeAnalysisFile(&pic_out->analysisData, *outFrame->m_encData);191
192
if (m_param->rc.bStatRead)193
readAnalysis2PassFile(&frameEnc->m_analysis2Pass, frameEnc->m_poc, frameEnc->m_lowres.sliceType);194
}195
+196
+ if (frameEnc->m_reconfigureRc && m_reconfigureRc)197
+ {198
+ memcpy(m_param, m_latestParam, sizeof(x265_param));199
+ m_rateControl->reconfigureRC();200
+ m_reconfigureRc = false;201
+ }202
+ if (frameEnc->m_reconfigureRc && !m_reconfigureRc)203
+ frameEnc->m_reconfigureRc = false;204
if (curEncoder->m_reconfigure)205
{206
/* One round robin cycle of FE reconfigure is complete */207
208
encParam->bIntraInBFrames = param->bIntraInBFrames;209
if (param->scalingLists && !encParam->scalingLists)210
encParam->scalingLists = strdup(param->scalingLists);211
+ /* VBV can't be turned ON if it wasn't ON to begin with and can't be turned OFF if it was ON to begin with*/212
+ if (param->rc.vbvMaxBitrate > 0 && param->rc.vbvBufferSize > 0 &&213
+ encParam->rc.vbvMaxBitrate > 0 && encParam->rc.vbvBufferSize > 0)214
+ {215
+ m_reconfigureRc |= encParam->rc.vbvMaxBitrate != param->rc.vbvMaxBitrate;216
+ m_reconfigureRc |= encParam->rc.vbvBufferSize != param->rc.vbvBufferSize;217
+ if (m_reconfigureRc && m_param->bEmitHRDSEI)218
+ x265_log(m_param, X265_LOG_WARNING, "VBV parameters cannot be changed when HRD is in use.\n");219
+ else220
+ {221
+ encParam->rc.vbvMaxBitrate = param->rc.vbvMaxBitrate;222
+ encParam->rc.vbvBufferSize = param->rc.vbvBufferSize;223
+ }224
+ }225
+ m_reconfigureRc |= encParam->rc.bitrate != param->rc.bitrate;226
+ encParam->rc.bitrate = param->rc.bitrate;227
+ m_reconfigureRc |= encParam->rc.rfConstant != param->rc.rfConstant;228
+ encParam->rc.rfConstant = param->rc.rfConstant; 229
+230
/* To add: Loop Filter/deblocking controls, transform skip, signhide require PPS to be resent */231
/* To add: SAO, temporal MVP, AMP, TU depths require SPS to be resent, at every CVS boundary */232
return x265_check_params(encParam);233
234
if (buffer)235
{236
sprintf(buffer, "x265 (build %d) - %s:%s - H.265/HEVC codec - "237
- "Copyright 2013-2016 (c) Multicoreware Inc - "238
+ "Copyright 2013-2017 (c) Multicoreware, Inc - "239
"http://x265.org - options: %s",240
X265_BUILD, PFX(version_str), PFX(build_info_str), opts);241
242
bs.resetBits();243
SEIuserDataUnregistered idsei;244
- idsei.m_payloadType = USER_DATA_UNREGISTERED;245
idsei.m_userData = (uint8_t*)buffer;246
- idsei.m_userDataLength = (uint32_t)strlen(buffer);247
+ idsei.setSize((uint32_t)strlen(buffer));248
idsei.write(bs, m_sps);249
bs.writeByteAlignment();250
list.serialize(NAL_UNIT_PREFIX_SEI, bs);251
252
253
pps->chromaQpOffset[0] = m_param->cbQpOffset;254
pps->chromaQpOffset[1] = m_param->crQpOffset;255
+ pps->pps_slice_chroma_qp_offsets_present_flag = m_param->bHDROpt;256
257
pps->bConstrainedIntraPred = m_param->bEnableConstrainedIntra;258
pps->bUseWeightPred = m_param->bEnableWeightedPred;259
260
/* some options make no sense if others are disabled */261
p->bSaoNonDeblocked &= p->bEnableSAO;262
p->bEnableTSkipFast &= p->bEnableTransformSkip;263
-264
+ p->bLimitSAO &= p->bEnableSAO;265
/* initialize the conformance window */266
m_conformanceWindow.bEnabled = false;267
m_conformanceWindow.rightOffset = 0;268
269
p->dynamicRd = 0;270
x265_log(p, X265_LOG_WARNING, "Dynamic-rd disabled, requires RD <= 4, VBV and aq-mode enabled\n");271
}272
+#ifdef ENABLE_DYNAMIC_HDR10273
+ if (m_param->bDhdr10opt && m_param->toneMapFile == NULL)274
+ {275
+ x265_log(p, X265_LOG_WARNING, "Disabling dhdr10-opt. dhdr10-info must be enabled.\n");276
+ m_param->bDhdr10opt = 0;277
+ }278
+279
+ if (m_param->toneMapFile)280
+ {281
+ if (!x265_fopen(p->toneMapFile, "r"))282
+ {283
+ x265_log(p, X265_LOG_ERROR, "Unable to open tone-map file.\n");284
+ m_bToneMap = 0;285
+ m_param->toneMapFile = NULL;286
+ m_aborted = true;287
+ }288
+ else289
+ m_bToneMap = 1;290
+ }291
+ else292
+ m_bToneMap = 0;293
+#else294
+ if (m_param->toneMapFile)295
+ {296
+ x265_log(p, X265_LOG_WARNING, "--dhdr10-info disabled. Enable dynamic HDR in cmake.\n");297
+ m_bToneMap = 0;298
+ m_param->toneMapFile = NULL;299
+ }300
+ else if (m_param->bDhdr10opt)301
+ {302
+ x265_log(p, X265_LOG_WARNING, "Disabling dhdr10-opt. dhdr10-info must be enabled.\n");303
+ m_param->bDhdr10opt = 0;304
+ }305
+#endif306
307
if (p->uhdBluray)308
{309
310
x265_log(p, X265_LOG_WARNING, "maxSlices can not be less than 1, force set to 1\n");311
p->maxSlices = 1;312
}313
-314
const uint32_t numRows = (p->sourceHeight + p->maxCUSize - 1) / p->maxCUSize;315
const uint32_t slicesLimit = X265_MIN(numRows, NALList::MAX_NAL_UNITS - 1);316
- if (p->maxSlices > numRows)317
+ if (p->maxSlices > slicesLimit)318
{319
x265_log(p, X265_LOG_WARNING, "maxSlices can not be more than min(rows, MAX_NAL_UNITS-1), force set to %d\n", slicesLimit);320
p->maxSlices = slicesLimit;321
}322
+ if (p->bHDROpt)323
+ {324
+ if (p->internalCsp != X265_CSP_I420 || p->internalBitDepth != 10 || p->vui.colorPrimaries != 9 ||325
+ p->vui.transferCharacteristics != 16 || p->vui.matrixCoeffs != 9)326
+ {327
+ x265_log(p, X265_LOG_ERROR, "Recommended Settings for HDR: colour primaries should be BT.2020,\n"328
+ " transfer characteristics should be SMPTE ST.2084,\n"329
+ " matrix coeffs should be BT.2020,\n"330
+ " the input video should be 10 bit 4:2:0\n"331
+ " Disabling offset tuning for HDR videos\n");332
+ p->bHDROpt = 0;333
+ }334
+ }335
}336
337
void Encoder::allocAnalysis(x265_analysis_data* analysis)338
339
analysis->interData = analysis->intraData = NULL;340
if (analysis->sliceType == X265_TYPE_IDR || analysis->sliceType == X265_TYPE_I)341
{342
+ if (m_param->analysisRefineLevel < 2)343
+ return;344
+345
analysis_intra_data *intraData = (analysis_intra_data*)analysis->intraData;346
CHECKED_MALLOC_ZERO(intraData, analysis_intra_data, 1);347
CHECKED_MALLOC(intraData->depth, uint8_t, analysis->numPartitions * analysis->numCUsInFrame);348
349
else350
{351
int numDir = analysis->sliceType == X265_TYPE_P ? 1 : 2;352
+ uint32_t numPlanes = m_param->internalCsp == X265_CSP_I400 ? 1 : 3;353
+ CHECKED_MALLOC_ZERO(analysis->wt, WeightParam, numPlanes * numDir);354
+ if (m_param->analysisRefineLevel < 2)355
+ return;356
+357
analysis_inter_data *interData = (analysis_inter_data*)analysis->interData;358
CHECKED_MALLOC_ZERO(interData, analysis_inter_data, 1);359
- CHECKED_MALLOC_ZERO(interData->ref, int32_t, analysis->numCUsInFrame * X265_MAX_PRED_MODE_PER_CTU * numDir);360
CHECKED_MALLOC(interData->depth, uint8_t, analysis->numPartitions * analysis->numCUsInFrame);361
CHECKED_MALLOC(interData->modes, uint8_t, analysis->numPartitions * analysis->numCUsInFrame);362
- CHECKED_MALLOC(interData->partSize, uint8_t, analysis->numPartitions * analysis->numCUsInFrame);363
- CHECKED_MALLOC(interData->mergeFlag, uint8_t, analysis->numPartitions * analysis->numCUsInFrame);364
- CHECKED_MALLOC_ZERO(interData->wt, WeightParam, 3 * numDir);365
+ if (m_param->analysisRefineLevel > 4)366
+ {367
+ CHECKED_MALLOC(interData->partSize, uint8_t, analysis->numPartitions * analysis->numCUsInFrame);368
+ CHECKED_MALLOC(interData->mergeFlag, uint8_t, analysis->numPartitions * analysis->numCUsInFrame);369
+ }370
+371
+ if (m_param->analysisRefineLevel == 10)372
+ {373
+ CHECKED_MALLOC(interData->interDir, uint8_t, analysis->numPartitions * analysis->numCUsInFrame);374
+ for (int dir = 0; dir < numDir; dir++)375
+ {376
+ CHECKED_MALLOC(interData->mvpIdx[dir], uint8_t, analysis->numPartitions * analysis->numCUsInFrame);377
+ CHECKED_MALLOC(interData->refIdx[dir], int8_t, analysis->numPartitions * analysis->numCUsInFrame);378
+ CHECKED_MALLOC(interData->mv[dir], MV, analysis->numPartitions * analysis->numCUsInFrame);379
+ }380
+381
+ /* Allocate intra in inter */382
+ if (analysis->sliceType == X265_TYPE_P || m_param->bIntraInBFrames)383
+ {384
+ analysis_intra_data *intraData = (analysis_intra_data*)analysis->intraData;385
+ CHECKED_MALLOC_ZERO(intraData, analysis_intra_data, 1);386
+ CHECKED_MALLOC(intraData->modes, uint8_t, analysis->numPartitions * analysis->numCUsInFrame);387
+ CHECKED_MALLOC(intraData->chromaModes, uint8_t, analysis->numPartitions * analysis->numCUsInFrame);388
+ analysis->intraData = intraData;389
+ }390
+ }391
+ else392
+ CHECKED_MALLOC_ZERO(interData->ref, int32_t, analysis->numCUsInFrame * X265_MAX_PRED_MODE_PER_CTU * numDir);393
+394
analysis->interData = interData;395
}396
return;397
398
399
void Encoder::freeAnalysis(x265_analysis_data* analysis)400
{401
+ /* Early exit freeing weights alone if level is 1 (when there is no analysis inter/intra) */402
+ if (analysis->sliceType > X265_TYPE_I && analysis->wt)403
+ X265_FREE(analysis->wt);404
+ if (m_param->analysisRefineLevel < 2)405
+ return;406
+407
if (analysis->intraData)408
{409
+ if (m_param->analysisRefineLevel < 2)410
+ return;411
+412
X265_FREE(((analysis_intra_data*)analysis->intraData)->depth);413
X265_FREE(((analysis_intra_data*)analysis->intraData)->modes);414
X265_FREE(((analysis_intra_data*)analysis->intraData)->partSizes);415
X265_FREE(((analysis_intra_data*)analysis->intraData)->chromaModes);416
X265_FREE(analysis->intraData);417
}418
- else419
+ else if (analysis->interData)420
{421
- X265_FREE(((analysis_inter_data*)analysis->interData)->ref);422
X265_FREE(((analysis_inter_data*)analysis->interData)->depth);423
X265_FREE(((analysis_inter_data*)analysis->interData)->modes);424
- X265_FREE(((analysis_inter_data*)analysis->interData)->mergeFlag);425
- X265_FREE(((analysis_inter_data*)analysis->interData)->partSize);426
- X265_FREE(((analysis_inter_data*)analysis->interData)->wt);427
+ if (m_param->analysisRefineLevel > 4)428
+ {429
+ X265_FREE(((analysis_inter_data*)analysis->interData)->mergeFlag);430
+ X265_FREE(((analysis_inter_data*)analysis->interData)->partSize);431
+ }432
+433
+ if (m_param->analysisRefineLevel == 10)434
+ {435
+ X265_FREE(((analysis_inter_data*)analysis->interData)->interDir);436
+ int numDir = analysis->sliceType == X265_TYPE_P ? 1 : 2;437
+ for (int dir = 0; dir < numDir; dir++)438
+ {439
+ X265_FREE(((analysis_inter_data*)analysis->interData)->mvpIdx[dir]);440
+ X265_FREE(((analysis_inter_data*)analysis->interData)->refIdx[dir]);441
+ X265_FREE(((analysis_inter_data*)analysis->interData)->mv[dir]);442
+ }443
+ if (analysis->sliceType == P_SLICE || m_param->bIntraInBFrames)444
+ {445
+ X265_FREE(((analysis_intra_data*)analysis->intraData)->modes);446
+ X265_FREE(((analysis_intra_data*)analysis->intraData)->chromaModes);447
+ X265_FREE(analysis->intraData);448
+ }449
+ }450
+ else451
+ X265_FREE(((analysis_inter_data*)analysis->interData)->ref);452
+453
X265_FREE(analysis->interData);454
}455
}456
457
458
if (analysis->sliceType == X265_TYPE_IDR || analysis->sliceType == X265_TYPE_I)459
{460
+ analysis->sliceType = X265_TYPE_I;461
+ if (m_param->analysisRefineLevel < 2)462
+ return;463
+464
uint8_t *tempBuf = NULL, *depthBuf = NULL, *modeBuf = NULL, *partSizes = NULL;465
466
tempBuf = X265_MALLOC(uint8_t, depthBytes * 3);467
468
}469
X265_FREAD(((analysis_intra_data *)analysis->intraData)->modes, sizeof(uint8_t), analysis->numCUsInFrame * analysis->numPartitions, m_analysisFile);470
X265_FREE(tempBuf);471
- analysis->sliceType = X265_TYPE_I;472
consumedBytes += frameRecordSize;473
}474
475
else476
{477
+ uint32_t numDir = analysis->sliceType == X265_TYPE_P ? 1 : 2;478
+ uint32_t numPlanes = m_param->internalCsp == X265_CSP_I400 ? 1 : 3;479
+ X265_FREAD((WeightParam*)analysis->wt, sizeof(WeightParam), numPlanes * numDir, m_analysisFile);480
+ if (m_param->analysisRefineLevel < 2)481
+ return;482
+483
uint8_t *tempBuf = NULL, *depthBuf = NULL, *modeBuf = NULL, *partSize = NULL, *mergeFlag = NULL;484
+ uint8_t *interDir = NULL, *chromaDir = NULL, *mvpIdx[2];485
+ MV* mv[2];486
+ int8_t* refIdx[2];487
+488
+ int numBuf = m_param->analysisRefineLevel > 4 ? 4 : 2;489
+ bool bIntraInInter = false;490
+ if (m_param->analysisRefineLevel == 10)491
+ {492
+ numBuf++;493
+ bIntraInInter = (analysis->sliceType == X265_TYPE_P || m_param->bIntraInBFrames);494
+ if (bIntraInInter) numBuf++;495
+ }496
497
- tempBuf = X265_MALLOC(uint8_t, depthBytes * 4);498
- X265_FREAD(tempBuf, sizeof(uint8_t), depthBytes * 4, m_analysisFile);499
+ tempBuf = X265_MALLOC(uint8_t, depthBytes * numBuf);500
+ X265_FREAD(tempBuf, sizeof(uint8_t), depthBytes * numBuf, m_analysisFile);501
502
depthBuf = tempBuf;503
modeBuf = tempBuf + depthBytes;504
- partSize = modeBuf + depthBytes;505
- mergeFlag = partSize + depthBytes;506
+ if (m_param->analysisRefineLevel > 4)507
+ {508
+ partSize = modeBuf + depthBytes;509
+ mergeFlag = partSize + depthBytes;510
+ if (m_param->analysisRefineLevel == 10)511
+ {512
+ interDir = mergeFlag + depthBytes;513
+ if (bIntraInInter) chromaDir = interDir + depthBytes;514
+ for (uint32_t i = 0; i < numDir; i++)515
+ {516
+ mvpIdx[i] = X265_MALLOC(uint8_t, depthBytes * 3);517
+ X265_FREAD(mvpIdx[i], sizeof(uint8_t), depthBytes, m_analysisFile);518
+ refIdx[i] = X265_MALLOC(int8_t, depthBytes);519
+ X265_FREAD(refIdx[i], sizeof(int8_t), depthBytes, m_analysisFile);520
+ mv[i] = X265_MALLOC(MV, depthBytes);521
+ X265_FREAD(mv[i], sizeof(MV), depthBytes, m_analysisFile);522
+ }523
+ }524
+ }525
526
size_t count = 0;527
for (uint32_t d = 0; d < depthBytes; d++)528
529
int bytes = analysis->numPartitions >> (depthBuf[d] * 2);530
memset(&((analysis_inter_data *)analysis->interData)->depth[count], depthBuf[d], bytes);531
memset(&((analysis_inter_data *)analysis->interData)->modes[count], modeBuf[d], bytes);532
- memset(&((analysis_inter_data *)analysis->interData)->partSize[count], partSize[d], bytes);533
- memset(&((analysis_inter_data *)analysis->interData)->mergeFlag[count], mergeFlag[d], bytes);534
+ if (m_param->analysisRefineLevel > 4)535
+ {536
+ memset(&((analysis_inter_data *)analysis->interData)->partSize[count], partSize[d], bytes);537
+ int numPU = nbPartsTable[(int)partSize[d]];538
+ for (int pu = 0; pu < numPU; pu++)539
+ {540
+ if (pu) d++;541
+ ((analysis_inter_data *)analysis->interData)->mergeFlag[count + pu] = mergeFlag[d];542
+ if (m_param->analysisRefineLevel == 10)543
+ {544
+ ((analysis_inter_data *)analysis->interData)->interDir[count + pu] = interDir[d];545
+ for (uint32_t i = 0; i < numDir; i++)546
+ {547
+ ((analysis_inter_data *)analysis->interData)->mvpIdx[i][count + pu] = mvpIdx[i][d];548
+ ((analysis_inter_data *)analysis->interData)->refIdx[i][count + pu] = refIdx[i][d];549
+ memcpy(&((analysis_inter_data *)analysis->interData)->mv[i][count + pu], &mv[i][d], sizeof(MV));550
+ }551
+ }552
+ }553
+ if (m_param->analysisRefineLevel == 10 && bIntraInInter)554
+ memset(&((analysis_intra_data *)analysis->intraData)->chromaModes[count], chromaDir[d], bytes);555
+ }556
count += bytes;557
}558
559
X265_FREE(tempBuf);560
561
- int numDir = analysis->sliceType == X265_TYPE_P ? 1 : 2;562
- X265_FREAD(((analysis_inter_data *)analysis->interData)->ref, sizeof(int32_t), analysis->numCUsInFrame * X265_MAX_PRED_MODE_PER_CTU * numDir, m_analysisFile);563
- uint32_t numPlanes = m_param->internalCsp == X265_CSP_I400 ? 1 : 3;564
- X265_FREAD(((analysis_inter_data *)analysis->interData)->wt, sizeof(WeightParam), numPlanes * numDir, m_analysisFile);565
+ if (m_param->analysisRefineLevel == 10)566
+ {567
+ for (uint32_t i = 0; i < numDir; i++)568
+ {569
+ X265_FREE(mvpIdx[i]);570
+ X265_FREE(refIdx[i]);571
+ X265_FREE(mv[i]);572
+ }573
+ if (bIntraInInter)574
+ X265_FREAD(((analysis_intra_data *)analysis->intraData)->modes, sizeof(uint8_t), analysis->numCUsInFrame * analysis->numPartitions, m_analysisFile);575
+ }576
+ else577
+ X265_FREAD(((analysis_inter_data *)analysis->interData)->ref, sizeof(int32_t), analysis->numCUsInFrame * X265_MAX_PRED_MODE_PER_CTU * numDir, m_analysisFile);578
+579
consumedBytes += frameRecordSize;580
if (numDir == 1)581
totalConsumedBytes = consumedBytes;582
583
}\584
585
uint32_t depthBytes = 0;586
- if (analysis->sliceType == X265_TYPE_IDR || analysis->sliceType == X265_TYPE_I)587
+ uint32_t numDir, numPlanes;588
+ bool bIntraInInter = false;589
+590
+ /* calculate frameRecordSize */591
+ analysis->frameRecordSize = sizeof(analysis->frameRecordSize) + sizeof(depthBytes) + sizeof(analysis->poc) + sizeof(analysis->sliceType) +592
+ sizeof(analysis->numCUsInFrame) + sizeof(analysis->numPartitions) + sizeof(analysis->bScenecut) + sizeof(analysis->satdCost);593
+ if (analysis->sliceType > X265_TYPE_I)594
{595
- for (uint32_t cuAddr = 0; cuAddr < analysis->numCUsInFrame; cuAddr++)596
+ numDir = (analysis->sliceType == X265_TYPE_P) ? 1 : 2;597
+ numPlanes = m_param->internalCsp == X265_CSP_I400 ? 1 : 3;598
+ analysis->frameRecordSize += sizeof(WeightParam) * numPlanes * numDir;599
+ }600
+601
+ if (m_param->analysisRefineLevel > 1)602
+ {603
+ if (analysis->sliceType == X265_TYPE_IDR || analysis->sliceType == X265_TYPE_I)604
{605
- uint8_t depth = 0;606
- uint8_t mode = 0;607
- uint8_t partSize = 0;608
+ for (uint32_t cuAddr = 0; cuAddr < analysis->numCUsInFrame; cuAddr++)609
+ {610
+ uint8_t depth = 0;611
+ uint8_t mode = 0;612
+ uint8_t partSize = 0;613
614
- CUData* ctu = curEncData.getPicCTU(cuAddr);615
- analysis_intra_data* intraDataCTU = (analysis_intra_data*)analysis->intraData;616
+ CUData* ctu = curEncData.getPicCTU(cuAddr);617
+ analysis_intra_data* intraDataCTU = (analysis_intra_data*)analysis->intraData;618
619
- for (uint32_t absPartIdx = 0; absPartIdx < ctu->m_numPartitions; depthBytes++)620
- {621
- depth = ctu->m_cuDepth[absPartIdx];622
- intraDataCTU->depth[depthBytes] = depth;623
+ for (uint32_t absPartIdx = 0; absPartIdx < ctu->m_numPartitions; depthBytes++)624
+ {625
+ depth = ctu->m_cuDepth[absPartIdx];626
+ intraDataCTU->depth[depthBytes] = depth;627
628
- mode = ctu->m_chromaIntraDir[absPartIdx];629
- intraDataCTU->chromaModes[depthBytes] = mode;630
+ mode = ctu->m_chromaIntraDir[absPartIdx];631
+ intraDataCTU->chromaModes[depthBytes] = mode;632
633
- partSize = ctu->m_partSize[absPartIdx];634
- intraDataCTU->partSizes[depthBytes] = partSize;635
+ partSize = ctu->m_partSize[absPartIdx];636
+ intraDataCTU->partSizes[depthBytes] = partSize;637
638
- absPartIdx += ctu->m_numPartitions >> (depth * 2);639
+ absPartIdx += ctu->m_numPartitions >> (depth * 2);640
+ }641
+ memcpy(&intraDataCTU->modes[ctu->m_cuAddr * ctu->m_numPartitions], ctu->m_lumaIntraDir, sizeof(uint8_t)* ctu->m_numPartitions);642
}643
- memcpy(&intraDataCTU->modes[ctu->m_cuAddr * ctu->m_numPartitions], ctu->m_lumaIntraDir, sizeof(uint8_t)* ctu->m_numPartitions);644
}645
- }646
- else647
- {648
- for (uint32_t cuAddr = 0; cuAddr < analysis->numCUsInFrame; cuAddr++)649
+ else650
{651
- uint8_t depth = 0;652
- uint8_t predMode = 0;653
- uint8_t partSize = 0;654
- uint8_t mergeFlag = 0;655
-656
- CUData* ctu = curEncData.getPicCTU(cuAddr);657
- analysis_inter_data* interDataCTU = (analysis_inter_data*)analysis->interData;658
-659
- for (uint32_t absPartIdx = 0; absPartIdx < ctu->m_numPartitions; depthBytes++)660
+ bIntraInInter = (analysis->sliceType == X265_TYPE_P || m_param->bIntraInBFrames);661
+ for (uint32_t cuAddr = 0; cuAddr < analysis->numCUsInFrame; cuAddr++)662
{663
- depth = ctu->m_cuDepth[absPartIdx];664
- interDataCTU->depth[depthBytes] = depth;665
+ uint8_t depth = 0;666
+ uint8_t predMode = 0;667
+ uint8_t partSize = 0;668
+669
+ CUData* ctu = curEncData.getPicCTU(cuAddr);670
+ analysis_inter_data* interDataCTU = (analysis_inter_data*)analysis->interData;671
+ analysis_intra_data* intraDataCTU = (analysis_intra_data*)analysis->intraData;672
673
- predMode = ctu->m_predMode[absPartIdx];674
- if (ctu->m_refIdx[1][absPartIdx] != -1)675
- predMode = 4; // used as indiacator if the block is coded as bidir676
+ for (uint32_t absPartIdx = 0; absPartIdx < ctu->m_numPartitions; depthBytes++)677
+ {678
+ depth = ctu->m_cuDepth[absPartIdx];679
+ interDataCTU->depth[depthBytes] = depth;680
681
- interDataCTU->modes[depthBytes] = predMode;682
+ predMode = ctu->m_predMode[absPartIdx];683
+ if (m_param->analysisRefineLevel != 10 && ctu->m_refIdx[1][absPartIdx] != -1)684
+ predMode = 4; // used as indiacator if the block is coded as bidir685
686
- partSize = ctu->m_partSize[absPartIdx];687
- interDataCTU->partSize[depthBytes] = partSize;688
+ interDataCTU->modes[depthBytes] = predMode;689
690
- mergeFlag = ctu->m_mergeFlag[absPartIdx];691
- interDataCTU->mergeFlag[depthBytes] = mergeFlag;692
+ if (m_param->analysisRefineLevel > 4)693
+ {694
+ partSize = ctu->m_partSize[absPartIdx];695
+ interDataCTU->partSize[depthBytes] = partSize;696
697
- absPartIdx += ctu->m_numPartitions >> (depth * 2);698
+ /* Store per PU data */699
+ uint32_t numPU = nbPartsTable[(int)partSize];700
+ for (uint32_t puIdx = 0; puIdx < numPU; puIdx++)701
+ {702
+ uint32_t puabsPartIdx = ctu->getPUOffset(puIdx, absPartIdx) + absPartIdx;703
+ if (puIdx) depthBytes++;704
+ interDataCTU->mergeFlag[depthBytes] = ctu->m_mergeFlag[puabsPartIdx];705
+706
+ if (m_param->analysisRefineLevel == 10)707
+ {708
+ interDataCTU->interDir[depthBytes] = ctu->m_interDir[puabsPartIdx];709
+ for (uint32_t dir = 0; dir < numDir; dir++)710
+ {711
+ interDataCTU->mvpIdx[dir][depthBytes] = ctu->m_mvpIdx[dir][puabsPartIdx];712
+ interDataCTU->refIdx[dir][depthBytes] = ctu->m_refIdx[dir][puabsPartIdx];713
+ interDataCTU->mv[dir][depthBytes] = ctu->m_mv[dir][puabsPartIdx];714
+ }715
+ }716
+ }717
+ if (m_param->analysisRefineLevel == 10 && bIntraInInter)718
+ intraDataCTU->chromaModes[depthBytes] = ctu->m_chromaIntraDir[absPartIdx];719
+ }720
+ absPartIdx += ctu->m_numPartitions >> (depth * 2);721
+ }722
+ if (m_param->analysisRefineLevel == 10 && bIntraInInter)723
+ memcpy(&intraDataCTU->modes[ctu->m_cuAddr * ctu->m_numPartitions], ctu->m_lumaIntraDir, sizeof(uint8_t)* ctu->m_numPartitions);724
}725
}726
- }727
728
- /* calculate frameRecordSize */729
- analysis->frameRecordSize = sizeof(analysis->frameRecordSize) + sizeof(depthBytes) + sizeof(analysis->poc) + sizeof(analysis->sliceType) +730
- sizeof(analysis->numCUsInFrame) + sizeof(analysis->numPartitions) + sizeof(analysis->bScenecut) + sizeof(analysis->satdCost);731
- if (analysis->sliceType == X265_TYPE_IDR || analysis->sliceType == X265_TYPE_I)732
- analysis->frameRecordSize += sizeof(uint8_t)* analysis->numCUsInFrame * analysis->numPartitions + depthBytes * 3;733
- else734
- {735
- int numDir = (analysis->sliceType == X265_TYPE_P) ? 1 : 2;736
- analysis->frameRecordSize += depthBytes * 4;737
- analysis->frameRecordSize += sizeof(int32_t)* analysis->numCUsInFrame * X265_MAX_PRED_MODE_PER_CTU * numDir;738
- analysis->frameRecordSize += sizeof(WeightParam)* 3 * numDir;739
+ if (analysis->sliceType == X265_TYPE_IDR || analysis->sliceType == X265_TYPE_I)740
+ analysis->frameRecordSize += sizeof(uint8_t)* analysis->numCUsInFrame * analysis->numPartitions + depthBytes * 3;741
+ else742
+ {743
+ /* Add sizeof depth, modes, partSize, mergeFlag */744
+ analysis->frameRecordSize += depthBytes * 2;745
+ if (m_param->analysisRefineLevel > 4)746
+ analysis->frameRecordSize += (depthBytes * 2);747
+748
+ if (m_param->analysisRefineLevel == 10)749
+ {750
+ /* Add Size of interDir, mvpIdx, refIdx, mv, luma and chroma modes */751
+ analysis->frameRecordSize += depthBytes;752
+ analysis->frameRecordSize += sizeof(uint8_t)* depthBytes * numDir;753
+ analysis->frameRecordSize += sizeof(int8_t)* depthBytes * numDir;754
+ analysis->frameRecordSize += sizeof(MV)* depthBytes * numDir;755
+ if (bIntraInInter)756
+ analysis->frameRecordSize += sizeof(uint8_t)* analysis->numCUsInFrame * analysis->numPartitions + depthBytes;757
+ }758
+ else759
+ analysis->frameRecordSize += sizeof(int32_t)* analysis->numCUsInFrame * X265_MAX_PRED_MODE_PER_CTU * numDir;760
+ }761
}762
X265_FWRITE(&analysis->frameRecordSize, sizeof(uint32_t), 1, m_analysisFile);763
X265_FWRITE(&depthBytes, sizeof(uint32_t), 1, m_analysisFile);764
765
X265_FWRITE(&analysis->satdCost, sizeof(int64_t), 1, m_analysisFile);766
X265_FWRITE(&analysis->numCUsInFrame, sizeof(int), 1, m_analysisFile);767
X265_FWRITE(&analysis->numPartitions, sizeof(int), 1, m_analysisFile);768
+ if (analysis->sliceType > X265_TYPE_I)769
+ X265_FWRITE((WeightParam*)analysis->wt, sizeof(WeightParam), numPlanes * numDir, m_analysisFile);770
+771
+ if (m_param->analysisRefineLevel < 2)772
+ return;773
774
if (analysis->sliceType == X265_TYPE_IDR || analysis->sliceType == X265_TYPE_I)775
{776
777
}778
else779
{780
- int numDir = analysis->sliceType == X265_TYPE_P ? 1 : 2;781
X265_FWRITE(((analysis_inter_data*)analysis->interData)->depth, sizeof(uint8_t), depthBytes, m_analysisFile);782
X265_FWRITE(((analysis_inter_data*)analysis->interData)->modes, sizeof(uint8_t), depthBytes, m_analysisFile);783
- X265_FWRITE(((analysis_inter_data*)analysis->interData)->partSize, sizeof(uint8_t), depthBytes, m_analysisFile);784
- X265_FWRITE(((analysis_inter_data*)analysis->interData)->mergeFlag, sizeof(uint8_t), depthBytes, m_analysisFile);785
- X265_FWRITE(((analysis_inter_data*)analysis->interData)->ref, sizeof(int32_t), analysis->numCUsInFrame * X265_MAX_PRED_MODE_PER_CTU * numDir, m_analysisFile);786
- uint32_t numPlanes = m_param->internalCsp == X265_CSP_I400 ? 1 : 3;787
- X265_FWRITE(((analysis_inter_data*)analysis->interData)->wt, sizeof(WeightParam), numPlanes * numDir, m_analysisFile);788
+ if (m_param->analysisRefineLevel > 4)789
+ {790
+ X265_FWRITE(((analysis_inter_data*)analysis->interData)->partSize, sizeof(uint8_t), depthBytes, m_analysisFile);791
+ X265_FWRITE(((analysis_inter_data*)analysis->interData)->mergeFlag, sizeof(uint8_t), depthBytes, m_analysisFile);792
+ if (m_param->analysisRefineLevel == 10)793
+ {794
+ X265_FWRITE(((analysis_inter_data*)analysis->interData)->interDir, sizeof(uint8_t), depthBytes, m_analysisFile);795
+ if (bIntraInInter) X265_FWRITE(((analysis_intra_data*)analysis->intraData)->chromaModes, sizeof(uint8_t), depthBytes, m_analysisFile);796
+ for (uint32_t dir = 0; dir < numDir; dir++)797
+ {798
+ X265_FWRITE(((analysis_inter_data*)analysis->interData)->mvpIdx[dir], sizeof(uint8_t), depthBytes, m_analysisFile);799
+ X265_FWRITE(((analysis_inter_data*)analysis->interData)->refIdx[dir], sizeof(int8_t), depthBytes, m_analysisFile);800
+ X265_FWRITE(((analysis_inter_data*)analysis->interData)->mv[dir], sizeof(MV), depthBytes, m_analysisFile);801
+ }802
+ if (bIntraInInter)803
+ X265_FWRITE(((analysis_intra_data*)analysis->intraData)->modes, sizeof(uint8_t), analysis->numCUsInFrame * analysis->numPartitions, m_analysisFile);804
+ }805
+ }806
+ if (m_param->analysisRefineLevel != 10)807
+ X265_FWRITE(((analysis_inter_data*)analysis->interData)->ref, sizeof(int32_t), analysis->numCUsInFrame * X265_MAX_PRED_MODE_PER_CTU * numDir, m_analysisFile);808
+809
}810
#undef X265_FWRITE811
}812
+813
void Encoder::writeAnalysis2PassFile(x265_analysis_2Pass* analysis2Pass, FrameData &curEncData, int slicetype)814
{815
#define X265_FWRITE(val, size, writeSize, fileOffset)\816
817
818
void Encoder::printReconfigureParams()819
{820
- if (!m_reconfigure)821
+ if (!(m_reconfigure || m_reconfigureRc))822
return;823
x265_param* oldParam = m_param;824
x265_param* newParam = m_latestParam;825
826
TOOLCMP(oldParam->maxNumMergeCand, newParam->maxNumMergeCand, "max-merge=%d to %d\n");827
TOOLCMP(oldParam->bIntraInBFrames, newParam->bIntraInBFrames, "b-intra=%d to %d\n");828
TOOLCMP(oldParam->scalingLists, newParam->scalingLists, "scalinglists=%s to %s\n");829
+ TOOLCMP(oldParam->rc.vbvMaxBitrate, newParam->rc.vbvMaxBitrate, "vbv-maxrate=%d to %d\n");830
+ TOOLCMP(oldParam->rc.vbvBufferSize, newParam->rc.vbvBufferSize, "vbv-bufsize=%d to %d\n");831
+ TOOLCMP(oldParam->rc.bitrate, newParam->rc.bitrate, "bitrate=%d to %d\n");832
+ TOOLCMP(oldParam->rc.rfConstant, newParam->rc.rfConstant, "crf=%f to %f\n");833
}834
835
bool Encoder::computeSPSRPSIndex()836
x265_2.3.tar.gz/source/encoder/encoder.h -> x265_2.4.tar.gz/source/encoder/encoder.h
Changed
57
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
9
#include "nal.h"10
#include "framedata.h"11
12
-struct x265_encoder {};13
+#ifdef ENABLE_DYNAMIC_HDR1014
+ #include "dynamicHDR10\hdr10plus.h"15
+#endif16
17
+struct x265_encoder {};18
namespace X265_NS {19
// private namespace20
extern const char g_sliceTypeToChar[3];21
22
bool m_bZeroLatency; // x265_encoder_encode() returns NALs for the input picture, zero lag23
bool m_aborted; // fatal error detected24
bool m_reconfigure; // Encoder reconfigure in progress25
+ bool m_reconfigureRc;26
27
/* Begin intra refresh when one not in progress or else begin one as soon as the current 28
* one is done. Requires bIntraRefresh to be set.*/29
30
31
Lock m_rpsInSpsLock;32
int m_rpsInSpsCount;33
+ /* For HDR*/34
+ double m_cB;35
+ double m_cR;36
+37
+ int m_bToneMap; // Enables tone-mapping38
+39
+#ifdef ENABLE_DYNAMIC_HDR1040
+ const hdr10plus_api *m_hdr10plus_api;41
+#endif42
+43
+ x265_sei_payload m_prevTonemapPayload;44
45
Encoder();46
- ~Encoder() {}47
+ ~Encoder()48
+ {49
+#ifdef ENABLE_DYNAMIC_HDR1050
+ if (m_prevTonemapPayload.payload != NULL)51
+ X265_FREE(m_prevTonemapPayload.payload);52
+#endif53
+ };54
55
void create();56
void stopJobs();57
x265_2.3.tar.gz/source/encoder/entropy.cpp -> x265_2.4.tar.gz/source/encoder/entropy.cpp
Changed
29
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
9
10
WRITE_SVLC(pps.chromaQpOffset[0], "pps_cb_qp_offset");11
WRITE_SVLC(pps.chromaQpOffset[1], "pps_cr_qp_offset");12
- WRITE_FLAG(0, "pps_slice_chroma_qp_offsets_present_flag");13
+ WRITE_FLAG(pps.pps_slice_chroma_qp_offsets_present_flag, "pps_slice_chroma_qp_offsets_present_flag");14
15
WRITE_FLAG(pps.bUseWeightPred, "weighted_pred_flag");16
WRITE_FLAG(pps.bUseWeightedBiPred, "weighted_bipred_flag");17
18
int code = sliceQp - (slice.m_iPPSQpMinus26 + 26);19
WRITE_SVLC(code, "slice_qp_delta");20
21
+ if (slice.m_pps->pps_slice_chroma_qp_offsets_present_flag)22
+ {23
+ WRITE_SVLC(slice.m_chromaQpOffset[0], "slice_cb_qp_offset");24
+ WRITE_SVLC(slice.m_chromaQpOffset[1], "slice_cr_qp_offset");25
+ }26
// TODO: Enable when pps_loop_filter_across_slices_enabled_flag==127
// We didn't support filter across slice board, so disable it now28
29
x265_2.3.tar.gz/source/encoder/entropy.h -> x265_2.4.tar.gz/source/encoder/entropy.h
Changed
8
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/encoder/frameencoder.cpp -> x265_2.4.tar.gz/source/encoder/frameencoder.cpp
Changed
163
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Chung Shin Yee <shinyee@multicorewareinc.com>7
* Min Chen <chenm003@163.com>8
9
10
WeightParam* reuseWP = NULL;11
if (m_param->analysisMode && (bUseWeightP || bUseWeightB))12
- reuseWP = ((analysis_inter_data*)m_frame->m_analysisData.interData)->wt;13
+ reuseWP = (WeightParam*)m_frame->m_analysisData.wt;14
15
if (bUseWeightP || bUseWeightB)16
{17
18
/* Get the QP for this frame from rate control. This call may block until19
* frames ahead of it in encode order have called rateControlEnd() */20
m_rce.encodeOrder = m_frame->m_encodeOrder;21
+ bool payloadChange = false;22
+ bool writeSei = true;23
+ if (m_param->bDhdr10opt)24
+ {25
+ for (int i = 0; i < m_frame->m_userSEI.numPayloads; i++)26
+ {27
+ x265_sei_payload *payload = &m_frame->m_userSEI.payloads[i];28
+ if(payload->payloadType == USER_DATA_REGISTERED_ITU_T_T35)29
+ {30
+ if (m_top->m_prevTonemapPayload.payload != NULL && payload->payloadSize == m_top->m_prevTonemapPayload.payloadSize)31
+ {32
+ if (memcmp(m_top->m_prevTonemapPayload.payload, payload->payload, payload->payloadSize) != 0)33
+ payloadChange = true;34
+ }35
+ else36
+ {37
+ payloadChange = true;38
+ if (m_top->m_prevTonemapPayload.payload != NULL)39
+ x265_free(m_top->m_prevTonemapPayload.payload);40
+ m_top->m_prevTonemapPayload.payload = (uint8_t*)x265_malloc(sizeof(uint8_t) * payload->payloadSize);41
+ }42
+43
+ if (payloadChange)44
+ {45
+ m_top->m_prevTonemapPayload.payloadType = payload->payloadType;46
+ m_top->m_prevTonemapPayload.payloadSize = payload->payloadSize;47
+ memcpy(m_top->m_prevTonemapPayload.payload, payload->payload, payload->payloadSize);48
+ }49
+50
+ bool isIDR = m_frame->m_lowres.sliceType == X265_TYPE_IDR;51
+ writeSei = payloadChange || isIDR;52
+ }53
+ }54
+ }55
int qp = m_top->m_rateControl->rateControlStart(m_frame, &m_rce, m_top);56
m_rce.newQp = qp;57
58
59
60
/* Clip slice QP to 0-51 spec range before encoding */61
slice->m_sliceQp = x265_clip3(-QP_BD_OFFSET, QP_MAX_SPEC, qp);62
+ if (m_param->bHDROpt)63
+ {64
+ int qpCb = x265_clip3(-12, 0, (int)floor((m_top->m_cB * ((-.46) * qp + 9.26)) + 0.5 ));65
+ int qpCr = x265_clip3(-12, 0, (int)floor((m_top->m_cR * ((-.46) * qp + 9.26)) + 0.5 ));66
+ slice->m_chromaQpOffset[0] = slice->m_pps->chromaQpOffset[0] + qpCb < -12 ? (qpCb + (-12 - (slice->m_pps->chromaQpOffset[0] + qpCb))) : qpCb;67
+ slice->m_chromaQpOffset[1] = slice->m_pps->chromaQpOffset[1] + qpCr < -12 ? (qpCr + (-12 - (slice->m_pps->chromaQpOffset[1] + qpCr))) : qpCr;68
+ }69
70
if (m_param->bOptQpPPS && m_param->bRepeatHeaders)71
{72
73
for (int i = 0; i < m_frame->m_userSEI.numPayloads; i++)74
{75
x265_sei_payload *payload = &m_frame->m_userSEI.payloads[i];76
- SEIuserDataUnregistered sei;77
-78
- sei.m_payloadType = payload->payloadType;79
- sei.m_userDataLength = payload->payloadSize;80
- sei.m_userData = payload->payload;81
-82
- m_bs.resetBits();83
- sei.write(m_bs, *slice->m_sps);84
- m_bs.writeByteAlignment();85
- m_nalList.serialize(NAL_UNIT_PREFIX_SEI, m_bs);86
+ if (payload->payloadType == USER_DATA_UNREGISTERED)87
+ {88
+ SEIuserDataUnregistered sei;89
+ sei.m_userData = payload->payload;90
+ m_bs.resetBits();91
+ sei.setSize(payload->payloadSize);92
+ sei.write(m_bs, *slice->m_sps);93
+ m_bs.writeByteAlignment();94
+ m_nalList.serialize(NAL_UNIT_PREFIX_SEI, m_bs);95
+ }96
+ else if (payload->payloadType == USER_DATA_REGISTERED_ITU_T_T35)97
+ {98
+ if (writeSei)99
+ {100
+ SEICreativeIntentMeta sei;101
+ sei.cim = payload->payload;102
+ m_bs.resetBits();103
+ sei.setSize(payload->payloadSize);104
+ sei.write(m_bs, *slice->m_sps);105
+ m_bs.writeByteAlignment();106
+ m_nalList.serialize(NAL_UNIT_PREFIX_SEI, m_bs);107
+ }108
+ }109
+ else110
+ x265_log(m_param, X265_LOG_ERROR, "Unrecognized SEI type\n");111
}112
-113
/* CQP and CRF (without capped VBV) doesn't use mid-frame statistics to 114
* tune RateControl parameters for other frames.115
* Hence, for these modes, update m_startEndOrder and unlock RC for previous threads waiting in116
117
if (m_param->decodedPictureHashSEI)118
{119
int planes = (m_frame->m_param->internalCsp != X265_CSP_I400) ? 3 : 1;120
+ int32_t payloadSize = 0;121
if (m_param->decodedPictureHashSEI == 1)122
{123
m_seiReconPictureDigest.m_method = SEIDecodedPictureHash::MD5;124
for (int i = 0; i < planes; i++)125
MD5Final(&m_state[i], m_seiReconPictureDigest.m_digest[i]);126
+ payloadSize = 1 + 16 * planes;127
}128
else if (m_param->decodedPictureHashSEI == 2)129
{130
m_seiReconPictureDigest.m_method = SEIDecodedPictureHash::CRC;131
for (int i = 0; i < planes; i++)132
crcFinish(m_crc[i], m_seiReconPictureDigest.m_digest[i]);133
+ payloadSize = 1 + 2 * planes;134
}135
else if (m_param->decodedPictureHashSEI == 3)136
{137
m_seiReconPictureDigest.m_method = SEIDecodedPictureHash::CHECKSUM;138
for (int i = 0; i < planes; i++)139
checksumFinish(m_checksum[i], m_seiReconPictureDigest.m_digest[i]);140
+ payloadSize = 1 + 4 * planes;141
}142
-143
m_bs.resetBits();144
+ m_seiReconPictureDigest.setSize(payloadSize);145
m_seiReconPictureDigest.write(m_bs, *slice->m_sps);146
m_bs.writeByteAlignment();147
-148
m_nalList.serialize(NAL_UNIT_SUFFIX_SEI, m_bs);149
}150
151
152
rowCoder.copyState(m_initSliceContext);153
rowCoder.loadContexts(m_rows[row - 1].bufferedEntropy);154
}155
- analysis2PassFrameData* analysisFrameData = (analysis2PassFrameData*)(m_frame->m_analysis2Pass).analysisFramedata;156
- if (analysisFrameData && m_param->rc.bStatRead && m_param->analysisMultiPassDistortion && (analysisFrameData->threshold[cuAddr] < 0.9 || analysisFrameData->threshold[cuAddr] > 1.1)157
- && analysisFrameData->highDistortionCtuCount && analysisFrameData->lowDistortionCtuCount)158
- curEncData.m_cuStat[cuAddr].baseQp += analysisFrameData->offset[cuAddr];159
-160
if (m_param->dynamicRd && (int32_t)(m_rce.qpaRc - m_rce.qpNoVbv) > 0)161
ctu->m_vbvAffected = true;162
163
x265_2.3.tar.gz/source/encoder/frameencoder.h -> x265_2.4.tar.gz/source/encoder/frameencoder.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Shin Yee <shinyee@multicorewareinc.com>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/encoder/framefilter.cpp -> x265_2.4.tar.gz/source/encoder/framefilter.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Chung Shin Yee <shinyee@multicorewareinc.com>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/encoder/framefilter.h -> x265_2.4.tar.gz/source/encoder/framefilter.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Chung Shin Yee <shinyee@multicorewareinc.com>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/encoder/level.cpp -> x265_2.4.tar.gz/source/encoder/level.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/encoder/level.h -> x265_2.4.tar.gz/source/encoder/level.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/encoder/motion.cpp -> x265_2.4.tar.gz/source/encoder/motion.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/encoder/motion.h -> x265_2.4.tar.gz/source/encoder/motion.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/encoder/nal.cpp -> x265_2.4.tar.gz/source/encoder/nal.cpp
Changed
8
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/encoder/nal.h -> x265_2.4.tar.gz/source/encoder/nal.h
Changed
8
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/encoder/ratecontrol.cpp -> x265_2.4.tar.gz/source/encoder/ratecontrol.cpp
Changed
152
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Sumalatha Polureddy <sumalatha@multicorewareinc.com>7
* Aarthi Priya Thirumalai <aarthi@multicorewareinc.com>8
9
return true;10
}11
12
+void RateControl::reconfigureRC()13
+{14
+ if (m_isVbv)15
+ {16
+ m_param->rc.vbvBufferSize = x265_clip3(0, 2000000, m_param->rc.vbvBufferSize);17
+ m_param->rc.vbvMaxBitrate = x265_clip3(0, 2000000, m_param->rc.vbvMaxBitrate);18
+ if (m_param->rc.vbvMaxBitrate < m_param->rc.bitrate &&19
+ m_param->rc.rateControlMode == X265_RC_ABR)20
+ {21
+ x265_log(m_param, X265_LOG_WARNING, "max bitrate less than average bitrate, assuming CBR\n");22
+ m_param->rc.bitrate = m_param->rc.vbvMaxBitrate;23
+ }24
+25
+ if (m_param->rc.vbvBufferSize < (int)(m_param->rc.vbvMaxBitrate / m_fps))26
+ {27
+ m_param->rc.vbvBufferSize = (int)(m_param->rc.vbvMaxBitrate / m_fps);28
+ x265_log(m_param, X265_LOG_WARNING, "VBV buffer size cannot be smaller than one frame, using %d kbit\n",29
+ m_param->rc.vbvBufferSize);30
+ }31
+ int vbvBufferSize = m_param->rc.vbvBufferSize * 1000;32
+ int vbvMaxBitrate = m_param->rc.vbvMaxBitrate * 1000;33
+ m_bufferRate = vbvMaxBitrate / m_fps;34
+ m_vbvMaxRate = vbvMaxBitrate;35
+ m_bufferSize = vbvBufferSize;36
+ m_singleFrameVbv = m_bufferRate * 1.1 > m_bufferSize;37
+ }38
+ if (m_param->rc.rateControlMode == X265_RC_CRF)39
+ {40
+ #define CRF_INIT_QP (int)m_param->rc.rfConstant41
+ m_param->rc.bitrate = 0;42
+ double baseCplx = m_ncu * (m_param->bframes ? 120 : 80);43
+ double mbtree_offset = m_param->rc.cuTree ? (1.0 - m_param->rc.qCompress) * 13.5 : 0;44
+ m_rateFactorConstant = pow(baseCplx, 1 - m_qCompress) /45
+ x265_qp2qScale(m_param->rc.rfConstant + mbtree_offset);46
+ if (m_param->rc.rfConstantMax)47
+ {48
+ m_rateFactorMaxIncrement = m_param->rc.rfConstantMax - m_param->rc.rfConstant;49
+ if (m_rateFactorMaxIncrement <= 0)50
+ {51
+ x265_log(m_param, X265_LOG_WARNING, "CRF max must be greater than CRF\n");52
+ m_rateFactorMaxIncrement = 0;53
+ }54
+ }55
+ if (m_param->rc.rfConstantMin)56
+ m_rateFactorMaxDecrement = m_param->rc.rfConstant - m_param->rc.rfConstantMin;57
+ }58
+ m_bitrate = m_param->rc.bitrate * 1000;59
+}60
+61
+62
void RateControl::initHRD(SPS& sps)63
{64
int vbvBufferSize = m_param->rc.vbvBufferSize * 1000;65
66
curFrame->m_rcData->cumulativePNorm = m_accumPNorm;67
for (int i = 0; i < 3; i++)68
curFrame->m_rcData->lastQScaleFor[i] = m_lastQScaleFor[i];69
+ curFrame->m_rcData->shortTermCplxSum = m_shortTermCplxSum;70
+ curFrame->m_rcData->shortTermCplxCount = m_shortTermCplxCount;71
}72
else // CQP73
{74
75
else if (m_framesDone == 0 && !m_isVbv && m_param->rc.rateControlMode == X265_RC_ABR)76
{77
/* for ABR alone, clip the first I frame qp */78
- lqmax = (m_lstep * m_isGrainEnabled) ? x265_qp2qScale(ABR_INIT_QP_GRAIN_MAX) :79
+ lqmax = (m_isGrainEnabled && m_lstep) ? x265_qp2qScale(ABR_INIT_QP_GRAIN_MAX) :80
x265_qp2qScale(ABR_INIT_QP_MAX);81
- q = X265_MIN(lqmax, q);82
+ q = X265_MIN(lqmax, q);83
}84
q = x265_clip3(lqmin, lqmax, q);85
/* Set a min qp at scenechanges and transitions */86
if (m_isSceneTransition)87
{88
- double minScenecutQscale =x265_qp2qScale(ABR_SCENECUT_INIT_QP_MIN); 89
- q = X265_MAX(minScenecutQscale, q);90
- m_lastQScaleFor[P_SLICE] = X265_MAX(minScenecutQscale, m_lastQScaleFor[P_SLICE]);91
+ double minScenecutQscale = x265_qp2qScale(ABR_SCENECUT_INIT_QP_MIN);92
+ q = X265_MAX(minScenecutQscale, q);93
+ m_lastQScaleFor[P_SLICE] = X265_MAX(minScenecutQscale, m_lastQScaleFor[P_SLICE]);94
}95
rce->qpNoVbv = x265_qScale2qp(q);96
- if(m_sliceType == P_SLICE)97
+ if (m_sliceType == P_SLICE)98
{99
m_avgPFrameQp = m_avgPFrameQp == 0 ? rce->qpNoVbv : m_avgPFrameQp;100
m_avgPFrameQp = (m_avgPFrameQp + rce->qpNoVbv) / 2;101
102
m_bufferFillFinal = X265_MAX(m_bufferFillFinal, 0);103
m_bufferFillFinal += m_bufferRate;104
105
- if (m_bufferFillFinal > m_bufferSize) 106
+ if (m_param->rc.bStrictCbr)107
{108
- if (m_param->rc.bStrictCbr)109
+ if (m_bufferFillFinal > m_bufferSize)110
{111
filler = (int)(m_bufferFillFinal - m_bufferSize);112
filler += FILLER_OVERHEAD * 8;113
- m_bufferFillFinal -= filler;114
- bufferBits = X265_MIN(bits + filler + m_bufferExcess, m_bufferRate);115
- m_bufferExcess = X265_MAX(m_bufferExcess - bufferBits + bits + filler, 0);116
- m_bufferFillActual += bufferBits - bits - filler;117
- }118
- else119
- {120
- m_bufferFillFinal = X265_MIN(m_bufferFillFinal, m_bufferSize);121
- bufferBits = X265_MIN(bits + m_bufferExcess, m_bufferRate);122
- m_bufferExcess = X265_MAX(m_bufferExcess - bufferBits + bits, 0);123
- m_bufferFillActual += bufferBits - bits;124
- m_bufferFillActual = X265_MIN(m_bufferFillActual, m_bufferSize);125
}126
+ m_bufferFillFinal -= filler;127
+ bufferBits = X265_MIN(bits + filler + m_bufferExcess, m_bufferRate);128
+ m_bufferExcess = X265_MAX(m_bufferExcess - bufferBits + bits + filler, 0);129
+ m_bufferFillActual += bufferBits - bits - filler;130
+ }131
+ else132
+ {133
+ m_bufferFillFinal = X265_MIN(m_bufferFillFinal, m_bufferSize);134
+ bufferBits = X265_MIN(bits + m_bufferExcess, m_bufferRate);135
+ m_bufferExcess = X265_MAX(m_bufferExcess - bufferBits + bits, 0);136
+ m_bufferFillActual += bufferBits - bits;137
+ m_bufferFillActual = X265_MIN(m_bufferFillActual, m_bufferSize);138
}139
return filler;140
}141
142
int qp = int (rce->qpaRc + 0.5);143
m_qpToEncodedBits[qp] = m_qpToEncodedBits[qp] == 0 ? actualBits : (m_qpToEncodedBits[qp] + actualBits) * 0.5;144
}145
+ curFrame->m_rcData->wantedBitsWindow = m_wantedBitsWindow;146
+ curFrame->m_rcData->cplxrSum = m_cplxrSum;147
+ curFrame->m_rcData->totalBits = m_totalBits;148
+ curFrame->m_rcData->encodedBits = m_encodedBits;149
}150
151
if (m_2pass)152
x265_2.3.tar.gz/source/encoder/ratecontrol.h -> x265_2.4.tar.gz/source/encoder/ratecontrol.h
Changed
16
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Sumalatha Polureddy <sumalatha@multicorewareinc.com>7
* Aarthi Priya Thirumalai <aarthi@multicorewareinc.com>8
9
RateControl(x265_param& p);10
bool init(const SPS& sps);11
void initHRD(SPS& sps);12
+ void reconfigureRC();13
14
void setFinalFrameCount(int count);15
void terminate(); /* un-block all waiting functions so encoder may close */16
x265_2.3.tar.gz/source/encoder/rdcost.h -> x265_2.4.tar.gz/source/encoder/rdcost.h
Changed
26
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
9
int qpCb, qpCr;10
if (slice.m_sps->chromaFormatIdc == X265_CSP_I420)11
{12
- qpCb = (int)g_chromaScale[x265_clip3(QP_MIN, QP_MAX_MAX, qp + slice.m_pps->chromaQpOffset[0])];13
- qpCr = (int)g_chromaScale[x265_clip3(QP_MIN, QP_MAX_MAX, qp + slice.m_pps->chromaQpOffset[1])];14
+ qpCb = (int)g_chromaScale[x265_clip3(QP_MIN, QP_MAX_MAX, qp + slice.m_pps->chromaQpOffset[0] + slice.m_chromaQpOffset[0])];15
+ qpCr = (int)g_chromaScale[x265_clip3(QP_MIN, QP_MAX_MAX, qp + slice.m_pps->chromaQpOffset[1] + slice.m_chromaQpOffset[1])];16
}17
else18
{19
- qpCb = x265_clip3(QP_MIN, QP_MAX_SPEC, qp + slice.m_pps->chromaQpOffset[0]);20
- qpCr = x265_clip3(QP_MIN, QP_MAX_SPEC, qp + slice.m_pps->chromaQpOffset[1]);21
+ qpCb = x265_clip3(QP_MIN, QP_MAX_SPEC, qp + slice.m_pps->chromaQpOffset[0] + slice.m_chromaQpOffset[0]);22
+ qpCr = x265_clip3(QP_MIN, QP_MAX_SPEC, qp + slice.m_pps->chromaQpOffset[1] + slice.m_chromaQpOffset[1]);23
}24
25
if (slice.m_sps->chromaFormatIdc == X265_CSP_I444)26
x265_2.3.tar.gz/source/encoder/reference.cpp -> x265_2.4.tar.gz/source/encoder/reference.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Deepthi Devaki <deepthidevaki@multicorewareinc.com>8
x265_2.3.tar.gz/source/encoder/reference.h -> x265_2.4.tar.gz/source/encoder/reference.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/encoder/sao.cpp -> x265_2.4.tar.gz/source/encoder/sao.cpp
Changed
336
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
9
/* Calculate SAO statistics for current CTU without non-crossing slice */10
void SAO::calcSaoStatsCTU(int addr, int plane)11
{12
+ Slice* slice = m_frame->m_encData->m_slice;13
const PicYuv* reconPic = m_frame->m_reconPic;14
const CUData* cu = m_frame->m_encData->getPicCTU(addr);15
const pixel* fenc0 = m_frame->m_fencPic->getPlaneAddr(plane, addr);16
17
18
primitives.saoCuStatsE1(diff + startY * MAX_CU_SIZE, rec0 + startY * stride, stride, upBuff1, endX, endY - startY, m_offsetOrg[plane][SAO_EO_1], m_count[plane][SAO_EO_1]);19
}20
-21
- // SAO_EO_2: // dir: 13522
+ if (!m_param->bLimitSAO || ((slice->m_sliceType == P_SLICE && !cu->isSkipped(0)) ||23
+ (slice->m_sliceType != B_SLICE)))24
{25
- if (m_param->bSaoNonDeblocked)26
+ // SAO_EO_2: // dir: 13527
{28
- skipB = 4;29
- skipR = 5;30
- }31
+ if (m_param->bSaoNonDeblocked)32
+ {33
+ skipB = 4;34
+ skipR = 5;35
+ }36
37
- fenc = fenc0;38
- rec = rec0;39
+ fenc = fenc0;40
+ rec = rec0;41
42
- startX = !lpelx;43
- endX = (rpelx == picWidth) ? ctuWidth - 1 : ctuWidth - skipR + plane_offset;44
+ startX = !lpelx;45
+ endX = (rpelx == picWidth) ? ctuWidth - 1 : ctuWidth - skipR + plane_offset;46
47
- startY = bAboveUnavail;48
- endY = (bpely == picHeight) ? ctuHeight - 1 : ctuHeight - skipB + plane_offset;49
- if (startY)50
- {51
- fenc += stride;52
- rec += stride;53
- }54
-55
- primitives.sign(upBuff1, &rec[startX], &rec[startX - stride - 1], (endX - startX));56
+ startY = bAboveUnavail;57
+ endY = (bpely == picHeight) ? ctuHeight - 1 : ctuHeight - skipB + plane_offset;58
+ if (startY)59
+ {60
+ fenc += stride;61
+ rec += stride;62
+ }63
64
- primitives.saoCuStatsE2(diff + startX + startY * MAX_CU_SIZE, rec0 + startX + startY * stride, stride, upBuff1, upBufft, endX - startX, endY - startY, m_offsetOrg[plane][SAO_EO_2], m_count[plane][SAO_EO_2]);65
- }66
+ primitives.sign(upBuff1, &rec[startX], &rec[startX - stride - 1], (endX - startX));67
68
- // SAO_EO_3: // dir: 4569
- {70
- if (m_param->bSaoNonDeblocked)71
- {72
- skipB = 4;73
- skipR = 5;74
+ primitives.saoCuStatsE2(diff + startX + startY * MAX_CU_SIZE, rec0 + startX + startY * stride, stride, upBuff1, upBufft, endX - startX, endY - startY, m_offsetOrg[plane][SAO_EO_2], m_count[plane][SAO_EO_2]);75
}76
+ // SAO_EO_3: // dir: 4577
+ {78
+ if (m_param->bSaoNonDeblocked)79
+ {80
+ skipB = 4;81
+ skipR = 5;82
+ }83
+ fenc = fenc0;84
+ rec = rec0;85
+ startX = !lpelx;86
+ endX = (rpelx == picWidth) ? ctuWidth - 1 : ctuWidth - skipR + plane_offset;87
88
- fenc = fenc0;89
- rec = rec0;90
+ startY = bAboveUnavail;91
+ endY = (bpely == picHeight) ? ctuHeight - 1 : ctuHeight - skipB + plane_offset;92
93
- startX = !lpelx;94
- endX = (rpelx == picWidth) ? ctuWidth - 1 : ctuWidth - skipR + plane_offset;95
+ if (startY)96
+ {97
+ fenc += stride;98
+ rec += stride;99
+ }100
101
- startY = bAboveUnavail;102
- endY = (bpely == picHeight) ? ctuHeight - 1 : ctuHeight - skipB + plane_offset;103
+ primitives.sign(upBuff1, &rec[startX - 1], &rec[startX - 1 - stride + 1], (endX - startX + 1));104
105
- if (startY)106
- {107
- fenc += stride;108
- rec += stride;109
+ primitives.saoCuStatsE3(diff + startX + startY * MAX_CU_SIZE, rec0 + startX + startY * stride, stride, upBuff1 + 1, endX - startX, endY - startY, m_offsetOrg[plane][SAO_EO_3], m_count[plane][SAO_EO_3]);110
}111
-112
- primitives.sign(upBuff1, &rec[startX - 1], &rec[startX - 1 - stride + 1], (endX - startX + 1));113
-114
- primitives.saoCuStatsE3(diff + startX + startY * MAX_CU_SIZE, rec0 + startX + startY * stride, stride, upBuff1 + 1, endX - startX, endY - startY, m_offsetOrg[plane][SAO_EO_3], m_count[plane][SAO_EO_3]);115
}116
}117
}118
119
void SAO::rdoSaoUnitCu(SAOParam* saoParam, int rowBaseAddr, int idxX, int addr)120
{121
Slice* slice = m_frame->m_encData->m_slice;122
-// int qp = slice->m_sliceQp;123
const CUData* cu = m_frame->m_encData->getPicCTU(addr);124
int qp = cu->m_qp[0];125
-126
int64_t lambda[2] = { 0 };127
128
- int qpCb = qp;129
+ int qpCb = qp + slice->m_pps->chromaQpOffset[0] + slice->m_chromaQpOffset[0];130
if (m_param->internalCsp == X265_CSP_I420)131
- qpCb = x265_clip3(m_param->rc.qpMin, m_param->rc.qpMax, (int)g_chromaScale[qp + slice->m_pps->chromaQpOffset[0]]);132
+ qpCb = x265_clip3(m_param->rc.qpMin, m_param->rc.qpMax, (int)g_chromaScale[x265_clip3(QP_MIN, QP_MAX_MAX, qpCb)]);133
else134
- qpCb = X265_MIN(qp + slice->m_pps->chromaQpOffset[0], QP_MAX_SPEC);135
-136
+ qpCb = x265_clip3(m_param->rc.qpMin, m_param->rc.qpMax, qpCb);137
lambda[0] = (int64_t)floor(256.0 * x265_lambda2_tab[qp]);138
lambda[1] = (int64_t)floor(256.0 * x265_lambda2_tab[qpCb]); // Use Cb QP for SAO chroma139
140
141
142
for (int i = 0; i < planes; i++)143
saoParam->ctuParam[i][addr].reset();144
-145
- if (saoParam->bSaoFlag[0])146
- calcSaoStatsCTU(addr, 0);147
-148
- if (saoParam->bSaoFlag[1])149
- {150
- calcSaoStatsCTU(addr, 1);151
- calcSaoStatsCTU(addr, 2);152
- }153
-154
- saoStatsInitialOffset(planes);155
-156
// SAO distortion calculation157
m_entropyCoder.load(m_rdContexts.cur);158
m_entropyCoder.resetBits();159
160
if (allowMerge[1])161
m_entropyCoder.codeSaoMerge(0);162
m_entropyCoder.store(m_rdContexts.temp);163
-164
- // Estimate distortion and cost of new SAO params165
+ memset(m_offset, 0, sizeof(m_offset));166
int64_t bestCost = 0;167
int64_t rateDist = 0;168
+169
+ bool bAboveLeftAvail = true;170
+ for (int mergeIdx = 0; mergeIdx < 2; ++mergeIdx)171
+ {172
+ if (!allowMerge[mergeIdx])173
+ continue;174
+175
+ SaoCtuParam* mergeSrcParam = &(saoParam->ctuParam[0][addrMerge[mergeIdx]]);176
+ bAboveLeftAvail = bAboveLeftAvail && (mergeSrcParam->typeIdx == -1);177
+ }178
+ // Don't apply sao if ctu is skipped or ajacent ctus are sao off179
+ bool bSaoOff = (slice->m_sliceType == B_SLICE) && (cu->isSkipped(0) || bAboveLeftAvail);180
+181
// Estimate distortion and cost of new SAO params182
- saoLumaComponentParamDist(saoParam, addr, rateDist, lambda, bestCost);183
- if (chroma)184
- saoChromaComponentParamDist(saoParam, addr, rateDist, lambda, bestCost);185
+ if (saoParam->bSaoFlag[0])186
+ {187
+ if (!m_param->bLimitSAO || !bSaoOff)188
+ {189
+ calcSaoStatsCTU(addr, 0);190
+ saoStatsInitialOffset(addr, 0);191
+ saoLumaComponentParamDist(saoParam, addr, rateDist, lambda, bestCost);192
+ }193
+ }194
195
+ SaoCtuParam* lclCtuParam = &saoParam->ctuParam[0][addr];196
+ if (saoParam->bSaoFlag[1])197
+ {198
+ if (!m_param->bLimitSAO || ((lclCtuParam->typeIdx != -1) && !bSaoOff))199
+ {200
+ calcSaoStatsCTU(addr, 1);201
+ calcSaoStatsCTU(addr, 2);202
+ saoStatsInitialOffset(addr, 1);203
+ saoChromaComponentParamDist(saoParam, addr, rateDist, lambda, bestCost);204
+ }205
+ }206
if (saoParam->bSaoFlag[0] || saoParam->bSaoFlag[1])207
{208
// Cost of merge left or Up209
210
}211
}212
213
-214
// Rounds the division of initial offsets by the number of samples in215
// each of the statistics table entries.216
-void SAO::saoStatsInitialOffset(int planes)217
+void SAO::saoStatsInitialOffset(int addr, int planes)218
{219
- memset(m_offset, 0, sizeof(m_offset));220
+ Slice* slice = m_frame->m_encData->m_slice;221
+ const CUData* cu = m_frame->m_encData->getPicCTU(addr);222
223
+ int maxSaoType;224
+ if (m_param->bLimitSAO && ((slice->m_sliceType == P_SLICE && cu->isSkipped(0)) ||225
+ (slice->m_sliceType == B_SLICE)))226
+ {227
+ maxSaoType = MAX_NUM_SAO_TYPE - 3;228
+ }229
+ else230
+ {231
+ maxSaoType = MAX_NUM_SAO_TYPE - 1;232
+ }233
// EO234
- for (int plane = 0; plane < planes; plane++)235
+ for (int plane = planes; plane <= planes * 2; plane++)236
{237
- for (int typeIdx = 0; typeIdx < MAX_NUM_SAO_TYPE - 1; typeIdx++)238
+ for (int typeIdx = 0; typeIdx < maxSaoType; typeIdx++)239
{240
for (int classIdx = 1; classIdx < SAO_NUM_OFFSET + 1; classIdx++)241
{242
243
}244
}245
}246
-247
// BO248
- for (int plane = 0; plane < planes; plane++)249
+ for (int plane = planes; plane <= planes * 2; plane++)250
{251
for (int classIdx = 0; classIdx < MAX_NUM_SAO_CLASS; classIdx++)252
{253
254
costClasses = bestCost;255
offset = bestOffset;256
}257
-258
void SAO::saoLumaComponentParamDist(SAOParam* saoParam, int32_t addr, int64_t& rateDist, int64_t* lambda, int64_t &bestCost)259
{260
+ Slice* slice = m_frame->m_encData->m_slice;261
+ const CUData* cu = m_frame->m_encData->getPicCTU(addr);262
int64_t bestDist = 0;263
int bestTypeIdx = -1;264
-265
SaoCtuParam* lclCtuParam = &saoParam->ctuParam[0][addr];266
267
int32_t distClasses[MAX_NUM_SAO_CLASS];268
269
m_entropyCoder.load(m_rdContexts.temp);270
m_entropyCoder.resetBits();271
m_entropyCoder.codeSaoType(0);272
-273
int64_t costPartBest = calcSaoRdoCost(0, m_entropyCoder.getNumberOfWrittenBits(), lambda[0]);274
+ int maxSaoType;275
+ if (m_param->bLimitSAO && ((slice->m_sliceType == P_SLICE && cu->isSkipped(0)) ||276
+ (slice->m_sliceType == B_SLICE)))277
+ {278
+ maxSaoType = MAX_NUM_SAO_TYPE - 3;279
+ }280
+ else281
+ {282
+ maxSaoType = MAX_NUM_SAO_TYPE - 1;283
+ }284
285
//EO distortion calculation286
- for (int typeIdx = 0; typeIdx < MAX_NUM_SAO_TYPE - 1; typeIdx++)287
+ for (int typeIdx = 0; typeIdx < maxSaoType; typeIdx++)288
{289
int64_t estDist = 0;290
for (int classIdx = 1; classIdx < SAO_NUM_OFFSET + 1; classIdx++)291
{292
- int32_t& count = m_count[0][typeIdx][classIdx];293
+ int32_t& count = m_count[0][typeIdx][classIdx];294
int32_t& offsetOrg = m_offsetOrg[0][typeIdx][classIdx];295
int32_t& offsetOut = m_offset[0][typeIdx][classIdx];296
-297
estIterOffset(typeIdx, lambda[0], count, offsetOrg, offsetOut, distClasses[classIdx], costClasses[classIdx]);298
299
//Calculate distortion300
301
bestCost = rateDist + m_entropyCoder.getNumberOfWrittenBits();302
}303
}304
-305
void SAO::saoChromaComponentParamDist(SAOParam* saoParam, int32_t addr, int64_t& rateDist, int64_t* lambda, int64_t &bestCost)306
{307
+ Slice* slice = m_frame->m_encData->m_slice;308
+ const CUData* cu = m_frame->m_encData->getPicCTU(addr);309
int64_t bestDist = 0;310
int bestTypeIdx = -1;311
-312
SaoCtuParam* lclCtuParam[2] = { &saoParam->ctuParam[1][addr], &saoParam->ctuParam[2][addr] };313
314
int64_t costClasses[MAX_NUM_SAO_CLASS];315
316
317
uint32_t bits = m_entropyCoder.getNumberOfWrittenBits();318
int64_t costPartBest = calcSaoRdoCost(0, bits, lambda[1]);319
+ int maxSaoType;320
+ if (m_param->bLimitSAO && ((slice->m_sliceType == P_SLICE && cu->isSkipped(0)) ||321
+ (slice->m_sliceType == B_SLICE)))322
+ {323
+ maxSaoType = MAX_NUM_SAO_TYPE - 3;324
+ }325
+ else326
+ {327
+ maxSaoType = MAX_NUM_SAO_TYPE - 1;328
+ }329
330
//EO RDO331
- for (int typeIdx = 0; typeIdx < MAX_NUM_SAO_TYPE - 1; typeIdx++)332
+ for (int typeIdx = 0; typeIdx < maxSaoType; typeIdx++)333
{334
int64_t estDist[2] = {0, 0};335
for (int compIdx = 1; compIdx < 3; compIdx++)336
x265_2.3.tar.gz/source/encoder/sao.h -> x265_2.4.tar.gz/source/encoder/sao.h
Changed
19
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
9
void rdoSaoUnitRowEnd(const SAOParam* saoParam, int numctus);10
void rdoSaoUnitCu(SAOParam* saoParam, int rowBaseAddr, int idxX, int addr);11
int64_t calcSaoRdoCost(int64_t distortion, uint32_t bits, int64_t lambda);12
-13
- void saoStatsInitialOffset(int planes);14
-15
+ void saoStatsInitialOffset(int addr, int planes);16
friend class FrameFilter;17
};18
19
x265_2.3.tar.gz/source/encoder/search.cpp -> x265_2.4.tar.gz/source/encoder/search.cpp
Changed
18
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
9
cu.getNeighbourMV(puIdx, pu.puAbsPartIdx, interMode.interNeighbours);10
11
/* Uni-directional prediction */12
- if (m_param->analysisMode == X265_ANALYSIS_LOAD || (m_param->analysisMultiPassRefine && m_param->rc.bStatRead))13
+ if ((m_param->analysisMode == X265_ANALYSIS_LOAD && m_param->analysisRefineLevel > 1)14
+ || (m_param->analysisMultiPassRefine && m_param->rc.bStatRead))15
{16
for (int list = 0; list < numPredDir; list++)17
{18
x265_2.3.tar.gz/source/encoder/search.h -> x265_2.4.tar.gz/source/encoder/search.h
Changed
8
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/encoder/sei.cpp -> x265_2.4.tar.gz/source/encoder/sei.cpp
Changed
71
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
9
* in bitstream bs */10
void SEI::write(Bitstream& bs, const SPS& sps)11
{12
- BitCounter count;13
- m_bitIf = &count;14
-15
- /* virtual writeSEI method, write to bit counter */16
- writeSEI(sps);17
-18
+ uint32_t type = m_payloadType;19
m_bitIf = &bs;20
- uint32_t type = payloadType();21
- for (; type >= 0xff; type -= 0xff)22
- WRITE_CODE(0xff, 8, "payload_type");23
+ BitCounter count;24
+ bool hrdTypes = (m_payloadType == ACTIVE_PARAMETER_SETS || m_payloadType == PICTURE_TIMING || m_payloadType == BUFFERING_PERIOD);25
+ if (hrdTypes)26
+ {27
+ m_bitIf = &count;28
+ /* virtual writeSEI method, write to bit counter to determine size */29
+ writeSEI(sps);30
+ m_bitIf = &bs;31
+ uint32_t payloadType = m_payloadType;32
+ for (; payloadType >= 0xff; payloadType -= 0xff)33
+ WRITE_CODE(0xff, 8, "payload_type");34
+ }35
WRITE_CODE(type, 8, "payload_type");36
+ uint32_t payloadSize;37
+ if (hrdTypes || m_payloadType == USER_DATA_UNREGISTERED)38
+ {39
+ if (hrdTypes)40
+ {41
+ X265_CHECK(0 == (count.getNumberOfWrittenBits() & 7), "payload unaligned\n");42
+ payloadSize = count.getNumberOfWrittenBits() >> 3;43
+ }44
+ else45
+ payloadSize = m_payloadSize + 16;46
47
- X265_CHECK(0 == (count.getNumberOfWrittenBits() & 7), "payload unaligned\n");48
- uint32_t payloadSize = count.getNumberOfWrittenBits() >> 3;49
- for (; payloadSize >= 0xff; payloadSize -= 0xff)50
- WRITE_CODE(0xff, 8, "payload_size");51
- WRITE_CODE(payloadSize, 8, "payload_size");52
-53
+ for (; payloadSize >= 0xff; payloadSize -= 0xff)54
+ WRITE_CODE(0xff, 8, "payload_size");55
+ WRITE_CODE(payloadSize, 8, "payload_size");56
+ }57
+ else if(m_payloadType != USER_DATA_REGISTERED_ITU_T_T35)58
+ WRITE_CODE(m_payloadSize, 8, "payload_size");59
/* virtual writeSEI method, write to bs */60
writeSEI(sps);61
}62
63
}64
}65
}66
+67
+void SEI::setSize(uint32_t size)68
+{69
+ m_payloadSize = size;70
+}71
x265_2.3.tar.gz/source/encoder/sei.h -> x265_2.4.tar.gz/source/encoder/sei.h
Changed
288
1
2
/*****************************************************************************3
-* Copyright (C) 2013 x265 project4
+* Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
9
class SEI : public SyntaxElementWriter10
{11
public:12
+ /* SEI users call write() to marshal an SEI to a bitstream.13
+ * The write() method calls writeSEI() which encodes the header */14
+ void write(Bitstream& bs, const SPS& sps);15
16
- /* SEI users call write() to marshal an SEI to a bitstream. SEI17
- * subclasses may implement write() or accept the default write()18
- * method which calls writeSEI() with a bitcounter to determine19
- * the size, then it encodes the header and calls writeSEI a20
- * second time for the real encode. */21
- virtual void write(Bitstream& bs, const SPS& sps);22
-23
+ void setSize(uint32_t size);24
virtual ~SEI() {}25
-26
protected:27
-28
- virtual SEIPayloadType payloadType() const = 0;29
-30
- virtual void writeSEI(const SPS&) { X265_CHECK(0, "empty writeSEI method called\n"); }31
-32
+ SEIPayloadType m_payloadType;33
+ uint32_t m_payloadSize;34
+ virtual void writeSEI(const SPS&) = 0;35
void writeByteAlign();36
};37
38
class SEIuserDataUnregistered : public SEI39
{40
public:41
-42
- SEIPayloadType payloadType() const { return m_payloadType; }43
-44
- SEIuserDataUnregistered() : m_userData(NULL) {}45
-46
+ SEIuserDataUnregistered() : m_userData(NULL)47
+ {48
+ m_payloadType = USER_DATA_UNREGISTERED;49
+ m_payloadSize = 0;50
+ }51
static const uint8_t m_uuid_iso_iec_11578[16];52
- SEIPayloadType m_payloadType;53
- uint32_t m_userDataLength;54
uint8_t *m_userData;55
-56
- void write(Bitstream& bs, const SPS&)57
+ void writeSEI(const SPS&)58
{59
- m_bitIf = &bs;60
-61
- WRITE_CODE(m_payloadType, 8, "payload_type");62
-63
- uint32_t payloadSize = 16 + m_userDataLength;64
- for (; payloadSize >= 0xff; payloadSize -= 0xff)65
- WRITE_CODE(0xff, 8, "payload_size");66
- WRITE_CODE(payloadSize, 8, "payload_size");67
-68
for (uint32_t i = 0; i < 16; i++)69
WRITE_CODE(m_uuid_iso_iec_11578[i], 8, "sei.uuid_iso_iec_11578[i]");70
-71
- for (uint32_t i = 0; i < m_userDataLength; i++)72
+ for (uint32_t i = 0; i < m_payloadSize; i++)73
WRITE_CODE(m_userData[i], 8, "user_data");74
}75
};76
77
class SEIMasteringDisplayColorVolume : public SEI78
{79
public:80
-81
+ SEIMasteringDisplayColorVolume()82
+ {83
+ m_payloadType = MASTERING_DISPLAY_INFO;84
+ m_payloadSize = (8 * 2 + 2 * 4);85
+ }86
uint16_t displayPrimaryX[3];87
uint16_t displayPrimaryY[3];88
uint16_t whitePointX, whitePointY;89
uint32_t maxDisplayMasteringLuminance;90
uint32_t minDisplayMasteringLuminance;91
-92
- SEIPayloadType payloadType() const { return MASTERING_DISPLAY_INFO; }93
-94
bool parse(const char* value)95
{96
return sscanf(value, "G(%hu,%hu)B(%hu,%hu)R(%hu,%hu)WP(%hu,%hu)L(%u,%u)",97
98
&whitePointX, &whitePointY,99
&maxDisplayMasteringLuminance, &minDisplayMasteringLuminance) == 10;100
}101
-102
- void write(Bitstream& bs, const SPS&)103
+ void writeSEI(const SPS&)104
{105
- m_bitIf = &bs;106
-107
- WRITE_CODE(MASTERING_DISPLAY_INFO, 8, "payload_type");108
- WRITE_CODE(8 * 2 + 2 * 4, 8, "payload_size");109
-110
for (uint32_t i = 0; i < 3; i++)111
{112
WRITE_CODE(displayPrimaryX[i], 16, "display_primaries_x[ c ]");113
114
class SEIContentLightLevel : public SEI115
{116
public:117
-118
+ SEIContentLightLevel()119
+ {120
+ m_payloadType = CONTENT_LIGHT_LEVEL_INFO;121
+ m_payloadSize = 4;122
+ }123
uint16_t max_content_light_level;124
uint16_t max_pic_average_light_level;125
-126
- SEIPayloadType payloadType() const { return CONTENT_LIGHT_LEVEL_INFO; }127
-128
- void write(Bitstream& bs, const SPS&)129
+ void writeSEI(const SPS&)130
{131
- m_bitIf = &bs;132
-133
- WRITE_CODE(CONTENT_LIGHT_LEVEL_INFO, 8, "payload_type");134
- WRITE_CODE(4, 8, "payload_size");135
WRITE_CODE(max_content_light_level, 16, "max_content_light_level");136
WRITE_CODE(max_pic_average_light_level, 16, "max_pic_average_light_level");137
}138
139
class SEIDecodedPictureHash : public SEI140
{141
public:142
-143
- SEIPayloadType payloadType() const { return DECODED_PICTURE_HASH; }144
-145
+ SEIDecodedPictureHash()146
+ {147
+ m_payloadType = DECODED_PICTURE_HASH;148
+ m_payloadSize = 0;149
+ }150
enum Method151
{152
MD5,153
CRC,154
CHECKSUM,155
} m_method;156
-157
uint8_t m_digest[3][16];158
-159
- void write(Bitstream& bs, const SPS& sps)160
+ void writeSEI(const SPS& sps)161
{162
- m_bitIf = &bs;163
-164
int planes = (sps.chromaFormatIdc != X265_CSP_I400) ? 3 : 1;165
-166
- WRITE_CODE(DECODED_PICTURE_HASH, 8, "payload_type");167
-168
- switch (m_method)169
- {170
- case MD5:171
- WRITE_CODE(1 + 16 * planes, 8, "payload_size");172
- WRITE_CODE(MD5, 8, "hash_type");173
- break;174
- case CRC:175
- WRITE_CODE(1 + 2 * planes, 8, "payload_size");176
- WRITE_CODE(CRC, 8, "hash_type");177
- break;178
- case CHECKSUM:179
- WRITE_CODE(1 + 4 * planes, 8, "payload_size");180
- WRITE_CODE(CHECKSUM, 8, "hash_type");181
- break;182
- }183
-184
+ WRITE_CODE(m_method, 8, "hash_type");185
for (int yuvIdx = 0; yuvIdx < planes; yuvIdx++)186
{187
if (m_method == MD5)188
189
class SEIActiveParameterSets : public SEI190
{191
public:192
-193
- SEIPayloadType payloadType() const { return ACTIVE_PARAMETER_SETS; }194
-195
+ SEIActiveParameterSets()196
+ {197
+ m_payloadType = ACTIVE_PARAMETER_SETS;198
+ m_payloadSize = 0;199
+ }200
bool m_selfContainedCvsFlag;201
bool m_noParamSetUpdateFlag;202
203
204
class SEIBufferingPeriod : public SEI205
{206
public:207
-208
- SEIPayloadType payloadType() const { return BUFFERING_PERIOD; }209
-210
SEIBufferingPeriod()211
: m_cpbDelayOffset(0)212
, m_dpbDelayOffset(0)213
, m_auCpbRemovalDelayDelta(1)214
{215
+ m_payloadType = BUFFERING_PERIOD;216
+ m_payloadSize = 0;217
}218
-219
bool m_cpbDelayOffset;220
bool m_dpbDelayOffset;221
uint32_t m_initialCpbRemovalDelay;222
223
class SEIPictureTiming : public SEI224
{225
public:226
-227
- SEIPayloadType payloadType() const { return PICTURE_TIMING; }228
-229
+ SEIPictureTiming()230
+ {231
+ m_payloadType = PICTURE_TIMING;232
+ m_payloadSize = 0;233
+ }234
uint32_t m_picStruct;235
uint32_t m_sourceScanType;236
bool m_duplicateFlag;237
238
class SEIRecoveryPoint : public SEI239
{240
public:241
-242
- SEIPayloadType payloadType() const { return RECOVERY_POINT; }243
-244
int m_recoveryPocCnt;245
bool m_exactMatchingFlag;246
bool m_brokenLinkFlag;247
248
writeByteAlign();249
}250
};251
-}252
253
+//seongnam.oh@samsung.com :: for the Creative Intent Meta Data Encoding254
+class SEICreativeIntentMeta : public SEI255
+{256
+public:257
+ SEICreativeIntentMeta()258
+ {259
+ m_payloadType = USER_DATA_REGISTERED_ITU_T_T35;260
+ m_payloadSize = 0;261
+ }262
+263
+ uint8_t *cim;264
+265
+ // daniel.vt@samsung.com :: for the Creative Intent Meta Data Encoding ( seongnam.oh@samsung.com )266
+ void writeSEI(const SPS&)267
+ {268
+ if (!cim)269
+ return;270
+271
+ int i = 0;272
+ int payloadSize = m_payloadSize;273
+ while (cim[i] == 0xFF)274
+ {275
+ i++;276
+ payloadSize += cim[i];277
+ WRITE_CODE(0xFF, 8, "payload_size");278
+ }279
+ WRITE_CODE(payloadSize, 8, "payload_size");280
+ i++;281
+ payloadSize += i;282
+ for (; i < payloadSize; ++i)283
+ WRITE_CODE(cim[i], 8, "creative_intent_metadata");284
+ }285
+};286
+}287
#endif // ifndef X265_SEI_H288
x265_2.3.tar.gz/source/encoder/slicetype.cpp -> x265_2.4.tar.gz/source/encoder/slicetype.cpp
Changed
61
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Gopu Govindaswamy <gopu@multicorewareinc.com>7
* Steve Borho <steve@borho.org>8
9
x265_emms();10
return var;11
}12
+/* Find the sum of pixels of each block for luma plane */13
+uint32_t LookaheadTLD::lumaSumCu(Frame* curFrame, uint32_t blockX, uint32_t blockY, uint32_t qgSize)14
+{15
+ intptr_t stride = curFrame->m_fencPic->m_stride;16
+ intptr_t blockOffsetLuma = blockX + (blockY * stride);17
+ uint64_t sum_ssd;18
+19
+ if (qgSize == 8)20
+ sum_ssd = primitives.cu[BLOCK_8x8].var(curFrame->m_fencPic->m_picOrg[0] + blockOffsetLuma, stride);21
+ else22
+ sum_ssd = primitives.cu[BLOCK_16x16].var(curFrame->m_fencPic->m_picOrg[0] + blockOffsetLuma, stride);23
+24
+ x265_emms();25
+ return (uint32_t)sum_ssd;26
+}27
28
void LookaheadTLD::calcAdaptiveQuantFrame(Frame *curFrame, x265_param* param)29
{30
31
uint32_t energy = acEnergyCu(curFrame, blockX, blockY, param->internalCsp,param->rc.qgSize);32
qp_adj = strength * (X265_LOG2(X265_MAX(energy, 1)) - (modeOneConst + 2 * (X265_DEPTH - 8)));33
}34
+35
+ if (param->bHDROpt)36
+ {37
+ uint32_t sum = lumaSumCu(curFrame, blockX, blockY, param->rc.qgSize);38
+ uint32_t lumaAvg = sum / (loopIncr * loopIncr);39
+ if (lumaAvg < 301)40
+ qp_adj += 3;41
+ else if (lumaAvg >= 301 && lumaAvg < 367)42
+ qp_adj += 2;43
+ else if (lumaAvg >= 367 && lumaAvg < 434)44
+ qp_adj += 1;45
+ else if (lumaAvg >= 501 && lumaAvg < 567)46
+ qp_adj -= 1;47
+ else if (lumaAvg >= 567 && lumaAvg < 634)48
+ qp_adj -= 2;49
+ else if (lumaAvg >= 634 && lumaAvg < 701)50
+ qp_adj -= 3;51
+ else if (lumaAvg >= 701 && lumaAvg < 767)52
+ qp_adj -= 4;53
+ else if (lumaAvg >= 767 && lumaAvg < 834)54
+ qp_adj -= 5;55
+ else if (lumaAvg >= 834)56
+ qp_adj -= 6;57
+ }58
if (quantOffsets != NULL)59
qp_adj += quantOffsets[blockXY];60
curFrame->m_lowres.qpAqOffset[blockXY] = qp_adj;61
x265_2.3.tar.gz/source/encoder/slicetype.h -> x265_2.4.tar.gz/source/encoder/slicetype.h
Changed
16
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
9
protected:10
11
uint32_t acEnergyCu(Frame* curFrame, uint32_t blockX, uint32_t blockY, int csp, uint32_t qgSize);12
+ uint32_t lumaSumCu(Frame* curFrame, uint32_t blockX, uint32_t blockY, uint32_t qgSize);13
uint32_t weightCostLuma(Lowres& fenc, Lowres& ref, WeightParam& wp);14
bool allocWeightedRef(Lowres& fenc);15
};16
x265_2.3.tar.gz/source/encoder/weightPrediction.cpp -> x265_2.4.tar.gz/source/encoder/weightPrediction.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Author: Shazeb Nawaz Khan <shazeb@multicorewareinc.com>7
* Steve Borho <steve@borho.org>8
x265_2.3.tar.gz/source/input/input.cpp -> x265_2.4.tar.gz/source/input/input.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/input/input.h -> x265_2.4.tar.gz/source/input/input.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/input/y4m.cpp -> x265_2.4.tar.gz/source/input/y4m.cpp
Changed
24
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
9
if (info.skipFrames)10
{11
#if X86_6412
- ifs->seekg((uint64_t)estFrameSize * info.skipFrames, ios::cur);13
+ if (ifs != &cin)14
+ ifs->seekg((uint64_t)estFrameSize * info.skipFrames, ios::cur);15
+ else16
+ for (int i = 0; i < info.skipFrames; i++)17
+ {18
+ ifs->read(buf[0], estFrameSize - framesize);19
+ ifs->read(buf[0], framesize);20
+ }21
#else22
for (int i = 0; i < info.skipFrames; i++)23
ifs->ignore(estFrameSize);24
x265_2.3.tar.gz/source/input/y4m.h -> x265_2.4.tar.gz/source/input/y4m.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/input/yuv.cpp -> x265_2.4.tar.gz/source/input/yuv.cpp
Changed
21
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
9
if (info.skipFrames)10
{11
#if X86_6412
- ifs->seekg((uint64_t)framesize * info.skipFrames, ios::cur);13
+ if (ifs != &cin)14
+ ifs->seekg((uint64_t)framesize * info.skipFrames, ios::cur);15
+ else16
+ for (int i = 0; i < info.skipFrames; i++)17
+ ifs->read(buf[0], framesize);18
#else19
for (int i = 0; i < info.skipFrames; i++)20
ifs->ignore(framesize);21
x265_2.3.tar.gz/source/input/yuv.h -> x265_2.4.tar.gz/source/input/yuv.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/output/output.cpp -> x265_2.4.tar.gz/source/output/output.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013-2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Xinyue Lu <i@7086.in>8
x265_2.3.tar.gz/source/output/output.h -> x265_2.4.tar.gz/source/output/output.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013-2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Xinyue Lu <i@7086.in>8
x265_2.3.tar.gz/source/output/raw.cpp -> x265_2.4.tar.gz/source/output/raw.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013-2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Xinyue Lu <i@7086.in>8
x265_2.3.tar.gz/source/output/raw.h -> x265_2.4.tar.gz/source/output/raw.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013-2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Xinyue Lu <i@7086.in>8
x265_2.3.tar.gz/source/output/reconplay.cpp -> x265_2.4.tar.gz/source/output/reconplay.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Peixuan Zhang <zhangpeixuancn@gmail.com>7
* Chunli Zhang <chunli@multicorewareinc.com>8
x265_2.3.tar.gz/source/output/reconplay.h -> x265_2.4.tar.gz/source/output/reconplay.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Peixuan Zhang <zhangpeixuancn@gmail.com>7
* Chunli Zhang <chunli@multicorewareinc.com>8
x265_2.3.tar.gz/source/output/y4m.cpp -> x265_2.4.tar.gz/source/output/y4m.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/output/y4m.h -> x265_2.4.tar.gz/source/output/y4m.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/output/yuv.cpp -> x265_2.4.tar.gz/source/output/yuv.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/output/yuv.h -> x265_2.4.tar.gz/source/output/yuv.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/profile/PPA/ppa.cpp -> x265_2.4.tar.gz/source/profile/PPA/ppa.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/profile/PPA/ppa.h -> x265_2.4.tar.gz/source/profile/PPA/ppa.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/profile/PPA/ppaApi.h -> x265_2.4.tar.gz/source/profile/PPA/ppaApi.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/profile/vtune/vtune.cpp -> x265_2.4.tar.gz/source/profile/vtune/vtune.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/profile/vtune/vtune.h -> x265_2.4.tar.gz/source/profile/vtune/vtune.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/test/checkasm-a.asm -> x265_2.4.tar.gz/source/test/checkasm-a.asm
Changed
12
1
2
;*****************************************************************************3
;* checkasm-a.asm: assembly check tool4
;*****************************************************************************5
-;* Copyright (C) 2008-2014 x264 project6
-;* Copyright (C) 2013-2015 x265 project7
+;* Copyright (C) 2003-2013 x264 project8
+;* Copyright (C) 2013-2017 MulticoreWare, Inc9
;*10
;* Authors: Loren Merritt <lorenm@u.washington.edu>11
;* Henrik Gramner <henrik@gramner.com>12
x265_2.3.tar.gz/source/test/checkasm-arm.S -> x265_2.4.tar.gz/source/test/checkasm-arm.S
Changed
10
1
2
/****************************************************************************3
* checkasm-arm.S: assembly check tool4
*****************************************************************************5
- * Copyright (C) 2016 x265 project6
+ * Copyright (C) 2013-2017 MulticoreWare, Inc7
*8
* Authors: Martin Storsjo <martin@martin.st>9
* Dnyaneshwar Gorade <dnyaneshwar@multicorewareinc.com>10
x265_2.3.tar.gz/source/test/intrapredharness.cpp -> x265_2.4.tar.gz/source/test/intrapredharness.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Min Chen <chenm003@163.com>7
*8
x265_2.3.tar.gz/source/test/intrapredharness.h -> x265_2.4.tar.gz/source/test/intrapredharness.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Min Chen <chenm003@163.com>7
*8
x265_2.3.tar.gz/source/test/ipfilterharness.cpp -> x265_2.4.tar.gz/source/test/ipfilterharness.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Deepthi Devaki <deepthidevaki@multicorewareinc.com>,7
* Rajesh Paulraj <rajesh@multicorewareinc.com>8
x265_2.3.tar.gz/source/test/ipfilterharness.h -> x265_2.4.tar.gz/source/test/ipfilterharness.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Deepthi Devaki <deepthidevaki@multicorewareinc.com>,7
* Rajesh Paulraj <rajesh@multicorewareinc.com>8
x265_2.3.tar.gz/source/test/mbdstharness.cpp -> x265_2.4.tar.gz/source/test/mbdstharness.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <min.chen@multicorewareinc.com>8
x265_2.3.tar.gz/source/test/mbdstharness.h -> x265_2.4.tar.gz/source/test/mbdstharness.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <min.chen@multicorewareinc.com>8
x265_2.3.tar.gz/source/test/pixelharness.cpp -> x265_2.4.tar.gz/source/test/pixelharness.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/test/pixelharness.h -> x265_2.4.tar.gz/source/test/pixelharness.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/test/regression-tests.txt -> x265_2.4.tar.gz/source/test/regression-tests.txt
Changed
42
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-mode=save --bitrate 7000 --limit-modes,--preset medium --no-cutree --analysis-mode=load --bitrate 7000 --limit-modes6
+BasketballDrive_1920x1080_50.y4m,--preset medium --no-cutree --analysis-mode=save --refine-level 2 --bitrate 7000 --limit-modes,--preset medium --no-cutree --analysis-mode=load --refine-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-mode=save --bitrate 7000,--preset slower --no-cutree --analysis-mode=load --bitrate 700010
+BasketballDrive_1920x1080_50.y4m,--preset slower --no-cutree --analysis-mode=save --refine-level 10 --bitrate 7000 --limit-tu 0,--preset slower --no-cutree --analysis-mode=load --refine-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-mode=save --bitrate 7000 --tskip-fast --limit-tu 4,--preset veryslow --no-cutree --analysis-mode=load --bitrate 7000 --tskip-fast --limit-tu 413
BasketballDrive_1920x1080_50.y4m,--preset veryslow --recon-y4m-exec "ffplay -i pipe:0 -autoexit"14
Coastguard-4k.y4m,--preset ultrafast --recon-y4m-exec "ffplay -i pipe:0 -autoexit"15
Coastguard-4k.y4m,--preset superfast --tune grain --overscan=crop16
Coastguard-4k.y4m,--preset superfast --tune grain --pme --aq-strength 2 --merange 19017
-Coastguard-4k.y4m,--preset veryfast --no-cutree --analysis-mode=save --bitrate 15000,--preset veryfast --no-cutree --analysis-mode=load --bitrate 1500018
+Coastguard-4k.y4m,--preset veryfast --no-cutree --analysis-mode=save --refine-level 1 --bitrate 15000,--preset veryfast --no-cutree --analysis-mode=load --refine-level 1 --bitrate 1500019
Coastguard-4k.y4m,--preset medium --rdoq-level 1 --tune ssim --no-signhide --me umh --slices 220
Coastguard-4k.y4m,--preset slow --tune psnr --cbqpoffs -1 --crqpoffs 1 --limit-refs 121
CrowdRun_1920x1080_50_10bit_422.yuv,--preset ultrafast --weightp --tune zerolatency --qg-size 1622
23
KristenAndSara_1280x720_60.y4m,--preset slower --pmode --max-tu-size 8 --limit-refs 0 --limit-modes --limit-tu 124
NebutaFestival_2560x1600_60_10bit_crop.yuv,--preset superfast --tune psnr25
NebutaFestival_2560x1600_60_10bit_crop.yuv,--preset medium --tune grain --limit-refs 226
-NebutaFestival_2560x1600_60_10bit_crop.yuv,--preset slow --no-cutree --analysis-mode=save --bitrate 9000,--preset slow --no-cutree --analysis-mode=load --bitrate 900027
-News-4k.y4m,--preset ultrafast --no-cutree --analysis-mode=save --bitrate 15000,--preset ultrafast --no-cutree --analysis-mode=load --bitrate 1500028
+NebutaFestival_2560x1600_60_10bit_crop.yuv,--preset slow --no-cutree --analysis-mode=save --rd 5 --refine-level 10 --bitrate 9000,--preset slow --no-cutree --analysis-mode=load --rd 5 --refine-level 10 --bitrate 900029
+News-4k.y4m,--preset ultrafast --no-cutree --analysis-mode=save --refine-level 2 --bitrate 15000,--preset ultrafast --no-cutree --analysis-mode=load --refine-level 2 --bitrate 1500030
News-4k.y4m,--preset superfast --lookahead-slices 6 --aq-mode 031
News-4k.y4m,--preset superfast --slices 4 --aq-mode 0 32
News-4k.y4m,--preset medium --tune ssim --no-sao --qg-size 1633
34
old_town_cross_444_720p50.y4m,--preset superfast --weightp --min-cu 16 --limit-modes35
old_town_cross_444_720p50.y4m,--preset veryfast --qp 1 --tune ssim36
old_town_cross_444_720p50.y4m,--preset faster --rd 1 --tune zero-latency37
-old_town_cross_444_720p50.y4m,--preset fast --no-cutree --analysis-mode=save --bitrate 3000 --early-skip,--preset fast --no-cutree --analysis-mode=load --bitrate 3000 --early-skip38
+old_town_cross_444_720p50.y4m,--preset fast --no-cutree --analysis-mode=save --refine-level 1 --bitrate 3000 --early-skip,--preset fast --no-cutree --analysis-mode=load --refine-level 1 --bitrate 3000 --early-skip39
old_town_cross_444_720p50.y4m,--preset medium --keyint -1 --no-weightp --ref 640
old_town_cross_444_720p50.y4m,--preset slow --rdoq-level 1 --early-skip --ref 7 --no-b-pyramid41
old_town_cross_444_720p50.y4m,--preset slower --crf 4 --cu-lossless42
x265_2.3.tar.gz/source/test/smoke-tests.txt -> x265_2.4.tar.gz/source/test/smoke-tests.txt
Changed
9
1
2
DucksAndLegs_1920x1080_60_10bit_422.yuv,--preset=veryfast --min-cu 163
DucksAndLegs_1920x1080_60_10bit_422.yuv,--preset=fast --weightb --interlace bff4
DucksAndLegs_1920x1080_60_10bit_422.yuv,--preset=veryslow --limit-ref 1 --limit-mode --tskip --limit-tu 15
-6
+CrowdRun_1920x1080_50_10bit_444.yuv,--preset=superfast --bitrate 7000 --sao --limit-sao7
# Main12 intraCost overflow bug test8
720p50_parkrun_ter.y4m,--preset medium9
x265_2.3.tar.gz/source/test/testbench.cpp -> x265_2.4.tar.gz/source/test/testbench.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Gopu Govindaswamy <gopu@govindaswamy.org>7
* Mandar Gurav <mandar@multicorewareinc.com>8
x265_2.3.tar.gz/source/test/testharness.h -> x265_2.4.tar.gz/source/test/testharness.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
x265_2.3.tar.gz/source/x265-extras.cpp -> x265_2.4.tar.gz/source/x265-extras.cpp
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Selvakumar Nithiyaruban <selvakumar@multicorewareinc.com>8
x265_2.3.tar.gz/source/x265-extras.h -> x265_2.4.tar.gz/source/x265-extras.h
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2015 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/x265.cpp -> x265_2.4.tar.gz/source/x265.cpp
Changed
16
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
9
#define CONSOLE_TITLE_SIZE 20010
#ifdef _WIN3211
#include <windows.h>12
+#define SetThreadExecutionState(es)13
static char orgConsoleTitle[CONSOLE_TITLE_SIZE] = "";14
#else15
#define GetConsoleTitle(t, n)16
x265_2.3.tar.gz/source/x265.h -> x265_2.4.tar.gz/source/x265.h
Changed
96
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
9
uint32_t numCUsInFrame;10
uint32_t numPartitions;11
int bScenecut;12
+ void* wt;13
void* interData;14
void* intraData;15
} x265_analysis_data;16
17
18
/* Enable weighted prediction in B slices. Default is disabled */19
int bEnableWeightedBiPred;20
-21
/* Enable source pixels in motion estimation. Default is disabled */22
- int bSourceReferenceEstimation;23
-24
+ int bSourceReferenceEstimation;25
/*== Loop Filters ==*/26
-27
/* Enable the deblocking loop filter, which improves visual quality by28
* reducing blocking effects at block edges, particularly at lower bitrates29
* or higher QP. When enabled it adds another CU row of reference lag,30
31
32
/* Enable storing commonly RPS in SPS in multi pass mode */33
int bMultiPassOptRPS;34
-35
/* This value represents the percentage difference between the inter cost and36
* intra cost of a frame used in scenecut detection. Default 5. */37
- double scenecutBias;38
-39
+ double scenecutBias;40
/* Use multiple worker threads dedicated to doing only lookahead instead of sharing41
* the worker threads with Frame Encoders. A dedicated lookahead threadpool is created with the42
* specified number of worker threads. This can range from 0 upto half the43
* hardware threads available for encoding. Using too many threads for lookahead can starve44
* resources for frame Encoder and can harm performance. Default is 0 - disabled. */45
int lookaheadThreads;46
-47
/* Optimize CU level QPs to signal consistent deltaQPs in frame for rd level > 4 */48
- int bOptCUDeltaQP;49
-50
+ int bOptCUDeltaQP;51
/* Refine analysis in multipass ratecontrol based on analysis information stored */52
- int analysisMultiPassRefine;53
-54
+ int analysisMultiPassRefine;55
/* Refine analysis in multipass ratecontrol based on distortion data stored */56
- int analysisMultiPassDistortion;57
-58
+ int analysisMultiPassDistortion;59
/* Adaptive Quantization based on relative motion */60
- int bAQMotion;61
-62
+ int bAQMotion;63
/* SSIM based RDO, based on residual divisive normalization scheme. Used for mode64
* selection during analysis of CTUs, can achieve significant gain in terms of 65
* objective quality metrics SSIM and PSNR */66
67
* Auto-enabled when max-cll, max-fall, or mastering display info is specified.68
* Default is disabled */69
int bEmitHDRSEI;70
-} x265_param;71
72
+ /* Enable luma and chroma offsets for HDR/WCG content.73
+ * Default is disabled */74
+ int bHDROpt;75
+76
+ /* A value between 1 and 10 (both inclusive) determines the level of77
+ * information stored/reused in save/load analysis-mode. Higher the refine78
+ * level higher the informtion stored/reused. Default is 5 */79
+ int analysisRefineLevel;80
+81
+ /* Limit Sample Adaptive Offset filter computation by early terminating SAO82
+ * process based on inter prediction mode, CTU spatial-domain correlations,83
+ * and relations between luma and chroma */84
+ int bLimitSAO;85
+86
+ /* File containing the tone mapping information */87
+ const char* toneMapFile;88
+89
+ /* Insert tone mapping information only for IDR frames and when the 90
+ * tone mapping information changes. */91
+ int bDhdr10opt;92
+} x265_param;93
/* x265_param_alloc:94
* Allocates an x265_param instance. The returned param structure is not95
* special in any way, but using this method together with x265_param_free()96
x265_2.3.tar.gz/source/x265_config.h.in -> x265_2.4.tar.gz/source/x265_config.h.in
Changed
8
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
*8
x265_2.3.tar.gz/source/x265cli.h -> x265_2.4.tar.gz/source/x265cli.h
Changed
65
1
2
/*****************************************************************************3
- * Copyright (C) 2013 x265 project4
+ * Copyright (C) 2013-2017 MulticoreWare, Inc5
*6
* Authors: Steve Borho <steve@borho.org>7
* Min Chen <chenm003@163.com>8
9
{ "no-multi-pass-opt-rps", no_argument, NULL, 0 },10
{ "analysis-mode", required_argument, NULL, 0 },11
{ "analysis-file", required_argument, NULL, 0 },12
+ { "refine-level", required_argument, NULL, 0 },13
{ "strict-cbr", no_argument, NULL, 0 },14
{ "temporal-layers", no_argument, NULL, 0 },15
{ "no-temporal-layers", no_argument, NULL, 0 },16
17
{ "no-ssim-rd", no_argument, NULL, 0 },18
{ "hdr", no_argument, NULL, 0 },19
{ "no-hdr", no_argument, NULL, 0 },20
+ { "hdr-opt", no_argument, NULL, 0 },21
+ { "no-hdr-opt", no_argument, NULL, 0 },22
+ { "limit-sao", no_argument, NULL, 0 },23
+ { "no-limit-sao", no_argument, NULL, 0 },24
+ { "dhdr10-info", required_argument, NULL, 0 },25
+ { "dhdr10-opt", no_argument, NULL, 0},26
+ { "no-dhdr10-opt", no_argument, NULL, 0},27
{ 0, 0, 0, 0 },28
{ 0, 0, 0, 0 },29
{ 0, 0, 0, 0 },30
31
H1(" 1 - i420 (4:2:0 default)\n");32
H1(" 2 - i422 (4:2:2)\n");33
H1(" 3 - i444 (4:4:4)\n");34
+#if ENABLE_DYNAMIC_HDR1035
+ H0(" --dhdr10-info <filename> JSON file containing the Creative Intent Metadata to be encoded as Dynamic Tone Mapping \n");36
+ H0(" --[no-]dhdr10-opt Insert tone mapping SEI only for IDR frames and when the tone mapping information changes. Default disabled");37
+#endif38
H0("-f/--frames <integer> Maximum number of frames to encode. Default all\n");39
H0(" --seek <integer> First frame to encode\n");40
H1(" --[no-]interlace <bff|tff> Indicate input pictures are interlace fields in temporal order. Default progressive\n");41
42
H0(" --[no-]strict-cbr Enable stricter conditions and tolerance for bitrate deviations in CBR mode. Default %s\n", OPT(param->rc.bStrictCbr));43
H0(" --analysis-mode <string|int> save - Dump analysis info into file, load - Load analysis buffers from the file. Default %d\n", param->analysisMode);44
H0(" --analysis-file <filename> Specify file name used for either dumping or reading analysis data.\n");45
+ H0(" --refine-level <1..10> Level of analysis refinement indicates amount of info stored/reused in save/load mode, 1:least....10:most. Default %d\n", param->analysisRefineLevel);46
H0(" --aq-mode <integer> Mode for Adaptive Quantization - 0:none 1:uniform AQ 2:auto variance 3:auto variance with bias to dark scenes. Default %d\n", param->rc.aqMode);47
H0(" --aq-strength <float> Reduces blocking and blurring in flat and textured areas (0 to 3.0). Default %.2f\n", param->rc.aqStrength);48
H0(" --[no-]aq-motion Adaptive Quantization based on the relative motion of each CU w.r.t., frame. Default %s\n", OPT(param->bOptCUDeltaQP));49
50
H0(" --[no-]deblock Enable Deblocking Loop Filter, optionally specify tC:Beta offsets Default %s\n", OPT(param->bEnableLoopFilter));51
H0(" --[no-]sao Enable Sample Adaptive Offset. Default %s\n", OPT(param->bEnableSAO));52
H1(" --[no-]sao-non-deblock Use non-deblocked pixels, else right/bottom boundary areas skipped. Default %s\n", OPT(param->bSaoNonDeblocked));53
+ H0(" --[no-]limit-sao Limit Sample Adaptive Offset types. Default %s\n", OPT(param->bLimitSAO));54
H0("\nVUI options:\n");55
H0(" --sar <width:height|int> Sample Aspect Ratio, the ratio of width to height of an individual pixel.\n");56
H0(" Choose from 0=undef, 1=1:1(\"square\"), 2=12:11, 3=10:11, 4=16:11,\n");57
58
H0(" format: G(x,y)B(x,y)R(x,y)WP(x,y)L(max,min)\n");59
H0(" --max-cll <string> Emit content light level info SEI as \"cll,fall\" (HDR)\n");60
H0(" --[no-]hdr Control dumping of HDR SEI packet. If max-cll or master-display has non-zero values, this is enabled. Default %s\n", OPT(param->bEmitHDRSEI));61
+ H0(" --[no-]hdr-opt Add luma and chroma offsets for HDR/WCG content. Default %s\n", OPT(param->bHDROpt));62
H0(" --min-luma <integer> Minimum luma plane value of input source picture\n");63
H0(" --max-luma <integer> Maximum luma plane value of input source picture\n");64
H0("\nBitstream options:\n");65
Refresh
No build results available
Refresh
No rpmlint results available
Login required, please
login
or
signup
in order to comment
Request History
enzokiel created request almost 8 years ago
Update to version 2.4
enzokiel accepted request almost 8 years ago