generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
0a64f943fc
vpx/vp9/common/vp9_entropymode.h

73 lines
2.7 KiB
C
Raw Normal View History

Initial WebM release
2010-05-18 17:58:33 +02:00
/*
Use WebM in copyright notice for consistency Changes 'The VP8 project' to 'The WebM project', for consistency with other webmproject.org repositories. Fixes issue #97. Change-Id: I37c13ed5fbdb9d334ceef71c6350e9febed9bbba
2010-09-09 14:16:39 +02:00
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
Initial WebM release
2010-05-18 17:58:33 +02:00
*
cosmetics: trim trailing whitespace When the license headers were updated, they accidentally contained trailing whitespace, so unfortunately we have to touch all the files again. Change-Id: I236c05fade06589e417179c0444cb39b09e4200d
2010-06-18 18:39:21 +02:00
* Use of this source code is governed by a BSD-style license
LICENSE: update with latest text Change-Id: Ieebea089095d9073b3a94932791099f614ce120c
2010-06-04 22:19:40 +02:00
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
cosmetics: trim trailing whitespace When the license headers were updated, they accidentally contained trailing whitespace, so unfortunately we have to touch all the files again. Change-Id: I236c05fade06589e417179c0444cb39b09e4200d
2010-06-18 18:39:21 +02:00
* in the file PATENTS. All contributing project authors may
LICENSE: update with latest text Change-Id: Ieebea089095d9073b3a94932791099f614ce120c
2010-06-04 22:19:40 +02:00
* be found in the AUTHORS file in the root of the source tree.
Initial WebM release
2010-05-18 17:58:33 +02:00
*/
google style guide include guards Change-Id: I2c252f3ddcc99e96c1f5d3dab8bcb25a2a3637ea
2012-11-30 01:36:10 +01:00
#ifndef VP9_COMMON_VP9_ENTROPYMODE_H_
#define VP9_COMMON_VP9_ENTROPYMODE_H_
Initial WebM release
2010-05-18 17:58:33 +02:00
fixed includes to be fully specified Change-Id: Ia1cce221f8511561b9cbd8edb7726fbc286ff243
2012-11-28 19:41:40 +01:00
#include "vp9/common/vp9_blockd.h"
#include "vp9/common/vp9_treecoder.h"
Initial WebM release
2010-05-18 17:58:33 +02:00
TX_SIZE contexts simplification. Reduces TX_SIZE contexts to 2 for each kind. The code is cleaner and there is hardly any performance difference with more than two contexts. Results: almost neutral Change-Id: I17656bd6db76224ae2856adf882504560e7dbaa4
2013-06-08 09:09:44 +02:00
#define TX_SIZE_CONTEXTS 2
cosmetics: strip 'VP9_' from defines in vp9 only code Change-Id: I481d9bb2fa3ec72b6a83d5f04d545ad8013f295c
2013-08-23 03:40:34 +02:00
#define SWITCHABLE_FILTERS 3 // number of switchable filters
Replacing (SWITCHABLE_FILTERS + 1) with SWITCHABLE_FILTER_CONTEXTS. Change-Id: I9781a62bc1a4cd9176554d1271d87dbcafda9cb0
2013-10-30 22:40:34 +01:00
#define SWITCHABLE_FILTER_CONTEXTS (SWITCHABLE_FILTERS + 1)
New probs for filters/tx_size and a few others * New probs for subpel filters/tx_count * Makes a change to not reset to defaults for the tx_size probs if an intermediate frame reverts to using a fixed tx_size. * A few updates to the parameters for backward adaptation for mode/mv * some cosmetic cleanups derf300: +0.06% Change-Id: I22994d659bc31ca7a4fc8820fde24001e64a2920
2013-06-10 21:00:43 +02:00
Coding tx-size selection by use of spatial context Adds coding of transform size within a frame by use of context of transform sizes selected in left and above blocks. Also incorporates code for generating stats. TODO: generate and incorporate new default stats Change-Id: I6a7af099f6ad61d448521d9a51167aedaf638ed6
2013-06-06 20:14:04 +02:00
// #define MODE_STATS
Removing kf_{y, uv}_mode_prob arrays from VP9Common. These arrays have constant values (no any updates). Removing two corresponding memcpy calls. Making a little cleanup in vp9_entropymode.h as well: removing redundant 'extern' keyword and moving all function declarations at the end. Change-Id: Ia16b38b46aec2e2500f5df29c40a297ae241dede
2013-07-18 01:50:52 +02:00
struct VP9Common;
Adding struct tx_probs and struct tx_counts to cleanup the code. Also removing unused declarations from vp9_entropymode.h file. Change-Id: Ib9c5826db3584a32f6bb3297a76c522b99d83402
2013-07-11 02:36:06 +02:00
struct tx_probs {
Renaming TX_SIZE_MAX_SB to TX_SIZES. Change-Id: I6aa4191935aa93461a07c41b59fdae1eb5f5f107
2013-07-27 02:15:37 +02:00
vp9_prob p32x32[TX_SIZE_CONTEXTS][TX_SIZES - 1];
vp9_prob p16x16[TX_SIZE_CONTEXTS][TX_SIZES - 2];
vp9_prob p8x8[TX_SIZE_CONTEXTS][TX_SIZES - 3];
Adding struct tx_probs and struct tx_counts to cleanup the code. Also removing unused declarations from vp9_entropymode.h file. Change-Id: Ib9c5826db3584a32f6bb3297a76c522b99d83402
2013-07-11 02:36:06 +02:00
};
struct tx_counts {
Renaming TX_SIZE_MAX_SB to TX_SIZES. Change-Id: I6aa4191935aa93461a07c41b59fdae1eb5f5f107
2013-07-27 02:15:37 +02:00
unsigned int p32x32[TX_SIZE_CONTEXTS][TX_SIZES];
unsigned int p16x16[TX_SIZE_CONTEXTS][TX_SIZES - 1];
unsigned int p8x8[TX_SIZE_CONTEXTS][TX_SIZES - 2];
Adding struct tx_probs and struct tx_counts to cleanup the code. Also removing unused declarations from vp9_entropymode.h file. Change-Id: Ib9c5826db3584a32f6bb3297a76c522b99d83402
2013-07-11 02:36:06 +02:00
};
cosmetics: strip 'VP9_' from defines in vp9 only code Change-Id: I481d9bb2fa3ec72b6a83d5f04d545ad8013f295c
2013-08-23 03:40:34 +02:00
extern const vp9_prob vp9_kf_uv_mode_prob[INTRA_MODES][INTRA_MODES - 1];
extern const vp9_prob vp9_kf_y_mode_prob[INTRA_MODES][INTRA_MODES]
[INTRA_MODES - 1];
Initial WebM release
2010-05-18 17:58:33 +02:00
Splitting partition_probs array into two arrays. We only update partition_probs for inter frames but they are constant for key frames. It is not necessary to have constants inside frame context and copy them every time. This change reduces FRAME_CONTEXT size by at least 48 bytes. Change-Id: If70a53be51043f37fe7d113853217937710932a7
2013-11-02 02:23:06 +01:00
extern const vp9_prob vp9_kf_partition_probs[PARTITION_CONTEXTS]
[PARTITION_TYPES - 1];
Adding TREE_SIZE macro + cleanup. Using TREE_SIZE for the following trees: vp9_intra_mode_tree vp9_inter_mode_tree vp9_partition_tree vp9_switchable_interp_tree vp9_mv_joint_tree vp9_mv_class_tree vp9_mv_class0_tree vp9_mv_fp_tree Change-Id: I0212bb4c1ee6648249f68517e28a67a56591ee1b
2013-10-12 01:25:50 +02:00
extern const vp9_tree_index vp9_intra_mode_tree[TREE_SIZE(INTRA_MODES)];
cosmetics: strip 'VP9_' from defines in vp9 only code Change-Id: I481d9bb2fa3ec72b6a83d5f04d545ad8013f295c
2013-08-23 03:40:34 +02:00
extern struct vp9_token vp9_intra_mode_encodings[INTRA_MODES];
Adding TREE_SIZE macro + cleanup. Using TREE_SIZE for the following trees: vp9_intra_mode_tree vp9_inter_mode_tree vp9_partition_tree vp9_switchable_interp_tree vp9_mv_joint_tree vp9_mv_class_tree vp9_mv_class0_tree vp9_mv_fp_tree Change-Id: I0212bb4c1ee6648249f68517e28a67a56591ee1b
2013-10-12 01:25:50 +02:00
extern const vp9_tree_index vp9_inter_mode_tree[TREE_SIZE(INTER_MODES)];
cosmetics: strip 'VP9_' from defines in vp9 only code Change-Id: I481d9bb2fa3ec72b6a83d5f04d545ad8013f295c
2013-08-23 03:40:34 +02:00
extern struct vp9_token vp9_inter_mode_encodings[INTER_MODES];
Initial WebM release
2010-05-18 17:58:33 +02:00
Adding TREE_SIZE macro + cleanup. Using TREE_SIZE for the following trees: vp9_intra_mode_tree vp9_inter_mode_tree vp9_partition_tree vp9_switchable_interp_tree vp9_mv_joint_tree vp9_mv_class_tree vp9_mv_class0_tree vp9_mv_fp_tree Change-Id: I0212bb4c1ee6648249f68517e28a67a56591ee1b
2013-10-12 01:25:50 +02:00
extern const vp9_tree_index vp9_partition_tree[TREE_SIZE(PARTITION_TYPES)];
Recursive partition syntax coding Enable recursive partition information coding from SB64X64 down to MB16X16. The bit-stream syntax is now supporting rectangular block sizes. It starts from SB64X64 and recursively describes the partition type of the current block. If the partition type is PARTITION_NONE, the block is coded as a single unit; if it is PARTITION_HORZ or PARTITION_VERT, the block is segmented into two independently coded rectangular units, with no further partition needed; otherwise, the block is segmented into 4 square blocks. i.e., PARTITION_SPLIT case, each can be potentially further partitioned. Forward adaptive probability modeling is used for the partition information coding, conditioned on the current block size. Change-Id: I499365fb547839d555498e3bcc0387d8a3587d87
2013-04-16 09:18:02 +02:00
extern struct vp9_token vp9_partition_encodings[PARTITION_TYPES];
Removing kf_{y, uv}_mode_prob arrays from VP9Common. These arrays have constant values (no any updates). Removing two corresponding memcpy calls. Making a little cleanup in vp9_entropymode.h as well: removing redundant 'extern' keyword and moving all function declarations at the end. Change-Id: Ia16b38b46aec2e2500f5df29c40a297ae241dede
2013-07-18 01:50:52 +02:00
extern const vp9_tree_index vp9_switchable_interp_tree
Adding TREE_SIZE macro + cleanup. Using TREE_SIZE for the following trees: vp9_intra_mode_tree vp9_inter_mode_tree vp9_partition_tree vp9_switchable_interp_tree vp9_mv_joint_tree vp9_mv_class_tree vp9_mv_class0_tree vp9_mv_fp_tree Change-Id: I0212bb4c1ee6648249f68517e28a67a56591ee1b
2013-10-12 01:25:50 +02:00
[TREE_SIZE(SWITCHABLE_FILTERS)];
cosmetics: strip 'VP9_' from defines in vp9 only code Change-Id: I481d9bb2fa3ec72b6a83d5f04d545ad8013f295c
2013-08-23 03:40:34 +02:00
extern struct vp9_token vp9_switchable_interp_encodings[SWITCHABLE_FILTERS];
Adjust style to match Google Coding Style a little more closely. Most of these were picked up by jenkins in the commit that changed the vp8 namespace to vp9 in common/. Change-Id: I5cbd56ffc753b92ef805133cda6acc1713a13878
2012-11-01 00:09:17 +01:00
Removing kf_{y, uv}_mode_prob arrays from VP9Common. These arrays have constant values (no any updates). Removing two corresponding memcpy calls. Making a little cleanup in vp9_entropymode.h as well: removing redundant 'extern' keyword and moving all function declarations at the end. Change-Id: Ia16b38b46aec2e2500f5df29c40a297ae241dede
2013-07-18 01:50:52 +02:00
void vp9_entropy_mode_init();
Adjust style to match Google Coding Style a little more closely. Most of these were picked up by jenkins in the commit that changed the vp8 namespace to vp9 in common/. Change-Id: I5cbd56ffc753b92ef805133cda6acc1713a13878
2012-11-01 00:09:17 +01:00
Moving segmentation struct from MACROBLOCKD to VP9_COMMON. VP9_COMMON is the right place to segmentatation struct because it has global segmentation parameters, not something specific to macroblock processing. Change-Id: Ib9ada0c06c253996eb3b5f6cccf6a323fbbba708
2013-08-14 20:20:33 +02:00
void vp9_setup_past_independence(struct VP9Common *cm);
Adds support for switchable interpolation filters. Allows for swtiching/setting interpolation filters at the MB level. A frame level flag indicates whether to use a specifc filter for the entire frame or to signal the interpolation filter for each MB. When switchable filters are used, the encoder chooses between 8-tap and 8-tap sharp filters. The code currently has options to explore other variations as well, which will be cleaned up subsequently. One issue with the framework is that encoding is slow. I tried to do some tricks to speed things up but it is still slow. Decoding speed should not be affected since the number of filter taps remain unchanged. With the current version, we are up 0.5% on derf on average but some videos city/mobile improve by close to 4 and 2% respectively. If we did a full-search by turning the SEARCH_BEST_FILTER flag on, the results are somewhat better. The framework can be combined with filtered prediction, and I seek feedback regarding that. Rebased. Change-Id: I8f632cb2c111e76284140a2bd480945d6d42b77a
2012-07-18 22:43:01 +02:00
consistently name VP9_COMMON variables #3 stragglers Change-Id: Ib1e853f9a331b7b66639dc34d79568d84d1930f1
2013-08-24 04:30:33 +02:00
void vp9_init_mbmode_probs(struct VP9Common *cm);
Adjust style to match Google Coding Style a little more closely. Most of these were picked up by jenkins in the commit that changed the vp8 namespace to vp9 in common/. Change-Id: I5cbd56ffc753b92ef805133cda6acc1713a13878
2012-11-01 00:09:17 +01:00
consistently name VP9_COMMON variables #3 stragglers Change-Id: Ib1e853f9a331b7b66639dc34d79568d84d1930f1
2013-08-24 04:30:33 +02:00
void vp9_adapt_mode_probs(struct VP9Common *cm);
Refactoring of switchable filter search for speed Refactors the switchable filter search in the rd loop to improve encode speed. Uses a piecewise approximation to a closed form expression to estimate rd cost for a Laplacian source with a given variance and quantization step-size. About 40% encode time reduction is achieved. Results (on a feb 12 baseline) show a slight drop: derf: -0.019% yt: +0.010% std-hd: -0.162% hd: -0.050% Change-Id: Ie861badf5bba1e3b1052e29a0ef1b7e256edbcd0
2013-02-12 02:08:52 +01:00
Adding const to function arguments. Function list: tx_counts_to_branch_counts_32x32 tx_counts_to_branch_counts_8x8 tx_counts_to_branch_counts_8x8 update_ct update_ct2 update_mode_probs Change-Id: I120d8945a34378cf285d6bd415e23de1d522cf2f
2013-09-30 23:50:15 +02:00
void tx_counts_to_branch_counts_32x32(const unsigned int *tx_count_32x32p,
Removing kf_{y, uv}_mode_prob arrays from VP9Common. These arrays have constant values (no any updates). Removing two corresponding memcpy calls. Making a little cleanup in vp9_entropymode.h as well: removing redundant 'extern' keyword and moving all function declarations at the end. Change-Id: Ia16b38b46aec2e2500f5df29c40a297ae241dede
2013-07-18 01:50:52 +02:00
unsigned int (*ct_32x32p)[2]);
Adding const to function arguments. Function list: tx_counts_to_branch_counts_32x32 tx_counts_to_branch_counts_8x8 tx_counts_to_branch_counts_8x8 update_ct update_ct2 update_mode_probs Change-Id: I120d8945a34378cf285d6bd415e23de1d522cf2f
2013-09-30 23:50:15 +02:00
void tx_counts_to_branch_counts_16x16(const unsigned int *tx_count_16x16p,
Removing kf_{y, uv}_mode_prob arrays from VP9Common. These arrays have constant values (no any updates). Removing two corresponding memcpy calls. Making a little cleanup in vp9_entropymode.h as well: removing redundant 'extern' keyword and moving all function declarations at the end. Change-Id: Ia16b38b46aec2e2500f5df29c40a297ae241dede
2013-07-18 01:50:52 +02:00
unsigned int (*ct_16x16p)[2]);
Adding const to function arguments. Function list: tx_counts_to_branch_counts_32x32 tx_counts_to_branch_counts_8x8 tx_counts_to_branch_counts_8x8 update_ct update_ct2 update_mode_probs Change-Id: I120d8945a34378cf285d6bd415e23de1d522cf2f
2013-09-30 23:50:15 +02:00
void tx_counts_to_branch_counts_8x8(const unsigned int *tx_count_8x8p,
Removing kf_{y, uv}_mode_prob arrays from VP9Common. These arrays have constant values (no any updates). Removing two corresponding memcpy calls. Making a little cleanup in vp9_entropymode.h as well: removing redundant 'extern' keyword and moving all function declarations at the end. Change-Id: Ia16b38b46aec2e2500f5df29c40a297ae241dede
2013-07-18 01:50:52 +02:00
unsigned int (*ct_8x8p)[2]);
Adjust style to match Google Coding Style a little more closely. Most of these were picked up by jenkins in the commit that changed the vp8 namespace to vp9 in common/. Change-Id: I5cbd56ffc753b92ef805133cda6acc1713a13878
2012-11-01 00:09:17 +01:00
Use standard integer types for pixel values and coefficients. For coefficients, use int16_t (instead of short); for pixel values in 16-bit intermediates, use uint16_t (instead of unsigned short); for all others, use uint8_t (instead of unsigned char). Change-Id: I3619cd9abf106c3742eccc2e2f5e89a62774f7da
2012-12-19 00:31:19 +01:00
#endif // VP9_COMMON_VP9_ENTROPYMODE_H_
Reference in New Issue Copy Permalink