From patchwork Fri Sep 28 09:52:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: He Lei X-Patchwork-Id: 10511 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:1286:0:0:0:0:0 with SMTP id 6-v6csp536476jap; Fri, 28 Sep 2018 02:52:53 -0700 (PDT) X-Google-Smtp-Source: ACcGV62vIwSehVhlSNsOzZBAVwiP5fbCSCOsMUGFjJa78b/ztrj/3+MiIwzilpV2GjRTunu2/VSU X-Received: by 2002:a1c:1694:: with SMTP id 142-v6mr1178269wmw.113.1538128373671; Fri, 28 Sep 2018 02:52:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538128373; cv=none; d=google.com; s=arc-20160816; b=EH3GShTYH8dLJjeOJZ1W8PfRRQxXDhDafkTB1IdFIeLtB0/v5bkUUdAfhQnqxyf5vF S0pO0/3WpetjA9WeQ1Uyf7EnjrTSB806f/zXtxRJDgo1kFqa1mm77Mp0acp1cXR+bOZk HCryKQ5nK0VW34t/6C1k5hH+Ho2AFmOc1lbE/PnI6cu4m/u6Wf3b5K8/HLaU15r/swAf Lb13Zd3U3ujZ6K8/mFLKZRczKPpT4DiZ4q26ca1VFxapUTIQnC8d2dArh0OLq3T+sjw6 Hbk6Tj9kwl30INSIfF1UPzYChIrgMjwwTtZ79YZmwy0HAGd3NwaYOg2BBV6wf3//r97u 5gNw== 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:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:to:from:dkim-signature:delivered-to; bh=uzL1mvqUHXMaTaS+UzZsAkqyujvdFEe72FNMi4oZXb0=; b=m8LGbF8fzTKHQMwpK5ZiTeKa3/t9H3jAhtCDd77DZDX6jAbOshIWn4cui2/bXZVaYD G+nGfkuMB8818WeDfvU7L1e8zXpSytfJkAG7jnSJ7Rahp2U7Cnx3ghyQvCS4wBtrW2I2 016dJwMjDUdbFfanZ/P7Zj03u7EbB1YoLnmcCHo3MbCgBQKgbyZuEqhg7oN9L6S6xuve njWqhQAkkKMenBFeo5ggCy2cDTPKi5ovz95f00sauo/EZOsposdPI1UGOSleJVn6r69w TEZBDYgaaay9IS2Mv2msgtL90UrB7AMPEi2WPLqUCO6c8Tk9BWQ9MdlZg51sUe9XEL8L bfMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=pQV8zLsU; 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=hotmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i9-v6si1250747wmb.67.2018.09.28.02.52.52; Fri, 28 Sep 2018 02:52:53 -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=@hotmail.com header.s=selector1 header.b=pQV8zLsU; 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=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C598E68A561; Fri, 28 Sep 2018 12:52:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-HK2-obe.outbound.protection.outlook.com (mail-oln040092255068.outbound.protection.outlook.com [40.92.255.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FAF968A107 for ; Fri, 28 Sep 2018 12:52:26 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A5BjcaY25Rl6jJQ4NHNWRmkeGxxKc8BOrWsvgBQZH2Y=; b=pQV8zLsUy6teVeaR4yWO8XSw/VfzFrceZao52iLfWhfZ5375HSue/DOw8RXj1dk3eqD2ol9+z/Nakl7fQ969xsHKkwaqWTH0nsybEa1+ngtu+kFVH1fuQ76Pm+1Wa5xD5sBV/eiB3tu5ojrzmUmTmhiLEeImzDV7sBAxowxr16m20iSCaDqaKIrAqVI5y6uEpZ//CE8/BtPgWFzpfyJ0WxHoYjG8omf0PoUGp8Gv6By3WsOtO2z67z6/tzpZM0JrZ0R5Z2o0Ex8GBiyiWl3LxYlLy0F8xqK/aDiMfkSgxgF3zWUBLp+fl7W/y85+R4dHMmLV+VffKsMHX5SfoN/obQ== Received: from HK2APC01FT064.eop-APC01.prod.protection.outlook.com (10.152.248.55) by HK2APC01HT134.eop-APC01.prod.protection.outlook.com (10.152.248.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.1185.13; Fri, 28 Sep 2018 09:52:39 +0000 Received: from TY2PR03MB3632.apcprd03.prod.outlook.com (10.152.248.55) by HK2APC01FT064.mail.protection.outlook.com (10.152.249.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.1185.13 via Frontend Transport; Fri, 28 Sep 2018 09:52:39 +0000 Received: from TY2PR03MB3632.apcprd03.prod.outlook.com ([fe80::9409:e2ac:75f9:83e7]) by TY2PR03MB3632.apcprd03.prod.outlook.com ([fe80::9409:e2ac:75f9:83e7%2]) with mapi id 15.20.1185.022; Fri, 28 Sep 2018 09:52:39 +0000 From: He Lei To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] avformat/hls.c:If custom IO is used, Don`t keepalive. Thread-Index: AQHUVYY/YDuFa/biKkqA0fDZyGh9C6UD972AgAF++gA= Date: Fri, 28 Sep 2018 09:52:39 +0000 Message-ID: References: In-Reply-To: Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: SG2PR02CA0060.apcprd02.prod.outlook.com (2603:1096:4:54::24) To TY2PR03MB3632.apcprd03.prod.outlook.com (2603:1096:404:3b::10) x-incomingtopheadermarker: OriginalChecksum:5571E1F3D3DC89D4AD90B9575A743C0DB3F160CEB741C1991E12C16EB7E911EC; UpperCasedChecksum:FD9DAF0B66E1136CC9A4BA605DCB85610AD8838C784DC5D88FCD111A75D90CA4; SizeAsReceived:7528; Count:50 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [aPnWaFCyfGddzO/nuHEmQlMwge0PHZ9T] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; HK2APC01HT134; 6:B1JYybhETqc+gSDKBnL4MdqY7N4wVTUPebcNad6TRSAUQHhkepiNuj61ozb/0MZEAbpVZnPippqKtTx/MNj/kb2YLobsTjl3lC+HwxiPDi/ghN3MNjme2WXD3+Xw6m5okRe88WUwtQC6zA21JdoyNSBJIRW7xsgrBCRj3igc6IAxu9uYHSmR0NehsJFtvvcJsVhrso6UTE2rcThr1nyzPkwecUi1Jf/fKGsKrlQz1QWKhVqU22+eY9TngqPPNmil7wRxPg5x+bq7cKIjoRBrmUZ7Zw3y5b/tj3lDvnnbL0Jras0H305egKrTo7brH349lorKS4lN1ejP5FRB1VHWD/DC7VBlIIffsJXQSLqUI6iVGpvUbXEygUpNIXp0Fqvp3KzeuYBPbVDl7Tfxxv6I3qrDhszUGCK7p1Lx3qDvrJ2/bVaUeoBUHcgKXVtCbnF0lSxshKlbay8znHrTpEzr+Q==; 5:8fKfzXnxZ6mvRMXgTHESSgkRDeDidnHPVcldwp7u4WSykUFiqNtEXlKvA5J2ag4sEEavHe9mZmpD48LSyQnCnIZ5i5sTI6J7gqgopuVbFNxgPRGSM3Zi7BHTCkxKHE3tH5LS98jUs32YsWhn+8vOgHfARxjmWkyflBnA1vVxTOA=; 7:u+CuTvvUEBJhWSt04quGo6/y/WVpJkrIt4sULqmCUVny0nWQ6/XppM3tN2awY9HSj2tOZoFQ/qI18atFwyWoYq+ihtX/d1cJVqqeC2CqLTScqM2SB5p9dj5+2ArNjSRVcA5ryKsQYQN7KwuBmVQv65qIrMpyNghdEYVP19AOUBTr5LNS5JqMgkt3+xrH7HHBB69nOjoRW+sb3zlINhjbqR7SCyKMDQDX0ZJ6mdBs6Q4VRgbSwN95JsE9wC7/xaAU x-incomingheadercount: 50 x-eopattributedmessage: 0 x-ms-exchange-slblob-mailprops: +LiGfBxqLEseEjQdJGWjvP2I3CkskqOqc9FU5VMy6n2fac+yR7cNPvDCKfbPbLX43msu2mjDZLjehl3iQCioh06mJpvPkEPbw1k3sLrFChR0hvJfsj63fbTVIbMH9VL3nCtf4FSxx7ox9bR9c868bj8rlL3JBfN/H7NgziRUXCm7izFhlNNSnHyObhsLQhUzh29Pi5JARKmCBKFKjxVSUZG14g63OmT5bo4iAr3QujncxFETVJmDMLAowf1Y+5GGGUcJqziEb0UBzOwvGKs1ZsKon1TaOBwP/ZJDc9UBFilRYTbkQhfHFjSbalt+ci0fdnxokdOVT4zDtHfklspkrd18FykoL5V6XpEuCX219M+r87qVwgUWyDgW0HVcN7k8MRqg+k1x+2GQfdjVviYH66fbZTtGmbwTqUAo6y/lylzPcDSU9+hBY/ANKdooggmk6iT91f85NI6R++zg9rvQPWiI8gec4Ds93JygQQi/8yQKitk6LxjbXoHzMUYAAAj+hUEVraHthiDCDJ2/rOEz9lPj4BCCBwCVEuzFeI//+94THOe/29edI88Qka7DJ8FLFroNz5eiAimC6mc9cqB0bpWcXyTNVXzd4rPFModFwooM91KBv9nOEA8dmwc20pFVU+nmPVl4mprMvn2omZUxPVwHuLwqvK4Nri3nFXHKaxlIBfePdERCerSD2RqO9XOgI0qLywTzayoXj6lO6QRrhkR9baCAw3kytyC183S98tnvqsw0Krl+gDirO6JT8d+7skXa+RtQFfFVB2dsNDUOr6bdWSMHvcHu x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(201702181274)(2017031322404)(1603101475)(1601125500)(1701031045); SRVR:HK2APC01HT134; x-ms-traffictypediagnostic: HK2APC01HT134: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(4566010)(82015058); SRVR:HK2APC01HT134; BCL:0; PCL:0; RULEID:; SRVR:HK2APC01HT134; x-forefront-prvs: 0809C12563 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(199004)(189003)(305945005)(74316002)(56003)(76176011)(83332001)(39060400002)(105586002)(99286004)(25786009)(106356001)(2351001)(71190400001)(71200400001)(14444005)(73972006)(256004)(104016004)(86362001)(9686003)(6436002)(55016002)(14454004)(58002004)(5640700003)(7696005)(8676002)(486006)(81156014)(33656002)(2900100001)(446003)(2501003)(70282004)(102836004)(5250100002)(8936002)(87572001)(20460500001)(4326008)(5660300001)(6916009)(11346002)(97736004)(6506007)(68736007)(26005)(476003)(82202002)(386003)(1857600001)(34290500001)(6346003)(15852004)(81973001); DIR:OUT; SFP:1901; SCL:1; SRVR:HK2APC01HT134; H:TY2PR03MB3632.apcprd03.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: hotmail.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=helei0908@hotmail.com; x-microsoft-antispam-message-info: +frbkXpM+6x/Xe8mcgQ1ZneOCHo1u2V+9ZQfZNP3ZpsSg8MnltR78XZyQ7/D7/S8zEIPUNrQ5/gtr10WsAvoBqpiXCkQY6aEReD4v3lyIGvbApM/U4XA+kwtxNu8DDfHNQzDfhWQvFZSk1TKnf0n54/yqiMgq+3VRw7XVWhRaZW9Ojr7sYqKH0u/SJ8C7M3MrmtWAHR/RClApBrCWB7inGd86Vd6oQkA457vAGZYqpU= MIME-Version: 1.0 X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 24fd1209-d934-423e-a578-ee886993c07f X-MS-Exchange-CrossTenant-Network-Message-Id: ad12e3a4-8826-4791-8415-08d625282019 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 24fd1209-d934-423e-a578-ee886993c07f X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Sep 2018 09:52:39.1379 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2APC01HT134 Subject: [FFmpeg-devel] [PATCH] avformat/hls.c:If custom IO is used, Don`t keepalive. 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: He Lei Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Because, the URLContext of the aviocontext is null when custom IO is used, If keepalive, that will cause the assertion to fail. Signed-off-by: Lei He --- libavformat/hls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 8ad08baaed..b7a11939bc 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -651,7 +651,7 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url, else if (strcmp(proto_name, "file") || !strncmp(url, "file,", 5)) return AVERROR_INVALIDDATA; - if (is_http && c->http_persistent && *pb) { + if (!(s->flags & AVFMT_FLAG_CUSTOM_IO) && is_http && c->http_persistent && *pb) { ret = open_url_keepalive(c->ctx, pb, url); if (ret == AVERROR_EXIT) { return ret;