@@ -1,4 +1,53 @@

 -------------------------------------------------------------------

+Fri Dec 01 16:40:13 UTC 2017 - joerg.lorenzen@ki.tng.de

+

+- Update to version 2.6

+  New features

+  * x265 can now refine analysis from a previous HEVC encode (using

+    options --refine-inter, and --refine-intra), or a previous AVC

+    encode (using option --refine-mv-type). The previous encode’s

+    information can be packaged using the x265_analysis_data_t data

+    field available in the x265_picture object.

+  * Basic support for segmented (or chunked) encoding added with

+    --vbv-end that can specify the status of CPB at the end of a

+    segment. String this together with --vbv-init to encode a title

+    as chunks while maintaining VBV compliance!

+  * --force-flush can be used to trigger a premature flush of the

+    encoder. This option is beneficial when input is known to be

+    bursty, and may be at a rate slower than the encoder.

+  * Experimental feature --lowpass-dct that uses truncated DCT for

+    transformation.

+  Encoder enhancements

+  * Slice-parallel mode gets a significant boost in performance,

+    particularly in low-latency mode.

+  * x265 now officially supported on VS2017.

+  * x265 now supports all depths from mono0 to mono16 for Y4M

+    format.

+  API changes

+  * Options that modified PPS dynamically (--opt-qp-pps and

+    --opt-ref-list-length-pps) are now disabled by default to

+    enable users to save bits by not sending headers. If these

+    options are enabled, headers have to be repeated for every GOP.

+  * Rate-control and analysis parameters can dynamically be

+    reconfigured simultaneously via the x265_encoder_reconfig API.

+  * New API functions to extract intermediate information such as

+    slice-type, scenecut information, reference frames, etc. are

+    now available. This information may be beneficial to

+    integrating applications that are attempting to perform

+    content-adaptive encoding. Refer to documentation on

+    x265_get_slicetype_poc_and_scenecut, and

+    x265_get_ref_frame_list for more details and suggested usage.

+  * A new API to pass supplemental CTU information to x265 to

+    influence analysis decisions has been added. Refer to

+    documentation on x265_encoder_ctu_info for more details.

+  Bug fixes

+  * Bug fixes when --slices is used with VBV settings.

+  * Minor memory leak fixed for HDR10+ builds, and default x265

+    when pools option is specified.

+  * HDR10+ bug fix to remove dependence on poc counter to select

+    meta-data information.

+

+-------------------------------------------------------------------

 Thu Jul 27 08:33:52 UTC 2017 - joerg.lorenzen@ki.tng.de

 - Update to version 2.5

​

@@ -1,10 +1,10 @@

 # based on the spec file from https://build.opensuse.org/package/view_file/home:Simmphonie/libx265/

 Name:           x265

-%define soname  130

+%define soname  146

 %define libname lib%{name}

 %define libsoname %{libname}-%{soname}

-Version:        2.5

+Version:        2.6

 Release:        0

 License:        GPL-2.0+

 Summary:        A free h265/HEVC encoder - encoder binary

@@ -49,7 +49,7 @@

 streams. 

 %prep

-%setup -q -n %{name}_%{version}

+%setup -q -n %{name}_v%{version}

 %patch0 -p1

 %patch1 -p1

​

@@ -1,447 +0,0 @@

-/*****************************************************************************

- * Copyright (C) 2013-2017 MulticoreWare, Inc

- *

- * Authors: Steve Borho <steve@borho.org>

- *          Selvakumar Nithiyaruban <selvakumar@multicorewareinc.com>

- *          Divya Manivannan <divya@multicorewareinc.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.

- *

- * This program is also available under a commercial proprietary license.

- * For more information, contact us at license @ x265.com.

- *****************************************************************************/

-

-#include "x265.h"

-#include "x265-extras.h"

-#include "param.h"

-#include "common.h"

-

-using namespace X265_NS;

-

-static const char* summaryCSVHeader =

-    "Command, Date/Time, Elapsed Time, FPS, Bitrate, "

-    "Y PSNR, U PSNR, V PSNR, Global PSNR, SSIM, SSIM (dB), "

-    "I count, I ave-QP, I kbps, I-PSNR Y, I-PSNR U, I-PSNR V, I-SSIM (dB), "

-    "P count, P ave-QP, P kbps, P-PSNR Y, P-PSNR U, P-PSNR V, P-SSIM (dB), "

-    "B count, B ave-QP, B kbps, B-PSNR Y, B-PSNR U, B-PSNR V, B-SSIM (dB), "

-    "MaxCLL, MaxFALL, Version\n";

-

-FILE* x265_csvlog_open(const x265_param& param, const char* fname, int level)

-{

-    FILE *csvfp = x265_fopen(fname, "r");

-    if (csvfp)

-    {

-        /* file already exists, re-open for append */

-        fclose(csvfp);

-        return x265_fopen(fname, "ab");

-    }

-    else

-    {

-        /* new CSV file, write header */

-        csvfp = x265_fopen(fname, "wb");

-        if (csvfp)

-        {

-            if (level)

-            {

-                fprintf(csvfp, "Encode Order, Type, POC, QP, Bits, Scenecut, ");

-                if (level >= 2)

-                    fprintf(csvfp, "I/P cost ratio, ");

-                if (param.rc.rateControlMode == X265_RC_CRF)

-                    fprintf(csvfp, "RateFactor, ");

-                if (param.rc.vbvBufferSize)

-                    fprintf(csvfp, "BufferFill, ");

-                if (param.bEnablePsnr)

-                    fprintf(csvfp, "Y PSNR, U PSNR, V PSNR, YUV PSNR, ");

-                if (param.bEnableSsim)

-                    fprintf(csvfp, "SSIM, SSIM(dB), ");

-                fprintf(csvfp, "Latency, ");

-                fprintf(csvfp, "List 0, List 1");

-                uint32_t size = param.maxCUSize;

-                for (uint32_t depth = 0; depth <= param.maxCUDepth; depth++)

-                {

-                    fprintf(csvfp, ", Intra %dx%d DC, Intra %dx%d Planar, Intra %dx%d Ang", size, size, size, size, size, size);

-                    size /= 2;

-                }

-                fprintf(csvfp, ", 4x4");

-                size = param.maxCUSize;

-                if (param.bEnableRectInter)

-                {

-                    for (uint32_t depth = 0; depth <= param.maxCUDepth; depth++)

-                    {

-                        fprintf(csvfp, ", Inter %dx%d, Inter %dx%d (Rect)", size, size, size, size);

-                        if (param.bEnableAMP)

-                            fprintf(csvfp, ", Inter %dx%d (Amp)", size, size);

-                        size /= 2;

-                    }

-                }

-                else

-                {

-                    for (uint32_t depth = 0; depth <= param.maxCUDepth; depth++)

-                    {

-                        fprintf(csvfp, ", Inter %dx%d", size, size);

-                        size /= 2;

-                    }

-                }

-                size = param.maxCUSize;

-                for (uint32_t depth = 0; depth <= param.maxCUDepth; depth++)

-                {

-                    fprintf(csvfp, ", Skip %dx%d", size, size);

-                    size /= 2;

-                }

-                size = param.maxCUSize;

-                for (uint32_t depth = 0; depth <= param.maxCUDepth; depth++)

-                {

-                    fprintf(csvfp, ", Merge %dx%d", size, size);

-                    size /= 2;

-                }

-

-                if (level >= 2)

-                {

-                    fprintf(csvfp, ", Avg Luma Distortion, Avg Chroma Distortion, Avg psyEnergy, Avg Residual Energy,"

-                        " Min Luma Level, Max Luma Level, Avg Luma Level");

-

-                    if (param.internalCsp != X265_CSP_I400)

-                        fprintf(csvfp, ", Min Cb Level, Max Cb Level, Avg Cb Level, Min Cr Level, Max Cr Level, Avg Cr Level");

-

-                    /* PU statistics */

-                    size = param.maxCUSize;

-                    for (uint32_t i = 0; i< param.maxLog2CUSize - (uint32_t)g_log2Size[param.minCUSize] + 1; i++)

-                    {

-                        fprintf(csvfp, ", Intra %dx%d", size, size);

-                        fprintf(csvfp, ", Skip %dx%d", size, size);

-                        fprintf(csvfp, ", AMP %d", size);

-                        fprintf(csvfp, ", Inter %dx%d", size, size);

-                        fprintf(csvfp, ", Merge %dx%d", size, size);

-                        fprintf(csvfp, ", Inter %dx%d", size, size / 2);

-                        fprintf(csvfp, ", Merge %dx%d", size, size / 2);

-                        fprintf(csvfp, ", Inter %dx%d", size / 2, size);

-                        fprintf(csvfp, ", Merge %dx%d", size / 2, size);

-                        size /= 2;

-                    }

-

-                    if ((uint32_t)g_log2Size[param.minCUSize] == 3)

-                        fprintf(csvfp, ", 4x4");

-

-                    /* detailed performance statistics */

-                    fprintf(csvfp, ", DecideWait (ms), Row0Wait (ms), Wall time (ms), Ref Wait Wall (ms), Total CTU time (ms),"

-                    "Stall Time (ms), Total frame time (ms), Avg WPP, Row Blocks");

-                }

-                fprintf(csvfp, "\n");

-            }

-            else

-                fputs(summaryCSVHeader, csvfp);

-        }

-        return csvfp;

-    }

-}

-

-// per frame CSV logging

-void x265_csvlog_frame(FILE* csvfp, const x265_param& param, const x265_picture& pic, int level)

