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 1F1724E3CC for ; Tue, 11 Mar 2025 02:35:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F4CC68D57E; Tue, 11 Mar 2025 04:35:27 +0200 (EET) Received: from out203-205-221-209.mail.qq.com (out203-205-221-209.mail.qq.com [203.205.221.209]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE00568CF6B for ; Tue, 11 Mar 2025 04:35:18 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1741660509; bh=4usQpIKepDNnodHNezk2HqYkD+aXj87qu+ANln0w56c=; h=From:To:Cc:Subject:Date; b=j6eBxhFLeS0xpJvh5M8GHp2zsGvyK0kx+MWRKc0pkl4NX+9eDcvTUL6jX6atZGuyg +zrbfpxxwT1RWTx/hTtbe7E2xObKsWtE5C7ChkWdyGk7pXI2rU1GZT+KAcJVN4QK56 uPpnJgMmRrAeGYOrkUy0213L+F4iTlJslDcFhfcA= Received: from localhost.localdomain ([119.147.10.242]) by newxmesmtplogicsvrszc16-0.qq.com (NewEsmtp) with SMTP id 8C8A129A; Tue, 11 Mar 2025 10:35:08 +0800 X-QQ-mid: xmsmtpt1741660508tz6sk4jae Message-ID: X-QQ-XMAILINFO: MmPNY57tR1Xnf8wQTQ/SuYWGVxTgDnjBSmC+SCoqfzyZif/oD2UCL1eAC9jIss DqUjv5WyvRzPGUAvILge0bvbC3hxxGPSVIZ3cOm14o0t8ywP/eakIecPfoIw/Qs9PpeCbeQMAeT3 qcuaUUjVzUNsZ1Un4sPAggP95row9VFQU/uzi++eYiTjgaCeLHn8YoBnD4jxHhhHC3BdD2AMiAuS PuUBNJtoLNXAaaTIh4vcDwktJUF0HhLvkZ5Z+wVHeGc31z6gmM3d5UIpYrVEpTfxT7CF4yM7Szzd qbPBzEx4eJNH8Ad4UE5VATflAMkeejpgZS0pPePitr/MihsQVI3rkz0Qup69Y4WzQ+h4CtFczxUU QE0pAprhhXP04oK2SJyashJe87xewVuLxXqSojQrMk3bzTieB2704egnMEl9c0qA1Gcd6Tbt38zP 8MPvEZ62iPIZz45S8CDtuufU5xvjo1xOTqB3w5vP2ZM8xOkchEOmO8RA/P9xWWcH4WW2eVZ/Zk1O FqnB2pbbBRBu/vSvZVGvTJcPO7gOK5FPeFKXwEC1bavgXNhCQTpvqQTq1sFO8sGRlaLVt3q8xBGI Cb1dyqpQq+Dhd2oPFe865teDerv4T3Uxjx/2p50Kuyvmh58PxHzD0qVJb6Y1NLuowwOrvWkEZ2Rl NhRA04MBAEVi0+AQU1Yc5GU/0VnRRAI3U2U3Q3etMujGfwdbUIjxJdOuIwh7y2djpgOQKennVb3C yATFYWJFytph1CYQ53UUsTHPu9L6XJ/6juT9NUxqSO2hwmBPP40BU+JFpKrYbYQvnvjhI4tbMQCG JbIms5FubJED8EScW4Wts20Ak6eo7IIdctFu7X+k45ohfVI9wcc1y2uQKXVBWO4MJ+gLVEzBRXRC mm7P0kpfhDuEfzGpkXXB99zSYNdfODURx0qIV2NDAmvr+olwaYOTcm9JXnUyOoMSmhOWia+JUF8Y AS3Bdjaqgk8jEr//eOBtDJiyX1CRsfqxktUGISz0NbTx6nASM1og== X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Mar 2025 10:35:07 +0800 X-OQ-MSGID: <20250311023507.92828-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/6] avformat/flvdec: Remove one level of indentation 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 Also remove the condition of AMF_DATA_TYPE_BOOL when parse color info. There is no AMF_DATA_TYPE_BOOL type in color info. --- libavformat/flvdec.c | 66 +++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 35 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index fcc8403db7..b5c468a1d1 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -754,42 +754,38 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, } } - if (flv->meta_color_info_flag == FLV_COLOR_INFO_FLAG_PARSING) { + if (amf_type == AMF_DATA_TYPE_NUMBER && flv->meta_color_info_flag == FLV_COLOR_INFO_FLAG_PARSING) { FLVMetaVideoColor *meta_video_color = &flv->meta_color_info; - - if (amf_type == AMF_DATA_TYPE_NUMBER || - amf_type == AMF_DATA_TYPE_BOOL) { - if (!strcmp(key, "colorPrimaries")) { - meta_video_color->primaries = num_val; - } else if (!strcmp(key, "transferCharacteristics")) { - meta_video_color->transfer_characteristics = num_val; - } else if (!strcmp(key, "matrixCoefficients")) { - meta_video_color->matrix_coefficients = num_val; - } else if (!strcmp(key, "maxFall")) { - meta_video_color->max_fall = num_val; - } else if (!strcmp(key, "maxCLL")) { - meta_video_color->max_cll = num_val; - } else if (!strcmp(key, "redX")) { - meta_video_color->mastering_meta.r_x = num_val; - } else if (!strcmp(key, "redY")) { - meta_video_color->mastering_meta.r_y = num_val; - } else if (!strcmp(key, "greenX")) { - meta_video_color->mastering_meta.g_x = num_val; - } else if (!strcmp(key, "greenY")) { - meta_video_color->mastering_meta.g_y = num_val; - } else if (!strcmp(key, "blueX")) { - meta_video_color->mastering_meta.b_x = num_val; - } else if (!strcmp(key, "blueY")) { - meta_video_color->mastering_meta.b_y = num_val; - } else if (!strcmp(key, "whitePointX")) { - meta_video_color->mastering_meta.white_x = num_val; - } else if (!strcmp(key, "whitePointY")) { - meta_video_color->mastering_meta.white_y = num_val; - } else if (!strcmp(key, "maxLuminance")) { - meta_video_color->mastering_meta.max_luminance = num_val; - } else if (!strcmp(key, "minLuminance")) { - meta_video_color->mastering_meta.min_luminance = num_val; - } + if (!strcmp(key, "colorPrimaries")) { + meta_video_color->primaries = num_val; + } else if (!strcmp(key, "transferCharacteristics")) { + meta_video_color->transfer_characteristics = num_val; + } else if (!strcmp(key, "matrixCoefficients")) { + meta_video_color->matrix_coefficients = num_val; + } else if (!strcmp(key, "maxFall")) { + meta_video_color->max_fall = num_val; + } else if (!strcmp(key, "maxCLL")) { + meta_video_color->max_cll = num_val; + } else if (!strcmp(key, "redX")) { + meta_video_color->mastering_meta.r_x = num_val; + } else if (!strcmp(key, "redY")) { + meta_video_color->mastering_meta.r_y = num_val; + } else if (!strcmp(key, "greenX")) { + meta_video_color->mastering_meta.g_x = num_val; + } else if (!strcmp(key, "greenY")) { + meta_video_color->mastering_meta.g_y = num_val; + } else if (!strcmp(key, "blueX")) { + meta_video_color->mastering_meta.b_x = num_val; + } else if (!strcmp(key, "blueY")) { + meta_video_color->mastering_meta.b_y = num_val; + } else if (!strcmp(key, "whitePointX")) { + meta_video_color->mastering_meta.white_x = num_val; + } else if (!strcmp(key, "whitePointY")) { + meta_video_color->mastering_meta.white_y = num_val; + } else if (!strcmp(key, "maxLuminance")) { + meta_video_color->mastering_meta.max_luminance = num_val; + } else if (!strcmp(key, "minLuminance")) { + meta_video_color->mastering_meta.min_luminance = num_val; } } -- 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".