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 A767C4A99E for ; Mon, 6 May 2024 19:55:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2598768D681; Mon, 6 May 2024 22:55:03 +0300 (EEST) 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 9812368D609 for ; Mon, 6 May 2024 22:54:56 +0300 (EEST) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-34c8592b8dbso1820223f8f.3 for ; Mon, 06 May 2024 12:54:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1715025295; x=1715630095; 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=iz26DBHf/vhfLH92eojYS20qOqYic4WxqFlDe1n/KUE=; b=eYWi7bFmpyd8EaLyOw2T1QbVL39cI2yKr3MUOza/NbkeFn989yWFvvcQS6TOXPoIuv xm6ddg6W+hl/GTaXJubIE3MnXSOEAjJdB4o3V2tDwDhIeBEE/F5UbOpkjpk/jUo4ipMu D9Yx8f4C65A+OmKPxGfunSBYjDbvVO19qwJe2cOtJ7+ffrpnarYWMKGgzKFom8Vel3BL Fd4BF6ag9Fekei9wEkjzqZ2LFdmw/v6/BsSGHC3JQ1MdWqTMXlk90SWCh8e/OpWXDfU1 TGHOPsJTik73IiTV2yU3FqGypzjLpWTaIB8cNbL7w8gEI4QqnDD6TVL1oG6B5l+AkmuX YawQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715025295; x=1715630095; 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=iz26DBHf/vhfLH92eojYS20qOqYic4WxqFlDe1n/KUE=; b=sr+BlzsmmKOvNmXVKSe7MCydemsGzVFYezY4isnh85GjFgnW5d8g0qSL1NA435ZoB1 GiSTIZCArNMQQpRgMNLQyg8R8FZqVcK22u74NveHK0fiIY8hPCXMT+rtHNhMAot0GnU1 udjLCG6XNAkj5dZXvcDFwp+8Ney7X6Mkl4m8VyWIhQeViAua2RtaEA05Xz3eR2qS2+yo hVq9e9uyFaAIKTfOx/DTvKXMvVXN7sSL+KEaHbEE1eTXAF99YiEjznv52tS23DNGNHAt hMo6QzlME5CrFnY3YktNyVTN7QF+a7gQdvCxOyHTljTMJWTIz33CzFwdmYS99cemItlf 33XQ== X-Gm-Message-State: AOJu0YyXRpQh56122KYiTpLXvUMZKNuCaueev080yIo6gKf61gq/+Clv TsQyCmdR8J8I/Ca83gZW6Pwjvr05Z16vuDavHfOezNTbTqGh6l9653EMBjFli9Jk6+gebw1dpIg 9 X-Google-Smtp-Source: AGHT+IGrTAaDz3NDmgdDie9TvKsOh3Qv7EV0eUrfb0mx9BKWRIw37QcgYKR71r0FOIR61pTChvP3rw== X-Received: by 2002:a5d:5142:0:b0:34d:b4db:9927 with SMTP id u2-20020a5d5142000000b0034db4db9927mr8633780wrt.50.1715025295617; Mon, 06 May 2024 12:54:55 -0700 (PDT) Received: from [192.168.0.15] (cpc92302-cmbg19-2-0-cust1183.5-4.cable.virginm.net. [82.1.212.160]) by smtp.gmail.com with ESMTPSA id w18-20020adfec52000000b0034dd8356028sm11323385wrn.26.2024.05.06.12.54.55 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 06 May 2024 12:54:55 -0700 (PDT) Message-ID: <6dff879e-9748-4b9e-bf09-1e1e0785eb4c@jkqxz.net> Date: Mon, 6 May 2024 20:55:24 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240505163656.765900-3-nowrep@gmail.com> From: Mark Thompson In-Reply-To: <20240505163656.765900-3-nowrep@gmail.com> Subject: Re: [FFmpeg-devel] [PATCH] lavc/vaapi_h264: Don't try to merge fields in DPB for non-field pics 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-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: On 05/05/2024 17:36, David Rosca wrote: > This path can be hit when there are missing references while decoding > progressive stream and would completely break the DPB contents. > --- > libavcodec/vaapi_h264.c | 30 ++++++++++++++++-------------- > 1 file changed, 16 insertions(+), 14 deletions(-) Can you share a stream which does this in a progressive case? My understanding of this (though I suspect I am missing something) is that we are filling from the short/long DPB lists which should not contain duplicates (not RefPicListX, which can), so I'm not seeing how this case could be triggered. If you do have two DPB entries which are different frames but refer to the same surface then that seems like a bug elsewhere. Thanks, - Mark > diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c > index b47531ce1c..ca0076f57a 100644 > --- a/libavcodec/vaapi_h264.c > +++ b/libavcodec/vaapi_h264.c > @@ -98,22 +98,24 @@ static int dpb_add(DPB *dpb, const H264Picture *pic) > if (dpb->size >= dpb->max_size) > return -1; > > - for (i = 0; i < dpb->size; i++) { > - VAPictureH264 * const va_pic = &dpb->va_pics[i]; > - if (va_pic->picture_id == ff_vaapi_get_surface_id(pic->f)) { > - VAPictureH264 temp_va_pic; > - fill_vaapi_pic(&temp_va_pic, pic, 0); > - > - if ((temp_va_pic.flags ^ va_pic->flags) & (VA_PICTURE_H264_TOP_FIELD | VA_PICTURE_H264_BOTTOM_FIELD)) { > - va_pic->flags |= temp_va_pic.flags & (VA_PICTURE_H264_TOP_FIELD | VA_PICTURE_H264_BOTTOM_FIELD); > - /* Merge second field */ > - if (temp_va_pic.flags & VA_PICTURE_H264_TOP_FIELD) { > - va_pic->TopFieldOrderCnt = temp_va_pic.TopFieldOrderCnt; > - } else { > - va_pic->BottomFieldOrderCnt = temp_va_pic.BottomFieldOrderCnt; > + if (pic->field_picture) { > + for (i = 0; i < dpb->size; i++) { > + VAPictureH264 * const va_pic = &dpb->va_pics[i]; > + if (va_pic->picture_id == ff_vaapi_get_surface_id(pic->f)) { > + VAPictureH264 temp_va_pic; > + fill_vaapi_pic(&temp_va_pic, pic, 0); > + > + if ((temp_va_pic.flags ^ va_pic->flags) & (VA_PICTURE_H264_TOP_FIELD | VA_PICTURE_H264_BOTTOM_FIELD)) { > + va_pic->flags |= temp_va_pic.flags & (VA_PICTURE_H264_TOP_FIELD | VA_PICTURE_H264_BOTTOM_FIELD); > + /* Merge second field */ > + if (temp_va_pic.flags & VA_PICTURE_H264_TOP_FIELD) { > + va_pic->TopFieldOrderCnt = temp_va_pic.TopFieldOrderCnt; > + } else { > + va_pic->BottomFieldOrderCnt = temp_va_pic.BottomFieldOrderCnt; > + } > } > + return 0; > } > - return 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".