23144d2345
Adds an experiment to use a weighted prediction of two INTER predictors, where the weight is one of (1/4, 3/4), (3/8, 5/8), (1/2, 1/2), (5/8, 3/8) or (3/4, 1/4), and is chosen implicitly based on consistency of the predictors to the already reconstructed pixels to the top and left of the current macroblock or superblock. Currently the weighting is not applied to SPLITMV modes, which default to the usual (1/2, 1/2) weighting. However the code is in place controlled by a macro. The same weighting is used for Y and UV components, where the weight is derived from analyzing the Y component only. Results (over compound inter-intra experiment) derf: +0.18% yt: +0.34% hd: +0.49% stdhd: +0.23% The experiment suggests bigger benefit for explicitly signaled weights. Change-Id: I5438539ff4485c5752874cd1eb078ff14bf5235a
86 lines
3.7 KiB
C
86 lines
3.7 KiB
C
/*
|
|
* Copyright (c) 2013 The WebM project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
#ifndef VP9_COMMON_CONVOLVE_H_
|
|
#define VP9_COMMON_CONVOLVE_H_
|
|
|
|
#include "./vpx_config.h"
|
|
#include "vpx/vpx_integer.h"
|
|
|
|
typedef void (*convolve_fn_t)(const uint8_t *src, int src_stride,
|
|
uint8_t *dst, int dst_stride,
|
|
const int16_t *filter_x, int x_step_q4,
|
|
const int16_t *filter_y, int y_step_q4,
|
|
int w, int h);
|
|
|
|
// Not a convolution, a block copy conforming to the convolution prototype
|
|
void vp9_convolve_copy(const uint8_t *src, int src_stride,
|
|
uint8_t *dst, int dst_stride,
|
|
const int16_t *filter_x, int x_step_q4,
|
|
const int16_t *filter_y, int y_step_q4,
|
|
int w, int h);
|
|
|
|
// Not a convolution, a block average conforming to the convolution prototype
|
|
void vp9_convolve_avg(const uint8_t *src, int src_stride,
|
|
uint8_t *dst, int dst_stride,
|
|
const int16_t *filter_x, int x_step_q4,
|
|
const int16_t *filter_y, int y_step_q4,
|
|
int w, int h);
|
|
|
|
#if CONFIG_IMPLICIT_COMPOUNDINTER_WEIGHT
|
|
// Not a convolution, a block wtd (1/8, 7/8) average for (dst, src)
|
|
void vp9_convolve_1by8(const uint8_t *src, int src_stride,
|
|
uint8_t *dst, int dst_stride,
|
|
const int16_t *filter_x, int x_step_q4,
|
|
const int16_t *filter_y, int y_step_q4,
|
|
int w, int h);
|
|
|
|
// Not a convolution, a block wtd (1/4, 3/4) average for (dst, src)
|
|
void vp9_convolve_qtr(const uint8_t *src, int src_stride,
|
|
uint8_t *dst, int dst_stride,
|
|
const int16_t *filter_x, int x_step_q4,
|
|
const int16_t *filter_y, int y_step_q4,
|
|
int w, int h);
|
|
|
|
// Not a convolution, a block wtd (3/8, 5/8) average for (dst, src)
|
|
void vp9_convolve_3by8(const uint8_t *src, int src_stride,
|
|
uint8_t *dst, int dst_stride,
|
|
const int16_t *filter_x, int x_step_q4,
|
|
const int16_t *filter_y, int y_step_q4,
|
|
int w, int h);
|
|
|
|
// Not a convolution, a block wtd (5/8, 3/8) average for (dst, src)
|
|
void vp9_convolve_5by8(const uint8_t *src, int src_stride,
|
|
uint8_t *dst, int dst_stride,
|
|
const int16_t *filter_x, int x_step_q4,
|
|
const int16_t *filter_y, int y_step_q4,
|
|
int w, int h);
|
|
|
|
// Not a convolution, a block wtd (3/4, 1/4) average for (dst, src)
|
|
void vp9_convolve_3qtr(const uint8_t *src, int src_stride,
|
|
uint8_t *dst, int dst_stride,
|
|
const int16_t *filter_x, int x_step_q4,
|
|
const int16_t *filter_y, int y_step_q4,
|
|
int w, int h);
|
|
|
|
// Not a convolution, a block wtd (7/8, 1/8) average for (dst, src)
|
|
void vp9_convolve_7by8(const uint8_t *src, int src_stride,
|
|
uint8_t *dst, int dst_stride,
|
|
const int16_t *filter_x, int x_step_q4,
|
|
const int16_t *filter_y, int y_step_q4,
|
|
int w, int h);
|
|
#endif
|
|
|
|
struct subpix_fn_table {
|
|
const int16_t (*filter_x)[8];
|
|
const int16_t (*filter_y)[8];
|
|
};
|
|
|
|
#endif // VP9_COMMON_CONVOLVE_H_
|