# HG changeset patch
# User Mahesh Pittala <[email protected]>
# Date 1480916513 -19800
# Mon Dec 05 11:11:53 2016 +0530
# Node ID ef2a58ba9fa2f0aaec4fbc27eb3351df8696188b
# Parent b2d360143d966de3832a05d8af1c824ecb5b8c5f
csv: modify csv api
diff -r b2d360143d96 -r ef2a58ba9fa2 source/x265-extras.cpp
--- a/source/x265-extras.cpp Mon Dec 05 11:11:53 2016 +0530
+++ b/source/x265-extras.cpp Mon Dec 05 11:11:53 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 ef2a58ba9fa2 source/x265-extras.h
--- a/source/x265-extras.h Mon Dec 05 11:11:53 2016 +0530
+++ b/source/x265-extras.h Mon Dec 05 11:11:53 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 ef2a58ba9fa2 source/x265.cpp
--- a/source/x265.cpp Mon Dec 05 11:11:53 2016 +0530
+++ b/source/x265.cpp Mon Dec 05 11:11:53 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;
_______________________________________________
x265-devel mailing list
[email protected]
https://mailman.videolan.org/listinfo/x265-devel
