# HG changeset patch
# User Pradeep Ramachandran <prad...@multicorewareinc.com>
# Date 1472187675 -19800
# Fri Aug 26 10:31:15 2016 +0530
# Node ID d7736df2077c2072991010f6fd574a05f69ee900
# Parent 215eedc9ecc0570baaf8189eda7b96f1df89bd22
cli: Change name of sei discard parameter
diff -r 215eedc9ecc0 -r d7736df2077c source/common/param.cpp
--- a/source/common/param.cpp Wed Aug 24 13:17:45 2016 +0530
+++ b/source/common/param.cpp Fri Aug 26 10:31:15 2016 +0530
@@ -252,7 +252,7 @@
param->minLuma = 0;
param->maxLuma = PIXEL_MAX;
param->log2MaxPocLsb = 8;
- param->bEnableSEIDump = true;
+ param->bDiscardSEI = false;
}
int x265_param_default_preset(x265_param* param, const char* preset, const
char* tune)
@@ -897,7 +897,7 @@
if (0) ;
OPT("qpmin") p->rc.qpMin = atoi(value);
OPT("log2-max-poc-lsb") p->log2MaxPocLsb = atoi(value);
- OPT("sei-dump") p->bEnableSEIDump = atobool(value);
+ OPT("discard-sei") p->bDiscardSEI = atobool(value);
else
return X265_PARAM_BAD_NAME;
}
diff -r 215eedc9ecc0 -r d7736df2077c source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp Wed Aug 24 13:17:45 2016 +0530
+++ b/source/encoder/encoder.cpp Fri Aug 26 10:31:15 2016 +0530
@@ -1452,7 +1452,7 @@
list.serialize(NAL_UNIT_PREFIX_SEI, bs);
}
- if (m_param->bEnableSEIDump && m_param->bEmitInfoSEI)
+ if (!m_param->bDiscardSEI && m_param->bEmitInfoSEI)
{
char *opts = x265_param2string(m_param);
if (opts)
@@ -1482,7 +1482,7 @@
}
}
- if (m_param->bEnableSEIDump && (m_param->bEmitHRDSEI ||
!!m_param->interlaceMode))
+ if (!m_param->bDiscardSEI && (m_param->bEmitHRDSEI ||
!!m_param->interlaceMode))
{
/* Picture Timing and Buffering Period SEI require the SPS to be
"activated" */
SEIActiveParameterSets sei;
diff -r 215eedc9ecc0 -r d7736df2077c source/encoder/frameencoder.cpp
--- a/source/encoder/frameencoder.cpp Wed Aug 24 13:17:45 2016 +0530
+++ b/source/encoder/frameencoder.cpp Fri Aug 26 10:31:15 2016 +0530
@@ -466,7 +466,7 @@
if (m_frame->m_lowres.bKeyframe)
{
- if (m_param->bEnableSEIDump && m_param->bEmitHRDSEI)
+ if (!m_param->bDiscardSEI && m_param->bEmitHRDSEI)
{
SEIBufferingPeriod* bpSei = &m_top->m_rateControl->m_bufPeriodSEI;
@@ -488,7 +488,7 @@
}
}
- if (m_param->bEnableSEIDump && (m_param->bEmitHRDSEI ||
!!m_param->interlaceMode))
+ if (!m_param->bDiscardSEI && (m_param->bEmitHRDSEI ||
!!m_param->interlaceMode))
{
SEIPictureTiming *sei = m_rce.picTimingSEI;
const VUI *vui = &slice->m_sps->vuiParameters;
@@ -524,7 +524,7 @@
}
/* Write user SEI */
- if (m_param->bEnableSEIDump)
+ if (!m_param->bDiscardSEI)
{
for (int i = 0; i < m_frame->m_userSEI.numPayloads; i++)
{
@@ -708,7 +708,7 @@
m_nalList.serialize(slice->m_nalUnitType, m_bs);
- if (m_param->bEnableSEIDump && m_param->decodedPictureHashSEI)
+ if (!m_param->bDiscardSEI && m_param->decodedPictureHashSEI)
{
int planes = (m_frame->m_param->internalCsp != X265_CSP_I400) ? 3 : 1;
if (m_param->decodedPictureHashSEI == 1)
diff -r 215eedc9ecc0 -r d7736df2077c source/x265.h
--- a/source/x265.h Wed Aug 24 13:17:45 2016 +0530
+++ b/source/x265.h Fri Aug 26 10:31:15 2016 +0530
@@ -1297,8 +1297,8 @@
/* Maximum of the picture order count */
int log2MaxPocLsb;
- /* Disable SEI message printing */
- int bEnableSEIDump;
+ /* Dicard SEI messages when printing */
+ int bDiscardSEI;
} x265_param;
diff -r 215eedc9ecc0 -r d7736df2077c source/x265cli.h
--- a/source/x265cli.h Wed Aug 24 13:17:45 2016 +0530
+++ b/source/x265cli.h Fri Aug 26 10:31:15 2016 +0530
@@ -207,8 +207,7 @@
{ "min-luma", required_argument, NULL, 0 },
{ "max-luma", required_argument, NULL, 0 },
{ "log2-max-poc-lsb", required_argument, NULL, 8 },
- { "no-sei-dump", no_argument, NULL, 0 },
- { "sei-dump", no_argument, NULL, 0 },
+ { "discard-sei", no_argument, NULL, 0 },
{ "no-dither", no_argument, NULL, 0 },
{ "dither", no_argument, NULL, 0 },
{ "no-repeat-headers", no_argument, NULL, 0 },
@@ -442,7 +441,7 @@
H0(" --[no-]aud Emit access unit delimiters at the
start of each access unit. Default %s\n",
OPT(param->bEnableAccessUnitDelimiters));
H1(" --hash <integer> Decoded Picture Hash SEI 0: disabled,
1: MD5, 2: CRC, 3: Checksum. Default %d\n", param->decodedPictureHashSEI);
H0(" --log2-max-poc-lsb <integer> Maximum of the picture order
count\n");
- H0(" --[no-]sei-dump Emit SEI packets in bitstream.
Default %s\n", OPT(param->bEnableSEIDump));
+ H0(" --discard-sei Discard SEI packets in bitstream.
Default %s\n", OPT(param->bDiscardSEI));
H1("\nReconstructed video options (debugging):\n");
H1("-r/--recon <filename> Reconstructed raw image YUV or Y4M
output file name\n");
H1(" --recon-depth <integer> Bit-depth of reconstructed raw image
file. Defaults to input bit depth, or 8 if Y4M\n");
# HG changeset patch
# User Pradeep Ramachandran <prad...@multicorewareinc.com>
# Date 1472187675 -19800
# Fri Aug 26 10:31:15 2016 +0530
# Node ID d7736df2077c2072991010f6fd574a05f69ee900
# Parent 215eedc9ecc0570baaf8189eda7b96f1df89bd22
cli: Change name of sei discard parameter
diff -r 215eedc9ecc0 -r d7736df2077c source/common/param.cpp
--- a/source/common/param.cpp Wed Aug 24 13:17:45 2016 +0530
+++ b/source/common/param.cpp Fri Aug 26 10:31:15 2016 +0530
@@ -252,7 +252,7 @@
param->minLuma = 0;
param->maxLuma = PIXEL_MAX;
param->log2MaxPocLsb = 8;
- param->bEnableSEIDump = true;
+ param->bDiscardSEI = false;
}
int x265_param_default_preset(x265_param* param, const char* preset, const char* tune)
@@ -897,7 +897,7 @@
if (0) ;
OPT("qpmin") p->rc.qpMin = atoi(value);
OPT("log2-max-poc-lsb") p->log2MaxPocLsb = atoi(value);
- OPT("sei-dump") p->bEnableSEIDump = atobool(value);
+ OPT("discard-sei") p->bDiscardSEI = atobool(value);
else
return X265_PARAM_BAD_NAME;
}
diff -r 215eedc9ecc0 -r d7736df2077c source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp Wed Aug 24 13:17:45 2016 +0530
+++ b/source/encoder/encoder.cpp Fri Aug 26 10:31:15 2016 +0530
@@ -1452,7 +1452,7 @@
list.serialize(NAL_UNIT_PREFIX_SEI, bs);
}
- if (m_param->bEnableSEIDump && m_param->bEmitInfoSEI)
+ if (!m_param->bDiscardSEI && m_param->bEmitInfoSEI)
{
char *opts = x265_param2string(m_param);
if (opts)
@@ -1482,7 +1482,7 @@
}
}
- if (m_param->bEnableSEIDump && (m_param->bEmitHRDSEI || !!m_param->interlaceMode))
+ if (!m_param->bDiscardSEI && (m_param->bEmitHRDSEI || !!m_param->interlaceMode))
{
/* Picture Timing and Buffering Period SEI require the SPS to be "activated" */
SEIActiveParameterSets sei;
diff -r 215eedc9ecc0 -r d7736df2077c source/encoder/frameencoder.cpp
--- a/source/encoder/frameencoder.cpp Wed Aug 24 13:17:45 2016 +0530
+++ b/source/encoder/frameencoder.cpp Fri Aug 26 10:31:15 2016 +0530
@@ -466,7 +466,7 @@
if (m_frame->m_lowres.bKeyframe)
{
- if (m_param->bEnableSEIDump && m_param->bEmitHRDSEI)
+ if (!m_param->bDiscardSEI && m_param->bEmitHRDSEI)
{
SEIBufferingPeriod* bpSei = &m_top->m_rateControl->m_bufPeriodSEI;
@@ -488,7 +488,7 @@
}
}
- if (m_param->bEnableSEIDump && (m_param->bEmitHRDSEI || !!m_param->interlaceMode))
+ if (!m_param->bDiscardSEI && (m_param->bEmitHRDSEI || !!m_param->interlaceMode))
{
SEIPictureTiming *sei = m_rce.picTimingSEI;
const VUI *vui = &slice->m_sps->vuiParameters;
@@ -524,7 +524,7 @@
}
/* Write user SEI */
- if (m_param->bEnableSEIDump)
+ if (!m_param->bDiscardSEI)
{
for (int i = 0; i < m_frame->m_userSEI.numPayloads; i++)
{
@@ -708,7 +708,7 @@
m_nalList.serialize(slice->m_nalUnitType, m_bs);
- if (m_param->bEnableSEIDump && m_param->decodedPictureHashSEI)
+ if (!m_param->bDiscardSEI && m_param->decodedPictureHashSEI)
{
int planes = (m_frame->m_param->internalCsp != X265_CSP_I400) ? 3 : 1;
if (m_param->decodedPictureHashSEI == 1)
diff -r 215eedc9ecc0 -r d7736df2077c source/x265.h
--- a/source/x265.h Wed Aug 24 13:17:45 2016 +0530
+++ b/source/x265.h Fri Aug 26 10:31:15 2016 +0530
@@ -1297,8 +1297,8 @@
/* Maximum of the picture order count */
int log2MaxPocLsb;
- /* Disable SEI message printing */
- int bEnableSEIDump;
+ /* Dicard SEI messages when printing */
+ int bDiscardSEI;
} x265_param;
diff -r 215eedc9ecc0 -r d7736df2077c source/x265cli.h
--- a/source/x265cli.h Wed Aug 24 13:17:45 2016 +0530
+++ b/source/x265cli.h Fri Aug 26 10:31:15 2016 +0530
@@ -207,8 +207,7 @@
{ "min-luma", required_argument, NULL, 0 },
{ "max-luma", required_argument, NULL, 0 },
{ "log2-max-poc-lsb", required_argument, NULL, 8 },
- { "no-sei-dump", no_argument, NULL, 0 },
- { "sei-dump", no_argument, NULL, 0 },
+ { "discard-sei", no_argument, NULL, 0 },
{ "no-dither", no_argument, NULL, 0 },
{ "dither", no_argument, NULL, 0 },
{ "no-repeat-headers", no_argument, NULL, 0 },
@@ -442,7 +441,7 @@
H0(" --[no-]aud Emit access unit delimiters at the start of each access unit. Default %s\n", OPT(param->bEnableAccessUnitDelimiters));
H1(" --hash <integer> Decoded Picture Hash SEI 0: disabled, 1: MD5, 2: CRC, 3: Checksum. Default %d\n", param->decodedPictureHashSEI);
H0(" --log2-max-poc-lsb <integer> Maximum of the picture order count\n");
- H0(" --[no-]sei-dump Emit SEI packets in bitstream. Default %s\n", OPT(param->bEnableSEIDump));
+ H0(" --discard-sei Discard SEI packets in bitstream. Default %s\n", OPT(param->bDiscardSEI));
H1("\nReconstructed video options (debugging):\n");
H1("-r/--recon <filename> Reconstructed raw image YUV or Y4M output file name\n");
H1(" --recon-depth <integer> Bit-depth of reconstructed raw image file. Defaults to input bit depth, or 8 if Y4M\n");
_______________________________________________
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel
