From patchwork Fri May 13 10:12:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 35761 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp220337pzb; Fri, 13 May 2022 03:12:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/cRUb2RZhA3c5RbEjJvc+6Ot46R4QRTPmUnxt7V7Wvxu+XD+HXN/c3mbWWAXVuYlOcI8p X-Received: by 2002:a17:907:7b9f:b0:6f4:d8c5:392c with SMTP id ne31-20020a1709077b9f00b006f4d8c5392cmr3509492ejc.652.1652436766237; Fri, 13 May 2022 03:12:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652436766; cv=none; d=google.com; s=arc-20160816; b=HQQ9IFDEzrF/2od8OU0z47CdBCBKwylKfWf0pxJri4E2ZTSoCUa+BowkPnKSz1VSJk ef/X5R71j2WkILhzNHoVOKQyatImumY8c2J7FvFQHiDMPe7Rnn19AAPGOjq8abBh1H0J 5JTG6DovUjHecOepdxadxA1k44MASyVGSmuTFFSL0iUHriF1NsDZhTo9cTTQe6XnYneE XQFys6RoYgtLcrg6K0C2UsUPXU7qwkyFbzRlQEjfw8Dhog104u8cpSTTva3Tb/OgIr7B BUSOSNHK5e5cIXaC1mmbdAxSXKGyb+hw4jzJXS5AAulztEPCneZHWLgjOO0/eBI2CGJT HUQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=bPKMJPxeCAxeTsZjvcUyP8VlxXQnEwAGK5jDO1GCjPk=; b=RITeGQSheVaYFloDRMSOJjiUUKC7W2jyQBOnNWo0ct6CyJZyS2BPL9zhdS1j6NL052 AWPZNACuZrrnVwgsjvJeW9EtjdSKk8gzcfm7D2pmepsUjl+DMJjCfaNU86hRlotl5L20 Vj36zNrMZb8FmqAoPmYr18nVvOUJsNKWqmDNpiVQ97mTfyMsTDg/DsqlLtS8zeYt9sIs 3yU56jFiPkfGgSL5zydkqO+7GL3R0dzmP1hGhGOSUcRqqDQmTUz/4EYRwa5KE8m2FjeU dlcvbQ9UZYdMAQTMhlbkB27KGl3KG5bMsEvJ0WhQeWouFhWJ1mOdFVXOIrlWFTvQXEax VlFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=hJ6kuvtL; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l18-20020a056402255200b004259e7818b8si1813306edb.328.2022.05.13.03.12.45; Fri, 13 May 2022 03:12:46 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=hJ6kuvtL; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4986468B36E; Fri, 13 May 2022 13:12:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-36.mail.qq.com (out203-205-251-36.mail.qq.com [203.205.251.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C04D68B0D3 for ; Fri, 13 May 2022 13:12:33 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1652436749; bh=cTu2WgwRJIBoK0rFrqrtMblSZxo1nH60yaUI/EUV/Io=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hJ6kuvtLC+huzdNLD3SCzRVvouoozALt5v5ZZ0hvddP+NDiNDEkBV/MFq1REWU+uL zeaHzuXrKwJtk/Hy7RjTb5BtCR2V6Ht0ly+WHVJsl6BSEK+9eKJt0eaUL5f4SNKIEg EoElgBcKHJw0KdwFyxh69++POqcwKPOBAcG5ZzMA= Received: from ZHILIZHAO-MB2.tencent.com ([113.118.107.45]) by newxmesmtplogicsvrszb6.qq.com (NewEsmtp) with SMTP id 31B956BD; Fri, 13 May 2022 18:12:27 +0800 X-QQ-mid: xmsmtpt1652436747ti6i9l5on Message-ID: X-QQ-XMAILINFO: MVTv5ZS7EtyTrJ0ed3CU8lvK3BnT7RXhsNam+ctO7bsLaS3z3hI1kIt24UvxSp 99Sze3hIhFA6tzh+t/oLDtChsj/GRyBopA49HMQlU3iWi6JabwBPM8hhJOs+QjRjLY4yuqt8TZdG bgPKRgHgXqj1jm8uvQrRztFBKjihF3MNcjDyVm/m7ZMVYEj1U+58VHeou6ckkN06UzfrQPuCumS6 xASmblhX0MaoLEqWsmv8xsDWyxz8m/fDwsmrtvB0EZDilWmfARCC9f5iE5bcqYmebX8Cyn+sifQQ Un9tGJhPEmE+5h1LE4UKrnN7P5jrn5wGGqtZ2yhpZ3xasSG9e8SO9N4taRoRS+hBy209bcRKoDFe rwoXoZOFmQ02IA8BalwkHZl1ufM2qMx2gtatUd2yRIcpe2X12wmMhDGqkLjKtdTzMhACDo38hSSl 60iU+tgXZIDA7zn6YcQKAw2G6BsHAJ0Kh04vfQgNPxglUA5cnugbyEyaNAKNInuTrVlogAeIKN7V wZyz5Eqs8/M2wBp08ecFSNSZ3U23BwWG8k6ZNiU/WrORRKB/oTarXWVbWaCR7oYPLO1Xj6pUAc0p ARNkBtmMxYI3ESNBNRp+Ivx1YY+5b6kgLxpJ+ADomLl0eC28S4NN6SDtlOgRXuuZ7wk9UMn618fO diBwergdToiPICHln3lJoDqd/W1Ri0U7hCrJFZ9Sf0akZy1Fegwy68bGb1RgOL54/wGsTmO19LFq vWDQ0Jzxj2B1lPtRyhyeq9Y2qKHoyHhH09EXUA9tEyDyVJKZf/kAiuBGCOI11T5gYRlvrwyZ/sf9 J4mGtN5uQOFWAM+nAe7XmJJSM7Y2jkn3HghI6Ez0a3jXKoJTm82LsBRvuVzOfITPOrXLoTc6Fuu2 KOzxJI75YSve+Bx+JL8NZ4BxGVeSMB07kl02KyZpGoUyUaXFafycxIirQBPX3cDT9l3mGvKOT1qg eyEL/eAPHnpcs/gHVunw== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 May 2022 18:12:25 +0800 X-OQ-MSGID: <20220513101225.12780-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/3] avcodec/avs3_parser: set has_b_frames properly 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uliuOk5li9JG has_b_frames should be output_reorder_delay field in AVS3 sequence header and larger than 1. The parser implementation doesn't parse that field. Decoder can set has_b_frames properly, so use FFMAX here to avoid resetting has_b_frames from output_reorder_delay to 1. --- libavcodec/avs3_parser.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/avs3_parser.c b/libavcodec/avs3_parser.c index d04d96a03a..a9fd879e9d 100644 --- a/libavcodec/avs3_parser.c +++ b/libavcodec/avs3_parser.c @@ -71,7 +71,7 @@ static void parse_avs3_nal_units(AVCodecParserContext *s, const uint8_t *buf, if (buf[0] == 0x0 && buf[1] == 0x0 && buf[2] == 0x1) { if (buf[3] == AVS3_SEQ_START_CODE) { GetBitContext gb; - int profile, ratecode; + int profile, ratecode, low_delay; init_get_bits8(&gb, buf + 4, buf_size - 4); @@ -114,7 +114,8 @@ static void parse_avs3_nal_units(AVCodecParserContext *s, const uint8_t *buf, // bitrate_high(12) skip_bits(&gb, 32); - avctx->has_b_frames = !get_bits(&gb, 1); + low_delay = get_bits(&gb, 1); + avctx->has_b_frames = FFMAX(avctx->has_b_frames, !low_delay); avctx->framerate.num = avctx->time_base.den = ff_avs3_frame_rate_tab[ratecode].num; avctx->framerate.den = avctx->time_base.num = ff_avs3_frame_rate_tab[ratecode].den;