From patchwork Sun Dec 26 17:16:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 32920 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp9682750iog; Sun, 26 Dec 2021 09:17:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJxuetFAEU5/n8dCNyLQTPQfkJwkmp6g7wSYu5+wtmNHgmZHmw4LI0DT4qaYedokniHz3Ir9 X-Received: by 2002:a17:906:1544:: with SMTP id c4mr11507946ejd.98.1640539033902; Sun, 26 Dec 2021 09:17:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640539033; cv=none; d=google.com; s=arc-20160816; b=I1gJZdx2StxAfkXmp3NoT8ztCWLEzvNlrX4DlPjdw82QxZrzAZwoWP0Tbuu2ANmYSY hmdr01vih8DmQq51ONXswr5g7gkdObPZ4XdF4FsHfogZwzDQCGn2rrVLCn8Kw+yxvXB5 i5/DDATYIcOGSp8Yx6tQlMoU47bKzb8rr+/6Xqs4zZ5o5G1t87kJlvScJi3SaNpVuUY9 3v33ec07dHUrxuo9MNy9hallME/1/wQ3YE92ShGzCuQQ2zYZHTncxH9JmwoKj/LCZ7pE 7ArTyO9XiDkWwkMt2NJEhkn3VwJCIipKr2QP3eaCCziEIk71lpqWRCnc2EOW7vp29ysJ dS3w== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=VZR4u79GvHGtXMFlb+sAOVo/azWRens3qvFiivyr+as=; b=VNx0hLoWxN0mV6aWGNM78tonCXjLkBxVETtrSY4axxP1pKahrcCVtceZs23ssAgiqO p26pyfFHpHTAzDQz5VhaSavbeEp7Smk77qIM/kIzvuGPWGeOEwsy6so5y91bvf2pkUXO H4TXqYGjUu4T2Tfsf2GI6ABHqy9oym+wAVzfIA9jRxvapS3BDgLG8Rv21RwFR3mRvFts W9mYp2joGRryGdsOdltGSHWWWcTKICD3u60mD9TwoigIyM/SWiN3v+T0LL3/qIBDuUkv b6s6dR0AyJ/pRzbgTW34sDmHod9A4rEP5Jzudrdo//7IYJgYiYoQGISYCZw+S2Neze2o debA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=g8uRBfXL; 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 b20si5283270ejz.420.2021.12.26.09.17.13; Sun, 26 Dec 2021 09:17:13 -0800 (PST) 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=g8uRBfXL; 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 2891F68B113; Sun, 26 Dec 2021 19:17:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B76A368AED0 for ; Sun, 26 Dec 2021 19:17:02 +0200 (EET) Received: by mail-lf1-f54.google.com with SMTP id u13so30043395lff.12 for ; Sun, 26 Dec 2021 09:17:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eT2ysa9lsTjgE/V40lFT2b0tcYO1wvf65vrE5mBaBJg=; b=g8uRBfXL7rWgmIP9bVX/TBpqA5duLLQQ/sOeVx22mAhNu0uGijJXj5nYaoawlFU5TJ 5XTGPqd5XMiq5F8sJtODWz7d4p8mqfRVzJZKWSLVdhAa+1KMH2RR/SPXAnIvxGAhSaz4 xsDKYz1byiOwDwaj/EWb/Gn/mcnXH6fhyg+xzeXHHuD9P0gGPoTAv27y6GfenYF7VwAe Vx4rGDFVMoApmJDVjEG2qbWz8UA9nwtpljzyrea/Gb/imSgmqGONCY3cEbEr/Gb+XwaT ifOZirluX6R79lvUdeYYq5FvmX8X7gfnWTWz+2P26/a2Ns27LaopOFXM1T74OVMoEZwV eFCQ== 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:mime-version :content-transfer-encoding; bh=eT2ysa9lsTjgE/V40lFT2b0tcYO1wvf65vrE5mBaBJg=; b=nGkHbMeOOwNXAzkyQNWdBV8578xGTjCzNUwuQhJg+gKymoKNAcQ8medoHNwcOgR2bS H809cHd3bNJGHkqa/fdv1M5X0pMcCde+KEtlaHkFFbfa9kjZuwExJLDw55ZF+RQJqWoL 5mXSLmYpwn5cjSjpoa/VfJFEJfVJnTEZJ0i0bFYKVHE/rK287MS6/xkfalScYnoy/Jqo CMojyvFMdijXFqe5+RcnnNgBba/zU5LQzkBB+XkFNTSLr8oINQ+FoV6qCuhcyr45QLEr yex1QhN1cm3KlODwHeCOC8CqHS8x+KzEV5oi669zRwjiKJMxIt69OBbMOpS1pD7pZ9sB G1YA== X-Gm-Message-State: AOAM5312V6NpJa45RUxqZCgIkeMteSgs7JCnbtF+FGG8Knm0ANZn+7Y6 13XvWzViiCeo1EuTzHeKmlCPS+I1R7E= X-Received: by 2002:a05:6512:10ca:: with SMTP id k10mr12500796lfg.677.1640539020864; Sun, 26 Dec 2021 09:17:00 -0800 (PST) Received: from localhost.localdomain ([196.244.192.5]) by smtp.gmail.com with ESMTPSA id t3sm555851lfg.283.2021.12.26.09.17.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Dec 2021 09:17:00 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Dec 2021 18:16:50 +0100 Message-Id: <20211226171650.372-1-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [RFC] 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: GdLdx/pmzn84 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. Signed-off-by: Diederick Niehorster --- libavdevice/avdevice.c | 10 ++++++++++ libavdevice/version.h | 10 ++++++++++ libavformat/utils.c | 5 +++++ libavformat/version.h | 11 +++++++++++ libavutil/macros.h | 2 ++ 5 files changed, 38 insertions(+) diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 8f460c7564..b608ec532f 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -38,6 +38,16 @@ 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 + if ((avformat_version_same_minor()) & ~0xFF != (LIBAVFORMAT_VERSION_INT & ~0xFF)) + abort(); + + return avformat_version(); +} + const char * avdevice_configuration(void) { return FFMPEG_CONFIGURATION; diff --git a/libavdevice/version.h b/libavdevice/version.h index 41f568d6b0..4c511a7f53 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -26,6 +26,7 @@ */ #include "libavutil/version.h" +#include "libavutil/macros.h" #define LIBAVDEVICE_VERSION_MAJOR 59 #define LIBAVDEVICE_VERSION_MINOR 1 @@ -48,4 +49,13 @@ */ #define FF_API_DEVICE_CAPABILITIES (LIBAVDEVICE_VERSION_MAJOR < 60) +/** + * avdevice_version_same_minor() expands to a function with + * the same minor and major version it was compiled against + * encoded in it. Enables linking locking to the minor version + * of other libraries they were compiled against. + */ +#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/utils.c b/libavformat/utils.c index 332ba534d2..607a777c3f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -63,6 +63,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 379a68cc7c..2423800687 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -28,6 +28,7 @@ */ #include "libavutil/version.h" +#include "libavutil/macros.h" // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here @@ -63,4 +64,14 @@ #define FF_API_R_FRAME_RATE 1 + +/** + * avformat_version_same_minor() expands to a function with + * the same minor and major version it was compiled against + * encoded in it. Enables linking 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/macros.h b/libavutil/macros.h index 2a7567c3ea..dda1bf6452 100644 --- a/libavutil/macros.h +++ b/libavutil/macros.h @@ -73,6 +73,8 @@ * @} */ +#define AV_MAKE_MAJOR_MINOR_FUNC_NAME(name,major,minor) AV_GLUE(av,name)AV_GLUE(_version_,major)AV_GLUE(_,minor) + #define AV_PRAGMA(s) _Pragma(#s) #define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))