update to FFmpeg 4.3.2, from Brad

This commit is contained in:
sthen 2021-02-23 14:30:04 +00:00
parent 95dac013da
commit 653d574c4d
7 changed files with 7 additions and 307 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.206 2020/11/05 19:42:28 sthen Exp $
# $OpenBSD: Makefile,v 1.207 2021/02/23 14:30:04 sthen Exp $
COMMENT= audio/video converter and streamer
V= 4.3.1
V= 4.3.2
DISTNAME= ffmpeg-${V}
REVISION= 0
EPOCH= 1
CATEGORIES= graphics multimedia
MASTER_SITES= https://ffmpeg.org/releases/

View File

@ -1,2 +1,2 @@
SHA256 (ffmpeg-4.3.1.tar.xz) = rQCSQNRuMHtOA6IToPScEbZQ5EWx+L4N2iqSErNNL/s=
SIZE (ffmpeg-4.3.1.tar.xz) = 9379424
SHA256 (ffmpeg-4.3.2.tar.xz) = RuTmTx3QIzy8CTS58cDaZ2AIytNHJRE/t/gCz6hMzds=
SIZE (ffmpeg-4.3.2.tar.xz) = 9391100

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-libavcodec_x86_h264_deblock_asm,v 1.1 2020/10/04 18:33:40 sthen Exp $
x86/h264_deblock: fix warning about trailing empty parameter.
Index: libavcodec/x86/h264_deblock.asm
--- libavcodec/x86/h264_deblock.asm.orig
+++ libavcodec/x86/h264_deblock.asm
@@ -1185,7 +1185,7 @@ cglobal deblock_h_chroma_8, 5, 7, 8, 0-16, pix_, strid
STORE_8_ROWS PASS8ROWS(pix_q - 2, r5 - 2, stride_q, r6)
RET
-cglobal deblock_h_chroma422_8, 5, 7, 8, 0-16, pix_, stride_, alpha_, beta_, tc0_,
+cglobal deblock_h_chroma422_8, 5, 7, 8, 0-16, pix_, stride_, alpha_, beta_, tc0_
CHROMA_H_START_XMM r5, r6
LOAD_8_ROWS PASS8ROWS(pix_q - 2, r5 - 2, stride_q, r6)
TRANSPOSE_8x4B_XMM

View File

