[x265-commits] [x265] cmake: look for yasm 1.3.0 binaries as well as 1.2.0
Steve Borho
steve at borho.org
Mon Jul 13 02:14:02 CEST 2015
details: http://hg.videolan.org/x265/rev/60fd55c206c5
branches:
changeset: 10799:60fd55c206c5
user: Steve Borho <steve at borho.org>
date: Sun Jul 12 17:18:52 2015 -0500
description:
cmake: look for yasm 1.3.0 binaries as well as 1.2.0
Subject: [x265] cli: move CSV and dither features into x265-extras, export from CLI on Windows
details: http://hg.videolan.org/x265/rev/ae2e79a13089
branches:
changeset: 10800:ae2e79a13089
user: Steve Borho <steve at borho.org>
date: Sun Jul 12 17:23:57 2015 -0500
description:
cli: move CSV and dither features into x265-extras, export from CLI on Windows
If other applications would like to take advantage of our CSV file writing
functions, or the dither feature, they may either build x265-extras.cpp into
their application, or on Windows they can use these functions directly from the
CLI (just change the extension from EXE to DLL and use it as a shared library).
diffstat:
source/CMakeLists.txt | 8 +-
source/cmake/FindYasm.cmake | 2 +-
source/filters/filters.cpp | 81 -------------
source/filters/filters.h | 31 ----
source/x265-extras.cpp | 273 ++++++++++++++++++++++++++++++++++++++++++++
source/x265-extras.h | 66 ++++++++++
source/x265.cpp | 203 ++------------------------------
source/x265cli.h | 3 +
8 files changed, 361 insertions(+), 306 deletions(-)
diffs (truncated from 794 to 300 lines):
diff -r 79f4906e9cb8 -r ae2e79a13089 source/CMakeLists.txt
--- a/source/CMakeLists.txt Sat Jul 11 12:31:21 2015 -0500
+++ b/source/CMakeLists.txt Sun Jul 12 17:23:57 2015 -0500
@@ -511,7 +511,6 @@ if(ENABLE_CLI)
file(GLOB OutputFiles output/output.cpp output/reconplay.cpp output/*.h
output/yuv.cpp output/y4m.cpp # recon
output/raw.cpp) # muxers
- file(GLOB FilterFiles filters/*.cpp filters/*.h)
source_group(input FILES ${InputFiles})
source_group(output FILES ${OutputFiles})
source_group(filters FILES ${FilterFiles})
@@ -530,11 +529,12 @@ if(ENABLE_CLI)
if(XCODE)
# Xcode seems unable to link the CLI with libs, so link as one targget
- add_executable(cli ../COPYING ${InputFiles} ${OutputFiles} ${FilterFiles} ${GETOPT} x265.cpp x265.h x265cli.h
- $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> ${YASM_OBJS} ${YASM_SRCS})
+ add_executable(cli ../COPYING ${InputFiles} ${OutputFiles} ${FilterFiles} ${GETOPT}
+ x265.cpp x265.h x265cli.h x265-extras.h x265-extras.cpp
+ $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> ${YASM_OBJS} ${YASM_SRCS})
else()
add_executable(cli ../COPYING ${InputFiles} ${OutputFiles} ${FilterFiles} ${GETOPT} ${X265_RC_FILE}
- ${ExportDefs} x265.cpp x265.h x265cli.h)
+ ${ExportDefs} x265.cpp x265.h x265cli.h x265-extras.h x265-extras.cpp)
if(WIN32 OR NOT ENABLE_SHARED OR INTEL_CXX)
# The CLI cannot link to the shared library on Windows, it
# requires internal APIs not exported from the DLL
diff -r 79f4906e9cb8 -r ae2e79a13089 source/cmake/FindYasm.cmake
--- a/source/cmake/FindYasm.cmake Sat Jul 11 12:31:21 2015 -0500
+++ b/source/cmake/FindYasm.cmake Sun Jul 12 17:23:57 2015 -0500
@@ -2,7 +2,7 @@ include(FindPackageHandleStandardArgs)
# Simple path search with YASM_ROOT environment variable override
find_program(YASM_EXECUTABLE
- NAMES yasm yasm-1.2.0-win32 yasm-1.2.0-win64
+ NAMES yasm yasm-1.2.0-win32 yasm-1.2.0-win64 yasm yasm-1.3.0-win32 yasm-1.3.0-win64
HINTS $ENV{YASM_ROOT} ${YASM_ROOT}
PATH_SUFFIXES bin
)
diff -r 79f4906e9cb8 -r ae2e79a13089 source/filters/filters.cpp
--- a/source/filters/filters.cpp Sat Jul 11 12:31:21 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*****************************************************************************
- * Copyright (C) 2013 x265 project
- *
- * Authors: Selvakumar Nithiyaruban <selvakumar at 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 "filters.h"
-#include "common.h"
-
-using namespace X265_NS;
-
-/* The dithering algorithm is based on Sierra-2-4A error diffusion. */
-void ditherPlane(pixel *dst, int dstStride, uint16_t *src, int srcStride,
- int width, int height, int16_t *errors, int bitDepth)
-{
- const int lShift = 16 - bitDepth;
- const int rShift = 16 - bitDepth + 2;
- const int half = (1 << (16 - bitDepth + 1));
- const int pixelMax = (1 << bitDepth) - 1;
-
- memset(errors, 0, (width + 1) * sizeof(int16_t));
- int pitch = 1;
- for (int y = 0; y < height; y++, src += srcStride, dst += dstStride)
- {
- int16_t err = 0;
- for (int x = 0; x < width; x++)
- {
- err = err * 2 + errors[x] + errors[x + 1];
- dst[x * pitch] = (pixel)x265_clip3(0, pixelMax, ((src[x * 1] << 2) + err + half) >> rShift);
- errors[x] = err = src[x * pitch] - (dst[x * pitch] << lShift);
- }
- }
-}
-
-void ditherImage(x265_picture& picIn, int picWidth, int picHeight, int16_t *errorBuf, int bitDepth)
-{
- /* This portion of code is from readFrame in x264. */
- for (int i = 0; i < x265_cli_csps[picIn.colorSpace].planes; i++)
- {
- if ((picIn.bitDepth & 7) && (picIn.bitDepth != 16))
- {
- /* upconvert non 16bit high depth planes to 16bit */
- uint16_t *plane = (uint16_t*)picIn.planes[i];
- uint32_t pixelCount = x265_picturePlaneSize(picIn.colorSpace, picWidth, picHeight, i);
- int lShift = 16 - picIn.bitDepth;
-
- /* This loop assumes width is equal to stride which
- happens to be true for file reader outputs */
- for (uint32_t j = 0; j < pixelCount; j++)
- {
- plane[j] = plane[j] << lShift;
- }
- }
- }
-
- for (int i = 0; i < x265_cli_csps[picIn.colorSpace].planes; i++)
- {
- int height = (int)(picHeight >> x265_cli_csps[picIn.colorSpace].height[i]);
- int width = (int)(picWidth >> x265_cli_csps[picIn.colorSpace].width[i]);
-
- ditherPlane(((pixel*)picIn.planes[i]), picIn.stride[i] / sizeof(pixel), ((uint16_t*)picIn.planes[i]),
- picIn.stride[i] / 2, width, height, errorBuf, bitDepth);
- }
-}
diff -r 79f4906e9cb8 -r ae2e79a13089 source/filters/filters.h
--- a/source/filters/filters.h Sat Jul 11 12:31:21 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*****************************************************************************
- * Copyright (C) 2013 x265 project
- *
- * Authors: Selvakumar Nithiyaruban <selvakumar at 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.
- *****************************************************************************/
-
-#ifndef X265_FILTERS_H
-#define X265_FILTERS_H
-
-#include "x265.h"
-
-void ditherImage(x265_picture&, int picWidth, int picHeight, int16_t *errorBuf, int bitDepth);
-
-#endif //X265_FILTERS_H
diff -r 79f4906e9cb8 -r ae2e79a13089 source/x265-extras.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/source/x265-extras.cpp Sun Jul 12 17:23:57 2015 -0500
@@ -0,0 +1,273 @@
+/*****************************************************************************
+ * Copyright (C) 2015 x265 project
+ *
+ * Authors: Steve Borho <steve at borho.org>
+ * Selvakumar Nithiyaruban <selvakumar at multicorewareinc.com>
+ * Divya Manivannan <divya at 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 "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), "
+ "Version\n";
+
+FILE* x265_csvlog_open(const x265_api& api, const x265_param& param, const char* fname, int level)
+{
+ if (sizeof(x265_stats) != api.sizeof_stats || sizeof(x265_picture) != api.sizeof_picture)
+ {
+ fprintf(stderr, "extras [error]: structure size skew, unable to create CSV logfile\n");
+ return NULL;
+ }
+
+ FILE *csvfp = fopen(fname, "r");
+ if (csvfp)
+ {
+ /* file already exists, re-open for append */
+ fclose(csvfp);
+ return fopen(fname, "ab");
+ }
+ else
+ {
+ /* new CSV file, write header */
+ csvfp = fopen(fname, "wb");
+ if (csvfp)
+ {
+ if (level)
+ {
+ fprintf(csvfp, "Encode Order, Type, POC, QP, Bits, ");
+ if (param.rc.rateControlMode == X265_RC_CRF)
+ fprintf(csvfp, "RateFactor, ");
+ fprintf(csvfp, "Y PSNR, U PSNR, V PSNR, YUV PSNR, SSIM, SSIM (dB), List 0, List 1");
+ /* detailed performance statistics */
+ fprintf(csvfp, ", DecideWait (ms), Row0Wait (ms), Wall time (ms), Ref Wait Wall (ms), Total CTU time (ms), Stall Time (ms), Avg WPP, Row Blocks\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)
+{
+ if (!csvfp)
+ return;
+
+ const x265_frame_stats* frameStats = &pic.frameData;
+ fprintf(csvfp, "%d, %c-SLICE, %4d, %2.2lf, %10d,", frameStats->encoderOrder, frameStats->sliceType, frameStats->poc, frameStats->qp, (int)frameStats->bits);
+ if (param.rc.rateControlMode == X265_RC_CRF)
+ fprintf(csvfp, "%.3lf,", frameStats->rateFactor);
+ if (param.bEnablePsnr)
+ fprintf(csvfp, "%.3lf, %.3lf, %.3lf, %.3lf,", frameStats->psnrY, frameStats->psnrU, frameStats->psnrV, frameStats->psnr);
+ else
+ fputs(" -, -, -, -,", csvfp);
+ if (param.bEnableSsim)
+ fprintf(csvfp, " %.6f, %6.3f,", frameStats->ssim, x265_ssim2dB(frameStats->ssim));
+ else
+ fputs(" -, -,", csvfp);
+ if (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);
+ }
+ fprintf(csvfp, " %.1lf, %.1lf, %.1lf, %.1lf, %.1lf, %.1lf,", frameStats->decideWaitTime, frameStats->row0WaitTime, frameStats->wallTime, frameStats->refWaitWallTime, frameStats->totalCTUTime, frameStats->stallTime);
+ fprintf(csvfp, " %.3lf, %d", frameStats->avgWPP, frameStats->countRowBlocks);
+ fprintf(csvfp, "\n");
+ fflush(stderr);
+}
+
+void x265_csvlog_encode(FILE* csvfp, const x265_api& api, const x265_param& param, const x265_stats& stats, int level, int argc, char** argv)
+{
+ if (!csvfp)
+ return;
+
+ if (level)
+ {
+ // adding summary to a per-frame csv log file, so it needs a summary header
+ fprintf(csvfp, "\nSummary\n");
+ fputs(summaryCSVHeader, csvfp);
+ }
+
+ // CLI arguments or other
+ for (int i = 1; i < argc; i++)
+ {
+ if (i) fputc(' ', csvfp);
+ fputs(argv[i], csvfp);
+ }
More information about the x265-commits
mailing list