Commit Graph

17622 Commits

Author SHA1 Message Date
Alex Converse
dacf45facd Add the tool used to generate the constrained tokenset.
The code that generates the raw distribution is based on a MATLAB
program by Debargha Mukherjee, and the algorithm used to quantize the
distribution comes from the ANS Toolkit by Jarek Duda.

Change-Id: Ic273f7d9e43e3ecd999e9e7e04cde57e8559375a
(cherry picked from aom/master commit ef446026aeafa318f9bee182b8c80eb4f1ef5a0a)
2016-10-12 17:41:01 -07:00
Alex Converse
e9f70f8f10 Remove the starting zero from ANS CDFs.
This brings it in line with the Daala CDFs and will make it easier to
share code.

Change-Id: Idfd2d2b33c3b9b2c4e72ce72fb3d8039013448b9
(cherry picked from aom/master commit af98507ca928afe33e9f88fdd2ca168379528d6a)
2016-10-12 17:41:01 -07:00
Alex Converse
a1ac972867 Import the aom_read/write_symbol abstractions from aom/master
Change-Id: I0b255c05108c3b97e74df1b59c34111c9e9a5770
2016-10-12 17:41:01 -07:00
Alex Converse
91e4e604bd Merge changes I3ca2b674,I78afc587,I3ae62181,I5ed91556 into nextgenv2
* changes:
  Unfork ANS decode_coefs
  Remove ZERO_TOKEN from the ANS tokenset
  Drop costing ANS tokens from derived probabilities
  Unfork ANS pack_mb_tokens
2016-10-12 22:25:27 +00:00
Hui Su
933bf08cfb Merge "Send allow_screen_content flag for both key and intra only frames" into nextgenv2 2016-10-12 21:13:24 +00:00
Debargha Mukherjee
4282b6bbbb Merge "Refactor expand dry_run types to return coef rate" into nextgenv2 2016-10-12 21:06:41 +00:00
Alex Converse
5e4d00c37e Unfork ANS decode_coefs
This is less code and more like what we have in aom/master.

Change-Id: I3ca2b674e4ad9e2e211d08bb51d78549e8b63a54
2016-10-12 13:23:33 -07:00
Alex Converse
ea7e990fd4 Remove ZERO_TOKEN from the ANS tokenset
This can be re-added after aligning AOM's ANS with nextgenv2's ANS.

This partially reverts commit 3829cd2f2f.

Change-Id: I78afc587f1abfe33ffcd53b3262910cfae135534
2016-10-12 13:15:08 -07:00
Alex Converse
ccf472bc05 Drop costing ANS tokens from derived probabilities
This mimics what's currently done in aom/master. This can be re-added
after aligning AOM's ANS with nextgenv2's ANS.

Change-Id: I3ae62181dd4803694204a234c717a86a15ca8a40
2016-10-12 13:14:21 -07:00
Alex Converse
dc62b0925d Unfork ANS pack_mb_tokens
This is less code and more like what we have in aom/master.

Change-Id: I5ed915563cbfbc6281113c1eb31455f50710ba9f
2016-10-12 13:09:13 -07:00
Jim Bankoski
3265ef3d1d AUTHORS regenerated
script changed to remove extra entities and clang-format bot.

Change-Id: I102cd80fdf4b240e6e4d5172943e49146a601a72
2016-10-12 12:26:05 -07:00
Yaowu Xu
c4d8fea575 Merge "minor updates" into nextgenv2 2016-10-12 19:25:47 +00:00
hui su
24f7b07f2e Send allow_screen_content flag for both key and intra only frames
BUG=webm:1311

Change-Id: I03c1043d17ed4e4ea22002473779a9612884c6c6
2016-10-12 11:45:05 -07:00
Yaowu Xu
c49a6f2a21 Merge "Include fix: use aom_integer.h" into nextgenv2 2016-10-12 18:26:30 +00:00
Yaowu Xu
694419b6a6 Merge "Add compiler flag -Wsign-compare" into nextgenv2 2016-10-12 18:26:22 +00:00
Yaowu Xu
732c188523 Merge "LIBVPX_TEST_DATA_PATH -> LIBAOM_TEST_DATA_PATH" into nextgenv2 2016-10-12 17:56:26 +00:00
Yaowu Xu
f36d0b46d1 minor updates
1. vp8->aom
2. removed no-effect statements and spaces

