From patchwork Wed Mar 3 15:31:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26076 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 4C70B449611 for ; Wed, 3 Mar 2021 17:31:21 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2187668AB0D; Wed, 3 Mar 2021 17:31:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B4C068A9EA for ; Wed, 3 Mar 2021 17:31:14 +0200 (EET) Received: by mail-ed1-f43.google.com with SMTP id w9so14366925edt.13 for ; Wed, 03 Mar 2021 07:31:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3vGpTTIorUMJpvYbyKDhIRNWLhr9TMfLlfKH+awNk68=; b=dpaJeY4JZBxFZZhd9AvG+v56JfQhdVKSVbSdmHB/DaWilkK84/eSbTBRzbXs/yKCnz HGF59BA1tcIJPQBiswkswrZABOf8pEHQg0xBWNvtGnZS9LlE30ywGAot7cWSOP4e3kms BYkGk5im82z8CjY5DlwfwSOhTKEl3mCr90LjI4/YzugI68LXXAkwdt9Jm3rN2rPKX3JT oiR/4jsp3jMZ6ATdQ6RcL2SDKSvrA01NZdxGBTvz5z5EJA3PD3Noch2nD08wiR8ShNcc 2GxTUAk13yIvByylZdlONnM1NDJ6/kif69lXwLTIpk4NMhU1VQQBk8ITQYrrMEMfU96A ThlA== 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=3vGpTTIorUMJpvYbyKDhIRNWLhr9TMfLlfKH+awNk68=; b=lKOioT0mqOojtKxhmKE+vLYZyOfwjq749uvkV0QkMdEws2JPPMoea/5ND0BYyClZvd x79+oMHykoJJZM+ioRV6G6ZqfY1+UOiidxLC/rLSS7vM3Y9/o9b7dh0Tl7Brjd7Jr8Sb 2y/0QymQjPbSRpH1HL1AcZZ8n0kmNscJjviKWk+0QxGg7iJi6QZHs11TgsZ0I6uYaUr5 rErt8neBbNuV8avz4OjkQNsNvUtR1RLdFROZwTuQqMd6Qm+Qj1UxuVckuClrf6dA30LF ZOR6QB3WFFWRSeRFaezruylIR0w9sn+eN760ZgwKh308R+wofThWejqR/HOTAxLWU3O0 Y/Ew== X-Gm-Message-State: AOAM533F5Nr5O/SyyCEcCwzUIkqWIe24hezQQiZHsBWphQWJzEge7ku0 YY6QXgICAHFvemswDFx2jviCz0PDnw0= X-Google-Smtp-Source: ABdhPJwo1Mf0pSF1I4VVWtgqZtkOWZiMRycNmcQbOdSGiQ+lpkHe9/PNSwg69Xlev6BC98vH/mzMhw== X-Received: by 2002:a05:6402:1d19:: with SMTP id dg25mr7406445edb.218.1614785473735; Wed, 03 Mar 2021 07:31:13 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id w24sm4745545edt.44.2021.03.03.07.31.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 07:31:13 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Mar 2021 16:31:08 +0100 Message-Id: <20210303153108.698933-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/frmdec: Simplify finding pixel format 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" The fourccs used by the Megalux Frame format to determine the pixel format are actually no fourccs at all as they are a single byte. Furthermore, their range is continuous (1-5), so they are actually ordinary indices. So treat them as such and don't use PixelFormatTags for them. Signed-off-by: Andreas Rheinhardt --- libavformat/frmdec.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/libavformat/frmdec.c b/libavformat/frmdec.c index 9a962f37fa..1bc3a83e11 100644 --- a/libavformat/frmdec.c +++ b/libavformat/frmdec.c @@ -29,13 +29,12 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" -static const PixelFormatTag frm_pix_fmt_tags[] = { - { AV_PIX_FMT_RGB555, 1 }, - { AV_PIX_FMT_RGB0, 2 }, - { AV_PIX_FMT_RGB24, 3 }, - { AV_PIX_FMT_BGR0, 4 }, - { AV_PIX_FMT_BGRA, 5 }, - { AV_PIX_FMT_NONE, 0 }, +static const enum AVPixelFormat frm_pix_fmt_tags[] = { + AV_PIX_FMT_RGB555, + AV_PIX_FMT_RGB0, + AV_PIX_FMT_RGB24, + AV_PIX_FMT_BGR0, + AV_PIX_FMT_BGRA, }; typedef struct { @@ -55,6 +54,8 @@ static int frm_read_header(AVFormatContext *avctx) { AVIOContext *pb = avctx->pb; AVStream *st = avformat_new_stream(avctx, 0); + unsigned idx; + if (!st) return AVERROR(ENOMEM); @@ -62,9 +63,10 @@ static int frm_read_header(AVFormatContext *avctx) st->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO; avio_skip(pb, 3); - st->codecpar->format = avpriv_find_pix_fmt(frm_pix_fmt_tags, avio_r8(pb)); - if (!st->codecpar->format) + idx = avio_r8(pb) - 1; + if (idx >= FF_ARRAY_ELEMS(frm_pix_fmt_tags)) return AVERROR_INVALIDDATA; + st->codecpar->format = frm_pix_fmt_tags[idx]; st->codecpar->codec_tag = 0; st->codecpar->width = avio_rl16(pb);