From patchwork Thu Apr 1 23:27:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26700 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 46AB644B298 for ; Fri, 2 Apr 2021 02:28:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 231F568A062; Fri, 2 Apr 2021 02:28:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CCA48687FDA for ; Fri, 2 Apr 2021 02:28:44 +0300 (EEST) Received: by mail-qk1-f180.google.com with SMTP id x14so3919643qki.10 for ; Thu, 01 Apr 2021 16:28:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=vgtyPCP6JwQm9xIJRhQfyLQlJtfMDE/PaYIlI9FGPhs=; b=ROC0XeT542fGBRxn6yWCNhq+vbyGJhyTVCPOWOzMB2utImMTTvhjbvKtGg38s0cGaQ jYGfFatoANj10v42Xy0w8X5wtux9ioNAHIdg3vThDjNlakmTsEYSXoqubRtIg+1faZMZ L1wTC45p3E086Xcj03RrKmShftYmVy+9nzCnz7SlPGa1XlXAgep8LwBENgXBvKfg+gkt 4zHeQY9f7tPetTuTR9Ooc3N3h45vGuOOg1Cto3VKRI0kQtvs3jWMnGJ7OfDfxvCKrtmv /EeyLwICLhDfU09QkKdyBw63TT92hnL7iYUnlIqfPRub0ZaHdi+uG3/TEsmbAeWSZxqj qxzA== 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=vgtyPCP6JwQm9xIJRhQfyLQlJtfMDE/PaYIlI9FGPhs=; b=WZ+OPkqyjOwoaFRH9qbE2fXeddz2ldr/mApADtOFvecgOa7eicGkaEi43gr8QjGuuC Ce0K4PLB6LXHV1XbK5UG25MZsPJ2IpmJNax/gcwfr1MFTq2sXFuUIAPrBuiq8hrak0/r Lk37DEhYHyGKa8rSEaQ9fvHyp+p+Pb67Wd+gPO7GXi5+SJeuZ6CebhAAPimfe5UbB6bM S1fulgmje6tVaxB9ixKLA6sRSzDpOHTJUwLnIq4z2HjaU4PKlFS9K/WwYXtmGyZpbvlK jYeB6OVoGbVBh1dO0fNVs4P+F49Z30sFN5OkCJVU/OeAhPu37EQPhrV2b96+DTDNgTqD yQIQ== X-Gm-Message-State: AOAM531WajXPujOWJYbAjtklIJOH377hyRQTO5D2tuECALeT77L1Nhen jH7FLCgAeELZNA9ia026CB+x72t0v60= X-Google-Smtp-Source: ABdhPJxj3R5fBO2pCpM+8kcN3zY9YsYsZK1QpMtns3BHzauzinuZf6Hxco2/H6RG6IcqzLxZDxoA6Q== X-Received: by 2002:a05:620a:53d:: with SMTP id h29mr10620533qkh.29.1617319723035; Thu, 01 Apr 2021 16:28:43 -0700 (PDT) Received: from localhost.localdomain ([191.83.218.26]) by smtp.gmail.com with ESMTPSA id v6sm5108392qkf.132.2021.04.01.16.28.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 16:28:42 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Apr 2021 20:27:36 -0300 Message-Id: <20210401232738.4908-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/apetag: ensure the binary tag is valid before allocating a stream for it 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" Signed-off-by: James Almer --- libavformat/apetag.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libavformat/apetag.c b/libavformat/apetag.c index 6f82fbe202..5a8144a27c 100644 --- a/libavformat/apetag.c +++ b/libavformat/apetag.c @@ -63,9 +63,7 @@ static int ape_tag_read_field(AVFormatContext *s) uint8_t filename[1024]; enum AVCodecID id; int ret; - AVStream *st = avformat_new_stream(s, NULL); - if (!st) - return AVERROR(ENOMEM); + AVStream *st = NULL; ret = avio_get_str(pb, size, filename, sizeof(filename)); if (ret < 0) @@ -76,20 +74,23 @@ static int ape_tag_read_field(AVFormatContext *s) } size -= ret; - av_dict_set(&st->metadata, key, filename, 0); - if ((id = ff_guess_image2_codec(filename)) != AV_CODEC_ID_NONE) { - int ret = ff_add_attached_pic(s, st, s->pb, NULL, size); + ret = ff_add_attached_pic(s, NULL, s->pb, NULL, size); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Error reading cover art.\n"); return ret; } + st = s->streams[s->nb_streams - 1]; st->codecpar->codec_id = id; } else { + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); if ((ret = ff_get_extradata(s, st->codecpar, s->pb, size)) < 0) return ret; st->codecpar->codec_type = AVMEDIA_TYPE_ATTACHMENT; } + av_dict_set(&st->metadata, key, filename, 0); } else { value = av_malloc(size+1); if (!value) From patchwork Thu Apr 1 23:27:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26701 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 9A08D44B298 for ; Fri, 2 Apr 2021 02:28:52 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 82D6B6881D0; Fri, 2 Apr 2021 02:28:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B22F768804D for ; Fri, 2 Apr 2021 02:28:45 +0300 (EEST) Received: by mail-qk1-f170.google.com with SMTP id o5so4034649qkb.0 for ; Thu, 01 Apr 2021 16:28:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=kovsiIl0NVZbbRG0f1dAIatDeAsk/kyYlDcXTLuGk3Y=; b=IFJKKzQfosACM4ELWwTSpOvINC0lqPUBzTc7pAcFzV9har0DPduHegqYHRiTX6NMLv hBu893IA8HxApl65+XpiTO7uI+h89VWCGXAriSEAzKWX+fwthhMsO2vvXssAYnptKsdx ybKcIcN4Lh0mHL85IAxmW0bj+UjsjN21pD5muBzLJeWB8nXkZO2hSLycDCI3uqxlNEMH d/QF7HeTDwtaQgjWlSvoH3m3vfyA6ulCu4Jl3vbex4bIdEfwQ5jRSNSWV4FBow95weEo WjtsJAldZeQgYhBOioC+byTxTsWXln3dd2SgJim1D0Am4q2RkCzLWc7w3J19S3Sp1dP+ EPOg== 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=kovsiIl0NVZbbRG0f1dAIatDeAsk/kyYlDcXTLuGk3Y=; b=CjG/7c0vDcveu7soexXwawp67u3FXa3fTF1PQ2yPG1QJh9SAW67OqDa0VLFCPQWBBQ 2IHGMcnqq5PYlc9JQZwe14OTp/mRzKCxE0M8zHxd6rId3tFFFpuMGt/MyMPdsbrXJGTP ycp7Nn+Lpo0wSak0KmNDvbyeOSv8JRGz6GC3jMQzsJ+mLFVFPw37Gpp0AMi5YqgmXL7l 7ir5mwq+ny0Pohdbt6+JuUt3HbctoZesyRvgOtryxq7Sw1dFSQIegs+JoKi3zdubqt65 m7v4WU2iR4FjbCqKSlE80v3mmoIPKdOHm8yumKBSbxHsFPBekPb7mj0+U97yJZlN2S3h +0PA== X-Gm-Message-State: AOAM532YhWpKkvfplNZRnInr4t103pdSifZ9O+S5Dum7A9wJcskyJL6m TMyMOUyJqRkQQfitB0IL+EfpRcGlmnw= X-Google-Smtp-Source: ABdhPJw9DEAGl37XT2FHlZeNpACKMVswGvpXy5pehaF8wsNTO5O27dAsec2AjK3KDbMmUiJZKiBUbw== X-Received: by 2002:a37:a70c:: with SMTP id q12mr10963101qke.141.1617319724184; Thu, 01 Apr 2021 16:28:44 -0700 (PDT) Received: from localhost.localdomain ([191.83.218.26]) by smtp.gmail.com with ESMTPSA id v6sm5108392qkf.132.2021.04.01.16.28.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 16:28:43 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Apr 2021 20:27:37 -0300 Message-Id: <20210401232738.4908-2-jamrial@gmail.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210401232738.4908-1-jamrial@gmail.com> References: <20210401232738.4908-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avformat: add a flag to enable exporting attached pictures 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" Signed-off-by: James Almer --- libavformat/apetag.c | 5 +++-- libavformat/asf.c | 3 ++- libavformat/avformat.h | 1 + libavformat/dsfdec.c | 3 ++- libavformat/flacdec.c | 4 +++- libavformat/hls.c | 10 ++++++---- libavformat/matroskadec.c | 32 ++++++++++++++++++-------------- libavformat/mov.c | 3 +++ libavformat/oggparsevorbis.c | 3 ++- libavformat/options_table.h | 3 ++- libavformat/utils.c | 3 ++- libavformat/wavdec.c | 3 ++- libavformat/wtvdec.c | 3 ++- 13 files changed, 48 insertions(+), 28 deletions(-) diff --git a/libavformat/apetag.c b/libavformat/apetag.c index 5a8144a27c..4f6ada6384 100644 --- a/libavformat/apetag.c +++ b/libavformat/apetag.c @@ -74,7 +74,8 @@ static int ape_tag_read_field(AVFormatContext *s) } size -= ret; - if ((id = ff_guess_image2_codec(filename)) != AV_CODEC_ID_NONE) { + if ((id = ff_guess_image2_codec(filename)) != AV_CODEC_ID_NONE && + s->flags & AVFMT_FLAG_ATTACHED_PIC) { ret = ff_add_attached_pic(s, NULL, s->pb, NULL, size); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Error reading cover art.\n"); @@ -82,7 +83,7 @@ static int ape_tag_read_field(AVFormatContext *s) } st = s->streams[s->nb_streams - 1]; st->codecpar->codec_id = id; - } else { + } else if (id == AV_CODEC_ID_NONE) { st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); diff --git a/libavformat/asf.c b/libavformat/asf.c index cef0f9f646..20bd707d15 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -259,7 +259,8 @@ static int get_id3_tag(AVFormatContext *s, int len) ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, len); if (id3v2_extra_meta) { - ff_id3v2_parse_apic(s, id3v2_extra_meta); + if (s->flags & AVFMT_FLAG_ATTACHED_PIC) + ff_id3v2_parse_apic(s, id3v2_extra_meta); ff_id3v2_parse_chapters(s, id3v2_extra_meta); ff_id3v2_free_extra_meta(&id3v2_extra_meta); } diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 765bc3b6f5..11e993eacb 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1392,6 +1392,7 @@ typedef struct AVFormatContext { #define AVFMT_FLAG_FAST_SEEK 0x80000 ///< Enable fast, but inaccurate seeks for some formats #define AVFMT_FLAG_SHORTEST 0x100000 ///< Stop muxing when the shortest stream stops. #define AVFMT_FLAG_AUTO_BSF 0x200000 ///< Add bitstream filters as requested by the muxer +#define AVFMT_FLAG_ATTACHED_PIC 0x400000 ///< Export attached pictures, like cover art /** * Maximum size of the data read from input for determining diff --git a/libavformat/dsfdec.c b/libavformat/dsfdec.c index 1df163e114..aba7f5714b 100644 --- a/libavformat/dsfdec.c +++ b/libavformat/dsfdec.c @@ -56,7 +56,8 @@ static void read_id3(AVFormatContext *s, uint64_t id3pos) ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, 0); if (id3v2_extra_meta) { - ff_id3v2_parse_apic(s, id3v2_extra_meta); + if (s->flags & AVFMT_FLAG_ATTACHED_PIC) + ff_id3v2_parse_apic(s, id3v2_extra_meta); ff_id3v2_parse_chapters(s, id3v2_extra_meta); } ff_id3v2_free_extra_meta(&id3v2_extra_meta); diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index f7b21986dc..d85dad43b7 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -146,7 +146,9 @@ static int flac_read_header(AVFormatContext *s) } av_freep(&buffer); } else if (metadata_type == FLAC_METADATA_TYPE_PICTURE) { - ret = ff_flac_parse_picture(s, buffer, metadata_size, 1); + ret = 0; + if (s->flags & AVFMT_FLAG_ATTACHED_PIC) + ret = ff_flac_parse_picture(s, buffer, metadata_size, 1); av_freep(&buffer); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Error parsing attached picture.\n"); diff --git a/libavformat/hls.c b/libavformat/hls.c index 597bea7f25..90e2a2b43a 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1104,9 +1104,10 @@ static void handle_id3(AVIOContext *pb, struct playlist *pls) pls->id3_found = 1; /* get picture attachment and set text metadata */ - if (pls->ctx->nb_streams) - ff_id3v2_parse_apic(pls->ctx, extra_meta); - else + if (pls->ctx->nb_streams) { + if (pls->ctx->flags & AVFMT_FLAG_ATTACHED_PIC) + ff_id3v2_parse_apic(pls->ctx, extra_meta); + } else /* demuxer not yet opened, defer picture attachment */ pls->id3_deferred_extra = extra_meta; @@ -2018,7 +2019,8 @@ static int hls_read_header(AVFormatContext *s) goto fail; if (pls->id3_deferred_extra && pls->ctx->nb_streams == 1) { - ff_id3v2_parse_apic(pls->ctx, pls->id3_deferred_extra); + if (pls->ctx->flags & AVFMT_FLAG_ATTACHED_PIC) + ff_id3v2_parse_apic(pls->ctx, pls->id3_deferred_extra); avformat_queue_attached_pictures(pls->ctx); ff_id3v2_parse_priv(pls->ctx, pls->id3_deferred_extra); ff_id3v2_free_extra_meta(&pls->id3_deferred_extra); diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index e8c76f9cfb..db1bd4acf8 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2988,29 +2988,26 @@ 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 { - AVStream *st = avformat_new_stream(s, NULL); - if (!st) - break; - av_dict_set(&st->metadata, "filename", attachments[j].filename, 0); - av_dict_set(&st->metadata, "mimetype", attachments[j].mime, 0); - if (attachments[j].description) - av_dict_set(&st->metadata, "title", attachments[j].description, 0); - st->codecpar->codec_id = AV_CODEC_ID_NONE; + AVStream *st = NULL; + enum AVCodecID codec_id = AV_CODEC_ID_NONE; for (i = 0; mkv_image_mime_tags[i].id != AV_CODEC_ID_NONE; i++) { if (av_strstart(attachments[j].mime, mkv_image_mime_tags[i].str, NULL)) { - st->codecpar->codec_id = mkv_image_mime_tags[i].id; + codec_id = mkv_image_mime_tags[i].id; break; } } - attachments[j].stream = st; - - if (st->codecpar->codec_id != AV_CODEC_ID_NONE) { - res = ff_add_attached_pic(s, st, NULL, &attachments[j].bin.buf, 0); + if (codec_id != AV_CODEC_ID_NONE && s->flags & AVFMT_FLAG_ATTACHED_PIC) { + res = ff_add_attached_pic(s, NULL, NULL, &attachments[j].bin.buf, 0); if (res < 0) goto fail; - } else { + st = s->streams[s->nb_streams - 1]; + st->codecpar->codec_id = codec_id; + } else if (codec_id == AV_CODEC_ID_NONE) { + st = avformat_new_stream(s, NULL); + if (!st) + break; st->codecpar->codec_type = AVMEDIA_TYPE_ATTACHMENT; if (ff_alloc_extradata(st->codecpar, attachments[j].bin.size)) break; @@ -3024,6 +3021,13 @@ static int matroska_read_header(AVFormatContext *s) } } } + + av_dict_set(&st->metadata, "filename", attachments[j].filename, 0); + av_dict_set(&st->metadata, "mimetype", attachments[j].mime, 0); + if (attachments[j].description) + av_dict_set(&st->metadata, "title", attachments[j].description, 0); + + attachments[j].stream = st; } } diff --git a/libavformat/mov.c b/libavformat/mov.c index 7805330bf9..08dcb10df4 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -196,6 +196,9 @@ static int mov_read_covr(MOVContext *c, AVIOContext *pb, int type, int len) return 0; } + if (!(c->fc->flags & AVFMT_FLAG_ATTACHED_PIC)) + return 0; + sc = av_mallocz(sizeof(*sc)); if (!sc) return AVERROR(ENOMEM); diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index 0e8c25c030..cc48374a99 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -75,7 +75,8 @@ static int ogm_chapter(AVFormatContext *as, uint8_t *key, uint8_t *val) int ff_vorbis_stream_comment(AVFormatContext *as, AVStream *st, const uint8_t *buf, int size) { - int updates = ff_vorbis_comment(as, &st->metadata, buf, size, 1); + int updates = ff_vorbis_comment(as, &st->metadata, buf, size, + !!(as->flags & AVFMT_FLAG_ATTACHED_PIC)); if (updates > 0) { st->event_flags |= AVSTREAM_EVENT_FLAG_METADATA_UPDATED; diff --git a/libavformat/options_table.h b/libavformat/options_table.h index b4141564c8..d54906327b 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -39,7 +39,7 @@ static const AVOption avformat_options[] = { {"probesize", "set probing size", OFFSET(probesize), AV_OPT_TYPE_INT64, {.i64 = 5000000 }, 32, INT64_MAX, D}, {"formatprobesize", "number of bytes to probe file format", OFFSET(format_probesize), AV_OPT_TYPE_INT, {.i64 = PROBE_BUF_MAX}, 0, INT_MAX-1, D}, {"packetsize", "set packet size", OFFSET(packet_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, E}, -{"fflags", NULL, OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = AVFMT_FLAG_AUTO_BSF }, INT_MIN, INT_MAX, D|E, "fflags"}, +{"fflags", NULL, OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = AVFMT_FLAG_AUTO_BSF | AVFMT_FLAG_ATTACHED_PIC}, INT_MIN, INT_MAX, D|E, "fflags"}, {"flush_packets", "reduce the latency by flushing out packets immediately", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_FLUSH_PACKETS }, INT_MIN, INT_MAX, E, "fflags"}, {"ignidx", "ignore index", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_IGNIDX }, INT_MIN, INT_MAX, D, "fflags"}, {"genpts", "generate pts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_GENPTS }, INT_MIN, INT_MAX, D, "fflags"}, @@ -59,6 +59,7 @@ static const AVOption avformat_options[] = { {"bitexact", "do not write random/volatile data", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_BITEXACT }, 0, 0, E, "fflags" }, {"shortest", "stop muxing with the shortest stream", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_SHORTEST }, 0, 0, E, "fflags" }, {"autobsf", "add needed bsfs automatically", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_AUTO_BSF }, 0, 0, E, "fflags" }, +{"attached_pic", "export attached pictures", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_ATTACHED_PIC }, 0, 0, D, "fflags" }, {"seek2any", "allow seeking to non-keyframes on demuxer level when supported", OFFSET(seek2any), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, D}, {"analyzeduration", "specify how many microseconds are analyzed to probe the input", OFFSET(max_analyze_duration), AV_OPT_TYPE_INT64, {.i64 = 0 }, 0, INT64_MAX, D}, {"cryptokey", "decryption key", OFFSET(key), AV_OPT_TYPE_BINARY, {.dbl = 0}, 0, 0, D}, diff --git a/libavformat/utils.c b/libavformat/utils.c index 0834c80f4e..3624678193 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -655,7 +655,8 @@ FF_ENABLE_DEPRECATION_WARNINGS if (id3v2_extra_meta) { if (!strcmp(s->iformat->name, "mp3") || !strcmp(s->iformat->name, "aac") || !strcmp(s->iformat->name, "tta") || !strcmp(s->iformat->name, "wav")) { - if ((ret = ff_id3v2_parse_apic(s, id3v2_extra_meta)) < 0) + if (s->flags & AVFMT_FLAG_ATTACHED_PIC && + (ret = ff_id3v2_parse_apic(s, id3v2_extra_meta)) < 0) goto close; if ((ret = ff_id3v2_parse_chapters(s, id3v2_extra_meta)) < 0) goto close; diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 8214ab8498..2179c55020 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -552,7 +552,8 @@ static int wav_read_header(AVFormatContext *s) ID3v2ExtraMeta *id3v2_extra_meta = NULL; ff_id3v2_read_dict(pb, &s->internal->id3v2_meta, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta); if (id3v2_extra_meta) { - ff_id3v2_parse_apic(s, id3v2_extra_meta); + if (s->flags & AVFMT_FLAG_ATTACHED_PIC) + ff_id3v2_parse_apic(s, id3v2_extra_meta); ff_id3v2_parse_chapters(s, id3v2_extra_meta); ff_id3v2_parse_priv(s, id3v2_extra_meta); } diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 44ca86d517..80aa0e0f88 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -437,7 +437,8 @@ static void get_attachment(AVFormatContext *s, AVIOContext *pb, int length) int64_t pos = avio_tell(pb); avio_get_str16le(pb, INT_MAX, mime, sizeof(mime)); - if (strcmp(mime, "image/jpeg")) + if (strcmp(mime, "image/jpeg") || + !(s->flags & AVFMT_FLAG_ATTACHED_PIC)) goto done; avio_r8(pb); From patchwork Thu Apr 1 23:27:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26702 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 917E744B298 for ; Fri, 2 Apr 2021 02:28:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7DA9568A48F; Fri, 2 Apr 2021 02:28:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1306568A03E for ; Fri, 2 Apr 2021 02:28:47 +0300 (EEST) Received: by mail-qt1-f177.google.com with SMTP id g24so2739370qts.6 for ; Thu, 01 Apr 2021 16:28:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=TgIgLRx8hm1/+qaz2g8rG1ccAgBDgXHPcWWRtlAwZik=; b=YFMGTra6wFITFktLQ1+2TJyM/DyXoctEpORWds5ziZdpNqybtLNmjvM31pyqRCIXoP 3YZfMieICDqOgQpXe+02Bb9oNucTn+d0JrbCY6Qj1Rm58dudt5rsbj3TKekSK1HQEJFr Bh1ssn6ZUS5LMCSctbi+MkUSH6l/VlQCjKTbzps4RpOIElbEFrnu/qx9PBUINk7jsM1X gwc82sq2VwKO6EUf2JML7UC4crwO3InZ9y8A0tadSPyDlJbjD0sMT3lZQx0JwNR+QZce BgXpAcENTLMUhs7/MkmrkmXFm5p7/F2HwCRGu/1AOQ9YLtX0nb80U77nFXoEngP49Q0V Sl8g== 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=TgIgLRx8hm1/+qaz2g8rG1ccAgBDgXHPcWWRtlAwZik=; b=OdSOcARQsPG3qaeQ7FtAgLvcpMtkl5fhLiKIe4ZxlGwaKx/eUN5OpNulCrU7TFhGA6 HLo33h12thVnmPAXxhuNS8zlfK3ttRvLc01Uym+Lfnab8n+53/m/CAJwxvEk9i3HQ2De 5K0xAS1MjvJQ5xk+AUMk7LOcd9BMCKUjXzyEFS3mbWeiErDX+X09hWnqbTwk4Hm3t1eL Jn0d83+FAZjk0Q5Av0hqMUm1Vn44hkuRsu+sztiTh3LQagRr4bnAfk47WKtvrbA2GYVL SzcRkdiODeFEvr8LFERwWr5lNlaKD10NppJwpPZf+BZ+6mThAQ4wNJrt44runk6I3K9y EWHQ== X-Gm-Message-State: AOAM532N/Pn0v88trA2+x31WzwkQcpoRqiNW1G1CE/BZfpyAil/m1LaA NkXTuhFDdAFJ0YKfvI40HbTnV7qbBJ0= X-Google-Smtp-Source: ABdhPJyRfvFD+3MOsFnlSArC4yRVj14zhT+5NJS/iBF0/8gWskrI17nWgSuKltyna/yhs9TtuZ2vjA== X-Received: by 2002:ac8:6789:: with SMTP id b9mr9250573qtp.103.1617319725325; Thu, 01 Apr 2021 16:28:45 -0700 (PDT) Received: from localhost.localdomain ([191.83.218.26]) by smtp.gmail.com with ESMTPSA id v6sm5108392qkf.132.2021.04.01.16.28.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 16:28:45 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Apr 2021 20:27:38 -0300 Message-Id: <20210401232738.4908-3-jamrial@gmail.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210401232738.4908-1-jamrial@gmail.com> References: <20210401232738.4908-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3 v2] avformat: add apic to AVStream 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" Signed-off-by: James Almer --- Now allocated only on attached_pic disposition streams. Added muxer usage doxy for the new field as well since Andreas has a patchset meant for this purpose. But i can make it say unused instead and let the aforementioned patchset change it as its own API change. Still using apic since i want other people's opinion on what the name should be, since Lynne didn't like it. Another option is simply picture. I don't want it to be too long. libavformat/avformat.h | 24 ++++++++++++++++++------ libavformat/hls.c | 6 +++--- libavformat/id3v2.c | 2 +- libavformat/mov.c | 4 ++-- libavformat/utils.c | 27 ++++++++++++++++++++++----- libavformat/version.h | 3 +++ 6 files changed, 49 insertions(+), 17 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 11e993eacb..6a9b09160c 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -838,7 +838,7 @@ typedef struct AVIndexEntry { * APIC frame in ID3v2). The first (usually only) packet associated with it * will be returned among the first few packets read from the file unless * seeking takes place. It can also be accessed at any time in - * AVStream.attached_pic. + * AVStream.apic. */ #define AV_DISPOSITION_ATTACHED_PIC 0x0400 /** @@ -947,14 +947,19 @@ typedef struct AVStream { */ AVRational avg_frame_rate; +#if FF_API_ATTACHED_PIC /** * For streams with AV_DISPOSITION_ATTACHED_PIC disposition, this packet * will contain the attached picture. * * decoding: set by libavformat, must not be modified by the caller. * encoding: unused + * + * @deprecated Use apic instead. */ + attribute_deprecated AVPacket attached_pic; +#endif /** * An array of side data that applies to the whole stream (i.e. the @@ -1039,6 +1044,18 @@ typedef struct AVStream { */ AVCodecParameters *codecpar; + /** + * Packet containing the attached picture. Used on streams with + * AV_DISPOSITION_ATTACHED_PIC disposition. + * + * - demuxing: Allocated and filled by libavformat on stream creation. Must + * not be modified by the caller. Freed by libavformat in + * avformat_free_context() + * - muxing: Allocated and filled by the caller before avformat_write_header() + * Freed by libavformat in avformat_free_context() + */ + AVPacket *apic; + /***************************************************************** * All fields below this line are not part of the public API. They * may not be used outside of libavformat and can be changed and @@ -1049,11 +1066,6 @@ typedef struct AVStream { ***************************************************************** */ -#if LIBAVFORMAT_VERSION_MAJOR < 59 - // kept for ABI compatibility only, do not access in any way - void *unused; -#endif - int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */ // Timestamp generation support: diff --git a/libavformat/hls.c b/libavformat/hls.c index 90e2a2b43a..8ac094acbe 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1068,15 +1068,15 @@ static int id3_has_changed_values(struct playlist *pls, AVDictionary *metadata, } /* check if apic appeared */ - if (apic && (pls->ctx->nb_streams != 2 || !pls->ctx->streams[1]->attached_pic.data)) + if (apic && (pls->ctx->nb_streams != 2 || !pls->ctx->streams[1]->apic)) return 1; if (apic) { - int size = pls->ctx->streams[1]->attached_pic.size; + int size = pls->ctx->streams[1]->apic->size; if (size != apic->buf->size - AV_INPUT_BUFFER_PADDING_SIZE) return 1; - if (memcmp(apic->buf->data, pls->ctx->streams[1]->attached_pic.data, size) != 0) + if (memcmp(apic->buf->data, pls->ctx->streams[1]->apic->data, size) != 0) return 1; } diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 863709abbf..49de81ba24 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -1154,7 +1154,7 @@ int ff_id3v2_parse_apic(AVFormatContext *s, ID3v2ExtraMeta *extra_meta) st = s->streams[s->nb_streams - 1]; st->codecpar->codec_id = apic->id; - if (AV_RB64(st->attached_pic.data) == PNGSIG) + if (AV_RB64(st->apic->data) == PNGSIG) st->codecpar->codec_id = AV_CODEC_ID_PNG; if (apic->description[0]) diff --git a/libavformat/mov.c b/libavformat/mov.c index 08dcb10df4..e9e9a674b7 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -210,8 +210,8 @@ static int mov_read_covr(MOVContext *c, AVIOContext *pb, int type, int len) st = c->fc->streams[c->fc->nb_streams - 1]; st->priv_data = sc; - if (st->attached_pic.size >= 8 && id != AV_CODEC_ID_BMP) { - if (AV_RB64(st->attached_pic.data) == 0x89504e470d0a1a0a) { + if (st->apic->size >= 8 && id != AV_CODEC_ID_BMP) { + if (AV_RB64(st->apic->data) == 0x89504e470d0a1a0a) { id = AV_CODEC_ID_PNG; } else { id = AV_CODEC_ID_MJPEG; diff --git a/libavformat/utils.c b/libavformat/utils.c index 3624678193..580f67c39d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -457,7 +457,7 @@ int avformat_queue_attached_pictures(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) if (s->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC && s->streams[i]->discard < AVDISCARD_ALL) { - if (s->streams[i]->attached_pic.size <= 0) { + if (s->streams[i]->apic->size <= 0) { av_log(s, AV_LOG_WARNING, "Attached picture on stream %d has invalid size, " "ignoring\n", i); @@ -466,7 +466,7 @@ int avformat_queue_attached_pictures(AVFormatContext *s) ret = avpriv_packet_list_put(&s->internal->raw_packet_buffer, &s->internal->raw_packet_buffer_end, - &s->streams[i]->attached_pic, + s->streams[i]->apic, av_packet_ref, 0); if (ret < 0) return ret; @@ -478,12 +478,13 @@ int ff_add_attached_pic(AVFormatContext *s, AVStream *st0, AVIOContext *pb, AVBufferRef **buf, int size) { AVStream *st = st0; - AVPacket *pkt; + AVPacket *pkt = av_packet_alloc(); int ret; - if (!st && !(st = avformat_new_stream(s, NULL))) + if (!pkt || (!st && !(st = avformat_new_stream(s, NULL)))) { + av_packet_free(&pkt); return AVERROR(ENOMEM); - pkt = &st->attached_pic; + } if (buf) { av_assert1(*buf); av_packet_unref(pkt); @@ -502,10 +503,20 @@ int ff_add_attached_pic(AVFormatContext *s, AVStream *st0, AVIOContext *pb, pkt->stream_index = st->index; pkt->flags |= AV_PKT_FLAG_KEY; +#if FF_API_ATTACHED_PIC +FF_DISABLE_DEPRECATION_WARNINGS + if (av_packet_ref(&st->attached_pic, pkt) < 0) + goto fail; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + av_assert0(!st0 || !st0->apic); + st->apic = pkt; + return 0; fail: if (!st0) ff_free_stream(s, st); + av_packet_free(&pkt); return ret; } @@ -4408,8 +4419,14 @@ static void free_stream(AVStream **pst) if (st->parser) av_parser_close(st->parser); +#if FF_API_ATTACHED_PIC +FF_DISABLE_DEPRECATION_WARNINGS if (st->attached_pic.data) av_packet_unref(&st->attached_pic); +FF_ENABLE_DEPRECATION_WARNINGS +#endif + + av_packet_free(&st->apic); if (st->internal) { avcodec_free_context(&st->internal->avctx); diff --git a/libavformat/version.h b/libavformat/version.h index ced5600034..dce936794a 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -115,6 +115,9 @@ #ifndef FF_API_LAVF_PRIV_OPT #define FF_API_LAVF_PRIV_OPT (LIBAVFORMAT_VERSION_MAJOR < 60) #endif +#ifndef FF_API_ATTACHED_PIC +#define FF_API_ATTACHED_PIC (LIBAVFORMAT_VERSION_MAJOR < 60) +#endif #ifndef FF_API_R_FRAME_RATE