[x265-commits] [x265] common: hoist x265_mdate above using namespace x265
Steve Borho
steve at borho.org
Fri Oct 25 05:43:43 CEST 2013
details: http://hg.videolan.org/x265/rev/4ac43db2d640
branches: stable
changeset: 4654:4ac43db2d640
user: Steve Borho <steve at borho.org>
date: Thu Oct 24 21:12:14 2013 -0500
description:
common: hoist x265_mdate above using namespace x265
I do not understand why, but this fixes cli linkage on Mac
Subject: [x265] y4m: disable file reader thread on frame header errors
details: http://hg.videolan.org/x265/rev/776c2ec26a5f
branches: stable
changeset: 4655:776c2ec26a5f
user: Steve Borho <steve at borho.org>
date: Thu Oct 24 21:13:24 2013 -0500
description:
y4m: disable file reader thread on frame header errors
Prevents deadlocks from malformed Y4M files
Subject: [x265] input: add missing carriage returns from error log messages
details: http://hg.videolan.org/x265/rev/63ca0173f8cb
branches: stable
changeset: 4656:63ca0173f8cb
user: Steve Borho <steve at borho.org>
date: Thu Oct 24 21:16:21 2013 -0500
description:
input: add missing carriage returns from error log messages
Subject: [x265] pixel: sse_sp[LUMA_12x16] fails tests on clang, disable it
details: http://hg.videolan.org/x265/rev/17195e65e91b
branches: stable
changeset: 4657:17195e65e91b
user: Steve Borho <steve at borho.org>
date: Thu Oct 24 21:27:03 2013 -0500
description:
pixel: sse_sp[LUMA_12x16] fails tests on clang, disable it
Subject: [x265] cmake: use system native stdint.h and getopt if they are found
details: http://hg.videolan.org/x265/rev/1ab80557656a
branches: stable
changeset: 4658:1ab80557656a
user: Steve Borho <steve at borho.org>
date: Thu Oct 24 22:05:28 2013 -0500
description:
cmake: use system native stdint.h and getopt if they are found
Subject: [x265] Merge with stable
details: http://hg.videolan.org/x265/rev/f886f2ed1fcd
branches:
changeset: 4659:f886f2ed1fcd
user: Steve Borho <steve at borho.org>
date: Thu Oct 24 22:42:51 2013 -0500
description:
Merge with stable
diffstat:
source/CMakeLists.txt | 24 +-
source/Lib/TLibCommon/ContextModel.cpp | 117 -
source/Lib/TLibCommon/ContextModel.h | 104 -
source/Lib/TLibCommon/ContextTables.h | 77 +-
source/Lib/TLibCommon/TComPic.cpp | 11 +-
source/Lib/TLibCommon/TComPic.h | 1 -
source/Lib/TLibCommon/TComPicYuv.cpp | 47 +-
source/Lib/TLibCommon/TComPicYuv.h | 17 +-
source/Lib/TLibCommon/TComPrediction.cpp | 11 +-
source/Lib/TLibCommon/TComPrediction.h | 5 +-
source/Lib/TLibCommon/TComRom.cpp | 8 +
source/Lib/TLibCommon/TComRom.h | 1 +
source/Lib/TLibCommon/TComSlice.cpp | 118 +-
source/Lib/TLibCommon/TComSlice.h | 63 +-
source/Lib/TLibCommon/TComTrQuant.cpp | 139 +-
source/Lib/TLibCommon/TComTrQuant.h | 6 +-
source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp | 27 +-
source/Lib/TLibEncoder/TEncBinCoderCABAC.h | 2 +-
source/Lib/TLibEncoder/TEncCu.cpp | 5 -
source/Lib/TLibEncoder/TEncEntropy.h | 1 -
source/Lib/TLibEncoder/TEncSbac.cpp | 180 +-
source/Lib/TLibEncoder/TEncSbac.h | 3 +-
source/Lib/TLibEncoder/TEncSearch.cpp | 15 +-
source/Lib/TLibEncoder/TEncSearch.h | 3 +-
source/common/CMakeLists.txt | 23 +-
source/common/common.cpp | 32 +-
source/common/common.h | 1 +
source/common/lowres.cpp | 15 +-
source/common/lowres.h | 8 +-
source/common/mv.h | 18 +
source/common/primitives.cpp | 4 +-
source/common/reference.cpp | 134 -
source/common/reference.h | 78 -
source/common/vec/blockcopy-avx2.cpp | 94 -
source/common/vec/intra-sse3.cpp | 3800 -------------------------
source/common/vec/intra-ssse3.cpp | 3946 ++++++++++++++++++++++++++
source/common/vec/pixel-avx2.cpp | 864 +++--
source/common/vec/pixel-sse41.cpp | 2 +
source/common/vec/vec-primitives.cpp | 6 +-
source/common/x86/asm-primitives.cpp | 20 +
source/common/x86/pixel.h | 6 +
source/common/x86/sad-a.asm | 19 +
source/encoder/CMakeLists.txt | 1 +
source/encoder/dpb.cpp | 4 -
source/encoder/frameencoder.cpp | 12 +-
source/encoder/frameencoder.h | 2 +
source/encoder/ratecontrol.cpp | 2 +-
source/encoder/reference.cpp | 122 +
source/encoder/reference.h | 56 +
source/encoder/slicetype.cpp | 52 +-
source/encoder/slicetype.h | 2 +
source/input/y4m.cpp | 7 +-
source/input/yuv.cpp | 2 +-
53 files changed, 5117 insertions(+), 5200 deletions(-)
diffs (truncated from 11846 to 300 lines):
diff -r a44b48b74d6f -r f886f2ed1fcd source/CMakeLists.txt
--- a/source/CMakeLists.txt Thu Oct 24 17:06:02 2013 -0500
+++ b/source/CMakeLists.txt Thu Oct 24 22:42:51 2013 -0500
@@ -8,6 +8,8 @@ endif()
project (x265)
cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8
+include(CheckIncludeFiles)
+include(CheckFunctionExists)
# X265_BUILD must be incremented each time the public API is changed
set(X265_BUILD 2)
@@ -57,7 +59,11 @@ if(MSVC)
add_definitions(/Ob2) # always inline
add_definitions(/Oi) # enable intrinsics
add_definitions(/MP) # multithreaded build
- include_directories(compat/msvc)
+
+ check_include_files(stdint.h HAVE_STDINT_H)
+ if(NOT HAVE_STDINT_H)
+ include_directories(compat/msvc)
+ endif()
endif(MSVC)
if(INTEL_CXX AND UNIX)
@@ -213,15 +219,15 @@ if(ENABLE_CLI)
file(GLOB OutputFiles output/*.cpp output/*.h)
source_group(input FILES ${InputFiles})
source_group(output FILES ${OutputFiles})
- if(MSVC)
- set_source_files_properties(compat/msvc/getopt.c PROPERTIES COMPILE_FLAGS "/wd4100 /wd4131 -DHAVE_STRING_H=1")
- elseif(GCC)
- set_source_files_properties(compat/msvc/getopt.c PROPERTIES COMPILE_FLAGS "-Wno-unused-parameter")
- endif()
+ check_include_files(getopt.h HAVE_GETOPT_H)
+ if(NOT HAVE_GETOPT_H)
+ if(MSVC)
+ set_source_files_properties(compat/msvc/getopt.c PROPERTIES COMPILE_FLAGS "/wd4100 /wd4131 -DHAVE_STRING_H=1")
+ endif(MSVC)
+ set(GETOPT compat/msvc/getopt.c compat/msvc/getopt.h)
+ endif(NOT HAVE_GETOPT_H)
- add_executable(cli ../COPYING ${InputFiles} ${OutputFiles}
- x265.cpp x265.h
- compat/msvc/getopt.c compat/msvc/getopt.h)
+ add_executable(cli ../COPYING ${InputFiles} ${OutputFiles} ${GETOPT} x265.cpp x265.h)
target_link_libraries(cli x265-static ${PLATFORM_LIBS})
set_target_properties(cli PROPERTIES OUTPUT_NAME x265)
diff -r a44b48b74d6f -r f886f2ed1fcd source/Lib/TLibCommon/ContextModel.cpp
--- a/source/Lib/TLibCommon/ContextModel.cpp Thu Oct 24 17:06:02 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/* The copyright in this software is being made available under the BSD
- * License, included below. This software may be subject to other third party
- * and contributor rights, including patent rights, and no such rights are
- * granted under this license.
- *
- * Copyright (c) 2010-2013, ITU/ISO/IEC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the ITU/ISO/IEC nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** \file ContextModel.cpp
- \brief context model class
-*/
-
-#include "ContextModel.h"
-#include "TComRom.h"
-#include "common.h"
-
-using namespace x265;
-
-//! \ingroup TLibCommon
-//! \{
-
-// ====================================================================================================================
-// Public member functions
-// ====================================================================================================================
-
-/**
- - initialize context model with respect to QP and initialization value
- .
- \param qp input QP value
- \param initValue 8 bit initialization value
- */
-void ContextModel::init(int qp, int initValue)
-{
- qp = Clip3(0, 51, qp);
-
- int slope = (initValue >> 4) * 5 - 45;
- int offset = ((initValue & 15) << 3) - 16;
- int initState = X265_MIN(X265_MAX(1, (((slope * qp) >> 4) + offset)), 126);
- UInt mpState = (initState >= 64);
- m_state = ((mpState ? (initState - 64) : (63 - initState)) << 1) + mpState;
-}
-
-const UChar ContextModel::s_nextStateMPS[128] =
-{
- 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
- 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
- 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
- 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 124, 125, 126, 127
-};
-
-const UChar ContextModel::s_nextStateLPS[128] =
-{
- 1, 0, 0, 1, 2, 3, 4, 5, 4, 5, 8, 9, 8, 9, 10, 11,
- 12, 13, 14, 15, 16, 17, 18, 19, 18, 19, 22, 23, 22, 23, 24, 25,
- 26, 27, 26, 27, 30, 31, 30, 31, 32, 33, 32, 33, 36, 37, 36, 37,
- 38, 39, 38, 39, 42, 43, 42, 43, 44, 45, 44, 45, 46, 47, 48, 49,
- 48, 49, 50, 51, 52, 53, 52, 53, 54, 55, 54, 55, 56, 57, 58, 59,
- 58, 59, 60, 61, 60, 61, 60, 61, 62, 63, 64, 65, 64, 65, 66, 67,
- 66, 67, 66, 67, 68, 69, 68, 69, 70, 71, 70, 71, 70, 71, 72, 73,
- 72, 73, 72, 73, 74, 75, 74, 75, 74, 75, 76, 77, 76, 77, 126, 127
-};
-
-UChar ContextModel::m_nextState[128][2];
-
-void ContextModel::buildNextStateTable()
-{
- for (int i = 0; i < 128; i++)
- {
- for (int j = 0; j < 2; j++)
- {
- m_nextState[i][j] = ((i & 1) == j) ? s_nextStateMPS[i] : s_nextStateLPS[i];
- }
- }
-}
-
-const int ContextModel::s_entropyBits[128] =
-{
- // Corrected table, most notably for last state
- 0x07b23, 0x085f9, 0x074a0, 0x08cbc, 0x06ee4, 0x09354, 0x067f4, 0x09c1b, 0x060b0, 0x0a62a, 0x05a9c, 0x0af5b, 0x0548d, 0x0b955, 0x04f56, 0x0c2a9,
- 0x04a87, 0x0cbf7, 0x045d6, 0x0d5c3, 0x04144, 0x0e01b, 0x03d88, 0x0e937, 0x039e0, 0x0f2cd, 0x03663, 0x0fc9e, 0x03347, 0x10600, 0x03050, 0x10f95,
- 0x02d4d, 0x11a02, 0x02ad3, 0x12333, 0x0286e, 0x12cad, 0x02604, 0x136df, 0x02425, 0x13f48, 0x021f4, 0x149c4, 0x0203e, 0x1527b, 0x01e4d, 0x15d00,
- 0x01c99, 0x166de, 0x01b18, 0x17017, 0x019a5, 0x17988, 0x01841, 0x18327, 0x016df, 0x18d50, 0x015d9, 0x19547, 0x0147c, 0x1a083, 0x0138e, 0x1a8a3,
- 0x01251, 0x1b418, 0x01166, 0x1bd27, 0x01068, 0x1c77b, 0x00f7f, 0x1d18e, 0x00eda, 0x1d91a, 0x00e19, 0x1e254, 0x00d4f, 0x1ec9a, 0x00c90, 0x1f6e0,
- 0x00c01, 0x1fef8, 0x00b5f, 0x208b1, 0x00ab6, 0x21362, 0x00a15, 0x21e46, 0x00988, 0x2285d, 0x00934, 0x22ea8, 0x008a8, 0x239b2, 0x0081d, 0x24577,
- 0x007c9, 0x24ce6, 0x00763, 0x25663, 0x00710, 0x25e8f, 0x006a0, 0x26a26, 0x00672, 0x26f23, 0x005e8, 0x27ef8, 0x005ba, 0x284b5, 0x0055e, 0x29057,
- 0x0050c, 0x29bab, 0x004c1, 0x2a674, 0x004a7, 0x2aa5e, 0x0046f, 0x2b32f, 0x0041f, 0x2c0ad, 0x003e7, 0x2ca8d, 0x003ba, 0x2d323, 0x0010c, 0x3bfbb
-};
-//! \}
diff -r a44b48b74d6f -r f886f2ed1fcd source/Lib/TLibCommon/ContextModel.h
--- a/source/Lib/TLibCommon/ContextModel.h Thu Oct 24 17:06:02 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-/* The copyright in this software is being made available under the BSD
- * License, included below. This software may be subject to other third party
- * and contributor rights, including patent rights, and no such rights are
- * granted under this license.
- *
- * Copyright (c) 2010-2013, ITU/ISO/IEC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the ITU/ISO/IEC nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** \file ContextModel.h
- \brief context model class (header)
-*/
-
-#ifndef X265_CONTEXTMODEL_H
-#define X265_CONTEXTMODEL_H
-
-#include "CommonDef.h"
-
-//! \ingroup TLibCommon
-//! \{
-
-namespace x265 {
-// private namespace
-
-// ====================================================================================================================
-// Class definition
-// ====================================================================================================================
-
-/// context model class
-class ContextModel
-{
-public:
-
- ContextModel() { m_state = 0; bBinsCoded = 0; }
-
- ~ContextModel() {}
-
- UChar getState() { return m_state >> 1; } ///< get current state
-
- UChar getMps() { return m_state & 1; } ///< get curret MPS
-
- void init(int qp, int initValue); ///< initialize state with initial probability
-
- void updateLPS()
- {
- m_state = s_nextStateLPS[m_state];
- }
-
- void updateMPS()
- {
- m_state = s_nextStateMPS[m_state];
- }
-
- int getEntropyBits(UInt val) { return s_entropyBits[m_state ^ val]; }
-
- void update(int binVal)
- {
- m_state = m_nextState[m_state][binVal];
- }
-
- static void buildNextStateTable();
- static int getEntropyBitsTrm(int val) { return s_entropyBits[126 ^ val]; }
-
- void setBinsCoded(UInt val) { bBinsCoded = (UChar)val; }
-
- UInt getBinsCoded() { return bBinsCoded; }
-
-private:
-
- UChar m_state; ///< internal state variable
- UChar bBinsCoded;
- static const UChar s_nextStateMPS[128];
- static const UChar s_nextStateLPS[128];
- static const int s_entropyBits[128];
- static UChar m_nextState[128][2];
-};
-}
-//! \}
-
-#endif // ifndef X265_CONTEXTMODEL_H
diff -r a44b48b74d6f -r f886f2ed1fcd source/Lib/TLibCommon/ContextTables.h
--- a/source/Lib/TLibCommon/ContextTables.h Thu Oct 24 17:06:02 2013 -0500
+++ b/source/Lib/TLibCommon/ContextTables.h Thu Oct 24 22:42:51 2013 -0500
@@ -39,6 +39,8 @@
#ifndef X265_CONTEXTTABLES_H
#define X265_CONTEXTTABLES_H
+#include <stdint.h>
+
//! \ingroup TLibCommon
//! \{
@@ -125,6 +127,29 @@
#define MAX_OFF_CTX_MOD (OFF_CU_TRANSQUANT_BYPASS_FLAG_CTX + NUM_CU_TRANSQUANT_BYPASS_FLAG_CTX)
// ====================================================================================================================
+// Sbac interface
+// ====================================================================================================================
+typedef struct ContextModel {
+ uint8_t m_state; ///< internal state variable
+ uint8_t bBinsCoded;
+} ContextModel;
More information about the x265-commits
mailing list