-{

-    if (!csvfp)

-        return;

-

-    const x265_frame_stats* frameStats = &pic.frameData;

-    fprintf(csvfp, "%d, %c-SLICE, %4d, %2.2lf, %10d, %d,", frameStats->encoderOrder, frameStats->sliceType, frameStats->poc, 

-                                                           frameStats->qp, (int)frameStats->bits, frameStats->bScenecut);

-    if (level >= 2)

-        fprintf(csvfp, "%.2f,", frameStats->ipCostRatio);

-    if (param.rc.rateControlMode == X265_RC_CRF)

-        fprintf(csvfp, "%.3lf,", frameStats->rateFactor);

-    if (param.rc.vbvBufferSize)

-        fprintf(csvfp, "%.3lf,", frameStats->bufferFill);

-    if (param.bEnablePsnr)

-        fprintf(csvfp, "%.3lf, %.3lf, %.3lf, %.3lf,", frameStats->psnrY, frameStats->psnrU, frameStats->psnrV, frameStats->psnr);

-    if (param.bEnableSsim)

-        fprintf(csvfp, " %.6f, %6.3f,", frameStats->ssim, x265_ssim2dB(frameStats->ssim));

-    fprintf(csvfp, "%d, ", frameStats->frameLatency);

-    if (frameStats->sliceType == 'I' || frameStats->sliceType == 'i')

-        fputs(" -, -,", csvfp);

-    else

-    {

-        int i = 0;

-        while (frameStats->list0POC[i] != -1)

-            fprintf(csvfp, "%d ", frameStats->list0POC[i++]);

-        fprintf(csvfp, ",");

-        if (frameStats->sliceType != 'P')

-        {

-            i = 0;

-            while (frameStats->list1POC[i] != -1)

-                fprintf(csvfp, "%d ", frameStats->list1POC[i++]);

-            fprintf(csvfp, ",");

-        }

-        else

-            fputs(" -,", csvfp);

-    }

-

-    if (level)

-    {

-        for (uint32_t depth = 0; depth <= param.maxCUDepth; depth++)

-            fprintf(csvfp, "%5.2lf%%, %5.2lf%%, %5.2lf%%,", frameStats->cuStats.percentIntraDistribution[depth][0],

-            frameStats->cuStats.percentIntraDistribution[depth][1],

-            frameStats->cuStats.percentIntraDistribution[depth][2]);

-        fprintf(csvfp, "%5.2lf%%", frameStats->cuStats.percentIntraNxN);

-        if (param.bEnableRectInter)

-        {

-            for (uint32_t depth = 0; depth <= param.maxCUDepth; depth++)

-            {

​

@@ -1,66 +0,0 @@

-/*****************************************************************************

- * Copyright (C) 2013-2017 MulticoreWare, Inc

- *

- * Authors: Steve Borho <steve@borho.org>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.

- *

- * This program is also available under a commercial proprietary license.

- * For more information, contact us at license @ x265.com.

- *****************************************************************************/

-

-#ifndef X265_EXTRAS_H

-#define X265_EXTRAS_H 1

-

-#include "x265.h"

-

-#include <stdio.h>

-#include <stdint.h>

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#if _WIN32

-#define LIBAPI __declspec(dllexport)

-#else

-#define LIBAPI

-#endif

-

-/* Open a CSV log file. On success it returns a file handle which must be passed

- * to x265_csvlog_frame() and/or x265_csvlog_encode(). The file handle must be

- * closed by the caller using fclose(). If level is 0, then no frame logging

- * header is written to the file. This function will return NULL if it is unable

- * to open the file for write or if it detects a structure size skew */

-LIBAPI FILE* x265_csvlog_open(const x265_param& param, const char* fname, int level);

-

-/* Log frame statistics to the CSV file handle. level should have been non-zero

- * in the call to x265_csvlog_open() if this function is called. */

-LIBAPI void x265_csvlog_frame(FILE* csvfp, const x265_param& param, const x265_picture& pic, int level);

-

-/* Log final encode statistics to the CSV file handle. 'argc' and 'argv' are

- * intended to be command line arguments passed to the encoder. Encode

- * statistics should be queried from the encoder just prior to closing it. */

-LIBAPI void x265_csvlog_encode(FILE* csvfp, const char* version, const x265_param& param, int padx, int pady, const x265_stats& stats, int level, int argc, char** argv);

-

-/* In-place downshift from a bit-depth greater than 8 to a bit-depth of 8, using

- * the residual bits to dither each row. */

-LIBAPI void x265_dither_image(const x265_api& api, x265_picture&, int picWidth, int picHeight, int16_t *errorBuf, int bitDepth);

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

​

@@ -1,4 +1,4 @@

 repo: 09fe40627f03a0f9c3e6ac78b22ac93da23f9fdf

-node: 64b2d0bf45a52511e57a6b7299160b961ca3d51c

+node: 0e9ea76945c89962cd46cee6537586e2054b2935

 branch: stable

-tag: 2.5

+tag: 2.6

​

@@ -23,3 +23,4 @@

 be14a7e9755e54f0fd34911c72bdfa66981220bc 2.2

 3037c1448549ca920967831482c653e5892fa8ed 2.3

 e7a4dd48293b7956d4a20df257d23904cc78e376 2.4

+64b2d0bf45a52511e57a6b7299160b961ca3d51c 2.5

​

@@ -0,0 +1,27 @@

+#!/bin/sh

+# This is to generate visual studio builds with required environment variables set in this shell, useful for ffmpeg integration

+# Run this from within an MSYS bash shell

+

+target_processor='amd64'

+path=$(which cl)

+

+if cl; then

+    echo

+else

+    echo "please launch 'visual studio command prompt' and run '..\vcvarsall.bat amd64'"

+    echo "and then launch msys bash shell from there"

+    exit 1

+fi

+

+if [[ $path  == *$target_processor* ]]; then

+    echo

+else

+    echo "64 bit target not set, please launch 'visual studio command prompt' and run '..\vcvarsall.bat amd64 | x86_amd64 | amd64_x86'"

+    exit 1

+fi

+

+cmake -G "NMake Makefiles" -DCMAKE_CXX_FLAGS="-DWIN32 -D_WINDOWS -W4 -GR -EHsc" -DCMAKE_C_FLAGS="-DWIN32 -D_WINDOWS -W4"  ../../source

+if [ -e Makefile ]

+then

+    nmake

+fi

\ No newline at end of file

​

@@ -0,0 +1,17 @@

+#!/bin/sh

+# This is to generate visual studio builds with required environment variables set in this shell, useful for ffmpeg integration

+# Run this from within an MSYS bash shell

+

+if cl; then

+    echo 

+else

+    echo "please launch msys from 'visual studio command prompt'"

+    exit 1

+fi

+

+cmake -G "NMake Makefiles" -DCMAKE_CXX_FLAGS="-DWIN32 -D_WINDOWS -W4 -GR -EHsc" -DCMAKE_C_FLAGS="-DWIN32 -D_WINDOWS -W4"  ../../source

+

+if [ -e Makefile ]

+then

+    nmake

+fi

\ No newline at end of file

​

@@ -0,0 +1,14 @@

+@echo off

+if "%VS150COMNTOOLS%" == "" (

+  msg "%username%" "Visual Studio 15 not detected"

+  exit 1

+)

+if not exist x265.sln (

+  call make-solutions.bat

+)

+if exist x265.sln (

+  call "%VS150COMNTOOLS%\..\..\VC\vcvarsall.bat"

+  MSBuild /property:Configuration="Release" x265.sln

+  MSBuild /property:Configuration="Debug" x265.sln

+  MSBuild /property:Configuration="RelWithDebInfo" x265.sln

+)

​

@@ -0,0 +1,6 @@

+@echo off

+::

+:: run this batch file to create a Visual Studio solution file for this project.

+:: See the cmake documentation for other generator targets

+::

+cmake -G "Visual Studio 15" ..\..\source && cmake-gui ..\..\source

​

@@ -0,0 +1,14 @@

+@echo off

+if "%VS150COMNTOOLS%" == "" (

+  msg "%username%" "Visual Studio 15 not detected"

+  exit 1

+)

+if not exist x265.sln (

+  call make-solutions.bat

+)

+if exist x265.sln (

+  call "%VS150COMNTOOLS%\..\..\VC\vcvarsall.bat"

+  MSBuild /property:Configuration="Release" x265.sln

+  MSBuild /property:Configuration="Debug" x265.sln

+  MSBuild /property:Configuration="RelWithDebInfo" x265.sln

+)

​

@@ -0,0 +1,6 @@

+@echo off

+::

+:: run this batch file to create a Visual Studio solution file for this project.

+:: See the cmake documentation for other generator targets

+::

+cmake -G "Visual Studio 15 Win64" ..\..\source && cmake-gui ..\..\source

​

@@ -0,0 +1,44 @@

+@echo off

+if "%VS150COMNTOOLS%" == "" (

+  msg "%username%" "Visual Studio 15 not detected"

+  exit 1

+)

+

+call "%VS150COMNTOOLS%\..\..\VC\vcvarsall.bat"

+

+@mkdir 12bit

+@mkdir 10bit

+@mkdir 8bit

+

+@cd 12bit

+cmake -G "Visual Studio 15 Win64" ../../../source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON

+if exist x265.sln (

+  MSBuild /property:Configuration="Release" x265.sln

+  copy/y Release\x265-static.lib ..\8bit\x265-static-main12.lib

+)

+

+@cd ..\10bit

+cmake -G "Visual Studio 15 Win64" ../../../source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF

+if exist x265.sln (

+  MSBuild /property:Configuration="Release" x265.sln

+  copy/y Release\x265-static.lib ..\8bit\x265-static-main10.lib

+)

+

+@cd ..\8bit

+if not exist x265-static-main10.lib (

+  msg "%username%" "10bit build failed"

+  exit 1

+)

+if not exist x265-static-main12.lib (

+  msg "%username%" "12bit build failed"

+  exit 1

+)

+cmake -G "Visual Studio 15 Win64" ../../../source -DEXTRA_LIB="x265-static-main10.lib;x265-static-main12.lib" -DLINKED_10BIT=ON -DLINKED_12BIT=ON

+if exist x265.sln (

+  MSBuild /property:Configuration="Release" x265.sln

+  :: combine static libraries (ignore warnings caused by winxp.cpp hacks)

+  move Release\x265-static.lib x265-static-main.lib

+  LIB.EXE /ignore:4006 /ignore:4221 /OUT:Release\x265-static.lib x265-static-main.lib x265-static-main10.lib x265-static-main12.lib

+)

+

+pause

​

@@ -192,12 +192,36 @@

     *      presets is not recommended without a more fine-grained breakdown of

     *      parameters to take this into account. */

    int x265_encoder_reconfig(x265_encoder *, x265_param *);

-**x265_encoder_ctu_info**

-       /* x265_encoder_ctu_info:

-        *    Copy CTU information such as ctu address and ctu partition structure of all

-        *    CTUs in each frame. The function is invoked only if "--ctu-info" is enabled and

-        *    the encoder will wait for this copy to complete if enabled.

-        */

+

+**x265_get_slicetype_poc_and_scenecut()** may be used to fetch slice type, poc and scene cut information mid-encode::

+

+    /* x265_get_slicetype_poc_and_scenecut:

+     *     get the slice type, poc and scene cut information for the current frame,

+     *     returns negative on error, 0 on success.

+     *     This API must be called after(poc >= lookaheadDepth + bframes + 2) condition check. */

+     int x265_get_slicetype_poc_and_scenecut(x265_encoder *encoder, int *slicetype, int *poc, int* sceneCut);

+

+**x265_get_ref_frame_list()** may be used to fetch forward and backward refrence list::

+

+    /* x265_get_ref_frame_list:

+     *     returns negative on error, 0 when access unit were output.

+     *     This API must be called after(poc >= lookaheadDepth + bframes + 2) condition check */

+     int x265_get_ref_frame_list(x265_encoder *encoder, x265_picyuv**, x265_picyuv**, int, int);

+ 

+**x265_encoder_ctu_info** may be used to provide additional CTU-specific information to the encoder::

+

+    /* x265_encoder_ctu_info:

+     *    Copy CTU information such as ctu address and ctu partition structure of all

+     *    CTUs in each frame. The function is invoked only if "--ctu-info" is enabled and

+     *    the encoder will wait for this copy to complete if enabled.*/

+    int x265_encoder_ctu_info(x265_encoder *encoder, int poc, x265_ctu_info_t** ctu);

+

+**x265_set_analysis_data()** may be used to recive analysis information from external application::

+

+    /* x265_set_analysis_data:

+     *     set the analysis data. The incoming analysis_data structure is assumed to be AVC-sized blocks.

+     *     returns negative on error, 0 access unit were output.*/

+     int x265_set_analysis_data(x265_encoder *encoder, x265_analysis_data *analysis_data, int poc, uint32_t cuBytes);

 Pictures

 ========

​

@@ -399,6 +399,18 @@

    Default: 1 slice per frame. **Experimental feature**

+.. option:: --copy-pic, --no-copy-pic

+

+   Allow encoder to copy input x265 pictures to internal frame buffers. When disabled,

+   x265 will not make an internal copy of the input picture and will work with the

+   application's buffers. While this allows for deeper integration, it is the responsbility

+   of the application to (a) ensure that the allocated picture has extra space for padding

+   that will be done by the library, and (b) the buffers aren't recycled until the library

+   has completed encoding this frame (which can be figured out by tracking NALs output by x265)

+

+   Default: enabled

+

+

 Input/Output File Options

 =========================

@@ -875,17 +887,26 @@

    Note that --analysis-reuse-level must be paired with analysis-reuse-mode.

-   +--------+-----------------------------------------+

-   | Level  | Description                             |

-   +========+=========================================+

-   | 1      | Lookahead information                   |

-   +--------+-----------------------------------------+

-   | 2 to 4 | Level 1 + intra/inter modes, ref's      |

-   +--------+-----------------------------------------+

-   | 5 to 9 | Level 2 + rect-amp                      |

-   +--------+-----------------------------------------+

-   | 10     | Level 5 + Full CU analysis-info         |

-   +--------+-----------------------------------------+

+    +--------------+------------------------------------------+

+    | Level        | Description                              |

+    +==============+==========================================+

+    | 1            | Lookahead information                    |

+    +--------------+------------------------------------------+

+    | 2 to 4       | Level 1 + intra/inter modes, ref's       |

+    +--------------+------------------------------------------+

+    | 5,6 and 9    | Level 2 + rect-amp                       |

+    +--------------+------------------------------------------+

+    | 7            | Level 5 + AVC size CU refinement         |

+    +--------------+------------------------------------------+

+    | 8            | Level 5 + AVC size Full CU analysis-info |

+    +--------------+------------------------------------------+

+    | 10           | Level 5 + Full CU analysis-info          |

+    +--------------+------------------------------------------+

+

+.. option:: --refine-mv-type <string>

+

+    Reuse MV information received through API call. Currently receives information for AVC size and the accepted 

+    string input is "avc". Default is disabled.

 .. option:: --scale-factor

@@ -893,28 +914,44 @@

        This option should be coupled with analysis-reuse-mode option, --analysis-reuse-level 10.

        The ctu size of load should be double the size of save. Default 0.

-.. option:: --refine-intra <0|1|2>

+.. option:: --refine-intra <0..3>

    Enables refinement of intra blocks in current encode. 

-   Level 0 - Forces both mode and depth from the previous encode.

+   Level 0 - Forces both mode and depth from the save encode.

+   

+   Level 1 - Evaluates all intra modes at current depth(n) and at depth 

+   (n+1) when current block size is one greater than the min-cu-size.

+   Forces modes for larger blocks.

-   Level 1 - Evaluates all intra modes for blocks of size one smaller than 

-   the min-cu-size of the incoming analysis data from the previous encode, 

-   forces modes for blocks of larger size.

+   Level 2 - In addition to the functionality of level 1, at all depths, force 

+   (a) only depth when angular mode is chosen by the save encode.

+   (b) depth and mode when other intra modes are chosen by the save encode.

-   Level 2 - Evaluates all intra modes for blocks of size one smaller than 

-   the min-cu-size of the incoming analysis data from the previous encode. 

-   For larger blocks, force only depth when angular mode is chosen by the 

-   previous encode, force depth and mode when other intra modes are chosen.

+   Level 3 - Perform analysis of intra modes for depth reused from first encode.

    Default 0.

-.. option:: --refine-inter-depth

+.. option:: --refine-inter <0..3>

-   Enables refinement of inter blocks in current encode. Evaluates all 

-   inter modes for blocks of size one smaller than the min-cu-size of the 

-   incoming analysis data from the previous encode. Default disabled.

+   Enables refinement of inter blocks in current encode. 

+   

+   Level 0 - Forces both mode and depth from the save encode.

+   

+   Level 1 - Evaluates all inter modes at current depth(n) and at depth 

+   (n+1) when current block size is one greater than the min-cu-size.

+   Forces modes for larger blocks.

+   

+   Level 2 - In addition to the functionality of level 1, restricts the modes 

+   evaluated when specific modes are decided as the best mode by the save encode.

+   

+   2nx2n in save encode - disable re-evaluation of rect and amp.

+   

+   skip in save encode  - re-evaluates only skip, merge and 2nx2n modes.

+   

+   Level 3 - Perform analysis of inter modes while reusing depths from the save encode.

+   

+   Default 0.

 .. option:: --refine-mv

@@ -1405,6 +1442,16 @@

 .. option:: --b-pyramid, --no-b-pyramid

    Use B-frames as references, when possible. Default enabled

+   

+.. option:: --force-flush <integer>

+

+   Force the encoder to flush frames. Default is 0.

+   

+   Values:

+   0 - flush the encoder only when all the input pictures are over.

+   1 - flush all the frames even when the input is not over. 

+       slicetype decision may change with this option.

+   2 - flush the slicetype decided frames only.     

 Quality, rate control and rate distortion options

 =================================================

@@ -1470,6 +1517,24 @@

    Default 0.9

    **Range of values:** fractional: 0 - 1.0, or kbits: 2 .. bufsize

+   

+.. option:: --vbv-end <float>

+

+   Final buffer emptiness. The portion of the decode buffer that must be 

+   available after all the specified frames have been inserted into the 

+   decode buffer. Specified as a fractional value between 0 and 1, or in 

+   kbits. Default 0 (disabled)

+   

+   This enables basic support for chunk-parallel encoding where each segment 

+   can specify the starting and ending state of the VBV buffer so that VBV 

+   compliance can be maintained when chunks are independently encoded and 

+   stitched together.

+   

+.. option:: --vbv-end-fr-adj <float>

+

+   Frame from which qp has to be adjusted to achieve final decode buffer

+   emptiness. Specified as a fraction of the total frames. Fractions > 0 are 

+   supported only when the total number of frames is known. Default 0.

 .. option:: --qp, -q <integer>

@@ -1529,7 +1594,7 @@

    Enable adaptive quantization for sub-CTUs. This parameter specifies 

    the minimum CU size at which QP can be adjusted, ie. Quantization Group

    size. Allowed range of values are 64, 32, 16, 8 provided this falls within 

-   the inclusive range [maxCUSize, minCUSize]. Experimental.

+   the inclusive range [maxCUSize, minCUSize].

    Default: same as maxCUSize

 .. option:: --cutree, --no-cutree

@@ -1618,7 +1683,7 @@

    conservative, waiting until there is enough feedback in terms of 

    encoded frames to control QP. strict-cbr allows the encoder to be 

    more aggressive in hitting the target bitrate even for short segment 

-   videos. Experimental.

+   videos.

 .. option:: --cbqpoffs <integer>

@@ -1878,7 +1943,7 @@

    undefined (not signaled)

    1. bt709

-   2. undef

+   2. unknown

    3. **reserved**

    4. bt470m

    5. bt470bg

@@ -1886,13 +1951,16 @@

    7. smpte240m

    8. film

    9. bt2020

+    10. smpte428

+    11. smpte431

+    12. smpte432

 .. option:: --transfer <integer|string>

    Specify transfer characteristics. Default undefined (not signaled)

    1. bt709

-   2. undef

+   2. unknown

    3. **reserved**

​

@@ -2,6 +2,37 @@

 Release Notes

 *************

+Version 2.6

+===========

+

+Release date - 29th November, 2017.

+

+New features

+------------

+1. x265 can now refine analysis from a previous HEVC encode (using options :option:`--refine-inter`, and :option:`--refine-intra`), or a previous AVC encode (using option :option:`--refine-mv-type`). The previous encode's information can be packaged using the *x265_analysis_data_t*  data field available in the *x265_picture* object.

+2. Basic support for segmented (or chunked) encoding added with :option:`--vbv-end` that can specify the status of CPB at the end of a segment. String this together with :option:`--vbv-init` to encode a title as chunks while maintaining VBV compliance!

+3. :option:`--force-flush` can be used to trigger a premature flush of the encoder. This option is beneficial when input is known to be bursty, and may be at a rate slower than the encoder.

+4. Experimental feature :option:`--lowpass-dct` that uses truncated DCT for transformation.

+

+Encoder enhancements

+--------------------

+1. Slice-parallel mode gets a significant boost in performance, particularly in low-latency mode.

+2. x265 now officially supported on VS2017.

+3. x265 now supports all depths from mono0 to mono16 for Y4M format.

+

+API changes

+-----------

+1. Options that modified PPS dynamically (:option:`--opt-qp-pps` and :option:`--opt-ref-list-length-pps`) are now disabled by default to enable users to save bits by not sending headers. If these options are enabled, headers have to be repeated for every GOP.

+2. Rate-control and analysis parameters can dynamically be reconfigured simultaneously via the *x265_encoder_reconfig* API.

+3. New API functions to extract intermediate information such as slice-type, scenecut information, reference frames, etc. are now available. This information may be beneficial to integrating applications that are attempting to perform content-adaptive encoding. Refer to documentation on *x265_get_slicetype_poc_and_scenecut*, and *x265_get_ref_frame_list* for more details and suggested usage.

+4. A new API to pass supplemental CTU information to x265 to influence analysis decisions has been added. Refer to documentation on *x265_encoder_ctu_info* for more details.

+

+Bug fixes

+---------

+1. Bug fixes when :option:`--slices` is used with VBV settings.

+2. Minor memory leak fixed for HDR10+ builds, and default x265 when pools option is specified.

+3. HDR10+ bug fix to remove dependence on poc counter to select meta-data information.

+

 Version 2.5

 ===========

​

@@ -29,7 +29,7 @@

 option(STATIC_LINK_CRT "Statically link C runtime for release builds" OFF)

 mark_as_advanced(FPROFILE_USE FPROFILE_GENERATE NATIVE_BUILD)

 # X265_BUILD must be incremented each time the public API is changed

-set(X265_BUILD 130)

+set(X265_BUILD 146)

 configure_file("${PROJECT_SOURCE_DIR}/x265.def.in"

                "${PROJECT_BINARY_DIR}/x265.def")

 configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in"

@@ -184,6 +184,14 @@

 endif()

 # this option is to enable the inclusion of dynamic HDR10 library to the libx265 compilation

 option(ENABLE_HDR10_PLUS "Enable dynamic HDR10 compilation" OFF)

+if(MSVC AND (MSVC_VERSION LESS 1800) AND ENABLE_HDR10_PLUS)

+    message(FATAL_ERROR "MSVC version 12.0 or above required to support hdr10plus")

+endif()

+if(WIN32 AND (MSVC_VERSION GREATER 1800))

+    if(CMAKE_VERSION VERSION_LESS 3.7)

+        message(FATAL_ERROR "cmake version not compatible for VS 2017. Update the cmake to versions 3.7 or above")

+    endif()

+endif()

 if(GCC)

     add_definitions(-Wall -Wextra -Wshadow)

     add_definitions(-D__STDC_LIMIT_MACROS=1)

@@ -539,6 +547,13 @@

 endif()

 install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)

+if(WIN32)

+    install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)

+    install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)

+    install(FILES "${PROJECT_BINARY_DIR}/Debug/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug OPTIONAL NAMELINK_ONLY)

+    install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo OPTIONAL NAMELINK_ONLY)

+endif()

+

 if(CMAKE_RC_COMPILER)

     # The resource compiler does not need CFLAGS or macro defines. It

     # often breaks them

@@ -639,13 +654,11 @@

             DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")

 endif()

-if(NOT WIN32)

-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"

-                   "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake"

-                   IMMEDIATE @ONLY)

