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 ESMTPS id 7BD324C826 for ; Tue, 11 Mar 2025 02:36:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CCE0D68D5E7; Tue, 11 Mar 2025 04:35:33 +0200 (EET) Received: from out162-62-57-137.mail.qq.com (out162-62-57-137.mail.qq.com [162.62.57.137]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4116668D5C5 for ; Tue, 11 Mar 2025 04:35:27 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1741660518; bh=ocYYc9t/f3UVtsH4FC6RT47praObcyjflLeNhAtQLeg=; h=From:To:Cc:Subject:Date; b=r64tld+xV0Bl58jjPZXNHhrnUqUbibJnU/0YJfM1noO4HJXZoOtlG26vCKC9r1+Ag tZ7c5k25+5GnaqyQzpbGYSvyrK1q7hPMC5vnUGFiz/naURcwHYsdEW7iZE2DzKUy4v AKwdkWxY8u4vZTnmM9YFU9foTgc5Bmj76Juwgp3g= Received: from localhost.localdomain ([119.147.10.242]) by newxmesmtplogicsvrsza29-0.qq.com (NewEsmtp) with SMTP id 8D1AC0C4; Tue, 11 Mar 2025 10:35:17 +0800 X-QQ-mid: xmsmtpt1741660517t11cro04i Message-ID: X-QQ-XMAILINFO: NVJ0hJNx7N5SKXmt2PI2hkNr6+pevq9yYhUj0yrfKgUaFg9swXOeXIlwdimJHO 38m2ZSGsf9UmHwoZOuUp3oe03zGqTCm/u/f8UpnDMZb79dpI51hN826qHm4L17RLtkBqngL20BZX Sp5P268jYgIfTFVVXeoa5TpoLSrQMEUCFO2gUxSt42+pd3e1hdF+CNr0frmrFoq+7GVJxG2BD/8I jpPl2FypAV1NBP/aOhOKhHTwCT2tkSMeVbI5j5EMLUOaik/RbFJQaylGBtqBS4qtAlJcpGXruAWQ 4jgnkpG3mUlh2h8PKjCiKW4I0JGfWfWQ4owLIh0FJM27Acq38EmEp1mVfXNzFpACh8OS8CJPuBaO c7K3l9U4UTwWg55i7HsVbQTDStF/sFXD4CRSEd8eIwRZnCyhswX9YFMYRHyLX02ChudtUvzMb8BL BbgnunZErRReEe/lBslrWj4nr9HgE48H+g5d/pNHYBe/tTOH5LRt0GwqR235tQlWOGZ6lCGwX+yK iKUnKwrDDj3+HyP4pd2BYNtZC6DovpNrokhS+WAeNmI66DC4OgrJ2sSoXfh5dzXsMMo09Pl/95Tt Ag8M9LI9Bp2O05tPdRVb25+CLjyYhdV/a9sZKxfISPLyqeUvDwaIIgobXWErSkhjU8jw9j92BtrI PlbY0vU9XnYczDfPg6oufF571UD8kqYiAZaxHqTVvabeMhCNbF1e0IzhMVy5OlOHZyul4G4dAHv9 kaJnF9kTej2T83TYQVUZ6q74Dbx+PQRBODU5BVNKEjXaDpVoKoLUAx0FYvrCItjkqA9dsu/CvCYl rZ9i3GfsGykfm7CuJy9zwIIXuZvXYlvwwgeeRkV6qH+xKU6j5eaBD+PGEPUIVVbwDVRSgZwh1znv 4xUphiF9l0sIJUiY2mKrIgnNslqK1Cgp0Yw101Fubxa6krZDHRJL9us4xP4EgMchjvVbVpVFotXK 8bdnn19z2aKFpuevFo7gGF/DkEMTfHkOv/zYLLv9hdaGq5O622bapIPdJKjI03BwKSdSpvk9srQN aKAWGJYg== X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Mar 2025 10:35:16 +0800 X-OQ-MSGID: <20250311023516.93076-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 5/6] avformat/flvdec: Use appropriate types in FLVMetaVideoColor 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: Zhao Zhili 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: Zhao Zhili This also reduce memory usage. --- libavformat/flvdec.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index b5c468a1d1..befa2ad021 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -60,11 +60,11 @@ typedef struct FLVMasteringMeta { } FLVMasteringMeta; typedef struct FLVMetaVideoColor { - uint64_t matrix_coefficients; - uint64_t transfer_characteristics; - uint64_t primaries; - uint64_t max_cll; - uint64_t max_fall; + enum AVColorSpace matrix_coefficients; + enum AVColorTransferCharacteristic trc; + enum AVColorPrimaries primaries; + uint16_t max_cll; + uint16_t max_fall; FLVMasteringMeta mastering_meta; } FLVMetaVideoColor; @@ -759,7 +759,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, if (!strcmp(key, "colorPrimaries")) { meta_video_color->primaries = num_val; } else if (!strcmp(key, "transferCharacteristics")) { - meta_video_color->transfer_characteristics = num_val; + meta_video_color->trc = num_val; } else if (!strcmp(key, "matrixCoefficients")) { meta_video_color->matrix_coefficients = num_val; } else if (!strcmp(key, "maxFall")) { @@ -1235,9 +1235,9 @@ static int flv_update_video_color_info(AVFormatContext *s, AVStream *st) if (meta_video_color->primaries != AVCOL_PRI_RESERVED && meta_video_color->primaries != AVCOL_PRI_RESERVED0) st->codecpar->color_primaries = meta_video_color->primaries; - if (meta_video_color->transfer_characteristics != AVCOL_TRC_RESERVED && - meta_video_color->transfer_characteristics != AVCOL_TRC_RESERVED0) - st->codecpar->color_trc = meta_video_color->transfer_characteristics; + if (meta_video_color->trc != AVCOL_TRC_RESERVED && + meta_video_color->trc != AVCOL_TRC_RESERVED0) + st->codecpar->color_trc = meta_video_color->trc; if (meta_video_color->max_cll && meta_video_color->max_fall) { size_t size = 0; -- 2.46.0 _______________________________________________ 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".