Skip to content

Commit

Permalink
project: Update for 1.13.0 merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sibras
Sibras committed Mar 11, 2023
1 parent cdedb9a commit c21151b
Show file tree
Hide file tree
Showing 8 changed files with 255 additions and 66 deletions.
30 changes: 18 additions & 12 deletions SMP/libvpx.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1418,6 +1418,24 @@
<ClCompile Include="..\vp9\encoder\vp9_ext_ratectrl.c">
<Filter>Source Files\libvpx\vp9\encoder</Filter>
</ClCompile>
<ClCompile Include="..\vp9\encoder\x86\vp9_quantize_ssse3.c">
<Filter>Source Files\libvpx\vp9\encoder\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\subtract_avx2.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\highbd_quantize_intrin_avx2.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\quantize_avx2.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\highbd_sad4d_avx2.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\highbd_sad_avx2.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="libvpx.def">
Expand Down Expand Up @@ -1473,9 +1491,6 @@
<YASM Include="..\vp9\common\x86\vp9_mfqe_sse2.asm">
<Filter>Source Files\libvpx\vp9\common\x86</Filter>
</YASM>
<YASM Include="..\vp9\encoder\x86\vp9_quantize_ssse3_x86_64.asm">
<Filter>Source Files\libvpx\vp9\encoder\x86</Filter>
</YASM>
<YASM Include="..\vpx_dsp\x86\vpx_subpixel_bilinear_sse2.asm">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</YASM>
Expand Down Expand Up @@ -1512,15 +1527,6 @@
<YASM Include="..\vpx_dsp\x86\sad_sse2.asm">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</YASM>
<YASM Include="..\vpx_dsp\x86\sad_sse3.asm">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</YASM>
<YASM Include="..\vpx_dsp\x86\sad_sse4.asm">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</YASM>
<YASM Include="..\vpx_dsp\x86\sad_ssse3.asm">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</YASM>
<YASM Include="..\vpx_dsp\x86\sad4d_sse2.asm">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</YASM>
Expand Down
9 changes: 6 additions & 3 deletions SMP/libvpx_files.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,7 @@
<ClCompile Include="..\vp9\encoder\x86\vp9_highbd_block_error_intrin_sse2.c" />
<ClCompile Include="..\vp9\encoder\x86\vp9_quantize_avx2.c" />
<ClCompile Include="..\vp9\encoder\x86\vp9_quantize_sse2.c" />
<ClCompile Include="..\vp9\encoder\x86\vp9_quantize_ssse3.c" />
<ClCompile Include="..\vp9\vp9_cx_iface.c" />
<ClCompile Include="..\vp9\vp9_dx_iface.c" />
<ClCompile Include="..\vp9\vp9_iface_common.c" />
Expand Down Expand Up @@ -401,7 +402,10 @@
<ClCompile Include="..\vpx_dsp\x86\highbd_intrapred_intrin_sse2.c" />
<ClCompile Include="..\vpx_dsp\x86\highbd_intrapred_intrin_ssse3.c" />
<ClCompile Include="..\vpx_dsp\x86\highbd_loopfilter_sse2.c" />
<ClCompile Include="..\vpx_dsp\x86\highbd_sad4d_avx2.c" />
<ClCompile Include="..\vpx_dsp\x86\highbd_sad_avx2.c" />
<ClCompile Include="..\vpx_dsp\x86\highbd_quantize_intrin_sse2.c" />
<ClCompile Include="..\vpx_dsp\x86\highbd_quantize_intrin_avx2.c" />
<ClCompile Include="..\vpx_dsp\x86\highbd_variance_sse2.c" />
<ClCompile Include="..\vpx_dsp\x86\inv_txfm_sse2.c" />
<ClCompile Include="..\vpx_dsp\x86\inv_txfm_ssse3.c" />
Expand All @@ -411,6 +415,7 @@
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\post_proc_sse2.c" />
<ClCompile Include="..\vpx_dsp\x86\quantize_avx.c" />
<ClCompile Include="..\vpx_dsp\x86\quantize_avx2.c" />
<ClCompile Include="..\vpx_dsp\x86\quantize_sse2.c" />
<ClCompile Include="..\vpx_dsp\x86\quantize_ssse3.c" />
<ClCompile Include="..\vpx_dsp\x86\sad4d_avx2.c" />
Expand All @@ -419,6 +424,7 @@
<ExcludedFromBuild Condition="'$(VisualStudioVersion)' == '12.0'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\sad_avx2.c" />
<ClCompile Include="..\vpx_dsp\x86\subtract_avx2.c" />
<ClCompile Include="..\vpx_dsp\x86\sum_squares_sse2.c" />
<ClCompile Include="..\vpx_dsp\x86\variance_avx2.c" />
<ClCompile Include="..\vpx_dsp\x86\variance_sse2.c" />
Expand Down Expand Up @@ -465,9 +471,6 @@
<YASM Include="..\vp9\common\x86\vp9_mfqe_sse2.asm" />
<YASM Include="..\vp9\encoder\x86\vp9_dct_sse2.asm" />
<YASM Include="..\vp9\encoder\x86\vp9_error_sse2.asm" />
<YASM Include="..\vp9\encoder\x86\vp9_quantize_ssse3_x86_64.asm">
<ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
</YASM>
<YASM Include="..\vpx_dsp\x86\add_noise_sse2.asm" />
<YASM Include="..\vpx_dsp\x86\avg_ssse3_x86_64.asm">
<ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
Expand Down
30 changes: 18 additions & 12 deletions SMP/libvpx_winrt.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1418,6 +1418,24 @@
<ClCompile Include="..\vp9\encoder\vp9_ext_ratectrl.c">
<Filter>Source Files\libvpx\vp9\encoder</Filter>
</ClCompile>
<ClCompile Include="..\vp9\encoder\x86\vp9_quantize_ssse3.c">
<Filter>Source Files\libvpx\vp9\encoder\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\subtract_avx2.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\highbd_quantize_intrin_avx2.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\quantize_avx2.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\highbd_sad4d_avx2.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\highbd_sad_avx2.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="libvpx.def">
Expand Down Expand Up @@ -1473,9 +1491,6 @@
<YASM Include="..\vp9\common\x86\vp9_mfqe_sse2.asm">
<Filter>Source Files\libvpx\vp9\common\x86</Filter>
</YASM>
<YASM Include="..\vp9\encoder\x86\vp9_quantize_ssse3_x86_64.asm">
<Filter>Source Files\libvpx\vp9\encoder\x86</Filter>
</YASM>
<YASM Include="..\vpx_dsp\x86\vpx_subpixel_bilinear_sse2.asm">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</YASM>
Expand Down Expand Up @@ -1512,15 +1527,6 @@
<YASM Include="..\vpx_dsp\x86\sad_sse2.asm">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</YASM>
<YASM Include="..\vpx_dsp\x86\sad_sse3.asm">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</YASM>
<YASM Include="..\vpx_dsp\x86\sad_sse4.asm">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</YASM>
<YASM Include="..\vpx_dsp\x86\sad_ssse3.asm">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</YASM>
<YASM Include="..\vpx_dsp\x86\sad4d_sse2.asm">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</YASM>
Expand Down
6 changes: 3 additions & 3 deletions SMP/vpx_version.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// This file is generated. Do not edit.
#define VERSION_MAJOR 1
#define VERSION_MINOR 12
#define VERSION_MINOR 13
#define VERSION_PATCH 0
#define VERSION_EXTRA ""
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
#define VERSION_STRING_NOSP "v1.12.0"
#define VERSION_STRING " v1.12.0"
#define VERSION_STRING_NOSP "v1.13.0"
#define VERSION_STRING " v1.13.0"
19 changes: 16 additions & 3 deletions SMP/x86/vp9_rtcd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,12 @@ void vp9_highbd_iht8x8_64_add_sse4_1(const tran_low_t *input, uint16_t *dest, in
RTCD_EXTERN void (*vp9_highbd_iht8x8_64_add)(const tran_low_t *input, uint16_t *dest, int stride, int tx_type, int bd);

void vp9_highbd_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
#define vp9_highbd_quantize_fp vp9_highbd_quantize_fp_c
void vp9_highbd_quantize_fp_avx2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
RTCD_EXTERN void (*vp9_highbd_quantize_fp)(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);

void vp9_highbd_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
#define vp9_highbd_quantize_fp_32x32 vp9_highbd_quantize_fp_32x32_c
void vp9_highbd_quantize_fp_32x32_avx2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
RTCD_EXTERN void (*vp9_highbd_quantize_fp_32x32)(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);

void vp9_highbd_temporal_filter_apply_c(const uint8_t *frame1, unsigned int stride, const uint8_t *frame2, unsigned int block_width, unsigned int block_height, int strength, int *blk_fw, int use_32x32, uint32_t *accumulator, uint16_t *count);
#define vp9_highbd_temporal_filter_apply vp9_highbd_temporal_filter_apply_c
Expand All @@ -120,11 +122,14 @@ RTCD_EXTERN void (*vp9_iht8x8_64_add)(const tran_low_t *input, uint8_t *dest, in

void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
void vp9_quantize_fp_sse2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
void vp9_quantize_fp_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
void vp9_quantize_fp_avx2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
RTCD_EXTERN void (*vp9_quantize_fp)(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);

void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
#define vp9_quantize_fp_32x32 vp9_quantize_fp_32x32_c
void vp9_quantize_fp_32x32_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
void vp9_quantize_fp_32x32_avx2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
RTCD_EXTERN void (*vp9_quantize_fp_32x32)(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);

void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config *src, struct yv12_buffer_config *dst, INTERP_FILTER filter_type, int phase_scaler);
void vp9_scale_and_extend_frame_ssse3(const struct yv12_buffer_config *src, struct yv12_buffer_config *dst, INTERP_FILTER filter_type, int phase_scaler);
Expand Down Expand Up @@ -168,6 +173,10 @@ static void setup_rtcd_internal(void)
if (flags & HAS_SSE4_1) vp9_highbd_iht4x4_16_add = vp9_highbd_iht4x4_16_add_sse4_1;
vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_c;
if (flags & HAS_SSE4_1) vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_sse4_1;
vp9_highbd_quantize_fp = vp9_highbd_quantize_fp_c;
if (flags & HAS_AVX2) vp9_highbd_quantize_fp = vp9_highbd_quantize_fp_avx2;
vp9_highbd_quantize_fp_32x32 = vp9_highbd_quantize_fp_32x32_c;
if (flags & HAS_AVX2) vp9_highbd_quantize_fp_32x32 = vp9_highbd_quantize_fp_32x32_avx2;
vp9_iht16x16_256_add = vp9_iht16x16_256_add_c;
if (flags & HAS_SSE2) vp9_iht16x16_256_add = vp9_iht16x16_256_add_sse2;
vp9_iht4x4_16_add = vp9_iht4x4_16_add_c;
Expand All @@ -176,7 +185,11 @@ static void setup_rtcd_internal(void)
if (flags & HAS_SSE2) vp9_iht8x8_64_add = vp9_iht8x8_64_add_sse2;
vp9_quantize_fp = vp9_quantize_fp_c;
if (flags & HAS_SSE2) vp9_quantize_fp = vp9_quantize_fp_sse2;
if (flags & HAS_SSSE3) vp9_quantize_fp = vp9_quantize_fp_ssse3;
if (flags & HAS_AVX2) vp9_quantize_fp = vp9_quantize_fp_avx2;
vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_c;
if (flags & HAS_SSSE3) vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_ssse3;
if (flags & HAS_AVX2) vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_avx2;
vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_c;
if (flags & HAS_SSSE3) vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_ssse3;
}
Expand Down
Loading

0 comments on commit c21151b

Please sign in to comment.