-    add_custom_target(uninstall

-                      "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake")

-endif()

+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"

+               "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake"

+               IMMEDIATE @ONLY)

+add_custom_target(uninstall

+                  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake")

 # Main CLI application

 set(ENABLE_CLI ON CACHE BOOL "Build standalone CLI application")

​

@@ -17,3 +17,7 @@

         message(STATUS "File '$ENV{DESTDIR}${file}' does not exist.")

     endif()

 endforeach(file)

+

+if(EXISTS "${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt")

+    file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt")

+endif()

​

@@ -131,7 +131,7 @@

 add_library(common OBJECT

     ${ASM_PRIMITIVES} ${VEC_PRIMITIVES} ${ALTIVEC_PRIMITIVES} ${WINXP}

     primitives.cpp primitives.h

-    pixel.cpp dct.cpp ipfilter.cpp intrapred.cpp loopfilter.cpp

+    pixel.cpp dct.cpp lowpassdct.cpp ipfilter.cpp intrapred.cpp loopfilter.cpp

     constants.cpp constants.h

     cpu.cpp cpu.h version.cpp

     threading.cpp threading.h

​

@@ -207,7 +207,6 @@

 // arbitrary, but low because SATD scores are 1/4 normal

 #define X265_LOOKAHEAD_QP (12 + QP_BD_OFFSET)

-#define X265_LOOKAHEAD_MAX 250

 // Use the same size blocks as x264.  Using larger blocks seems to give artificially

 // high cost estimates (intra and inter both suffer)

​

@@ -201,6 +201,8 @@

         m_cuDepth            = charBuf; charBuf += m_numPartitions;

         m_predMode           = charBuf; charBuf += m_numPartitions; /* the order up to here is important in initCTU() and initSubCU() */

         m_partSize           = charBuf; charBuf += m_numPartitions;

+        m_skipFlag[0]        = charBuf; charBuf += m_numPartitions;

+        m_skipFlag[1]        = charBuf; charBuf += m_numPartitions;

         m_mergeFlag          = charBuf; charBuf += m_numPartitions;

         m_interDir           = charBuf; charBuf += m_numPartitions;

         m_mvpIdx[0]          = charBuf; charBuf += m_numPartitions;

@@ -239,6 +241,8 @@

         m_cuDepth            = charBuf; charBuf += m_numPartitions;

         m_predMode           = charBuf; charBuf += m_numPartitions; /* the order up to here is important in initCTU() and initSubCU() */

         m_partSize           = charBuf; charBuf += m_numPartitions;

+        m_skipFlag[0]        = charBuf; charBuf += m_numPartitions;

+        m_skipFlag[1]        = charBuf; charBuf += m_numPartitions;

         m_mergeFlag          = charBuf; charBuf += m_numPartitions;

         m_interDir           = charBuf; charBuf += m_numPartitions;

         m_mvpIdx[0]          = charBuf; charBuf += m_numPartitions;

​

@@ -199,13 +199,14 @@

     uint8_t*      m_predMode;         // array of prediction modes

     uint8_t*      m_partSize;         // array of partition sizes

     uint8_t*      m_mergeFlag;        // array of merge flags

+    uint8_t*      m_skipFlag[2];

     uint8_t*      m_interDir;         // array of inter directions

     uint8_t*      m_mvpIdx[2];        // array of motion vector predictor candidates or merge candidate indices [0]

     uint8_t*      m_tuDepth;          // array of transform indices

     uint8_t*      m_transformSkip[3]; // array of transform skipping flags per plane

     uint8_t*      m_cbf[3];           // array of coded block flags (CBF) per plane

     uint8_t*      m_chromaIntraDir;   // array of intra directions (chroma)

-    enum { BytesPerPartition = 21 };  // combined sizeof() of all per-part data

+    enum { BytesPerPartition = 23 };  // combined sizeof() of all per-part data

     sse_t*        m_distortion;

     coeff_t*      m_trCoeff[3];       // transformed coefficient buffer per plane

​

@@ -77,7 +77,15 @@

         }

     }

