Re: [x265] [PATCH] Fix build warnings in linux

2018-07-06 Thread Ashok Kumar Mishra 
On Thu, Jul 5, 2018 at 6:10 PM,  wrote:

> # HG changeset patch
> # User induma...@multicorewareinc.com
> # Date 1530793686 -19800
> #  Thu Jul 05 17:58:06 2018 +0530
> # Node ID f377b028f4a91715372a6241fc80e78a672dbd06
> # Parent  d65e3a557a20c0a67dd6dd7ad4cfb4b679ccd937
> Fix build warnings in linux
>
> diff -r d65e3a557a20 -r f377b028f4a9 source/encoder/encoder.cpp
> --- a/source/encoder/encoder.cppThu Jun 14 16:27:32 2018 +0800
> +++ b/source/encoder/encoder.cppThu Jul 05 17:58:06 2018 +0530
> @@ -4740,9 +4740,8 @@
>  void Encoder::readUserSeiFile(x265_sei_payload& seiMsg, int curPoc)
>  {
>  char line[1024];
> -while (!feof(m_naluFile))
> +while (fgets(line, sizeof(line), m_naluFile))
>  {
> -fgets(line, sizeof(line), m_naluFile);
>  int poc = atoi(strtok(line, " "));
>  char *prefix = strtok(NULL, " ");
>  int nalType = atoi(strtok(NULL, "/"));
>
> ___
> x265-devel mailing list
> x265-devel@videolan.org
> https://mailman.videolan.org/listinfo/x265-devel
>
>
Pushed.
___
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel

[x265] [PATCH] Fix build warnings in linux

2018-07-05 Thread indumathi 
# HG changeset patch
# User induma...@multicorewareinc.com
# Date 1530793686 -19800
#  Thu Jul 05 17:58:06 2018 +0530
# Node ID f377b028f4a91715372a6241fc80e78a672dbd06
# Parent  d65e3a557a20c0a67dd6dd7ad4cfb4b679ccd937
Fix build warnings in linux

diff -r d65e3a557a20 -r f377b028f4a9 source/encoder/encoder.cpp
--- a/source/encoder/encoder.cppThu Jun 14 16:27:32 2018 +0800
+++ b/source/encoder/encoder.cppThu Jul 05 17:58:06 2018 +0530
@@ -4740,9 +4740,8 @@
 void Encoder::readUserSeiFile(x265_sei_payload& seiMsg, int curPoc)
 {
 char line[1024];
-while (!feof(m_naluFile))
+while (fgets(line, sizeof(line), m_naluFile))
 {
-fgets(line, sizeof(line), m_naluFile);
 int poc = atoi(strtok(line, " "));
 char *prefix = strtok(NULL, " ");
 int nalType = atoi(strtok(NULL, "/"));
# HG changeset patch
# User induma...@multicorewareinc.com
# Date 1530793686 -19800
#  Thu Jul 05 17:58:06 2018 +0530
# Node ID f377b028f4a91715372a6241fc80e78a672dbd06
# Parent  d65e3a557a20c0a67dd6dd7ad4cfb4b679ccd937
Fix build warnings in linux

diff -r d65e3a557a20 -r f377b028f4a9 source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp	Thu Jun 14 16:27:32 2018 +0800
+++ b/source/encoder/encoder.cpp	Thu Jul 05 17:58:06 2018 +0530
@@ -4740,9 +4740,8 @@
 void Encoder::readUserSeiFile(x265_sei_payload& seiMsg, int curPoc)
 {
 char line[1024];
-while (!feof(m_naluFile))
+while (fgets(line, sizeof(line), m_naluFile))
 {
-fgets(line, sizeof(line), m_naluFile);
 int poc = atoi(strtok(line, " "));
 char *prefix = strtok(NULL, " ");
 int nalType = atoi(strtok(NULL, "/"));
___
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel

Re: [x265] [PATCH] fix build warnings in Linux

2018-05-29 Thread Ashok Kumar Mishra 
On Tue, May 29, 2018 at 7:25 PM,  wrote:

> # HG changeset patch
> # User Bhavna Hariharan 
> # Date 1527601396 -19800
> #  Tue May 29 19:13:16 2018 +0530
> # Node ID 2d1fd0bb3a627842c490cbd86159f09472f98153
> # Parent  9db5be89d74cc55cd6aff30c2a576119ca09d8a1
> fix build warnings in Linux
>
> diff -r 9db5be89d74c -r 2d1fd0bb3a62 source/encoder/encoder.cpp
> --- a/source/encoder/encoder.cppTue May 29 12:50:04 2018 +0530
> +++ b/source/encoder/encoder.cppTue May 29 19:13:16 2018 +0530
> @@ -3408,16 +3408,16 @@
>  allocAnalysis(analysis);
>  if (m_param->bDisableLookahead && m_rateControl->m_isVbv)
>  {
> -int vbvCount = m_param->lookaheadDepth + m_param->bframes + 2;
> +uint64_t vbvCount = m_param->lookaheadDepth + m_param->bframes +
> 2;
>  X265_FREAD(analysis->lookahead.intraVbvCost, sizeof(uint32_t),
> analysis->numCUsInFrame, m_analysisFileIn, picData->lookahead.
> intraVbvCost);
>  X265_FREAD(analysis->lookahead.vbvCost, sizeof(uint32_t),
> analysis->numCUsInFrame, m_analysisFileIn, picData->lookahead.vbvCost);
>  X265_FREAD(analysis->lookahead.satdForVbv, sizeof(uint32_t),
> analysis->numCuInHeight, m_analysisFileIn, picData->lookahead.satdForVbv);
>  X265_FREAD(analysis->lookahead.intraSatdForVbv,
> sizeof(uint32_t), analysis->numCuInHeight, m_analysisFileIn,
> picData->lookahead.intraSatdForVbv);
> -X265_FREAD(analysis->lookahead.plannedSatd, sizeof(int64_t),
> vbvCount, m_analysisFileIn, picData->lookahead.plannedSatd);
> +X265_FREAD(analysis->lookahead.plannedSatd, sizeof(uint64_t),
> vbvCount, m_analysisFileIn, picData->lookahead.plannedSatd);
>
>  if (m_param->scaleFactor)
>  {
> -for (int index = 0; index < vbvCount; index++)
> +for (uint64_t index = 0; index < vbvCount; index++)
>  analysis->lookahead.plannedSatd[index] *= factor;
>
>  for (uint32_t i = 0; i < analysis->numCuInHeight; i++)
>
> ___
> x265-devel mailing list
> x265-devel@videolan.org
> https://mailman.videolan.org/listinfo/x265-devel
>
>
Pushed.
___
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel

[x265] [PATCH] fix build warnings in Linux

2018-05-29 Thread bhavna 
# HG changeset patch
# User Bhavna Hariharan 
# Date 1527601396 -19800
#  Tue May 29 19:13:16 2018 +0530
# Node ID 2d1fd0bb3a627842c490cbd86159f09472f98153
# Parent  9db5be89d74cc55cd6aff30c2a576119ca09d8a1
fix build warnings in Linux

diff -r 9db5be89d74c -r 2d1fd0bb3a62 source/encoder/encoder.cpp
--- a/source/encoder/encoder.cppTue May 29 12:50:04 2018 +0530
+++ b/source/encoder/encoder.cppTue May 29 19:13:16 2018 +0530
@@ -3408,16 +3408,16 @@
 allocAnalysis(analysis);
 if (m_param->bDisableLookahead && m_rateControl->m_isVbv)
 {
-int vbvCount = m_param->lookaheadDepth + m_param->bframes + 2;
+uint64_t vbvCount = m_param->lookaheadDepth + m_param->bframes + 2;
 X265_FREAD(analysis->lookahead.intraVbvCost, sizeof(uint32_t), 
analysis->numCUsInFrame, m_analysisFileIn, picData->lookahead.intraVbvCost);
 X265_FREAD(analysis->lookahead.vbvCost, sizeof(uint32_t), 
analysis->numCUsInFrame, m_analysisFileIn, picData->lookahead.vbvCost);
 X265_FREAD(analysis->lookahead.satdForVbv, sizeof(uint32_t), 
analysis->numCuInHeight, m_analysisFileIn, picData->lookahead.satdForVbv);
 X265_FREAD(analysis->lookahead.intraSatdForVbv, sizeof(uint32_t), 
analysis->numCuInHeight, m_analysisFileIn, picData->lookahead.intraSatdForVbv);
-X265_FREAD(analysis->lookahead.plannedSatd, sizeof(int64_t), vbvCount, 
m_analysisFileIn, picData->lookahead.plannedSatd);
+X265_FREAD(analysis->lookahead.plannedSatd, sizeof(uint64_t), 
vbvCount, m_analysisFileIn, picData->lookahead.plannedSatd);
 
 if (m_param->scaleFactor)
 {
-for (int index = 0; index < vbvCount; index++)
+for (uint64_t index = 0; index < vbvCount; index++)
 analysis->lookahead.plannedSatd[index] *= factor;
 
 for (uint32_t i = 0; i < analysis->numCuInHeight; i++)
# HG changeset patch
# User Bhavna Hariharan 
# Date 1527601396 -19800
#  Tue May 29 19:13:16 2018 +0530
# Node ID 2d1fd0bb3a627842c490cbd86159f09472f98153
# Parent  9db5be89d74cc55cd6aff30c2a576119ca09d8a1
fix build warnings in Linux

diff -r 9db5be89d74c -r 2d1fd0bb3a62 source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp	Tue May 29 12:50:04 2018 +0530
+++ b/source/encoder/encoder.cpp	Tue May 29 19:13:16 2018 +0530
@@ -3408,16 +3408,16 @@
 allocAnalysis(analysis);
 if (m_param->bDisableLookahead && m_rateControl->m_isVbv)
 {
-int vbvCount = m_param->lookaheadDepth + m_param->bframes + 2;
+uint64_t vbvCount = m_param->lookaheadDepth + m_param->bframes + 2;
 X265_FREAD(analysis->lookahead.intraVbvCost, sizeof(uint32_t), analysis->numCUsInFrame, m_analysisFileIn, picData->lookahead.intraVbvCost);
 X265_FREAD(analysis->lookahead.vbvCost, sizeof(uint32_t), analysis->numCUsInFrame, m_analysisFileIn, picData->lookahead.vbvCost);
 X265_FREAD(analysis->lookahead.satdForVbv, sizeof(uint32_t), analysis->numCuInHeight, m_analysisFileIn, picData->lookahead.satdForVbv);
 X265_FREAD(analysis->lookahead.intraSatdForVbv, sizeof(uint32_t), analysis->numCuInHeight, m_analysisFileIn, picData->lookahead.intraSatdForVbv);
-X265_FREAD(analysis->lookahead.plannedSatd, sizeof(int64_t), vbvCount, m_analysisFileIn, picData->lookahead.plannedSatd);
+X265_FREAD(analysis->lookahead.plannedSatd, sizeof(uint64_t), vbvCount, m_analysisFileIn, picData->lookahead.plannedSatd);
 
 if (m_param->scaleFactor)
 {
-for (int index = 0; index < vbvCount; index++)
+for (uint64_t index = 0; index < vbvCount; index++)
 analysis->lookahead.plannedSatd[index] *= factor;
 
 for (uint32_t i = 0; i < analysis->numCuInHeight; i++)
___
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel