From patchwork Tue Jan 31 12:45:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Coiner X-Patchwork-Id: 40194 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp13617pzj; Tue, 31 Jan 2023 04:46:34 -0800 (PST) X-Google-Smtp-Source: AK7set+1VtCrMbpIwVhD8V3l5rv+KsVDylpn0NnJShi02CYDACDoqaTBZxp7ctut3khVsLiiwLlm X-Received: by 2002:a05:6402:371a:b0:49e:a174:329c with SMTP id ek26-20020a056402371a00b0049ea174329cmr3735631edb.36.1675169194002; Tue, 31 Jan 2023 04:46:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675169193; cv=none; d=google.com; s=arc-20160816; b=roNJyB9P634+29KhHiELzsb1oZKisX7lqIkzcjLA+7WYHPhUzmeAuTBcDqtkrT1sv/ 8OSWO5IS4pFkyIzhmZDHvmQsfC1Y89oomRvUge2CdsMjLOYcK+pij8y/0WbdVwfWO6cX nGo0wkamcbviJc7+xNdXFGtZaPlsuaJArl1WNjkZSlMqvA0orOFVnyo49KnWqmB7c/QI rh10dI7TrJuY+dE7AHw5f/NwB4fwBx5RkqRN03SA+b0hkeWsFgjk5BQsIg0g1lHGY5C7 LeRXUDiXfPxGHX98ujRHgCJC7T7jypg1W/CNLn3qPWQu58UaQ0QzVreKg76UnjFYWQZb qS4Q== 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=UsX9lywO0FKfOn4QIQdAPDV4yivdHFW2MFnXICAXeJs=; b=cACnOCW8DdaU2o8W12FWy8hUzmag68+qLkbtTHoQ1Ps1b042tf/P0mZSK3vWcoculC ksu2a3zqAHQ2uhGiREIkKigkdeZRotvo2kOEDXVvkB9JvWZPtRLvyH8YZtS15JFG/oNz vG/1s8zu9Xoz4HUnvWeVTEgD7usM3xy2y+F5kXVgLTBpV5BcWCeG5S+GoTODwK4x9HNJ SheXAxZdAFTeyIP2gSVl71haVkmON6qBhpd6+7L5xQdeUugJf1Jkr9VNHZD7gtY8sYaU UkSYNCuCFXx0G0aGKmEoKYub9FBp9w11SbjKm9TrU8vbIPiqqrGFN0Vd8Cd5SutFLWGQ 2dUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=BzzQ5skU; 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 ey3-20020a0564022a0300b0049e24913887si19544917edb.356.2023.01.31.04.46.10; Tue, 31 Jan 2023 04:46:33 -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=@gmail.com header.s=20210112 header.b=BzzQ5skU; 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 1BCCA68BDFC; Tue, 31 Jan 2023 14:46:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D66768BB77 for ; Tue, 31 Jan 2023 14:46:01 +0200 (EET) Received: by mail-qt1-f175.google.com with SMTP id w3so4467764qts.7 for ; Tue, 31 Jan 2023 04:46:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=XmfBZlNr5A3UJin8sWbUrasG3YaPXqCG5HmvWKz2GSA=; b=BzzQ5skUtO54mq6wSAKPj/vxSDX0fzEhfZ8r5GcikNGmugKomNj9Mw8mvGxP+PyB51 XPSw0N23zmi36L3qp8ZBcsDfCqyeHhSXgf6aF79YhnxpK6fRzK2KIhlZTT6Q3AiK+SaS 4xle0mxiAw5ADtyFPYJ8LVrWaF4NGjlQ4DcBSf0CRAgI9gY4rw/+7gRmz/bsfS7HaSzQ RIWTRrYNO16LmqzzRXHyiEcirTwWQQXPGBvtxIoCwprfEdGRn9YwRH309sULuzyMe1KY 3gDrqC/D/+vpTFXK25gzZq29IYkdOcnqdxM2dfPL01Oizqt8oMdZsKCCH/DEUVeMNuzP vNFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=XmfBZlNr5A3UJin8sWbUrasG3YaPXqCG5HmvWKz2GSA=; b=nZCXtd9K6mLIhHJvc/7zAaWgT9A3+drDLwx9o6qoz5MhhD8HMUjzZM02ezFVkpF58d SsgM2aivukGkHNRxLwBVojuXYH+sF9HYtb18NSR72YVghAgFRKC5VECcT7j3bh0YaDjC XIFbcTxuOQzXnEBa9DQE32cA0oUz9Gh5aTcrYXybnJFg3xknuOOHOVMtVRMVTkheoW9q gKfGKyEgpp0r9W2PSeL2Iw8PeoB8MxGm5085Fsv76Y0j8fRAJ8KEXQym51LRaLv/3fwI TgBCe36j0OLB0LOOIL5lhS9xRz1NVfLar2MN4XgLkl0uR1vM6P9LqIpcx00AVNur6BNY jVCw== X-Gm-Message-State: AO0yUKUPYn+NjNIYj2c3vO+ejRY83Jb7+LOm41KK6ITZp0AZq4BgiGYu q5b/tdEEDB/yN0aUZ7vC/egLAwmRVYk= X-Received: by 2002:ac8:5255:0:b0:3b8:68df:fc72 with SMTP id y21-20020ac85255000000b003b868dffc72mr5472656qtn.2.1675169159537; Tue, 31 Jan 2023 04:45:59 -0800 (PST) Received: from jcoiner3.roam.corp.google.com (c-73-38-3-254.hsd1.ma.comcast.net. [73.38.3.254]) by smtp.gmail.com with ESMTPSA id e7-20020ac85dc7000000b003b68d445654sm1128800qtx.91.2023.01.31.04.45.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 04:45:59 -0800 (PST) From: John Coiner To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Jan 2023 07:45:12 -0500 Message-Id: <20230131124512.281726-1-jpcoiner@gmail.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat/mpegtsenc.c -- correctly re-emit extradata ahead of IDR pictures 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: John Coiner Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Bfd+Zew/oSpQ This replaces and obsoletes the earlier version of this patch, which had a bug. Thanks to Marton Balint for spotting it. This fixes https://trac.ffmpeg.org/ticket/10148, it ensures that each IDR frame is prefixed with SPS/PPS. Tested manually, with inputs containing AUDs (x264's aud=1 mode) and also without (aud=0) to confirm it still inserts AUDs when necessary, and not otherwise. --- libavformat/mpegtsenc.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 48d39e6a7d..64948f4d75 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1877,6 +1877,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) if (st->codecpar->codec_id == AV_CODEC_ID_H264) { const uint8_t *p = buf, *buf_end = p + size; + uint8_t found_aud = 0; uint32_t state = -1; int extradd = (pkt->flags & AV_PKT_FLAG_KEY) ? st->codecpar->extradata_size : 0; int ret = ff_check_h264_startcode(s, st, pkt); @@ -1886,17 +1887,25 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) if (extradd && AV_RB24(st->codecpar->extradata) > 1) extradd = 0; + // Ensure that all pictures are prefixed with an AUD, and that + // IDR pictures are also prefixed with SPS and PPS. SPS and PPS + // are assumed to be available in 'extradata' if not found in-band. do { p = avpriv_find_start_code(p, buf_end, &state); av_log(s, AV_LOG_TRACE, "nal %"PRId32"\n", state & 0x1f); - if ((state & 0x1f) == 7) + if ((state & 0x1f) == 7) // SPS NAL extradd = 0; - } while (p < buf_end && (state & 0x1f) != 9 && - (state & 0x1f) != 5 && (state & 0x1f) != 1); - - if ((state & 0x1f) != 5) + if ((state & 0x1f) == 9) // AUD + found_aud = 1; + } while (p < buf_end + && (state & 0x1f) != 5 // IDR picture + && (state & 0x1f) != 1 // non-IDR picture + && (extradd > 0 || !found_aud)); + if ((state & 0x1f) != 5) { + // Did not find IDR picture; do not emit extradata. extradd = 0; - if ((state & 0x1f) != 9) { // AUD NAL + } + if (extradd > 0 || !found_aud) { data = av_malloc(pkt->size + 6 + extradd); if (!data) return AVERROR(ENOMEM);