From patchwork Fri Mar 25 14:10:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 34963 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp1376356uaj; Fri, 25 Mar 2022 07:11:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+HTALfbkD3EVReOlOw5DH4uREy6K9G5kErMy9q9Td8/3AOlHoduiqmVv8VEzlnwjghE8f X-Received: by 2002:a05:6402:18:b0:410:86cd:9dce with SMTP id d24-20020a056402001800b0041086cd9dcemr13417977edu.70.1648217490792; Fri, 25 Mar 2022 07:11:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648217490; cv=none; d=google.com; s=arc-20160816; b=XlPCmLWq3sYRvNF1w3eNJ99Teq56Mh/gTw6ljkyFhLWUMap7PTEO0xoA6Ax6PrKDNZ 5V/2A9OZP0PNkml7xhj+mTfbbzcPlVwZ6D+IIbq/RvJZER5364LUHQcVdlh4FUKdc4g3 FYOAd7elmzlohIrrikKLQ+Bv4b/PHZiFfmxCvbbwu0cGZ67HZRkaBCFqgLm7VEpRWtiZ /wjcmo/FMwP8TulTIGkB90oqE1vn947ZSlANmG6b3I+eF5mT7YktqpxcrRRqx0NSPXjq U7x6Qry5KdR85zSKH4JWyISbQPOANVr42C7c5V1nYi3VunTiceUc5co15uy+farOPU+P zJug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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:dkim-signature:delivered-to; bh=3snGBuOwmhowU55f3H/s2KYtk+TEC+8f4GqAvO9S+s8=; b=WvzolNMeW7HSfe6XOwZs1eehSS2Lp8z/8ZK1Xf9v9ydfw5ZQmXEdwFFk+oiORNgi5C LOvPDcoAKl1J5w566V9Q/DAwR4EocUaF8vzKe5X+UJhJGEfi0a3IFJPDmctk71yLlq7Z Y10CbBkUcL+mUgFjmGLAjkVdmFmIDp8p0LcmwOH+XxVf6YwCLhf5kwgSHQuhsJfY6heN FSzpf8cNNeJBB5Zra1N2iUkqzACQE1j/MvjQ35kmmTifRycs05IJ43wa9JpgwErFmq33 ytZI+GEqc6HCnyRzXa6lYOmrni1541rX+rq7aDYDU2GyBEqp348nXneG0mzxk60bcXlK fzZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="AOmEGME/"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p23-20020a1709061b5700b006df76385f35si2706356ejg.981.2022.03.25.07.11.30; Fri, 25 Mar 2022 07:11:30 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="AOmEGME/"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A744368B223; Fri, 25 Mar 2022 16:11:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 344CB68B226 for ; Fri, 25 Mar 2022 16:11:20 +0200 (EET) Received: by mail-lj1-f169.google.com with SMTP id q14so10447061ljc.12 for ; Fri, 25 Mar 2022 07:11:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tXs8ox1/4RHrSDOFWIJWqjZWHt/g1eY+wm8TMZiRvpA=; b=AOmEGME/DqcFUgbBg3YDwIDLAiYjRzh/uQP7WX6pBGMUat+uyufX9QtFepoyWxt9GP xPW81LB3cW1cD5XAAVXc2Fxp7MZftZWPqX1Ba0VB+zk+B8td8mGavwvG+ikpk5+qTefx OiAKv7twBSmnsWHYj7RWZEdCgnsLpnWXP9mp2VjpXIaFr5UNRvLgbsoGGTdlYCZQnzqj O/2jocysBF7j5rt6gaIIM2uQt44FRSfkNTdaOcXZ97PG6NgdVIVuUTYa4TtSHyOHyuil 4SjEl130ai/zLAZwuuII9yUnwf7pdsvwoWZdZJQJca559faLAy1eFzsNcXsGCa5kEaNg nZTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tXs8ox1/4RHrSDOFWIJWqjZWHt/g1eY+wm8TMZiRvpA=; b=j1t/MMwiRW7Yf3ktlsnJnfMvaJ4/BuGYu51G9B+ACP5wOro+hje0o3De6KpRjgOpvB ZtTdFg/lhh2z01XeT8nhe4dDy3ySZYIkJvU4Vlk3ZAKhEbLYn2dCf1hdV+jlFreANFsd flJRc0mOAsKObRg8uaroEW3Oi0EgYBVCLwM01ZlgeRDnVdl8KwQLWSRNBwbHDPirTypF 2fZHaXf2AQkefmcm5lYy0SZTaDNj/vFE612TxAn/YnSx57yaSwRiGQpmTNG+Y+FLQfTg sKYcsts/F3L2B8L+GxOumLefoYiZ6ukKCgV+UrHnUHYr2KxL2hJJ0MHtqHTnChvEyvPg wtFA== X-Gm-Message-State: AOAM533hkbKpxdhB6v/5UR4+doq0pDguAP2B1M2PBKbwcZl0/UP02TYt yL8yhBRtRmoFtmGxT4ogRlhNxMCn8kY= X-Received: by 2002:a2e:3607:0:b0:249:87a5:af18 with SMTP id d7-20020a2e3607000000b0024987a5af18mr8388605lja.93.1648217478913; Fri, 25 Mar 2022 07:11:18 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id s6-20020a197706000000b0044a3dd3773csm719516lfc.47.2022.03.25.07.11.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 07:11:15 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Mar 2022 15:10:21 +0100 Message-Id: <20220325141041.1748-3-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20220325141041.1748-1-dcnieho@gmail.com> References: <20220325141041.1748-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 02/22] avdevice: lock to minor version of avformat 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 Cc: Diederick Niehorster Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /IBstty0hbol As per discussion on the list ( https://ffmpeg.org/pipermail/ffmpeg-devel/2021-June/281513.html, see especially https://ffmpeg.org/pipermail/ffmpeg-devel/2021-June/281586.html), to resolve the the unholy ABI-relationship between libavdevice and libavformat and allow easier working on the part of the avdevice API that lives in avformat, lock avdevice to a specific major and minor version of avformat. Documentation of this restriction added. Signed-off-by: Diederick Niehorster --- libavdevice/avdevice.c | 13 +++++++++++++ libavdevice/avdevice.h | 10 ++++++++++ libavdevice/version.h | 13 ++++++++++++- libavformat/avformat.h | 3 +++ libavformat/utils.c | 5 +++++ libavformat/version.h | 14 ++++++++++++-- libavutil/avutil.h | 3 +++ libavutil/macros.h | 3 +++ 8 files changed, 61 insertions(+), 3 deletions(-) diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 833d200054..9b684251aa 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -19,6 +19,7 @@ #include "libavutil/avassert.h" #include "libavutil/samplefmt.h" #include "libavutil/pixfmt.h" +#include "libavformat/version.h" #include "avdevice.h" #include "internal.h" #include "config.h" @@ -39,6 +40,18 @@ unsigned avdevice_version(void) return LIBAVDEVICE_VERSION_INT; } +unsigned avdevice_version_same_minor() +{ + // check version of loaded lavf has same major and minor version as + // this library was compiled against + // NB: this function doesn't have to be called, dynamic linker will + // signal error when avformat of wrong major or minor version is found. + if ((avformat_version_same_minor()) & ~0xFF != (LIBAVFORMAT_VERSION_INT & ~0xFF)) + abort(); + + return avdevice_version(); +} + const char * avdevice_configuration(void) { return FFMPEG_CONFIGURATION; diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index 0b32e59fed..db16a2f27e 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -47,6 +47,16 @@ * * To use libavdevice, simply call avdevice_register_all() to register all * compiled muxers and demuxers. They all use standard libavformat API. + * + * Note that libavdevice is locked to be used with the same major and minor + * version of libavformat that it was built against. Attempting to use a + * shared build of FFmpeg or its libavdevice library with a libavformat of + * a different major or minor version will generate a dynamic linker error. + * This is achieved by the internal function check_avformat_same_minor() in + * avdevice.c. This function does not have to be called, its call to + * avformat_version_same_minor() (a macro which expands to a name with the + * specific major and minor version of avformat embedded in it) is sufficient + * to trigger link failure. * * @{ */ diff --git a/libavdevice/version.h b/libavdevice/version.h index 09c1d778dc..01e566a1be 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -26,10 +26,11 @@ */ #include "libavutil/version.h" +#include "libavutil/macros.h" #include "version_major.h" -#define LIBAVDEVICE_VERSION_MINOR 6 +#define LIBAVDEVICE_VERSION_MINOR 7 #define LIBAVDEVICE_VERSION_MICRO 100 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ @@ -42,4 +43,14 @@ #define LIBAVDEVICE_IDENT "Lavd" AV_STRINGIFY(LIBAVDEVICE_VERSION) +/** + * avdevice_version_same_minor() expands to a function with + * the same minor and major version it was compiled against + * encoded in it. Enables locking to the minor version of + * other libraries they were compiled against. Does not have + * to be called by user. + */ +#define avdevice_version_same_minor AV_MAKE_MAJOR_MINOR_FUNC_NAME(device,LIBAVFORMAT_VERSION_MAJOR,LIBAVFORMAT_VERSION_MINOR) +unsigned avdevice_version_same_minor(); + #endif /* AVDEVICE_VERSION_H */ diff --git a/libavformat/avformat.h b/libavformat/avformat.h index f12fa7d904..350912e272 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -64,6 +64,9 @@ * set by user for input, always set by user for output (unless you are dealing * with an AVFMT_NOFILE format). * + * Note that libavdevice is locked to a specific major and minor version of + * libavformat, see @ref lavd "libavdevice" for more details. + * * @section lavf_options Passing options to (de)muxers * It is possible to configure lavf muxers and demuxers using the @ref avoptions * mechanism. Generic (format-independent) libavformat options are provided by diff --git a/libavformat/utils.c b/libavformat/utils.c index 3f253c2045..5c4f14535e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -64,6 +64,11 @@ unsigned avformat_version(void) return LIBAVFORMAT_VERSION_INT; } +unsigned avformat_version_same_minor() +{ + return avformat_version(); +} + const char *avformat_configuration(void) { return FFMPEG_CONFIGURATION; diff --git a/libavformat/version.h b/libavformat/version.h index f4a26c2870..ac14f8eb37 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -28,11 +28,12 @@ */ #include "libavutil/version.h" +#include "libavutil/macros.h" #include "version_major.h" -#define LIBAVFORMAT_VERSION_MINOR 20 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MINOR 21 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ @@ -44,4 +45,13 @@ #define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION) +/** + * avformat_version_same_minor() expands to a function with + * the same minor and major version it was compiled against + * encoded in it. Enables locking to the minor version of + * other libraries they were compiled against. + */ +#define avformat_version_same_minor AV_MAKE_MAJOR_MINOR_FUNC_NAME(format,LIBAVFORMAT_VERSION_MAJOR,LIBAVFORMAT_VERSION_MINOR) +unsigned avformat_version_same_minor(); + #endif /* AVFORMAT_VERSION_H */ diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 4d633156d1..94ce472c27 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -76,6 +76,9 @@ * situations may change slightly (and be documented). All those are accompanied * by an entry in doc/APIchanges and incrementing either the minor or micro * version number. + * + * Note that libavdevice is locked to a specific major and minor version of + * libavformat, see @ref lavd "libavdevice" for more details. */ /** diff --git a/libavutil/macros.h b/libavutil/macros.h index 2a7567c3ea..dab530a8a0 100644 --- a/libavutil/macros.h +++ b/libavutil/macros.h @@ -73,6 +73,9 @@ * @} */ +#define AV_MAKE_MAJOR_MINOR_FUNC_NAME_IMPL(name,major,minor) av ## name ## _version_ ## major ## _ ## minor +#define AV_MAKE_MAJOR_MINOR_FUNC_NAME(name,major,minor) AV_MAKE_MAJOR_MINOR_FUNC_NAME_IMPL(name,major,minor) + #define AV_PRAGMA(s) _Pragma(#s) #define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))