From patchwork Sun May 15 19:55:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Theisen X-Patchwork-Id: 35779 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1247299pzb; Sun, 15 May 2022 12:56:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuTyH5SEuBI7Ki1lXh4TWNHAnuGokEbKCq3uxGmuXMGCjR2+U17Ke8jarBFxk/kI4/Z2qa X-Received: by 2002:a05:6402:3684:b0:42a:4fc2:644c with SMTP id ej4-20020a056402368400b0042a4fc2644cmr9805445edb.56.1652644571720; Sun, 15 May 2022 12:56:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652644571; cv=none; d=google.com; s=arc-20160816; b=i8Z4JgLtPpRTUE8kf06NFLDnNKgf4cbQPOey5aqHOHYGuDxXDbHwV4xk5NmgF10WFc 04v9rFp8TNR0pS1VfMB3mUcrg5yQFLf3bme7jOopkY9bufBW0ecYYCdofvtkb+9Y4nCy nb3wBWpuv3h8ksbjBEvr05TsrKeqgDIcMLM/7no2+f0FlW+olT0Yg/jXnzxy5APAkOIp 4eipWC/xb1rqVlpsqS9iM0RHO1yayGhv3X9GlTC6vpFjn8RxWO/WFBXYZlrCbsvtwS7Z UK7Y7QEg6/4Qjbfp6YwWIiAgP2XhrB0bnw7c8QU+PfGeLHHn4/FygvcSqYuWgOgErfIh 6s4g== 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=llT+cTt87b0JfSZ5Bb9D7EymndV/2cXZ2Pnt57d5m18=; b=KBm556kf72UAr97E5lE4eT1FJcaY2e8e8jjPVdDEt1RBrEAWJhZZD51/mcmW3sW7Q9 Sefg0kaFxsW0dCKp+1nwE6wg3wfn/4zXkJMDy/NOnPgwMtiTlYxSU5eMgtnCHIB9Atfx bh6MVkNYMCI5PIiY73GRyd9leKOgW/WpkHEy5MEjtQdM9/uQCjTs82HCL1OzIwPTMTEo v2V2tirQqPJVkX/OTtoB/P198dXypQB6OTP18gcQRaa7FGbuoAVkA/IRvL5b1uzucKde MMfzPLtHLwhpMueKuVhwo9FYhNU7uZtt6JNDXCDYqhN1YWhr/Nuk3Bulr0gZmDIyOdxD OIzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="j/LH5WvF"; 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 a12-20020aa7d90c000000b0042aae338f71si1463623edr.236.2022.05.15.12.56.11; Sun, 15 May 2022 12:56:11 -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="j/LH5WvF"; 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 40E2668B4E3; Sun, 15 May 2022 22:56:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 126FE68AFAB for ; Sun, 15 May 2022 22:55:55 +0300 (EEST) Received: by mail-qk1-f175.google.com with SMTP id b20so10994759qkc.6 for ; Sun, 15 May 2022 12:55:55 -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=1TUqa8OLojPcab0NetDLqtUPladDTV1wBZJ3Oi8K7iA=; b=j/LH5WvFaWxvX37KE5UtkRNyOPo0Fevyj0TO3BkBB0ZsItrftrgKhOFehNleEJoEHL 9eLydlYwEZMLDKsA71dQ0JMptAVwha3cFC3OhkKfwm8sgh9sYXs6gpOh8epesi9gRYWU NhxIrybEWGp/KJi9uWjpTnJL/4gMQGipZ/roYeVmakCNqa9h/mThBNK52bs2RgP2A5Hf VuTPPJVUJYKz0JP2Qo861PP9jIN4X7TVbiCWlRJSe7i96YsVNDryCQAYB5+Syi6Iv+Z5 6fHdu0qC+BpIWD31RIuTHqkM5x7C9RvpsBKOi5doZchA7gFuFd4nE7slv9LLiyT2nbrK gArw== 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=1TUqa8OLojPcab0NetDLqtUPladDTV1wBZJ3Oi8K7iA=; b=0zY4PfCyUkzsDpKz4oICjYbPfHBALnRhGylNxlzB3DnEBKffbQ8YMivcpHdGPewj1a cj4nM6R3+HlmSWgAZ1da7Kv8VzAiJV3PSXmFsTMoiCGVyarw0BcgRDVOa7jqVou+UHAX E0sXganGpOOZIlPSfj6C5tf1E0mNhtIUXanZpSw2AHIoHe83UDXyhwOFsfzWq+r0+OOs kQaNpUVtSwoyHta+NcFGI3WOdHNc7dVbCrrL8JHY8TGxvcn6VGs7n5Zu3736J7DecTkI eX+v4JWXXS+uk/mcKGYt9Evb5fyKV/pIQ1SHV65s+qkkUxYpuBLSw7ObIJgIvkjrZsDs C5hw== X-Gm-Message-State: AOAM531MErsEvPYSYjRX/In/p71l21Y1SJmnOw10ajSjPIoB/1vU2tOO NVmXgRl/10ewAWUjPyR9Skfsfw1Xjd4= X-Received: by 2002:a05:620a:4691:b0:6a0:3684:fc2d with SMTP id bq17-20020a05620a469100b006a03684fc2dmr10413043qkb.208.1652644553222; Sun, 15 May 2022 12:55:53 -0700 (PDT) Received: from scott-desktop.. ([151.200.235.219]) by smtp.gmail.com with ESMTPSA id p5-20020a37bf05000000b0069fc13ce206sm4642271qkf.55.2022.05.15.12.55.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 May 2022 12:55:52 -0700 (PDT) From: Scott Theisen To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 May 2022 15:55:43 -0400 Message-Id: <20220515195544.280890-2-scott.the.elm@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220515195544.280890-1-scott.the.elm@gmail.com> References: <20220201223058.31090-1-scott.the.elm@gmail.com> <20220515195544.280890-1-scott.the.elm@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 1/2] libavutil: create av_media_type_get_string() 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: Scott Theisen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HOfq0vBQBybS This deprecates av_get_media_type_string() which does return NULL. printf %s with a null pointer is undefined behavior This also matches behavior with avcodec_get_name() which never returns NULL, instead it returns "unknown_codec". --- doc/APIchanges | 3 +++ libavutil/avutil.h | 10 ++++++++++ libavutil/utils.c | 13 +++++++++++++ 3 files changed, 26 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index 1a9f0a303e..53f4378a50 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2022-05-XX - xxxxxxxxxxx - lavu 57.19.100 - avutil.h + Add av_media_type_get_string() which deprecates av_get_media_type_string(). + 2022-03-16 - xxxxxxxxxx - all libraries - version_major.h Add lib/version_major.h as new installed headers, which only contain the major version number (and corresponding API deprecation diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 4d633156d1..0f03080dcb 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -21,6 +21,8 @@ #ifndef AVUTIL_AVUTIL_H #define AVUTIL_AVUTIL_H +#include "attributes.h" + /** * @file * @ingroup lavu @@ -209,9 +211,17 @@ enum AVMediaType { /** * Return a string describing the media_type enum, NULL if media_type * is unknown. + * + * @deprecated Use av_media_type_get_string() instead. */ +attribute_deprecated const char *av_get_media_type_string(enum AVMediaType media_type); +/** + * Return a string describing the media_type enum, never NULL. + */ +const char *av_media_type_get_string(enum AVMediaType media_type); + /** * @defgroup lavu_const Constants * @{ diff --git a/libavutil/utils.c b/libavutil/utils.c index 94d247bbee..5e0be8361f 100644 --- a/libavutil/utils.c +++ b/libavutil/utils.c @@ -37,6 +37,19 @@ const char *av_get_media_type_string(enum AVMediaType media_type) } } +const char *av_media_type_get_string(enum AVMediaType media_type) +{ + switch (media_type) { + case AVMEDIA_TYPE_UNKNOWN: return "unknown"; + case AVMEDIA_TYPE_VIDEO: return "video"; + case AVMEDIA_TYPE_AUDIO: return "audio"; + case AVMEDIA_TYPE_DATA: return "data"; + case AVMEDIA_TYPE_SUBTITLE: return "subtitle"; + case AVMEDIA_TYPE_ATTACHMENT: return "attachment"; + default: return "invalid_media_type"; + } +} + char av_get_picture_type_char(enum AVPictureType pict_type) { switch (pict_type) {