From patchwork Thu Nov 3 00:12:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1266 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp534788vsb; Wed, 2 Nov 2016 17:12:15 -0700 (PDT) X-Received: by 10.28.58.14 with SMTP id h14mr5277691wma.7.1478131934933; Wed, 02 Nov 2016 17:12:14 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fu10si5790322wjc.118.2016.11.02.17.12.14; Wed, 02 Nov 2016 17:12:14 -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=@googlemail.com; 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=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 29785689AE5; Thu, 3 Nov 2016 02:12:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C77D16899BE for ; Thu, 3 Nov 2016 02:12:02 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id c17so5374136wmc.3 for ; Wed, 02 Nov 2016 17:12:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=tZsnVGZafVQKkYAx2uv/TGqHPIUH1fgM3QWaMHFLGmM=; b=RafIC9TJZI42/ZmxsPIxIVRCPnuSZKqul0cCURLcco6qf/7R2fiEp7LeWh3jRmg099 X1K8ZAcN0OeWOnHYLZFs1U7/HyRE9gftY6eL6KPXHhZkZXlHvZGnay/obqhfVXsXM0BN wFfO85GXrYOsKYl7jNn3h9W9CBUV6IR4NkhdC7yT+SajrsqhONhU2Bq3p3WbQepMctKa atIb7t7hylw3MgtebX/fRkn8vrCfLGmxjZ/BO/zw/WIfz16UyalWSOcJidOUROIr61QY 3Bn87WD/Xh32dTIB71z+PECyVPfpKQCUTngtbzbVsmsSUb+MmXKC1XJ1JHgpJbUOM2+0 u/wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=tZsnVGZafVQKkYAx2uv/TGqHPIUH1fgM3QWaMHFLGmM=; b=FiZ7W0phyyDHimIooMeXJOnt9Zbq6p2SfQwUfQ5hntWu2Q2wgezKAGMU2r29yupKkN /rQBKSTgTkFR5gvYjQRxlB9sU7Xnd1lBauesZclzcw+rN7nAVvaePDPFlhUvXRrZTZ5/ wQQl6zHtLbrrvJqe78KmR2dQ6NEOuwGK+I+P18Tlj9nErfRU0FV7+iU3CV3lmlLmrKf/ XkeVRchd8ZCD6cu1bQZn5LySaZcj+miCxZpSUhAJPwiKzgx4hWtepqO9IYLPajxpB2GK J5WmsyRSoi/M4Ieh+91BviBS5DNXZv583P4dROwNp78/pooqMeEwRT6eDWWbkMfrAzTN 58VQ== X-Gm-Message-State: ABUngvfhh0PW3KhwcYnmdz+TXO8Gredtth7xG3in9UUSYzwFYMVwR9V1dBBj4PDZ3pusUg== X-Received: by 10.194.137.168 with SMTP id qj8mr4927282wjb.146.1478131925368; Wed, 02 Nov 2016 17:12:05 -0700 (PDT) Received: from [192.168.2.21] (p5B0722EB.dip0.t-ipconnect.de. [91.7.34.235]) by smtp.googlemail.com with ESMTPSA id f76sm5652800wmd.15.2016.11.02.17.12.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Nov 2016 17:12:04 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <79cd7384-b356-914a-1f43-655d46023aff@googlemail.com> Date: Thu, 3 Nov 2016 01:12:03 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] hls: call avformat_find_stream_info for mpegts subdemuxer 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This fixes probing dts/eac3/mp2 in hls. The problem was introduced in commit 04964ac311abe670fb3b60290a330f2067544b13. Also update the fate reference for the fate-segment-mp4-to-ts test. Signed-off-by: Andreas Cadhalpun --- I've no idea why the fate reference changes, but this also happens when partially/fully reverting commit 04964ac311abe670fb3b60290a330f2067544b13. And it's a very recent fate test... --- libavformat/hls.c | 2 +- tests/ref/fate/segment-mp4-to-ts | 77 +++++++++++++++++++++++++--------------- 2 files changed, 50 insertions(+), 29 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 3c09dd8..543e65c 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1756,7 +1756,7 @@ static int hls_read_header(AVFormatContext *s) * but for other streams we can rely on our user calling avformat_find_stream_info() * on us if they want to. */ - if (pls->is_id3_timestamped) { + if (pls->is_id3_timestamped || av_match_name(in_fmt->name, "mpegts")) { ret = avformat_find_stream_info(pls->ctx, NULL); if (ret < 0) goto fail; diff --git a/tests/ref/fate/segment-mp4-to-ts b/tests/ref/fate/segment-mp4-to-ts index 8513027..acb1199 100644 --- a/tests/ref/fate/segment-mp4-to-ts +++ b/tests/ref/fate/segment-mp4-to-ts @@ -5,34 +5,55 @@ #dimensions 0: 640x360 #sar 0: 1/1 0, -7200, 0, 0, 22630, 0x9b109541, S=1, 1, 0x00e000e0 -0, -3600, 14400, 0, 4021, 0xbf7cdb02, F=0x0, S=1, 1, 0x00e000e0 -0, 0, 7200, 0, 1096, 0x4f162690, F=0x0, S=1, 1, 0x00e000e0 -0, 3600, 3600, 0, 687, 0x00394b95, F=0x0, S=1, 1, 0x00e000e0 -0, 7200, 10800, 0, 445, 0x08c3d065, F=0x0, S=1, 1, 0x00e000e0 -0, 10800, 28800, 0, 4212, 0x56d12b8f, F=0x0, S=1, 1, 0x00e000e0 -0, 14400, 21600, 0, 1117, 0xd521260b, F=0x0, S=1, 1, 0x00e000e0 -0, 18000, 18000, 0, 892, 0x4262bdbc, F=0x0, S=1, 1, 0x00e000e0 -0, 21600, 25200, 0, 480, 0x3be1ef0b, F=0x0, S=1, 1, 0x00e000e0 -0, 25200, 43200, 0, 4065, 0x40dee237, F=0x0, S=1, 1, 0x00e000e0 -0, 28800, 36000, 0, 962, 0x31a4ceb1, F=0x0, S=1, 1, 0x00e000e0 -0, 32400, 32400, 0, 651, 0xb2aa317a, F=0x0, S=1, 1, 0x00e000e0 -0, 36000, 39600, 0, 543, 0x9c4e0024, F=0x0, S=1, 1, 0x00e000e0 -0, 39600, 57600, 0, 4221, 0x77c23977, F=0x0, S=1, 1, 0x00e000e0 -0, 43200, 50400, 0, 1040, 0x482cfa34, F=0x0, S=1, 1, 0x00e000e0 -0, 46800, 46800, 0, 576, 0x2686136a, F=0x0, S=1, 1, 0x00e000e0 -0, 50400, 54000, 0, 607, 0xc53c2339, F=0x0, S=1, 1, 0x00e000e0 -0, 54000, 72000, 0, 4755, 0x2f642b58, F=0x0, S=1, 1, 0x00e000e0 -0, 57600, 64800, 0, 1182, 0xbe1a4847, F=0x0, S=1, 1, 0x00e000e0 -0, 61200, 61200, 0, 809, 0x8d948a4e, F=0x0, S=1, 1, 0x00e000e0 -0, 64800, 68400, 0, 656, 0x4fa03c2b, F=0x0, S=1, 1, 0x00e000e0 -0, 68400, 86400, 0, 26555, 0x5629b584, S=1, 1, 0x00e000e0 -0, 72000, 79200, 0, 1141, 0x761b31e8, F=0x0, S=1, 1, 0x00e000e0 -0, 75600, 75600, 0, 717, 0x57746351, F=0x0, S=1, 1, 0x00e000e0 -0, 79200, 82800, 0, 693, 0x78b24263, F=0x0, S=1, 1, 0x00e000e0 -0, 82800, 100800, 0, 3417, 0x560dbc89, F=0x0, S=1, 1, 0x00e000e0 -0, 86400, 93600, 0, 1128, 0xc0f1383c, F=0x0, S=1, 1, 0x00e000e0 -0, 90000, 90000, 0, 650, 0xc3ad485e, F=0x0, S=1, 1, 0x00e000e0 -0, 93600, 97200, 0, 766, 0xd3e9757d, F=0x0, S=1, 1, 0x00e000e0 +0, -3600, 14400, 3600, 4021, 0xbf7cdb02, F=0x0, S=1, 1, 0x00e000e0 +0, 0, 7200, 3600, 1096, 0x4f162690, F=0x0, S=1, 1, 0x00e000e0 +0, 3600, 3600, 3600, 687, 0x00394b95, F=0x0, S=1, 1, 0x00e000e0 +0, 7200, 10800, 3600, 445, 0x08c3d065, F=0x0, S=1, 1, 0x00e000e0 +0, 10800, 28800, 3600, 4212, 0x56d12b8f, F=0x0, S=1, 1, 0x00e000e0 +0, 14400, 21600, 3600, 1117, 0xd521260b, F=0x0, S=1, 1, 0x00e000e0 +0, 18000, 18000, 3600, 892, 0x4262bdbc, F=0x0, S=1, 1, 0x00e000e0 +0, 21600, 25200, 3600, 480, 0x3be1ef0b, F=0x0, S=1, 1, 0x00e000e0 +0, 25200, 43200, 3600, 4065, 0x40dee237, F=0x0, S=1, 1, 0x00e000e0 +0, 28800, 36000, 3600, 962, 0x31a4ceb1, F=0x0, S=1, 1, 0x00e000e0 +0, 32400, 32400, 3600, 651, 0xb2aa317a, F=0x0, S=1, 1, 0x00e000e0 +0, 36000, 39600, 3600, 543, 0x9c4e0024, F=0x0, S=1, 1, 0x00e000e0 +0, 39600, 57600, 3600, 4221, 0x77c23977, F=0x0, S=1, 1, 0x00e000e0 +0, 43200, 50400, 3600, 1040, 0x482cfa34, F=0x0, S=1, 1, 0x00e000e0 +0, 46800, 46800, 3600, 576, 0x2686136a, F=0x0, S=1, 1, 0x00e000e0 +0, 50400, 54000, 3600, 607, 0xc53c2339, F=0x0, S=1, 1, 0x00e000e0 +0, 54000, 72000, 3600, 4755, 0x2f642b58, F=0x0, S=1, 1, 0x00e000e0 +0, 57600, 64800, 3600, 1182, 0xbe1a4847, F=0x0, S=1, 1, 0x00e000e0 +0, 61200, 61200, 3600, 809, 0x8d948a4e, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 68400, 3600, 656, 0x4fa03c2b, F=0x0 +0, 64800, 64800, 3600, 22630, 0x9b109541, S=1, 1, 0x00e000e0 +0, 64800, 64800, 3600, 4021, 0xbf7cdb02, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 64800, 3600, 1096, 0x4f162690, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 64800, 3600, 687, 0x00394b95, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 64800, 3600, 445, 0x08c3d065, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 64800, 3600, 4212, 0x56d12b8f, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 64800, 3600, 1117, 0xd521260b, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 64800, 3600, 892, 0x4262bdbc, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 64800, 3600, 480, 0x3be1ef0b, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 64800, 3600, 4065, 0x40dee237, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 64800, 3600, 962, 0x31a4ceb1, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 64800, 3600, 651, 0xb2aa317a, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 64800, 3600, 543, 0x9c4e0024, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 64800, 3600, 4221, 0x77c23977, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 64800, 3600, 1040, 0x482cfa34, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 64800, 3600, 576, 0x2686136a, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 64800, 3600, 607, 0xc53c2339, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 72000, 3600, 4755, 0x2f642b58, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 64800, 3600, 1182, 0xbe1a4847, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 64800, 3600, 809, 0x8d948a4e, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 68400, 3600, 656, 0x4fa03c2b, F=0x0, S=1, 1, 0x00e000e0 +0, 68400, 86400, 3600, 26555, 0x5629b584, S=1, 1, 0x00e000e0 +0, 72000, 79200, 3600, 1141, 0x761b31e8, F=0x0, S=1, 1, 0x00e000e0 +0, 75600, 75600, 3600, 717, 0x57746351, F=0x0, S=1, 1, 0x00e000e0 +0, 79200, 82800, 3600, 693, 0x78b24263, F=0x0, S=1, 1, 0x00e000e0 +0, 82800, 100800, 3600, 3417, 0x560dbc89, F=0x0, S=1, 1, 0x00e000e0 +0, 86400, 93600, 3600, 1128, 0xc0f1383c, F=0x0, S=1, 1, 0x00e000e0 +0, 90000, 90000, 3600, 650, 0xc3ad485e, F=0x0, S=1, 1, 0x00e000e0 +0, 93600, 97200, 3600, 766, 0xd3e9757d, F=0x0, S=1, 1, 0x00e000e0 0, 97200, 115200, 3600, 4268, 0xec1235b5, F=0x0, S=1, 1, 0x00e000e0 0, 100800, 108000, 3600, 1119, 0x65f51fb7, F=0x0, S=1, 1, 0x00e000e0 0, 104400, 104400, 3600, 766, 0x213b78d3, F=0x0, S=1, 1, 0x00e000e0