[FFmpeg-devel] [PATCH 2/2] libavcodec/libvpxenc: move libvpx-vp9 init_static_data function to the only place it's used

[James Almer <jamrial@gmail.com>]

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/Makefile    |  4 +--
 libavcodec/libvpx.c    | 81 ------------------------------------------
 libavcodec/libvpx.h    | 10 ------
 libavcodec/libvpxenc.c | 41 ++++++++++++++++++++-
 4 files changed, 42 insertions(+), 94 deletions(-)
 delete mode 100644 libavcodec/libvpx.c

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 389253f5d0..6c797b8e14 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1121,8 +1121,8 @@ OBJS-$(CONFIG_LIBVORBIS_ENCODER)          += libvorbisenc.o \
                                              vorbis_data.o
 OBJS-$(CONFIG_LIBVPX_VP8_DECODER)         += libvpxdec.o
 OBJS-$(CONFIG_LIBVPX_VP8_ENCODER)         += libvpxenc.o
-OBJS-$(CONFIG_LIBVPX_VP9_DECODER)         += libvpxdec.o libvpx.o
-OBJS-$(CONFIG_LIBVPX_VP9_ENCODER)         += libvpxenc.o libvpx.o
+OBJS-$(CONFIG_LIBVPX_VP9_DECODER)         += libvpxdec.o
+OBJS-$(CONFIG_LIBVPX_VP9_ENCODER)         += libvpxenc.o
 OBJS-$(CONFIG_LIBWEBP_ENCODER)            += libwebpenc_common.o libwebpenc.o
 OBJS-$(CONFIG_LIBWEBP_ANIM_ENCODER)       += libwebpenc_common.o libwebpenc_animencoder.o
 OBJS-$(CONFIG_LIBX262_ENCODER)            += libx264.o
diff --git a/libavcodec/libvpx.c b/libavcodec/libvpx.c
deleted file mode 100644
index 8601f82bd2..0000000000
--- a/libavcodec/libvpx.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2013 Guillaume Martres <smarter@ubuntu.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <vpx/vpx_codec.h>
-#include "libvpx.h"
-#include "config.h"
-#include "config_components.h"
-
-#if CONFIG_LIBVPX_VP9_ENCODER
-#include <vpx/vpx_encoder.h>
-#include <vpx/vp8cx.h>
-#endif
-
-static const enum AVPixelFormat vp9_pix_fmts_def[] = {
-    AV_PIX_FMT_YUV420P,
-    AV_PIX_FMT_YUVA420P,
-    AV_PIX_FMT_NONE
-};
-
-#if CONFIG_LIBVPX_VP9_ENCODER
-static const enum AVPixelFormat vp9_pix_fmts_highcol[] = {
-    AV_PIX_FMT_YUV420P,
-    AV_PIX_FMT_YUVA420P,
-    AV_PIX_FMT_YUV422P,
-    AV_PIX_FMT_YUV440P,
-    AV_PIX_FMT_YUV444P,
-    AV_PIX_FMT_GBRP,
-    AV_PIX_FMT_NONE
-};
-
-static const enum AVPixelFormat vp9_pix_fmts_highbd[] = {
-    AV_PIX_FMT_YUV420P,
-    AV_PIX_FMT_YUVA420P,
-    AV_PIX_FMT_YUV422P,
-    AV_PIX_FMT_YUV440P,
-    AV_PIX_FMT_YUV444P,
-    AV_PIX_FMT_YUV420P10,
-    AV_PIX_FMT_YUV422P10,
-    AV_PIX_FMT_YUV440P10,
-    AV_PIX_FMT_YUV444P10,
-    AV_PIX_FMT_YUV420P12,
-    AV_PIX_FMT_YUV422P12,
-    AV_PIX_FMT_YUV440P12,
-    AV_PIX_FMT_YUV444P12,
-    AV_PIX_FMT_GBRP,
-    AV_PIX_FMT_GBRP10,
-    AV_PIX_FMT_GBRP12,
-    AV_PIX_FMT_NONE
-};
-#endif
-
-av_cold void ff_vp9_init_static(FFCodec *codec)
-{
-    codec->p.pix_fmts = vp9_pix_fmts_def;
-#if CONFIG_LIBVPX_VP9_ENCODER
-    {
-        vpx_codec_caps_t codec_caps = vpx_codec_get_caps(vpx_codec_vp9_cx());
-        if (codec_caps & VPX_CODEC_CAP_HIGHBITDEPTH)
-            codec->p.pix_fmts = vp9_pix_fmts_highbd;
-        else
-            codec->p.pix_fmts = vp9_pix_fmts_highcol;
-    }
-#endif
-}
diff --git a/libavcodec/libvpx.h b/libavcodec/libvpx.h
index 331feb8745..4671e0edef 100644
--- a/libavcodec/libvpx.h
+++ b/libavcodec/libvpx.h
@@ -21,16 +21,6 @@
 #ifndef AVCODEC_LIBVPX_H
 #define AVCODEC_LIBVPX_H
 
