1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
|
Namespace functions for multi-bitdepth builds so that libraries are self-contained.
Index: source/common/param.h
===================================================================
--- source.orig/common/param.h
+++ source/common/param.h
@@ -53,6 +53,18 @@ int x265_param_default_preset(x265_param
int x265_param_apply_profile(x265_param *, const char *profile);
int x265_param_parse(x265_param *p, const char *name, const char *value);
int x265_zone_param_parse(x265_param* p, const char* name, const char* value);
+void x265_free_analysis_data(x265_param *param, x265_analysis_data* analysis);
+void x265_alloc_analysis_data(x265_param *param, x265_analysis_data* analysis);
+void x265_picture_free(x265_picture *);
+x265_zone *x265_zone_alloc(int zoneCount, int isZoneFile);
+void x265_zone_free(x265_param *param);
+FILE* x265_csvlog_open(const x265_param *);
+void x265_csvlog_frame(const x265_param *, const x265_picture *);
+void x265_csvlog_encode(const x265_param*, const x265_stats *, int padx, int pady, int argc, char** argv);
+void x265_dither_image(x265_picture *, int picWidth, int picHeight, int16_t *errorBuf, int bitDepth);
+int x265_encoder_reconfig(x265_encoder *, x265_param *);
+x265_picture *x265_picture_alloc(void);
+void x265_picture_init(x265_param *param, x265_picture *pic);
#define PARAM_NS X265_NS
#endif
}
Index: source/encoder/api.cpp
===================================================================
--- source.orig/encoder/api.cpp
+++ source/encoder/api.cpp
@@ -106,9 +106,9 @@ x265_encoder *x265_encoder_open(x265_par
if (p->rc.zoneCount || p->rc.zonefileCount)
{
int zoneCount = p->rc.zonefileCount ? p->rc.zonefileCount : p->rc.zoneCount;
- param->rc.zones = x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
- latestParam->rc.zones = x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
- zoneParam->rc.zones = x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
+ param->rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
+ latestParam->rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
+ zoneParam->rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
}
x265_copy_params(param, p);
@@ -216,7 +216,7 @@ x265_encoder *x265_encoder_open(x265_par
/* Try to open CSV file handle */
if (encoder->m_param->csvfn)
{
- encoder->m_param->csvfpt = x265_csvlog_open(encoder->m_param);
+ encoder->m_param->csvfpt = PARAM_NS::x265_csvlog_open(encoder->m_param);
if (!encoder->m_param->csvfpt)
{
x265_log(encoder->m_param, X265_LOG_ERROR, "Unable to open CSV log file <%s>, aborting\n", encoder->m_param->csvfn);
@@ -321,7 +321,7 @@ int x265_encoder_reconfig(x265_encoder*
if (encoder->m_latestParam->rc.zoneCount || encoder->m_latestParam->rc.zonefileCount)
{
int zoneCount = encoder->m_latestParam->rc.zonefileCount ? encoder->m_latestParam->rc.zonefileCount : encoder->m_latestParam->rc.zoneCount;
- save.rc.zones = x265_zone_alloc(zoneCount, !!encoder->m_latestParam->rc.zonefileCount);
+ save.rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!encoder->m_latestParam->rc.zonefileCount);
}
x265_copy_params(&save, encoder->m_latestParam);
int ret = encoder->reconfigureParam(encoder->m_latestParam, param_in);
@@ -604,7 +604,7 @@ fail:
*pi_nal = 0;
if (numEncoded && encoder->m_param->csvLogLevel && encoder->m_outputCount >= encoder->m_latestParam->chunkStart)
- x265_csvlog_frame(encoder->m_param, pic_out);
+ PARAM_NS::x265_csvlog_frame(encoder->m_param, pic_out);
if (numEncoded < 0)
encoder->m_aborted = true;
@@ -637,7 +637,7 @@ void x265_vmaf_encoder_log(x265_encoder*
encoder->fetchStats(&stats, sizeof(stats));
int padx = encoder->m_sps.conformanceWindow.rightOffset;
int pady = encoder->m_sps.conformanceWindow.bottomOffset;
- x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);
+ PARAM_NS::x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);
}
}
#endif
@@ -651,7 +651,7 @@ void x265_encoder_log(x265_encoder* enc,
encoder->fetchStats(&stats, sizeof(stats));
int padx = encoder->m_sps.conformanceWindow.rightOffset;
int pady = encoder->m_sps.conformanceWindow.bottomOffset;
- x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);
+ PARAM_NS::x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);
}
}
@@ -872,7 +872,7 @@ void x265_alloc_analysis_data(x265_param
return;
fail:
- x265_free_analysis_data(param, analysis);
+ PARAM_NS::x265_free_analysis_data(param, analysis);
}
void x265_free_analysis_data(x265_param *param, x265_analysis_data* analysis)
Index: source/encoder/encoder.cpp
===================================================================
--- source.orig/encoder/encoder.cpp
+++ source/encoder/encoder.cpp
@@ -186,8 +186,8 @@ void Encoder::create()
{
m_dupBuffer[i] = (AdaptiveFrameDuplication*)x265_malloc(sizeof(AdaptiveFrameDuplication));
m_dupBuffer[i]->dupPic = NULL;
- m_dupBuffer[i]->dupPic = x265_picture_alloc();
- x265_picture_init(p, m_dupBuffer[i]->dupPic);
+ m_dupBuffer[i]->dupPic = PARAM_NS::x265_picture_alloc();
+ PARAM_NS::x265_picture_init(p, m_dupBuffer[i]->dupPic);
m_dupBuffer[i]->dupPlane = NULL;
m_dupBuffer[i]->dupPlane = X265_MALLOC(char, framesize);
m_dupBuffer[i]->dupPic->planes[0] = m_dupBuffer[i]->dupPlane;
@@ -756,7 +756,7 @@ int Encoder::setAnalysisData(x265_analys
curFrame->m_analysisData = (*analysis_data);
curFrame->m_analysisData.numCUsInFrame = widthInCU * heightInCU;
curFrame->m_analysisData.numPartitions = m_param->num4x4Partitions;
- x265_alloc_analysis_data(m_param, &curFrame->m_analysisData);
+ PARAM_NS::x265_alloc_analysis_data(m_param, &curFrame->m_analysisData);
if (m_param->maxCUSize == 16)
{
if (analysis_data->sliceType == X265_TYPE_IDR || analysis_data->sliceType == X265_TYPE_I)
@@ -860,7 +860,7 @@ void Encoder::destroy()
for (uint32_t i = 0; i < DUP_BUFFER; i++)
{
X265_FREE(m_dupBuffer[i]->dupPlane);
- x265_picture_free(m_dupBuffer[i]->dupPic);
+ PARAM_NS::x265_picture_free(m_dupBuffer[i]->dupPic);
X265_FREE(m_dupBuffer[i]);
}
@@ -1592,7 +1592,7 @@ int Encoder::encode(const x265_picture*
if (m_exportedPic)
{
if (!m_param->bUseAnalysisFile && m_param->analysisSave)
- x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData);
+ PARAM_NS::x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData);
ATOMIC_DEC(&m_exportedPic->m_countRefEncoders);
m_exportedPic = NULL;
m_dpb->recycleUnreferenced();
@@ -1968,7 +1968,7 @@ int Encoder::encode(const x265_picture*
/* Free up inputPic->analysisData since it has already been used */
if ((m_param->analysisLoad && !m_param->analysisSave) || ((m_param->bAnalysisType == AVC_INFO) && slice->m_sliceType != I_SLICE))
- x265_free_analysis_data(m_param, &outFrame->m_analysisData);
+ PARAM_NS::x265_free_analysis_data(m_param, &outFrame->m_analysisData);
if (pic_out)
{
@@ -2046,7 +2046,7 @@ int Encoder::encode(const x265_picture*
writeAnalysisFile(&pic_out->analysisData, *outFrame->m_encData);
pic_out->analysisData.saveParam = pic_out->analysisData.saveParam;
if (m_param->bUseAnalysisFile)
- x265_free_analysis_data(m_param, &pic_out->analysisData);
+ PARAM_NS::x265_free_analysis_data(m_param, &pic_out->analysisData);
}
}
if (m_param->rc.bStatWrite && (m_param->analysisMultiPassRefine || m_param->analysisMultiPassDistortion))
@@ -2061,7 +2061,7 @@ int Encoder::encode(const x265_picture*
writeAnalysisFileRefine(&outFrame->m_analysisData, *outFrame->m_encData);
}
if (m_param->analysisMultiPassRefine || m_param->analysisMultiPassDistortion)
- x265_free_analysis_data(m_param, &outFrame->m_analysisData);
+ PARAM_NS::x265_free_analysis_data(m_param, &outFrame->m_analysisData);
if (m_param->internalCsp == X265_CSP_I400)
{
if (slice->m_sliceType == P_SLICE)
@@ -2199,7 +2199,7 @@ int Encoder::encode(const x265_picture*
uint32_t heightInCU = (m_param->sourceHeight + m_param->maxCUSize - 1) >> m_param->maxLog2CUSize;
frameEnc->m_analysisData.numCUsInFrame = widthInCU * heightInCU;
frameEnc->m_analysisData.numPartitions = m_param->num4x4Partitions;
- x265_alloc_analysis_data(m_param, &frameEnc->m_analysisData);
+ PARAM_NS::x265_alloc_analysis_data(m_param, &frameEnc->m_analysisData);
frameEnc->m_analysisData.poc = frameEnc->m_poc;
if (m_param->rc.bStatRead)
readAnalysisFile(&frameEnc->m_analysisData, frameEnc->m_poc, frameEnc->m_lowres.sliceType);
@@ -2210,7 +2210,7 @@ int Encoder::encode(const x265_picture*
for (int i = 0; i < m_param->rc.zonefileCount; i++)
{
if (m_param->rc.zones[i].startFrame == frameEnc->m_poc)
- x265_encoder_reconfig(this, m_param->rc.zones[i].zoneParam);
+ PARAM_NS::x265_encoder_reconfig(this, m_param->rc.zones[i].zoneParam);
}
}
@@ -2353,7 +2353,7 @@ int Encoder::encode(const x265_picture*
analysis->numCUsInFrame = numCUsInFrame;
analysis->numCuInHeight = heightInCU;
analysis->numPartitions = m_param->num4x4Partitions;
- x265_alloc_analysis_data(m_param, analysis);
+ PARAM_NS::x265_alloc_analysis_data(m_param, analysis);
}
/* determine references, setup RPS, etc */
m_dpb->prepareEncode(frameEnc);
@@ -4264,7 +4264,7 @@ void Encoder::readAnalysisFile(x265_anal
else if (fread(val, size, readSize, fileOffset) != readSize)\
{\
x265_log(NULL, X265_LOG_ERROR, "Error reading analysis data\n");\
- x265_free_analysis_data(m_param, analysis);\
+ PARAM_NS::x265_free_analysis_data(m_param, analysis);\
m_aborted = true;\
return;\
}\
@@ -4300,7 +4300,7 @@ void Encoder::readAnalysisFile(x265_anal
if (poc != curPoc || feof(m_analysisFileIn))
{
x265_log(NULL, X265_LOG_WARNING, "Error reading analysis data: Cannot find POC %d\n", curPoc);
- x265_free_analysis_data(m_param, analysis);
+ PARAM_NS::x265_free_analysis_data(m_param, analysis);
return;
}
}
@@ -4334,7 +4334,7 @@ void Encoder::readAnalysisFile(x265_anal
if (m_param->scaleFactor)
analysis->numPartitions *= factor;
/* Memory is allocated for inter and intra analysis data based on the slicetype */
- x265_alloc_analysis_data(m_param, analysis);
+ PARAM_NS::x265_alloc_analysis_data(m_param, analysis);
if (m_param->ctuDistortionRefine == CTU_DISTORTION_INTERNAL)
{
@@ -4587,7 +4587,7 @@ void Encoder::readAnalysisFile(x265_anal
else if (fread(val, size, readSize, fileOffset) != readSize)\
{\
x265_log(NULL, X265_LOG_ERROR, "Error reading analysis data\n");\
- x265_free_analysis_data(m_param, analysis);\
+ PARAM_NS::x265_free_analysis_data(m_param, analysis);\
m_aborted = true;\
return;\
}\
@@ -4624,7 +4624,7 @@ void Encoder::readAnalysisFile(x265_anal
if (poc != curPoc || feof(m_analysisFileIn))
{
x265_log(NULL, X265_LOG_WARNING, "Error reading analysis data: Cannot find POC %d\n", curPoc);
- x265_free_analysis_data(m_param, analysis);
+ PARAM_NS::x265_free_analysis_data(m_param, analysis);
return;
}
}
@@ -4655,7 +4655,7 @@ void Encoder::readAnalysisFile(x265_anal
analysis->numCuInHeight = cuLoc.heightInCU;
/* Memory is allocated for inter and intra analysis data based on the slicetype */
- x265_alloc_analysis_data(m_param, analysis);
+ PARAM_NS::x265_alloc_analysis_data(m_param, analysis);
if (m_param->ctuDistortionRefine == CTU_DISTORTION_INTERNAL)
{
@@ -5257,7 +5257,7 @@ void Encoder::readAnalysisFile(x265_anal
if (fread(val, size, readSize, fileOffset) != readSize)\
{\
x265_log(NULL, X265_LOG_ERROR, "Error reading analysis 2 pass data\n"); \
- x265_alloc_analysis_data(m_param, analysis); \
+ PARAM_NS::x265_alloc_analysis_data(m_param, analysis); \
m_aborted = true; \
return; \
}\
@@ -5271,7 +5271,7 @@ void Encoder::readAnalysisFile(x265_anal
if (poc != curPoc || feof(m_analysisFileIn))
{
x265_log(NULL, X265_LOG_WARNING, "Error reading analysis 2 pass data: Cannot find POC %d\n", curPoc);
- x265_free_analysis_data(m_param, analysis);
+ PARAM_NS::x265_free_analysis_data(m_param, analysis);
return;
}
/* Now arrived at the right frame, read the record */
@@ -5378,7 +5378,7 @@ void Encoder::writeAnalysisFile(x265_ana
if (fwrite(val, size, writeSize, fileOffset) < writeSize)\
{\
x265_log(NULL, X265_LOG_ERROR, "Error writing analysis data\n");\
- x265_free_analysis_data(m_param, analysis);\
+ PARAM_NS::x265_free_analysis_data(m_param, analysis);\
m_aborted = true;\
return;\
}\
@@ -5600,7 +5600,7 @@ void Encoder::writeAnalysisFileRefine(x2
if (fwrite(val, size, writeSize, fileOffset) < writeSize)\
{\
x265_log(NULL, X265_LOG_ERROR, "Error writing analysis 2 pass data\n"); \
- x265_free_analysis_data(m_param, analysis); \
+ PARAM_NS::x265_free_analysis_data(m_param, analysis); \
m_aborted = true; \
return; \
}\
Index: source/common/param.cpp
===================================================================
--- source.orig/common/param.cpp
+++ source/common/param.cpp
@@ -102,7 +102,7 @@ x265_param *x265_param_alloc()
void x265_param_free(x265_param* p)
{
- x265_zone_free(p);
+ PARAM_NS::x265_zone_free(p);
#ifdef SVT_HEVC
x265_free(p->svtHevcParam);
#endif
|
