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 D999740784 for ; Thu, 26 Jan 2023 19:16:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D872E68BC6A; Thu, 26 Jan 2023 21:16:34 +0200 (EET) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDB7E68AD83 for ; Thu, 26 Jan 2023 21:16:28 +0200 (EET) Received: by mail-pl1-f174.google.com with SMTP id z13so2745988plg.6 for ; Thu, 26 Jan 2023 11:16:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=xqPMOieaeoYKhffmeG1UAyGSCWrQyLHtquLkxleNHm0=; b=A4CQmm2NYu3LTW0XR7qgw3hZqmc1R5b1lZB1/w3IBd6/aRxLEnCeEYVEAYCLmA3zoP J7AtizaVZWEBZ/k2ilvxu1tdpAx7bbA3980u5SqSdRNxJtW6DY+qEuZayo0QrX8bspxJ zqBws7bhU0IhvZEEeMl4rf+19F/Fx4mJILb+XryhSt2W85wa9pcCLX2a1IobMGiIHWVW UlWPPOzfgNkQjf+hUhrxndoDRjd7DSCkwsAHYv4Ie55qPOmsThwWXwS+0mzhz/T39UAm sL6tdCQHCS56lcr/suSwPE/lMV9VzBumM/rfSTrFPlxLZJpWjsGK11o/sF2Sm2T/OH8u n37Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=xqPMOieaeoYKhffmeG1UAyGSCWrQyLHtquLkxleNHm0=; b=NMiqdZj2Xnl3kTsB8e91apbwwXe9ant5Xb1H7cnVY+0GW1QSopb3CVWjzfQODoMiCF p9HQ0cPGnVhCIqlASAK+C8CLTrzj2tkhHvT9aa3jnlTe2DHaIkrQESrO2egfVe2tSwEc y6GrD/sSwlDA5roydpgvg0bqVinQCcQSq8POhvW8xXMRVJHwFtW/XVqQnLkzka7xWBF7 QnV0GLhnpaoenC7bZOE+2fk0Ehl/Y3kI7cBfv06RLYJv1t532W3f2QUMSW/YSPOcOrOs yv9A6dWaY9ReuEu/TtGzJEfjOcwu+Of4uYi8MvMndlpklyGVCeMGKURqRqgUp5efTgbW WhoA== X-Gm-Message-State: AFqh2kp7SVPNnFOenCFcdUdjOX6McOKcF7g3MS/qtqGEepchwPcgEU9m z+wPqUwUr7ViHt5vIm/zWH0Bf8zwghjWhZcV/HhzyBPZEVQ= X-Google-Smtp-Source: AMrXdXuZru1prDONlokgInqA0s1HfeXSLW6bkjSoLhULr8PSDOWZV52qmgd06GbmDks8qPM1YF6E85uFaD1DcYnCG+g= X-Received: by 2002:a17:90a:2882:b0:22b:b832:4125 with SMTP id f2-20020a17090a288200b0022bb8324125mr3706163pjd.146.1674760586574; Thu, 26 Jan 2023 11:16:26 -0800 (PST) MIME-Version: 1.0 From: John Coiner Date: Thu, 26 Jan 2023 14:16:15 -0500 Message-ID: To: ffmpeg-devel@ffmpeg.org X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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 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: Trying again to upload the same patch, this time inline: >From 09c4bbd3d4ef6fbcb1558fce5cff4d15d7839526 Mon Sep 17 00:00:00 2001 From: John Coiner Date: Thu, 26 Jan 2023 13:34:24 -0500 Subject: [PATCH] Proposed fix for https://trac.ffmpeg.org/ticket/10148 --- libavformat/mpegtsenc.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 48d39e6a7d..6cb398f99c 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1886,17 +1886,21 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) if (extradd && AV_RB24(st->codecpar->extradata) > 1) extradd = 0; - do { + while (p < buf_end + && extradd > 0 + && (state & 0x1f) != 5 // IDR picture + && (state & 0x1f) != 1 // non-IDR picture + ) { 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) != 5) { + // Not an IDR picture extradd = 0; - if ((state & 0x1f) != 9) { // AUD NAL + } + if (extradd > 0) { data = av_malloc(pkt->size + 6 + extradd); if (!data) return AVERROR(ENOMEM); -- 2.39.1.456.gfc5497dd1b-goog _______________________________________________ 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".