[FFmpeg-cvslog] avcodec: add missing FF_API_OLD_ENCDEC wrappers to xmm clobber functions

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Feb 26 19:22:42 2021 -0300| [f1a894f9d3767eca9a4fbd10ac4312262d3f2968] | committer: James Almer

avcodec: add missing FF_API_OLD_ENCDEC wrappers to xmm clobber functions

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f1a894f9d3767eca9a4fbd10ac4312262d3f2968
---

 libavcodec/aarch64/neontest.c | 32 +++++++++++++++++---------------
 libavcodec/arm/neontest.c     | 32 +++++++++++++++++---------------
 libavcodec/x86/w64xmmtest.c   | 32 +++++++++++++++++---------------
 3 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/libavcodec/aarch64/neontest.c b/libavcodec/aarch64/neontest.c
index a24c22dd30..a4fc5a0e2f 100644
--- a/libavcodec/aarch64/neontest.c
+++ b/libavcodec/aarch64/neontest.c
@@ -29,6 +29,7 @@ wrap(avcodec_open2(AVCodecContext *avctx,
     testneonclobbers(avcodec_open2, avctx, codec, options);
 }
 
+#if FF_API_OLD_ENCDEC
 wrap(avcodec_decode_audio4(AVCodecContext *avctx,
                            AVFrame *frame,
                            int *got_frame_ptr,
@@ -47,15 +48,6 @@ wrap(avcodec_decode_video2(AVCodecContext *avctx,
                      got_picture_ptr, avpkt);
 }
 
-wrap(avcodec_decode_subtitle2(AVCodecContext *avctx,
-                              AVSubtitle *sub,
-                              int *got_sub_ptr,
-                              AVPacket *avpkt))
-{
-    testneonclobbers(avcodec_decode_subtitle2, avctx, sub,
-                     got_sub_ptr, avpkt);
-}
-
 wrap(avcodec_encode_audio2(AVCodecContext *avctx,
                            AVPacket *avpkt,
                            const AVFrame *frame,
@@ -65,6 +57,22 @@ wrap(avcodec_encode_audio2(AVCodecContext *avctx,
                      got_packet_ptr);
 }
 
+wrap(avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
+                           const AVFrame *frame, int *got_packet_ptr))
+{
+    testneonclobbers(avcodec_encode_video2, avctx, avpkt, frame, got_packet_ptr);
+}
+#endif
+
+wrap(avcodec_decode_subtitle2(AVCodecContext *avctx,
+                              AVSubtitle *sub,
+                              int *got_sub_ptr,
+                              AVPacket *avpkt))
+{
+    testneonclobbers(avcodec_decode_subtitle2, avctx, sub,
+                     got_sub_ptr, avpkt);
+}
+
 wrap(avcodec_encode_subtitle(AVCodecContext *avctx,
                              uint8_t *buf, int buf_size,
                              const AVSubtitle *sub))
@@ -72,12 +80,6 @@ wrap(avcodec_encode_subtitle(AVCodecContext *avctx,
     testneonclobbers(avcodec_encode_subtitle, avctx, buf, buf_size, sub);
 }
 
-wrap(avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
-                           const AVFrame *frame, int *got_packet_ptr))
-{
-    testneonclobbers(avcodec_encode_video2, avctx, avpkt, frame, got_packet_ptr);
-}
-
 wrap(avcodec_send_packet(AVCodecContext *avctx, const AVPacket *avpkt))
 {
     testneonclobbers(avcodec_send_packet, avctx, avpkt);
diff --git a/libavcodec/arm/neontest.c b/libavcodec/arm/neontest.c
index f9c0dbf12e..d1ede4955c 100644
--- a/libavcodec/arm/neontest.c
+++ b/libavcodec/arm/neontest.c
@@ -29,6 +29,7 @@ wrap(avcodec_open2(AVCodecContext *avctx,
     testneonclobbers(avcodec_open2, avctx, codec, options);
 }
 
+#if FF_API_OLD_ENCDEC
 wrap(avcodec_decode_audio4(AVCodecContext *avctx,
                            AVFrame *frame,
                            int *got_frame_ptr,
@@ -47,15 +48,6 @@ wrap(avcodec_decode_video2(AVCodecContext *avctx,
                      got_picture_ptr, avpkt);
 }
 
-wrap(avcodec_decode_subtitle2(AVCodecContext *avctx,
-                              AVSubtitle *sub,
-                              int *got_sub_ptr,
-                              AVPacket *avpkt))
-{
-    testneonclobbers(avcodec_decode_subtitle2, avctx, sub,
-                     got_sub_ptr, avpkt);
-}
-
 wrap(avcodec_encode_audio2(AVCodecContext *avctx,
                            AVPacket *avpkt,
                            const AVFrame *frame,
@@ -65,6 +57,22 @@ wrap(avcodec_encode_audio2(AVCodecContext *avctx,
                      got_packet_ptr);
 }
 
+wrap(avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
+                           const AVFrame *frame, int *got_packet_ptr))
+{
+    testneonclobbers(avcodec_encode_video2, avctx, avpkt, frame, got_packet_ptr);
+}
+#endif
+
+wrap(avcodec_decode_subtitle2(AVCodecContext *avctx,
+                              AVSubtitle *sub,
+                              int *got_sub_ptr,
+                              AVPacket *avpkt))
+{
+    testneonclobbers(avcodec_decode_subtitle2, avctx, sub,
+                     got_sub_ptr, avpkt);
+}
+
 wrap(avcodec_encode_subtitle(AVCodecContext *avctx,
                              uint8_t *buf, int buf_size,
                              const AVSubtitle *sub))
@@ -72,12 +80,6 @@ wrap(avcodec_encode_subtitle(AVCodecContext *avctx,
     testneonclobbers(avcodec_encode_subtitle, avctx, buf, buf_size, sub);
 }
 
-wrap(avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
-                           const AVFrame *frame, int *got_packet_ptr))
-{
-    testneonclobbers(avcodec_encode_video2, avctx, avpkt, frame, got_packet_ptr);
-}
-
 wrap(avcodec_send_packet(AVCodecContext *avctx, const AVPacket *avpkt))
 {
     testneonclobbers(avcodec_send_packet, avctx, avpkt);
diff --git a/libavcodec/x86/w64xmmtest.c b/libavcodec/x86/w64xmmtest.c
index 8f2b8a6299..d0782b9408 100644
--- a/libavcodec/x86/w64xmmtest.c
+++ b/libavcodec/x86/w64xmmtest.c
@@ -29,6 +29,7 @@ wrap(avcodec_open2(AVCodecContext *avctx,
     testxmmclobbers(avcodec_open2, avctx, codec, options);
 }
 
+#if FF_API_OLD_ENCDEC
 wrap(avcodec_decode_audio4(AVCodecContext *avctx,
                            AVFrame *frame,
                            int *got_frame_ptr,
@@ -47,15 +48,6 @@ wrap(avcodec_decode_video2(AVCodecContext *avctx,
                     got_picture_ptr, avpkt);
 }
 
-wrap(avcodec_decode_subtitle2(AVCodecContext *avctx,
-                              AVSubtitle *sub,
-                              int *got_sub_ptr,
-                              AVPacket *avpkt))
-{
-    testxmmclobbers(avcodec_decode_subtitle2, avctx, sub,
-                    got_sub_ptr, avpkt);
-}
-
 wrap(avcodec_encode_audio2(AVCodecContext *avctx,
                            AVPacket *avpkt,
                            const AVFrame *frame,
@@ -65,6 +57,22 @@ wrap(avcodec_encode_audio2(AVCodecContext *avctx,
                     got_packet_ptr);
 }
 
+wrap(avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
+                           const AVFrame *frame, int *got_packet_ptr))
+{
+    testxmmclobbers(avcodec_encode_video2, avctx, avpkt, frame, got_packet_ptr);
+}
+#endif
+
+wrap(avcodec_decode_subtitle2(AVCodecContext *avctx,
+                              AVSubtitle *sub,
+                              int *got_sub_ptr,
+                              AVPacket *avpkt))
+{
+    testxmmclobbers(avcodec_decode_subtitle2, avctx, sub,
+                    got_sub_ptr, avpkt);
+}
+
 wrap(avcodec_encode_subtitle(AVCodecContext *avctx,
                              uint8_t *buf, int buf_size,
                              const AVSubtitle *sub))
@@ -72,12 +80,6 @@ wrap(avcodec_encode_subtitle(AVCodecContext *avctx,
     testxmmclobbers(avcodec_encode_subtitle, avctx, buf, buf_size, sub);
 }
 
-wrap(avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
-                           const AVFrame *frame, int *got_packet_ptr))
-{
-    testxmmclobbers(avcodec_encode_video2, avctx, avpkt, frame, got_packet_ptr);
-}
-
 wrap(avcodec_send_packet(AVCodecContext *avctx, const AVPacket *avpkt))
 {
     testxmmclobbers(avcodec_send_packet, avctx, avpkt);