From patchwork Wed Sep 9 06:02:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22224 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 23D4E449ED1 for ; Wed, 9 Sep 2020 09:09:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 08D0D68B869; Wed, 9 Sep 2020 09:09:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04BFF68B746 for ; Wed, 9 Sep 2020 09:09:52 +0300 (EEST) Received: by mail-pg1-f169.google.com with SMTP id j34so1295105pgi.7 for ; Tue, 08 Sep 2020 23:09:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=snfZk8hpzUD2hGQYNE2/UHaO3IhlruUwAo+/e2wy1TI=; b=d1Uy5AIuHOM6iApKrkTAcHq6PfF4cMMQLN7dZKqiJ9R6RhGDQuDmW3Ec1XjcFTGYKP XKdnOscVNa/RqWzgZPb7VuUGoVp45iz5lQVjZ0+cj+sijM+IdmKZXObFLXA+fJeEKdbV SwOK2aYsNa+/i480nEPk55DcwtJjvGMPK7mYW1Dfdd0Sk95SUBUaK0+ulAPcwYqgExgv xbu3eqVMlK2G+hbt6LXrblqXSqwPg7lFATXLu1PObTkmS6eQRR3wDKVhDecqn66FKqL0 9PAk6aJLZSSCf/jxutZADXGAl2f/YiEBZ3+/EFwteFoDIXNDF+CLn1ATLOCM6WpTpcb6 uy9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=snfZk8hpzUD2hGQYNE2/UHaO3IhlruUwAo+/e2wy1TI=; b=OI9cpFb8C7+0LjD7twPpAJuX8uIe7DkH+4h+0f23jrRzHyAokihitteYKucFMZaiWb Bk0rJPUg2KTcv8eEZZSecWduX3Yo1HsubFOKJFclnG4afhnsQIilt6xzYEmR2kHffRMd H71j5kd0wZgDD52aLCyo6P7r8H5qbLU9ylBVNUr5sBpVMFWG7R/wLitGZsiCM/Eh3xZk j1ScfWeZCEa35QJDoWCtGE/EXvKpHE8kTfnue9Xz6bB8yDbDG232/tfSB72RvR8a+Svx 6PI+foggceMULVgCwQzH7WzEWqmC+ZQVfzM9X2vfi0u70UjTME+bLkmU+/sw8CZ7Kdxb 8+vA== X-Gm-Message-State: AOAM5338kkjBKccDKIic7eESJYsETXaHT+SjVay9pVRCkrb07tpKuHp7 mj6wcL1iPIj02jAH2xHclySlbNEAHKLK X-Google-Smtp-Source: ABdhPJzh1w54yrFTFKgBgVeIGEXC7VkTbDW+OqcNNLghRPYvAaE6/wE3n5YQftHLaLvW5dTEIpweUQ== X-Received: by 2002:a92:cd05:: with SMTP id z5mr2162017iln.280.1599631341169; Tue, 08 Sep 2020 23:02:21 -0700 (PDT) Received: from rcombs-mbp.localdomain (c-73-50-128-8.hsd1.il.comcast.net. [73.50.128.8]) by smtp.gmail.com with ESMTPSA id j20sm864575ilq.6.2020.09.08.23.02.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:20 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:03 -0500 Message-Id: <20200909060217.25794-1-rcombs@rcombs.me> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/15] lavc/codec_desc: add MIME type to AV_CODEC_ID_TEXT X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" --- libavcodec/codec_desc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 9e73dcba27..3dee640360 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -3173,6 +3173,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "text", .long_name = NULL_IF_CONFIG_SMALL("raw UTF-8 text"), .props = AV_CODEC_PROP_TEXT_SUB, + .mime_types= MT("text/plain"), }, { .id = AV_CODEC_ID_XSUB, From patchwork Wed Sep 9 06:02:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22213 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A6DAD44BC6F for ; Wed, 9 Sep 2020 09:02:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8C25668B7BA; Wed, 9 Sep 2020 09:02:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0B6668B673 for ; Wed, 9 Sep 2020 09:02:23 +0300 (EEST) Received: by mail-io1-f49.google.com with SMTP id y13so1938346iow.4 for ; Tue, 08 Sep 2020 23:02:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ft2psQ4K4ak9eZcXUqS5ZLcgKZ4vKdifvLh23ws9lCg=; b=Q3Q6/0RcSzO/kvYDucZjimmhnkIW3iUANc/RQ8A3ksxsAYavBNbd0Vo4Sxe7iCBwpa WRTBI5s8v/bJsYAD1bUUsREcrnPhXShkmF1OOvxv0IxtohqOXTFwfrAqn4qsY0UQNwIj Lq/cknnjWHqXZU2BEei89xMuwlE0G6tfEo6AnqU7d8LXd5TBqyO4bxEaVAqgNWIaUd2l f8RTodJGxXuqNc6Eh5delcll8m5dNs9KdUNmMpy16M5j5kNJgqDp1sqdy8F/SyByE1d5 TpPmQ2B0EImQrseTF9vhFdPaEnQoPt15ad7hgpe6BNUXwdB/UxYippDmopJwWmQ7scrj rm/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ft2psQ4K4ak9eZcXUqS5ZLcgKZ4vKdifvLh23ws9lCg=; b=W8G60mvS8rICIQXqudiwMeBvRzqESU+Nnp/5JqnuZ/133JG4S0GceFp7RVr0imx5Ea KWe7dgnW+Fc2xlt6N96eo+4jjidowhXP6Z/F6UCi7kvIE2/HWb+kxqPG9DEAi3HxsLTe iOJvAr6LWRC/VqLZ61ttIC3r6K3hYM6kC2bnWG+evksip7vyy86+nNlwwstfDEfHlX5A Ax4AjNqibTp6zVhYAws7KNap/z9JNaebnunWwbxfkKqtJMwFH+dI+Ew+GxQ1PmSZl6XW Z1k3EiMDGaOC+odp9tvLU4aW4qSnkY37RxBHcBuq0o1Y4hl6EDq3YMR08CGUY2okIyXu RAJg== X-Gm-Message-State: AOAM53311X7nlh49D8+0egFK1Oa3buI81T+yF0dxgoR6VCrC6Bo4dWZk BbgL65ZuouNRX5rMzUQpROe/eJibag16 X-Google-Smtp-Source: ABdhPJzTJvI47t/cUhM/Pzb2X710gQus7CroUyOB8416PkUugFpCvPFWeWMlhVq1ytghZTFdg0En2w== X-Received: by 2002:a02:a04d:: with SMTP id f13mr2585269jah.112.1599631342161; Tue, 08 Sep 2020 23:02:22 -0700 (PDT) Received: from rcombs-mbp.localdomain (c-73-50-128-8.hsd1.il.comcast.net. [73.50.128.8]) by smtp.gmail.com with ESMTPSA id j20sm864575ilq.6.2020.09.08.23.02.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:21 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:04 -0500 Message-Id: <20200909060217.25794-2-rcombs@rcombs.me> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909060217.25794-1-rcombs@rcombs.me> References: <20200909060217.25794-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/15] lavc/codec_desc: add additional JPEG and BMP MIME types X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" --- libavcodec/codec_desc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 3dee640360..49a00ad264 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -82,7 +82,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "mjpeg", .long_name = NULL_IF_CONFIG_SMALL("Motion JPEG"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - .mime_types= MT("image/jpeg"), + .mime_types= MT("image/jpeg", "image/jpg"), .profiles = NULL_IF_CONFIG_SMALL(ff_mjpeg_profiles), }, { @@ -588,7 +588,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "bmp", .long_name = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - .mime_types= MT("image/x-ms-bmp"), + .mime_types= MT("image/x-ms-bmp", "image/bmp"), }, { .id = AV_CODEC_ID_CSCD, From patchwork Wed Sep 9 06:02:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22225 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3918E44A9B3 for ; Wed, 9 Sep 2020 09:28:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 11CED68B783; Wed, 9 Sep 2020 09:28:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f181.google.com (mail-il1-f181.google.com [209.85.166.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55CBC68ABC3 for ; Wed, 9 Sep 2020 09:28:35 +0300 (EEST) Received: by mail-il1-f181.google.com with SMTP id t13so1256743ile.9 for ; Tue, 08 Sep 2020 23:28:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=HN/ACU+/Gfy4tMoenEdIWQVaEI/UPXJy6wM12PV4qdQ=; b=Shr204Yjlp4ywMU2BeSQ3xh8o0Tc0Q1s605FQNX9bL+rtCClLVvBz+LgjPGLDCAHBC 4r6AptzIzN1CIjSt83yvkoGfUGAEV/ovdYG5lh6xRyM3TadUZTThrIR6WD0Mmc/Nj7v5 +38b+IhO+T7vFOQCseFlsNHzQxKr/e1zKXfhlZJdn3L/B8wnt5gca/JhfK2wKZU0oo7a HTq5eN/lThOLifT4VQJdREirQCvujaOpw2uTPl4XYyrvCPOJtLp3lLAmW21fmITo6+6M Nh/ct0zb11O/tUTc3iF94gunibOIY/78vGXpIuSdDHkcxCIr+ALqx5tt4oiKnpT0CzTb P+Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HN/ACU+/Gfy4tMoenEdIWQVaEI/UPXJy6wM12PV4qdQ=; b=JePh5rHLaWtCEJYK+sRV4XN9DLQDlrHHreXYogE46RY42XoSf4V8oDNhZKMSXygzj4 SQyuC284BCFJS3h7QtTYvB14yLWtjHetXJkpYNYujt7jv+RxE9d+pbu0r4Rv+iOwTSP0 z5Ewghrf/O8HaahWcmttG6pzmYnZNhlqDRhCIJ8R8E7KKHPQfq+1xt37jgvFGW3hs19X i+lf7z/JuuDmSzLFnSBOvA0LMLsB8/dbkxCWA1fcw6LuEPH0Ili920u92JiSIvLh/z+Y KDwO9Q4+7PjiDBaK4TrcTFRZd1mBwhtzmvBPeMapJAw9YLXugTGUlcmQCE14T2b4HRyf 9NXg== X-Gm-Message-State: AOAM533eL7ck6s4cfnJAZI1ErPrHRMt/aBzS8AdO67dEtiQDPtxc2fCv FIcmb4gHSyRh40kDsxv8NReO2CJVy0Uc X-Google-Smtp-Source: ABdhPJyf7A7F2TPL1HmQ6FMRtnGXk2Nnvt9YbK4e1d0e/62Ipwhf9yA/ZnE7m6aZqrlxzIFB9dhHYw== X-Received: by 2002:a92:b009:: with SMTP id x9mr2334126ilh.49.1599631343133; Tue, 08 Sep 2020 23:02:23 -0700 (PDT) Received: from rcombs-mbp.localdomain (c-73-50-128-8.hsd1.il.comcast.net. [73.50.128.8]) by smtp.gmail.com with ESMTPSA id j20sm864575ilq.6.2020.09.08.23.02.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:22 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:05 -0500 Message-Id: <20200909060217.25794-3-rcombs@rcombs.me> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909060217.25794-1-rcombs@rcombs.me> References: <20200909060217.25794-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/15] lavc/codec_desc: add new TTF and OTF MIME types X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" --- libavcodec/codec_desc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 49a00ad264..72ecc1012b 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -3343,7 +3343,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .type = AVMEDIA_TYPE_DATA, .name = "ttf", .long_name = NULL_IF_CONFIG_SMALL("TrueType font"), - .mime_types= MT("application/x-truetype-font", "application/x-font"), + .mime_types= MT("application/x-truetype-font", "application/x-font", "font/ttf"), }, { .id = AV_CODEC_ID_SCTE_35, @@ -3383,7 +3383,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .type = AVMEDIA_TYPE_DATA, .name = "otf", .long_name = NULL_IF_CONFIG_SMALL("OpenType font"), - .mime_types= MT("application/vnd.ms-opentype"), + .mime_types= MT("application/vnd.ms-opentype", "font/otf"), }, { .id = AV_CODEC_ID_SMPTE_KLV, From patchwork Wed Sep 9 06:02:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22214 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9FBA944BC6F for ; Wed, 9 Sep 2020 09:02:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8542068B814; Wed, 9 Sep 2020 09:02:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f171.google.com (mail-il1-f171.google.com [209.85.166.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA69D68B7FF for ; Wed, 9 Sep 2020 09:02:25 +0300 (EEST) Received: by mail-il1-f171.google.com with SMTP id t18so607019ilp.5 for ; Tue, 08 Sep 2020 23:02:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=B/wCUk+00YGF+85Zoftd367IgEmCDg5A1kvKjwqoOcI=; b=d+SRCesGkKnj44y6TT3MCHSzDkW72xYB3/FN1VwbS1KYUaoaJf/wjZOHOLCn60dH1+ C2ZO3gwYshGTZsMbdDDAkVxFDdEM/CXLUeyktmF5HS8RbtRpyMmKMo9WvDuoy3k1EG7A /wWXosRY8b4qZnczm68lRh1qv5v02Mae/1fhwBgnhQZd+/hNxmD3UeNeoPf0w8cmjLgA 4Oz6DQLpWOH7BMuKDTHEKLIhsV29ct6eOX8vHT3/65IIDzPgIpPFFyefde9j+eHkKqAT J/ehlH4XnmW3HH1EfXcreSU8Gk+jsCiUm0wFMnlHzAU6XmmWRQy/CIk04XLt9wQGPBU0 hXvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B/wCUk+00YGF+85Zoftd367IgEmCDg5A1kvKjwqoOcI=; b=JwG6yiiFpHIGM0ON1IMBaB9KMzl8b5sUMfWbo9yfcUFBWrws1OukrTzMmylo/xkKDb IyGifb7+Tq14B2LcoQR5YOVfeV5xBYzNqbCTH7q+KpnU69c3lnrjOzwSCaZEoOrjclV2 TzTiwLqd7/oYM72Q+sC9+3JkxbtilOg93v7X48fVL2okBdllHthlHbkxOX7beEUtW5V9 fKu9jk1JR7FdqfskWx3qwwbGuyJIyxcl11bDk5Ecauyr4A7k6nfwSwn5s/uxl5ZyO0+d 25k1JlNJgi2EQVdpZMla3Q4MAZqF46qiLYqv1fdh5+ppa+QJfdFZOCHQvOqMjOnqbZp2 te6Q== X-Gm-Message-State: AOAM5328ZmxDNB+S9UuCyrbKJ22l7izhsK7C/pdClCRzOVZUK52Y2M90 2O2HDklmvz2O4/WTpbeJ7tr/k1XWnArS X-Google-Smtp-Source: ABdhPJwtiui7QWeV5WSv6sDaOwdDmq9jZlCD5+PFZL9P6KVzIrD22E1EHxzok4M+y8Ke6isP7S1NKQ== X-Received: by 2002:a92:d1cb:: with SMTP id u11mr2079697ilg.15.1599631344135; Tue, 08 Sep 2020 23:02:24 -0700 (PDT) Received: from rcombs-mbp.localdomain (c-73-50-128-8.hsd1.il.comcast.net. [73.50.128.8]) by smtp.gmail.com with ESMTPSA id j20sm864575ilq.6.2020.09.08.23.02.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:23 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:06 -0500 Message-Id: <20200909060217.25794-4-rcombs@rcombs.me> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909060217.25794-1-rcombs@rcombs.me> References: <20200909060217.25794-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/15] lavc: add new font pseudo-codecs X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" --- libavcodec/codec_desc.c | 28 ++++++++++++++++++++++++++++ libavcodec/codec_id.h | 4 ++++ 2 files changed, 32 insertions(+) diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 72ecc1012b..ad044318c7 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -3410,6 +3410,34 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("binary data"), .mime_types= MT("application/octet-stream"), }, + { + .id = AV_CODEC_ID_TTC, + .type = AVMEDIA_TYPE_DATA, + .name = "ttc", + .long_name = NULL_IF_CONFIG_SMALL("OpenType font collection"), + .mime_types= MT("font/collection"), + }, + { + .id = AV_CODEC_ID_SFNT, + .type = AVMEDIA_TYPE_DATA, + .name = "sfnt", + .long_name = NULL_IF_CONFIG_SMALL("SFNT font"), + .mime_types= MT("font/sfnt", "application/font-sfnt"), + }, + { + .id = AV_CODEC_ID_WOFF, + .type = AVMEDIA_TYPE_DATA, + .name = "woff", + .long_name = NULL_IF_CONFIG_SMALL("WOFF font"), + .mime_types= MT("font/woff", "application/font-woff"), + }, + { + .id = AV_CODEC_ID_WOFF2, + .type = AVMEDIA_TYPE_DATA, + .name = "woff2", + .long_name = NULL_IF_CONFIG_SMALL("WOFF version 2 font"), + .mime_types= MT("font/woff2"), + }, { .id = AV_CODEC_ID_WRAPPED_AVFRAME, .type = AVMEDIA_TYPE_VIDEO, diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index e4eca5d580..06e5cdb4cd 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -552,6 +552,10 @@ enum AVCodecID { AV_CODEC_ID_DVD_NAV, AV_CODEC_ID_TIMED_ID3, AV_CODEC_ID_BIN_DATA, + AV_CODEC_ID_TTC, + AV_CODEC_ID_SFNT, + AV_CODEC_ID_WOFF, + AV_CODEC_ID_WOFF2, AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it From patchwork Wed Sep 9 06:02:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22215 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id AE25244BC6F for ; Wed, 9 Sep 2020 09:02:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9AAC968B821; Wed, 9 Sep 2020 09:02:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f182.google.com (mail-il1-f182.google.com [209.85.166.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA4CC68B7F2 for ; Wed, 9 Sep 2020 09:02:26 +0300 (EEST) Received: by mail-il1-f182.google.com with SMTP id m1so1204746ilj.10 for ; Tue, 08 Sep 2020 23:02:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=0XPh2fxOHFXZ8IwEvrkNhLF8R7u8Kau0W7NX33pJrVA=; b=DTsRUvEROScC3SNwkJqFN4NVvZVkK1h41PkzxtQhcul4tdJL5qTYKPt84rSv8hlhyB NjPR+zOkgB5TPr4QplI6RmB6eraR9O2D8rD42HW20S7E3uAbpqJSzlEundAyECJEASDA O9QGaDnxbyheDAAVh3azteu6bS1clVQqmjJ+Y1i82Hfsae7xESF2sS6a1g1ijZHfn9c/ uBF3A8mRVigjOzW6LUXReNbKnVutsIQacpBxEtrYzLuV9GGiOFAGZl3oMR2338v6Waxf Gq0jgFW7qfVm7W3Jq7hgH+fP/zSbbopnhQFcLy1g/fq4qc4iwYgRR1OG77nG+G6XTnRT vqXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0XPh2fxOHFXZ8IwEvrkNhLF8R7u8Kau0W7NX33pJrVA=; b=tX60STXp2q4YmFwB1h8g6WchhBQwlAsXUKfU3bHDEMb9SeTU5yygBcsfPrF7myP7OS Fu8vcFV5EjUdgdprE2XyvHLrlX7lV3DxaLbWHu/N3BaUSlQGt1Yx5W7xjsCC6QZ2xseR S8D9WTUCKVJ8eht9pxzUo5d3aReLqxjlpdRI4ACpu2qgjaVipV8nZNLmW3O3rxHachLk KraYmeTItDJTHUdXdsvejVW5tPDWW+rQ6LvGRl0NcidIZG0GIVUZCtGTnt6JfIh27zbL wQWSldhMIFGqQ8HRC/96/NnDX9QaKfOq+Q2kzkMfvMJX+azuGeRtPUO8+uU4VfyVvQ+O XiHw== X-Gm-Message-State: AOAM530iyztxuZuBOdl9nqAbTGjW9cQmTAo0vLEkkgiV1M7eO9UQSnfy y2UW0azg6ko6V9NabWbrwD1IsWLFs7Uk X-Google-Smtp-Source: ABdhPJyB2z6aqU8mDDsV1+ghrmG2T0FtFCwIJIg0C5AzMgIgHw3N4zH5hJcOpz1Q1INsi0RVs2GD6g== X-Received: by 2002:a92:35d0:: with SMTP id c77mr2030158ilf.183.1599631345081; Tue, 08 Sep 2020 23:02:25 -0700 (PDT) Received: from rcombs-mbp.localdomain (c-73-50-128-8.hsd1.il.comcast.net. [73.50.128.8]) by smtp.gmail.com with ESMTPSA id j20sm864575ilq.6.2020.09.08.23.02.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:24 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:07 -0500 Message-Id: <20200909060217.25794-5-rcombs@rcombs.me> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909060217.25794-1-rcombs@rcombs.me> References: <20200909060217.25794-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/15] lavf/matroskaenc: remove text/plain special-case X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" --- libavformat/matroskaenc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 233c472b8f..d9caa3e728 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1706,10 +1706,8 @@ static const char *get_mimetype(const AVStream *st) return t->value; if (st->codecpar->codec_id != AV_CODEC_ID_NONE) { const AVCodecDescriptor *desc = avcodec_descriptor_get(st->codecpar->codec_id); - if (desc && desc->mime_types) { + if (desc && desc->mime_types) return desc->mime_types[0]; - } else if (st->codecpar->codec_id == AV_CODEC_ID_TEXT) - return "text/plain"; } return NULL; From patchwork Wed Sep 9 06:02:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22216 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0077044BC6F for ; Wed, 9 Sep 2020 09:02:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D936168B811; Wed, 9 Sep 2020 09:02:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f47.google.com (mail-io1-f47.google.com [209.85.166.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF69268B817 for ; Wed, 9 Sep 2020 09:02:27 +0300 (EEST) Received: by mail-io1-f47.google.com with SMTP id d190so1945007iof.3 for ; Tue, 08 Sep 2020 23:02:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Yf/BwuAsv/EksP8akrX3XFz0b8AwxX+WnAkrgC8FVZU=; b=oDBgyTZQG5YUrnngu4CUZDTsz6d2CiYlMJFBcttHVAU8W2C7W3lgvEmjMpLBeXxeJl MsanRw4gHoAeIeqKu0BNnfkOwBnl4Xwbra9JN6RNLlyMHMpGNr/ulUPu5lmoogOm58PW zDWqzUl1/cwOFErbxxsABa5HnPeXMeb2+s6VrAv8VCY7QoG5aGrwDPUQhGb8AhiUCHKJ s46KYLmrdq1tDq9UY7PSkWZcIf/aY/slJvUUsOZmyP25ZyuCkYBfVOWt61gBwb7Aj/Jf VfCkGBulA2AKuBfs1T+fFFkuV2r4HnPyndySAVPUTYIyTBtzGbC12Tno/oDbzLby4+co QLRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Yf/BwuAsv/EksP8akrX3XFz0b8AwxX+WnAkrgC8FVZU=; b=S/MPw5/MCdkx2hjUbiQyi7Shp8yi9ejm8s4x5/Z2K7J2srlVzvLc5zUGrKvaQKvpCU G2LS8xrT8IZNl47hINgpUWJ/IeW3KUYuzg+qNjQMgkdE7E8d6sz+KcfVmedr70sf9kKm D1gWQ2pfhYvvQRtpEIlLS+ryVuerWeRhc7jf3iqGX0kradBVDm9KMkwSKgRudtG1hK5R 24rlv4IoVfEZbMvr5aPaGCpb/IztTO6IbzkowEIszB2p9wbJl3bvrFICXKQP19FbglyH Ev4Oqj1dvbnJC+6EVtI1t2bb1K1EduWD/LMg42HhjFo0xV3h7YZxHlAsu+EQu6fAFWtd eSag== X-Gm-Message-State: AOAM533pZMVyutS7YdGFI1X8Yeb0y2tiPVnKISrl69IS6a6gRoeICjze nGJg8ygcLISW9QeL8zRNFzL57+sHUhj/ X-Google-Smtp-Source: ABdhPJxGV8ElGtmD1s9THeO5IoDXsFJ0kAhMnhVzcR/yJE/r+TTt0gGx6EtVeMwI6YA900U1kvMVow== X-Received: by 2002:a02:94ee:: with SMTP id x101mr2591642jah.23.1599631346011; Tue, 08 Sep 2020 23:02:26 -0700 (PDT) Received: from rcombs-mbp.localdomain (c-73-50-128-8.hsd1.il.comcast.net. [73.50.128.8]) by smtp.gmail.com with ESMTPSA id j20sm864575ilq.6.2020.09.08.23.02.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:25 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:08 -0500 Message-Id: <20200909060217.25794-6-rcombs@rcombs.me> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909060217.25794-1-rcombs@rcombs.me> References: <20200909060217.25794-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/15] lavc/codec_desc: add avcodec_descriptor_get_by_mime_type X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" --- libavcodec/codec_desc.c | 41 +++++++++++++++++++++++++++++++++++++++++ libavcodec/codec_desc.h | 12 ++++++++++++ libavcodec/version.h | 2 +- 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index ad044318c7..61b7f8d74f 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -21,6 +21,7 @@ #include +#include "libavutil/avstring.h" #include "libavutil/common.h" #include "libavutil/internal.h" @@ -3480,6 +3481,46 @@ const AVCodecDescriptor *avcodec_descriptor_get_by_name(const char *name) return NULL; } +const AVCodecDescriptor *avcodec_descriptor_get_by_mime_type(const char *search, const char *prefix) +{ + const AVCodecDescriptor *desc = NULL; + int len, prefix_len; + if (!search) + return NULL; + + len = strlen(search); + if (!len) + return NULL; + + if (strchr(search, '/')) + prefix = NULL; + + if (prefix) + prefix_len = strlen(prefix); + + while ((desc = avcodec_descriptor_next(desc))) { + if (desc->mime_types) { + int i; + for (i = 0; desc->mime_types[i]; i++) { + const char *check = desc->mime_types[i]; + if (prefix) { + if (!av_strncasecmp(check, prefix, prefix_len) && + check[prefix_len] == '/') + check += prefix_len + 1; + else + continue; + } + + if (!av_strncasecmp(check, search, len) && + (check[len] == 0 || check[len] == '+' || check[len] == ';')) + return desc; + } + } + } + + return NULL; +} + enum AVMediaType avcodec_get_type(enum AVCodecID codec_id) { const AVCodecDescriptor *desc = avcodec_descriptor_get(codec_id); diff --git a/libavcodec/codec_desc.h b/libavcodec/codec_desc.h index 126b52df47..da38784a49 100644 --- a/libavcodec/codec_desc.h +++ b/libavcodec/codec_desc.h @@ -121,6 +121,18 @@ const AVCodecDescriptor *avcodec_descriptor_next(const AVCodecDescriptor *prev); */ const AVCodecDescriptor *avcodec_descriptor_get_by_name(const char *name); +/** + * Locate a codec descriptor with a particular MIME type + * + * @param search the MIME type to search for. + * @param prefix a prefix to use if the search type does not contain a media type. + * NULL if no default prefix should be used. + * + * @return codec descriptor with the given MIME type or NULL if no such + * descriptor exists. + */ +const AVCodecDescriptor *avcodec_descriptor_get_by_mime_type(const char *search, const char *prefix); + /** * @} */ diff --git a/libavcodec/version.h b/libavcodec/version.h index 4b221f96ad..5ce4ba55d9 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 105 +#define LIBAVCODEC_VERSION_MINOR 106 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ From patchwork Wed Sep 9 06:02:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22223 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1D8FD449ED1 for ; Wed, 9 Sep 2020 09:09:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B0F168B867; Wed, 9 Sep 2020 09:09:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D40168B864 for ; Wed, 9 Sep 2020 09:09:24 +0300 (EEST) Received: by mail-io1-f67.google.com with SMTP id u126so1897766iod.12 for ; Tue, 08 Sep 2020 23:09:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Ts8GhNAEt6RgQk+wx4IdsIOgl9K9RbW0uEBkfm0pg1w=; b=MCSyDDQd4B+q1FaCEW4qc1XMO2KcfXoZLzLGH5caMfQCvIiALkGN9H5HBQrUIku19F sWbB/uwXUsTLSVgURFw591JbVtPhb8+Cn7QzNY5/yk7xUanC0vZbCQ2746q2nAmn35Kg aVWilnv+Zux//PpFh5EAJZO4P2X2X/BDV0weaC4G8T/Zb2zN0lugRRTSaJPVoipHpQNE NzHxXAjQzH5OOHlWPcz/WXO99fhsVgiVhBcx0l4cSv5AgRehP2ktHCoUZGwj47yjlYnI zfQ1RZ/qaIPWRT5bBuXUX9+xCovzLj/yGk8D/7AMAdUuTf5+2N85gvGn/wHmj98tnCcs UEow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ts8GhNAEt6RgQk+wx4IdsIOgl9K9RbW0uEBkfm0pg1w=; b=R/TH4+sEsQXZ9jVY65zGOAIzgGi3LuuF//21qvKHYbGNlTjxsHWFhysvnTj566n8wT dDS6eciEtEIbLPUMijsZ4IWYyt7IfUHrnrEY4CPArPlTtBxVIzOo+LenOEpN8rPyDQF5 4YDzp7Px0/x3bNID9TvjfIrb6H2Q/zbuYVNS+aztkmpwrJ9hqxNOkMLHo8gC1dqV4fTJ qLwFnsDzBCwzxnIs4LYgXZwaTxbdA2iwYI5fd93bo6W9kQIZEsQgIh8bs4Ou1I0qtYYF 71oGGiX5zO0egs3W3irMQqiCEtf37Or2RpeXYSoMqLrb9rX/LYscVVrhsW1Ssxp1abpO u6Mw== X-Gm-Message-State: AOAM530J6YlDFBVawh7rXUHzIHPgyRPd4m3BP1vrzKoyzSC9EQdwBWzH 8CXeKZ+t3trsn4eYjHzbdoAB/2+odHR5 X-Google-Smtp-Source: ABdhPJyzeGPUk0w7gHNyFpplqdTMYPcM2nAH3F/cMo2d+rvd313wWr7f35HJHecVyLJPgK/s+d5SLg== X-Received: by 2002:a02:1a83:: with SMTP id 125mr2649470jai.48.1599631346949; Tue, 08 Sep 2020 23:02:26 -0700 (PDT) Received: from rcombs-mbp.localdomain (c-73-50-128-8.hsd1.il.comcast.net. [73.50.128.8]) by smtp.gmail.com with ESMTPSA id j20sm864575ilq.6.2020.09.08.23.02.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:26 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:09 -0500 Message-Id: <20200909060217.25794-7-rcombs@rcombs.me> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909060217.25794-1-rcombs@rcombs.me> References: <20200909060217.25794-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/15] lavf/matroskadec: use avcodec_descriptor_get_by_mime_type X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" --- libavformat/matroskadec.c | 40 ++++++--------------------------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index b1ef344aa7..71debe692a 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -749,25 +749,6 @@ static EbmlSyntax matroska_cluster_enter[] = { }; #undef CHILD_OF -static const CodecMime mkv_image_mime_tags[] = { - {"image/gif" , AV_CODEC_ID_GIF}, - {"image/jpeg" , AV_CODEC_ID_MJPEG}, - {"image/png" , AV_CODEC_ID_PNG}, - {"image/tiff" , AV_CODEC_ID_TIFF}, - - {"" , AV_CODEC_ID_NONE} -}; - -static const CodecMime mkv_mime_tags[] = { - {"text/plain" , AV_CODEC_ID_TEXT}, - {"application/x-truetype-font", AV_CODEC_ID_TTF}, - {"application/x-font" , AV_CODEC_ID_TTF}, - {"application/vnd.ms-opentype", AV_CODEC_ID_OTF}, - {"binary" , AV_CODEC_ID_BIN_DATA}, - - {"" , AV_CODEC_ID_NONE} -}; - static const char *const matroska_doctypes[] = { "matroska", "webm" }; static int matroska_read_close(AVFormatContext *s); @@ -2908,6 +2889,7 @@ static int matroska_read_header(AVFormatContext *s) attachments[j].bin.data && attachments[j].bin.size > 0)) { av_log(matroska->ctx, AV_LOG_ERROR, "incomplete attachment\n"); } else { + const AVCodecDescriptor *desc = avcodec_descriptor_get_by_mime_type(attachments[j].mime, NULL); AVStream *st = avformat_new_stream(s, NULL); if (!st) break; @@ -2917,17 +2899,12 @@ static int matroska_read_header(AVFormatContext *s) av_dict_set(&st->metadata, "title", attachments[j].description, 0); st->codecpar->codec_id = AV_CODEC_ID_NONE; - for (i = 0; mkv_image_mime_tags[i].id != AV_CODEC_ID_NONE; i++) { - if (!strncmp(mkv_image_mime_tags[i].str, attachments[j].mime, - strlen(mkv_image_mime_tags[i].str))) { - st->codecpar->codec_id = mkv_image_mime_tags[i].id; - break; - } - } + if (desc) + st->codecpar->codec_id = desc->id; attachments[j].stream = st; - if (st->codecpar->codec_id != AV_CODEC_ID_NONE) { + if (desc && desc->type == AVMEDIA_TYPE_VIDEO) { AVPacket *pkt = &st->attached_pic; st->disposition |= AV_DISPOSITION_ATTACHED_PIC; @@ -2947,13 +2924,8 @@ static int matroska_read_header(AVFormatContext *s) memcpy(st->codecpar->extradata, attachments[j].bin.data, attachments[j].bin.size); - for (i = 0; mkv_mime_tags[i].id != AV_CODEC_ID_NONE; i++) { - if (!strncmp(mkv_mime_tags[i].str, attachments[j].mime, - strlen(mkv_mime_tags[i].str))) { - st->codecpar->codec_id = mkv_mime_tags[i].id; - break; - } - } + if (!strcmp(attachments[j].mime, "binary")) + st->codecpar->codec_id = AV_CODEC_ID_BIN_DATA; } } } From patchwork Wed Sep 9 06:02:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22221 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id EE059449DDA for ; Wed, 9 Sep 2020 09:08:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C7E3D68B821; Wed, 9 Sep 2020 09:08:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f195.google.com (mail-il1-f195.google.com [209.85.166.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE67E68B63E for ; Wed, 9 Sep 2020 09:08:45 +0300 (EEST) Received: by mail-il1-f195.google.com with SMTP id m1so1216534ilj.10 for ; Tue, 08 Sep 2020 23:08:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=1BsNJzanZR5KJCn+YNRcwnhWTPzIUsNf8J+XYABD5NI=; b=Wbesgb/9eLHFvxm2JsslgSVY/AUMRfb0uBgIN/4iC3DDbwLJBWXKKb1eWMcXWEq2Mv QwYTGRY+hsf2gT87hyUmippoiRRONU9RkSMDLNB+bbuaaCtLcp3WVSD3rXe8PglfAFgD 4n8pmV7XUj7xVlUh4+dp74Y8BRxxUracrfXmRra05mk5aFM5+8cCJxKmUtuQyhWzoiFj sr9qMUGH+FlyVqulTFRo/qYkJCSElGioXBRf0dxVtEOPScsoME5GW3+aDYCgQaHbdwmc YjC5sd6CnzQni7g8gKK1TyCdg6tFA2Bn2i0XjpkFoEuNg/BRr4QPeRsac+5wYEtw1IKX l8Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1BsNJzanZR5KJCn+YNRcwnhWTPzIUsNf8J+XYABD5NI=; b=VYD/A6A7Jhm11evFXnT2WUIFnoroSoDoavwafPnjWn3pl2O07//lg/elcVWgZeSEX5 TV7e4keRYmYDWG8E27Wpyi/5RPd7QA5Had+FozDp9VN5pkYBH3yJ2hTLjDaQdnFQ57hH o9DpZxuXN7aEPfZJnaSFptDfsXPsBkAwLs2JgF9PSFVO1a4Krj5ZGxUkXF1GYK8d2VYJ 1tahzmTxdwes6KCKQKNvzMdZ2hhZHqxwKDfj1cVkZ24fNRddvD8iBs3fHAdNhc+J1q+5 /jKzwhTb16p4bHXDux0PXFV5XKoAVU2ewfjrp+cNFw105pRn1VFoAY7YzQTC2MxblWy5 QJww== X-Gm-Message-State: AOAM532MZOFVu48u0v8v21msYuC/JZ/g14wlB+n0r++QYOslYWOGJzNC 7ojBFAR9E+ZL2uroB5PRAVb5U666cNyd X-Google-Smtp-Source: ABdhPJx2rgtXkbklN6Ccmevb69Gye4SrLfDmI6KbGu/16gbzmZVutjffiAEl7vCOYUOq4Ka5vuO6Jw== X-Received: by 2002:a05:6e02:66f:: with SMTP id l15mr2266313ilt.234.1599631347859; Tue, 08 Sep 2020 23:02:27 -0700 (PDT) Received: from rcombs-mbp.localdomain (c-73-50-128-8.hsd1.il.comcast.net. [73.50.128.8]) by smtp.gmail.com with ESMTPSA id j20sm864575ilq.6.2020.09.08.23.02.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:27 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:10 -0500 Message-Id: <20200909060217.25794-8-rcombs@rcombs.me> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909060217.25794-1-rcombs@rcombs.me> References: <20200909060217.25794-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/15] lavf/id3v2enc: use codec-desc-provided MIME types X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" --- libavformat/id3v2enc.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libavformat/id3v2enc.c b/libavformat/id3v2enc.c index 5d821ea4db..a7f251652f 100644 --- a/libavformat/id3v2enc.c +++ b/libavformat/id3v2enc.c @@ -352,23 +352,18 @@ int ff_id3v2_write_apic(AVFormatContext *s, ID3v2EncContext *id3, AVPacket *pkt) { AVStream *st = s->streams[pkt->stream_index]; AVDictionaryEntry *e; + const AVCodecDescriptor *cdesc = avcodec_descriptor_get(st->codecpar->codec_id); AVIOContext *dyn_buf; uint8_t *buf; - const CodecMime *mime = ff_id3v2_mime_tags; const char *mimetype = NULL, *desc = ""; int enc = id3->version == 3 ? ID3v2_ENCODING_UTF16BOM : ID3v2_ENCODING_UTF8; int i, len, type = 0, ret; /* get the mimetype*/ - while (mime->id != AV_CODEC_ID_NONE) { - if (mime->id == st->codecpar->codec_id) { - mimetype = mime->str; - break; - } - mime++; - } + if (cdesc && cdesc->mime_types) + mimetype = cdesc->mime_types[0]; if (!mimetype) { av_log(s, AV_LOG_ERROR, "No mimetype is known for stream %d, cannot " "write an attached picture.\n", st->index); From patchwork Wed Sep 9 06:02:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22218 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9AB7B44BC6F for ; Wed, 9 Sep 2020 09:02:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 88C3868B83C; Wed, 9 Sep 2020 09:02:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f44.google.com (mail-io1-f44.google.com [209.85.166.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B51968B825 for ; Wed, 9 Sep 2020 09:02:30 +0300 (EEST) Received: by mail-io1-f44.google.com with SMTP id r9so1948519ioa.2 for ; Tue, 08 Sep 2020 23:02:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=vqSRIxLLutp0qjIZyh1NCsa4+pNlH+IvoYBLcn3vu1o=; b=crhwgsngdPMuj5IDcGhSaHU3lSsVacaQ1TbkL2Fr90bxCczIx/D+bjphtbwxbc2exe VhMy+yfOANxUoy8x/DuNyJchcg26xY3GjxNxK5DjOdsz8WrZvPW03G6IzOOnMYO8355A 27y5T5Oq4IC2ClEscfBLdgZl9BQj92Kl0BKqIg46wHmjsmXmmF9msyk48mVodOA+itfx QDfEIBbaivFFXWrb+SMHn9SY+sRGowkZuJYugVqQ3B59fNn4otziDW3QzWJsKNrdUJnH Mj3iJdPWuQUhAOWLBsI9El3k05e0H8N13U8TtZPQL9yQvXdn7N1ljfkzAvFR59kdrA9G OjXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vqSRIxLLutp0qjIZyh1NCsa4+pNlH+IvoYBLcn3vu1o=; b=dfJDf9hIJnMV+cdY/KQ/GrMV80Qg2Mg0lbd3Edx54FcpZlLbbZJcZBJKxonTQvnto2 c6GlGk8SndGU2+qibmWS2vmCZvcmq1fribCIMFaCUD3OCVQVvt0ut828hhiDjE5OuKQc BRDzGh0AjikVapAKdtE9RixVtDuPDoQVbgKQrXT+bfqCjS+S6ezpS3aEecomseoYUV3c NCM5MayJ9UnrhmZRNh0+rmCsB0sfRWqEfD2bW4xe4gQB2H0hpXtN055ktf0ff8Rz3Fjt 4aaSiSZn/tSC18i7buImYS+YbhL5a4OGCmytbvHrUI2tvfje5Cqen2iX36PzWfv1B8NC 8yEw== X-Gm-Message-State: AOAM532K/fvPFTu2Y9aVzX3c7nOiJvU9eT77FB7l7jOO3vf4XnXNBtDY TsIMvjhf7yMOpJ7QkzdDVl5bQ5tSjrOy X-Google-Smtp-Source: ABdhPJwzQkxmo+4Ggxcgd1lEU8O9NixsTdJgLvoJMrtAv3GP4zxi6OuSKJoWwIBsDdzE4gEVWz9dYA== X-Received: by 2002:a05:6638:dd3:: with SMTP id m19mr2733910jaj.115.1599631348736; Tue, 08 Sep 2020 23:02:28 -0700 (PDT) Received: from rcombs-mbp.localdomain (c-73-50-128-8.hsd1.il.comcast.net. [73.50.128.8]) by smtp.gmail.com with ESMTPSA id j20sm864575ilq.6.2020.09.08.23.02.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:28 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:11 -0500 Message-Id: <20200909060217.25794-9-rcombs@rcombs.me> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909060217.25794-1-rcombs@rcombs.me> References: <20200909060217.25794-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/15] lavf/id3v2: use avcodec_descriptor_get_by_mime_type X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" --- libavformat/id3v2.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index cecd9b9f6d..72a10bd1e1 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -585,7 +585,7 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, { int enc, pic_type; char mimetype[64] = {0}; - const CodecMime *mime = ff_id3v2_mime_tags; + const AVCodecDescriptor *desc; enum AVCodecID id = AV_CODEC_ID_NONE; ID3v2ExtraMetaAPIC *apic = NULL; ID3v2ExtraMeta *new_extra = NULL; @@ -614,13 +614,9 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, taglen -= 3; } - while (mime->id != AV_CODEC_ID_NONE) { - if (!av_strncasecmp(mime->str, mimetype, sizeof(mimetype))) { - id = mime->id; - break; - } - mime++; - } + if ((desc = avcodec_descriptor_get_by_mime_type(mimetype, "image"))) + id = desc->id; + if (id == AV_CODEC_ID_NONE) { av_log(s, AV_LOG_WARNING, "Unknown attached picture mimetype: %s, skipping.\n", mimetype); From patchwork Wed Sep 9 06:02:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22222 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 21BAD449ED1 for ; Wed, 9 Sep 2020 09:09:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 092A268B847; Wed, 9 Sep 2020 09:09:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f196.google.com (mail-il1-f196.google.com [209.85.166.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F8F068B844 for ; Wed, 9 Sep 2020 09:09:15 +0300 (EEST) Received: by mail-il1-f196.google.com with SMTP id a8so1261129ilk.1 for ; Tue, 08 Sep 2020 23:09:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=9OpXqfS6la1ks+geJcz33IBMhW2kpxGadZk7RtwkxHE=; b=PqbOefMCWFpAtCt/Qx7/6IHKXkqXg72b5q/7Vhy8yM2ChiQjrQhZmj+I9S3uFPxDOP opg9sqveAlIehLgj/buBHX/ULgBvinnv2e/HRWVYh+/dEkNBpO1dD+cV+vT+v7ElxFqL Q1SYnUNQQccKiYrwUQ8nAdCPvjJ46uR3cgy/GYuCfT6t5d4NtXYU7lRr5WYfatPC0sB1 LppP1g/4gOcj+y9QhJcLV3fiZVf5EX7ksz/WF/1wxlEVBz7OVtpjV7quH4reDuGfBRf6 tcDXDVAYPD5Il/3OmW0458G6+IN3D909V9mUEYs/VsVlsS8/j4rIOdaEahVUhGWOZD3e KzTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9OpXqfS6la1ks+geJcz33IBMhW2kpxGadZk7RtwkxHE=; b=psTSL8imrrY8GdvhVdBooe2plP3IfQ4PJpaRBS7bS96lDwMVCHweD+4ywbqmI4UtQv Mz0Qfd4RaefOW3eThQj2qGfv+CTe4KuP9UN7VTEWDV66RrY0Cb8Ofe+16+fVrUvnXfxw B1i1pWG5LkweA4DyglZFYC1RXk9ycR0nnHq614vrclMndaZ8CbG1oP4Oq51cPgoYSc6/ Lok3+hesQExfdVJ5sY0e3H+OuLko6ozZrlCvXqeiDhm4lukY+elMUa0XfAljEnXdPWhU Rb8cY3HjeanBi9oZSFxtApzjx7omam6w8PGiU6SYfQqkvM/hgPdUMSLExlHEnKNJgn2J HG1g== X-Gm-Message-State: AOAM53104XyE+piCo51UepxGGhNaT6/+4/jkGg+DRKuLJYuuSHqukm9q tMXNF+nlRQoBcKk0IyUsj+XqM3FPZH32 X-Google-Smtp-Source: ABdhPJyuL/3Ja5UA9vj1bZxKXHYa2qYpFWBSata6p6m6qqN/d1JdM4xSPNs7mYJm6v+0aNTn7gKUGg== X-Received: by 2002:a05:6e02:cc:: with SMTP id r12mr2102033ilq.122.1599631349708; Tue, 08 Sep 2020 23:02:29 -0700 (PDT) Received: from rcombs-mbp.localdomain (c-73-50-128-8.hsd1.il.comcast.net. [73.50.128.8]) by smtp.gmail.com with ESMTPSA id j20sm864575ilq.6.2020.09.08.23.02.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:29 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:12 -0500 Message-Id: <20200909060217.25794-10-rcombs@rcombs.me> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909060217.25794-1-rcombs@rcombs.me> References: <20200909060217.25794-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/15] lavf/flac_picture: use avcodec_descriptor_get_by_mime_type X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" --- libavformat/flac_picture.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libavformat/flac_picture.c b/libavformat/flac_picture.c index 53e24b28b7..3e684b58a3 100644 --- a/libavformat/flac_picture.c +++ b/libavformat/flac_picture.c @@ -31,7 +31,7 @@ int ff_flac_parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size, int truncate_workaround) { - const CodecMime *mime = ff_id3v2_mime_tags; + const AVCodecDescriptor *cdesc; enum AVCodecID id = AV_CODEC_ID_NONE; AVBufferRef *data = NULL; uint8_t mimetype[64], *desc = NULL; @@ -78,13 +78,8 @@ int ff_flac_parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size, int tr bytestream2_get_bufferu(&g, mimetype, len); mimetype[len] = 0; - while (mime->id != AV_CODEC_ID_NONE) { - if (!strncmp(mime->str, mimetype, sizeof(mimetype))) { - id = mime->id; - break; - } - mime++; - } + if ((cdesc = avcodec_descriptor_get_by_mime_type(mimetype, "image"))) + id = cdesc->id; if (id == AV_CODEC_ID_NONE) { av_log(s, AV_LOG_ERROR, "Unknown attached picture mimetype: %s.\n", mimetype); From patchwork Wed Sep 9 06:02:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22226 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 8B21144AE3D for ; Wed, 9 Sep 2020 09:30:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5244368B7DA; Wed, 9 Sep 2020 09:30:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7EC1A68B783 for ; Wed, 9 Sep 2020 09:30:28 +0300 (EEST) Received: by mail-qt1-f175.google.com with SMTP id 19so1179955qtp.1 for ; Tue, 08 Sep 2020 23:30:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=W+ZnjixDCQ2UTuTvgBdZ8CQD9ITnpae7EqJHY0iskUY=; b=GkdMfxoDXNuWMLuqacFouzHE1qaLBfMFPj1idhilFn+48mkZC1oKWjtrUNwhNaeeTq DHMDvuv3T6qbrVghlZBFHNgLxoRzzQkHiPcFZv1yA/zzgYmxj06RDJoJK1JkNnPSF4zs mWv3Od+EMCTCUvDhYeUpG6Jomz/Lado95Hjr8EDNqXilMkKGftEfwtWdEIfHNCQS1O2j OZteEETRdBFkcDRO9847akvLW1ywGkxPRwIZPcDgvu6te83qX8DE4HzyuI69j8IWPG/R aFA25qqNrdSy7ACw1EXZbKZrmLS214p548egrKEuC1tdqvok17zQpaB5uWLk1Pm9m74Y Bj1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W+ZnjixDCQ2UTuTvgBdZ8CQD9ITnpae7EqJHY0iskUY=; b=CPOtduGqfyP+kbKeHsyJ8vK/nbPma+gMfITwfw/4MUXTMp1tpBGorTdAksdWeLlmWq CIOMAYnVvFVPURQr1bX1BqPGyfKRYIvUQJadQMmvAKXZ+pkLaOLZkmOHjbtfsYFhGhfs h7O+Qb1vUTIZsJ6eRdGPC7yun8DgMFv6m0R2DgZIxCmh+l8Ug/S7g38JMTZtAgBdxKnK smFicLhcxGPCVh43zkBkAqr5pq77mO70KXLEqPbHZEhE39WhX9xDRu0CulvLfdFTT9WD byxnLfUAKwG75eTgPrOma6GT+mJ3znZHk77paR6/Bkvx3pwCMc2VTNLmCnDt8vRJWTef fo6g== X-Gm-Message-State: AOAM532HpPiU/UPQ2JpoFNgbWgIOh5T7/hM/NTtrze4MQLhlx1s0/Z4y rjhMH2TKDUA7smlHY+XzWo7pJCJCpUXp X-Google-Smtp-Source: ABdhPJwrVC4dGSKM1FbOQcBO8VUUOqs7Z5d3yJkxsnThCSdSBVWvCpRo+ITxAL6GJkmNRK1bLWvFLQ== X-Received: by 2002:a02:8802:: with SMTP id r2mr2644580jai.75.1599631350626; Tue, 08 Sep 2020 23:02:30 -0700 (PDT) Received: from rcombs-mbp.localdomain (c-73-50-128-8.hsd1.il.comcast.net. [73.50.128.8]) by smtp.gmail.com with ESMTPSA id j20sm864575ilq.6.2020.09.08.23.02.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:30 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:13 -0500 Message-Id: <20200909060217.25794-11-rcombs@rcombs.me> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909060217.25794-1-rcombs@rcombs.me> References: <20200909060217.25794-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/15] lavf/flacenc: use codec-desc-provided MIME types X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" --- libavformat/flacenc.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c index b947a3b067..ebb0ffb967 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -80,22 +80,17 @@ static int flac_write_picture(struct AVFormatContext *s, AVPacket *pkt) FlacMuxerContext *c = s->priv_data; AVIOContext *pb = s->pb; const AVPixFmtDescriptor *pixdesc; - const CodecMime *mime = ff_id3v2_mime_tags; AVDictionaryEntry *e; const char *mimetype = NULL, *desc = ""; const AVStream *st = s->streams[pkt->stream_index]; + const AVCodecDescriptor *cdesc = avcodec_descriptor_get(st->codecpar->codec_id); int i, mimelen, desclen, type = 0, blocklen; if (!pkt->data) return 0; - while (mime->id != AV_CODEC_ID_NONE) { - if (mime->id == st->codecpar->codec_id) { - mimetype = mime->str; - break; - } - mime++; - } + if (cdesc && cdesc->mime_types) + mimetype = cdesc->mime_types[0]; if (!mimetype) { av_log(s, AV_LOG_ERROR, "No mimetype is known for stream %d, cannot " "write an attached picture.\n", st->index); From patchwork Wed Sep 9 06:02:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22227 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 88DC444B44A for ; Wed, 9 Sep 2020 09:31:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5F53C68B817; Wed, 9 Sep 2020 09:31:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD94568B6F5 for ; Wed, 9 Sep 2020 09:31:14 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id n14so1265401pff.6 for ; Tue, 08 Sep 2020 23:31:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=BBJhzMDnwFwJbIvS+2O2xUvPOpuezncL2HN9A2/cWVg=; b=VNEspUsAOeugs1S4PzdsmiRBksnqLP3HvCgBcXuTvSYMLG4Bwxu5yOk5rucL6ghs5N XvTBfCIlfOZ31TwLotfy/DYGY4KhYIxjAWL8Q8oX0246caHe8EQp1xR9pcSfOjA+A/Ug CuThjzWpXpqOYijkKWFADcCEFlGJjMAu/mGfP72Rvy4MXFO794d1fgaA8M0wnM6TgDf4 PGwMqmC3/6R5KkEPeAWOpsGtlR9wjDW5BjPOUiUyTGoVJhlEhI4DRs7nwu/mk5PlclUW hdhbFJ/f3TuFXCfw1dLuyJjGS8J4/aNWS6p0Y+csbCwFxVAuIEGxOl2S6H21BIxP9kJK pB+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BBJhzMDnwFwJbIvS+2O2xUvPOpuezncL2HN9A2/cWVg=; b=HnqkrC7EEluRrOyhDig05gWR4dBmyKKDdJJLTQghwj/4EBLBnHpmgnJGtXVazjA2Mc KnKNFpFv0GBXuCLAwun9NvmJSHOs/HFo2suSqK8UrDQ+87zH7PxljNu43e5+qxbIar+Z JghdQvsscBUniVZdYPRJ5jwcBscXxwGa6LplF/HIwjm3y/iZTHjfdCVqutCcg5y/VNxX 3RU/3sqVPYAPoGCu/1xYYeaHR2czJJzE66xHsBaDNjAMxerSVCHHAFPdhcIWDIl+Bf2g L9MpxXLBfLnBRBAQyS4Q1osw/f+xsrci4zw3kUvkdLHdm7OSSCGswms8ZccUMHAo0Fwv W8+A== X-Gm-Message-State: AOAM530FKQTJr6lePt73afa0C9CtBgWmMtNZI4N8usgo/H9Mvcru0qqY Ql1V4LmUs8nuVr7oKCRyp/pp3gnT664s X-Google-Smtp-Source: ABdhPJyi42Ogm7PDVqOErPgNTKE4tk2yM2iGHjbglPJoI4K1Oe7NnWgAunMiaCEcuIMjnPFrF1LokQ== X-Received: by 2002:a92:d952:: with SMTP id l18mr2081501ilq.97.1599631351966; Tue, 08 Sep 2020 23:02:31 -0700 (PDT) Received: from rcombs-mbp.localdomain (c-73-50-128-8.hsd1.il.comcast.net. [73.50.128.8]) by smtp.gmail.com with ESMTPSA id j20sm864575ilq.6.2020.09.08.23.02.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:31 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:14 -0500 Message-Id: <20200909060217.25794-12-rcombs@rcombs.me> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909060217.25794-1-rcombs@rcombs.me> References: <20200909060217.25794-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/15] lavf/mp3enc: use codec descs for query_codec X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" --- libavformat/mp3enc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index a3586e1f86..eb8cc2e22f 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -489,12 +489,9 @@ static int mp3_write_trailer(struct AVFormatContext *s) static int query_codec(enum AVCodecID id, int std_compliance) { - const CodecMime *cm= ff_id3v2_mime_tags; - while(cm->id != AV_CODEC_ID_NONE) { - if(id == cm->id) - return MKTAG('A', 'P', 'I', 'C'); - cm++; - } + const AVCodecDescriptor *desc = avcodec_descriptor_get(id); + if (desc && desc->type == AVMEDIA_TYPE_VIDEO && desc->mime_types) + return MKTAG('A', 'P', 'I', 'C'); return -1; } From patchwork Wed Sep 9 06:02:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22217 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 4ECD744BC6F for ; Wed, 9 Sep 2020 09:02:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2EE6968B81F; Wed, 9 Sep 2020 09:02:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f47.google.com (mail-io1-f47.google.com [209.85.166.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 83D5F68B73E for ; Wed, 9 Sep 2020 09:02:34 +0300 (EEST) Received: by mail-io1-f47.google.com with SMTP id d190so1945200iof.3 for ; Tue, 08 Sep 2020 23:02:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=VaCL2GiuD3oMb2yCyYRb1pEOgFEjljqrNQRtReKA3bQ=; b=DFU3BUKOk+WSpOpgwbml7y0G/kxy3v3kjTTILR+zfzHTgECzItIV6Kde4ObMy1ZaBf EKdp8Yxy81eUH7ApQjzJ3vGLMrfbgJx4Edc2IgAG9xZQqLk1YODmtgPA5TPN5gjS8utd jMCuOLZxqvUTFov97pxnt8NyC+8w72gG+ve9pKdFmtySowciGAo1gBYvu4mJPwp2ZV6S Z8tnNbIHywxTQwCt3LfJd4BJqp7jz+8YJMxwUOJr8gXWMIpBlJU7L2GN/FttHNs/aYaa pqI2aE4jLd80bnlUSUsf7/UT0ZELWLajbT1kFxXFJOvNLhbUvrbDk/gmeFAkkrIqG/UO afIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VaCL2GiuD3oMb2yCyYRb1pEOgFEjljqrNQRtReKA3bQ=; b=ssRP6SXECpA7vryR1ISdgTvqVjbcfr5OMqFCCuY7jtELUXiZGE4vp0/JZzRq6itkZ9 8MxanXkYr2PDHdpRHn651IxkYSlyTON3YYwqQ0A9snvpPtbfN+qmicLuK6mUxHZPbyWr AOPB6lkqvxz6eZDLwdif0l/4uuPWiuCjb52WuoLQDaCe9FcNAYmTVMPHcpm+FQLuVtm6 1QJ1GhquVB3LNiHxMePAsoHfGpUjAyQSjHaxB74KEl0KzF8uBRkLmP6W4gCLzHVA5Nre jz/5aVp+t+6kLV84inj8bY9xWCHE5IMCioKTTwLfoRyx6zZeGlll05RgdhRfzmXn2lSy 1/YA== X-Gm-Message-State: AOAM530cvavMIDU/hM1jFrHNcp3szc0/ppJZwXA2qx1lHQr4daclM8/J DLiCysOMt9b0cJgT2Ag2Xp5g9HtXguAO X-Google-Smtp-Source: ABdhPJxJwqWVAlNIXeDcySMTcYY3hBLUwWU8vuqg5tOGSr/TcQKLQVtpYez+Mq6Cnzl/ZcipeilS9Q== X-Received: by 2002:a6b:c997:: with SMTP id z145mr2152882iof.136.1599631352906; Tue, 08 Sep 2020 23:02:32 -0700 (PDT) Received: from rcombs-mbp.localdomain (c-73-50-128-8.hsd1.il.comcast.net. [73.50.128.8]) by smtp.gmail.com with ESMTPSA id j20sm864575ilq.6.2020.09.08.23.02.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:32 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:15 -0500 Message-Id: <20200909060217.25794-13-rcombs@rcombs.me> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909060217.25794-1-rcombs@rcombs.me> References: <20200909060217.25794-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/15] lavf/asfdec: use avcodec_descriptor_get_by_mime_type X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" --- libavformat/asfdec_f.c | 11 +++-------- libavformat/asfdec_o.c | 11 +++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index e9ddca7151..c35b81550b 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -218,7 +218,7 @@ static int get_value(AVIOContext *pb, int type, int type2_size) static int asf_read_picture(AVFormatContext *s, int len) { AVPacket pkt = { 0 }; - const CodecMime *mime = ff_id3v2_mime_tags; + const AVCodecDescriptor *cdesc; enum AVCodecID id = AV_CODEC_ID_NONE; char mimetype[64]; uint8_t *desc = NULL; @@ -245,13 +245,8 @@ static int asf_read_picture(AVFormatContext *s, int len) /* picture MIME type */ len -= avio_get_str16le(s->pb, len, mimetype, sizeof(mimetype)); - while (mime->id != AV_CODEC_ID_NONE) { - if (!strncmp(mime->str, mimetype, sizeof(mimetype))) { - id = mime->id; - break; - } - mime++; - } + if ((cdesc = avcodec_descriptor_get_by_mime_type(mimetype, "image"))) + id = cdesc->id; if (id == AV_CODEC_ID_NONE) { av_log(s, AV_LOG_ERROR, "Unknown attached picture mimetype: %s.\n", mimetype); diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 1b10e47907..970748c6cf 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -359,7 +359,7 @@ static int asf_read_picture(AVFormatContext *s, int len) { ASFContext *asf = s->priv_data; AVPacket pkt = { 0 }; - const CodecMime *mime = ff_id3v2_mime_tags; + const AVCodecDescriptor *cdesc; enum AVCodecID id = AV_CODEC_ID_NONE; char mimetype[64]; uint8_t *desc = NULL; @@ -387,13 +387,8 @@ static int asf_read_picture(AVFormatContext *s, int len) /* picture MIME type */ len -= avio_get_str16le(s->pb, len, mimetype, sizeof(mimetype)); - while (mime->id != AV_CODEC_ID_NONE) { - if (!strncmp(mime->str, mimetype, sizeof(mimetype))) { - id = mime->id; - break; - } - mime++; - } + if ((cdesc = avcodec_descriptor_get_by_mime_type(mimetype, "image"))) + id = cdesc->id; if (id == AV_CODEC_ID_NONE) { av_log(s, AV_LOG_ERROR, "Unknown attached picture mimetype: %s.\n", mimetype); From patchwork Wed Sep 9 06:02:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22219 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 708EE44BC6F for ; Wed, 9 Sep 2020 09:02:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5FEFA68B84A; Wed, 9 Sep 2020 09:02:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f170.google.com (mail-il1-f170.google.com [209.85.166.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9724168B82C for ; Wed, 9 Sep 2020 09:02:35 +0300 (EEST) Received: by mail-il1-f170.google.com with SMTP id b17so1233993ilh.4 for ; Tue, 08 Sep 2020 23:02:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=XWjnWmRBy2/NBs76N+hCFG2QNiZs2Qq6/EfTn9ujhoA=; b=nDtYN4DSq8+3cPKqfOo08V0l9kOt5Epa4AXwhdPryEowqL8POXx9kAcxPYo/cL+Mv4 gGX99x8iiPjTwuuWvnRiO4zsqExkogDf31anL7LoyXN3zZVR01RXigKulYFOoWUbDXSc pu+VSLxu3B+imSJuXt9n/dRYtAEQf6O6/uAG8FiGadc9a4lU7O8ZsDP1kR6/UwIqJWmr kchZ6/7XRZDmPNDzZMy7FBGQJ6lb9Ybqz9Q8Qxatf1jxwOd3eyI7uRyzxINOY2rp5Dmg Lxkw/XEnzsjtmbcDfCpxeFQtL7mKc+lMl+MbQQGgIockSEixoTFS2f29m7MXl6C+CU0Z uiYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XWjnWmRBy2/NBs76N+hCFG2QNiZs2Qq6/EfTn9ujhoA=; b=LH5ylwa9z1gBH6i7TWl27V4vWywl4DzEXJAKAkbmG1DaD3nWHhx3GbJSaEVIGH06iD IvtxHbvH1bQfsrLHEGgrREoQYObcs0TJUnjRur6XIx5CIUJQLDJjylWIKSK9sTB38JSs 9zIhId3w7owLiFVVETtREfFWfN5kf+3ySN7U18tlVHLA75f2F5ZWyA2rXjM61yN5+1Ci +kj6tVdgw9QwNbnAHZr29jZQrQVFCFJZTIvTTSa817nVCNGo1B43zZ2n0SvtgZUXKMVY QIaoE1fXESwvpzzZGL8SJAD0bSeSqi/Qse1CjFpl2oMODtfYcS2yrOm02t/yj5AQpvBh 7c4g== X-Gm-Message-State: AOAM531bqVaPIIOQQODzlQV/dxiiDD0wkqi3G79n+RaXRzt8N3g+n9Q7 3oHmOwQzc6zPhxkekNWNUH8R4w0mMHEE X-Google-Smtp-Source: ABdhPJz9ba+vVDRfL2VkEPuWnQkih2+V5kbACFxTj6zlrL+gI2llzNWnOOWatNaEbbqRhbxg6NYwtw== X-Received: by 2002:a05:6e02:673:: with SMTP id l19mr2273073ilt.225.1599631353843; Tue, 08 Sep 2020 23:02:33 -0700 (PDT) Received: from rcombs-mbp.localdomain (c-73-50-128-8.hsd1.il.comcast.net. [73.50.128.8]) by smtp.gmail.com with ESMTPSA id j20sm864575ilq.6.2020.09.08.23.02.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:33 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:16 -0500 Message-Id: <20200909060217.25794-14-rcombs@rcombs.me> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909060217.25794-1-rcombs@rcombs.me> References: <20200909060217.25794-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/15] lavf: remove ff_id3v2_mime_tags X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" The ID3 spec doesn't list any particular set of allowed types, it only suggests using PNG or JPEG for compatibility. --- libavformat/id3v2.c | 12 ------------ libavformat/id3v2.h | 2 -- 2 files changed, 14 deletions(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 72a10bd1e1..340b2fc60c 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -128,18 +128,6 @@ const char * const ff_id3v2_picture_types[21] = { "Publisher/Studio logotype", }; -const CodecMime ff_id3v2_mime_tags[] = { - { "image/gif", AV_CODEC_ID_GIF }, - { "image/jpeg", AV_CODEC_ID_MJPEG }, - { "image/jpg", AV_CODEC_ID_MJPEG }, - { "image/png", AV_CODEC_ID_PNG }, - { "image/tiff", AV_CODEC_ID_TIFF }, - { "image/bmp", AV_CODEC_ID_BMP }, - { "JPG", AV_CODEC_ID_MJPEG }, /* ID3v2.2 */ - { "PNG", AV_CODEC_ID_PNG }, /* ID3v2.2 */ - { "", AV_CODEC_ID_NONE }, -}; - int ff_id3v2_match(const uint8_t *buf, const char *magic) { return buf[0] == magic[0] && diff --git a/libavformat/id3v2.h b/libavformat/id3v2.h index a41fb271a4..8e9b7d95d2 100644 --- a/libavformat/id3v2.h +++ b/libavformat/id3v2.h @@ -207,8 +207,6 @@ extern const char ff_id3v2_4_tags[][4]; */ extern const char ff_id3v2_3_tags[][4]; -extern const CodecMime ff_id3v2_mime_tags[]; - extern const char * const ff_id3v2_picture_types[21]; #endif /* AVFORMAT_ID3V2_H */ From patchwork Wed Sep 9 06:02:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22220 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 6DE1A44BC6F for ; Wed, 9 Sep 2020 09:02:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B3F368B831; Wed, 9 Sep 2020 09:02:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f182.google.com (mail-il1-f182.google.com [209.85.166.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55E4C68B7F2 for ; Wed, 9 Sep 2020 09:02:36 +0300 (EEST) Received: by mail-il1-f182.google.com with SMTP id m1so1205062ilj.10 for ; Tue, 08 Sep 2020 23:02:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=wo/vEsxApZ3FNzDbrPhY+eGCRYB8Wbp/PrVr6CPqIuk=; b=IvhKkErYgNlsKrJ1PAjiTF9PvThPWoZenbTGdSdATOKIjuMU56aYMKsVJYz2K6FhDm VDYcvHvwuTV9jLoj/n76pZJlXaRxFfF6VSJayqyBuL2v8R2ke0WE63jnlXBPFUgxc7tB 6NIySWnyhVqxxonfq/k+cW4n6iX6Uq5PdScfEKjOEuFVdHPBiTFQijOWvtv5ZB2ka/QV uW6a+V0TQgLSctul3lep30O80W4Ev8Ddyuf6cXa8yhPutj6Nf8L7n2SA6yp0TKJccXRW k0IJq0UuYlVZnbvsksz1jpfl5XcMlsqph6monnw42fA9SRpfYeNn3TRwNcQ72VIUaDMK OmrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wo/vEsxApZ3FNzDbrPhY+eGCRYB8Wbp/PrVr6CPqIuk=; b=YbZTuka0jaNnStlOTuSg20ewm2rnigcYbrbKGsm0ql9G0h8uyRch+c/eeM/GRFaLSy sl2zDBCcacOlUGAAgEMfUdDk5BUOfEk3CKtwd7UtF/5N6h95gl+Niuc5Mt+MJJlPqA9n 0AwJvJktVC2uoeCiGT+9TyIeEm/Y6L9SeqtTRdPsJ50hcr10eiW8IOgJfLZknLrUFev0 RARl4UoeUuMf9kKGhRZSBDXK3oN+2V5j0Tgek10QsOwlvKH49iXMBysxlZHoawI5IwUy oLLD6yEgAwcyHt6rhK6iY8IczoJLrIoc/ZhoFLXqYwv8xS6C914SNo6xEZ6CE7CBdWua +MLg== X-Gm-Message-State: AOAM533/A8f7qslyRU0Z99KmCMHAzv5ZHChsWSFvUvHD5HGJsx2T9BDf Bkd2VpRMGvz3jzc/bfJE4IfExhsF87lW X-Google-Smtp-Source: ABdhPJy9UYZ4G2MjWQOpixQte/D7YDQFPZPjUTgqYGbT+WXGXRYCWgHcHQAdG5cHosA53/YdwsmXLQ== X-Received: by 2002:a92:91dc:: with SMTP id e89mr2137196ill.27.1599631354838; Tue, 08 Sep 2020 23:02:34 -0700 (PDT) Received: from rcombs-mbp.localdomain (c-73-50-128-8.hsd1.il.comcast.net. [73.50.128.8]) by smtp.gmail.com with ESMTPSA id j20sm864575ilq.6.2020.09.08.23.02.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:34 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:17 -0500 Message-Id: <20200909060217.25794-15-rcombs@rcombs.me> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909060217.25794-1-rcombs@rcombs.me> References: <20200909060217.25794-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 15/15] lavf: remove internal CodecMime type X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" These use the global codec descriptor registry now. --- libavformat/internal.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavformat/internal.h b/libavformat/internal.h index 17a6ab07d3..7ae8142e5b 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -44,11 +44,6 @@ typedef struct AVCodecTag { unsigned int tag; } AVCodecTag; -typedef struct CodecMime{ - char str[32]; - enum AVCodecID id; -} CodecMime; - /*************************************************/ /* fractional numbers for exact pts handling */