[x265] [PATCH] fix output mistake in Main12

[chen]

At 2015-07-08 07:40:24,"Steve Borho" <steve at borho.org> wrote:
>On 07/07, Min Chen wrote:
>> # HG changeset patch
>> # User Min Chen <chenm003 at 163.com>
>> # Date 1436311227 25200
>> # Node ID 54e4cb9bfe6fb9bee6edaad537f5ab01ff1c8dca
>> # Parent  bb167ce66cfa1a04436f1f3bedaee1f6e42cd37f
>> fix output mistake in Main12
>> ---
>>  source/encoder/sao.cpp |    2 +-
>>  source/encoder/sao.h   |    2 +-
>>  2 files changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff -r bb167ce66cfa -r 54e4cb9bfe6f source/encoder/sao.cpp
>> --- a/source/encoder/sao.cpp	Mon Jul 06 17:15:56 2015 +0530
>> +++ b/source/encoder/sao.cpp	Tue Jul 07 16:20:27 2015 -0700
>> @@ -1235,7 +1235,7 @@
>>          }
>>          if (count)
>>          {
>> -            int offset = roundIBDI(offsetOrg, count << SAO_BIT_INC);
>> +            int offset = roundIBDI(offsetOrg << (X265_DEPTH - 8), count);
>>              offset = x265_clip3(-OFFSET_THRESH + 1, OFFSET_THRESH - 1, offset);
>>              if (typeIdx < SAO_BO)
>>              {
>> diff -r bb167ce66cfa -r 54e4cb9bfe6f source/encoder/sao.h
>> --- a/source/encoder/sao.h	Mon Jul 06 17:15:56 2015 +0530
>> +++ b/source/encoder/sao.h	Tue Jul 07 16:20:27 2015 -0700
>> @@ -57,7 +57,7 @@
>>      enum { SAO_MAX_DEPTH = 4 };
>>      enum { SAO_BO_BITS  = 5 };
>>      enum { MAX_NUM_SAO_CLASS = 33 };
>> -    enum { SAO_BIT_INC = X265_MAX(X265_DEPTH - 10, 0) };
>> +    enum { SAO_BIT_INC = 0/*X265_MAX(X265_DEPTH - 10, 0)*/ };
>
>if this flag should always be 0, it should be removed entirely


this code in HM12, after HM upgrade to support Main12, it always 0, I keep it as reference

>
>>      enum { OFFSET_THRESH = 1 << X265_MIN(X265_DEPTH - 5, 5) };
>>      enum { NUM_EDGETYPE = 5 };
>>      enum { NUM_PLANE = 3 };
>> 
>> _______________________________________________
>> x265-devel mailing list
>> x265-devel at videolan.org
>> https://mailman.videolan.org/listinfo/x265-devel
>
>-- 
>Steve Borho
>_______________________________________________
>x265-devel mailing list
>x265-devel at videolan.org
>https://mailman.videolan.org/listinfo/x265-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20150708/11d4dba0/attachment-0001.html>