From 8ce39a2aa6c76c559c272a757b0ff7bfcb9b9ac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Mon, 30 Oct 2023 17:02:42 +0100 Subject: [PATCH] Prune some useless imports from Cython code --- av/audio/codeccontext.pyx | 1 - av/audio/fifo.pyx | 2 -- av/audio/frame.pyx | 1 - av/audio/plane.pyx | 2 -- av/codec/codec.pyx | 2 +- av/codec/context.pyx | 2 +- av/container/core.pyx | 5 ----- av/container/output.pyx | 1 - av/enum.pyx | 2 -- av/filter/context.pyx | 6 ++---- av/frame.pyx | 2 -- av/logging.pyx | 2 +- av/stream.pxd | 1 - av/stream.pyx | 4 ---- av/subtitles/codeccontext.pyx | 1 - av/utils.pxd | 2 +- av/utils.pyx | 2 +- av/video/frame.pxd | 2 +- av/video/frame.pyx | 2 +- include/libavcodec/avcodec.pxd | 7 +------ include/libavutil/motion_vector.pxd | 7 +------ include/libswresample/swresample.pxd | 1 + 22 files changed, 12 insertions(+), 45 deletions(-) diff --git a/av/audio/codeccontext.pyx b/av/audio/codeccontext.pyx index c81a49dd8..8446fbcd0 100644 --- a/av/audio/codeccontext.pyx +++ b/av/audio/codeccontext.pyx @@ -3,7 +3,6 @@ cimport libav as lib from av.audio.format cimport AudioFormat, get_audio_format from av.audio.frame cimport AudioFrame, alloc_audio_frame from av.audio.layout cimport AudioLayout, get_audio_layout -from av.error cimport err_check from av.frame cimport Frame from av.packet cimport Packet diff --git a/av/audio/fifo.pyx b/av/audio/fifo.pyx index 6d1d17bd7..9b95d5770 100644 --- a/av/audio/fifo.pyx +++ b/av/audio/fifo.pyx @@ -1,6 +1,4 @@ -from av.audio.format cimport get_audio_format from av.audio.frame cimport alloc_audio_frame -from av.audio.layout cimport get_audio_layout from av.error cimport err_check diff --git a/av/audio/frame.pyx b/av/audio/frame.pyx index 97de3cc53..b97d5e043 100644 --- a/av/audio/frame.pyx +++ b/av/audio/frame.pyx @@ -56,7 +56,6 @@ cdef class AudioFrame(Frame): # Audio filters need AVFrame.channels to match number of channels from layout. self.ptr.channels = self.layout.nb_channels - cdef size_t buffer_size if self.layout.channels and nb_samples: # Cleanup the old buffer. diff --git a/av/audio/plane.pyx b/av/audio/plane.pyx index 50fe0aa59..92c508cbd 100644 --- a/av/audio/plane.pyx +++ b/av/audio/plane.pyx @@ -1,5 +1,3 @@ -cimport libav as lib - from av.audio.frame cimport AudioFrame diff --git a/av/codec/codec.pyx b/av/codec/codec.pyx index 46fafee15..a7002acc2 100644 --- a/av/codec/codec.pyx +++ b/av/codec/codec.pyx @@ -1,7 +1,7 @@ from av.audio.format cimport get_audio_format from av.descriptor cimport wrap_avclass from av.enum cimport define_enum -from av.utils cimport avrational_to_fraction, flag_in_bitfield +from av.utils cimport avrational_to_fraction from av.video.format cimport get_video_format diff --git a/av/codec/context.pyx b/av/codec/context.pyx index 98b017f66..bc8b35d57 100644 --- a/av/codec/context.pyx +++ b/av/codec/context.pyx @@ -1,7 +1,7 @@ import warnings from libc.errno cimport EAGAIN -from libc.stdint cimport int64_t, uint8_t +from libc.stdint cimport uint8_t from libc.string cimport memcpy cimport libav as lib diff --git a/av/container/core.pyx b/av/container/core.pyx index aae294c17..5b1711a53 100755 --- a/av/container/core.pyx +++ b/av/container/core.pyx @@ -1,6 +1,5 @@ from cython.operator cimport dereference from libc.stdint cimport int64_t -from libc.stdlib cimport free, malloc import os import time @@ -20,9 +19,6 @@ from av.dictionary import Dictionary from av.logging import Capture as LogCapture -ctypedef int64_t (*seek_func_t)(void *opaque, int64_t offset, int whence) noexcept nogil - - cdef object _cinit_sentinel = object() @@ -207,7 +203,6 @@ cdef class Container: cdef bytes name_obj = os.fsencode(self.name) cdef char *name = name_obj - cdef seek_func_t seek_func = NULL cdef lib.AVOutputFormat *ofmt if self.writeable: diff --git a/av/container/output.pyx b/av/container/output.pyx index 0107ff17e..788b3214d 100644 --- a/av/container/output.pyx +++ b/av/container/output.pyx @@ -1,4 +1,3 @@ -from fractions import Fraction import logging import os diff --git a/av/enum.pyx b/av/enum.pyx index 19a5b6d46..522948bbb 100644 --- a/av/enum.pyx +++ b/av/enum.pyx @@ -9,9 +9,7 @@ integers for names and values respectively. """ -from collections import OrderedDict import copyreg -import sys cdef sentinel = object() diff --git a/av/filter/context.pyx b/av/filter/context.pyx index c97718f32..4505c7cd3 100644 --- a/av/filter/context.pyx +++ b/av/filter/context.pyx @@ -1,13 +1,11 @@ -from libc.string cimport memcpy - -from av.audio.frame cimport AudioFrame, alloc_audio_frame +from av.audio.frame cimport alloc_audio_frame from av.dictionary cimport _Dictionary from av.dictionary import Dictionary from av.error cimport err_check from av.filter.pad cimport alloc_filter_pads from av.frame cimport Frame from av.utils cimport avrational_to_fraction -from av.video.frame cimport VideoFrame, alloc_video_frame +from av.video.frame cimport alloc_video_frame cdef object _cinit_sentinel = object() diff --git a/av/frame.pyx b/av/frame.pyx index cab930334..b98624cc5 100644 --- a/av/frame.pyx +++ b/av/frame.pyx @@ -1,7 +1,5 @@ from av.utils cimport avrational_to_fraction, to_avrational -from fractions import Fraction - from av.sidedata.sidedata import SideDataContainer diff --git a/av/logging.pyx b/av/logging.pyx index 4330da08a..131b9a69f 100644 --- a/av/logging.pyx +++ b/av/logging.pyx @@ -32,7 +32,7 @@ API Reference from __future__ import absolute_import -from libc.stdio cimport fprintf, printf, stderr +from libc.stdio cimport fprintf, stderr from libc.stdlib cimport free, malloc cimport libav as lib diff --git a/av/stream.pxd b/av/stream.pxd index 0edd9c83b..c847f641e 100644 --- a/av/stream.pxd +++ b/av/stream.pxd @@ -1,4 +1,3 @@ -from libc.stdint cimport int64_t cimport libav as lib from av.codec.context cimport CodecContext diff --git a/av/stream.pyx b/av/stream.pyx index 56127ccb2..f832d8955 100644 --- a/av/stream.pyx +++ b/av/stream.pyx @@ -1,11 +1,7 @@ import warnings -from cpython cimport PyWeakref_NewRef -from libc.stdint cimport int64_t, uint8_t -from libc.string cimport memcpy cimport libav as lib -from av.codec.context cimport wrap_codec_context from av.error cimport err_check from av.packet cimport Packet from av.utils cimport ( diff --git a/av/subtitles/codeccontext.pyx b/av/subtitles/codeccontext.pyx index a120fc3a5..c3f433abe 100644 --- a/av/subtitles/codeccontext.pyx +++ b/av/subtitles/codeccontext.pyx @@ -1,7 +1,6 @@ cimport libav as lib from av.error cimport err_check -from av.frame cimport Frame from av.packet cimport Packet from av.subtitles.subtitle cimport SubtitleProxy, SubtitleSet diff --git a/av/utils.pxd b/av/utils.pxd index 0c943de81..bc5d56927 100644 --- a/av/utils.pxd +++ b/av/utils.pxd @@ -1,4 +1,4 @@ -from libc.stdint cimport int64_t, uint8_t, uint64_t +from libc.stdint cimport uint64_t cimport libav as lib diff --git a/av/utils.pyx b/av/utils.pyx index 1894ce7ab..1b25a38fe 100644 --- a/av/utils.pyx +++ b/av/utils.pyx @@ -1,4 +1,4 @@ -from libc.stdint cimport int64_t, uint8_t, uint64_t +from libc.stdint cimport uint64_t from fractions import Fraction diff --git a/av/video/frame.pxd b/av/video/frame.pxd index a08da1ecc..709775e55 100644 --- a/av/video/frame.pxd +++ b/av/video/frame.pxd @@ -1,4 +1,4 @@ -from libc.stdint cimport int16_t, int32_t, uint8_t, uint16_t, uint64_t +from libc.stdint cimport uint8_t cimport libav as lib from av.frame cimport Frame diff --git a/av/video/frame.pyx b/av/video/frame.pyx index 972abb779..971b88ccc 100644 --- a/av/video/frame.pyx +++ b/av/video/frame.pyx @@ -5,7 +5,7 @@ from libc.stdint cimport uint8_t from av.enum cimport define_enum from av.error cimport err_check from av.utils cimport check_ndarray, check_ndarray_shape -from av.video.format cimport VideoFormat, get_pix_fmt, get_video_format +from av.video.format cimport get_pix_fmt, get_video_format from av.video.plane cimport VideoPlane diff --git a/include/libavcodec/avcodec.pxd b/include/libavcodec/avcodec.pxd index 0334b18e4..11d968b1a 100644 --- a/include/libavcodec/avcodec.pxd +++ b/include/libavcodec/avcodec.pxd @@ -1,9 +1,4 @@ -from libc.stdint cimport ( - uint8_t, int8_t, - uint16_t, int16_t, - uint32_t, int32_t, - uint64_t, int64_t -) +from libc.stdint cimport int8_t, int64_t, uint16_t, uint32_t cdef extern from "libavcodec/avcodec.h" nogil: diff --git a/include/libavutil/motion_vector.pxd b/include/libavutil/motion_vector.pxd index bcf61c0d1..457d7149e 100644 --- a/include/libavutil/motion_vector.pxd +++ b/include/libavutil/motion_vector.pxd @@ -1,9 +1,4 @@ -from libc.stdint cimport ( - uint8_t, int8_t, - uint16_t, int16_t, - uint32_t, int32_t, - uint64_t, int64_t -) +from libc.stdint cimport int16_t, int32_t, uint8_t, uint16_t, uint64_t cdef extern from "libavutil/motion_vector.h" nogil: diff --git a/include/libswresample/swresample.pxd b/include/libswresample/swresample.pxd index 703310139..d76b777a3 100644 --- a/include/libswresample/swresample.pxd +++ b/include/libswresample/swresample.pxd @@ -1,5 +1,6 @@ from libc.stdint cimport int64_t, uint8_t + cdef extern from "libswresample/swresample.h" nogil: cdef int swresample_version()