Skip to content

Commit

Permalink
project: Update for 1.14.0 merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sibras
Sibras committed Apr 6, 2024
1 parent 9e260c4 commit f4d1314
Show file tree
Hide file tree
Showing 13 changed files with 1,025 additions and 283 deletions.
3 changes: 3 additions & 0 deletions SMP/libvpx.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ EXPORTS
vpx_img_free
vpx_img_set_rect
vpx_img_wrap
vpx_free_tpl_gop_stats
vpx_read_tpl_gop_stats
vpx_write_tpl_gop_stats
vpx_codec_enc_config_default
vpx_codec_enc_config_set
vpx_codec_enc_init_multi_ver
Expand Down
33 changes: 30 additions & 3 deletions SMP/libvpx.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,15 @@
<ClInclude Include="..\vp9\encoder\vp9_ext_ratectrl.h">
<Filter>Header Files\libvpx\vp9\encoder</Filter>
</ClInclude>
<ClInclude Include="..\vp9\encoder\vp9_firstpass_stats.h">
<Filter>Header Files\libvpx\vp9\encoder</Filter>
</ClInclude>
<ClInclude Include="..\vp9\encoder\vp9_tpl_model.h">
<Filter>Header Files\libvpx\vp9\encoder</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vpx_tpl.h">
<Filter>Source Files\libvpx\vpx</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\vpx\src\vpx_encoder.c">
Expand Down Expand Up @@ -1274,9 +1283,6 @@
<ClCompile Include="..\vp9\encoder\x86\vp9_dct_intrin_sse2.c">
<Filter>Source Files\libvpx\vp9\encoder\x86</Filter>
</ClCompile>
<ClCompile Include="..\vp9\encoder\x86\vp9_diamond_search_sad_avx.c">
<Filter>Source Files\libvpx\vp9\encoder\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\add_noise.c">
<Filter>Source Files\libvpx\vpx_dsp</Filter>
</ClCompile>
Expand Down Expand Up @@ -1436,6 +1442,27 @@
<ClCompile Include="..\vpx_dsp\x86\highbd_sad_avx2.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\avg_pred_avx2.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\inv_txfm_avx2.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx\src\vpx_tpl.c">
<Filter>Source Files\libvpx\vpx</Filter>
</ClCompile>
<ClCompile Include="..\vp9\encoder\vp9_tpl_model.c">
<Filter>Source Files\libvpx\vp9\encoder</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\sse.c">
<Filter>Source Files\libvpx\vpx_dsp</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\sse_sse4.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\sse_avx2.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="libvpx.def">
Expand Down
11 changes: 10 additions & 1 deletion SMP/libvpx_files.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
<ClInclude Include="..\vp9\encoder\vp9_extend.h" />
<ClInclude Include="..\vp9\encoder\vp9_ext_ratectrl.h" />
<ClInclude Include="..\vp9\encoder\vp9_firstpass.h" />
<ClInclude Include="..\vp9\encoder\vp9_firstpass_stats.h" />
<ClInclude Include="..\vp9\encoder\vp9_job_queue.h" />
<ClInclude Include="..\vp9\encoder\vp9_lookahead.h" />
<ClInclude Include="..\vp9\encoder\vp9_mbgraph.h" />
Expand All @@ -124,6 +125,7 @@
<ClInclude Include="..\vp9\encoder\vp9_svc_layercontext.h" />
<ClInclude Include="..\vp9\encoder\vp9_temporal_filter.h" />
<ClInclude Include="..\vp9\encoder\vp9_tokenize.h" />
<ClInclude Include="..\vp9\encoder\vp9_tpl_model.h" />
<ClInclude Include="..\vp9\encoder\vp9_treewriter.h" />
<ClInclude Include="..\vp9\vp9_dx_iface.h" />
<ClInclude Include="..\vp9\vp9_iface_common.h" />
Expand All @@ -137,6 +139,7 @@
<ClInclude Include="..\vpx\vpx_frame_buffer.h" />
<ClInclude Include="..\vpx\vpx_image.h" />
<ClInclude Include="..\vpx\vpx_integer.h" />
<ClInclude Include="..\vpx\vpx_tpl.h" />
<ClInclude Include="..\vpx\internal\vpx_codec_internal.h" />
<ClInclude Include="..\vpx_dsp\bitreader.h" />
<ClInclude Include="..\vpx_dsp\bitreader_buffer.h" />
Expand Down Expand Up @@ -346,11 +349,11 @@
<ClCompile Include="..\vp9\encoder\vp9_svc_layercontext.c" />
<ClCompile Include="..\vp9\encoder\vp9_temporal_filter.c" />
<ClCompile Include="..\vp9\encoder\vp9_tokenize.c" />
<ClCompile Include="..\vp9\encoder\vp9_tpl_model.c" />
<ClCompile Include="..\vp9\encoder\vp9_treewriter.c" />
<ClCompile Include="..\vp9\encoder\x86\highbd_temporal_filter_sse4.c" />
<ClCompile Include="..\vp9\encoder\x86\temporal_filter_sse4.c" />
<ClCompile Include="..\vp9\encoder\x86\vp9_dct_intrin_sse2.c" />
<ClCompile Include="..\vp9\encoder\x86\vp9_diamond_search_sad_avx.c" />
<ClCompile Include="..\vp9\encoder\x86\vp9_error_avx2.c" />
<ClCompile Include="..\vp9\encoder\x86\vp9_frame_scale_ssse3.c" />
<ClCompile Include="..\vp9\encoder\x86\vp9_highbd_block_error_intrin_sse2.c" />
Expand All @@ -364,6 +367,7 @@
<ClCompile Include="..\vpx\src\vpx_decoder.c" />
<ClCompile Include="..\vpx\src\vpx_encoder.c" />
<ClCompile Include="..\vpx\src\vpx_image.c" />
<ClCompile Include="..\vpx\src\vpx_tpl.c" />
<ClCompile Include="..\vpx_dsp\add_noise.c" />
<ClCompile Include="..\vpx_dsp\avg.c" />
<ClCompile Include="..\vpx_dsp\bitreader.c" />
Expand All @@ -379,6 +383,7 @@
<ClCompile Include="..\vpx_dsp\psnr.c" />
<ClCompile Include="..\vpx_dsp\quantize.c" />
<ClCompile Include="..\vpx_dsp\sad.c" />
<ClCompile Include="..\vpx_dsp\sse.c" />
<ClCompile Include="..\vpx_dsp\skin_detection.c" />
<ClCompile Include="..\vpx_dsp\subtract.c" />
<ClCompile Include="..\vpx_dsp\sum_squares.c" />
Expand All @@ -388,6 +393,7 @@
<ClCompile Include="..\vpx_dsp\x86\avg_intrin_avx2.c" />
<ClCompile Include="..\vpx_dsp\x86\avg_intrin_sse2.c" />
<ClCompile Include="..\vpx_dsp\x86\avg_pred_sse2.c" />
<ClCompile Include="..\vpx_dsp\x86\avg_pred_avx2.c" />
<ClCompile Include="..\vpx_dsp\x86\fwd_txfm_avx2.c" />
<ClCompile Include="..\vpx_dsp\x86\fwd_txfm_sse2.c" />
<ClCompile Include="..\vpx_dsp\x86\highbd_convolve_avx2.c" />
Expand All @@ -409,6 +415,7 @@
<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" />
<ClCompile Include="..\vpx_dsp\x86\inv_txfm_avx2.c" />
<ClCompile Include="..\vpx_dsp\x86\loopfilter_avx2.c" />
<ClCompile Include="..\vpx_dsp\x86\loopfilter_sse2.c">
<ObjectFileName>$(IntDir)\vpx_%(Filename).obj</ObjectFileName>
Expand All @@ -424,6 +431,8 @@
<ExcludedFromBuild Condition="'$(VisualStudioVersion)' == '12.0'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\sad_avx2.c" />
<ClCompile Include="..\vpx_dsp\x86\sse_avx2.c" />
<ClCompile Include="..\vpx_dsp\x86\sse_sse4.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" />
Expand Down
33 changes: 30 additions & 3 deletions SMP/libvpx_winrt.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,15 @@
<ClInclude Include="..\vp9\encoder\vp9_ext_ratectrl.h">
<Filter>Header Files\libvpx\vp9\encoder</Filter>
</ClInclude>
<ClInclude Include="..\vp9\encoder\vp9_firstpass_stats.h">
<Filter>Header Files\libvpx\vp9\encoder</Filter>
</ClInclude>
<ClInclude Include="..\vp9\encoder\vp9_tpl_model.h">
<Filter>Header Files\libvpx\vp9\encoder</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vpx_tpl.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\vpx\src\vpx_encoder.c">
Expand Down Expand Up @@ -1274,9 +1283,6 @@
<ClCompile Include="..\vp9\encoder\x86\vp9_dct_intrin_sse2.c">
<Filter>Source Files\libvpx\vp9\encoder\x86</Filter>
</ClCompile>
<ClCompile Include="..\vp9\encoder\x86\vp9_diamond_search_sad_avx.c">
<Filter>Source Files\libvpx\vp9\encoder\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\add_noise.c">
<Filter>Source Files\libvpx\vpx_dsp</Filter>
</ClCompile>
Expand Down Expand Up @@ -1436,6 +1442,27 @@
<ClCompile Include="..\vpx_dsp\x86\highbd_sad_avx2.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\avg_pred_avx2.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\inv_txfm_avx2.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx\src\vpx_tpl.c">
<Filter>Source Files\libvpx\vpx</Filter>
</ClCompile>
<ClCompile Include="..\vp9\encoder\vp9_tpl_model.c">
<Filter>Source Files\libvpx\vp9\encoder</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\sse.c">
<Filter>Source Files\libvpx\vpx_dsp</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\sse_sse4.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
<ClCompile Include="..\vpx_dsp\x86\sse_avx2.c">
<Filter>Source Files\libvpx\vpx_dsp\x86</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="libvpx.def">
Expand Down
10 changes: 7 additions & 3 deletions SMP/vpx_config.asm
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
VPX_ARCH_ARM equ 0
VPX_ARCH_AARCH64 equ 0
VPX_ARCH_MIPS equ 0
%ifidn __OUTPUT_FORMAT__,win64
VPX_ARCH_X86 equ 0
Expand All @@ -12,8 +13,11 @@ VPX_ARCH_X86_64 equ 0
%endif
VPX_ARCH_PPC equ 0
VPX_ARCH_LOONGARCH equ 0
HAVE_NEON equ 0
HAVE_NEON_ASM equ 0
HAVE_NEON equ 0
HAVE_NEON_DOTPROD equ 0
HAVE_NEON_I8MM equ 0
HAVE_SVE equ 0
HAVE_MIPS32 equ 0
HAVE_DSPR2 equ 0
HAVE_MSA equ 0
Expand Down Expand Up @@ -46,7 +50,7 @@ CONFIG_GCOV equ 0
CONFIG_RVCT equ 0
CONFIG_GCC equ 0
CONFIG_MSVS equ 1
CONFIG_PIC equ 0
CONFIG_PIC equ 1
CONFIG_BIG_ENDIAN equ 0
CONFIG_CODEC_SRCS equ 0
CONFIG_DEBUG_LIBS equ 0
Expand Down Expand Up @@ -83,7 +87,6 @@ CONFIG_ENCODE_PERF_TESTS equ 0
CONFIG_MULTI_RES_ENCODING equ 0
CONFIG_TEMPORAL_DENOISING equ 1
CONFIG_VP9_TEMPORAL_DENOISING equ 0
CONFIG_CONSISTENT_RECODE equ 0
CONFIG_COEFFICIENT_RANGE_CHECKING equ 0
CONFIG_VP9_HIGHBITDEPTH equ 1
CONFIG_BETTER_HW_COMPATIBILITY equ 0
Expand All @@ -96,3 +99,4 @@ CONFIG_FP_MB_STATS equ 0
CONFIG_EMULATE_HARDWARE equ 0
CONFIG_NON_GREEDY_MV equ 0
CONFIG_RATE_CTRL equ 0
CONFIG_COLLECT_COMPONENT_TIMING equ 0
10 changes: 7 additions & 3 deletions SMP/vpx_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#define RESTRICT
#define INLINE __inline
#define VPX_ARCH_ARM 0
#define VPX_ARCH_AARCH64 0
#define VPX_ARCH_MIPS 0
#if defined(__x86_64) || defined(_M_X64)
#define VPX_ARCH_X86 0
Expand All @@ -21,8 +22,11 @@
#endif
#define VPX_ARCH_PPC 0
#define VPX_ARCH_LOONGARCH 0
#define HAVE_NEON 0
#define HAVE_NEON_ASM 0
#define HAVE_NEON 0
#define HAVE_NEON_DOTPROD 0
#define HAVE_NEON_I8MM 0
#define HAVE_SVE 0
#define HAVE_MIPS32 0
#define HAVE_DSPR2 0
#define HAVE_MSA 0
Expand Down Expand Up @@ -59,7 +63,7 @@
#define CONFIG_RVCT 0
#define CONFIG_GCC 0
#define CONFIG_MSVS 1
#define CONFIG_PIC 0
#define CONFIG_PIC 1
#define CONFIG_BIG_ENDIAN 0
#define CONFIG_CODEC_SRCS 0
#define CONFIG_DEBUG_LIBS 0
Expand Down Expand Up @@ -105,7 +109,6 @@
#define CONFIG_MULTI_RES_ENCODING 0
#define CONFIG_TEMPORAL_DENOISING 1
#define CONFIG_VP9_TEMPORAL_DENOISING 0
#define CONFIG_CONSISTENT_RECODE 0
#define CONFIG_COEFFICIENT_RANGE_CHECKING 0
#define CONFIG_VP9_HIGHBITDEPTH 1
#define CONFIG_BETTER_HW_COMPATIBILITY 0
Expand All @@ -118,4 +121,5 @@
#define CONFIG_EMULATE_HARDWARE 0
#define CONFIG_NON_GREEDY_MV 0
#define CONFIG_RATE_CTRL 0
#define CONFIG_COLLECT_COMPONENT_TIMING 0
#endif /* VPX_CONFIG_H */
8 changes: 4 additions & 4 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 13
#define VERSION_PATCH 1
#define VERSION_MINOR 14
#define VERSION_PATCH 0
#define VERSION_EXTRA ""
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
#define VERSION_STRING_NOSP "v1.13.1"
#define VERSION_STRING " v1.13.1"
#define VERSION_STRING_NOSP "v1.14.0"
#define VERSION_STRING " v1.14.0"
9 changes: 0 additions & 9 deletions SMP/x86/vp8_rtcd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,6 @@ void vp8_bilinear_predict8x8_sse2(unsigned char *src_ptr, int src_pixels_per_lin
void vp8_bilinear_predict8x8_ssse3(unsigned char *src_ptr, int src_pixels_per_line, int xoffset, int yoffset, unsigned char *dst_ptr, int dst_pitch);
RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char *src_ptr, int src_pixels_per_line, int xoffset, int yoffset, unsigned char *dst_ptr, int dst_pitch);

void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y_1, int u_1, int v_1, int alpha, int stride);
#define vp8_blend_b vp8_blend_b_c

void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, int y_1, int u_1, int v_1, int alpha, int stride);
#define vp8_blend_mb_inner vp8_blend_mb_inner_c

void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, int y_1, int u_1, int v_1, int alpha, int stride);
#define vp8_blend_mb_outer vp8_blend_mb_outer_c

int vp8_block_error_c(short *coeff, short *dqcoeff);
int vp8_block_error_sse2(short *coeff, short *dqcoeff);
RTCD_EXTERN int (*vp8_block_error)(short *coeff, short *dqcoeff);
Expand Down
Loading

0 comments on commit f4d1314

Please sign in to comment.