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 224EC4E3C6 for ; Tue, 11 Mar 2025 02:35:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF0E768DEEC; Tue, 11 Mar 2025 04:35:19 +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 3865C68DEE6 for ; Tue, 11 Mar 2025 04:35:11 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1741660503; bh=HBdv8h+VbNZ151fSyaMNOyuv0m2OuLPUYLYtnSkpkDc=; h=From:To:Cc:Subject:Date; b=erD4CRMqCk6vu1wC4hCBbeSwD0x9UrBCJfE9Oed3p/s9PdI/bCsHMKVkQc6+SeaXN V0bm18+e47WamqwfKlMd7PLn5/1fAhYx8OGvSQhbvdEpicwO88vvyF1ViWvuZKH9H2 jWeEHRlucjQetuBM+SvcTE+zqniK70bFE+JGp2/E= Received: from localhost.localdomain ([119.147.10.242]) by newxmesmtplogicsvrszc13-0.qq.com (NewEsmtp) with SMTP id 8C2816DF; Tue, 11 Mar 2025 10:35:02 +0800 X-QQ-mid: xmsmtpt1741660502tochrkvin Message-ID: X-QQ-XMAILINFO: NyTsQ4JOu2J2fdxylaPOX1+kyop5fa7E6f9ap9Tr8FKbn6pULr96gRRlXmoncM GpFd03oXxHGeOrq3/GHNveBcoihjzbSL1Lr8EtZHiApxX4eYsSu2LKGypqN37jwnmlEIw5U1KEd7 r4wKJ3sKv/TfeVTMOCp22Agwk3BDTSwz7NrlWJejbUyWEl2Bl8OWluyoDdAgOxP03tm0v8uYEeHl Mf/uM29+8cMR+2hLOf7MZkCvq7iqWGOwdhrVFsr+adAFZYjc3Mw9UUN4TdIOKcEocQnY8WoWLqb1 ue/0jN8GPW258hHwaERuf1Tko2DZFZzV1Hy68XVkeELau8skOEtTa+VJr85PbRuWiuiCus8M9/ba f+ZG1JZmN2TCzTnZz7YeC/9OnOeLI7fDQwTJiXftwsEWd7EQi3lsTHkfM314eC4GaYCNVf7Rq2wl RjXIc78aHrKoiIG+JZMux2jw+ldYoyrSaHc/dtVUj78rB12jPdyWI/Z3qfygHal5E/GLuOpPLQDZ 2LUiN8qKB+QP1tAejByjZD3CMxqeFCoCMxoorgs/tE8Bw8W4kxt3VzKAxKki0RvoM/DtJrA57T97 zRoRg504TPc3ZsQHmAFmlqvyCa0aYsmQPyozaPHKpV7g6qS3s6q7vYETa8sQVVW15wuFFEtw08Mn 3aZUHkQAWc2iqsGY5znxiKtMdxLMlYGIP8KcLApqoq2w+5+YEEWpiQxe1mu97cNyszltJ097dOWC M6f7XhI6h3sYviUCb49AwDn3iHmvI3hH1fv1OZwqaAjLEVykgMMOTQIRJ/kLzh1P+tSl1ro5U1OY 2LQgd6H60Ta50uTnFCl5rGGFp9DCSQZhnW4aXwMvI257NtC1eDzgKGiU4AehHj+z4LgHpfCfUvrh RIcr0QXGMejih/ijWXMMS8pca/0S5agCx73MFMX9vr9WDQ/zIgvlBRmIsu8DlfSNzVdHOOwxTCyA fmIDRVWZDb48UZbhDtIvfipSfuiMEKQ1zXcGhHTVkVY8+yFb4zsw== X-QQ-XMRINFO: Nq+8W0+stu50PRdwbJxPCL0= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Mar 2025 10:35:01 +0800 X-OQ-MSGID: <20250311023501.92684-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/6] avformat/flvdec: Put FLVMetaVideoColor inside FLVContext directly 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 1. Rename metaVideoColor to meta_color_info 2. Allocated FLVMetaVideoColor together with FLVContext 3. Improve the use of meta_color_info_flag. Do a sequence of strcmp only if meta_color_info_flag is FLV_COLOR_INFO_FLAG_PARSING. 4. Check return value of amf_parse_object(). --- libavformat/flvdec.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 7ea4275784..fcc8403db7 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -68,6 +68,12 @@ typedef struct FLVMetaVideoColor { FLVMasteringMeta mastering_meta; } FLVMetaVideoColor; +enum FLVMetaColorInfoFlag { + FLV_COLOR_INFO_FLAG_NONE = 0, + FLV_COLOR_INFO_FLAG_GOT = 1, + FLV_COLOR_INFO_FLAG_PARSING = 2, +}; + typedef struct FLVContext { const AVClass *class; ///< Class for private options. int trust_metadata; ///< configure streams according onMetaData @@ -102,8 +108,8 @@ typedef struct FLVContext { int64_t time_offset; int64_t time_pos; - FLVMetaVideoColor *metaVideoColor; - int meta_color_info_flag; + FLVMetaVideoColor meta_color_info; + enum FLVMetaColorInfoFlag meta_color_info_flag; uint8_t **mt_extradata; int *mt_extradata_sz; @@ -600,7 +606,6 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, FLVContext *flv = s->priv_data; AVIOContext *ioc; AMFDataType amf_type; - FLVMetaVideoColor *meta_video_color = flv->metaVideoColor; char str_val[1024]; double num_val; amf_date date; @@ -749,7 +754,9 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, } } - if (meta_video_color) { + if (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")) { @@ -943,7 +950,6 @@ static int flv_read_close(AVFormatContext *s) av_freep(&flv->mt_extradata_sz); av_freep(&flv->keyframe_times); av_freep(&flv->keyframe_filepositions); - av_freep(&flv->metaVideoColor); return 0; } @@ -1183,6 +1189,7 @@ static int resync(AVFormatContext *s) static int flv_parse_video_color_info(AVFormatContext *s, AVStream *st, int64_t next_pos) { + int ret; FLVContext *flv = s->priv_data; AMFDataType type; AVIOContext *ioc; @@ -1200,19 +1207,22 @@ static int flv_parse_video_color_info(AVFormatContext *s, AVStream *st, int64_t return TYPE_UNKNOWN; } - av_free(flv->metaVideoColor); - if (!(flv->metaVideoColor = av_mallocz(sizeof(FLVMetaVideoColor)))) { - return AVERROR(ENOMEM); + flv->meta_color_info_flag = FLV_COLOR_INFO_FLAG_PARSING; + ret = amf_parse_object(s, NULL, NULL, buffer, next_pos, 0); // parse metadata + if (ret < 0) { + flv->meta_color_info_flag = FLV_COLOR_INFO_FLAG_NONE; + return ret; } - flv->meta_color_info_flag = 1; - amf_parse_object(s, NULL, NULL, buffer, next_pos, 0); // parse metadata + + flv->meta_color_info_flag = FLV_COLOR_INFO_FLAG_GOT; + return 0; } static int flv_update_video_color_info(AVFormatContext *s, AVStream *st) { FLVContext *flv = s->priv_data; - const FLVMetaVideoColor* meta_video_color = flv->metaVideoColor; + const FLVMetaVideoColor* meta_video_color = &flv->meta_color_info; const FLVMasteringMeta *mastering_meta = &meta_video_color->mastering_meta; int has_mastering_primaries, has_mastering_luminance; @@ -1735,9 +1745,10 @@ retry_duration: goto leave; } - if (enhanced_flv && stream_type == FLV_STREAM_TYPE_VIDEO && flv->meta_color_info_flag) { + if (enhanced_flv && stream_type == FLV_STREAM_TYPE_VIDEO && + flv->meta_color_info_flag == FLV_COLOR_INFO_FLAG_GOT) { flv_update_video_color_info(s, st); // update av packet side data - flv->meta_color_info_flag = 0; + flv->meta_color_info_flag = FLV_COLOR_INFO_FLAG_NONE; } if (st->codecpar->codec_id == AV_CODEC_ID_MPEG4 || -- 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".