Skip to content

GitLab

A
aom-rav1e
Commit 344b643d authored by hui su's avatar hui su
Browse files
Options

Remove av1/common/intra_filters.h 

Use a single header reconintra.h for all intra prediction
related codes.

Change-Id: Ib869447f8c482b534c890eab673e81ff830e8d85
parent 5db9743f
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 96 deletions
av1/av1_common.mk
View file @ 344b643d
......@@ -140,7 +140,6 @@ AV1_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/iht8x8_add_neon.c
endif
ifeq ($(CONFIG_FILTER_INTRA),yes)
AV1_COMMON_SRCS-yes += common/intra_filters.h
AV1_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/reconintra_sse4.c
endif
......
av1/common/intra_filters.h deleted 100644 → 0
View file @ 5db9743f
/*
* Copyright (c) 2016 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 AV1_COMMON_INTRA_FILTERS_H_
#define AV1_COMMON_INTRA_FILTERS_H_
#define FILTER_INTRA_PREC_BITS (10)
static int filter_intra_taps_4[TX_SIZES][INTRA_MODES][4] = {
{
{ 735, 881, -537, -54 },
{ 1005, 519, -488, -11 },
{ 383, 990, -343, -6 },
{ 442, 805, -542, 319 },
{ 658, 616, -133, -116 },
{ 875, 442, -141, -151 },
{ 386, 741, -23, -80 },
{ 390, 1027, -446, 51 },
{ 679, 606, -523, 262 },
{ 903, 922, -778, -23 },
},
{
{ 648, 803, -444, 16 },
{ 972, 620, -576, 7 },
{ 561, 967, -499, -5 },
{ 585, 762, -468, 144 },
{ 596, 619, -182, -9 },
{ 895, 459, -176, -153 },
{ 557, 722, -126, -129 },
{ 601, 839, -523, 105 },
{ 562, 709, -499, 251 },
{ 803, 872, -695, 43 },
},
{
{ 423, 728, -347, 111 },
{ 963, 685, -665, 23 },
{ 281, 1024, -480, 216 },
{ 640, 596, -437, 78 },
{ 429, 669, -259, 99 },
{ 740, 646, -415, 23 },
{ 568, 771, -346, 40 },
{ 404, 833, -486, 209 },
{ 398, 712, -423, 307 },
{ 939, 935, -887, 17 },
},
{
{ 477, 737, -393, 150 },
{ 881, 630, -546, 67 },
{ 506, 984, -443, -20 },
{ 114, 459, -270, 528 },
{ 433, 528, 14, 3 },
{ 837, 470, -301, -30 },
{ 181, 777, 89, -107 },
{ -29, 716, -232, 259 },
{ 589, 646, -495, 255 },
{ 740, 884, -728, 77 },
},
};
#endif // AV1_COMMON_INTRA_FILTERS_H_
av1/common/reconintra.c
View file @ 344b643d
......@@ -22,9 +22,6 @@
#include "aom_mem/aom_mem.h"
#include "aom_ports/mem.h"
#include "aom_ports/aom_once.h"
#if CONFIG_FILTER_INTRA
#include "av1/common/intra_filters.h"
#endif // CONFIG_FILTER_INTRA
#include "av1/common/reconintra.h"
#include "av1/common/onyxc_int.h"
......@@ -866,6 +863,57 @@ static void highbd_dr_predictor(uint16_t *dst, ptrdiff_t stride, int bs,
#endif // CONFIG_EXT_INTRA
#if CONFIG_FILTER_INTRA
int av1_filter_intra_taps_4[TX_SIZES][INTRA_MODES][4] = {
{
{ 735, 881, -537, -54 },
{ 1005, 519, -488, -11 },
{ 383, 990, -343, -6 },
{ 442, 805, -542, 319 },
{ 658, 616, -133, -116 },
{ 875, 442, -141, -151 },
{ 386, 741, -23, -80 },
{ 390, 1027, -446, 51 },
{ 679, 606, -523, 262 },
{ 903, 922, -778, -23 },
},
{
{ 648, 803, -444, 16 },
{ 972, 620, -576, 7 },
{ 561, 967, -499, -5 },
{ 585, 762, -468, 144 },
{ 596, 619, -182, -9 },
{ 895, 459, -176, -153 },
{ 557, 722, -126, -129 },
{ 601, 839, -523, 105 },
{ 562, 709, -499, 251 },
{ 803, 872, -695, 43 },
},
{
{ 423, 728, -347, 111 },
{ 963, 685, -665, 23 },
{ 281, 1024, -480, 216 },
{ 640, 596, -437, 78 },
{ 429, 669, -259, 99 },
{ 740, 646, -415, 23 },
{ 568, 771, -346, 40 },
{ 404, 833, -486, 209 },
{ 398, 712, -423, 307 },
{ 939, 935, -887, 17 },
},
{
{ 477, 737, -393, 150 },
{ 881, 630, -546, 67 },
{ 506, 984, -443, -20 },
{ 114, 459, -270, 528 },
{ 433, 528, 14, 3 },
{ 837, 470, -301, -30 },
{ 181, 777, 89, -107 },
{ -29, 716, -232, 259 },
{ 589, 646, -495, 255 },
{ 740, 884, -728, 77 },
},
};
static void filter_intra_predictors_4tap(uint8_t *dst, ptrdiff_t stride, int bs,
const uint8_t *above,
const uint8_t *left, int mode) {
......@@ -875,10 +923,10 @@ static void filter_intra_predictors_4tap(uint8_t *dst, ptrdiff_t stride, int bs,
const TX_SIZE tx_size =
(bs == 32) ? TX_32X32
: ((bs == 16) ? TX_16X16 : ((bs == 8) ? TX_8X8 : (TX_4X4)));
const int c0 = filter_intra_taps_4[tx_size][mode][0];
const int c1 = filter_intra_taps_4[tx_size][mode][1];
const int c2 = filter_intra_taps_4[tx_size][mode][2];
const int c3 = filter_intra_taps_4[tx_size][mode][3];
const int c0 = av1_filter_intra_taps_4[tx_size][mode][0];
const int c1 = av1_filter_intra_taps_4[tx_size][mode][1];
const int c2 = av1_filter_intra_taps_4[tx_size][mode][2];
const int c3 = av1_filter_intra_taps_4[tx_size][mode][3];
k = 0;
mean = 0;
......@@ -999,10 +1047,10 @@ static void highbd_filter_intra_predictors_4tap(uint16_t *dst, ptrdiff_t stride,
const TX_SIZE tx_size =
(bs == 32) ? TX_32X32
: ((bs == 16) ? TX_16X16 : ((bs == 8) ? TX_8X8 : (TX_4X4)));
const int c0 = filter_intra_taps_4[tx_size][mode][0];
const int c1 = filter_intra_taps_4[tx_size][mode][1];
const int c2 = filter_intra_taps_4[tx_size][mode][2];
const int c3 = filter_intra_taps_4[tx_size][mode][3];
const int c0 = av1_filter_intra_taps_4[tx_size][mode][0];
const int c1 = av1_filter_intra_taps_4[tx_size][mode][1];
const int c2 = av1_filter_intra_taps_4[tx_size][mode][2];
const int c3 = av1_filter_intra_taps_4[tx_size][mode][3];
k = 0;
mean = 0;
......
av1/common/reconintra.h
View file @ 344b643d
......@@ -43,4 +43,9 @@ static const INTERINTRA_MODE intra_to_interintra_mode[INTRA_MODES] = {
} // extern "C"
#endif
#if CONFIG_FILTER_INTRA
#define FILTER_INTRA_PREC_BITS 10
extern int av1_filter_intra_taps_4[TX_SIZES][INTRA_MODES][4];
#endif // CONFIG_FILTER_INTRA
#endif // AV1_COMMON_RECONINTRA_H_
av1/common/x86/reconintra_sse4.c
View file @ 344b643d
......@@ -12,7 +12,7 @@
#include "./av1_rtcd.h"
#include "aom_ports/mem.h"
#include "av1/common/enums.h"
#include "av1/common/intra_filters.h"
#include "av1/common/reconintra.h"
static INLINE void AddPixelsSmall(const uint8_t *above, const uint8_t *left,
__m128i *sum) {
......@@ -153,25 +153,25 @@ static INLINE void GetIntraFilterParams(int bs, int mode, __m128i *params) {
(bs == 32) ? TX_32X32
: ((bs == 16) ? TX_16X16 : ((bs == 8) ? TX_8X8 : (TX_4X4)));
// c0
params[0] = _mm_set_epi32(filter_intra_taps_4[tx_size][mode][0],
filter_intra_taps_4[tx_size][mode][0],
filter_intra_taps_4[tx_size][mode][0],
filter_intra_taps_4[tx_size][mode][0]);
params[0] = _mm_set_epi32(av1_filter_intra_taps_4[tx_size][mode][0],
av1_filter_intra_taps_4[tx_size][mode][0],
av1_filter_intra_taps_4[tx_size][mode][0],
av1_filter_intra_taps_4[tx_size][mode][0]);
// c1
params[1] = _mm_set_epi32(filter_intra_taps_4[tx_size][mode][1],
filter_intra_taps_4[tx_size][mode][1],
filter_intra_taps_4[tx_size][mode][1],
filter_intra_taps_4[tx_size][mode][1]);
params[1] = _mm_set_epi32(av1_filter_intra_taps_4[tx_size][mode][1],
av1_filter_intra_taps_4[tx_size][mode][1],
av1_filter_intra_taps_4[tx_size][mode][1],
av1_filter_intra_taps_4[tx_size][mode][1]);
// c2
params[2] = _mm_set_epi32(filter_intra_taps_4[tx_size][mode][2],
filter_intra_taps_4[tx_size][mode][2],
filter_intra_taps_4[tx_size][mode][2],
filter_intra_taps_4[tx_size][mode][2]);
params[2] = _mm_set_epi32(av1_filter_intra_taps_4[tx_size][mode][2],
av1_filter_intra_taps_4[tx_size][mode][2],
av1_filter_intra_taps_4[tx_size][mode][2],
av1_filter_intra_taps_4[tx_size][mode][2]);
// c3
params[3] = _mm_set_epi32(filter_intra_taps_4[tx_size][mode][3],
filter_intra_taps_4[tx_size][mode][3],
filter_intra_taps_4[tx_size][mode][3],
filter_intra_taps_4[tx_size][mode][3]);
params[3] = _mm_set_epi32(av1_filter_intra_taps_4[tx_size][mode][3],
av1_filter_intra_taps_4[tx_size][mode][3],
av1_filter_intra_taps_4[tx_size][mode][3],
av1_filter_intra_taps_4[tx_size][mode][3]);
}
static const int maxBlkSize = 32;
......
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