From patchwork Fri Nov 6 23:10:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Foucu X-Patchwork-Id: 23422 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 5E4EE449ED9 for ; Sat, 7 Nov 2020 01:17:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 21EF868B9F9; Sat, 7 Nov 2020 01:17:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 81C4868B9CB for ; Sat, 7 Nov 2020 01:17:29 +0200 (EET) Received: by mail-pl1-f193.google.com with SMTP id z1so1368019plo.12 for ; Fri, 06 Nov 2020 15:17:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dca9J2q/tTj1IkFY8ht17W55JhZldt8GuNbfYRt/a1Y=; b=YkEMMO1MdKwne/2iWCvWsaM+uZuY6SMSf77y7HZSlhyx3KUGGpFk+tFfYTtEXj2NsZ p6S4OYlJiMrtgwujdvroCkaqsxI1b6TyRAmVsftq4GEl+0v2X2EIqdeO0Ib1HTfs3/iS OjgZVgtC7Ck0tbArZxIES+qwJ8a0JUqYHz3LGIhIDYhkW10QKoewJ9f2B4+lSSlOgiLM 1SXSDK8crcuIgYh2hPICyE96oa6EqgGBb8Sfj1jHr2RE7ITwUagzeoqGB3e8VTgxDaZe IHntx2pHosWNX7zrYlxuagWDuTPD0TyYn4i47j1vgeAPqKW4hOi/vQMGpj/5qdlCl9fe trrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dca9J2q/tTj1IkFY8ht17W55JhZldt8GuNbfYRt/a1Y=; b=rsgYh+cC0w3cCbxFeocIq3YN+EHvkm3sgi19H9r81Z+yMQoUq0BL2rbvVmzU4Cnr1c UfWlaNCBwMHwzB3T/0ciRRq4LOmqCkdUgF6aFYMWNqvXiY8cAGgMtODiksyqNFmdU96a UtZzKqwKFV0NiiSvSI5dyl3PUy6f4RC3stT15SySlNHLA4ZsXZEQvjwBCLx2J5rAAy9w iGURbcnVioSt7UZqmx4v5cSv63NDwVRLwtiC1gSf3qoM3Ys4i5zXXNoYlHshoGEcgTDx ZFTqkzczN0vFLKospVoYtdGQJRdSeXSkFLyUusV8TNFnEmnESHXZ7XXb42G2VC0mGPjo AwVw== X-Gm-Message-State: AOAM531OZp+yH9X8RcivWKKgBre03iJv4VrHVsHJnAaJd8spmvWUhLfv tPmC3EsS5pUraHK45u7thOd/Y6OsLBw= X-Google-Smtp-Source: ABdhPJwX5NFIz225bc2fj5K7wkU1BK4OEBPulNGQ3V5//nNz7YcMsjC1Zzp5G/b2ZPP3lEFtSKG2Bw== X-Received: by 2002:a17:902:9f86:b029:d6:d25f:7ad8 with SMTP id g6-20020a1709029f86b02900d6d25f7ad8mr3477121plq.4.1604704222215; Fri, 06 Nov 2020 15:10:22 -0800 (PST) Received: from tfoucu.mtv.corp.google.com ([2620:0:1000:4001:a28c:fdff:feed:4b81]) by smtp.gmail.com with ESMTPSA id i123sm3370930pfc.13.2020.11.06.15.10.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Nov 2020 15:10:21 -0800 (PST) From: Thierry Foucu To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Nov 2020 15:10:17 -0800 Message-Id: <20201106231017.2741118-1-tfoucu@gmail.com> X-Mailer: git-send-email 2.29.2.222.g5d2a92d10f8-goog MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat/avidec: Extract more metadata from the header 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 Cc: Thierry Foucu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/avidec.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 578cf68ce1..7e527e15ee 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -110,6 +110,15 @@ static const char avi_headers[][8] = { static const AVMetadataConv avi_metadata_conv[] = { { "strn", "title" }, + { "isbj", "subject" }, + { "inam", "title" }, + { "iart", "artist" }, + { "icop", "copyright" }, + { "icmt", "comment" }, + { "ignr", "genre" }, + { "iprd", "product" }, + { "isft", "software" }, + { 0 }, }; @@ -979,6 +988,14 @@ static int avi_read_header(AVFormatContext *s) avio_skip(pb, size); break; case MKTAG('s', 't', 'r', 'n'): + case MKTAG('i', 's', 'b', 'j'): + case MKTAG('i', 'n', 'a', 'm'): + case MKTAG('i', 'a', 'r', 't'): + case MKTAG('i', 'c', 'o', 'p'): + case MKTAG('i', 'c', 'm', 't'): + case MKTAG('i', 'g', 'n', 'r'): + case MKTAG('i', 'p', 'o', 'd'): + case MKTAG('i', 's', 'o', 'f'): if (s->nb_streams) { ret = avi_read_tag(s, s->streams[s->nb_streams - 1], tag, size); if (ret < 0)