From patchwork Fri May 3 21:54:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48479 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:e68f:b0:1af:836d:81b3 with SMTP id mz15csp68770pzb; Fri, 3 May 2024 14:55:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUXFWxTkqjUnYwMQ5scczKFrUgS0mGWL/QsvJKey3OwWJBqdMz65XYnMh4hOXWeKfpGu69wyqQh4R3nFB3It4s7fI9k6PDNgz3cCA== X-Google-Smtp-Source: AGHT+IEChGjyIahJ/sx1MEObr8tZ1nlcFKY2NbtYXk+ZP3dm3re6FPZsn+gjQzIEs5IfhLlWDFnK X-Received: by 2002:a19:5f13:0:b0:51f:ca3a:c669 with SMTP id t19-20020a195f13000000b0051fca3ac669mr974098lfb.29.1714773315790; Fri, 03 May 2024 14:55:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714773315; cv=none; d=google.com; s=arc-20160816; b=IVCMmd1jZa/SXOeRT02PY0nWZ7Gs74LwACTR80aZuKYNls+nteA0K5nn7DLpApARGA Zi8zuoc5bOcseqd2xHBSPX8j7B/Ab4JBAjJgXr/ZySfxo1nuhoufQoKaDlDV2j/ycDoK 4PrlEsXo3ylyQNibnSS/KN2agXnEa5sZ3haTn2mUeGgal5UtNNpVhLXVMNtRi05tbIHO wX1STQVmsLMmugoBPqhuzgpssbBWZahBD3gvjBLUuwecb2qoce2QLlYlYxMnqadpSJhj cDsr0tbRASHqJajzabPy0h5dDRCsZelhximfX93UodIpr8P3ALU0qRRt4L7WyWjaPPsb Xogg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=Mj2uclfSzxm7nobgOPfJzEaXaysOnADGKKJOTJP1kAU=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=NH5nNy9eAHkaIcu9slfBhT7VKpBTuIYdbcb7lM1+F/MxuYfm2ByGjEjkau1ILlLJko EtJk2uqP2ypGQ2GePrYl7e95BGqxUoHvKRWHZv8u5dPzDazff+Nn55AAncn+o1drBIex cL5H3PJ2FrKiyxGNPozTpTRDMZlQEm/tq613GhEPjcjrmtLFB7NlnsLCv3lbBcA9qPg5 raZGT0yhafzTHfmmu185/LjQ3n4+MJu5hGv2AN+onQttSdtCZJ6Yp9HjktLbFQvpAjnj ENZW0KyNBBNLiZ4UZLGCeELrn5QBC/zqSS4tmb2dIqt3/WsqMkdbfBYZ0aThIrEISYS4 4Ikw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=iZIaHooY; 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 bl13-20020a170906c24d00b00a5577fa80c3si2014678ejb.612.2024.05.03.14.55.15; Fri, 03 May 2024 14:55:15 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=iZIaHooY; 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 300C968D653; Sat, 4 May 2024 00:55:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB40368D653 for ; Sat, 4 May 2024 00:55:04 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id CB6431BF20C for ; Fri, 3 May 2024 21:55:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1714773304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Fx9zIQpey1CDKGC38E/yTzoh2FsjLJd8TkVb/l5UCLs=; b=iZIaHooY768roqE7e+YIXGZtjdzWLcxvWj4HPEBHycSam19rfFVPlVcFZbK1XxiZuCJbXa WD0XZi0n0Z44czxglUzKgOvXKHvaNqz+dohz94YgjWcSu1inRGFo7kdTWmBBVS8JKj4vLU JEYOThQhDiWwH5O3NMk2wmvDfsXB7hLSju8VhsdZ3DZIbOowENMao4BDZbzwLqfgeJnjRB 1sQKYWG4aj11yWkk5f650Ag4JA3JZx3ePsHVs1GOXAc6R2+Cw3uLcfwbP68EZLDnSShZIw fh0+xEuwFHU2hETzT9uvqcpLssZqU1MZ+yi881IJpsY8GgsFiogG9gaN4U+6gg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 3 May 2024 23:54:58 +0200 Message-ID: <20240503215502.1509887-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/decode: decode_simple_internal() only implements audio and video 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: c2AuIpCfWCag Fixes: CID1538861 Uninitialized scalar variable Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/decode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index d031b1ca176..900b0c07a35 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -431,7 +431,8 @@ FF_ENABLE_DEPRECATION_WARNINGS } else if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) { ret = !got_frame ? AVERROR(EAGAIN) : discard_samples(avctx, frame, discarded_samples); - } + } else + av_assert0(0); if (ret == AVERROR(EAGAIN)) av_frame_unref(frame); From patchwork Fri May 3 21:54:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48480 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:e68f:b0:1af:836d:81b3 with SMTP id mz15csp68844pzb; Fri, 3 May 2024 14:55:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVyiVR7uMITWVaSLdWWHXItKRz8IvPXVdWaTJc62/IdfkZZghkn0/PAprbcBkiP6Oy2ebH9Lc3nwmHWeNRCBvEz2ULS3/mlpmOcHA== X-Google-Smtp-Source: AGHT+IEvKtmur4tZLR2D9An6LPTrOz33TEEP7R5XY+febuNrBJKLb21taz22lm2Svk5C6YjeuY+d X-Received: by 2002:a17:907:1c90:b0:a58:9709:eadb with SMTP id nb16-20020a1709071c9000b00a589709eadbmr3366568ejc.2.1714773325960; Fri, 03 May 2024 14:55:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714773325; cv=none; d=google.com; s=arc-20160816; b=rgrYocZI21Wihf7uQkElJyfhjABhtJOfNfA/VHndwAqo07gJP5mmy/XNDRjJFeZQVI WltQ6+AzJ+4KqHbXtXr9beZhBqVjeZlIDPS61/Hh9lfRJ8hMcq6aXIfvU2iacCLS2nFo wWgj/hOHjj7UWrhzdsYsmE+Z11UtTsPJhk0kAUd4RXs2CJ8BXdXMH6x8BFl6dIT6G8Q5 vh+BM3f+5D9j7akZmvpUn+9hNcRTqcuAsT3uwGgPsN5D873FQsodKNx5H4ZolQ/idyUW t2UN4EWmIEVZ+YZC0v4Tr4/Dn9j8krI3TTokUJYZCoAp+7LuB1b/8ti07DDj2Q57rw9i To3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=pTZTXjAsfC8wx+UOC/8j96/MNzhvAA75CDRUOWXvcZY=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=KqXeKnoLmx9Jkgv8AihaUiPO0MTwl+NG9QIkXU0JjF321B3AWmGLP6bvOiLF5smnKM QjSPQrjXo3vMWmGmAJn6NgJKCGMdT8nXnBvBtCJHQQ0liLxOGgLhX3SzKqFeWb6lG7ai /KkTRftvL9HRKhcjQ80RCwT+jMrL1GjDTMhgxXJxOW3UdKpYcoD7n0ivV9T1b/qq9Hqm jH09IjDsperFYdczJrKp/AwUYjgbcy2r68sIDiw+hKkQxjxTd996TZYuOiPVs6lSkG+D KfPJ588WmL8kigLWSivSKEEnI5sdgcffFedI0gbGchxqUG42xFPSiF5vhEkYpzbZtEWx 33eA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="Pnr5/GC4"; 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 gs43-20020a1709072d2b00b00a5991a53115si1088347ejc.83.2024.05.03.14.55.25; Fri, 03 May 2024 14:55:25 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="Pnr5/GC4"; 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 4A91668D693; Sat, 4 May 2024 00:55:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A6BA368D659 for ; Sat, 4 May 2024 00:55:05 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 041DAE0007 for ; Fri, 3 May 2024 21:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1714773305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tc9Ct4OJuyyGGeY1BQgXa4TgM0IMYvW1j/9+gkVR9zg=; b=Pnr5/GC4VdmUWQRYPR865NPzeqRqFqqkjs85l/2Geep+9UsdulEPLfBiA44tUh5gXvY3nr lzZ9SeP0I5nDFR/eodDhEyQCfP5KoUzbl3RcOnEfGiTlzFhQzhsS68dh4+/NL+GhnTgxOz 8GgDyrWQ+9OeqPSfbh1NgKS+js2l0Y+eoTAMQqjBAAh46YDrCIDpu6TNLZe4M6ERoH0cyn l+32hOVmKBp8Xm+LvQDfV+Vh7g0NWFNDzEm/YuHFy4W4s5Qro3/V/dy6ENIlYuTHsoKZHa ir0iATO6IeLBba/ZKeNGcLb/8Vg7b6Or23kPiVBeMsG1gFuyflnOcyWPY/4Hxg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 3 May 2024 23:54:59 +0200 Message-ID: <20240503215502.1509887-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240503215502.1509887-1-michael@niedermayer.cc> References: <20240503215502.1509887-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/dovi_rpuenc: initialize profile 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lzSEf9wSEV2f Code is taken from dovi_rpudec Fixes: CID1596604 Uninitialized scalar variable Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/dovi_rpuenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c index 3feaa04b9ed..80dc22234a9 100644 --- a/libavcodec/dovi_rpuenc.c +++ b/libavcodec/dovi_rpuenc.c @@ -571,6 +571,8 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, set_ue_golomb(pb, vdr_rpu_id); s->mapping = &s->vdr[vdr_rpu_id]->mapping; + profile = s->cfg.dv_profile ? s->cfg.dv_profile : ff_dovi_guess_profile_hevc(hdr); + if (!use_prev_vdr_rpu) { set_ue_golomb(pb, mapping->mapping_color_space); set_ue_golomb(pb, mapping->mapping_chroma_format_idc); From patchwork Fri May 3 21:55:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48481 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:e68f:b0:1af:836d:81b3 with SMTP id mz15csp68896pzb; Fri, 3 May 2024 14:55:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUnQxBt3M8+WqukBrWq3p674mWEbUuWJ/Y/5ttziNTExYNcAZU/36c3JOleWnrPNCPevoRsQEuEfVg6/GTSo35Ani1Rf2GR7byF0Q== X-Google-Smtp-Source: AGHT+IGKyH8IplG1d4C4EB7ZRDOFioqRI+PFJSc4KFepZ8OuhyeEoCXm+HTbzsBv0YyeCWnx9KM2 X-Received: by 2002:a05:6402:380c:b0:572:d841:1189 with SMTP id es12-20020a056402380c00b00572d8411189mr1717842edb.3.1714773335031; Fri, 03 May 2024 14:55:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714773335; cv=none; d=google.com; s=arc-20160816; b=m5uKO+WU58unNoaGSxpNFI1R4GL6lx3wRGo+is5TE7XPIL4NkA5RjMstPPQ5pjHLdb TBgJz9+hdNmYgqUefhRU5qRZwBbhw+94FdM+3QveG3hfsoFlWWv6cXDhlG0ijtjTcLFj jRGtODYFKLuz+ssNIhvjdwgQxVXht0zt3eHvhWiIZ6Xj/BCchvjaFjvn/d73XmPXBeI8 fiBrR9D+wJK8uGcpIBM9fQTwRXuwNPcAOJhmV0SegN1/1KB5h85d9BGsyqtVitROzs1H ILIc1F879o3lXfgwKYZTgh4M1v5+rN6O6DJgXadwIMlfpJsquxHTu38bs+XBZXTrJr9W LRfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=WICbhkHcOD2qvmhWgskXjhup8HPR6Ldu7zMaIsac7+o=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=HFMdhVCaqjt8vjTAuaE1nvfOKetv6eaQix0VNxv+D8/rUR1m89UvrAJFlQPjD8kmf3 VvwGfXVBdBl+LEEqlrtyV4jycNnACxlvwlviFNJx36cHDsw2UvqTJDr1pDJ1gB0lb7YD mFfA2NbwGoKeCFDQROR8z9AipC2shT7Bq6pjvaXV1rJWxbhYrmRXriwHxegLg9UAuCdN iDwshd5zcDGVFo9dHe9g32/7Wjn/NH8MN7yIwY5+H9BL5AT2oooK+IGYyeJOAJqcGGTj 7qfxGKP6tjOEmruKJpMgzyDT//0648pBU6PXs3IH8WcvE0yZtGa21VVHKhAfHCNip7Sg EmNA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=KaRt24Xd; 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 z17-20020aa7cf91000000b00572a0826598si1953631edx.613.2024.05.03.14.55.34; Fri, 03 May 2024 14:55:35 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=KaRt24Xd; 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 8E14868D6BB; Sat, 4 May 2024 00:55:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3374F68D6FB for ; Sat, 4 May 2024 00:55:07 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id D45C11C0005 for ; Fri, 3 May 2024 21:55:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1714773306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DZT3bbd86WX/oI7rXmwWOdyhyKzhIGTjpTTq9yvufpQ=; b=KaRt24XdZELtgxg6pJDogUf5tuPiuIBhCFACod9g7qQm1/N340D4yVG+trR4zPZiXXo5bP 36ljleI7Jc1AUEVVziQIM/Am+5h0ZP1UT+HoAy2oyxrK6R9Mbl1SEIEq6wTdySdiy1cYOh eO8U3HHZjh2NwAIJ6LXGPpTH4zAvd98BDNaKPwujTVUGh2GW5TWh3xeqXr7J4gzwThHoxl bcMGl6vu/yrIxZc9SpkCJ2juH//fCd3FvwgAC405VIqnAu0s5avNmkcE5mpKMRRXwFI72B FVVoAem/9XLGF16tDGc2qDIL9+aaxmCb0hwYHbxCL3VuqcY47HXrPZI8g1AusQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 3 May 2024 23:55:00 +0200 Message-ID: <20240503215502.1509887-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240503215502.1509887-1-michael@niedermayer.cc> References: <20240503215502.1509887-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/dovi_rpuenc: fix compaatibility 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: EsbWcOThgcFH Fixes: a frequency Found while reviewing: CID1596607 Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/dovi_rpuenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c index 80dc22234a9..7e0292533bd 100644 --- a/libavcodec/dovi_rpuenc.c +++ b/libavcodec/dovi_rpuenc.c @@ -139,7 +139,7 @@ int ff_dovi_configure(DOVIContext *s, AVCodecContext *avctx) if (!dv_profile || bl_compat_id < 0) { if (s->enable > 0) { av_log(s->logctx, AV_LOG_ERROR, "Dolby Vision enabled, but could " - "not determine profile and compaatibility mode. Double-check " + "not determine profile and compatibility mode. Double-check " "colorspace and format settings for compatibility?\n"); return AVERROR(EINVAL); } From patchwork Fri May 3 21:55:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48482 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:e68f:b0:1af:836d:81b3 with SMTP id mz15csp68955pzb; Fri, 3 May 2024 14:55:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWz1EqbAQBOxvu0qpAa/+OOMtic0/FCbLLWGZsj4cOLQo2QNXtIP+MGbRPNUdOpgUhwJl9kessVdqev95foXGIRo/EDzBF5geOwBQ== X-Google-Smtp-Source: AGHT+IFD3g6SOGa4xpet1QBCDIcrDCJokPWMmzAF3Kem/OqeAElOpCV3Lzxs3syohMGLmkIx9wAr X-Received: by 2002:a2e:979a:0:b0:2dd:bc53:e80 with SMTP id y26-20020a2e979a000000b002ddbc530e80mr2948427lji.51.1714773343803; Fri, 03 May 2024 14:55:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714773343; cv=none; d=google.com; s=arc-20160816; b=q7a5OhsN8kRN0ipVBsMSsbwBomtVsC01XRa53EpS8gDaFUksJSL+roVnOThhZvzRyn tV8njQpZ1VFDdlLhBWW+tQKOCcrKpm/exzl/5ZmK8TOOAJc3QFgcs4Dftu3K57DWfM3U faJRGnWMS1aD1MfKyudBHcd1zZn0npkN+KOSasV2sYKEF7GppEMGGDANdv5QmKveSyeU +iXg/lPguceXE7Y2q2CbJ876gzCgDVfCAilLZtwrpZkkgfme4kECMHJoWwgsFyVAsfVq 3y/W04bgr54KkGSeYEgpahB5TeJ2Q0f7oRJqOLV33JekNSBAQh2sGPzKSFxourl+OS9s 5VJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=f7l6mw/e0bpP1O65OzdoTrY993SVQZiS+vQKvlYlHkY=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=YxntJREPS0CRyFeMzY1FSfqHCmxTLnmiTjf1JYXB3R1vQ2l5GGfTvNPAOmiY0+q1Ns LY8LCss4rpjH/yiszHvFDtRaEkWUy34jNmYckBJTXt2ZOduiu1JcupVmmXFvliawtzx/ yX0YPr5IQlYHiezlLC6c53e60nH/ZXnuxokKYfAfIVJFJtDY5mEV/shsPVIesRQB/5h9 cs37ieR+ieGA/9kDqXyrRF+YIrrjGe86/qDWk7dkfwCLxhMcD290vUbfmzkcJbzcYagx gZpezKZqsPVQZhXHMFLcCieePhKiNYOsZ4H39WCUWF59f1Yanspcaa9lX8g4ATI5eTAQ OMzw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=EpOqpMXm; 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 gz21-20020a170906f2d500b00a52450cfb88si62317ejb.619.2024.05.03.14.55.43; Fri, 03 May 2024 14:55:43 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=EpOqpMXm; 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 CA74368D71D; Sat, 4 May 2024 00:55:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B03CC68D711 for ; Sat, 4 May 2024 00:55:07 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 1CEE3E0009 for ; Fri, 3 May 2024 21:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1714773307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QY3zEV4Lx6ZBpaWhtjvXpA0kyHuTzHZjtsX8VvKakc4=; b=EpOqpMXmSMHqN+QYnVsHXl3yMXhKW98ht7is/cp6lbrypx87gC51NAIQwG3icxw1CXTrDv R8/OnxV5+ks4l6yWJcuPfjTo7H6PMawE/2jt9gDLEBuHUt2l7vb4GZuFkdxso9fCui0jlo v1tA5HiDz5kGsEORaXgh8MA5Md2LeA+cDGIctd63CuBWVKh8rSLqDB9clE4t1IIUkknHnS 9IEYYUSDhVbZa4vdn8QXbZZ9BQ83361vq3GJLBZQFQ/tl15zJB3BqGCPtrgJJHjKR5qUjO ekvlw/6vF2SHNN4uDUSXMYLPb+Tox1kE1BTt89vZk3cDiDjIc6EC8pYg6+FJ8w== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 3 May 2024 23:55:01 +0200 Message-ID: <20240503215502.1509887-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240503215502.1509887-1-michael@niedermayer.cc> References: <20240503215502.1509887-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/dovi_rpuenc: Initialize bl_compat_id 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 78GzjdF9/Gcy Fixes: CID1596607 Uninitialized scalar variable Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/dovi_rpuenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c index 7e0292533bd..c5e452957b5 100644 --- a/libavcodec/dovi_rpuenc.c +++ b/libavcodec/dovi_rpuenc.c @@ -57,7 +57,7 @@ int ff_dovi_configure(DOVIContext *s, AVCodecContext *avctx) AVDOVIDecoderConfigurationRecord *cfg; const AVDOVIRpuDataHeader *hdr = NULL; const AVFrameSideData *sd; - int dv_profile, dv_level, bl_compat_id; + int dv_profile, dv_level, bl_compat_id = -1; size_t cfg_size; uint64_t pps; From patchwork Fri May 3 21:55:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48483 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:e68f:b0:1af:836d:81b3 with SMTP id mz15csp69028pzb; Fri, 3 May 2024 14:55:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUStPQc8M1qkI6AMZhQoVBhS4IO0DbkM0t7dQaalLKuGo0AJBx2kDd//iAmney3o9m3WYsjzCpwOOutAdaozfRbaHQHtS/Cp5mzzw== X-Google-Smtp-Source: AGHT+IEmclfgHEPKxVD9OzgejIFMwRaIBNxNy2gnqHWEAKtmZPtYFL9s8TCNu6sHRy6MbJGAOH6z X-Received: by 2002:a05:6402:4495:b0:572:5796:85fb with SMTP id er21-20020a056402449500b00572579685fbmr2134054edb.4.1714773352340; Fri, 03 May 2024 14:55:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714773352; cv=none; d=google.com; s=arc-20160816; b=vI31KW65WdX1LkKw8/pqA2vxUbKvGglIFqBSueRPlBNaelM+GXldUKZRBPH5c/6lwr vRJlNtbX3m7sIjsiF5DTeJGJEmGg1wI4mt4rbDueFESvtyUQK1OO6wiAcqE1HjReWnoC ZYU9U5PmLikUGaVmB5IVCJUsA1thEObE/cOSKfVT783khIibE8tD2J+xrSJbi4BSJqt2 6kJ5okWPr45CvMVtEq0eq0vJyiYXKd8FN8RflMWSXZD06ANSdjsHjsv16DSAjfzxBCDO 6Njs86lfyi2o25NdAJ7pPe39MrKxuLqYRJOD+b5WY297PURd1L4aYeuVpUnsJwwopjfa x53A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=5luuatb4bfQrSFVKtGTAgkMpSIyEa0LTIAn9DQrhfPI=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=zEV1KF/tgjdJfMXi3LfrwgYJ4jG0JNn4BwWOy66GuAYbo8cfOiDWrVolsIxPZdei4U x67tvB0d6DgipfeWxJ9jk1a5gbneOgd1mJMkwXJpjvfZaJSa0il5hvjHiVHUoAQAk4xk 57CysToIZ9vp0QJilM7JLeoJ59tvJjYWcn/o4zbTOMvMwuYtr21ENFOMoPhd772laAUB /fpw6fyi4fW/JF+WI8oJlrtpvtZ551QWKJGHFt7FUbMcqmFBxHzVqo+9i48lTWatgg6Y lXEAifYqyH6wgaGq+AOAIDMmMfFCbivRJXKdhXRQOoUS7QuT/S5Cx+4RxtjXIDn7Kih+ 2Yjw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="dloY1VP/"; 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 bx18-20020a0564020b5200b00572207fd7e2si1864145edb.184.2024.05.03.14.55.51; Fri, 03 May 2024 14:55:52 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="dloY1VP/"; 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 1837C68D731; Sat, 4 May 2024 00:55:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6200768D71C for ; Sat, 4 May 2024 00:55:09 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 2CF3420003 for ; Fri, 3 May 2024 21:55:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1714773308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xb2Y/kNRKgPB1pSf6dE7oWOvtq1UeUMXLgzzOvqM4hA=; b=dloY1VP/SV4goQh1PkaOeYZPhtoI/nt4b2pqU4uz1T5Jbc22eD+Bl4oHNx7eqOLKq/S6pT bUbQgBYQRLaR4B0Ms9GmbgEezGDxkJTmKKO0AOL7plZJxnD4L2HOI40RCMbtnziTWHZDZ/ KrevpjI/LFHGjjBq+w+D1Nw/0yGLf/j5ek/8ROcoJ/b+vkKF9fBPeYeT9mc2BkrdIPuM4o RsIIiWknzsq6HSKSUsFt1Y0VNnSf9rLXKYg2HUpnz6lG5A7SlDsVhvD3r24WaY0CgYB8nF w7qbJrxaqzv2YNbeSODus1JU9Jwb6AiVrwWgpJcjeAR844PREA9067nCAN+BXA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 3 May 2024 23:55:02 +0200 Message-ID: <20240503215502.1509887-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240503215502.1509887-1-michael@niedermayer.cc> References: <20240503215502.1509887-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/exr: Fix preview overflow 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: JkbIbfKYGCPl Fixes: CID1515456 Unintentional integer overflow Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/exr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 8bd39f78a45..4bac0be89b2 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1943,7 +1943,7 @@ static int decode_header(EXRContext *s, AVFrame *frame) "preview", 16)) >= 0) { uint32_t pw = bytestream2_get_le32(gb); uint32_t ph = bytestream2_get_le32(gb); - uint64_t psize = pw * ph; + uint64_t psize = pw * (uint64_t)ph; if (psize > INT64_MAX / 4) { ret = AVERROR_INVALIDDATA; goto fail;