Commit 26c8e720 authored by James Zern's avatar James Zern Committed by Gerrit Code Review

Merge "vp9_filter: move table alignment decl's to header"

parents 011be1af 80920802
......@@ -10,12 +10,9 @@
#include <assert.h>
#include "vpx_ports/mem.h"
#include "vp9/common/vp9_filter.h"
DECLARE_ALIGNED(256, const InterpKernel,
vp9_bilinear_filters[SUBPEL_SHIFTS]) = {
const InterpKernel vp9_bilinear_filters[SUBPEL_SHIFTS] = {
{ 0, 0, 0, 128, 0, 0, 0, 0 },
{ 0, 0, 0, 120, 8, 0, 0, 0 },
{ 0, 0, 0, 112, 16, 0, 0, 0 },
......@@ -35,8 +32,7 @@ DECLARE_ALIGNED(256, const InterpKernel,
};
// Lagrangian interpolation filter
DECLARE_ALIGNED(256, const InterpKernel,
vp9_sub_pel_filters_8[SUBPEL_SHIFTS]) = {
const InterpKernel vp9_sub_pel_filters_8[SUBPEL_SHIFTS] = {
{ 0, 0, 0, 128, 0, 0, 0, 0},
{ 0, 1, -5, 126, 8, -3, 1, 0},
{ -1, 3, -10, 122, 18, -6, 2, 0},
......@@ -56,8 +52,7 @@ DECLARE_ALIGNED(256, const InterpKernel,
};
// DCT based filter
DECLARE_ALIGNED(256, const InterpKernel,
vp9_sub_pel_filters_8s[SUBPEL_SHIFTS]) = {
const InterpKernel vp9_sub_pel_filters_8s[SUBPEL_SHIFTS] = {
{0, 0, 0, 128, 0, 0, 0, 0},
{-1, 3, -7, 127, 8, -3, 1, 0},
{-2, 5, -13, 125, 17, -6, 3, -1},
......@@ -77,8 +72,7 @@ DECLARE_ALIGNED(256, const InterpKernel,
};
// freqmultiplier = 0.5
DECLARE_ALIGNED(256, const InterpKernel,
vp9_sub_pel_filters_8lp[SUBPEL_SHIFTS]) = {
const InterpKernel vp9_sub_pel_filters_8lp[SUBPEL_SHIFTS] = {
{ 0, 0, 0, 128, 0, 0, 0, 0},
{-3, -1, 32, 64, 38, 1, -3, 0},
{-2, -2, 29, 63, 41, 2, -3, 0},
......
......@@ -13,6 +13,8 @@
#include "./vpx_config.h"
#include "vpx/vpx_integer.h"
#include "vpx_ports/mem.h"
#ifdef __cplusplus
extern "C" {
......@@ -37,10 +39,14 @@ typedef int16_t InterpKernel[SUBPEL_TAPS];
const InterpKernel *vp9_get_interp_kernel(INTERP_FILTER filter);
extern const InterpKernel vp9_bilinear_filters[SUBPEL_SHIFTS];
extern const InterpKernel vp9_sub_pel_filters_8[SUBPEL_SHIFTS];
extern const InterpKernel vp9_sub_pel_filters_8s[SUBPEL_SHIFTS];
extern const InterpKernel vp9_sub_pel_filters_8lp[SUBPEL_SHIFTS];
DECLARE_ALIGNED(256, extern const InterpKernel,
vp9_bilinear_filters[SUBPEL_SHIFTS]);
DECLARE_ALIGNED(256, extern const InterpKernel,
vp9_sub_pel_filters_8[SUBPEL_SHIFTS]);
DECLARE_ALIGNED(256, extern const InterpKernel,
vp9_sub_pel_filters_8s[SUBPEL_SHIFTS]);
DECLARE_ALIGNED(256, extern const InterpKernel,
vp9_sub_pel_filters_8lp[SUBPEL_SHIFTS]);
// The VP9_BILINEAR_FILTERS_2TAP macro returns a pointer to the bilinear
// filter kernel as a 2 tap filter.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment