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 ESMTP id 1BFA6483EB for ; Sat, 2 Mar 2024 14:25:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B0B5968CCE7; Sat, 2 Mar 2024 16:25:14 +0200 (EET) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D75D068CAFD for ; Sat, 2 Mar 2024 16:25:08 +0200 (EET) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-53fbf2c42bfso2627423a12.3 for ; Sat, 02 Mar 2024 06:25:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709389506; x=1709994306; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=bxntcNnUmsAezwBQPzG3GskdVA0L+Bhs3xa07N5dEuc=; b=U4P5G78HlRK1Gi2H3F6b5CPJYT+RBL1HVwrw48zR+Fm330n1f0njvS9it2LWl0d/sF ci+sKbjPGOqPfvHsIoTTdh9CO9MsJxraBSKNNt1BKBK9r33KSvdMKQdVACDQVx8YQMh/ zEC1cvq6XKslOTg+w+mpeWNi6VRo+9vL7OU2EqJsHq6AsQVTgCr/aIcoM1l+3QwBo+ep HSRYy6WNo/+RUYzDjWcI8zCRcucOu5OlT6ZJN756v3uJ7UbMa9ygldIv3vaZtCb7Jgnj Xx1bRpI5znDlQj4wK9EuXINLoIdz6VHCxTou19FarK47BfgOd+j56/XBnCAcOXuGYzdH /lkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709389506; x=1709994306; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=bxntcNnUmsAezwBQPzG3GskdVA0L+Bhs3xa07N5dEuc=; b=wOVW8hcyUh9N5MFqq7k+ME6pNOLjAERc+ety19E+8LRWAn2GBSfCskIE0lyTnoFUXO SeTnuO/PWbMcdqGbnwIh9keZlYNwpy6kk9+Hw5m+nvQ1Vg7bojtF52A97zm0FQNWESMn xdYXXbLcuxq7MV6eGrLKO5JvkvFrwNEZfgyVtQu1ULaeAAF/tqbNKCiNEAYTfvVEd1rN dVhZgB23g/vEhvgwQEgfIwVU/CA9nlvvUPzf9RW4y55R1n1uCV2KeYNFIlhQ0DbiwBmP lf5u06G9oFrItd6yrTQ8O1oZobbFJ2TGyhXbfx/ovAoRf+wSnq+GizZWXkvHjlN6Wf5F NsEA== X-Gm-Message-State: AOJu0YwzgdONVjJwSkJpq0EIN3S9YEdgOYF/8rBVaOx/99Jg/Tq0EUfe zpdqw9II8ivZGI9LQdXwp82ulbKbDxTdvY2mR9BrBwCFET4u+vrePqEjNpEX X-Google-Smtp-Source: AGHT+IHTCgeXJomf5Bfjec1j5vLoDRX9c8nU4A3eHmuEd/LDRAUj7XMme5KY0rXz+ng0H4OfN4NWEQ== X-Received: by 2002:a05:6a21:9994:b0:1a0:e463:fcad with SMTP id ve20-20020a056a21999400b001a0e463fcadmr6395092pzb.2.1709389505472; Sat, 02 Mar 2024 06:25:05 -0800 (PST) Received: from [192.168.0.11] ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id w19-20020aa78593000000b006e4bcdcff43sm4584494pfn.78.2024.03.02.06.25.04 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 02 Mar 2024 06:25:04 -0800 (PST) Message-ID: Date: Sat, 2 Mar 2024 11:25:11 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <29ed7620-f60f-4f31-bc22-3f0903456c07@gmail.com> From: James Almer In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH v4 1/3] avformat/flvdec: support enhanced flv PacketTypeMetadata 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 3/2/2024 5:51 AM, zhupengfei via ffmpeg-devel wrote: > @@ -1100,8 +1262,17 @@ retry: > video_codec_id = avio_rb32(s->pb); > size -= 4; > } > - if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_VIDEO_INFO_CMD) > + > + if (enhanced_flv && stream_type == FLV_STREAM_TYPE_VIDEO && (flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_VIDEO_INFO_CMD) { > + type = flags & 0x0F; > + if (type == PacketTypeMetadata) { warning: comparison between 'enum FlvTagType' and 'enum ' [-Wenum-compare] I changed it locally to use a new packet_type variable in this scope. Will apply the set soon if no one objects. > + int ret = flv_parse_video_color_info(s, st, next); > + av_log(s, AV_LOG_DEBUG, "enhanced flv parse metadata ret %d and skip\n", ret); > + } > + goto skip; > + } else if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_VIDEO_INFO_CMD) { > goto skip; > + } > } else if (type == FLV_TAG_TYPE_META) { > stream_type=FLV_STREAM_TYPE_SUBTITLE; > if (size > 13 + 1 + 4) { // Header-type metadata stuff > @@ -1287,6 +1458,11 @@ retry_duration: > goto leave; > } > > + if (enhanced_flv && stream_type == FLV_STREAM_TYPE_VIDEO && flv->meta_color_info_flag) { > + flv_update_video_color_info(s, st); // update av packet side data > + flv->meta_color_info_flag = 0; > + } > + > if (st->codecpar->codec_id == AV_CODEC_ID_H264 || st->codecpar->codec_id == AV_CODEC_ID_MPEG4 || > (st->codecpar->codec_id == AV_CODEC_ID_HEVC && type == PacketTypeCodedFrames)) { > // sign extension _______________________________________________ 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".