<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jun 22, 2018 at 12:47 PM, <span dir="ltr"><<a href="mailto:indumathi@multicorewareinc.com" target="_blank">indumathi@multicorewareinc.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"># HG changeset patch<br>
# User <a href="mailto:indumathi@multicorewareinc.com">indumathi@multicorewareinc.com</a><br>
# Date 1529648256 -19800<br>
# Fri Jun 22 11:47:36 2018 +0530<br>
# Node ID 8d1092f478c4ded9c6bd62a72501a9<wbr>9dc28bcec1<br>
# Parent 656b5b442f0b636f5e56048886e1fb<wbr>aa1c59d3e5<br>
Rename usersei-file to nalu-file<br>
<br>
diff -r 656b5b442f0b -r 8d1092f478c4 doc/reST/cli.rst<br>
--- a/doc/reST/cli.rst Mon Jun 11 19:44:51 2018 +0530<br>
+++ b/doc/reST/cli.rst Fri Jun 22 11:47:36 2018 +0530<br>
@@ -2136,7 +2136,7 @@<br>
Maximum luma value allowed for input pictures. Any values above max-luma<br>
are clipped. No default.<br>
<br>
-.. option:: --usersei-file <filename><br>
+.. option:: --nalu-file <filename><br>
<br>
Text file containing userSEI in POC order : <POC><space><PREFIX><space><<wbr>NAL UNIT TYPE>/<SEI TYPE><space><SEI Payload><br>
Parse the input file specified and inserts SEI messages into the bitstream. <br>
diff -r 656b5b442f0b -r 8d1092f478c4 source/common/param.cpp<br>
--- a/source/common/param.cpp Mon Jun 11 19:44:51 2018 +0530<br>
+++ b/source/common/param.cpp Fri Jun 22 11:47:36 2018 +0530<br>
@@ -302,7 +302,7 @@<br>
param->bDisableLookahead = 0;<br>
param->bCopyPicToFrame = 1;<br>
param->maxAUSizeFactor = 1;<br>
- param->userSeiFile = NULL;<br>
+ param->naluFile = NULL;<br>
<br>
/* DCT Approximations */<br>
param->bLowPassDct = 0;<br>
@@ -1049,7 +1049,7 @@<br>
OPT("pic-struct") p->pictureStructure = atoi(value);<br>
OPT("chunk-start") p->chunkStart = atoi(value);<br>
OPT("chunk-end") p->chunkEnd = atoi(value);<br>
- OPT("usersei-file") p->userSeiFile = strdup(value);<br>
+ OPT("nalu-file") p->naluFile = strdup(value);<br>
else<br>
return X265_PARAM_BAD_NAME;<br>
}<br>
diff -r 656b5b442f0b -r 8d1092f478c4 source/encoder/encoder.cpp<br>
--- a/source/encoder/encoder.cpp Mon Jun 11 19:44:51 2018 +0530<br>
+++ b/source/encoder/encoder.cpp Fri Jun 22 11:47:36 2018 +0530<br>
@@ -79,7 +79,7 @@<br>
m_threadPool = NULL;<br>
m_analysisFileIn = NULL;<br>
m_analysisFileOut = NULL;<br>
- m_seiFile = NULL;<br>
+ m_naluFile = NULL;<br>
m_offsetEmergency = NULL;<br>
m_iFrameNum = 0;<br>
m_iPPSQpMinus26 = 0;<br>
@@ -413,19 +413,19 @@<br>
<br>
m_emitCLLSEI = p->maxCLL || p->maxFALL;<br>
<br>
- if (m_param->userSeiFile)<br>
+ if (m_param->naluFile)<br>
{<br>
- m_seiFile = x265_fopen(m_param-><wbr>userSeiFile, "r");<br>
- if (!m_seiFile)<br>
+ m_naluFile = x265_fopen(m_param->naluFile, "r");<br>
+ if (!m_naluFile)<br>
{<br>
- x265_log_file(NULL, X265_LOG_ERROR, "%s file not found or Failed to open\n", m_param->userSeiFile);<br>
+ x265_log_file(NULL, X265_LOG_ERROR, "%s file not found or Failed to open\n", m_param->naluFile);<br>
m_aborted = true;<br>
}<br>
else<br>
- m_enableUserSei = 1;<br>
+ m_enableNal = 1;<br>
}<br>
else<br>
- m_enableUserSei = 0;<br>
+ m_enableNal = 0;<br>
<br>
#if ENABLE_HDR10_PLUS<br>
if (m_bToneMap)<br>
@@ -797,8 +797,8 @@<br>
}<br>
X265_FREE(temp);<br>
}<br>
- if (m_seiFile)<br>
- fclose(m_seiFile);<br>
+ if (m_naluFile)<br>
+ fclose(m_naluFile);<br>
if (m_param)<br>
{<br>
if (m_param->csvfpt)<br>
@@ -943,7 +943,7 @@<br>
* Format of the file : <POC><space><PREFIX><space><<wbr>NAL UNIT TYPE>/<SEI TYPE><space><SEI Payload> */<br>
x265_sei_payload seiMsg;<br>
seiMsg.payload = NULL;<br>
- if (m_enableUserSei)<br>
+ if (m_enableNal)<br>
readUserSeiFile(seiMsg, m_pocLast);<br>
if (pic_in->bitDepth < 8 || pic_in->bitDepth > 16)<br>
{<br>
@@ -1030,8 +1030,8 @@<br>
if (m_bToneMap && toneMap.payload)<br>
toneMapEnable = 1;<br>
int numPayloads = pic_in->userSEI.numPayloads + toneMapEnable;<br>
- if (m_enableUserSei && seiMsg.payload)<br>
- numPayloads += m_enableUserSei;<br>
+ if (m_enableNal && seiMsg.payload)<br>
+ numPayloads += m_enableNal;<br>
inFrame->m_userSEI.numPayloads = numPayloads;<br>
<br>
if (inFrame->m_userSEI.<wbr>numPayloads)<br>
@@ -1047,7 +1047,7 @@<br>
x265_sei_payload input;<br>
if ((i == (numPayloads - 1)) && toneMapEnable)<br>
input = toneMap;<br>
- else if (m_enableUserSei)<br>
+ else if (m_enableNal)<br>
input = seiMsg;<br>
else<br>
input = pic_in->userSEI.payloads[i];<br>
@@ -4739,9 +4739,9 @@<br>
void Encoder::readUserSeiFile(x265_<wbr>sei_payload& seiMsg, int curPoc)<br>
{<br>
char line[1024];<br>
- while (!feof(m_seiFile))<br>
+ while (!feof(m_naluFile))<br>
{<br>
- fgets(line, sizeof(line), m_seiFile);<br>
+ fgets(line, sizeof(line), m_naluFile);<br>
int poc = atoi(strtok(line, " "));<br>
char *prefix = strtok(NULL, " ");<br>
int nalType = atoi(strtok(NULL, "/"));<br>
diff -r 656b5b442f0b -r 8d1092f478c4 source/encoder/encoder.h<br>
--- a/source/encoder/encoder.h Mon Jun 11 19:44:51 2018 +0530<br>
+++ b/source/encoder/encoder.h Fri Jun 22 11:47:36 2018 +0530<br>
@@ -169,7 +169,7 @@<br>
Frame* m_exportedPic;<br>
FILE* m_analysisFileIn;<br>
FILE* m_analysisFileOut;<br>
- FILE* m_seiFile;<br>
+ FILE* m_naluFile;<br>
x265_param* m_param;<br>
x265_param* m_latestParam; // Holds latest param during a reconfigure<br>
RateControl* m_rateControl;<br>
@@ -213,7 +213,7 @@<br>
double m_cR;<br>
<br>
int m_bToneMap; // Enables tone-mapping<br>
- int m_enableUserSei;<br>
+ int m_enableNal;<br>
<br>
#ifdef ENABLE_HDR10_PLUS<br>
const hdr10plus_api *m_hdr10plus_api;<br>
diff -r 656b5b442f0b -r 8d1092f478c4 source/x265.h<br>
--- a/source/x265.h Mon Jun 11 19:44:51 2018 +0530<br>
+++ b/source/x265.h Fri Jun 22 11:47:36 2018 +0530<br>
@@ -1642,7 +1642,7 @@<br>
* Default 0 (disabled). */<br>
int chunkEnd;<br>
/* File containing base64 encoded SEI messages in POC order */<br>
- const char* userSeiFile;<br>
+ const char* naluFile;<br>
<br>
} x265_param;<br>
<br>
diff -r 656b5b442f0b -r 8d1092f478c4 source/x265cli.h<br>
--- a/source/x265cli.h Mon Jun 11 19:44:51 2018 +0530<br>
+++ b/source/x265cli.h Fri Jun 22 11:47:36 2018 +0530<br>
@@ -304,7 +304,7 @@<br>
{ "no-single-sei", no_argument, NULL, 0 },<br>
{ "atc-sei", required_argument, NULL, 0 },<br>
{ "pic-struct", required_argument, NULL, 0 },<br>
- { "usersei-file", required_argument, NULL, 0 },<br>
+ { "nalu-file", required_argument, NULL, 0 },<br>
{ 0, 0, 0, 0 },<br>
{ 0, 0, 0, 0 },<br>
{ 0, 0, 0, 0 },<br>
@@ -355,7 +355,7 @@<br>
H0(" --dhdr10-info <filename> JSON file containing the Creative Intent Metadata to be encoded as Dynamic Tone Mapping\n");<br>
H0(" --[no-]dhdr10-opt Insert tone mapping SEI only for IDR frames and when the tone mapping information changes. Default disabled\n");<br>
#endif<br>
- H0(" --usersei-file <filename> Text file containing SEI messages in the following format : <POC><space><PREFIX><space><<wbr>NAL UNIT TYPE>/<SEI TYPE><space><SEI Payload>\n");<br>
+ H0(" --nalu-file <filename> Text file containing SEI messages in the following format : <POC><space><PREFIX><space><<wbr>NAL UNIT TYPE>/<SEI TYPE><space><SEI Payload>\n");<br>
H0("-f/--frames <integer> Maximum number of frames to encode. Default all\n");<br>
H0(" --seek <integer> First frame to encode\n");<br>
H1(" --[no-]interlace <bff|tff> Indicate input pictures are interlace fields in temporal order. Default progressive\n");<br>
<br>______________________________<wbr>_________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org">x265-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/x265-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/<wbr>listinfo/x265-devel</a><br>
<br></blockquote></div><br></div><div class="gmail_extra"><br></div><div class="gmail_extra">Pushed.</div></div>