From patchwork Mon Mar 29 08:42:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26635 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 17FF144AD8A for ; Mon, 29 Mar 2021 11:43:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E42A3680856; Mon, 29 Mar 2021 11:42:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070051.outbound.protection.outlook.com [40.92.70.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 471C86806EB for ; Mon, 29 Mar 2021 11:42:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i3goCmZKs6zyZzXpvY1DeLXPl0zXttm/denC95e3qLrBolX7AadYZTOCd5kXw4LwDjc0AN4Mz4GuwtqIc6XjMZiLxWU5dbiT+YU99xGwAPRzmIlYZnQLedxGSiLQi4H0t78F4oS36t13y5FegadX1La4gzxU5r4HmOuYlci6NKoRqHIQzcKqC6CFXyaf3cxtsccXxnV5YXK8HTsUI7A/cJBZHmre2cCg1vn0M9kPX0B7uPhwS/g718oXKgg5MH2A+LIGqQCLfnDeh9nmFKoRM+pawLqyUr8nyw6lE8gb+JKcenPDZDJyYIaBIMdZGQfgqqcxc+wHhfPy8hiYr8nLCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qmwE7dIvyF542RWhKJXGbRQxXpbb5B3TlFcvBSYAVtM=; b=co5zX/JSiS0y7DYaxYeb5eKpNtUzNQJ+YBu5UARWJbVrhGK7maRTfo3hVllCuJJs3L8BM8hpmDnX3F2epDy+RwHGWr2kVxedCY2n+/3I2yB4+THxVM+1keEpkkhHpyx+XEdXA3pyic7+0zFC4JnDhcLtseYXOxa+VHfQ+gDJaoEm0cKAS4KucL0fTGY6XN3EKpbV8nkUNsyho7Rcr37Z8b+/4ORYcyPuHWJhkjk82kF02YVNrThtHiQFblX3QLzAgon5TExxJ7n8Lzm25xbT9F9U0iruPtxGQWwWURLOtg6Kj4h+uscXIRQ7KC+RjvL0rp+4134Y8DHQo/UtR33GUw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qmwE7dIvyF542RWhKJXGbRQxXpbb5B3TlFcvBSYAVtM=; b=gCv3adL/WPph89QaGk3DTLPQp/A+00Q3Fmob4KHDjcrUIuYVXgEBGt17qFtgGs5qpP+IIJkDZRAw3cWLTf2eZU6WOwyK3WTV9ulEbz/ZHAlugeJTZIqyI08psT5TBGUzRzyHS0KjAzI01EUGYMe/AvKzQORVpVcNUUEjNKPFRZ5VLMKgdOtMFcoPnrC+MwOKGYWUbN+Ile66gx+8y7drhkJDDPKqTn98k72YSI8bjeLWf1yLKo625xwxG09BwFyWfvHkyfkR1LdyTYAG3lHh4HzPLrkRtoT89Tbog/l7TXHYdiRYPtnSxDG1HaEZwlDWnqmEd6F3u+qRdftq8AnSUQ== Received: from VE1EUR03FT009.eop-EUR03.prod.protection.outlook.com (2a01:111:e400:7e09::46) by VE1EUR03HT037.eop-EUR03.prod.protection.outlook.com (2a01:111:e400:7e09::358) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.29; Mon, 29 Mar 2021 08:42:39 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e09::49) by VE1EUR03FT009.mail.protection.outlook.com (2a01:111:e400:7e09::92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.25 via Frontend Transport; Mon, 29 Mar 2021 08:42:39 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:71503DF93C0201D4AC21B2554FD0C051AB1E761FE4D0453F5934EEE51BA97A58; UpperCasedChecksum:F62F4F9E8ED1BB785AAF57A24A30A357E4E7174A47AC6DDA7769504EDC2DB662; SizeAsReceived:7522; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3977.033; Mon, 29 Mar 2021 08:42:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Mar 2021 10:42:01 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210329084203.402250-1-andreas.rheinhardt@outlook.com> References: <20210329084203.402250-1-andreas.rheinhardt@outlook.com> X-TMN: [W2FZEVbZ5XTWyfgg0OWoPC2mjjB46846] X-ClientProxiedBy: AM4PR0302CA0023.eurprd03.prod.outlook.com (2603:10a6:205:2::36) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210329084203.402250-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM4PR0302CA0023.eurprd03.prod.outlook.com (2603:10a6:205:2::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.25 via Frontend Transport; Mon, 29 Mar 2021 08:42:38 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: a95df66c-8854-4c39-f0f7-08d8f28e9c24 X-MS-Exchange-SLBlob-MailProps: 7MJMDUNTCtyG7JLNmMoDcXgSrFf0WyM4OOjnFjhQ/BhBRH0qHdws4cmTlO7z0pbNA9Q8ZSZZtF+ZExvoqXjko7UL/bBJET/J9lO8X5N415F3W5d688V6sGdgG9X1JCDkURDO0DECzawypxlrIckT543sMqpIf9FPykvo+Avv21VfB4Xp73tSCU5pdr7i4TGToiM+mL8cclila6RrY/jonRwar06tCdPBLB2OtzAOC8BcVhZZLLvPRU9gDOyuXV0fmCoMMY5ZQr/SMZuttuv7WV6RjYGIF2foqdhzt1epjKpi1H5CBKuq3rfHxqdj6YB82y0kOWHrYFP8dATYt4KACtzOsXVXEIzRmZv3/gWNRrd1ArTTkWKmQF3pIpwFTwHj+BRISrIC7BH5/75Iv+SF5O+xUezYYgiynd2/0vhmoGnMoWb4rbFyn8qOV2mXk91sWLH8QcodsAfqqA/VEG9ZqXbas/Oi5wzloABNZTSCHNecaa7wg6f0BuXV5Kz0iupguWBc4VoWPgh7mNzel+e5zaUpeutoWtxRz+1gYYzsHrjhT3WHLuDRV+YBgeLhBlyu/9RskFt2YIyR5o0E36cPOuqBZaamgy/3e8Tupr3fRrpZUPfxgiSu+zP79iJqJDDXE0Ia4TUKCsuZR1q0S5kxltVMqoorwpaTWTgwohjkL+G2Dekv0lPGuvCnMqsfCS8EGNIqebBk6vteyzDh9EXToXRVfEzG7He+G8djAyv1KWxZ7A10KWsF+A== X-MS-TrafficTypeDiagnostic: VE1EUR03HT037: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: anXHLhd6qMy2CtLLHVS3YeP6aicb/+XhNKts3j4SREFe8mzxH7JTjvZADuTi6bi+aZn38mKjIiUzEihvlU5z4iwIKPnSGM8DjVFuiSBG7nAKETjIM15bgfxw9t4gUlOWrkMFvT2Vfi5XDNycYS7okmAAkl9S/UVxfI72L4IBHlIy/JgWU7J568VnAbM9WfRGTWSKKGCA8MjSu/zG+q6niiExb6Kg9TrGpsXngppLZhk9kRb5pbLGZdp2JxfyVDCiNAeLnV/uXxYtnc983ZV9mecDi1V0pyPsPz83hXY6Sf/DIoxyOfmfB2xR/imHpo2N8hM29SXcIv9QkEpx8m1nrNsQj5MNm88exaIYrXSzTdZUePH4U+Bc4io0h8AVCZEvdpILePCmVhDFh1HJxnuRDw== X-MS-Exchange-AntiSpam-MessageData: T7lZ+KWS++CiFpBxF1dM7z1PgoLYqQXEZvpxNW7+5CDGMU/vc1D6sT6QBvCKArSJ8A9kR2y+WgJcbWilDR9u/nVSLXeeqIuHWr0y8P8EYVFUuGHLkP+DDwQWCt1ScChjrLfHsMWfR2uW/yk9lAdVOA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a95df66c-8854-4c39-f0f7-08d8f28e9c24 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2021 08:42:39.4438 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT009.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR03HT037 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/asf: Factor common code out 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Both function to read attached pictures coincide since e83f27a21a6d2f602b55e541ef66e365400e9827 (save for some log messages in case av_dict_set failed). Signed-off-by: Andreas Rheinhardt --- How nice it would be if there were consensus on which of the demuxers is better! libavformat/asf.c | 117 +++++++++++++++++++++++++++++++++++++++++ libavformat/asf.h | 10 ++++ libavformat/asfdec_f.c | 109 +------------------------------------- libavformat/asfdec_o.c | 114 +-------------------------------------- 4 files changed, 129 insertions(+), 221 deletions(-) diff --git a/libavformat/asf.c b/libavformat/asf.c index f1f171e6f6..204355abab 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -19,6 +19,7 @@ */ #include "asf.h" +#include "id3v2.h" const ff_asf_guid ff_asf_header = { 0x30, 0x26, 0xB2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C @@ -170,3 +171,119 @@ const AVMetadataConv ff_asf_metadata_conv[] = { // { "Year" , "date" }, TODO: conversion year<->date { 0 } }; + +/* MSDN claims that this should be "compatible with the ID3 frame, APIC", + * but in reality this is only loosely similar */ +static int asf_read_picture(AVFormatContext *s, int len) +{ + AVPacket pkt = { 0 }; + const CodecMime *mime = ff_id3v2_mime_tags; + enum AVCodecID id = AV_CODEC_ID_NONE; + char mimetype[64]; + uint8_t *desc = NULL; + AVStream *st = NULL; + int ret, type, picsize, desc_len; + + /* type + picsize + mime + desc */ + if (len < 1 + 4 + 2 + 2) { + av_log(s, AV_LOG_ERROR, "Invalid attached picture size: %d.\n", len); + return AVERROR_INVALIDDATA; + } + + /* picture type */ + type = avio_r8(s->pb); + len--; + if (type >= FF_ARRAY_ELEMS(ff_id3v2_picture_types) || type < 0) { + av_log(s, AV_LOG_WARNING, "Unknown attached picture type: %d.\n", type); + type = 0; + } + + /* picture data size */ + picsize = avio_rl32(s->pb); + len -= 4; + + /* 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 (id == AV_CODEC_ID_NONE) { + av_log(s, AV_LOG_ERROR, "Unknown attached picture mimetype: %s.\n", + mimetype); + return 0; + } + + if (picsize >= len) { + av_log(s, AV_LOG_ERROR, "Invalid attached picture data size: %d >= %d.\n", + picsize, len); + return AVERROR_INVALIDDATA; + } + + /* picture description */ + desc_len = (len - picsize) * 2 + 1; + desc = av_malloc(desc_len); + if (!desc) + return AVERROR(ENOMEM); + len -= avio_get_str16le(s->pb, len - picsize, desc, desc_len); + + ret = av_get_packet(s->pb, &pkt, picsize); + if (ret < 0) + goto fail; + + st = avformat_new_stream(s, NULL); + if (!st) { + ret = AVERROR(ENOMEM); + goto fail; + } + + st->disposition |= AV_DISPOSITION_ATTACHED_PIC; + st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; + st->codecpar->codec_id = id; + st->attached_pic = pkt; + st->attached_pic.stream_index = st->index; + st->attached_pic.flags |= AV_PKT_FLAG_KEY; + + if (*desc) { + if (av_dict_set(&st->metadata, "title", desc, AV_DICT_DONT_STRDUP_VAL) < 0) + av_log(s, AV_LOG_WARNING, "av_dict_set failed.\n"); + } else + av_freep(&desc); + + if (av_dict_set(&st->metadata, "comment", ff_id3v2_picture_types[type], 0) < 0) + av_log(s, AV_LOG_WARNING, "av_dict_set failed.\n"); + + return 0; + +fail: + av_freep(&desc); + av_packet_unref(&pkt); + return ret; +} + +static int get_id3_tag(AVFormatContext *s, int len) +{ + ID3v2ExtraMeta *id3v2_extra_meta = NULL; + + ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, len); + if (id3v2_extra_meta) { + ff_id3v2_parse_apic(s, id3v2_extra_meta); + ff_id3v2_parse_chapters(s, id3v2_extra_meta); + ff_id3v2_free_extra_meta(&id3v2_extra_meta); + } + return 0; +} + +int ff_asf_handle_byte_array(AVFormatContext *s, const char *name, + int val_len) +{ + if (!strcmp(name, "WM/Picture")) // handle cover art + return asf_read_picture(s, val_len); + else if (!strcmp(name, "ID3")) // handle ID3 tag + return get_id3_tag(s, val_len); + + return 1; +} diff --git a/libavformat/asf.h b/libavformat/asf.h index bce820efae..01cc4f7a46 100644 --- a/libavformat/asf.h +++ b/libavformat/asf.h @@ -104,6 +104,16 @@ extern const ff_asf_guid ff_asf_mutex_language; extern const AVMetadataConv ff_asf_metadata_conv[]; +/** + * Handles both attached pictures as well as id3 tags. + * + * @return Returns < 0 on error, 1 if the type of the byte array + * is unsupported by this function and 0 otherwise. + */ +int ff_asf_handle_byte_array(AVFormatContext *s, const char *name, + int val_len); + + #define ASF_PACKET_FLAG_ERROR_CORRECTION_PRESENT 0x80 //1000 0000 diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index 2fae528f4d..27162e9559 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -33,7 +33,6 @@ #include "avformat.h" #include "avio_internal.h" #include "avlanguage.h" -#include "id3v2.h" #include "internal.h" #include "riff.h" #include "asf.h" @@ -219,107 +218,6 @@ static int get_value(AVIOContext *pb, int type, int type2_size) } } -/* MSDN claims that this should be "compatible with the ID3 frame, APIC", - * but in reality this is only loosely similar */ -static int asf_read_picture(AVFormatContext *s, int len) -{ - AVPacket pkt = { 0 }; - const CodecMime *mime = ff_id3v2_mime_tags; - enum AVCodecID id = AV_CODEC_ID_NONE; - char mimetype[64]; - uint8_t *desc = NULL; - AVStream *st = NULL; - int ret, type, picsize, desc_len; - - /* type + picsize + mime + desc */ - if (len < 1 + 4 + 2 + 2) { - av_log(s, AV_LOG_ERROR, "Invalid attached picture size: %d.\n", len); - return AVERROR_INVALIDDATA; - } - - /* picture type */ - type = avio_r8(s->pb); - len--; - if (type >= FF_ARRAY_ELEMS(ff_id3v2_picture_types) || type < 0) { - av_log(s, AV_LOG_WARNING, "Unknown attached picture type: %d.\n", type); - type = 0; - } - - /* picture data size */ - picsize = avio_rl32(s->pb); - len -= 4; - - /* 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 (id == AV_CODEC_ID_NONE) { - av_log(s, AV_LOG_ERROR, "Unknown attached picture mimetype: %s.\n", - mimetype); - return 0; - } - - if (picsize >= len) { - av_log(s, AV_LOG_ERROR, "Invalid attached picture data size: %d >= %d.\n", - picsize, len); - return AVERROR_INVALIDDATA; - } - - /* picture description */ - desc_len = (len - picsize) * 2 + 1; - desc = av_malloc(desc_len); - if (!desc) - return AVERROR(ENOMEM); - len -= avio_get_str16le(s->pb, len - picsize, desc, desc_len); - - ret = av_get_packet(s->pb, &pkt, picsize); - if (ret < 0) - goto fail; - - st = avformat_new_stream(s, NULL); - if (!st) { - ret = AVERROR(ENOMEM); - goto fail; - } - st->disposition |= AV_DISPOSITION_ATTACHED_PIC; - st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; - st->codecpar->codec_id = id; - st->attached_pic = pkt; - st->attached_pic.stream_index = st->index; - st->attached_pic.flags |= AV_PKT_FLAG_KEY; - - if (*desc) - av_dict_set(&st->metadata, "title", desc, AV_DICT_DONT_STRDUP_VAL); - else - av_freep(&desc); - - av_dict_set(&st->metadata, "comment", ff_id3v2_picture_types[type], 0); - - return 0; - -fail: - av_freep(&desc); - av_packet_unref(&pkt); - return ret; -} - -static void get_id3_tag(AVFormatContext *s, int len) -{ - ID3v2ExtraMeta *id3v2_extra_meta = NULL; - - ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, len); - if (id3v2_extra_meta) { - ff_id3v2_parse_apic(s, id3v2_extra_meta); - ff_id3v2_parse_chapters(s, id3v2_extra_meta); - } - ff_id3v2_free_extra_meta(&id3v2_extra_meta); -} - static void get_tag(AVFormatContext *s, const char *key, int type, int len, int type2_size) { ASFContext *asf = s->priv_data; @@ -345,13 +243,8 @@ static void get_tag(AVFormatContext *s, const char *key, int type, int len, int value[len]=0; break; case ASF_BYTE_ARRAY: - if (!strcmp(key, "WM/Picture")) { // handle cover art - asf_read_picture(s, len); - } else if (!strcmp(key, "ID3")) { // handle ID3 tag - get_id3_tag(s, len); - } else { + if (ff_asf_handle_byte_array(s, key, len) > 0) av_log(s, AV_LOG_VERBOSE, "Unsupported byte array in tag %s.\n", key); - } goto finish; case ASF_BOOL: case ASF_DWORD: diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 34ae541934..6cfcd8b088 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -20,19 +20,15 @@ */ #include "libavutil/attributes.h" -#include "libavutil/avstring.h" -#include "libavutil/bswap.h" #include "libavutil/common.h" #include "libavutil/dict.h" #include "libavutil/internal.h" #include "libavutil/mathematics.h" -#include "libavutil/opt.h" #include "libavutil/time_internal.h" #include "avformat.h" #include "avio_internal.h" #include "avlanguage.h" -#include "id3v2.h" #include "internal.h" #include "riff.h" #include "asf.h" @@ -356,110 +352,6 @@ static int asf_set_metadata(AVFormatContext *s, const uint8_t *name, return 0; } -/* MSDN claims that this should be "compatible with the ID3 frame, APIC", - * but in reality this is only loosely similar */ -static int asf_read_picture(AVFormatContext *s, int len) -{ - AVPacket pkt = { 0 }; - const CodecMime *mime = ff_id3v2_mime_tags; - enum AVCodecID id = AV_CODEC_ID_NONE; - char mimetype[64]; - uint8_t *desc = NULL; - AVStream *st = NULL; - int ret, type, picsize, desc_len; - - /* type + picsize + mime + desc */ - if (len < 1 + 4 + 2 + 2) { - av_log(s, AV_LOG_ERROR, "Invalid attached picture size: %d.\n", len); - return AVERROR_INVALIDDATA; - } - - /* picture type */ - type = avio_r8(s->pb); - len--; - if (type >= FF_ARRAY_ELEMS(ff_id3v2_picture_types) || type < 0) { - av_log(s, AV_LOG_WARNING, "Unknown attached picture type: %d.\n", type); - type = 0; - } - - /* picture data size */ - picsize = avio_rl32(s->pb); - len -= 4; - - /* 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 (id == AV_CODEC_ID_NONE) { - av_log(s, AV_LOG_ERROR, "Unknown attached picture mimetype: %s.\n", - mimetype); - return 0; - } - - if (picsize >= len) { - av_log(s, AV_LOG_ERROR, "Invalid attached picture data size: %d >= %d.\n", - picsize, len); - return AVERROR_INVALIDDATA; - } - - /* picture description */ - desc_len = (len - picsize) * 2 + 1; - desc = av_malloc(desc_len); - if (!desc) - return AVERROR(ENOMEM); - len -= avio_get_str16le(s->pb, len - picsize, desc, desc_len); - - ret = av_get_packet(s->pb, &pkt, picsize); - if (ret < 0) - goto fail; - - st = avformat_new_stream(s, NULL); - if (!st) { - ret = AVERROR(ENOMEM); - goto fail; - } - - st->disposition |= AV_DISPOSITION_ATTACHED_PIC; - st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; - st->codecpar->codec_id = id; - st->attached_pic = pkt; - st->attached_pic.stream_index = st->index; - st->attached_pic.flags |= AV_PKT_FLAG_KEY; - - if (*desc) { - if (av_dict_set(&st->metadata, "title", desc, AV_DICT_DONT_STRDUP_VAL) < 0) - av_log(s, AV_LOG_WARNING, "av_dict_set failed.\n"); - } else - av_freep(&desc); - - if (av_dict_set(&st->metadata, "comment", ff_id3v2_picture_types[type], 0) < 0) - av_log(s, AV_LOG_WARNING, "av_dict_set failed.\n"); - - return 0; - -fail: - av_freep(&desc); - av_packet_unref(&pkt); - return ret; -} - -static void get_id3_tag(AVFormatContext *s, int len) -{ - ID3v2ExtraMeta *id3v2_extra_meta = NULL; - - ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, len); - if (id3v2_extra_meta) { - ff_id3v2_parse_apic(s, id3v2_extra_meta); - ff_id3v2_parse_chapters(s, id3v2_extra_meta); - } - ff_id3v2_free_extra_meta(&id3v2_extra_meta); -} - static int process_metadata(AVFormatContext *s, const uint8_t *name, uint16_t name_len, uint16_t val_len, uint16_t type, AVDictionary **met) { @@ -472,11 +364,7 @@ static int process_metadata(AVFormatContext *s, const uint8_t *name, uint16_t na asf_read_value(s, name, val_len, type, met); break; case ASF_BYTE_ARRAY: - if (!strcmp(name, "WM/Picture")) // handle cover art - asf_read_picture(s, val_len); - else if (!strcmp(name, "ID3")) // handle ID3 tag - get_id3_tag(s, val_len); - else + if (ff_asf_handle_byte_array(s, name, val_len) > 0) asf_read_value(s, name, val_len, type, met); break; case ASF_GUID: