[x265] [PATCH] csv: modify csv api

[mahesh at multicorewareinc.com]

# HG changeset patch
# User Mahesh Pittala <mahesh at multicorewareinc.com>
# Date 1481091178 -19800
#      Wed Dec 07 11:42:58 2016 +0530
# Node ID 97cc2e5c06717bf68a2ff9a0e91fe7ba443a4cf8
# Parent  b2d360143d966de3832a05d8af1c824ecb5b8c5f
csv: modify csv api

diff -r b2d360143d96 -r 97cc2e5c0671 source/CMakeLists.txt
--- a/source/CMakeLists.txt	Mon Dec 05 11:11:53 2016 +0530
+++ b/source/CMakeLists.txt	Wed Dec 07 11:42:58 2016 +0530
@@ -30,7 +30,7 @@
 mark_as_advanced(FPROFILE_USE FPROFILE_GENERATE NATIVE_BUILD)
 
 # X265_BUILD must be incremented each time the public API is changed
-set(X265_BUILD 101)
+set(X265_BUILD 102)
 configure_file("${PROJECT_SOURCE_DIR}/x265.def.in"
                "${PROJECT_BINARY_DIR}/x265.def")
 configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in"
diff -r b2d360143d96 -r 97cc2e5c0671 source/x265-extras.cpp
--- a/source/x265-extras.cpp	Mon Dec 05 11:11:53 2016 +0530
+++ b/source/x265-extras.cpp	Wed Dec 07 11:42:58 2016 +0530
@@ -191,7 +191,7 @@
     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)
+void x265_csvlog_encode(FILE* csvfp, const char* version, const x265_param& param, const x265_stats& stats, int level, int argc, char** argv)
 {
     if (!csvfp)
         return;
@@ -281,7 +281,7 @@
     else
         fprintf(csvfp, " -, -, -, -, -, -, -,");
 
-    fprintf(csvfp, " %-6u, %-6u, %s\n", stats.maxCLL, stats.maxFALL, api.version_str);
+    fprintf(csvfp, " %-6u, %-6u, %s\n", stats.maxCLL, stats.maxFALL, version);
 }
 
 /* The dithering algorithm is based on Sierra-2-4A error diffusion.
diff -r b2d360143d96 -r 97cc2e5c0671 source/x265-extras.h
--- a/source/x265-extras.h	Mon Dec 05 11:11:53 2016 +0530
+++ b/source/x265-extras.h	Wed Dec 07 11:42:58 2016 +0530
@@ -53,7 +53,7 @@
 /* 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 x265_api& api, const x265_param& param, const x265_stats& stats, int level, int argc, char** argv);
+LIBAPI void x265_csvlog_encode(FILE* csvfp, const char* version, const x265_param& param, 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. */
diff -r b2d360143d96 -r 97cc2e5c0671 source/x265.cpp
--- a/source/x265.cpp	Mon Dec 05 11:11:53 2016 +0530
+++ b/source/x265.cpp	Wed Dec 07 11:42:58 2016 +0530
@@ -746,7 +746,7 @@
 
     api->encoder_get_stats(encoder, &stats, sizeof(stats));
     if (cliopt.csvfpt && !b_ctrl_c)
-        x265_csvlog_encode(cliopt.csvfpt, *api, *param, stats, cliopt.csvLogLevel, argc, argv);
+        x265_csvlog_encode(cliopt.csvfpt, api->version_str, *param, stats, cliopt.csvLogLevel, argc, argv);
     api->encoder_close(encoder);
 
     int64_t second_largest_pts = 0;