-    if (m_fencPic->create(param) && m_lowres.create(m_fencPic, param->bframes, !!param->rc.aqMode || !!param->bAQMotion, param->rc.qgSize))

+    if (param->bMVType == AVC_INFO)

+    {

+        m_analysisData.wt = NULL;

+        m_analysisData.intraData = NULL;

+        m_analysisData.interData = NULL;

+        m_analysis2Pass.analysisFramedata = NULL;

+    }

+

+    if (m_fencPic->create(param, !!m_param->bCopyPicToFrame) && m_lowres.create(m_fencPic, param->bframes, !!param->rc.aqMode || !!param->bAQMotion, param->rc.qgSize))

     {

         X265_CHECK((m_reconColCount == NULL), "m_reconColCount was initialized");

         m_numRows = (m_fencPic->m_picHeight + param->maxCUSize - 1)  / param->maxCUSize;

@@ -150,7 +158,8 @@

     if (m_fencPic)

     {

-        m_fencPic->destroy();

+        if (m_param->bCopyPicToFrame)

+            m_fencPic->destroy();

         delete m_fencPic;

         m_fencPic = NULL;

     }

​

@@ -98,6 +98,7 @@

     float*                 m_quantOffsets;       // points to quantOffsets in x265_picture

     x265_sei               m_userSEI;

+    Event                  m_reconEncoded;

     /* Frame Parallelism - notification between FrameEncoders of available motion reference rows */

     ThreadSafeInteger*     m_reconRowFlag;       // flag of CTU rows completely reconstructed and extended for motion reference

@@ -112,6 +113,8 @@

     x265_analysis_2Pass    m_analysis2Pass;

     RcStats*               m_rcData;

+    Event                  m_copyMVType;

+

     x265_ctu_info_t**      m_ctuInfo;

     Event                  m_copied;

     int*                   m_prevCtuInfoChange;

​

@@ -195,6 +195,7 @@

     uint8_t*    mvpIdx[2];

     int8_t*     refIdx[2];

     MV*         mv[2];

+   int64_t*     sadCost;

 };

 struct analysis2PassFrameData

