From patchwork Tue Mar 15 17:06:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 34761 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp3190880nkb; Tue, 15 Mar 2022 10:06:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzy/Yv/3qd009PXKeV9NMsQhZJzfPqWzmVSCRTGovDOwUYMx+97gRDtBmylVPKxeNq4tLyz X-Received: by 2002:a17:906:30cf:b0:6da:9da6:b360 with SMTP id b15-20020a17090630cf00b006da9da6b360mr22555210ejb.743.1647363984259; Tue, 15 Mar 2022 10:06:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647363984; cv=none; d=google.com; s=arc-20160816; b=ResKW7N/sqYHUz5g48m8p0OylmKUMODg0gDj4eeMnmX1x4N31RLSVwkln7H/1Fvj8R W512YECXAWHaH16QzN5ZTKsfezmSLm5Bwu35aowg4B+GUk24gkO08Shk08XB1khM3MrY kYSSpHn2qGoYv0YS0RlktsyKEO7P9paxQDA+heRCJsV6jyv/CJV5SjiohtTwDILFx+Hk fCnrdnXzd40n1fqWZhc9u8jqkTvjotfu+oAWp7qwMcN80iDItGdZKvJJG+Egc2Q0MxG0 gRl2tek/jBcLvQgvKOWQXgBMw4g/so2x4cdWDErPxEIb2pHzEwK/IfF9kNOxFBpWS+ND LfcQ== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=xV0FvDXckg/Rm9WiQfyBAIMQ9C8smLso0ItTDtlZ5aE=; b=Bn+bYbTQbDbIU8NC0oMUwU7OAnVNej4D1bZT+c/T31Y6MNM6J2U18klE8/iUNnd5eR vYMOs22cLvfN30UFE0ldaPso6uh2Q2K6+2n+/EMe2OG/sZm1+nrnb62HrDZ70u3mIEaH QfqILRRDAgVHPiEmy616NH5Rqqn14gEVrlnYMwFncMF7m6AzS8zTu2LZ9b+iwCRfABZA WEeOFDP45v1e9AhFhgH5UxbXQGVcM5AYiop8wWSPcGxu9gvDvmU8z7KL5hTP9zn+u3Qv NVoEmLRQwrIuRUoeFIWv5O9NisiiE5r7AbAaMGABbmzXHb7PBCLbzmo8txvBgo4KjPfq w0EA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=ZyOPZFjJ; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j8-20020a05640211c800b004186d45c920si6050861edw.148.2022.03.15.10.06.23; Tue, 15 Mar 2022 10:06:24 -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=@foxmail.com header.s=s201512 header.b=ZyOPZFjJ; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7501368A8BE; Tue, 15 Mar 2022 19:06:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-240.mail.qq.com (out203-205-221-240.mail.qq.com [203.205.221.240]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C6AC1689F20 for ; Tue, 15 Mar 2022 19:06:10 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1647363966; bh=vJ8Nz3S5QItucFiLGL6S8KPzOu8qSB/QFAYmruVEcOs=; h=From:To:Cc:Subject:Date; b=ZyOPZFjJBU6epUKEAgX3sMoc7LsRNqaTWwEUrN95j0j2ElYdBx6LJwZF5PDzGTyO3 SgPAZmd5Q4PsbxZTRsjlk6hgjVWZ+YOlF4C2AKzyB7TMW+79dABaLNWHIHJUHvZA+N mJD6VKDnIC6jQwWVsMNmpqKhL1jGMQW6meGPxkWQ= Received: from ZHILIZHAO-MB2.tencent.com ([119.123.73.156]) by newxmesmtplogicsvrszc10.qq.com (NewEsmtp) with SMTP id 18422A88; Wed, 16 Mar 2022 01:06:04 +0800 X-QQ-mid: xmsmtpt1647363964t4qqwvlnb Message-ID: X-QQ-XMAILINFO: MyHh0PQai9Fp5ruHIxgeknuRwQaTZeogi5QjytstPBk7vUaqpUKHZz3BoyFv3X OjMZX2dKj3mmxpCU+2w06s2AdTjmvmDVY7MtA3QCVaOuAxpNEWMbE7wDHowVTzswgZaYzl+K9ize W+VR5cFEAhrzkCwnJHuJ9wdXdYSxYS00DDR2usMlLJ+cF67h6PkI/CeXUHmYovkGD6ikJnDvnCYn PyjbceZYbxOldi8cbO1UxtmNepzvN9jVp1gjnMrOKIKDpYXdh1yIMet7nSgrpVAHWomg8v9lvG/l lQ+1vEq+2bFYz3zpWfm72bk5cdgEmL4yvi+CUwOCUOFy6RS2qgO9C0BCVOkoOwFS5OXT6PUIvbnI uZkLzWclS0F9G34s0i4KgXx5v02Qd0Nj+bOVxuhhH7j18dUvdXPgmvQmi2/CWpKggJD/YBXerKAo vzXT9QuCAposThfiTPa+zwu5HiGDoctwRsLq2uIR4kxjUdz0B3TMXNKwn9SMZLedEpoqmVxoUxpA zpoeAk8Wh9g0P+IpiBVcBP44kBHv7O12oZJ620Fk/GF9GF4LfTOEfsx3d+yTfquhQ4oTkrwvmtpJ 5gJtlhf3edJ/EVw8NIMKkKPL6mpPmT+9xNULLyiOsqUJUgZnHQcfutZ4Hvv87p7ivktA+djbaupr vOIpV/zzqUCOBm17+7+4TgWGPy6T6DkB+sWZoFG7rJmZ33lBBaJwTf+IzEOTjUS3JzWbBTmY3Zqb QErW2zbQ8FqtxhQaqDR4x13PcDeiq5xPI1da5JWGmhfeuhLISnIU0o3gImaQ9gxOFEkLE+jNkSTe +PAF32hN5cMRonNLGkJHTyYmg+uIqq0SgmhL7r+h2seIvDJYXmSiH7HTNa+0b/W1yE2K2tv7W7Gp UnXFr8aoHHNbu/QEW0TaN5mKUx8FGrRv5YU86HeuTd From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Mar 2022 01:06:01 +0800 X-OQ-MSGID: <20220315170602.93035-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/hls: add AVFMT_NO_BYTE_SEEK flag 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: VxDZwG6OrTAi After d6ac6650b91, ffplay failed to seek HLS stream with AVSEEK_FLAG_BYTE enabled by default. --- libavformat/hls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 06bc46c23f..affff01529 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2497,7 +2497,7 @@ const AVInputFormat ff_hls_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("Apple HTTP Live Streaming"), .priv_class = &hls_class, .priv_data_size = sizeof(HLSContext), - .flags = AVFMT_NOGENSEARCH | AVFMT_TS_DISCONT, + .flags = AVFMT_NOGENSEARCH | AVFMT_TS_DISCONT | AVFMT_NO_BYTE_SEEK, .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = hls_probe, .read_header = hls_read_header, From patchwork Tue Mar 15 17:06:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 34762 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp3191096nkb; Tue, 15 Mar 2022 10:06:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9m7fyAjFt51ijqZ9RLsQ/FJ3GyPRC8qLM5yRQrrZVpTSmWUA9cKsh3igjdBbJvs/0p06x X-Received: by 2002:a17:906:bc9b:b0:6da:9f90:a56a with SMTP id lv27-20020a170906bc9b00b006da9f90a56amr23860646ejb.575.1647363996924; Tue, 15 Mar 2022 10:06:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647363996; cv=none; d=google.com; s=arc-20160816; b=IdGHh/lnB4+lebPV8aPEn+Rgg9DY4Q+P9mwGXlafFZE01AkgZPBGwfvFPvkM4IPwgd TkxMwomENy+gUm4lYxkgLj3Mcj6/E3vz+uY3P9FEv4Rvlv6DAUkQo4iIsLpJlwTfusU0 WOJu5IFIrVc2rG05R/EA0KkgAEuz6UiNZPiCStSL3Cewi0zZdo8ctVVrfXWAY1YPWauq wZ82/NpBlPrSN6zaPouw/rUMgT9uTy20qbi9aS4Jn5sr1xWHYYq6uqXXL0H+zekLfNKp KFZK04+Y+3+27eTfEGoE7JGMIhb2Htkh998wz8q763kJBgyfiSumD7XqKux6h47SlWTM Jv7g== 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:date :to:from:message-id:dkim-signature:delivered-to; bh=ZJ5zD7BEhOFXr3ggzlwS2/ik2IZe6ytGXuXWDijS3q0=; b=nvFTuY7nT2gAtTq2qsikg+iUnDx+p0zH2iTxd9DhAOtj+XjZOE5xviHXDVpeKNO/va qbDuwHFUKOtypEmvGZm5NKYQbjdN4kcbuXW21bRY/ipZ9kjBbrNRqUKaAmO/9ZkR3Mo0 vYvLJaRhxn/pOsyFC0g7YuOqklBqA+a5Tb4GHYAmvbyb4qL7vDz3b1SOBX6Rc1yAguet tg2tqDfH0bKst0J0gzcQzgxwVb9cc2tCBIXb6rTsG/oRoSzOK+6CGS+yDNDogS8gvztB DBQBA6Luhfl3sIDiwHNQehRpiIAQahNPKR/Fw7GcvUKkhAQb6OL83zeMX1lGwqEfKuBP m6ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=qqEvP1Vs; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v17-20020aa7d651000000b00415fdcd8479si11704954edr.41.2022.03.15.10.06.36; Tue, 15 Mar 2022 10:06:36 -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=@foxmail.com header.s=s201512 header.b=qqEvP1Vs; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6656768A948; Tue, 15 Mar 2022 19:06:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-155.mail.qq.com (out203-205-221-155.mail.qq.com [203.205.221.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C964868A800 for ; Tue, 15 Mar 2022 19:06:10 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1647363966; bh=saI0WmwgOBsaeyXgja61xPNK5jgfI/taAdSkHupMjAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qqEvP1VsfBAXxRMqcgI+Yy8PLHKu7eOunrZzFSQHOPPR4NG+6denF/suxVSXTuVwY 7sKLXzqPkyqpUyUiTznl1Iz5ezMoy6OGEUGIid0lvrVju+ti20AhDzoO/kK1QNSAL5 DOU9yPXaaBbsu3QEM7xTeKcMosMU1Yj4buIJoijY= Received: from ZHILIZHAO-MB2.tencent.com ([119.123.73.156]) by newxmesmtplogicsvrszc10.qq.com (NewEsmtp) with SMTP id 18422A88; Wed, 16 Mar 2022 01:06:04 +0800 X-QQ-mid: xmsmtpt1647363965txpijr18g Message-ID: X-QQ-XMAILINFO: Mdc3TkmnJyI/gWoPS+v3+Qznw7jv72/V/Txa4GxoeeYbRR6TZx3hUzRfJTwRJv yHKs8rf8uE8URWW901GNF8LIwLpzrEVAYDjPH7r/jtlJzJEUQ5ytFL1ioCCQ1Bs2UXfMkL4IY92r K+I9jY3PAyhNhZe93lc5xof0o9T5qxGMxAtUzXNlTE5ONPAJKP005pUCOgKUNHwwvLzbDIo8mzN0 2a+bfsGJw0IAxOxsHGN1ArBNMLn/5S39Tak+w+zCRsEj5FbSJxTt4YXxUgDrH0Mrjlbj8B63QTnV rxO/l35bor8CqTLE5fgc+bfb7BlAHmDy8qKIPLXBUMG5Y3BWA3ILgiuv0VQq8K2yMMKqZtbbhfCI WkIN1qCNMo5kufiY15ZmZbquZP4w1YhoPfeG5dW1/NC/pp598pieYGrMd+t1ambQJ4uoAF6NCcPT W4v+0VxZF+vDubeJOpdvpb0Jw9+dsdzOFktUDBrToAUtPY4vTYzr2TbQsaAN9r82IpjfbqpVx9r3 R7CDoTuEvpxWm0hmeRAY2NM/AABFl4wdkurRbyi1UoiWEhir4KrMbpZ/8Do90CX/IfwL7RtZ11M3 Nsj6/AdTqZkUernuWhflTnM1e3unEXhS07hzZcoU7A83WGE5D+3Rf9TX1WpBDZcTmfef0deUguUa BYypbGu2L964ZyyqLo2/l8QT0f3sVnIykRP7R2/vVJFl10aRJuBNUW2zzWNfKpsoJXRdFe9Du9RI 5bCb64icwtDWJxlEKt6iSV3Ppyclmy1GpzJ6pPhdpWu6VdinT+DcqNic08VOGifThsA0peDuivi2 xBmpEoH0EUKb6S/ZHiF8jlcZvAUl20JzN84UmEtEnUlc/wJtfJMS+cxEFMOgbMipqSqMcQ6OiV37 MIbkGeC0hIxfWkTTCvAT/mnYWv30rRJV605h6YYOXDLIedV1ugEz+A5pxriFvxXjRULyTsh4u8 From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Mar 2022 01:06:02 +0800 X-OQ-MSGID: <20220315170602.93035-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220315170602.93035-1-quinkblack@foxmail.com> References: <20220315170602.93035-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] ffplay: check AVFMT_NO_BYTE_SEEK flag for seek_by_bytes 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Mo7UzpH2HZ/C --- fftools/ffplay.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 92ad7ce1a6..80678cfbb5 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -2819,7 +2819,9 @@ static int read_thread(void *arg) ic->pb->eof_reached = 0; // FIXME hack, ffplay maybe should not use avio_feof() to test for the end if (seek_by_bytes < 0) - seek_by_bytes = !!(ic->iformat->flags & AVFMT_TS_DISCONT) && strcmp("ogg", ic->iformat->name); + seek_by_bytes = !(ic->iformat->flags & AVFMT_NO_BYTE_SEEK) && + !!(ic->iformat->flags & AVFMT_TS_DISCONT) && + strcmp("ogg", ic->iformat->name); is->max_frame_duration = (ic->iformat->flags & AVFMT_TS_DISCONT) ? 10.0 : 3600.0;