Change-Id: I367d05ff9bf1b9f3c71c517c45d8049d9d4236ec
2016-10-12 10:50:08 -07:00
Sarah Parker
d2b1fe4a1f Merge "Fix inconsistency in gm parameter write to bitstream" into nextgenv2 2016-10-12 17:32:21 +00:00
Urvang Joshi
f792a72740 Include fix: use aom_integer.h
Change-Id: I98919a04bead417379e555461f67978501f922e7
2016-10-12 08:27:00 -07:00
Urvang Joshi
d3a7576fbc Add compiler flag -Wsign-compare
Also, fix the warnings generated by this flag.

Conflicts:
	examples/aom_cx_set_ref.c

Change-Id: I0451e119c52000aa7c1c55027d53f1da5a02a11f
2016-10-12 08:27:00 -07:00
Yaowu Xu
97aa09f658 LIBVPX_TEST_DATA_PATH -> LIBAOM_TEST_DATA_PATH
This commit renames LIBVPX_TEST_DATA_PATH to LIBAOM_TEST_DATA_PATH,
with a work around for working with jenkins environmnet variables.

Change-Id: If664ce57e25ad2af8121d1b578bf64043f0baa2a
2016-10-12 08:26:44 -07:00
Yaowu Xu
445ae93ec7 Merge "y4m_test: fix segfault if test files are missing" into nextgenv2 2016-10-12 04:26:52 +00:00
Yaowu Xu
6bb9b697be Merge "Remove two files not in use" into nextgenv2 2016-10-12 04:26:36 +00:00
Sarah Parker
689b0caea7 Fix inconsistency in gm parameter write to bitstream
Before this change, gm parameters were being written to the
bitstream for all frames, but only read for inter only frames,
causing a bitstream error.

Change-Id: I63b8e2fdf6358e07cc00718de04cc399809bde37
2016-10-11 19:35:26 -07:00
Tristan Matthews
46940a8e7d y4m_test: fix segfault if test files are missing
Change-Id: I7a04beb83095e5c0821048909f81f45be8b5eee3
2016-10-11 18:20:01 -07:00
Alex Converse
5cca4187fe Merge "Remove -fno-strict-aliasing flag" into nextgenv2 2016-10-11 23:24:39 +00:00
Yaowu Xu
5a9b51c725 Remove two files not in use
test/cx_set_ref.sh: replaced by test/aomcx_set_ref.sh
test/vpxdec.sh: replaced by aomdec.sh

Change-Id: I74136d311eee7666e08ed8f573a17f810992fc52
2016-10-11 15:12:11 -07:00
Yaowu Xu
4a01dca3c6 Merge "change to use aomedia copyright notice" into nextgenv2 2016-10-11 22:11:09 +00:00
Yaowu Xu
058ec6cd56 Merge "Fix missing parentheses in v64_align()" into nextgenv2 2016-10-11 22:10:08 +00:00
Yaowu Xu
f72f844572 Merge "Improve v128 and v64 8 bit shifts for x86" into nextgenv2 2016-10-11 22:09:53 +00:00
Yaowu Xu
c96168987d Merge "Clean up and speed up CLPF clipping" into nextgenv2 2016-10-11 22:09:31 +00:00
Yaowu Xu
afb60c361c Merge "Fix typos in CLPF unit test" into nextgenv2 2016-10-11 22:06:59 +00:00
Yaowu Xu
bd979a16c8 Merge "Make generic SIMD code compile if no native support" into nextgenv2 2016-10-11 22:06:43 +00:00
Debargha Mukherjee
ceebb70197 Refactor expand dry_run types to return coef rate
Adds the functionality to return the rate cost due to
coefficients without doing full search of all modes.
This will be subsequently used in various experiments,
including in new_quant experiment to search quantization
profiles at the superblock level without repeating the
full mode/partition search.