@ -1,136 +0,0 @@
$OpenBSD: patch-libavfilter_x86_vf_blend_asm,v 1.1 2020/10/04 18:33:40 sthen Exp $
x86/vf_blend: fix warnings about trailing empty parameters.
Index: libavfilter/x86/vf_blend.asm
--- libavfilter/x86/vf_blend.asm.orig
+++ libavfilter/x86/vf_blend.asm
@@ -38,11 +38,11 @@ pb_255: times 16 db 255
SECTION .text
-%macro BLEND_INIT 2-3
+%macro BLEND_INIT 2-3 0
%if ARCH_X86_64
cglobal blend_%1, 6, 9, %2, top, top_linesize, bottom, bottom_linesize, dst, dst_linesize, width, end, x
mov widthd, dword widthm
- %if %0 == 3; is 16 bit
+ %if %3; is 16 bit
add widthq, widthq ; doesn't compile on x86_32
%endif
%else
@@ -66,7 +66,7 @@ cglobal blend_%1, 5, 7, %2, top, top_linesize, bottom,
REP_RET
%endmacro
-%macro BLEND_SIMPLE 2-3
+%macro BLEND_SIMPLE 2-3 0
BLEND_INIT %1, 2, %3
.nextrow:
mov xq, widthq
@@ -82,10 +82,10 @@ BLEND_END
%endmacro
; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit)
-%macro GRAINEXTRACT 3-4
+%macro GRAINEXTRACT 3-4 0
BLEND_INIT %1, 6, %4
pxor m4, m4
-%if %0 == 4 ; 16 bit
+%if %4 ; 16 bit
VBROADCASTI128 m5, [pd_32768]
%else
VBROADCASTI128 m5, [pw_128]
@@ -182,7 +182,7 @@ BLEND_END
%endmacro
;%1 name, %2 (b or w), %3 (set if 16 bit)
-%macro AVERAGE 2-3
+%macro AVERAGE 2-3 0
BLEND_INIT %1, 3, %3
pcmpeqb m2, m2
@@ -203,10 +203,10 @@ BLEND_END
%endmacro
; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit)
-%macro GRAINMERGE 3-4
+%macro GRAINMERGE 3-4 0
BLEND_INIT %1, 6, %4
pxor m4, m4
-%if %0 == 4 ; 16 bit
+%if %4 ; 16 bit
VBROADCASTI128 m5, [pd_32768]
%else
VBROADCASTI128 m5, [pw_128]
@@ -288,7 +288,7 @@ BLEND_INIT divide, 4
BLEND_END
%endmacro
-%macro PHOENIX 2-3
+%macro PHOENIX 2-3 0
; %1 name, %2 b or w, %3 (opt) 1 if 16 bit
BLEND_INIT %1, 4, %3
VBROADCASTI128 m3, [pb_255]
@@ -311,7 +311,7 @@ BLEND_END
%endmacro
; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit)
-%macro DIFFERENCE 3-4
+%macro DIFFERENCE 3-4 0
BLEND_INIT %1, 5, %4
pxor m2, m2
.nextrow:
@@ -326,7 +326,7 @@ BLEND_INIT %1, 5, %4
punpckl%2%3 m1, m2
psub%3 m0, m1
psub%3 m3, m4
-%if %0 == 4; 16 bit
+%if %4; 16 bit
pabsd m0, m0
pabsd m3, m3
%else
@@ -340,10 +340,10 @@ BLEND_END
%endmacro
; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit)
-%macro EXTREMITY 3-4
+%macro EXTREMITY 3-4 0
BLEND_INIT %1, 8, %4
pxor m2, m2
-%if %0 == 4; 16 bit
+%if %4; 16 bit
VBROADCASTI128 m4, [pd_65535]
%else
VBROADCASTI128 m4, [pw_255]
@@ -362,7 +362,7 @@ BLEND_INIT %1, 8, %4
psub%3 m7, m4, m5
psub%3 m3, m1
psub%3 m7, m6
-%if %0 == 4; 16 bit
+%if %4; 16 bit
pabsd m3, m3
pabsd m7, m7
%else
@@ -375,10 +375,10 @@ BLEND_INIT %1, 8, %4
BLEND_END
%endmacro
-%macro NEGATION 3-4
+%macro NEGATION 3-4 0
BLEND_INIT %1, 8, %4
pxor m2, m2
-%if %0 == 4; 16 bit
+%if %4; 16 bit
VBROADCASTI128 m4, [pd_65535]
%else
VBROADCASTI128 m4, [pw_255]
@@ -397,7 +397,7 @@ BLEND_INIT %1, 8, %4
psub%3 m7, m4, m5
psub%3 m3, m1
psub%3 m7, m6
-%if %0 == 4; 16 bit
+%if %4; 16 bit
pabsd m3, m3
pabsd m7, m7
%else

View File

@ -1,102 +0,0 @@
$OpenBSD: patch-libavutil_x86_x86inc_asm,v 1.1 2020/10/04 18:33:40 sthen Exp $
avutil/x86inc: fix warnings when assembling with Nasm 2.15.
Index: libavutil/x86/x86inc.asm
--- libavutil/x86/x86inc.asm.orig
+++ libavutil/x86/x86inc.asm
@@ -411,16 +411,6 @@ DECLARE_REG_TMP_SIZE 0,1,2,3,4,5,6,7,8,9,10,11,12,13,1
%endif
%endmacro
-%macro DEFINE_ARGS_INTERNAL 3+
- %ifnum %2
- DEFINE_ARGS %3
- %elif %1 == 4
- DEFINE_ARGS %2
- %elif %1 > 4
- DEFINE_ARGS %2, %3
- %endif
-%endmacro
-
%if WIN64 ; Windows x64 ;=================================================
DECLARE_REG 0, rcx
@@ -439,7 +429,7 @@ DECLARE_REG 12, R15, 104
DECLARE_REG 13, R12, 112
DECLARE_REG 14, R13, 120
-%macro PROLOGUE 2-5+ 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
+%macro PROLOGUE 2-5+ 0, 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
%assign num_args %1
%assign regs_used %2
ASSERT regs_used >= num_args
@@ -451,7 +441,15 @@ DECLARE_REG 14, R13, 120
WIN64_SPILL_XMM %3
%endif
LOAD_IF_USED 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
- DEFINE_ARGS_INTERNAL %0, %4, %5
+ %if %0 > 4
+ %ifnum %4
+ DEFINE_ARGS %5
+ %else
+ DEFINE_ARGS %4, %5
+ %endif
+ %elifnnum %4
+ DEFINE_ARGS %4
+ %endif
%endmacro
%macro WIN64_PUSH_XMM 0
@@ -547,7 +545,7 @@ DECLARE_REG 12, R15, 56
DECLARE_REG 13, R12, 64
DECLARE_REG 14, R13, 72
-%macro PROLOGUE 2-5+ 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
+%macro PROLOGUE 2-5+ 0, 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
%assign num_args %1
%assign regs_used %2
%assign xmm_regs_used %3
@@ -557,7 +555,15 @@ DECLARE_REG 14, R13, 72
PUSH_IF_USED 9, 10, 11, 12, 13, 14
ALLOC_STACK %4
LOAD_IF_USED 6, 7, 8, 9, 10, 11, 12, 13, 14
- DEFINE_ARGS_INTERNAL %0, %4, %5
+ %if %0 > 4
+ %ifnum %4
+ DEFINE_ARGS %5
+ %else
+ DEFINE_ARGS %4, %5
+ %endif
+ %elifnnum %4
+ DEFINE_ARGS %4
+ %endif
%endmacro
%define has_epilogue regs_used > 9 || stack_size > 0 || vzeroupper_required
@@ -598,7 +604,7 @@ DECLARE_REG 6, ebp, 28
DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14
-%macro PROLOGUE 2-5+ ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
+%macro PROLOGUE 2-5+ 0, 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
%assign num_args %1
%assign regs_used %2
ASSERT regs_used >= num_args
@@ -613,7 +619,15 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14
PUSH_IF_USED 3, 4, 5, 6
ALLOC_STACK %4
LOAD_IF_USED 0, 1, 2, 3, 4, 5, 6
- DEFINE_ARGS_INTERNAL %0, %4, %5
+ %if %0 > 4
+ %ifnum %4
+ DEFINE_ARGS %5
+ %else
+ DEFINE_ARGS %4, %5
+ %endif
+ %elifnnum %4
+ DEFINE_ARGS %4
+ %endif
%endmacro
%define has_epilogue regs_used > 3 || stack_size > 0 || vzeroupper_required

