From patchwork Wed Oct 28 01:31:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 23260 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 3533144B601 for ; Wed, 28 Oct 2020 03:40:06 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0908E6881FC; Wed, 28 Oct 2020 03:40:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f196.google.com (mail-oi1-f196.google.com [209.85.167.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C7621687FA8 for ; Wed, 28 Oct 2020 03:39:59 +0200 (EET) Received: by mail-oi1-f196.google.com with SMTP id x1so3369532oic.13 for ; Tue, 27 Oct 2020 18:39:59 -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; bh=DDZs/gK5SmoFwxF2VbIeHhPlX6/euFbTo/WSOLqoo88=; b=tBeaKB8idlZofqXxkuUhjdpx5k+8wIwI6LluN2BrBtki/9L9Bv17DxkhaVYCu4zfQc /ZUVybgK6fB8us+FB1r0zJhzNYXAYNJSQ8d7bsmEhpR7t0i7WI16ShUPGToTnmL3VsN6 kkT7HojhmkFu/QzLLn4LGUxYEYpcMU7sBpWQK1kaKDx5VgtWeRbRoxJwnOXA1GRGH9jO 9iMQtxGovTzFCDFVKdz8W/RxH2gSImce6SNgLZ8INgN1ojAiZkU7ogs5ADLIPyKOzIvR JU4aKM2k01q+w9PTRBpfyn2o+Vof4y3fDD0R4SOOX7Tp5j4QAriBY2kJG76/KIOlpjbu U4oQ== 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; bh=DDZs/gK5SmoFwxF2VbIeHhPlX6/euFbTo/WSOLqoo88=; b=LSX1UXeQDZbqSINp1TkJS/K3xVf2eAu4D1QkvR8ilMq8lcSu60ND2wFHj9XzaoXswg 9URQUMGDCQKr3vCzhU7XzboOjiYoawP9IgKguVfZsCbHH0u5nwf9tb93rZXCU/3fnApJ D9j7tk/pmamP/ryBj53SDpwKxhFRgAUHI3GFOFgPjqUCOAkOJshfbvbbgbK78OO/c+D/ 3M59zbxAqcDiP98BS+o7Ey9A6s5ecb1rXBTKcNdYhcsfSJFKdilwBViKSEZzGE6Qk7Zz Vb4N7uvVfw+i2JH4YNEmWz9et0WaHc98FW6fTiQkdZBby99gKduQYM6Hlwp7SuchbUpG rZVg== X-Gm-Message-State: AOAM532pRP/yQJtaiIx8odZW9JCaokIXc9KBgU2DmK1cDdLhebRMHDMI 1syqbe1uoVICuFSrsrIV1hzzFXueIzs= X-Google-Smtp-Source: ABdhPJyTZN0Jd/Qnxekq4+aIZnvmQvSFs6NkN91EjUxAGbiUnwWVkwcLsrfZYaCAo8gB6nDKMe41bA== X-Received: by 2002:a17:90b:4204:: with SMTP id iw4mr4487410pjb.175.1603848690931; Tue, 27 Oct 2020 18:31:30 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id b24sm3157543pge.59.2020.10.27.18.31.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Oct 2020 18:31:30 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Oct 2020 09:31:23 +0800 Message-Id: <1603848684-32691-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mpegtsenc: first_pts_check -> first_pts_checked 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang change to first_pts_checked and reverse the logic. Signed-off-by: Limin Wang --- libavformat/mpegtsenc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 29dcaf6..383181d 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -232,7 +232,7 @@ typedef struct MpegTSWriteStream { int cc; int discontinuity; int payload_size; - int first_pts_check; ///< first pts check needed + int first_pts_checked; ///< first pts check needed int prev_payload_key; int64_t payload_pts; int64_t payload_dts; @@ -1101,7 +1101,6 @@ static int mpegts_init(AVFormatContext *s) } ts_st->payload_pts = AV_NOPTS_VALUE; ts_st->payload_dts = AV_NOPTS_VALUE; - ts_st->first_pts_check = 1; ts_st->cc = 15; ts_st->discontinuity = ts->flags & MPEGTS_FLAG_DISCONT; if (st->codecpar->codec_id == AV_CODEC_ID_AAC && @@ -1700,11 +1699,11 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) dts += delay; } - if (ts_st->first_pts_check && pts == AV_NOPTS_VALUE) { + if (!ts_st->first_pts_checked && pts == AV_NOPTS_VALUE) { av_log(s, AV_LOG_ERROR, "first pts value must be set\n"); return AVERROR_INVALIDDATA; } - ts_st->first_pts_check = 0; + ts_st->first_pts_checked = 1; if (st->codecpar->codec_id == AV_CODEC_ID_H264) { const uint8_t *p = buf, *buf_end = p + size;