From patchwork Mon Jan 24 01:37:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Waltman X-Patchwork-Id: 33755 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2337466iog; Sun, 23 Jan 2022 17:37:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJxU2ks7P+/NsFgQTrkXJblkiTkiNd6s9bF93OdzaU+POk9PtXfsQGyDjkxVYhEK4t5ksey/ X-Received: by 2002:a17:907:3f08:: with SMTP id hq8mr552617ejc.758.1642988244263; Sun, 23 Jan 2022 17:37:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642988244; cv=none; d=google.com; s=arc-20160816; b=C/zZhgebGJvUFrTQ6e1LmFRSXX/zB0RVtLEUEsRE5nH/F/0tK6dOHjDnOmIeGMGWMS u0gI4PZzWKzeoBqxr7JwpX4ol9/9AvI3u/B+3IZvRF3YR1wTHKmk23KNeZ8w1Q1YufYj LgPR8Sb5WYluYXFevrMie4dJJc4VIaaM8XFxLwFq0/DdAczQ+2FZEiYtRm2I9ZD7Ozjw ytYkRucIhecucW9jvL4wByKT47F7R8KWRxVcyJHF8qa8+7WRWTdIJggqViSGU/87OgqM sgNerOt4pv0GYQjbBk9EltXk249fpmjIB1gSddmmc9fkcaISHw+LUzWzbQ9cVwkIBEK0 gcFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:content-language:accept-language :message-id:date:thread-index:thread-topic:to:from:dkim-signature :delivered-to; bh=uZr+LLwvG7qQbGM9vU1KRN4GakuByWfBe7QlHKORDX4=; b=gjHhDxYkluR4G9ajGGZ4cd5unpJq0qARTy8X5u88esZ2o9VE63mPyCoz4JSIbLxADb PcMcYtX7QbSBoB76piKP+mGg7yGy4/mw8m3F5X18h9zE1VqlhS1IRI+sIPIjehDi0KTF LGb1hz86lsPJGRJH0SiYcvWwuW3QOolVPoCP2xxRhv7by7zcVxqaALVhc8tLEqDLZgQh 1g4Y2iCDWJ1y1VV4mZCG8RuAC71boHx93sTMD6Lyxn0FBTWoj2UqfLamqv2O7wTPqeqE BbHup2azG9DFFm9icVsN2CRRsdFCa5LmvAO/VapGPrY/EYwMOMnXH16+evevvcYSh1KK LqsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@toyon.com header.s=default header.b=eE9rmwBj; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=toyon.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ds12si7622930ejc.36.2022.01.23.17.37.23; Sun, 23 Jan 2022 17:37:24 -0800 (PST) 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=@toyon.com header.s=default header.b=eE9rmwBj; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=toyon.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 242A668AFF2; Mon, 24 Jan 2022 03:37:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.toyon.com (mail.toyon.com [209.203.101.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3E8268AECE for ; Mon, 24 Jan 2022 03:37:12 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=toyon.com; s=default; h=From:To:Subject:Thread-Topic:Thread-Index:Date: Message-ID:Accept-Language:Content-Language:Content-Type: Content-Transfer-Encoding:MIME-Version; bh=DzIFpc4CIt60JkHKAxnAc 47srUCeu2SvI4YTQZexz1g=; b=eE9rmwBj1lzEMAFNV2bAD8BGHmhuXdKS206CO oRBA6FcO65MmM0dcBkgGkxUr7HOuKSbAAmk9oIAvEJm2G9dp8MLdHSiV66IvzSnu 7Daz2FiRJtcZALTzWpD4GqEuq0XPHwuTXRX9z3fqmVWL0q3JTdSqve7HZbCmCC2z 61SVxw= From: Jon Waltman To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] lavc/cbs_sei: Fix H.264/5 SEI unit ordering Thread-Index: AdgQt0M0amYiylM1RR+Wbrovz+xdAw== Date: Mon, 24 Jan 2022 01:37:07 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [172.21.1.145] MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/cbs_sei: Fix H.264/5 SEI unit ordering 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: NW+ziYLFnE6U Fixes regression from commit 8843607f495c95c1e67a3ce3d6f15dca6e252439 causing incorrect SEI unit ordering (e.g. after H264_NAL_IDR_SLICE when prefix is specified). Signed-off-by: Jon Waltman --- libavcodec/cbs_sei.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/libavcodec/cbs_sei.c b/libavcodec/cbs_sei.c index 141e97ec58..4a4a58957b 100644 --- a/libavcodec/cbs_sei.c +++ b/libavcodec/cbs_sei.c @@ -154,14 +154,14 @@ static int cbs_sei_get_unit(CodedBitstreamContext *ctx, if (prefix) { // ... before the first VCL NAL unit. for (i = 0; i < au->nb_units; i++) { - if (au->units[i].type < highest_vcl_type) + if (au->units[i].type <= highest_vcl_type) break; } position = i; } else { // ... after the last VCL NAL unit. for (i = au->nb_units - 1; i >= 0; i--) { - if (au->units[i].type < highest_vcl_type) + if (au->units[i].type <= highest_vcl_type) break; } if (i < 0) {