From patchwork Sat Apr 22 15:45:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Beauxis X-Patchwork-Id: 41298 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp310456pzb; Sat, 22 Apr 2023 08:45:49 -0700 (PDT) X-Google-Smtp-Source: AKy350alFaGlP0Cbt2al1LsAeki4RgijNWX/XIU3gfNurUpaXY+6MlwHrOO7wdMNEI3A+a7tQMoz X-Received: by 2002:a05:6402:7d1:b0:506:c2b2:72f3 with SMTP id u17-20020a05640207d100b00506c2b272f3mr7026112edy.28.1682178348904; Sat, 22 Apr 2023 08:45:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682178348; cv=none; d=google.com; s=arc-20160816; b=q+9KRxVYsW3qnifqCL3wgrfY8CDBODNLOozQ60YbTg2gypNV5UD8a9x5UtiLKm+9pG LguBw/YPMhf5UcMqO3yuY2l+zxzxGk8IZSm2sbP1kDWbbDH+rhFEluTMnRChDF/3uHvb uMIvzVpZk0WsbT6yq59N2/hj2p/UA7hUu7E3Zdte/9lR4b56vSBwPAAq04UEgIOAdspz fJ1RJ447qbHoHu4YlWXLbuUCLQB4yiazYhQDLsWLExmo155lNsnwsF/vlONXGyR9wMnw WCzrrtzeY5Y41hBA4Pt/RZPihp44kB5Hb0rgzvnNjfCsnne+ru3uBxRA5xIOL4qm5TPM aehg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=GK8bPUu8MwquzqzMpmlgEFB/C4xYUz7OaP2ThMILrI0=; b=D1ME2dj5OPL3dluW2lb++h3MUvTNk/NiogpdJIOkpYgSBIUkvEq0XyRv6SfG4pKmzi IpF/zqU7kYe2K0if8lu81GB1FuaLkagRPn8ToF3L/hERJP6QTSjN+NHfr3VRh1emBvUv 8cswcMReCZQRSZY6cAtSLMeN6HGxb9fENT+wpti8CKGiwdUF26EG9scpza9WQYSWviPn arI6iM2cXI/isolHcj16zGRIm7jm1ZLDZVpw+LcSjnKzuAW17DWRbymqU10jm0gwt3s5 eAxe4yUXJj6+HyziRz+L25NdmmoOuxATd5aWZxWHWLT8zqoy9mgaB3WnbWbbY2/T3NR8 iTSg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g22-20020a056402181600b0050690621b9fsi5586004edy.478.2023.04.22.08.45.48; Sat, 22 Apr 2023 08:45:48 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3EA0268BF80; Sat, 22 Apr 2023 18:45:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 330C768BF45 for ; Sat, 22 Apr 2023 18:45:40 +0300 (EEST) Received: by mail-ot1-f54.google.com with SMTP id 46e09a7af769-6a4124c8328so592397a34.1 for ; Sat, 22 Apr 2023 08:45:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682178338; x=1684770338; 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=x3Gd/IdeIRlAWsppHWuysdbewNpu1Bew60NgSj0zkuU=; b=TzkKNYboWqBOktzmdt6433JJGvTFg7wLP3OLxuTh3tNvTrmNsMcVvBe0v6AAkYvI+w WHm1i1lWRHzXNTLV3Yu1D1X9uEzXwU4Nr5Qtk6e0sm7ZdupIuzJSWEnLV/s7/q3yVa+4 YxLg6SWQtWwMWubx16SfhpqNGl+ijAeC3QHYSUrHWMdI/zjyoF9n7Bo0H8c4OQ6PuWAT w/nWywqNtdeM36jmloksQxnU7DAYyI7KeG2oQutKqNVxCrcH85bmXXZsp03CMPXuWdW7 zPkqbET2cO1Gpq/OwCdmj6Z0B+0UyGvtFAHfeCX1hO1BoEz7lpQ1zysTP1zxIit/RvoD jFaQ== X-Gm-Message-State: AAQBX9d2+/L1Yi/3fEjAOfGHhZk7oVCwec1PCdDmu+JRJLMEfWFud/GN rbMdSFqgcw6OAyTHw5D0Egr3FNAAZQaU9A== X-Received: by 2002:aca:a855:0:b0:38d:ce1e:30a3 with SMTP id r82-20020acaa855000000b0038dce1e30a3mr4342328oie.1.1682178338405; Sat, 22 Apr 2023 08:45:38 -0700 (PDT) Received: from romains-mbp.lan (ip24-252-77-224.no.no.cox.net. [24.252.77.224]) by smtp.gmail.com with ESMTPSA id b82-20020aca3455000000b0038ec2b341c2sm8397oia.12.2023.04.22.08.45.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 22 Apr 2023 08:45:38 -0700 (PDT) From: toots@rastageeks.org To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Apr 2023 10:45:24 -0500 Message-Id: <20230422154523.22794-1-toots@rastageeks.org> X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Add support for flac in-stream metadata. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZJOk8bwqvRJP From: Romain Beauxis This patch adds support for in-stream metadata updates in the ogg/flac parser. Code for detecting metadata frame is based on libavcodec/flacdec.c, code for handling comment update is based on libavformat/oggparsevorbis.c. This has been successfully tested locally. To reproduce: * Setup an ogg/flac icecast stream. * Read the stream * Check the associated AVStream metadata There seems to be similar issues with opus as well, which will be addressed in a separate patch. --- 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, };