source/libvpx/vp9/encoder/vp9_quantize.c - Issue 756673003: libvpx: Pull from upstream

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: source/libvpx/vp9/encoder/vp9_quantize.c

Issue 756673003: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: source/libvpx/vp9/encoder/vp9_quantize.c

===================================================================

--- source/libvpx/vp9/encoder/vp9_quantize.c (revision 293081)

+++ source/libvpx/vp9/encoder/vp9_quantize.c (working copy)

@@ -56,7 +56,7 @@

const int64_t tmp =

(clamp(abs_coeff + round_ptr[rc != 0], INT32_MIN, INT32_MAX) *

quant) >> 16;

- qcoeff_ptr[rc] = (tmp ^ coeff_sign) - coeff_sign;

+ qcoeff_ptr[rc] = (tran_low_t)((tmp ^ coeff_sign) - coeff_sign);

dqcoeff_ptr[rc] = qcoeff_ptr[rc] * dequant_ptr;

if (tmp)

eob = 0;

@@ -107,7 +107,7 @@

const int64_t tmp =

(clamp(abs_coeff + round_ptr[rc != 0], INT32_MIN, INT32_MAX) *

quant) >> 15;

- qcoeff_ptr[rc] = (tmp ^ coeff_sign) - coeff_sign;

+ qcoeff_ptr[rc] = (tran_low_t)((tmp ^ coeff_sign) - coeff_sign);

dqcoeff_ptr[rc] = qcoeff_ptr[rc] * dequant_ptr / 2;

if (tmp)

eob = 0;

@@ -197,7 +197,7 @@

(clamp(abs_coeff + round_ptr[rc != 0], INT32_MIN, INT32_MAX) *

quant_ptr[rc != 0]) >> 16;

- qcoeff_ptr[rc] = (tmp ^ coeff_sign) - coeff_sign;

+ qcoeff_ptr[rc] = (tran_low_t)((tmp ^ coeff_sign) - coeff_sign);

dqcoeff_ptr[rc] = qcoeff_ptr[rc] * dequant_ptr[rc != 0];

if (tmp)

@@ -284,7 +284,7 @@

tmp = clamp(abs_coeff + ROUND_POWER_OF_TWO(round_ptr[rc != 0], 1),

INT32_MIN, INT32_MAX);

tmp = (tmp * quant_ptr[rc != 0]) >> 15;

- qcoeff_ptr[rc] = (tmp ^ coeff_sign) - coeff_sign;

+ qcoeff_ptr[rc] = (tran_low_t)((tmp ^ coeff_sign) - coeff_sign);

dqcoeff_ptr[rc] = qcoeff_ptr[rc] * dequant_ptr[rc != 0] / 2;

}

@@ -393,7 +393,7 @@

INT32_MIN, INT32_MAX);

tmp = ((((tmp * quant_ptr[rc != 0]) >> 16) + tmp) *

quant_shift_ptr[rc != 0]) >> 16; // quantization

- qcoeff_ptr[rc] = (tmp ^ coeff_sign) - coeff_sign;

+ qcoeff_ptr[rc] = (tran_low_t)((tmp ^ coeff_sign) - coeff_sign);

dqcoeff_ptr[rc] = qcoeff_ptr[rc] * dequant_ptr[rc != 0];

if (tmp)

@@ -510,7 +510,7 @@

tmp = ((((tmp * quant_ptr[rc != 0]) >> 16) + tmp) *

quant_shift_ptr[rc != 0]) >> 15;

- qcoeff_ptr[rc] = (tmp ^ coeff_sign) - coeff_sign;

+ qcoeff_ptr[rc] = (tran_low_t)((tmp ^ coeff_sign) - coeff_sign);

dqcoeff_ptr[rc] = qcoeff_ptr[rc] * dequant_ptr[rc != 0] / 2;

if (tmp)

« no previous file with comments | « source/libvpx/vp9/encoder/vp9_pickmode.c ('k') | source/libvpx/vp9/encoder/vp9_ratectrl.h » ('j') | no next file with comments »