From patchwork Tue Oct 20 11:03:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23114 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3A0E044A859 for ; Tue, 20 Oct 2020 14:04:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2100968BA9C; Tue, 20 Oct 2020 14:04:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 33A6168BA8C for ; Tue, 20 Oct 2020 14:04:09 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id q5so1388906wmq.0 for ; Tue, 20 Oct 2020 04:04:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mgBjxqd3xPJflmx10o69gkhwrO5M1lLdPdz/Vx2Jr6k=; b=gauhT9pYhLqKI2Eq/VNV6CVwuZ1ak925jNj91B1jLWhWGGyD1JbGfaij2M6U0hyxk5 kQzP8NSGFHsbsRk4PMKvNNwHQ/7X5T4dqMyl+q1CAC4ig8p2SeJBCqTo6SpUTQ79LhXW uxw3GxQyBWb13UbRsBQ/bGuRIJh1mzqwdsgIaUEbJDAVeWWSyPqB3xF2VIuqq7HeV0l8 HNS++ZAbpCcrJFwBphIVIdmUxbdxBd0yDS57XSCeU+6h2LFnDMweL2xfJ8Fq0276yk9K 6KKeeb2iHkGoWLjIY9eECbrkgC6Hall7iebGxRT/jTXr0Ycsizcvf8aSzlkE1hJ+f8F4 4QPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mgBjxqd3xPJflmx10o69gkhwrO5M1lLdPdz/Vx2Jr6k=; b=QaWOLgvxOOD1S0/guClgD6p32q+BYam7IaP8js2o+Cn8R7bLV46DrlvbzdQJ6ihG7a qDE3f7ouGY6oks7pn9yHnqYBUOMIRqKmKtuRX7r4z/gm5sQIxLFBouNJNUvY9NpmwGb3 7NfUf8+NA3cT1Sva3TgVAD7zmXt1RF7cRQ+bi2DcFeabh66mJPGQMmcorPE1+CkktihV SJo4xe0gfN2ynUw+cAYTS5RrYUVGd3slUy4FaGm5YTPfxMry72uS6uYvFN05Lyyg/MZX WXOyHchENoqI1eTz3NPQlkOMlQ6yhbo45qq3ZwYgSHktIB9Lnm2OaJyTkEv/HeNiOC3G Nxjg== X-Gm-Message-State: AOAM532/L3D5y/MT8rvkbJcMudRaXB2kHKlLpNFpy0IutSems2vK92fD 8N2HGTTB1bkKdLG0Oklo81p9AYLmXr8= X-Google-Smtp-Source: ABdhPJwpYxlAH4ibP1skpnw6iDIr6HDY+mTiKwZKATZvQ5k2YZm4PmKuzHE8mtqSGU4pjdT3x9YcuQ== X-Received: by 2002:a1c:2e53:: with SMTP id u80mr2388466wmu.58.1603191848355; Tue, 20 Oct 2020 04:04:08 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id c18sm2413075wrq.5.2020.10.20.04.04.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 04:04:07 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Oct 2020 13:03:34 +0200 Message-Id: <20201020110334.197116-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201020110334.197116-1-andreas.rheinhardt@gmail.com> References: <20201020110334.197116-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/hlsenc: Fix check for SPS X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Check all the six bits, not only the two bits that are set for SPS. Signed-off-by: Andreas Rheinhardt --- libavformat/hlsenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 4967247bca..cbfd8f7c0d 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -351,7 +351,7 @@ static void write_codec_attr(AVStream *st, VariantStream *vs) /* check the boundary of data which from current position is small than extradata_size */ while (data && (data - st->codecpar->extradata + 19) < st->codecpar->extradata_size) { /* get HEVC SPS NAL and seek to profile_tier_level */ - if (!(data[0] | data[1] | data[2]) && data[3] == 1 && ((data[4] & 0x42) == 0x42)) { + if (!(data[0] | data[1] | data[2]) && data[3] == 1 && ((data[4] & 0x7E) == 0x42)) { uint8_t *rbsp_buf; int remain_size = 0; int rbsp_size = 0;