generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
982deebb5e
vpx/vp8/common/entropymode.h

90 lines
3.5 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
*/
#ifndef __INC_ENTROPYMODE_H
#define __INC_ENTROPYMODE_H
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
#include "blockd.h"
Initial WebM release
2010-05-18 17:58:33 +02:00
#include "treecoder.h"
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
#define SUBMVREF_COUNT 5
#define VP8_NUMMBSPLITS 4
Change non-function symbol vp8_ prefixes to vp9_. For local symbols, make them static instead. Change-Id: I13d60947a46f711bc8991e16100cea2a13e3a22e
2012-10-31 01:12:12 +01:00
typedef const int vp9_mbsplit[16];
Initial WebM release
2010-05-18 17:58:33 +02:00
Change non-function symbol vp8_ prefixes to vp9_. For local symbols, make them static instead. Change-Id: I13d60947a46f711bc8991e16100cea2a13e3a22e
2012-10-31 01:12:12 +01:00
extern vp9_mbsplit vp9_mbsplits [VP8_NUMMBSPLITS];
Initial WebM release
2010-05-18 17:58:33 +02:00
Change non-function symbol vp8_ prefixes to vp9_. For local symbols, make them static instead. Change-Id: I13d60947a46f711bc8991e16100cea2a13e3a22e
2012-10-31 01:12:12 +01:00
extern const int vp9_mbsplit_count [VP8_NUMMBSPLITS]; /* # of subsets */
Initial WebM release
2010-05-18 17:58:33 +02:00
Change non-function symbol vp8_ prefixes to vp9_. For local symbols, make them static instead. Change-Id: I13d60947a46f711bc8991e16100cea2a13e3a22e
2012-10-31 01:12:12 +01:00
extern const vp8_prob vp9_mbsplit_probs [VP8_NUMMBSPLITS - 1];
Initial WebM release
2010-05-18 17:58:33 +02:00
Change common vp8_ public symbol prefixes to vp9_. Change-Id: Ic5a5f60e1ff9d9ccae4174160d36529466eeb509
2012-10-31 00:25:53 +01:00
extern int vp9_mv_cont(const int_mv *l, const int_mv *a);
Continued adaptive entropy coding Incorporates mv_ref, mbsplit and second_mv into the adaptive entropy framework. The mv_ref framework has been modified from before. Adds some clean-ups and fixes. Results with the adaptive entropy experiment are currently up by +1.93% on derf; +2.33% std-hd and +1.87% yt-hd. Fixed a nasty intermittent bug. Change-Id: I4b1ac9f9483b48432597595195bfec05f31d1e39
2012-06-20 14:07:24 +02:00
Change non-function symbol vp8_ prefixes to vp9_. For local symbols, make them static instead. Change-Id: I13d60947a46f711bc8991e16100cea2a13e3a22e
2012-10-31 01:12:12 +01:00
extern const vp8_prob vp9_sub_mv_ref_prob [VP8_SUBMVREFS - 1];
extern const vp8_prob vp9_sub_mv_ref_prob2 [SUBMVREF_COUNT][VP8_SUBMVREFS - 1];
Initial WebM release
2010-05-18 17:58:33 +02:00
Change non-function symbol vp8_ prefixes to vp9_. For local symbols, make them static instead. Change-Id: I13d60947a46f711bc8991e16100cea2a13e3a22e
2012-10-31 01:12:12 +01:00
extern const unsigned int vp9_kf_default_bmode_counts[VP8_BINTRAMODES][VP8_BINTRAMODES][VP8_BINTRAMODES];
Initial WebM release
2010-05-18 17:58:33 +02:00
Change non-function symbol vp8_ prefixes to vp9_. For local symbols, make them static instead. Change-Id: I13d60947a46f711bc8991e16100cea2a13e3a22e
2012-10-31 01:12:12 +01:00
extern const vp8_tree_index vp9_bmode_tree[];
Initial WebM release
2010-05-18 17:58:33 +02:00
Change non-function symbol vp8_ prefixes to vp9_. For local symbols, make them static instead. Change-Id: I13d60947a46f711bc8991e16100cea2a13e3a22e
2012-10-31 01:12:12 +01:00
extern const vp8_tree_index vp9_ymode_tree[];
extern const vp8_tree_index vp9_kf_ymode_tree[];
extern const vp8_tree_index vp9_uv_mode_tree[];
#define vp8_sb_ymode_tree vp9_uv_mode_tree
extern const vp8_tree_index vp9_i8x8_mode_tree[];
extern const vp8_tree_index vp9_mbsplit_tree[];
extern const vp8_tree_index vp9_mv_ref_tree[];
extern const vp8_tree_index vp9_sb_mv_ref_tree[];
extern const vp8_tree_index vp9_sub_mv_ref_tree[];
Initial WebM release
2010-05-18 17:58:33 +02:00
Change non-function symbol vp8_ prefixes to vp9_. For local symbols, make them static instead. Change-Id: I13d60947a46f711bc8991e16100cea2a13e3a22e
2012-10-31 01:12:12 +01:00
extern struct vp8_token_struct vp9_bmode_encodings [VP8_BINTRAMODES];
extern struct vp8_token_struct vp9_ymode_encodings [VP8_YMODES];
extern struct vp8_token_struct vp9_sb_kf_ymode_encodings [VP8_I32X32_MODES];
extern struct vp8_token_struct vp9_kf_ymode_encodings [VP8_YMODES];
extern struct vp8_token_struct vp9_i8x8_mode_encodings [VP8_I8X8_MODES];
extern struct vp8_token_struct vp9_uv_mode_encodings [VP8_UV_MODES];
extern struct vp8_token_struct vp9_mbsplit_encodings [VP8_NUMMBSPLITS];
Initial WebM release
2010-05-18 17:58:33 +02:00
/* Inter mode values do not start at zero */
Change non-function symbol vp8_ prefixes to vp9_. For local symbols, make them static instead. Change-Id: I13d60947a46f711bc8991e16100cea2a13e3a22e
2012-10-31 01:12:12 +01:00
extern struct vp8_token_struct vp9_mv_ref_encoding_array [VP8_MVREFS];
extern struct vp8_token_struct vp9_sb_mv_ref_encoding_array [VP8_MVREFS];
extern struct vp8_token_struct vp9_sub_mv_ref_encoding_array [VP8_SUBMVREFS];
Initial WebM release
2010-05-18 17:58:33 +02:00
Change common vp8_ public symbol prefixes to vp9_. Change-Id: Ic5a5f60e1ff9d9ccae4174160d36529466eeb509
2012-10-31 00:25:53 +01:00
void vp9_entropy_mode_init(void);
Initial WebM release
2010-05-18 17:58:33 +02:00
Change name of common top-level structures from VP8 to VP9. This change encompasses VP8_PTR, VP8_COMP, VP8D_COMP, VP8_COMMON, VP8Decompressor and VP8Common. Change-Id: I514ef4ad4e682370f36d656af1c09ee20da216ad
2012-10-31 01:53:32 +01:00
struct VP9Common;
void vp9_init_mbmode_probs(struct VP9Common *x);
extern void vp9_init_mode_contexts(struct VP9Common *pc);
extern void vp9_update_mode_context(struct VP9Common *pc);;
extern void vp9_accum_mv_refs(struct VP9Common *pc,
Restyle code Approximate the Google style guide[1] so that that there's a written document to follow and tools to check compliance[2]. [1]: http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml [2]: http://google-styleguide.googlecode.com/svn/trunk/cpplint/cpplint.py Change-Id: Idf40e3d8dddcc72150f6af127b13e5dab838685f
2012-07-14 00:21:29 +02:00
MB_PREDICTION_MODE m,
const int ct[4]);
Revised coding using adaptive mode context to depend on frame type A previous commit 76feb965 made the vp8_mode_context adaptive on a frame frame basis, this commit further made the coding context adaptive to two frame types separately. Tests on derf set showed a further small gain on all metrics: avg psnr 0.10%, glb psnr: 0.11%, ssim: 0.08% http://www.corp.google.com/~yaowu/no_crawl/newNearMode_1209.html Change-Id: I7b3e32ec8729de1903d14a3f1213f1624b78cdee
2011-12-08 20:43:09 +01:00
Change common vp8_ public symbol prefixes to vp9_. Change-Id: Ic5a5f60e1ff9d9ccae4174160d36529466eeb509
2012-10-31 00:25:53 +01:00
void vp9_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES - 1]);
void vp9_kf_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES] [VP8_BINTRAMODES] [VP8_BINTRAMODES - 1]);
Initial WebM release
2010-05-18 17:58:33 +02:00
Change name of common top-level structures from VP8 to VP9. This change encompasses VP8_PTR, VP8_COMP, VP8D_COMP, VP8_COMMON, VP8Decompressor and VP8Common. Change-Id: I514ef4ad4e682370f36d656af1c09ee20da216ad
2012-10-31 01:53:32 +01:00
void vp9_adapt_mode_probs(struct VP9Common *);
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
#define VP8_SWITCHABLE_FILTERS 2 /* number of switchable filters */
Change non-function symbol vp8_ prefixes to vp9_. For local symbols, make them static instead. Change-Id: I13d60947a46f711bc8991e16100cea2a13e3a22e
2012-10-31 01:12:12 +01:00
extern const INTERPOLATIONFILTERTYPE vp9_switchable_interp
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
[VP8_SWITCHABLE_FILTERS];
Change non-function symbol vp8_ prefixes to vp9_. For local symbols, make them static instead. Change-Id: I13d60947a46f711bc8991e16100cea2a13e3a22e
2012-10-31 01:12:12 +01:00
extern const int vp9_switchable_interp_map[SWITCHABLE + 1];
extern const vp8_tree_index vp9_switchable_interp_tree
Merging in the Switchable interp experiment There is a macro DEFAULT_INTERP_FILTER defined in encoder/onyx_if.c that is set as EIGHTTAP for now - so SWITCHABLE is not really used. Ideally, this should be SWITCHABLE but that would make the encoder quite a bit slower. We will change the default filter to SWITCHABLE once we find a faster way to search for switchable filters. Change-Id: Iee91832cdc07e6e14108d9b543130fdd12fc9874
2012-10-22 23:43:01 +02:00
[2*(VP8_SWITCHABLE_FILTERS - 1)];
Change non-function symbol vp8_ prefixes to vp9_. For local symbols, make them static instead. Change-Id: I13d60947a46f711bc8991e16100cea2a13e3a22e
2012-10-31 01:12:12 +01:00
extern struct vp8_token_struct vp9_switchable_interp_encodings
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
[VP8_SWITCHABLE_FILTERS];
Change non-function symbol vp8_ prefixes to vp9_. For local symbols, make them static instead. Change-Id: I13d60947a46f711bc8991e16100cea2a13e3a22e
2012-10-31 01:12:12 +01:00
extern const vp8_prob vp9_switchable_interp_prob
Merging in the Switchable interp experiment There is a macro DEFAULT_INTERP_FILTER defined in encoder/onyx_if.c that is set as EIGHTTAP for now - so SWITCHABLE is not really used. Ideally, this should be SWITCHABLE but that would make the encoder quite a bit slower. We will change the default filter to SWITCHABLE once we find a faster way to search for switchable filters. Change-Id: Iee91832cdc07e6e14108d9b543130fdd12fc9874
2012-10-22 23:43:01 +02:00
[VP8_SWITCHABLE_FILTERS + 1][VP8_SWITCHABLE_FILTERS - 1];
Adaptive entropy coding of coefficients, modes, mv. This patch incorporates adaptive entropy coding of coefficient tokens, and mode/mv information based on distributions encountered in a frame. Specifically, there is an initial forward update to the probabilities in the bitstream as before for coding the symbols in the frame, however at the end of decoding each frame, the forward update to the probabilities is reverted and instead the probabilities are updated towards the actual distributions encountered within the frame. The amount of update is weighted by the number of hits within each context. Results on derf/hd/std-hd are all up by 1.6%. On derf, the most of the gains come from coefficients, however for the hd and std-hd sets, the most of the gains come from the mode/mv information updates. Change-Id: I708c0e11fdacafee04940fe7ae159ba6844005fd
2012-06-06 00:25:07 +02:00
#endif
Reference in New Issue Copy Permalink