Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix more conflicts with SVT-AV1 #82

Merged
merged 2 commits into from
Aug 19, 2020
Merged

Fix more conflicts with SVT-AV1 #82

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d5362e
Fix more conflicts with SVT-AV1
1480c1 Jan 17, 2020
e347a4b
EbNoiseExtractAVX2.c: Use static inline
1480c1 Aug 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
EbNoiseExtractAVX2.c: Use static inline
  • Loading branch information
@1480c1
1480c1 committed Aug 19, 2020
commit e347a4bb73ba64e94382c8a674a38f4e264cb969
50 changes: 11 additions & 39 deletions Source/Lib/ASM_AVX2/EbNoiseExtractAVX2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,9 @@ static EB_ALIGN(16) const uint8_t weak_chroma_filter[2][32] = {
{ 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2 },
};

static void eb_vp9_luma_weak_filter_avx2_intrin(
__m256i top,
__m256i curr,
__m256i bottom,
__m256i curr_prev,
__m256i curr_next,
uint8_t *ptr_denoised,
uint8_t *ptr_noise
)
{
static inline void eb_vp9_luma_weak_filter_avx2_intrin(
__m256i top, __m256i curr, __m256i bottom, __m256i curr_prev,
__m256i curr_next, uint8_t *ptr_denoised, uint8_t *ptr_noise) {
__m256i top_first_half,
bottom_first_half,
filter_first_half,
Expand Down Expand Up @@ -74,21 +67,11 @@ static void eb_vp9_luma_weak_filter_avx2_intrin(
_mm256_storeu_si256((__m256i *)(ptr_denoised ), filter_first_half);

_mm256_storeu_si256((__m256i *)(ptr_noise), _mm256_subs_epu8(curr, filter_first_half));

}
static void eb_vp9_chroma_weak_luma_strong_filter_avx2_intrin(
__m256i top,
__m256i curr,
__m256i bottom,
__m256i curr_prev,
__m256i curr_next,
__m256i top_prev,
__m256i top_next,
__m256i bottom_prev,
__m256i bottom_next,
uint8_t *ptr_denoised
)
{
static inline void eb_vp9_chroma_weak_luma_strong_filter_avx2_intrin(
__m256i top, __m256i curr, __m256i bottom, __m256i curr_prev,
__m256i curr_next, __m256i top_prev, __m256i top_next, __m256i bottom_prev,
__m256i bottom_next, uint8_t *ptr_denoised) {
__m256i filter_first_half,
filter_second_half,
curr_next_first_half,
Expand Down Expand Up @@ -174,22 +157,12 @@ static void eb_vp9_chroma_weak_luma_strong_filter_avx2_intrin(

filter_first_half = _mm256_permute4x64_epi64(_mm256_packus_epi16(filter_first_half, filter_second_half), 216);
_mm256_storeu_si256((__m256i *)(ptr_denoised), filter_first_half);

}

static void eb_vp9_chroma_strong_avx2_intrin(
__m256i top,
__m256i curr,
__m256i bottom,
__m256i curr_prev,
__m256i curr_next,
__m256i top_prev,
__m256i top_next,
__m256i bottom_prev,
__m256i bottom_next,
uint8_t *ptr_denoised
)
{
static inline void eb_vp9_chroma_strong_avx2_intrin(
__m256i top, __m256i curr, __m256i bottom, __m256i curr_prev,
__m256i curr_next, __m256i top_prev, __m256i top_next, __m256i bottom_prev,
__m256i bottom_next, uint8_t *ptr_denoised) {
__m256i curr_left_mid_first_halflo,
curr_left_mid_first_halfhi,
curr_prev_permutation,
Expand Down Expand Up @@ -266,7 +239,6 @@ static void eb_vp9_chroma_strong_avx2_intrin(

curr_left_mid_first_halflo = _mm256_insertf128_si256(curr_left_mid_first_halflo, _mm_packus_epi16(_mm256_extracti128_si256(curr_left_mid_first_halfhi, 0), _mm256_extracti128_si256(curr_left_mid_first_halfhi, 1)), 1);
_mm256_storeu_si256((__m256i *)(ptr_denoised), curr_left_mid_first_halflo);

}
/*******************************************
* eb_vp9_noise_extract_luma_weak
Expand Down