# HG changeset patch
# User Bhavna Hariharan <bha...@multicorewareinc.com>
# Date 1497590903 -19800
#      Fri Jun 16 10:58:23 2017 +0530
# Node ID 646bd0ff6478699f4c858b5a05013ad5699015a4
# Parent  25a7f0f74c9bff70987d3182c0e4c41b65918a92
nits: rename dynamic HDR10, rectify warning message

diff -r 25a7f0f74c9b -r 646bd0ff6478 source/CMakeLists.txt
--- a/source/CMakeLists.txt     Tue Jun 13 15:15:55 2017 +0530
+++ b/source/CMakeLists.txt     Fri Jun 16 10:58:23 2017 +0530
@@ -183,11 +183,11 @@
     add_definitions(-qinline=level=10 -qpath=IL:/data/video_files/latest.tpo/)
 endif()
 # this option is to enable the inclusion of dynamic HDR10 library to the 
libx265 compilation
-option(ENABLE_DYNAMIC_HDR10 "Enable dynamic HDR10 compilation" OFF)
+option(ENABLE_HDR10_PLUS "Enable dynamic HDR10 compilation" OFF)
 if(GCC)
     add_definitions(-Wall -Wextra -Wshadow)
     add_definitions(-D__STDC_LIMIT_MACROS=1)
