From patchwork Mon May 3 13:31:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27570 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a10:399:0:0:0:0 with SMTP id 25csp257060pxh; Mon, 3 May 2021 06:32:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxRZ1CmqMRrRPZLqqbd38unZAwcaih43AsVzXlNQgRMGD47yTnH1S6y/BhYDt3lWrDsr58A X-Received: by 2002:a05:6402:280d:: with SMTP id h13mr20324046ede.105.1620048753481; Mon, 03 May 2021 06:32:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620048753; cv=none; d=google.com; s=arc-20160816; b=gJW8eq5X6FbomCFv0uj6X9TdxzNmNFv/+pMo7QVrLwdmpqWeVRKDvZKSoAzzpXyUZK iuBQKp1sw/wYRcD8IQej6T9lY0Y3CK9JmrBVYGA5GmomFcLME9KyQJtyt4NTwUjdo4th VS5tlEGhwM4ZKEf3Enzn3hhTKUKKvUboIKkOZ3TW7tOZzUtvCoJ9TlatqLwm+6KAmxnX b62PLVl6GF1ChnyqBlLiD4McPPxGzNr+Eu8jRzUhY60JozO6vQjT6kiYWrfRujFylhGV dOb1xWRBYgBA6YRAbJ4GscB6lVklzK22wvNYd/WgX8IeUPlzENNp4h27nQDqtUf3QFyF VyTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=+RAYee1rzGlLN38FMwDzWRnoJiOhO0Xriz+ev+N2zog=; b=0iIQz21eHtPfaaUUOrho2GVLH3WC24ZbEyddpwAfD2uA4AgSLutzvP9SwXDPFRRCvz DHyH+oMrfGjWmlwBt0JZwHc9rDebtFR+cd4cQ9bky8lXNPom5mWddFf8Ixv1fQp6sPDw sklqzpIK1JVg/PLO6KaHeA5r/rTcmJF94H6u1EZnsa+fX91uAw4HTDOQDV5wBArPpx9d qFp3ajaSx/WX4VUu22nNYr2nCH4VxLavCUW3CBnL6X3t00ZQ81MO0jIFQY1XW42TObqL mgb32czz4YJdip//I2Qc/+wm6ASz1DAQMHE6pTwknAj36TrFIPWSKAWz3HYafd63Oz/F YTgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qsBNQKT3; 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 o9si10594791ejc.407.2021.05.03.06.32.33; Mon, 03 May 2021 06:32:33 -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=@gmail.com header.s=20161025 header.b=qsBNQKT3; 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 C4E4E687F34; Mon, 3 May 2021 16:32:29 +0300 (EEST) 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 2EC12680226 for ; Mon, 3 May 2021 16:32:23 +0300 (EEST) Received: by mail-qt1-f175.google.com with SMTP id g1so3612574qtq.6 for ; Mon, 03 May 2021 06:32:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=uo9c/iayA0dscJ7UKQzwx2vcv74BL531iDA38z2VbPA=; b=qsBNQKT3u63XFBlpI6u06F0RH2fYDnsVva6XGmNs/RY2sAIruzP51g2EiOBTqwQGCv rvpZnM1S9nyDMtZCa6jy4L2XH++Nezknmo9Lwek+P4QRnkxGeq5c191weSCqhHzFm8rW 9T6rNNcUE0FIgNwzijEG9OUtdp/ExUFpW/i+/eh5ozrdIyWwz08IPlZDaiR03K5VgZGe Ux1ndRjWlMK3sH2w8oQ6OiMku1eZC+XGVeVXR33ShyQ3T7h3kwb97v+RGPs4U4mwdXbu RQwyJ5iCxMMvPhOHKVi4aY9MxEDbXnuwxs+ZVoYNxomKjXehHXRZax3gAY8ozGL15tBk WfjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=uo9c/iayA0dscJ7UKQzwx2vcv74BL531iDA38z2VbPA=; b=Fo0r8E877JEVmR6Zi8vAOBwZtfPCasD/WAxZPHpyc5z/3CB+dvvZNUC4Pvn+18z0rg aM3t0C9RUtz/entYzc8u+a4qz8L2bKQHbuQL47BfJzBzw2mU2JOCKANnxsh47x4Pz+ML FFTmfCFDWW5AzGs/uFQIi7986+aIIor7/bv4c4S7xxNKGnGaS1k3mdwrfX14Pu8PdCzY +xPevEVA6VzWvtNStPBYlKceaJGsu7tQDPWq2bCIoU0XiLTNNV+gg5NrFdJcwyb8A5lf auT4EnRdF9r+eDmAWu+wn0UxktS2QgvR4HOj0FN3PE1wWwlPvj6JS19w6hRdMmgQBpif XkFw== X-Gm-Message-State: AOAM533v6GJoIceVO0taki8KHgqLcCx+N3N0pKQOLgZ70vvGVTWvhOOs 7tIou1usmUlqeeD6z+z61bZgVnRxhE4= X-Received: by 2002:ac8:6f4c:: with SMTP id n12mr17720235qtv.22.1620048741138; Mon, 03 May 2021 06:32:21 -0700 (PDT) Received: from localhost.localdomain ([191.83.208.172]) by smtp.gmail.com with ESMTPSA id 189sm5751929qkh.99.2021.05.03.06.32.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 06:32:20 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 May 2021 10:31:56 -0300 Message-Id: <20210503133200.1434-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] avformat: move AVStream.last-IP_{pts, duration} to AVStreamInternal 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TxtfUw12rwmI Those are private fields, no reason to have them exposed in a public header. Signed-off-by: James Almer --- libavformat/avformat.h | 2 -- libavformat/internal.h | 3 +++ libavformat/nutdec.c | 2 +- libavformat/utils.c | 20 ++++++++++---------- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 624d2dae2c..e62c6d1567 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1002,8 +1002,6 @@ typedef struct AVStream { */ int64_t first_dts; int64_t cur_dts; - int64_t last_IP_pts; - int last_IP_duration; /** * Number of packets to buffer for codec probing diff --git a/libavformat/internal.h b/libavformat/internal.h index 7d0eab44ac..10d8f8dfeb 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -365,6 +365,9 @@ struct AVStreamInternal { * last packet in packet_buffer for this stream when muxing. */ struct PacketList *last_in_packet_buffer; + + int64_t last_IP_pts; + int last_IP_duration; }; #ifdef __GNUC__ diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 46f21ddd57..e709257135 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -1086,7 +1086,7 @@ static int decode_frame(NUTContext *nut, AVPacket *pkt, int frame_code) stc->skip_until_key_frame = 0; discard = s->streams[stream_id]->discard; - last_IP_pts = s->streams[stream_id]->last_IP_pts; + last_IP_pts = s->streams[stream_id]->internal->last_IP_pts; if ((discard >= AVDISCARD_NONKEY && !(stc->last_flags & FLAG_KEY)) || (discard >= AVDISCARD_BIDIR && last_IP_pts != AV_NOPTS_VALUE && last_IP_pts > pts) || diff --git a/libavformat/utils.c b/libavformat/utils.c index 49bf19b2b0..b5b0995f32 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1285,28 +1285,28 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, /* DTS = decompression timestamp */ /* PTS = presentation timestamp */ if (pkt->dts == AV_NOPTS_VALUE) - pkt->dts = st->last_IP_pts; + pkt->dts = st->internal->last_IP_pts; update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts, pkt); if (pkt->dts == AV_NOPTS_VALUE) pkt->dts = st->cur_dts; /* This is tricky: the dts must be incremented by the duration * of the frame we are displaying, i.e. the last I- or P-frame. */ - if (st->last_IP_duration == 0 && (uint64_t)pkt->duration <= INT32_MAX) - st->last_IP_duration = pkt->duration; + if (st->internal->last_IP_duration == 0 && (uint64_t)pkt->duration <= INT32_MAX) + st->internal->last_IP_duration = pkt->duration; if (pkt->dts != AV_NOPTS_VALUE) - st->cur_dts = av_sat_add64(pkt->dts, st->last_IP_duration); + st->cur_dts = av_sat_add64(pkt->dts, st->internal->last_IP_duration); if (pkt->dts != AV_NOPTS_VALUE && pkt->pts == AV_NOPTS_VALUE && - st->last_IP_duration > 0 && + st->internal->last_IP_duration > 0 && ((uint64_t)st->cur_dts - (uint64_t)next_dts + 1) <= 2 && next_dts != next_pts && next_pts != AV_NOPTS_VALUE) pkt->pts = next_dts; if ((uint64_t)pkt->duration <= INT32_MAX) - st->last_IP_duration = pkt->duration; - st->last_IP_pts = pkt->pts; + st->internal->last_IP_duration = pkt->duration; + st->internal->last_IP_pts = pkt->pts; /* Cannot compute PTS if not present (we can compute it only * by knowing the future. */ } else if (pkt->pts != AV_NOPTS_VALUE || @@ -1823,7 +1823,7 @@ void ff_read_frame_flush(AVFormatContext *s) av_parser_close(st->parser); st->parser = NULL; } - st->last_IP_pts = AV_NOPTS_VALUE; + st->internal->last_IP_pts = AV_NOPTS_VALUE; st->internal->last_dts_for_order_check = AV_NOPTS_VALUE; if (st->first_dts == AV_NOPTS_VALUE) st->cur_dts = RELATIVE_TS_BASE; @@ -2840,7 +2840,7 @@ skip_duration_calc: st = ic->streams[i]; st->cur_dts = st->first_dts; - st->last_IP_pts = AV_NOPTS_VALUE; + st->internal->last_IP_pts = AV_NOPTS_VALUE; st->internal->last_dts_for_order_check = AV_NOPTS_VALUE; for (j = 0; j < MAX_REORDER_DELAY + 1; j++) st->internal->pts_buffer[j] = AV_NOPTS_VALUE; @@ -4423,7 +4423,7 @@ AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c) st->internal->pts_wrap_reference = AV_NOPTS_VALUE; st->internal->pts_wrap_behavior = AV_PTS_WRAP_IGNORE; - st->last_IP_pts = AV_NOPTS_VALUE; + st->internal->last_IP_pts = AV_NOPTS_VALUE; st->internal->last_dts_for_order_check = AV_NOPTS_VALUE; for (i = 0; i < MAX_REORDER_DELAY + 1; i++) st->internal->pts_buffer[i] = AV_NOPTS_VALUE;