From patchwork Wed Nov 30 01:28:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1609 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp121161vsa; Tue, 29 Nov 2016 17:29:06 -0800 (PST) X-Received: by 10.28.62.77 with SMTP id l74mr25221157wma.37.1480469346598; Tue, 29 Nov 2016 17:29:06 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 140si4843610wmk.98.2016.11.29.17.29.06; Tue, 29 Nov 2016 17:29:06 -0800 (PST) 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 30763689E21; Wed, 30 Nov 2016 03:28:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wj0-f194.google.com (mail-wj0-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B90F689DBA for ; Wed, 30 Nov 2016 03:28:51 +0200 (EET) Received: by mail-wj0-f194.google.com with SMTP id he10so6064186wjc.2 for ; Tue, 29 Nov 2016 17:28:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:subject:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=+Lc77DF2bLSDNIylud864YjUuRYv6JVhrcojEeFqewc=; b=bD/KW1jnLCFDw5anTdSfGFTCUMtBAWCM0fPRX4RFIbSoWUYbPFnOE4CFkbRzUqDl2Z Y8cagfeYBt6HzTRV1Bk6gqXIzKeqI1KZxYB6vxDfg4JYZgus6ox745H2d+f/JV2pqw5s 5jgA2LAYbHA79WSES+fVXefzEkj5ewhLl1zvuDKScrW/X+6RAj9x0i8uaANVbLjTPcVn 5FBcRdJERZAds7T59j1cPNORnC6X9+9uJQaG9ElnRLDGcaLZoj60o7XWl5yteWZWo4P1 ojFbGc0seGilsjSz5I9GMfcqgDm2VtEOlWlj+5hD8RhM1eIdqW+9achjVwNrIO1P4jq1 XgGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=+Lc77DF2bLSDNIylud864YjUuRYv6JVhrcojEeFqewc=; b=T7EYx7DjcqAkowB6C1ny+j88qUzEkTSLBIJ/KJaovNMilu9Y40M7w38uKUQKP1UyOl Y2Xd09MuTCCqKD+AjItzl7g0X5ifL57Af0JAFHXrL317OTsJS4UIRnW+HqWyFt5Fde4f GmRvus4uMoiKCj7nd9WFXhhI8mbMfTTHuMVpT/IG6zTobWpFFtQFSGh6Are06WYS6EiD K/q1X8RIEszro/+kwZ8kvfcfCLSbYjAIVQiZH2LvN/PysboQAHiK5PZxJ5FOTGlw4CMI l4B68xxCiCj/D6ob2HmDu4W9RKUlgQRdXCholNHZKQ/4lSHXrO2+vKE21XN5ioFqBz+Z 3o0Q== X-Gm-Message-State: AKaTC032r7zOnVoOjyBVuDJauTVhxiHB9oSMUq1BdeDxTs55G7K9Q/Ltm7qGuUfgAyNaqg== X-Received: by 10.194.52.8 with SMTP id p8mr25542313wjo.38.1480469337388; Tue, 29 Nov 2016 17:28:57 -0800 (PST) Received: from [192.168.2.21] (p5B072CA2.dip0.t-ipconnect.de. [91.7.44.162]) by smtp.googlemail.com with ESMTPSA id i15sm70354206wjs.16.2016.11.29.17.28.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Nov 2016 17:28:56 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches References: <3d7233eb-5e4c-40dd-ac75-7f1981064872@googlemail.com> Message-ID: <90c975b0-de30-40d5-b11e-c1e99cd43bf3@googlemail.com> Date: Wed, 30 Nov 2016 02:28:56 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: <3d7233eb-5e4c-40dd-ac75-7f1981064872@googlemail.com> Subject: [FFmpeg-devel] [PATCH 3/3] ffserver: use codec time_base for stream 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 producing swf and rm files as done by ffservertest. Signed-off-by: Andreas Cadhalpun --- ffserver.c | 2 +- tests/ffserver.regression.ref | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ffserver.c b/ffserver.c index 20f5995..ffd75d4 100644 --- a/ffserver.c +++ b/ffserver.c @@ -3529,7 +3529,7 @@ static LayeredAVStream *add_av_stream1(FFServerStream *stream, //NOTE we previously allocated internal & internal->avctx, these seemed uneeded though fst->codecpar = avcodec_parameters_alloc(); fst->index = stream->nb_streams; - fst->time_base = (AVRational) {1, 90000}; + fst->time_base = codec->time_base; fst->pts_wrap_bits = 33; fst->sample_aspect_ratio = codec->sample_aspect_ratio; stream->streams[stream->nb_streams++] = fst; diff --git a/tests/ffserver.regression.ref b/tests/ffserver.regression.ref index ec7b37c..f796b50 100644 --- a/tests/ffserver.regression.ref +++ b/tests/ffserver.regression.ref @@ -1,11 +1,11 @@ 233020d119085ba47535d5f2faf73cc0 *ff-test_h.avi 431b75d1f12cb039acebad61a3d39225 *ff-test_l.avi -d41d8cd98f00b204e9800998ecf8427e *ff-test.swf +a767dbdf5d1bded3450279f812f97b37 *ff-test.swf dc16f607e13328a832e73801cd21ec98 *ff-test_h.asf 69337d6c8cd7ac7e626338decdbf41d3 *ff-test_l.asf -d41d8cd98f00b204e9800998ecf8427e *ff-test_h.rm -d41d8cd98f00b204e9800998ecf8427e *ff-test_l.rm +06f5a6a4c5d1c6735f4d0068e825c91f *ff-test_h.rm +1f57580f02f0317407b3b82a3d5e093f *ff-test_l.rm 4c887dfc1dd0f6ea1a3a2be6dd32e495 *ff-test.jpg 1d04b73b04aad27793cc762d5afabac1 *ff-test_small.jpg bc36c40ee34ebee6ffe50f3094aab733 *ff-test.mjpg -9b72c3d6d89a038fa141fe636baa2c0e *ff-stat +db129c1b1b7fd55e101591392ba88854 *ff-stat