From patchwork Fri Nov 12 16:32:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 31391 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp2052615iob; Fri, 12 Nov 2021 08:33:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJz1gulfZi5Hn9ugjIRzQ+5wG2Qex/nJ1VHXJ+V4H8iGXJJyLQD80P14MiL718Yg9Wwwz+vF X-Received: by 2002:a17:906:c302:: with SMTP id s2mr21237409ejz.499.1636734803228; Fri, 12 Nov 2021 08:33:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636734803; cv=none; d=google.com; s=arc-20160816; b=xanJ65pimjxlDyMOv9rAF930hqfZ9W6q8zxt6g0JXVCcXbfgnlVd1XXE2VbpPI4KTN /Lyq4Dyq4ZLfyPe7Jb0xgJwQKkOkOVHME63Y50CJ9Be6ANdCpw2GsUOVaszK0+0ThJ/F NaT+4SZPlnz0hKbNEV9LyDVhZ8f0f0G+6x4NRn84GQWqUf2u2yogJmcsaBihJx78jseq bAp/XelJz3JhZT7sK9gwB48nscQE/9u7LRm3pMrjbb0fvqco5b+womy6e4NDULbeD/IJ C4UK9jzyJX0jgayQoVAU0oTAoT66croO10ghUECpJKdJBWBOiAVcHheUcLt4U976tsGf rlQg== 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=/OqGYPyNJ45iPn/aNjzrTt+PA5cwnBRRIDp/ar5iPzQ=; b=wa382v7n2fdvNKOI/r72R831DYryFVaP5s2cDwDl0TUhpuSaArWEjL5NYR/od0WdfJ 25TDOxpgXBF8rEjp74PQBwu8+wltZEazrpSXBimacKhWq26iwYBhku6/QhVdy/0vI3Oc IPoBkfFQBhewln0hKOBuB2/MnqpQmm+z3+INSSR2QaiUV4wc+etkRRoY+Kva3+PMLCW3 CYscGw+AsA3aX+i+qlNinBlsg1zAxP5x+S9JZbAOG/wEENbUDiacUOkyTJY+N9P7vi7t TnVtc6o7e2S/amFb1rDEqdLrDakMv0dfThg5L1ImFqnJBYUC3DbXE0NH2lTx4cw7n3Ok rhaA== 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 yc17si4923787ejb.18.2021.11.12.08.33.21; Fri, 12 Nov 2021 08:33:23 -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; 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 B133968AE3E; Fri, 12 Nov 2021 18:33:07 +0200 (EET) 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 693D368A1A7 for ; Fri, 12 Nov 2021 18:33:00 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id E937E240175 for ; Fri, 12 Nov 2021 17:32:59 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id dhvFjc51XzcR for ; Fri, 12 Nov 2021 17:32:59 +0100 (CET) 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 0823F240179 for ; Fri, 12 Nov 2021 17:32:59 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 026893A073E; Fri, 12 Nov 2021 17:32:58 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Nov 2021 17:32:52 +0100 Message-Id: <20211112163255.20522-3-anton@khirnov.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211112163255.20522-1-anton@khirnov.net> References: <20211112163255.20522-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/6] lavf: add public functions converting dispositions to/from strings 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: 5k/SxtrFY/JM --- doc/APIchanges | 1 + libavformat/avformat.h | 14 +++++++++++++ libavformat/utils.c | 47 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index a86f4b936e..53f229d41a 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -17,6 +17,7 @@ API changes, most recent first: 2021-11-xx - xxxxxxxxxx - lavf 59.9.100 - avformat.h Add av_stream_get_class(). Schedule adding AVStream.av_class at libavformat major version 60. + Add av_disposition_to_string() and av_disposition_from_string(). 2021-11-12 - xxxxxxxxxx - lavu 57.8.100 - hwcontext_vulkan.h Added AVFrame.sem_value, AVVulkanDeviceContext.queue_family_encode_index, diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 4dabc90f24..ac3e1b6e60 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -894,6 +894,20 @@ typedef struct AVIndexEntry { */ #define AV_DISPOSITION_STILL_IMAGE (1 << 20) +/** + * @return The AV_DISPOSITION_* flag corresponding to disp or a negative error + * code if disp does not correspond to a known stream disposition. + */ +int av_disposition_from_string(const char *disp); + +/** + * @param disposition a combination of AV_DISPOSITION_* values + * @return The string description corresponding to the lowest set bit in + * disposition. NULL when the lowest set bit does not correspond + * to a known disposition or when disposition is 0. + */ +const char *av_disposition_to_string(int disposition); + /** * Options for behavior on timestamp wrap detection. */ diff --git a/libavformat/utils.c b/libavformat/utils.c index d889134a1a..9c38c60e81 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -28,6 +28,7 @@ #include "libavutil/bprint.h" #include "libavutil/dict.h" #include "libavutil/internal.h" +#include "libavutil/intmath.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "libavutil/pixfmt.h" @@ -1965,3 +1966,49 @@ void ff_format_set_url(AVFormatContext *s, char *url) av_freep(&s->url); s->url = url; } + +static const struct { + const char *str; + int disposition; +} dispositions[] = { + { "default", AV_DISPOSITION_DEFAULT }, + { "dub", AV_DISPOSITION_DUB }, + { "original", AV_DISPOSITION_ORIGINAL }, + { "comment", AV_DISPOSITION_COMMENT }, + { "lyrics", AV_DISPOSITION_LYRICS }, + { "karaoke", AV_DISPOSITION_KARAOKE }, + { "forced", AV_DISPOSITION_FORCED }, + { "hearing_impaired", AV_DISPOSITION_HEARING_IMPAIRED }, + { "visual_impaired", AV_DISPOSITION_VISUAL_IMPAIRED }, + { "clean_effects", AV_DISPOSITION_CLEAN_EFFECTS }, + { "attached_pic", AV_DISPOSITION_ATTACHED_PIC }, + { "timed_thumbnails", AV_DISPOSITION_TIMED_THUMBNAILS }, + { "captions", AV_DISPOSITION_CAPTIONS }, + { "descriptions", AV_DISPOSITION_DESCRIPTIONS }, + { "metadata", AV_DISPOSITION_METADATA }, + { "dependent", AV_DISPOSITION_DEPENDENT }, + { "still_image", AV_DISPOSITION_STILL_IMAGE }, +}; + +int av_disposition_from_string(const char *disp) +{ + for (int i = 0; i < FF_ARRAY_ELEMS(dispositions); i++) + if (!strcmp(disp, dispositions[i].str)) + return dispositions[i].disposition; + return AVERROR(EINVAL); +} + +const char *av_disposition_to_string(int disposition) +{ + int val; + + if (disposition <= 0) + return NULL; + + val = 1 << ff_ctz(disposition); + for (int i = 0; i < FF_ARRAY_ELEMS(dispositions); i++) + if (dispositions[i].disposition == val) + return dispositions[i].str; + + return NULL; +}