View File

@ -1,46 +0,0 @@
$OpenBSD: patch-libswscale_x86_yuv_2_rgb_asm,v 1.1 2020/10/04 18:33:40 sthen Exp $
x86/yuv2rgb: fix crashes when storing data on unaligned buffers
Index: libswscale/x86/yuv_2_rgb.asm
--- libswscale/x86/yuv_2_rgb.asm.orig
+++ libswscale/x86/yuv_2_rgb.asm
@@ -268,9 +268,9 @@ cglobal %1_420_%2%3, GPR_num, GPR_num, reg_num, parame
por m2, m7
por m1, m6 ; g5 b5 r6 g6 b6 r7 g7 b7 r8 g8 b8 r9 g9 b9 r10 g10
por m2, m3 ; b10 r11 g11 b11 r12 g12 b12 r13 g13 b13 r14 g14 b14 r15 g15 b15
- mova [imageq], m0
- mova [imageq + 16], m1
- mova [imageq + 32], m2
+ movu [imageq], m0
+ movu [imageq + 16], m1
+ movu [imageq + 32], m2
%endif ; mmsize = 16
%else ; PACK RGB15/16/32
packuswb m0, m1
@@ -300,10 +300,10 @@ cglobal %1_420_%2%3, GPR_num, GPR_num, reg_num, parame
punpckhwd m_green, m_red
punpcklwd m5, m6
punpckhwd m_alpha, m6
- mova [imageq + 0], m_blue
- mova [imageq + 8 * time_num], m_green
- mova [imageq + 16 * time_num], m5
- mova [imageq + 24 * time_num], m_alpha
+ movu [imageq + 0], m_blue
+ movu [imageq + 8 * time_num], m_green
+ movu [imageq + 16 * time_num], m5
+ movu [imageq + 24 * time_num], m_alpha
%else ; PACK RGB15/16
%define depth 2
%if cpuflag(ssse3)
@@ -342,8 +342,8 @@ cglobal %1_420_%2%3, GPR_num, GPR_num, reg_num, parame
mova m2, m0
punpcklbw m0, m1
punpckhbw m2, m1
- mova [imageq], m0
- mova [imageq + 8 * time_num], m2
+ movu [imageq], m0
+ movu [imageq + 8 * time_num], m2
%endif ; PACK RGB15/16
%endif ; PACK RGB15/16/32

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.311 2021/02/06 21:46:32 sthen Exp $
# $OpenBSD: Makefile,v 1.312 2021/02/23 14:30:05 sthen Exp $
COMMENT= movie player supporting many formats
V= 20210124
FFMPEG_V= 4.3.1
FFMPEG_V= 4.3.2
DISTNAME= mplayer-${V}
REVISION= 0
CATEGORIES= x11 multimedia
MASTER_SITES= https://comstyle.com/source/
EXTRACT_SUFX= .tar.xz