-    if(ENABLE_DYNAMIC_HDR10)
+    if(ENABLE_HDR10_PLUS)
         if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8")
             message(FATAL_ERROR "gcc version above 4.8 required to support 
hdr10plus")
         endif()
@@ -371,11 +371,11 @@
     add_definitions(-DHIGH_BIT_DEPTH=0 -DX265_DEPTH=8)
 endif(HIGH_BIT_DEPTH)
 
-if (ENABLE_DYNAMIC_HDR10)
+if (ENABLE_HDR10_PLUS)
     include_directories(. dynamicHDR10 "${PROJECT_BINARY_DIR}")
     add_subdirectory(dynamicHDR10)
-    add_definitions(-DENABLE_DYNAMIC_HDR10)
-endif(ENABLE_DYNAMIC_HDR10)
+    add_definitions(-DENABLE_HDR10_PLUS)
+endif(ENABLE_HDR10_PLUS)
 # this option can only be used when linking multiple libx265 libraries
 # together, and some alternate API access method is implemented.
 option(EXPORT_C_API "Implement public C programming interface" ON)
@@ -515,7 +515,7 @@
     endif()
 endif()
 source_group(ASM FILES ${ASM_SRCS})
-if(ENABLE_DYNAMIC_HDR10)
+if(ENABLE_HDR10_PLUS)
     add_library(x265-static STATIC $<TARGET_OBJECTS:encoder> 
$<TARGET_OBJECTS:common> $<TARGET_OBJECTS:dynamicHDR10> ${ASM_OBJS} ${ASM_SRCS})
     add_library(hdr10plus-static STATIC $<TARGET_OBJECTS:dynamicHDR10>)
     set_target_properties(hdr10plus-static PROPERTIES OUTPUT_NAME hdr10plus)
@@ -532,7 +532,7 @@
     LIBRARY DESTINATION ${LIB_INSTALL_DIR}
     ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
 
-if(ENABLE_DYNAMIC_HDR10)
+if(ENABLE_HDR10_PLUS)
     install(TARGETS hdr10plus-static
         LIBRARY DESTINATION ${LIB_INSTALL_DIR}
         ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
@@ -560,15 +560,15 @@
 endif()
 option(ENABLE_SHARED "Build shared library" ON)
 if(ENABLE_SHARED)
-    if(ENABLE_DYNAMIC_HDR10)
+    if(ENABLE_HDR10_PLUS)
         add_library(x265-shared SHARED "${PROJECT_BINARY_DIR}/x265.def" 
${ASM_OBJS}
                     ${X265_RC_FILE} $<TARGET_OBJECTS:encoder> 
$<TARGET_OBJECTS:common> $<TARGET_OBJECTS:dynamicHDR10>)
-        add_library(hdr10plus SHARED $<TARGET_OBJECTS:dynamicHDR10>)
+        add_library(hdr10plus-shared SHARED $<TARGET_OBJECTS:dynamicHDR10>)
 
         if(MSVC)
-            set_target_properties(hdr10plus PROPERTIES OUTPUT_NAME 
libhdr10plus)
+            set_target_properties(hdr10plus-shared PROPERTIES OUTPUT_NAME 
libhdr10plus)
         else()
-            set_target_properties(hdr10plus PROPERTIES OUTPUT_NAME hdr10plus)
+            set_target_properties(hdr10plus-shared PROPERTIES OUTPUT_NAME 
hdr10plus)
         endif()
     else()
         add_library(x265-shared SHARED "${PROJECT_BINARY_DIR}/x265.def" 
${ASM_OBJS}
@@ -604,8 +604,8 @@
                 ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
                 RUNTIME DESTINATION ${BIN_INSTALL_DIR})
     endif()
-    if(ENABLE_DYNAMIC_HDR10)
-        install(TARGETS hdr10plus
+    if(ENABLE_HDR10_PLUS)
+        install(TARGETS hdr10plus-shared
             LIBRARY DESTINATION ${LIB_INSTALL_DIR}
             ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
     endif()
@@ -670,7 +670,7 @@
     endif(WIN32)
     if(XCODE)
         # Xcode seems unable to link the CLI with libs, so link as one targget
-        if(ENABLE_DYNAMIC_HDR10)
+        if(ENABLE_HDR10_PLUS)
         add_executable(cli ../COPYING ${InputFiles} ${OutputFiles} ${GETOPT}
                         x265.cpp x265.h x265cli.h
                         $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> 
$<TARGET_OBJECTS:dynamicHDR10> ${ASM_OBJS} ${ASM_SRCS})
diff -r 25a7f0f74c9b -r 646bd0ff6478 source/common/param.cpp
--- a/source/common/param.cpp   Tue Jun 13 15:15:55 2017 +0530
+++ b/source/common/param.cpp   Fri Jun 16 10:58:23 2017 +0530
@@ -1491,7 +1491,7 @@
     TOOLOPT(!param->bSaoNonDeblocked && param->bEnableSAO, "sao");
     TOOLOPT(param->rc.bStatWrite, "stats-write");
     TOOLOPT(param->rc.bStatRead,  "stats-read");
-#if ENABLE_DYNAMIC_HDR10
+#if ENABLE_HDR10_PLUS
     TOOLOPT(param->toneMapFile != NULL, "dhdr10-info");
 #endif
     x265_log(param, X265_LOG_INFO, "tools:%s\n", buf);
diff -r 25a7f0f74c9b -r 646bd0ff6478 source/dynamicHDR10/CMakeLists.txt
--- a/source/dynamicHDR10/CMakeLists.txt        Tue Jun 13 15:15:55 2017 +0530
+++ b/source/dynamicHDR10/CMakeLists.txt        Fri Jun 16 10:58:23 2017 +0530
@@ -1,5 +1,5 @@
 # vim: syntax=cmake
-if(ENABLE_DYNAMIC_HDR10)
+if(ENABLE_HDR10_PLUS)
 
 add_library(dynamicHDR10 OBJECT 
     BasicStructures.h
diff -r 25a7f0f74c9b -r 646bd0ff6478 source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp        Tue Jun 13 15:15:55 2017 +0530
+++ b/source/encoder/encoder.cpp        Fri Jun 16 10:58:23 2017 +0530
@@ -87,7 +87,7 @@
         m_frameEncoder[i] = NULL;
     MotionEstimate::initScales();
 
-#if ENABLE_DYNAMIC_HDR10
+#if ENABLE_HDR10_PLUS
     m_hdr10plus_api = hdr10plus_api_get();
 #endif
 
@@ -606,7 +606,7 @@
     {
         x265_sei_payload toneMap;
         toneMap.payload = NULL;
-#if ENABLE_DYNAMIC_HDR10
+#if ENABLE_HDR10_PLUS
         if (m_bToneMap)
         {
             uint8_t *cim = NULL;
@@ -2302,12 +2302,12 @@
         x265_log(p, X265_LOG_WARNING, "Inter refinement does not support 
limitTU. Disabling limitTU.\n");
         p->limitTU = 0;
     }
-       
-       if (p->mvRefine)
+
+    if (p->mvRefine)
     {
         if (p->analysisMode != X265_ANALYSIS_LOAD || p->analysisRefineLevel < 
10 || !p->scaleFactor)
         {
-            x265_log(p, X265_LOG_WARNING, "MV refinement requires analysis 
load, refine-level 10, scale factor. Disabling inter refine.\n");
+            x265_log(p, X265_LOG_WARNING, "MV refinement requires analysis 
load, refine-level 10, scale factor. Disabling MV refine.\n");
             p->mvRefine = 0;
         }
     }
@@ -2459,7 +2459,7 @@
         p->dynamicRd = 0;
         x265_log(p, X265_LOG_WARNING, "Dynamic-rd disabled, requires RD <= 4, 
VBV and aq-mode enabled\n");
     }
-#ifdef ENABLE_DYNAMIC_HDR10
+#ifdef ENABLE_HDR10_PLUS
     if (m_param->bDhdr10opt && m_param->toneMapFile == NULL)
     {
         x265_log(p, X265_LOG_WARNING, "Disabling dhdr10-opt. dhdr10-info must 
be enabled.\n");
@@ -2483,7 +2483,7 @@
 #else
     if (m_param->toneMapFile)
     {
-        x265_log(p, X265_LOG_WARNING, "--dhdr10-info disabled. Enable dynamic 
HDR in cmake.\n");
+        x265_log(p, X265_LOG_WARNING, "--dhdr10-info disabled. Enable 
HDR10_PLUS in cmake.\n");
         m_bToneMap = 0;
         m_param->toneMapFile = NULL;
     }
diff -r 25a7f0f74c9b -r 646bd0ff6478 source/encoder/encoder.h
--- a/source/encoder/encoder.h  Tue Jun 13 15:15:55 2017 +0530
+++ b/source/encoder/encoder.h  Fri Jun 16 10:58:23 2017 +0530
@@ -31,7 +31,7 @@
 #include "x265.h"
 #include "nal.h"
 #include "framedata.h"
-#ifdef ENABLE_DYNAMIC_HDR10
+#ifdef ENABLE_HDR10_PLUS
     #include "dynamicHDR10/hdr10plus.h"
 #endif
 struct x265_encoder {};
@@ -177,7 +177,7 @@
 
     int                     m_bToneMap; // Enables tone-mapping
 
-#ifdef ENABLE_DYNAMIC_HDR10
+#ifdef ENABLE_HDR10_PLUS
     const hdr10plus_api     *m_hdr10plus_api;
 #endif
 
@@ -186,7 +186,7 @@
     Encoder();
     ~Encoder()
     {
-#ifdef ENABLE_DYNAMIC_HDR10
+#ifdef ENABLE_HDR10_PLUS
         if (m_prevTonemapPayload.payload != NULL)
             X265_FREE(m_prevTonemapPayload.payload);
 #endif
diff -r 25a7f0f74c9b -r 646bd0ff6478 source/x265cli.h
--- a/source/x265cli.h  Tue Jun 13 15:15:55 2017 +0530
+++ b/source/x265cli.h  Fri Jun 16 10:58:23 2017 +0530
@@ -324,7 +324,7 @@
     H1("                                 1 - i420 (4:2:0 default)\n");
     H1("                                 2 - i422 (4:2:2)\n");
     H1("                                 3 - i444 (4:4:4)\n");
-#if ENABLE_DYNAMIC_HDR10
+#if ENABLE_HDR10_PLUS
     H0("   --dhdr10-info <filename>      JSON file containing the Creative 
Intent Metadata to be encoded as Dynamic Tone Mapping\n");
     H0("   --[no-]dhdr10-opt             Insert tone mapping SEI only for IDR 
frames and when the tone mapping information changes. Default disabled\n");
 #endif
_______________________________________________
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel

Reply via email to