From patchwork Sat Oct 1 18:04:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Landry X-Patchwork-Id: 811 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp832449vsd; Sat, 1 Oct 2016 11:04:53 -0700 (PDT) X-Received: by 10.28.47.87 with SMTP id v84mr2802626wmv.50.1475345093266; Sat, 01 Oct 2016 11:04:53 -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 tq8si26985370wjb.126.2016.10.01.11.04.52; Sat, 01 Oct 2016 11:04: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=@gmail.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=NONE 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 5B58C689E48; Sat, 1 Oct 2016 21:04:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f68.google.com (mail-it0-f68.google.com [209.85.214.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E84A689D04 for ; Sat, 1 Oct 2016 21:04:29 +0300 (EEST) Received: by mail-it0-f68.google.com with SMTP id l13so4908954itl.2 for ; Sat, 01 Oct 2016 11:04:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Fhx1t4xqYfkqWE9tyYeU+2I/zX40nKygpomdTj3gXJ0=; b=u2ZRHInn5G+koxvx46s71M2mkJPG/X6YoBABVUa150ru4b/vYwroIBnT2KdVYiMOt+ XAUrJ8NpPGHOm6BvY/VSOw3y0UKO2IZDdHYoUocc8aOj1Y3vhZbEaHRagDa788OYrnmC wwH80FlaCo/AiV12eY7N907uNjcvQIuTc2qupiONcz2MeGnz3+xL/6yaudgtW6kzZQel j5o+WRgS8rOhzrPZj7mw5R0eUq08eFCaYBaT6/+Ru4KRCgWpIx211VvsfnL6D75P7Qck l1lw4WlW4w1UBmnGW88058YWqHYQbG1DF20qSpVQsX+895ELw9pXAKap/XexUM7DxFAr 14gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Fhx1t4xqYfkqWE9tyYeU+2I/zX40nKygpomdTj3gXJ0=; b=XqhvOm3tsLvdmJGF1Qlj8eqiI3mNNvly2qHwhNuQ6nUlO9XYFa40IKEKwaewwBzZKn BdnyGu2TpqTzwtfGzzW7zTLMEqJ8lhlOcfJSLE43cHZGEvqAFxpBzLKqBf1daB1iZd6L pZdtV8l2nE5TTGmyqfclm8EIJ2mLLoynhSXIw2T6EyI8TJ/4SEkjLppqvLUdPF5kvyLu 7rbL9T3pTfYu6orkT0x8sScZDfdvB2ViTLRAUNjAf8sQjsl4o5uJR/f7uALkjAjOLat+ gLrjA2czzfCS7IJTgYOyi+2XIicPjvKtkCfMTUcLvmhhKuleZRUgM/nxe+qY3uUm4AAB Ho3w== X-Gm-Message-State: AA6/9RnEKnrIhCquyYEYVsIlIowxVet9OR+/HLMMokN4sUDzJoPYQ+pJeZS1UGM8jX+hLw== X-Received: by 10.36.212.132 with SMTP id x126mr10220774itg.34.1475345081246; Sat, 01 Oct 2016 11:04:41 -0700 (PDT) Received: from localhost.localdomain (CPE84948c99c101-CM84948c99c100.cpe.net.cable.rogers.com. [72.137.151.112]) by smtp.gmail.com with ESMTPSA id w143sm924489itc.7.2016.10.01.11.04.40 (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 01 Oct 2016 11:04:40 -0700 (PDT) From: Chris Landry X-Google-Original-From: Chris Landry To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Oct 2016 14:04:29 -0400 Message-Id: <1475345069-71261-1-git-send-email-topher.p.landry@gmail.comm> X-Mailer: git-send-email 2.8.2 In-Reply-To: <20161001102717.GQ4975@nb4> References: <20161001102717.GQ4975@nb4> Subject: [FFmpeg-devel] [PATCH] libavdevice/lavfi.c: adjust subcc_packet->pts to correct timebase with av_rescale_q 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: Chris Landry MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Chris Landry Should have used av_rescale_q to do the timebase adjustment. Fixed compiler warning for variable declaration. Signed-off-by: Chris Landry --- libavdevice/lavfi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index ffe5e0e..89979db 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -364,6 +364,7 @@ static int create_subcc_packet(AVFormatContext *avctx, AVFrame *frame, LavfiContext *lavfi = avctx->priv_data; AVFrameSideData *sd; int stream_idx, i, ret; + int64_t pts; if ((stream_idx = lavfi->sink_stream_subcc_map[sink_idx]) < 0) return 0; @@ -377,10 +378,7 @@ static int create_subcc_packet(AVFormatContext *avctx, AVFrame *frame, return ret; memcpy(lavfi->subcc_packet.data, sd->data, sd->size); - AVRational time_base = lavfi->video_time_base; - - double adjust_factor = time_base.den / (90000.0 * time_base.num); - double pts = frame->pts / adjust_factor; + pts = av_rescale_q(frame->pts, lavfi->video_time_base, (AVRational){1, 90000}); lavfi->subcc_packet.stream_index = stream_idx; lavfi->subcc_packet.pts = (int64_t)pts;