From patchwork Tue Apr 20 04:44:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zheng qian X-Patchwork-Id: 27186 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp1123897iob; Mon, 19 Apr 2021 21:45:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyW6zE6Wk7wM2Lg5uFsQ/MK9WTBEz0AqFiACLGb2mUnv+4ZCrpZfhcIIxn2TgJ+mufFCqF1 X-Received: by 2002:a17:906:8812:: with SMTP id zh18mr25576285ejb.342.1618893917206; Mon, 19 Apr 2021 21:45:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618893917; cv=none; d=google.com; s=arc-20160816; b=SX84mGa03JPxYVg+I8GztiI+22Cahzb64Hs9UlUNIQQQ1axEAnzpp49kkxGyRJE0Tw KodLV+nhhtR4EwKCdLCzaXZxLa0eDQ15dQcIv04S/dSSkNRwHiN5z8gtahI4lxad/PHU /ERNbYFhfOPJ8o1Q/xnFMnsjyjiBEV3rGT1AJrzdg6/6SQUWNtY5iXHobN915oLfwnT+ +FVN+vF0Mcu5h4oCJFw7FVjJiNmfP16CJ1s/DMw1opkIg8WTSuJf0exUwUJ01WI/kY/P pepT9Mhy3TbJkhc6w40cSFmQA+YcfEkaLqF7CIrNGLnusTTDjD6M+6lu2qvY3VRESOE5 vyVA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=0KRmiVjOfUqRvclDOGD/CuBAoyDXAdvMHu4zRUzSsZw=; b=GoUgQV9e3zHhvt6MlS75cACTlGKOWs/BnkQxrf5r5XBy7qNlSB38KIcdaOH7dIcHU+ u/C2W4V6U9MK+M4IA06FK4ysrLHna8sVaIBvAtnVPkLtnRC0ehhTH6L9hgAM7W8dYyHc IksgngAXhjcL6cJUyT5G8KGOSV1iPkFnlN7AzJdW+TZgiEKdqDNlbOloePxKAT6LtSZW 6KEkxj4RLcmJJl4Hq0HRbfD4i0vvgVGqyjBqX7/k00QW/38GVckGbXxAEl6zikpCV0vN nApzgpFdZ88hFNW4QAzP4vbCN8DxlZ8wTkxAc7JAajbLDifE0wQvbtHm1BEtLxL+IdER HE4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@xqq-im.20150623.gappssmtp.com header.s=20150623 header.b=Kutn3WBC; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v15si14064153ejr.512.2021.04.19.21.45.16; Mon, 19 Apr 2021 21:45:17 -0700 (PDT) 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=@xqq-im.20150623.gappssmtp.com header.s=20150623 header.b=Kutn3WBC; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A1F5068A176; Tue, 20 Apr 2021 07:45:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B179268A148 for ; Tue, 20 Apr 2021 07:44:59 +0300 (EEST) Received: by mail-pj1-f50.google.com with SMTP id m6-20020a17090a8586b02901507e1acf0fso4276318pjn.3 for ; Mon, 19 Apr 2021 21:44:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xqq-im.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lkYu2E0S0JSVtWk+cPt1esYWEz0c4i43pHMjiIbK3O0=; b=Kutn3WBC5UYLoIVOjm3vWvVULnX11gKeRDpTLwLIGnzQVscTCQREVVCPx/DjQOdzOI C5zqeZ+slILF/Xz8KOyzpVEhnB/hFSgJQz0xR2OfVMQ1lWdj+IHn/qdgvsB1MtVOBUKL ButctMFRRvmb0uPQRKqfBh5Xbna3bZzhgO2aHi4lj0UigmWodASa9AeYzxINpt64XTVg eYY9uRe4MQ6oPrRDS3Big7T3KlJSGxKrL//FhsqeRzEH3yK0XSE2HNZB+H9m/gk1RhBo rMM75xdxL0k6w5VAtPATKPE+9sAP8hoNuk2y3LjNJKuTBRSJajqSwF/Iyb55AZ0s8x0T MtIw== 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=lkYu2E0S0JSVtWk+cPt1esYWEz0c4i43pHMjiIbK3O0=; b=rACNXwoOk7TsJN+qh9yrqRHHqtJUXe6YQcMoPc0rs5RwwNA3Hrg7d9bdAsfo1DlBH7 OXbzOtK9e/c6cR0ekEntVQLVTyid3+BW9fBC3R/pB/MHJ6B/m42NG5Qdjp8G3gP8znP7 y67BYakfgnhdQF6eMpP9Hyb02Psu/KZE28iOpcehIZsXO0QN/W+GhjL838F63/eBlpPq D7MIHcQEHVLd15eKu1yziWvHabw6H023v0UNzDkzidib0hyCbXr8sK1xm2phQvBg0Z6o i6Ce/HeGR77Tm50D639ocByYIrF5MwBBOtPUZLxH2lCwXT6iZKFGSWelimETu79Q/pAV DPOA== X-Gm-Message-State: AOAM533TGuvzC8DkLYkPo+szSM0bTYAETWKNAshonOVrZVTSbPQ7UBy1 ktXSPGhtMPhw/4DEAag8x9MYIRaG02FBYcqF X-Received: by 2002:a17:90a:2807:: with SMTP id e7mr2925327pjd.181.1618893897798; Mon, 19 Apr 2021 21:44:57 -0700 (PDT) Received: from zhengqian-xps.lan (ngn-nat1.v4.open.ad.jp. [202.222.12.138]) by smtp.gmail.com with ESMTPSA id a65sm13619988pfb.116.2021.04.19.21.44.56 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Apr 2021 21:44:57 -0700 (PDT) From: zheng qian To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Apr 2021 13:44:34 +0900 Message-Id: <20210420044434.65012-3-xqq@xqq.im> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210420044434.65012-1-xqq@xqq.im> References: <20210420044434.65012-1-xqq@xqq.im> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] avformat/mpegtsenc: Write stream_id into PES after stream_id decision 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: zheng qian Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kBUt3tjUlUFR Since stream_id will have effect on the existences of PES header fields like PTS/DTS, it should be better to guarantee stream_id variable to be identical with exact written value. Signed-off-by: zheng qian --- libavformat/mpegtsenc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 4a20775af4..0e9c978d74 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1445,28 +1445,28 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, is_dvb_teletext = 0; if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { if (st->codecpar->codec_id == AV_CODEC_ID_DIRAC) - *q++ = STREAM_ID_EXTENDED_STREAM_ID; + stream_id = STREAM_ID_EXTENDED_STREAM_ID; else - *q++ = STREAM_ID_VIDEO_STREAM_0; + stream_id = STREAM_ID_VIDEO_STREAM_0; } else if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && (st->codecpar->codec_id == AV_CODEC_ID_MP2 || st->codecpar->codec_id == AV_CODEC_ID_MP3 || st->codecpar->codec_id == AV_CODEC_ID_AAC)) { - *q++ = STREAM_ID_AUDIO_STREAM_0; + stream_id = STREAM_ID_AUDIO_STREAM_0; } else if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && st->codecpar->codec_id == AV_CODEC_ID_AC3 && ts->m2ts_mode) { - *q++ = STREAM_ID_EXTENDED_STREAM_ID; + stream_id = STREAM_ID_EXTENDED_STREAM_ID; } else if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA && st->codecpar->codec_id == AV_CODEC_ID_TIMED_ID3) { - *q++ = STREAM_ID_PRIVATE_STREAM_1; + stream_id = STREAM_ID_PRIVATE_STREAM_1; } else if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA) { - *q++ = stream_id != -1 ? stream_id : STREAM_ID_METADATA_STREAM; + stream_id = stream_id != -1 ? stream_id : STREAM_ID_METADATA_STREAM; if (stream_id == STREAM_ID_PRIVATE_STREAM_1) /* asynchronous KLV */ pts = dts = AV_NOPTS_VALUE; } else { - *q++ = STREAM_ID_PRIVATE_STREAM_1; + stream_id = STREAM_ID_PRIVATE_STREAM_1; if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) { if (st->codecpar->codec_id == AV_CODEC_ID_DVB_SUBTITLE) { is_dvb_subtitle = 1; @@ -1475,6 +1475,7 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, } } } + *q++ = stream_id; header_len = 0; flags = 0; if (pts != AV_NOPTS_VALUE) {