From patchwork Wed Jul 12 13:35:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Pavlov X-Patchwork-Id: 42610 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp2189183pzb; Wed, 12 Jul 2023 06:39:01 -0700 (PDT) X-Google-Smtp-Source: APBJJlG7K897BW6xvbjoZWNU9CpW6v/V0a2x73GhNhnuFYenjQslkcYBCFbPdt9bBAGnEDmJWKL6 X-Received: by 2002:a05:6402:3492:b0:51e:48e7:72ca with SMTP id v18-20020a056402349200b0051e48e772camr2828804edc.13.1689169141133; Wed, 12 Jul 2023 06:39:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689169141; cv=none; d=google.com; s=arc-20160816; b=p7KbIOkWrgGWp9dWYnep9SWUFzjMk/KvKVKXRTj0RFoi8BG7zCthGz6UycPIMGMNHL 9aCJ+jY2wda8f8vnu8Tuotcnbk/t/cKsemeGhJgTlfkpmVK4/baogKLji8b1otUMLHxm risALO9UFgnr/VqNOa4SsaS2qezsOonFlM6meD1u6JEDtazuht4kEfuEY58vUSuBWi6g 4aIyy+DAJANjeZTdYSjKc1wsOKC/YsEfX1gGySHoMAGh1a+0FVUtnwLTnQ1cl7LSrw6d lz+YSEyM9xeadFPkkqzCzKgPXANSynULk0W9bZgQi/iAcoq05tmZcVD86VT/5yYozwGb /jfA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=o8Z3sDc/+rMyfd0EyI4xhVSCjZtB02lHgSUHv2uvUBo=; fh=Ndx/gRzOmdOyvgGXHQQArUxv5ev+C0gUgbsopzrG/lI=; b=yXGmxOoGmo6oVAd9MtHk9+piNzfXkh9gI1MD/2fWFjew7+jHW9Mq7UXZe6lNa3PhXF Pn/eN4fKQOlsjrUryjGxTTqLG+aeUv8Qkok4k7fJLxesyzlKrD4DLVK4UXRZ7WvleqCf Ei3p/o06HZeTE+6hGYld+d7Dx55sNX7dCBV9Gg0UhtKoTagk+Z1GqJ4jXgXvH8bXtKfT eUrb4+evMeyhlCb9OYXNp4AQ+usaqMMYeKH06jivUukP2dhIRHHMn5k73Yq/BBAg/4CO 6cclXnazwY9j4SckfBwPhXydJNlmnRX7wprYTik6zEHAu+u+dxv0MZnCH1bjWHCT5z44 z8Tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=cfrV4xiD; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w23-20020aa7da57000000b0051e576dbb63si4861712eds.534.2023.07.12.06.39.00; Wed, 12 Jul 2023 06:39:01 -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=@gmail.com header.s=20221208 header.b=cfrV4xiD; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D16B668C5F1; Wed, 12 Jul 2023 16:38:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79CA468BEF2 for ; Wed, 12 Jul 2023 16:38:51 +0300 (EEST) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-31297125334so507818f8f.0 for ; Wed, 12 Jul 2023 06:38:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689169130; x=1691761130; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=IkcI79e2D8AvXVUOc1/ZkCcRYn74KkmdM2Gl3Py9G1k=; b=cfrV4xiD7nmlMkbqAsGeIFyWX1ze5cC7s4FpoPGc7qgq15SZQ34Gul9gGgTu5VRaMK A1xeRD6/c03udnAa4FiaxRqWKqdrhlXpVKW5UQgAnCgDM1IyEPOcxITE3+3gMABmjbS/ y0GwUOiPTTowltv/Nwbgs3nhTlhMVZAGBOufUqpObc+LEJNDe7f2ELNf+73UGzYDMKw+ a6gfyOEWKvc4wNDeAW14HNQ9UtN2cXBLnWMuZOxQ+lu4bHJxyE6SQY80E8EFnaENh8HT AOqN23Fhom3pAZ5SXNeENJd9SGlubCB94lNXq+c3cUD3/01qPj9Kn8xlUWpCuDf9A61b ttxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689169130; x=1691761130; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IkcI79e2D8AvXVUOc1/ZkCcRYn74KkmdM2Gl3Py9G1k=; b=MVKKnv0pY+dbIyfU4lPIKTS4ORsf11NQnhqJUByt9qOYJM+hQd9QRPFlhUHsmFATKc 7g3aiu7z/m9CgucS1tanNKD6H/I9oqeYI+Qjs6LVbyLLaYQSV2IG2iF8C8vljwXGLy2m 70ND620zaE2s+WyZz4YpPvAfDsC2eVRWPA2eOuEZhn9T3c4qu62EHuu11oIWGb9Qgl/R i/r8IVkgsaN0QW7uCB8eJpSXJGm9yfiJCIcMNzSGPYHtJahnl0fVQoLSnJqSLimXLQ3X xPyZerHU6EAH2w0lLGH/obc2hoAHlD0Vgr/bLbaMl/XTKC45esSyPl8Amtm1W1oqY0gK BTaA== X-Gm-Message-State: ABy/qLZYKODfWxt6NMBFZiSDRxmQPBFIkF5aKkKxKAtdhcoLy9mjE5et tK3h6T7EM7czDYIUDWJXUqsZW22sCQQOlwd0 X-Received: by 2002:a5d:4085:0:b0:314:3108:500a with SMTP id o5-20020a5d4085000000b003143108500amr2066944wrp.0.1689169130303; Wed, 12 Jul 2023 06:38:50 -0700 (PDT) Received: from MSDN-EVPAVLOV.amd.com (178-223-57-237.dynamic.isp.telekom.rs. [178.223.57.237]) by smtp.gmail.com with ESMTPSA id l20-20020a7bc354000000b003fbb8c7c799sm15687622wmj.30.2023.07.12.06.38.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jul 2023 06:38:49 -0700 (PDT) From: Evgeny Pavlov To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jul 2023 15:35:14 +0200 Message-Id: <20230712133514.846-1-lucenticus@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavcodec/amfenc: Fix issue with missing headers in AV1 encoder 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: Evgeny Pavlov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Yipckr2ZNiIg This commit fixes issue with missing SPS/PPS headers in video encoded by AMF AV1 encoder. Missing headers leads to broken seek in MPV video player. Default value for property AV1_HEADER_INSERTION_MODE shouldn't be setup to NONE (no headers insertion). We need to skip definition of this property, because default value depends on USAGE property. Signed-off-by: Evgeny Pavlov --- libavcodec/amfenc_av1.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/amfenc_av1.c b/libavcodec/amfenc_av1.c index 30c0a9fad2..0a58a0808a 100644 --- a/libavcodec/amfenc_av1.c +++ b/libavcodec/amfenc_av1.c @@ -77,7 +77,7 @@ static const AVOption options[] = { { "qvbr_quality_level", "Sets the QVBR quality level", OFFSET(qvbr_quality_level), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 51, VE }, - { "header_insertion_mode", "Set header insertion mode", OFFSET(header_insertion_mode), AV_OPT_TYPE_INT,{.i64 = AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE_NONE }, AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE_NONE, AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE_KEY_FRAME_ALIGNED, VE, "hdrmode" }, + { "header_insertion_mode", "Set header insertion mode", OFFSET(header_insertion_mode), AV_OPT_TYPE_INT,{.i64 = -1 }, -1, AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE_KEY_FRAME_ALIGNED, VE, "hdrmode" }, { "none", "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE_NONE }, 0, 0, VE, "hdrmode" }, { "gop", "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE_GOP_ALIGNED }, 0, 0, VE, "hdrmode" }, { "frame", "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE_KEY_FRAME_ALIGNED }, 0, 0, VE, "hdrmode" }, @@ -220,7 +220,9 @@ FF_ENABLE_DEPRECATION_WARNINGS // Picture control properties AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_GOP_SIZE, avctx->gop_size); - AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE, ctx->header_insertion_mode); + // Setup header insertion mode only if this option was defined explicitly + if (ctx->header_insertion_mode != -1) + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE, ctx->header_insertion_mode); // Rate control // autodetect rate control method