From: Zhao Zhili <quinkblack-at-foxmail.com@ffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Cc: Zhao Zhili <zhilizhao@tencent.com>
Subject: [FFmpeg-devel] [PATCH 4/6] avformat/flvdec: Remove one level of indentation
Date: Mon, 10 Mar 2025 22:40:34 +0800
Message-ID: <tencent_163A9DC365B5D8698601C96A167D06AE220A@qq.com> (raw)
From: Zhao Zhili <zhilizhao@tencent.com>
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".
reply other threads:[~2025-03-10 14:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_163A9DC365B5D8698601C96A167D06AE220A@qq.com \
--to=quinkblack-at-foxmail.com@ffmpeg.org \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=zhilizhao@tencent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git