-#include <vpx/vpx_codec.h>
-
-#include "codec_internal.h"
-
 #define MAX_VPX_THREADS 64
 
-void ff_vp9_init_static(FFCodec *codec);
-#if 0
-enum AVPixelFormat ff_vpx_imgfmt_to_pixfmt(vpx_img_fmt_t img);
-vpx_img_fmt_t ff_vpx_pixfmt_to_imgfmt(enum AVPixelFormat pix);
-#endif
-
 #endif /* AVCODEC_LIBVPX_H */
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index 339d4d8146..5e6467a3d0 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -1979,6 +1979,45 @@ static av_cold int vp9_init(AVCodecContext *avctx)
     return vpx_init(avctx, vpx_codec_vp9_cx());
 }
 
+static const enum AVPixelFormat vp9_pix_fmts_highcol[] = {
+    AV_PIX_FMT_YUV420P,
+    AV_PIX_FMT_YUVA420P,
+    AV_PIX_FMT_YUV422P,
+    AV_PIX_FMT_YUV440P,
+    AV_PIX_FMT_YUV444P,
+    AV_PIX_FMT_GBRP,
+    AV_PIX_FMT_NONE
+};
+
+static const enum AVPixelFormat vp9_pix_fmts_highbd[] = {
+    AV_PIX_FMT_YUV420P,
+    AV_PIX_FMT_YUVA420P,
+    AV_PIX_FMT_YUV422P,
+    AV_PIX_FMT_YUV440P,
+    AV_PIX_FMT_YUV444P,
+    AV_PIX_FMT_YUV420P10,
+    AV_PIX_FMT_YUV422P10,
+    AV_PIX_FMT_YUV440P10,
+    AV_PIX_FMT_YUV444P10,
+    AV_PIX_FMT_YUV420P12,
+    AV_PIX_FMT_YUV422P12,
+    AV_PIX_FMT_YUV440P12,
+    AV_PIX_FMT_YUV444P12,
+    AV_PIX_FMT_GBRP,
+    AV_PIX_FMT_GBRP10,
+    AV_PIX_FMT_GBRP12,
+    AV_PIX_FMT_NONE
+};
+
+static av_cold void vp9_init_static(FFCodec *codec)
+{
+    vpx_codec_caps_t codec_caps = vpx_codec_get_caps(vpx_codec_vp9_cx());
+    if (codec_caps & VPX_CODEC_CAP_HIGHBITDEPTH)
+        codec->p.pix_fmts = vp9_pix_fmts_highbd;
+    else
+        codec->p.pix_fmts = vp9_pix_fmts_highcol;
+}
+
 static const AVClass class_vp9 = {
     .class_name = "libvpx-vp9 encoder",
     .item_name  = av_default_item_name,
@@ -2003,6 +2042,6 @@ FFCodec ff_libvpx_vp9_encoder = {
     .caps_internal  = FF_CODEC_CAP_NOT_INIT_THREADSAFE |
                       FF_CODEC_CAP_AUTO_THREADS,
     .defaults       = defaults,
-    .init_static_data = ff_vp9_init_static,
+    .init_static_data = vp9_init_static,
 };
 #endif /* CONFIG_LIBVPX_VP9_ENCODER */
-- 
2.39.2

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".