From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5500D44C64 for ; Sun, 14 May 2023 21:40:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0188068BD03; Mon, 15 May 2023 00:40:24 +0300 (EEST) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71BF26806D7 for ; Mon, 15 May 2023 00:40:17 +0300 (EEST) Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-2529f2d0ea6so539182a91.1 for ; Sun, 14 May 2023 14:40:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684100415; x=1686692415; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SpVvMVxHzboUCidawmc9PBoJPAa6qW4K9Dvh5CGujSY=; b=ax8WdIgssctKemvs58PnHbsMk0zzdLMAAOCFPZaDYd7Abvvr43S7KEjl/BNKpmLmek 4BE/vQPMzvUbMrMYbQo03uJnpkBvBa8agRU9AVThTMwYqjSeCQ+AQy80mXE0JD71Q7mW uJU+x8DmOFBU8JjEPQxAGVmOF498C/qSImp9ijiBrlAMngKPn+EP0RFslQmzRAJQeYgV X4EeEvWrLjgk6sWyTQL8lApKDIH9s000XqwEzQ4qg1Ivv0ObxOffAj1BE2DejNGg9S3r eF7WcmF4PyGOYx2kFSISEPvD0JxG5lMdpq9MvqWZ8+Wy9naVG7j8IVs4uQpfsZuxOMJj cdcw== X-Gm-Message-State: AC+VfDwevcmGLjFBjP0ZnT0jPzYpVn4k3mpiMj8XJsIw/g02c1XVkSew l77m4fm6cEId6rf9htMs4SRmh/AziZ4= X-Google-Smtp-Source: ACHHUZ7ZCBt7T6+YmIKgkzcJBAXI99p3U1UMa5B4R9dV+nN9mCDhPeUT+UjZufV1NGJQ3hbM21y3yw== X-Received: by 2002:a17:90b:4c86:b0:252:75c8:d0a4 with SMTP id my6-20020a17090b4c8600b0025275c8d0a4mr14791552pjb.2.1684100414753; Sun, 14 May 2023 14:40:14 -0700 (PDT) Received: from localhost.localdomain (066-168-152-244.res.spectrum.com. [66.168.152.244]) by smtp.gmail.com with ESMTPSA id jl1-20020a170903134100b001a4edbabad3sm1346808plb.230.2023.05.14.14.40.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 14 May 2023 14:40:14 -0700 (PDT) From: toots@rastageeks.org To: ffmpeg-devel@ffmpeg.org Date: Sun, 14 May 2023 16:37:41 -0500 Message-Id: <20230514213741.34312-1-toots@rastageeks.org> X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/2] libavformat/oggparseflac: Decode metadata packets. Fixes: #10364 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Romain Beauxis Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Romain Beauxis This is the third version on a series of patches improving ffmpeg support for ogg chained streams. Reproduction steps for the issue fixed with patch are included in this bug report: https://trac.ffmpeg.org/ticket/10363 --- libavformat/oggparseflac.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c index eef6e09927..1dd292483d 100644 --- a/libavformat/oggparseflac.c +++ b/libavformat/oggparseflac.c @@ -126,10 +126,30 @@ fail: return ret; } +static int flac_packet(AVFormatContext *s, int idx) +{ + struct ogg *ogg = s->priv_data; + struct ogg_stream *os = ogg->streams + idx; + int ret; + + if (os->psize > 4 && (*(os->buf + os->pstart) & 0x7F) == FLAC_METADATA_TYPE_VORBIS_COMMENT) { + AVStream *st = s->streams[idx]; + av_dict_free(&st->metadata); + ret = ff_vorbis_stream_comment(s, st, os->buf + os->pstart + 4, + os->psize - 4); + + if (ret < 0) return ret; + } + + return 0; +} + + const struct ogg_codec ff_flac_codec = { .magic = "\177FLAC", .magicsize = 5, .header = flac_header, + .packet = flac_packet, .nb_header = 2, }; -- 2.37.1 (Apple Git-137.1) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".