​

@@ -0,0 +1,127 @@

+/*****************************************************************************

+ * Copyright (C) 2017 

+ *

+ * Authors: Humberto Ribeiro Filho <mont3z.claro5@gmail.com>

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.

+ *

+ * This program is also available under a commercial proprietary license.

+ * For more information, contact us at license @ x265.com.

+ *****************************************************************************/

+

+#include "common.h"

+#include "primitives.h"

+

+using namespace X265_NS;

+

+/* standard dct transformations */

+static dct_t* s_dct4x4;

+static dct_t* s_dct8x8;

+static dct_t* s_dct16x16;

+

+static void lowPassDct8_c(const int16_t* src, int16_t* dst, intptr_t srcStride)

+{

+    ALIGN_VAR_32(int16_t, coef[4 * 4]);

+    ALIGN_VAR_32(int16_t, avgBlock[4 * 4]);

+    int16_t totalSum = 0;

+    int16_t sum = 0;

+    

+    for (int i = 0; i < 4; i++)

+        for (int j =0; j < 4; j++)

+        {

+            // Calculate average of 2x2 cells

+            sum = src[2*i*srcStride + 2*j] + src[2*i*srcStride + 2*j + 1]

+                    + src[(2*i+1)*srcStride + 2*j] + src[(2*i+1)*srcStride + 2*j + 1];

+            avgBlock[i*4 + j] = sum >> 2;

+

+            totalSum += sum; // use to calculate total block average

+        }

+

+    //dct4

+    (*s_dct4x4)(avgBlock, coef, 4);

+    memset(dst, 0, 64 * sizeof(int16_t));

+    for (int i = 0; i < 4; i++)

+    {

+        memcpy(&dst[i * 8], &coef[i * 4], 4 * sizeof(int16_t));

+    }

+

+    // replace first coef with total block average

+    dst[0] = totalSum << 1;

+}