Change-Id: I4aad3f3f0c8b8dfdea38f8f4f094a98283f47f08
2016-10-11 14:55:26 -07:00
Yaowu Xu
53a9745c7a Merge "Bugfix in CLPF RDO. Prevented selection of enable_fb_flag=0." into nextgenv2 2016-10-11 21:54:13 +00:00
Yaowu Xu
1aa6cbc7ea Merge "Bugfix in the CLPF RDO." into nextgenv2 2016-10-11 21:53:56 +00:00
Sarah Parker
4082ff0bf6 Merge "Read mode to mi->bmi for sub 8x8 blocks" into nextgenv2 2016-10-11 21:48:01 +00:00
Yaowu Xu
6e0d64c5fe change to use aomedia copyright notice
Change-Id: Idb2cf2555bcbe04a6650c492a3a714d7d5836b67
2016-10-11 12:36:17 -07:00
Steinar Midtskogen
b066b962a7 Fix missing parentheses in v64_align()
Change-Id: I16469062853c101965f56002be30ebc5823975b1
2016-10-11 12:36:17 -07:00
Steinar Midtskogen
9d6a53b8fd Improve v128 and v64 8 bit shifts for x86
Change-Id: I25dc61bab46895d425ce49f89fceb164bee36906
2016-10-11 12:36:17 -07:00
Steinar Midtskogen
e66fc87c46 Clean up and speed up CLPF clipping
* Move clipping tests from inside to outside loops
* Let sizex and sizey to clpf_block() be the clipped block size rather
  than both just bs
* Make fallback tests to C more accurate

Change-Id: Icdc57540ce21b41a95403fdcc37988a4ebf546c7
2016-10-11 12:36:17 -07:00
Steinar Midtskogen
6116141c23 Fix typos in CLPF unit test
Change-Id: Ia69bad44e47509208e3b9d306165d0872d4e92f3
2016-10-11 12:36:16 -07:00
Steinar Midtskogen
ebf209ba82 Make generic SIMD code compile if no native support
Change-Id: I7f691a0ae27f06ef3d727764829a60a8ffc509eb
2016-10-11 12:36:16 -07:00
Steinar Midtskogen
86b19177ab Bugfix in CLPF RDO. Prevented selection of enable_fb_flag=0.
PSNR YCbCr:     -0.01%     -0.06%     -0.17%
   PSNRHVS:      0.01%
      SSIM:      0.03%
    MSSSIM:      0.00%
 CIEDE2000:     -0.05%

Change-Id: I1205c021bfc5cee6f80344fec92aabb529af9bd1
2016-10-11 12:35:48 -07:00
Steinar Midtskogen
2e40cc4ce6 Bugfix in the CLPF RDO.
When CLPF was extended to chroma, the chroma RDO accidentally
discarded the optimal block size found in the luma RDO.

PSNR YCbCr:     -0.25%      0.05%      0.06%
   PSNRHVS:     -0.19%
      SSIM:     -0.36%
    MSSSIM:     -0.23%

Conflicts:
	av1/common/clpf.c

Change-Id: Ie49cd30f9276a311ada88cb2f13d14757617f030
2016-10-11 12:35:10 -07:00
Yaowu Xu
25faa0e9f5 Merge "Move tree writing code into bitwriter.h." into nextgenv2 2016-10-11 19:16:25 +00:00
Yaowu Xu
de005d322a Merge "Remove unused color_sensitivity member from MACROBLOCK." into nextgenv2 2016-10-11 19:16:07 +00:00
Sarah Parker
d7fa8542f6 Read mode to mi->bmi for sub 8x8 blocks
Previously, only the motion vectors were being stored. This caused
a mismatch in the global motion experiment, which needs this
mode information to decide whether or not to use the gm parameters
in reconstruction.

Change-Id: I58cde750ec06587dbfb8d65b07c15a67b7d6b1f6
2016-10-11 11:51:59 -07:00
Yaowu Xu
57aa518c30 Merge "CLPF: Remove redundant function argument." into nextgenv2 2016-10-11 18:44:56 +00:00
Yaowu Xu
80eaf1a120 Merge "Extend CLPF to chroma." into nextgenv2 2016-10-11 18:44:31 +00:00