From patchwork Sat Jun 5 15:01:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 28094 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2030249iof; Sat, 5 Jun 2021 08:02:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOXJ7eWDIxCruN4d5K1VKTBnXNN8cOPnG6F//RG+aUxP/r7ihavaCQivY8jmsW7RrFqeou X-Received: by 2002:a17:907:2bf9:: with SMTP id gv57mr9588233ejc.189.1622905349855; Sat, 05 Jun 2021 08:02:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622905349; cv=none; d=google.com; s=arc-20160816; b=lGAROdHJJlmY0JroC0MWZEKvivb+e47Dq47JvUpA6ru2erHZC0d46+YaNerdfI9ZlH EX+hst9tqRv3MvyE/+TIoENISLoeAN4UZVm3IV4dMiGqhcr9I/3rlocBjQzgoIaSPK3D UpouZ/a8Pnf8++pdIJFTZZb/uHd95NYdJf6XH4JYbhpjIDhhf5Kcj/yvjQvXkPqnBXKz zMAzeK4yWeiYIJbJ4Ks2B86bCxVLM7KvRZ+4zD7+0SNNo5d2uZehUqrE5bPLm+D9dGSl m8C0zYOOx7TM1LKL1Cyki3BIT2lB2LAgoLV0D/FZMZixHXa0DjYbbSRfRE6NdtjHQgwv YKzQ== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=X/rJSFYW4Pbvbb61n1f96n2NNuvUC4ZD7OHtmu+YIQY=; b=eweas2UoEww9JK2T4UsA0QeF+z7G9vUzcXihSSgveqVYfSCwNLTdmKH+di52egjLhe 6tzJ6DfUqps/zz/+i2j/s824EEYM1uJgccM1yrHvBHTMrpJt8LNqwuBYoo8qJoi9XaiG EjFqdrVi8NLep1CE4Fw/7C/sDqI91Pqo8lL5IbzFSSBbrGA9P5l712CueCYeQNl5dayQ keK4N0uve/4NJiuP25rxec6qXHa+opgn94yGycMbJFvSJUswgFnW+aZOfg/frbJqWJqT O5UXaEWwXHAug+vcazweLuHHszETmyq7dIb7XOhW3nQWIV24Mng6EzZWI9dRE+cHr2Gk LnvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=eCyrkuVK; 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 b13si8600703ede.412.2021.06.05.08.02.29; Sat, 05 Jun 2021 08:02:29 -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=eCyrkuVK; 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 77D9468A548; Sat, 5 Jun 2021 18:02:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D96FE68A506 for ; Sat, 5 Jun 2021 18:02:11 +0300 (EEST) Received: by mail-qk1-f177.google.com with SMTP id r17so12329223qkp.10 for ; Sat, 05 Jun 2021 08:02:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=xqVrh3HrNze3OVzv5u3QhvYfmBscGQn2qZn4OEiaBeY=; b=eCyrkuVKmYrRuvCu63tweUueeVQiqEhL4rYq0niAHiIQ3E35IPJlGTOVwjSCdjkEIK zsAWrzMdJ5lPn5nSXj2wRTGJ06L+TJcs+nF0HTjwp1UGJ06FnErqYd4zkabNZ/+6+HIk IvQ5CZ/7jUXt/p9WyxD6t0r4AnTYODCqS/PrGtyZotQY7UgBeqSwrm6u5/rq6IMXCJj3 z7U7TVjV1ir9F8dQo1AOSfYg/Zdgf5FaEafeVYOpJBVEKEmr40NWg+gClARja/qnUDO4 KGOPjlf0R4LOoP82ePxuJDLRRmgvJMCeDl7JfKyAQSf5gj9Hi34vNO6eF3yUaWjCf+Ej 0uQA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=xqVrh3HrNze3OVzv5u3QhvYfmBscGQn2qZn4OEiaBeY=; b=I3JdzQDyABhZrFlGHrAJYjAfYJLodnjGUOEuc2PZi3QLURt/5jP8+lea/4cRNCdHZj 9YE2e5ndVGV+Q7Jju5O6atndIy5XKxShtqTlhjB/0d92aOd6qaVeHyX6TmoiZWGB/dFx yamNJ27IGpm04FYab0EoAHNMpX34d4oPEVB3kqUuOxxbGbnvjM1oeEmVX3trkYQwzZR/ BsBBkuPGwTn4RzdkwDAxD0/lf29ks0Ma2PZzPz7luNhBbB8ujMJRc2kM8OyIB1fFgXN9 5mONq8AFiRzS2AKZVo/6cB7Dzcw8H2Eo6VG0pYqA3/AzIZi9uwGl0q60CYTNJHLfnYX/ SBNQ== X-Gm-Message-State: AOAM530J94Lw8NLfkLoqB7b8frSVGF2BxQRP7cHTf5Z1cD3w6zqTBPa2 gn9oK6z0/hE2jgP44QGdG2m9pQejsBY= X-Received: by 2002:a05:620a:1368:: with SMTP id d8mr9361273qkl.283.1622905330356; Sat, 05 Jun 2021 08:02:10 -0700 (PDT) Received: from localhost.localdomain ([191.83.217.13]) by smtp.gmail.com with ESMTPSA id w4sm4706044qtv.79.2021.06.05.08.02.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Jun 2021 08:02:10 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Jun 2021 12:01:48 -0300 Message-Id: <20210605150149.2334-2-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210605150149.2334-1-jamrial@gmail.com> References: <20210605150149.2334-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avdevice/libcdio: fix AVStream.cur_dts usage 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: vTwDNrbdPu9G It should not be accessed from outside of libavformat. Signed-off-by: James Almer --- Untested. I'm removing the cur_dts usage from read_packet() because i don't want to add another avpriv function just to read it, and cdio_paranoia_read() should return NULL when there's no more data, so it's probably superfluous. libavdevice/libcdio.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c index f1a1468554..dba02d4130 100644 --- a/libavdevice/libcdio.c +++ b/libavdevice/libcdio.c @@ -118,9 +118,6 @@ static int read_packet(AVFormatContext *ctx, AVPacket *pkt) uint16_t *buf; char *err = NULL; - if (ctx->streams[0]->cur_dts > s->last_sector) - return AVERROR_EOF; - buf = cdio_paranoia_read(s->paranoia, NULL); if (!buf) return AVERROR_EOF; @@ -157,7 +154,7 @@ static int read_seek(AVFormatContext *ctx, int stream_index, int64_t timestamp, AVStream *st = ctx->streams[0]; cdio_paranoia_seek(s->paranoia, timestamp, SEEK_SET); - st->cur_dts = timestamp; + avpriv_update_cur_dts(ctx, st, timestamp); return 0; }