+

+static void lowPassDct16_c(const int16_t* src, int16_t* dst, intptr_t srcStride)

+{

+    ALIGN_VAR_32(int16_t, coef[8 * 8]);

+    ALIGN_VAR_32(int16_t, avgBlock[8 * 8]);

+    int32_t totalSum = 0;

+    int16_t sum = 0;

+    for (int i = 0; i < 8; i++)

+        for (int j =0; j < 8; j++)

+        {

+            sum = src[2*i*srcStride + 2*j] + src[2*i*srcStride + 2*j + 1]

+                    + src[(2*i+1)*srcStride + 2*j] + src[(2*i+1)*srcStride + 2*j + 1];

+            avgBlock[i*8 + j] = sum >> 2;

+

+            totalSum += sum;

+        }

+

+    (*s_dct8x8)(avgBlock, coef, 8);

+    memset(dst, 0, 256 * sizeof(int16_t));

+    for (int i = 0; i < 8; i++)

+    {

+        memcpy(&dst[i * 16], &coef[i * 8], 8 * sizeof(int16_t));

+    }

+    dst[0] = static_cast<int16_t>(totalSum >> 1);

+}

+

+static void lowPassDct32_c(const int16_t* src, int16_t* dst, intptr_t srcStride)

+{

+    ALIGN_VAR_32(int16_t, coef[16 * 16]);

+    ALIGN_VAR_32(int16_t, avgBlock[16 * 16]);

+    int32_t totalSum = 0;

+    int16_t sum = 0;

+    for (int i = 0; i < 16; i++)

+        for (int j =0; j < 16; j++)

+        {

+            sum = src[2*i*srcStride + 2*j] + src[2*i*srcStride + 2*j + 1]

+                    + src[(2*i+1)*srcStride + 2*j] + src[(2*i+1)*srcStride + 2*j + 1];

+            avgBlock[i*16 + j] = sum >> 2;

+

+            totalSum += sum;

+        }

+

+    (*s_dct16x16)(avgBlock, coef, 16);

+    memset(dst, 0, 1024 * sizeof(int16_t));

+    for (int i = 0; i < 16; i++)

+    {

+        memcpy(&dst[i * 32], &coef[i * 16], 16 * sizeof(int16_t));

+    }

+    dst[0] = static_cast<int16_t>(totalSum >> 3);

+}

