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; } } }