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 C8A5C4E274 for ; Mon, 10 Mar 2025 14:41:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1C24B68E45C; Mon, 10 Mar 2025 16:40:51 +0200 (EET) Received: from out162-62-57-64.mail.qq.com (out162-62-57-64.mail.qq.com [162.62.57.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B8B9668E435 for ; Mon, 10 Mar 2025 16:40:44 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1741617637; bh=4usQpIKepDNnodHNezk2HqYkD+aXj87qu+ANln0w56c=; h=From:To:Cc:Subject:Date; b=eLj4f7WfqhoJmntF/+ZyNkuXdjQjt1G3fBYG9oGv0f9zGv/7FS5CU36zEk+bs0g8K /GJKnqtcu2P6ifCcDFQJ2B24PY0JQE/qik/Ud121fE9Xf9wlHzaf9O2QwHiq0A27Hc alPzg00cB8zJhI6jh5nn/9PUBCq7y+U5qYLVOrAg= Received: from localhost.localdomain ([119.147.10.242]) by newxmesmtplogicsvrszc16-0.qq.com (NewEsmtp) with SMTP id A23A3E59; Mon, 10 Mar 2025 22:40:35 +0800 X-QQ-mid: xmsmtpt1741617635tjdvg8rl6 Message-ID: X-QQ-XMAILINFO: NFi+Ea4/qQimZDfVRcVXQzhPtsQsDWvLHMckxBwEpqfkGZBRxO1ot6AZl9+5cx cEw43lP9we3V40Qh4vTgOQ8r+l/jJu1kVKZ7u/OzBZS78CGwuLIjKSDsdV8L6nuJ6cVFVubXf87b 49v1KLAivEedJlGFNRYgx+q5Wlrs+o4//NmW5U9o3tr7IxOM0/bIwxAYNLMRIhftyUtRiajaC/kJ NXS9VNTUNG/ytpABNhjdKZLePkqoDXhOhtrHYWfpk6oejk8ed68J8tKmta10hwnLGAj4H3Rja4uS PtoMAqFge2KEfUELZX3WZizb+jP0/o8k1TxMNJEGzLXJ03HPHV5uyiVM2F4b4d+ppnIZZsPDaiq9 ofEWrthCZfhHq8/XqdOqwIMuauLQa8t3Dm9jtd8QIxDiWja4UQ2Pku3R9VFTk4nfEuNCdF4SRoL1 P37g+ddiprxJgRphwWvj03aK6+Sbv/f2W1XCJpAH1rJqpT43XAIDvwPxaDQfhFmkRVzJosOJewjC rLlX4aDJncs2Ao9xRZgxklHX+lixJswzerRFjcug3x8djObzHgVueE0iujDoJ3DJmtH92GkJgQsq mS0Dad0vxZ3D4/SmuGTG2Ly1Uh6w55yzTHjXvbf1kJD1j+qtTLrU4Yzh3uy+rKqA3+ViiH7RbPpx OYzD/xmYmMePRkUufn3WLaZZdNlKRCMnbvuQfhhoZkzsJvbeYnt08j6ZK7e5xzQ5wcKkjxIAdQl7 foI1gTA2CbYMwRw4QLh3dpbh2R87+LIDqzzZvlE6jcjkoITM+2lCRF9YBXiavQyrxG1MCaOuN8oU 3AuRnoOzZBCxTmQjwmdjaPoj8DuK2zVxeEt66zfZQ2L+d8/WO9w2Ii0hoBbdntp23M20Pgf5yL1o iLcIm++mBfn0X8stM2Nz4Nbnd0EDVe/lVxK5zmP+iKOfFyEI8paBXk/3dra3VjDVOCXC/N7B71+D 0T2GsogjtS+P3Pu06GLSaABY3VeNLKuQfn3cK+GgLO3prEEsXPTniPxhue4N5rHCGAxZJFnSW06d mRN2klDg== X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Mar 2025 22:40:34 +0800 X-OQ-MSGID: <20250310144034.94575-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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".