[x265] [PATCH 3 of 3] api: drop _t suffix from public data types, for POSIX compatibility
Steve Borho
steve at borho.org
Thu Oct 24 00:05:13 CEST 2013
# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1382565835 18000
# Wed Oct 23 17:03:55 2013 -0500
# Node ID 53dce09435550a1dbd1d4159ef7b507efa2e7992
# Parent 6687f9654743a596fb810231e236ff954245a186
api: drop _t suffix from public data types, for POSIX compatibility
x265_t was changed to x265_encoder, since x265 is too short and would collide
with our namespace.
diff -r 6687f9654743 -r 53dce0943555 source/Lib/TLibCommon/TComPicYuv.cpp
--- a/source/Lib/TLibCommon/TComPicYuv.cpp Wed Oct 23 16:12:17 2013 -0500
+++ b/source/Lib/TLibCommon/TComPicYuv.cpp Wed Oct 23 17:03:55 2013 -0500
@@ -357,7 +357,7 @@
* Upscale pixels from 8bits to 16 bits when required, but do not modify pixels.
* This new routine is GPL
*/
-void TComPicYuv::copyFromPicture(const x265_picture_t& pic, int *pad)
+void TComPicYuv::copyFromPicture(const x265_picture& pic, int *pad)
{
Pel *Y = getLumaAddr();
Pel *U = getCbAddr();
diff -r 6687f9654743 -r 53dce0943555 source/Lib/TLibCommon/TComPicYuv.h
--- a/source/Lib/TLibCommon/TComPicYuv.h Wed Oct 23 16:12:17 2013 -0500
+++ b/source/Lib/TLibCommon/TComPicYuv.h Wed Oct 23 17:03:55 2013 -0500
@@ -178,7 +178,7 @@
void copyToPicLuma(TComPicYuv* destYuv);
void copyToPicCb(TComPicYuv* destYuv);
void copyToPicCr(TComPicYuv* destYuv);
- void copyFromPicture(const x265_picture_t&, int *pad);
+ void copyFromPicture(const x265_picture&, int *pad);
MotionReference* generateMotionReference(wpScalingParam *w);
diff -r 6687f9654743 -r 53dce0943555 source/Lib/TLibEncoder/TEncCfg.h
--- a/source/Lib/TLibEncoder/TEncCfg.h Wed Oct 23 16:12:17 2013 -0500
+++ b/source/Lib/TLibEncoder/TEncCfg.h Wed Oct 23 17:03:55 2013 -0500
@@ -154,7 +154,7 @@
public:
/* copy of parameters used to create encoder */
- x265_param_t param;
+ x265_param param;
int m_pad[2];
Window m_conformanceWindow;
diff -r 6687f9654743 -r 53dce0943555 source/common/common.cpp
--- a/source/common/common.cpp Wed Oct 23 16:12:17 2013 -0500
+++ b/source/common/common.cpp Wed Oct 23 17:03:55 2013 -0500
@@ -100,7 +100,7 @@
if (i > 1023) return 0xffff;
return (x265_exp2_lut[i & 63] + 256) << (i >> 6) >> 8;
}
-void x265_log(x265_param_t *param, int level, const char *fmt, ...)
+void x265_log(x265_param *param, int level, const char *fmt, ...)
{
if (param && level > param->logLevel)
return;
@@ -132,9 +132,9 @@
}
extern "C"
-void x265_param_default(x265_param_t *param)
+void x265_param_default(x265_param *param)
{
- memset(param, 0, sizeof(x265_param_t));
+ memset(param, 0, sizeof(x265_param));
/* Applying non-zero default values to all elements in the param structure */
param->logLevel = X265_LOG_INFO;
@@ -201,14 +201,14 @@
}
extern "C"
-void x265_picture_init(x265_param_t *param, x265_picture_t *pic)
+void x265_picture_init(x265_param *param, x265_picture *pic)
{
- memset(pic, 0, sizeof(x265_picture_t));
+ memset(pic, 0, sizeof(x265_picture));
pic->bitDepth = param->internalBitDepth;
}
extern "C"
-int x265_param_apply_profile(x265_param_t *param, const char *profile)
+int x265_param_apply_profile(x265_param *param, const char *profile)
{
if (!profile)
return 0;
@@ -237,7 +237,7 @@
return 0;
}
-static inline int _confirm(x265_param_t *param, bool bflag, const char* message)
+static inline int _confirm(x265_param *param, bool bflag, const char* message)
{
if (!bflag)
return 0;
@@ -246,7 +246,7 @@
return 1;
}
-int x265_check_params(x265_param_t *param)
+int x265_check_params(x265_param *param)
{
#define CHECK(expr, msg) check_failed |= _confirm(param, expr, msg)
int check_failed = 0; /* abort if there is a fatal configuration problem */
@@ -328,7 +328,7 @@
return check_failed;
}
-int x265_set_globals(x265_param_t *param)
+int x265_set_globals(x265_param *param)
{
uint32_t maxCUDepth = (uint32_t)g_convertToBit[param->maxCUSize];
uint32_t tuQTMinLog2Size = 2; //log2(4)
@@ -377,7 +377,7 @@
return 0;
}
-void x265_print_params(x265_param_t *param)
+void x265_print_params(x265_param *param)
{
if (param->logLevel < X265_LOG_INFO)
return;
@@ -449,7 +449,7 @@
}
extern "C"
-int x265_param_parse(x265_param_t *p, const char *name, const char *value)
+int x265_param_parse(x265_param *p, const char *name, const char *value)
{
int berror = 0;
int valuewasnull;
@@ -571,7 +571,7 @@
return berror ? X265_PARAM_BAD_VALUE : 0;
}
-char *x265_param2string( x265_param_t *p)
+char *x265_param2string( x265_param *p)
{
char *buf, *s;
buf = s = (char *)X265_MALLOC(char, 2000);
diff -r 6687f9654743 -r 53dce0943555 source/common/common.h
--- a/source/common/common.h Wed Oct 23 16:12:17 2013 -0500
+++ b/source/common/common.h Wed Oct 23 17:03:55 2013 -0500
@@ -111,10 +111,10 @@
/* defined in common.cpp */
int64_t x265_mdate(void);
-void x265_log(x265_param_t *param, int level, const char *fmt, ...);
-int x265_check_params(x265_param_t *param);
-void x265_print_params(x265_param_t *param);
-int x265_set_globals(x265_param_t *param);
-char *x265_param2string(x265_param_t *p);
+void x265_log(x265_param *param, int level, const char *fmt, ...);
+int x265_check_params(x265_param *param);
+void x265_print_params(x265_param *param);
+int x265_set_globals(x265_param *param);
+char *x265_param2string(x265_param *p);
int x265_exp2fix8(double x);
#endif // ifndef X265_COMMON_H
diff -r 6687f9654743 -r 53dce0943555 source/common/primitives.cpp
--- a/source/common/primitives.cpp Wed Oct 23 16:12:17 2013 -0500
+++ b/source/common/primitives.cpp Wed Oct 23 17:03:55 2013 -0500
@@ -91,7 +91,7 @@
* cpuid > 0 - force CPU type
* cpuid < 0 - auto-detect if uninitialized */
extern "C"
-void x265_setup_primitives(x265_param_t *param, int cpuid)
+void x265_setup_primitives(x265_param *param, int cpuid)
{
// initialize global variables
initROM();
diff -r 6687f9654743 -r 53dce0943555 source/dllmain.cpp
--- a/source/dllmain.cpp Wed Oct 23 16:12:17 2013 -0500
+++ b/source/dllmain.cpp Wed Oct 23 17:03:55 2013 -0500
@@ -27,7 +27,7 @@
* and common libraries into the DLL */
void dummy()
{
- x265_param_t param;
+ x265_param param;
x265_param_default(¶m);
x265_t *enc = x265_encoder_open(¶m);
diff -r 6687f9654743 -r 53dce0943555 source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp Wed Oct 23 16:12:17 2013 -0500
+++ b/source/encoder/encoder.cpp Wed Oct 23 17:03:55 2013 -0500
@@ -189,7 +189,7 @@
\param nalunits output NAL packets
\retval number of encoded pictures
*/
-int Encoder::encode(bool flush, const x265_picture_t* pic_in, x265_picture_t *pic_out, NALUnitEBSP **nalunits)
+int Encoder::encode(bool flush, const x265_picture* pic_in, x265_picture *pic_out, NALUnitEBSP **nalunits)
{
if (pic_in)
{
@@ -325,7 +325,7 @@
}
}
-void Encoder::fetchStats(x265_stats_t *stats)
+void Encoder::fetchStats(x265_stats *stats)
{
stats->globalPsnrY = m_analyzeAll.getPsnrY();
stats->globalPsnrU = m_analyzeAll.getPsnrU();
@@ -368,7 +368,7 @@
strftime(buffer, 128, "%c", timeinfo);
fprintf(m_csvfpt, ", %s, ", buffer);
- x265_stats_t stats;
+ x265_stats stats;
fetchStats(&stats);
// elapsed time, fps, bitrate
@@ -833,7 +833,7 @@
pps->setLoopFilterAcrossTilesEnabledFlag(m_loopFilterAcrossTilesEnabledFlag);
}
-void Encoder::determineLevelAndProfile(x265_param_t *_param)
+void Encoder::determineLevelAndProfile(x265_param *_param)
{
// this is all based on the table at on Wikipedia at
// http://en.wikipedia.org/wiki/High_Efficiency_Video_Coding#Profiles
@@ -953,7 +953,7 @@
x265_log(_param, X265_LOG_INFO, "%s profile, Level-%s (%s tier)\n", profiles[m_profile], level, tiers[m_levelTier]);
}
-void Encoder::configure(x265_param_t *_param)
+void Encoder::configure(x265_param *_param)
{
// Trim the thread pool if WPP is disabled
if (!_param->bEnableWavefront)
@@ -1159,7 +1159,7 @@
X265_FREE(m_packetData);
X265_FREE(m_nals);
CHECKED_MALLOC(m_packetData, char, memsize);
- CHECKED_MALLOC(m_nals, x265_nal_t, num);
+ CHECKED_MALLOC(m_nals, x265_nal, num);
memsize = 0;
@@ -1210,7 +1210,7 @@
}
extern "C"
-x265_t *x265_encoder_open(x265_param_t *param)
+x265_t *x265_encoder_open(x265_param *param)
{
x265_setup_primitives(param, -1); // -1 means auto-detect if uninitialized
@@ -1239,7 +1239,7 @@
}
extern "C"
-int x265_encoder_headers(x265_t *enc, x265_nal_t **pp_nal, int *pi_nal)
+int x265_encoder_headers(x265_t *enc, x265_nal **pp_nal, int *pi_nal)
{
if (!pp_nal)
return 0;
@@ -1273,7 +1273,7 @@
}
extern "C"
-int x265_encoder_encode(x265_t *enc, x265_nal_t **pp_nal, int *pi_nal, x265_picture_t *pic_in, x265_picture_t *pic_out)
+int x265_encoder_encode(x265_t *enc, x265_nal **pp_nal, int *pi_nal, x265_picture *pic_in, x265_picture *pic_out)
{
Encoder *encoder = static_cast<Encoder*>(enc);
NALUnitEBSP *nalunits[MAX_NAL_UNITS] = { 0, 0, 0, 0, 0 };
@@ -1303,7 +1303,7 @@
EXTERN_CYCLE_COUNTER(ME);
extern "C"
-void x265_encoder_get_stats(x265_t *enc, x265_stats_t *outputStats)
+void x265_encoder_get_stats(x265_t *enc, x265_stats *outputStats)
{
Encoder *encoder = static_cast<Encoder*>(enc);
diff -r 6687f9654743 -r 53dce0943555 source/encoder/encoder.h
--- a/source/encoder/encoder.h Wed Oct 23 16:12:17 2013 -0500
+++ b/source/encoder/encoder.h Wed Oct 23 17:03:55 2013 -0500
@@ -74,7 +74,7 @@
public:
- x265_nal_t* m_nals;
+ x265_nal* m_nals;
char* m_packetData;
Encoder();
@@ -88,11 +88,11 @@
void initSPS(TComSPS *sps);
void initPPS(TComPPS *pps);
- int encode(bool bEos, const x265_picture_t* pic, x265_picture_t *pic_out, NALUnitEBSP **nalunits);
+ int encode(bool bEos, const x265_picture* pic, x265_picture *pic_out, NALUnitEBSP **nalunits);
int getStreamHeaders(NALUnitEBSP **nalunits);
- void fetchStats(x265_stats_t* stats);
+ void fetchStats(x265_stats* stats);
void writeLog(int argc, char **argv);
@@ -102,9 +102,9 @@
void setThreadPool(ThreadPool* p) { m_threadPool = p; }
- void configure(x265_param_t *param);
+ void configure(x265_param *param);
- void determineLevelAndProfile(x265_param_t *param);
+ void determineLevelAndProfile(x265_param *param);
int extractNalData(NALUnitEBSP **nalunits);
diff -r 6687f9654743 -r 53dce0943555 source/input/input.h
--- a/source/input/input.h Wed Oct 23 16:12:17 2013 -0500
+++ b/source/input/input.h Wed Oct 23 17:03:55 2013 -0500
@@ -63,7 +63,7 @@
virtual void skipFrames(int numFrames) = 0;
- virtual bool readPicture(x265_picture_t& pic) = 0;
+ virtual bool readPicture(x265_picture& pic) = 0;
virtual bool isEof() const = 0;
diff -r 6687f9654743 -r 53dce0943555 source/input/y4m.cpp
--- a/source/input/y4m.cpp Wed Oct 23 16:12:17 2013 -0500
+++ b/source/input/y4m.cpp Wed Oct 23 17:03:55 2013 -0500
@@ -228,7 +228,7 @@
void Y4MInput::skipFrames(int numFrames)
{
- x265_picture_t pic;
+ x265_picture pic;
for (int i = 0; i < numFrames; i++)
{
@@ -237,7 +237,7 @@
}
#if defined(ENABLE_THREAD)
-bool Y4MInput::readPicture(x265_picture_t& pic)
+bool Y4MInput::readPicture(x265_picture& pic)
{
PPAStartCpuEventFunc(read_yuv);
if (!threadActive)
@@ -315,7 +315,7 @@
}
#else // if defined(ENABLE_THREAD)
-bool Y4MInput::readPicture(x265_picture_t& pic)
+bool Y4MInput::readPicture(x265_picture& pic)
{
PPAStartCpuEventFunc(read_yuv);
diff -r 6687f9654743 -r 53dce0943555 source/input/y4m.h
--- a/source/input/y4m.h Wed Oct 23 16:12:17 2013 -0500
+++ b/source/input/y4m.h Wed Oct 23 17:03:55 2013 -0500
@@ -98,7 +98,7 @@
void skipFrames(int numFrames);
- bool readPicture(x265_picture_t&);
+ bool readPicture(x265_picture&);
#if defined(ENABLE_THREAD)
diff -r 6687f9654743 -r 53dce0943555 source/input/yuv.cpp
--- a/source/input/yuv.cpp Wed Oct 23 16:12:17 2013 -0500
+++ b/source/input/yuv.cpp Wed Oct 23 17:03:55 2013 -0500
@@ -137,7 +137,7 @@
return true;
}
-bool YUVInput::readPicture(x265_picture_t& pic)
+bool YUVInput::readPicture(x265_picture& pic)
{
PPAStartCpuEventFunc(read_yuv);
if (!threadActive)
@@ -172,7 +172,7 @@
#else // if defined ENABLE_THREAD
// TODO: only supports 4:2:0 chroma sampling
-bool YUVInput::readPicture(x265_picture_t& pic)
+bool YUVInput::readPicture(x265_picture& pic)
{
PPAStartCpuEventFunc(read_yuv);
diff -r 6687f9654743 -r 53dce0943555 source/input/yuv.h
--- a/source/input/yuv.h Wed Oct 23 16:12:17 2013 -0500
+++ b/source/input/yuv.h Wed Oct 23 17:03:55 2013 -0500
@@ -99,7 +99,7 @@
void skipFrames(int numFrames);
- bool readPicture(x265_picture_t&);
+ bool readPicture(x265_picture&);
#if defined(ENABLE_THREAD)
diff -r 6687f9654743 -r 53dce0943555 source/output/output.h
--- a/source/output/output.h Wed Oct 23 16:12:17 2013 -0500
+++ b/source/output/output.h Wed Oct 23 17:03:55 2013 -0500
@@ -45,7 +45,7 @@
virtual void release() = 0;
- virtual bool writePicture(const x265_picture_t& pic) = 0;
+ virtual bool writePicture(const x265_picture& pic) = 0;
};
}
diff -r 6687f9654743 -r 53dce0943555 source/output/y4m.cpp
--- a/source/output/y4m.cpp Wed Oct 23 16:12:17 2013 -0500
+++ b/source/output/y4m.cpp Wed Oct 23 17:03:55 2013 -0500
@@ -47,7 +47,7 @@
delete [] buf;
}
-bool Y4MOutput::writePicture(const x265_picture_t& pic)
+bool Y4MOutput::writePicture(const x265_picture& pic)
{
PPAStartCpuEventFunc(write_yuv);
std::ofstream::pos_type outPicPos = header;
diff -r 6687f9654743 -r 53dce0943555 source/output/y4m.h
--- a/source/output/y4m.h Wed Oct 23 16:12:17 2013 -0500
+++ b/source/output/y4m.h Wed Oct 23 17:03:55 2013 -0500
@@ -56,7 +56,7 @@
void release() { delete this; }
- bool writePicture(const x265_picture_t& pic);
+ bool writePicture(const x265_picture& pic);
};
}
diff -r 6687f9654743 -r 53dce0943555 source/output/yuv.cpp
--- a/source/output/yuv.cpp Wed Oct 23 16:12:17 2013 -0500
+++ b/source/output/yuv.cpp Wed Oct 23 17:03:55 2013 -0500
@@ -43,7 +43,7 @@
delete [] buf;
}
-bool YUVOutput::writePicture(const x265_picture_t& pic)
+bool YUVOutput::writePicture(const x265_picture& pic)
{
PPAStartCpuEventFunc(write_yuv);
int pixelbytes = (depth > 8) ? 2 : 1;
diff -r 6687f9654743 -r 53dce0943555 source/output/yuv.h
--- a/source/output/yuv.h Wed Oct 23 16:12:17 2013 -0500
+++ b/source/output/yuv.h Wed Oct 23 17:03:55 2013 -0500
@@ -55,7 +55,7 @@
void release() { delete this; }
- bool writePicture(const x265_picture_t& pic);
+ bool writePicture(const x265_picture& pic);
};
}
diff -r 6687f9654743 -r 53dce0943555 source/x265.cpp
--- a/source/x265.cpp Wed Oct 23 16:12:17 2013 -0500
+++ b/source/x265.cpp Wed Oct 23 17:03:55 2013 -0500
@@ -177,11 +177,11 @@
}
void destroy();
- void writeNALs(const x265_nal_t* nal, int nalcount);
- void printStatus(int frameNum, x265_param_t *param);
- void printVersion(x265_param_t *param);
- void showHelp(x265_param_t *param);
- bool parse(int argc, char **argv, x265_param_t* param);
+ void writeNALs(const x265_nal* nal, int nalcount);
+ void printStatus(int frameNum, x265_param *param);
+ void printVersion(x265_param *param);
+ void showHelp(x265_param *param);
+ bool parse(int argc, char **argv, x265_param* param);
};
void CLIOptions::destroy()
@@ -194,7 +194,7 @@
recon = NULL;
}
-void CLIOptions::writeNALs(const x265_nal_t* nal, int nalcount)
+void CLIOptions::writeNALs(const x265_nal* nal, int nalcount)
{
PPAScopeEvent(bitstream_write);
for (int i = 0; i < nalcount; i++)
@@ -205,7 +205,7 @@
}
}
-void CLIOptions::printStatus(int i_frame, x265_param_t *param)
+void CLIOptions::printStatus(int i_frame, x265_param *param)
{
char buf[200];
int64_t i_time = x265_mdate();
@@ -233,14 +233,14 @@
prevUpdateTime = i_time;
}
-void CLIOptions::printVersion(x265_param_t *param)
+void CLIOptions::printVersion(x265_param *param)
{
fprintf(stderr, "x265 [info]: HEVC encoder version %s\n", x265_version_str);
fprintf(stderr, "x265 [info]: build info %s\n", x265_build_info_str);
x265_setup_primitives(param, 0);
}
-void CLIOptions::showHelp(x265_param_t *param)
+void CLIOptions::showHelp(x265_param *param)
{
x265_param_default(param);
printVersion(param);
@@ -322,7 +322,7 @@
exit(0);
}
-bool CLIOptions::parse(int argc, char **argv, x265_param_t* param)
+bool CLIOptions::parse(int argc, char **argv, x265_param* param)
{
int berror = 0;
int help = 0;
@@ -520,7 +520,7 @@
fp1 = fopen("LOG_CU_COST.txt", "w");
#endif
- x265_param_t param;
+ x265_param param;
CLIOptions cliopt;
if (cliopt.parse(argc, argv, ¶m))
@@ -542,11 +542,11 @@
if (signal(SIGINT, sigint_handler) == SIG_ERR)
x265_log(¶m, X265_LOG_ERROR, "Unable to register CTRL+C handler: %s\n", strerror(errno));
- x265_picture_t pic_orig, pic_out;
- x265_picture_t *pic_in = &pic_orig;
- x265_picture_t *pic_recon = cliopt.recon ? &pic_out : NULL;
- x265_nal_t *p_nal;
- x265_stats_t stats;
+ x265_picture pic_orig, pic_out;
+ x265_picture *pic_in = &pic_orig;
+ x265_picture *pic_recon = cliopt.recon ? &pic_out : NULL;
+ x265_nal *p_nal;
+ x265_stats stats;
int nal;
if (!x265_encoder_headers(encoder, &p_nal, &nal))
diff -r 6687f9654743 -r 53dce0943555 source/x265.h
--- a/source/x265.h Wed Oct 23 16:12:17 2013 -0500
+++ b/source/x265.h Wed Oct 23 17:03:55 2013 -0500
@@ -31,9 +31,9 @@
extern "C" {
#endif
-/* x265_t:
+/* x265_encoder:
* opaque handler for encoder */
-typedef struct x265_t x265_t;
+typedef struct x265_encoder x265_encoder;
// TODO: Existing names used for the different NAL unit types can be altered to better reflect the names in the spec.
// However, the names in the spec are not yet stable at this point. Once the names are stable, a cleanup
@@ -122,12 +122,12 @@
* before calling x265_encoder_encode again. */
typedef struct
{
- int i_type; /* NalUnitType */
- int i_payload; /* size in bytes */
+ int i_type; /* NalUnitType */
+ int i_payload; /* size in bytes */
uint8_t *p_payload;
-} x265_nal_t;
+} x265_nal;
-typedef struct x265_picture_t
+typedef struct
{
void* planes[3];
int stride[3];
@@ -136,7 +136,7 @@
int poc;
int64_t pts;
void* userData;
-} x265_picture_t;
+} x265_picture;
typedef enum
{
@@ -210,7 +210,7 @@
#define IS_X265_TYPE_B(x) ((x) == X265_TYPE_B || (x) == X265_TYPE_BREF)
/* rate tolerance method */
-typedef enum RcMethod
+typedef enum
{
X265_RC_ABR,
X265_RC_CQP,
@@ -218,7 +218,7 @@
} X265_RC_METHODS;
/*Level of Rate Distortion Optimization Allowed */
-typedef enum RDOLevel
+typedef enum
{
X265_NO_RDO_NO_RDOQ, /* Partial RDO during mode decision (only at each depth/mode), no RDO in quantization*/
X265_NO_RDO, /* Partial RDO during mode decision (only at each depth/mode), quantization RDO enabled */
@@ -226,7 +226,7 @@
} X265_RDO_LEVEL;
/* Output statistics from encoder */
-typedef struct x265_stats_t
+typedef struct x265_stats
{
double globalPsnrY;
double globalPsnrU;
@@ -238,10 +238,10 @@
double elapsedEncodeTime; // wall time since encoder was opened
double elapsedVideoTime; // encoded picture count / frame rate
double bitrate; // accBits / elapsed video time
-} x265_stats_t;
+} x265_stats;
/* Input parameters to the encoder */
-typedef struct x265_param_t
+typedef struct
{
int logLevel;
int bEnableWavefront; ///< enable wavefront parallel processing
@@ -332,17 +332,17 @@
int aqMode; ///< Adaptive QP (AQ)
double aqStrength;
} rc;
-} x265_param_t;
+} x265_param;
/***
* If not called, first encoder allocated will auto-detect the CPU and
* initialize performance primitives, which are process global */
-void x265_setup_primitives(x265_param_t *param, int cpu);
+void x265_setup_primitives(x265_param *param, int cpu);
/***
* Initialize an x265_param_t structure to default values
*/
-void x265_param_default(x265_param_t *param);
+void x265_param_default(x265_param *param);
/* x265_param_parse:
* set one parameter by name.
@@ -353,12 +353,12 @@
* value=NULL means "true" for boolean options, but is a BAD_VALUE for non-booleans. */
#define X265_PARAM_BAD_NAME (-1)
#define X265_PARAM_BAD_VALUE (-2)
-int x265_param_parse(x265_param_t *p, const char *name, const char *value);
+int x265_param_parse(x265_param *p, const char *name, const char *value);
/***
* Initialize an x265_picture_t structure to default values
*/
-void x265_picture_init(x265_param_t *param, x265_picture_t *pic);
+void x265_picture_init(x265_param *param, x265_picture *pic);
/* x265_param_apply_profile:
* Applies the restrictions of the given profile. (one of below) */
@@ -366,7 +366,7 @@
/* (can be NULL, in which case the function will do nothing)
* returns 0 on success, negative on failure (e.g. invalid profile name). */
-int x265_param_apply_profile(x265_param_t *, const char *profile);
+int x265_param_apply_profile(x265_param *, const char *profile);
/* x265_max_bit_depth:
* Specifies the maximum number of bits per pixel that x265 can input. This
@@ -394,35 +394,35 @@
/* x265_encoder_open:
* create a new encoder handler, all parameters from x265_param_t are copied */
-x265_t* x265_encoder_open(x265_param_t *);
+x265_encoder* x265_encoder_open(x265_param *);
/* x265_encoder_headers:
* return the SPS and PPS that will be used for the whole stream.
* *pi_nal is the number of NAL units outputted in pp_nal.
* returns negative on error.
* the payloads of all output NALs are guaranteed to be sequential in memory. */
-int x265_encoder_headers(x265_t *, x265_nal_t **pp_nal, int *pi_nal);
+int x265_encoder_headers(x265_encoder *, x265_nal **pp_nal, int *pi_nal);
/* x265_encoder_encode:
* encode one picture.
* *pi_nal is the number of NAL units outputted in pp_nal.
* returns negative on error, zero if no NAL units returned.
* the payloads of all output NALs are guaranteed to be sequential in memory. */
-int x265_encoder_encode(x265_t *encoder, x265_nal_t **pp_nal, int *pi_nal, x265_picture_t *pic_in, x265_picture_t *pic_out);
+int x265_encoder_encode(x265_encoder *encoder, x265_nal **pp_nal, int *pi_nal, x265_picture *pic_in, x265_picture *pic_out);
/* x265_encoder_get_stats:
* returns encoder statistics */
-void x265_encoder_get_stats(x265_t *encoder, x265_stats_t *);
+void x265_encoder_get_stats(x265_encoder *encoder, x265_stats *);
/* x265_encoder_log:
* write a line to the configured CSV file. If a CSV filename was not
* configured, or file open failed, or the log level indicated frame level
* logging, this function will perform no write. */
-void x265_encoder_log(x265_t *encoder, int argc, char **argv);
+void x265_encoder_log(x265_encoder *encoder, int argc, char **argv);
/* x265_encoder_close:
* close an encoder handler */
-void x265_encoder_close(x265_t *);
+void x265_encoder_close(x265_encoder *);
/***
* Release library static allocations
More information about the x265-devel
mailing list