+

+namespace X265_NS {

+// x265 private namespace

+

+void setupLowPassPrimitives_c(EncoderPrimitives& p)

+{

+    s_dct4x4 = &(p.cu[BLOCK_4x4].standard_dct);

+    s_dct8x8 = &(p.cu[BLOCK_8x8].standard_dct);

+    s_dct16x16 = &(p.cu[BLOCK_16x16].standard_dct);

+

+    p.cu[BLOCK_8x8].lowpass_dct = lowPassDct8_c;

+    p.cu[BLOCK_16x16].lowpass_dct = lowPassDct16_c;

+    p.cu[BLOCK_32x32].lowpass_dct = lowPassDct32_c;

+}

+}

​

@@ -160,6 +160,9 @@

     for (int i = 0; i < bframes + 2; i++)

         intraMbs[i] = 0;

+    if (origPic->m_param->rc.vbvBufferSize)

+        for (int i = 0; i < X265_LOOKAHEAD_MAX + 1; i++)

+            plannedType[i] = X265_TYPE_AUTO;

     /* downscale and generate 4 hpel planes for lookahead */

     primitives.frameInitLowres(origPic->m_picOrg[0],

​

@@ -157,6 +157,7 @@

     param->bEnableConstrainedIntra = 0;

     param->bEnableStrongIntraSmoothing = 1;

     param->bEnableFastIntra = 0;

+    param->bEnableSplitRdSkip = 0;

     /* Inter Coding tools */

     param->searchMethod = X265_HEX_SEARCH;

@@ -211,6 +212,8 @@

     param->rc.vbvMaxBitrate = 0;

     param->rc.vbvBufferSize = 0;

     param->rc.vbvBufferInit = 0.9;

+    param->vbvBufferEnd = 0;

+    param->vbvEndFrameAdjust = 0;

     param->rc.rfConstant = 28;

     param->rc.bitrate = 0;

     param->rc.qCompress = 0.6;

@@ -268,8 +271,8 @@

     param->bEmitVUITimingInfo   = 1;