From patchwork Wed Aug 24 08:43:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 37436 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2371096pzh; Wed, 24 Aug 2022 01:44:16 -0700 (PDT) X-Google-Smtp-Source: AA6agR4bAZltOOpEpV87cdDSCnTUzDnElecNGGqFg9sQkly7CCgeHu+nkCnnPtCCFyL//3JIeElZ X-Received: by 2002:a05:6402:428e:b0:443:8279:13ea with SMTP id g14-20020a056402428e00b00443827913eamr6780983edc.294.1661330656602; Wed, 24 Aug 2022 01:44:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661330656; cv=none; d=google.com; s=arc-20160816; b=WX1rgvmn/mIf6S5Mp8qJsWCsUBTot237fH6+RWwz6I3egWJyv+uuHuGtnu6Plk6lg4 GFVIHmpW8vgQw5Pv8Wn5DioiVdeKMO4HZn5cwtXaQEbucdzSIycxBu3N8/3uLw2XI0/a FOZ2AsGUZ7Cl++k5jwSWM2hl1J68D0guoUUJmTWSN987CpRLL4LZDAURNr1GdOj9hN9C epjF07BKTYBmDeMgd3kurupAYV3XivRtcl//qLn4veNGZEg/AI4C8alMeV0MnIMsU8wj BGHPcGuimMEdmScaAEVN6g5ZP9vi0te1FqLzVQHJwRyVSrQdiV/WA1CwUEPlNZRVnukU KFLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=840S2TBKuqRWASVHbhIcY1u3dorsZSk7thUckXWjcPg=; b=PenARY/lGAOqe36ZY3TCI8t4zmfXZgAAROu35+UU7XOfIyuy/MbXwuzi1PFwvGScOu /1V7OP5iu7F/Kwq3caLBE5W4I66qySPtferbWuzzfbfV1UQhhrNy9QX62+gIxjGN//He QDtCCdxx17YVyBfDZ+peeasnqFUjEDUuS6U8lkwmc5iLPDGxOBDvHbnLVStwQVGmioJJ buDmdSw67WikJhZhj9pCYH6pB4SetnUAGL8MbLxoYb8Y+H3+cW8CsKF9Bpt6u5frrUQg MnH2bQ37JRjv9g/x6LAojouVwS2GrZ2TvP2S70ciAg0Gx9MGaFUdhKCiPmRtAgwGogrm 1RXQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id di9-20020a170906730900b007315a1c65b8si1964068ejc.329.2022.08.24.01.44.16; Wed, 24 Aug 2022 01:44:16 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E674668B9D9; Wed, 24 Aug 2022 11:43:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B39368B9C1 for ; Wed, 24 Aug 2022 11:43:44 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id B3FBF240D0E for ; Wed, 24 Aug 2022 10:43:43 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id oX231ai0Ojz6 for ; Wed, 24 Aug 2022 10:43:43 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 917C0240D18 for ; Wed, 24 Aug 2022 10:43:41 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 7A7493A21B8; Wed, 24 Aug 2022 10:43:35 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Aug 2022 10:43:03 +0200 Message-Id: <20220824084318.333-3-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220824084318.333-1-anton@khirnov.net> References: <20220824084318.333-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/18] lavf/dv: always provide avpriv_dv_* symbols X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: yv8Jhf54JkWo They are used from libavdevice. --- configure | 1 + libavformat/Makefile | 3 +-- libavformat/dv.c | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/configure b/configure index ea50c94002..f4c4ab0484 100755 --- a/configure +++ b/configure @@ -3530,6 +3530,7 @@ gdigrab_indev_deps="CreateDIBSection" gdigrab_indev_extralibs="-lgdi32" gdigrab_indev_select="bmp_decoder" iec61883_indev_deps="libiec61883" +iec61883_indev_select="dv_demuxer" jack_indev_deps="libjack" jack_indev_deps_any="sem_timedwait dispatch_dispatch_h" kmsgrab_indev_deps="libdrm" diff --git a/libavformat/Makefile b/libavformat/Makefile index f67a99f839..684bad0eb4 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -13,6 +13,7 @@ OBJS = allformats.o \ demux.o \ demux_utils.o \ dump.o \ + dv.o \ format.o \ id3v1.o \ id3v2.o \ @@ -184,7 +185,6 @@ OBJS-$(CONFIG_DSS_DEMUXER) += dss.o OBJS-$(CONFIG_DTSHD_DEMUXER) += dtshddec.o OBJS-$(CONFIG_DTS_DEMUXER) += dtsdec.o rawdec.o OBJS-$(CONFIG_DTS_MUXER) += rawenc.o -OBJS-$(CONFIG_DV_DEMUXER) += dv.o OBJS-$(CONFIG_DV_MUXER) += dvenc.o OBJS-$(CONFIG_DVBSUB_DEMUXER) += dvbsub.o rawdec.o OBJS-$(CONFIG_DVBTXT_DEMUXER) += dvbtxt.o rawdec.o @@ -711,7 +711,6 @@ SHLIBOBJS-$(CONFIG_RTP_MUXER) += golomb_tab.o jpegtables.o \ SHLIBOBJS-$(CONFIG_SPDIF_MUXER) += dca_sample_rate_tab.o # libavdevice dependencies -OBJS-$(CONFIG_IEC61883_INDEV) += dv.o # Windows resource file SHLIBOBJS-$(HAVE_GNU_WINDRES) += avformatres.o diff --git a/libavformat/dv.c b/libavformat/dv.c index 1dadaf6e62..24bacd5c53 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -28,6 +28,9 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "config_components.h" + #include #include "avformat.h" #include "internal.h" @@ -40,6 +43,8 @@ #include "dv.h" #include "libavutil/avassert.h" +#if CONFIG_DV_DEMUXER + // Must be kept in sync with AVPacket struct DVPacket { int64_t pts; @@ -647,3 +652,21 @@ const AVInputFormat ff_dv_demuxer = { .read_seek = dv_read_seek, .extensions = "dv,dif", }; + +#else // CONFIG_DV_DEMUXER +DVDemuxContext *avpriv_dv_init_demux(AVFormatContext *s) +{ + return NULL; +} + +int avpriv_dv_get_packet(DVDemuxContext *c, AVPacket *pkt) +{ + return AVERROR(ENOSYS); +} + +int avpriv_dv_produce_packet(DVDemuxContext *c, AVPacket *pkt, + uint8_t *buf, int buf_size, int64_t pos) +{ + return AVERROR(ENOSYS); +} +#endif // CONFIG_DV_DEMUXER