From patchwork Thu Jan 28 21:56:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: leo60228 X-Patchwork-Id: 25241 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 41EF144B01C for ; Fri, 29 Jan 2021 00:01:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 01E08689AA6; Fri, 29 Jan 2021 00:01:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 35FA3689A91 for ; Fri, 29 Jan 2021 00:01:32 +0200 (EET) Received: by mail-qk1-f178.google.com with SMTP id n15so6919414qkh.8 for ; Thu, 28 Jan 2021 14:01:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=60228.dev; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OWFmhfTr329xvskrUf1JHhgteF1ppq1X3JskYXoUnJU=; b=mgVz3H7F28k60/M7ZN8hUrCGNnVCDJQYbKAHJzH3BVG3oc8gHByGCeF2xDvwB4dKiR 2DAXmw2AUyUPzXFIjZdT1MNhZtTlaKSzmmelXMZ+QnExXosKj8Z7sSN7QdL7AIm3xPgQ bMmHgcimtFG9hy6RTFtDx+yMJSkMUqRVs1hrkIbCUAAL63+KgEwVXXYFP6cmJAXrEplD rMltsSAuJG303aVs/cgK9RqZ05meTqEK/8oCnjkQ3uC0exXvEbI7VOfdeBtZVxBguolL TVxt9YT3K8UrNYU4S8SpFlJG4T8C9/xYT1IOrmUteo7v5oIYykeIPfCa3SBTUg3oJAzV M/xQ== 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=OWFmhfTr329xvskrUf1JHhgteF1ppq1X3JskYXoUnJU=; b=bR0IDyQiEI1F4t1PEOfSLnNXLtOnKKgfVL7URomXTMUfuvdjr0HnCha+WBOf6o46ib 0u36BjPjK4otGcQSWpxbpD8SJaBs7qZJZYbEDpKlZQG9b82+df/A5edPHWthqEfNjAMD r5m+R6Zm3O35KxeBZcU4pzs6AYMYBgYaY0G2j87F/Gf3qpmyVGcAXNEXIQJVxJBXZ6fZ R7Q9fZHRtdmoANtEeb8kp5zo3nHi23HsvmAw2U3DhnTjccjEWe6/adelwnRb7FScwpJw ahiLKElDhogKs8WGgZmtjDvdASkMFFgoVbvoAIFmJUdF+wJvVKRHmOeyD5TdiLeQG4Oh HqGw== X-Gm-Message-State: AOAM532GvfBetLHK0hIqaBst+HnG+5AUxfYTDyQqI2XCA8XU3FkQH/+b qYr11mfbxluG9nsR9XN52Dm/3vqO9HuGbn6I X-Google-Smtp-Source: ABdhPJyzPi1WLSzgCUciaGj3SXEbpoUz+b91AkmIdGCHXMk2akwkVd6Bl6i5lgInidwGeS6PNvdPBQ== X-Received: by 2002:a37:b6c6:: with SMTP id g189mr1384862qkf.432.1611870981707; Thu, 28 Jan 2021 13:56:21 -0800 (PST) Received: from localhost (098-121-230-017.res.spectrum.com. [98.121.230.17]) by smtp.gmail.com with ESMTPSA id s136sm4247573qka.106.2021.01.28.13.56.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 28 Jan 2021 13:56:21 -0800 (PST) From: leo60228 To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Jan 2021 16:56:17 -0500 Message-Id: <20210128215617.3437-1-leo@60228.dev> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] flac: add GIF image support 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: leo60228 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The FLAC specification requires GIF images to contain their number of colors. While I can't find a specific reference to that effect, I'm assuming that's why GIF images were previously unsupported. This was implemented by just writing AVPALETTE_COUNT for paletted images. --- Changelog | 1 + libavformat/flacenc.c | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index e8ee74775e..3ff783c61d 100644 --- a/Changelog +++ b/Changelog @@ -61,6 +61,7 @@ version : - shear filter - kirsch filter - colortemperature filter +- GIF support in FLAC version 4.3: diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c index 1c983486aa..c156d13b14 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -151,11 +151,16 @@ static int flac_write_picture(struct AVFormatContext *s, AVPacket *pkt) avio_wb32(pb, st->codecpar->width); avio_wb32(pb, st->codecpar->height); + if ((pixdesc = av_pix_fmt_desc_get(st->codecpar->format))) avio_wb32(pb, av_get_bits_per_pixel(pixdesc)); else avio_wb32(pb, 0); - avio_wb32(pb, 0); + + if (st->codecpar->format == AV_PIX_FMT_PAL8) + avio_wb32(pb, AVPALETTE_COUNT); + else + avio_wb32(pb, 0); avio_wb32(pb, pkt->size); avio_write(pb, pkt->data, pkt->size); @@ -218,9 +223,6 @@ static int flac_init(struct AVFormatContext *s) if (!(st->disposition & AV_DISPOSITION_ATTACHED_PIC)) { av_log(s, AV_LOG_WARNING, "Video stream #%d is not an attached picture. Ignoring\n", i); continue; - } else if (st->codecpar->codec_id == AV_CODEC_ID_GIF) { - av_log(s, AV_LOG_ERROR, "GIF image support is not implemented.\n"); - return AVERROR_PATCHWELCOME; } else if (!c->write_header) { av_log(s, AV_LOG_ERROR, "Can't write attached pictures without a header.\n"); return AVERROR(EINVAL);