From patchwork Tue Apr 24 20:59:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 8637 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2282520jad; Tue, 24 Apr 2018 13:59:49 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/nM6JuL0bpF29rTFSUArulcgqbbUxvseCRI7LmbW5gVwPEBUOr6AbMsWj+TKtAvbHfcmS7 X-Received: by 10.28.168.201 with SMTP id r192mr13803365wme.134.1524603589608; Tue, 24 Apr 2018 13:59:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524603589; cv=none; d=google.com; s=arc-20160816; b=b8bOzfpHC29NRa+vqa5x73g+oWoL4hd66z1NEQ9EP3mGEewGjCYFQD+SPP2DSSxb7W wO2Q7csO2zIUdMcTtvY6iw8b7PYAIxghFE8ll1IBAiRwvVYJOOZeWhmT1bua4TMVmciU wXBw9CgwLz6pp4KgDzoKikaQGbAQgla+UN17v1nH6MoclHHOWi395OJ4T5D7dq/lZWHd 9nvilqaBm1cVjYUkNppN9SZguz+egXeFpAK64cpjUQ3nWEEz6nz4MOVQHPVLvOwTRd83 8l1oK7t3mJ26BnxmDkhsSWnQas0J5ohI55aRGBr28bOBxicXd+QjNI+AjO2tkoiEaeHD Oq5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=G4zRjfeqbObyjFrkMzSzal2LDTRdOLwCGXhnZH9VZUs=; b=wY7qk0NKAaP+puxx1pZUxsyx+rfe4wfJSgNKnlEvzgUieav42NM2VGmPPQKKW0eGLx LwuqbrbYb2eUJ/GrRuFBmTssOfUBIQNfzfyeSJju8p9A1N7jv/nvPwgm6RH3nWNpOgwx Q+DFm1aafpqd8drijlG7EQxeXRN26/M/GN90hhd0BbCYbuaUcax5FNnx9qj5J2z7w/HW F2Bo0dZO5lxjyTw/X5nAaJHcJwBJPE6ITsfbAw6S9afeAlDtaJATDgg1aNfJE6cTkDaJ sEvgI4tkXgzMU8u0k4WB1VqRdqHG7M8fr3H4TiJ6XJVxQXjCMpMKR/Q/aZEakwlx+GVx Xw2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=rqLLnl+v; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t128si7385661wmt.124.2018.04.24.13.59.49; Tue, 24 Apr 2018 13:59:49 -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=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=rqLLnl+v; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 61521689ED3; Tue, 24 Apr 2018 23:59:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BFF6689B4A for ; Tue, 24 Apr 2018 23:59:03 +0300 (EEST) Received: by mail-pg0-f68.google.com with SMTP id e9so11731386pgr.7 for ; Tue, 24 Apr 2018 13:59:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=VPZbF7/8gzhCjlDMAljKLwvb6fyfd6+583yj829LJNU=; b=rqLLnl+vJh6arwc4pauP/AaC7rJA/0Vh8o0FP/bAEhc0J1MhvQeKCdgX98YIbVVzev XsP4B1A3ua0fcKtQKPmrnmGC426F0IMq0lhq5rLbgjlnJJ+vR5Ir251byOtJN9Rt69mJ hcuG+yzBePtQlYGeMVyJB39JXls3Zt79UFARsRp4qZ6Gq/TTA0fMsbQuwMnzgJQgwbeZ LR/DW/QIlgvxYRW/8Cs+/aERvpLBVwao0/Lxn6tPaamGUVdk8tCXKclodCbHF9nNU9RA CG5kJQpdo99TnB8Yz1g59QexTQDmMb4DKoPWHu4Eq75j2xZBIVWWh1OkJb+Tuf4Ah7aM J4fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=VPZbF7/8gzhCjlDMAljKLwvb6fyfd6+583yj829LJNU=; b=Zr4QjAFMaHHHjrjUEo/YR5ZUpPSu0rqpdqAk2W2JPzQRLKJc+sKxw8jvpsN6yw57a8 vTjwT9jq3RNuxtA7RitiBX7xmVsRPfy3DXfOr4gPSEM12N02cT9EhY5iEYF8+JL1zWrT 4ZKjHyz2Pd8P5q2WplmQ0CTUqYF840dxzHcuHYviHvGpgjCqatpV2AHjoSoLG1i2/slC FyEdYrCcTdhwI235s7idWG1r/h00W4ftxndC+S05Bq3HnnHTv7mABN7wEqi0hqkAILeF f6WnAc0RxkMXZmz1ud5MZjH6e8UG2N43L6Sf2eNo/B7N7+hRwGrJZB5vXP9zzQuNm9+U Ex7w== X-Gm-Message-State: ALQs6tBfxU/WAE7RhDwvhq23FD904IkGJzQhOQlFlgT5oMauOmqEC1dG o7FzPEuobDaYpEAnb73zZtr+668F X-Received: by 2002:a17:902:7795:: with SMTP id o21-v6mr25429760pll.8.1524603571355; Tue, 24 Apr 2018 13:59:31 -0700 (PDT) Received: from localhost.localdomain (c-69-181-54-242.hsd1.ca.comcast.net. [69.181.54.242]) by smtp.gmail.com with ESMTPSA id h6sm26184534pfi.35.2018.04.24.13.59.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Apr 2018 13:59:30 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Apr 2018 13:59:24 -0700 Message-Id: <20180424205926.42027-2-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180424205926.42027-1-ffmpeg@tmm1.net> References: <20180424205926.42027-1-ffmpeg@tmm1.net> Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/mediacodecdec: use AV_TIME_BASE_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: matthieu.bouron@gmail.com, Aman Gupta , jeebjp@gmail.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta --- libavcodec/mediacodecdec_common.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/mediacodecdec_common.c b/libavcodec/mediacodecdec_common.c index 0c27624dea..56b3c4fd1e 100644 --- a/libavcodec/mediacodecdec_common.c +++ b/libavcodec/mediacodecdec_common.c @@ -209,7 +209,7 @@ static int mediacodec_wrap_hw_buffer(AVCodecContext *avctx, if (avctx->pkt_timebase.num && avctx->pkt_timebase.den) { frame->pts = av_rescale_q(info->presentationTimeUs, - av_make_q(1, 1000000), + AV_TIME_BASE_Q, avctx->pkt_timebase); } else { frame->pts = info->presentationTimeUs; @@ -298,7 +298,7 @@ static int mediacodec_wrap_sw_buffer(AVCodecContext *avctx, * * 0-sized avpackets are pushed to flush remaining frames at EOS */ if (avctx->pkt_timebase.num && avctx->pkt_timebase.den) { frame->pts = av_rescale_q(info->presentationTimeUs, - av_make_q(1, 1000000), + AV_TIME_BASE_Q, avctx->pkt_timebase); } else { frame->pts = info->presentationTimeUs; @@ -610,7 +610,7 @@ int ff_mediacodec_dec_send(AVCodecContext *avctx, MediaCodecDecContext *s, uint32_t flags = ff_AMediaCodec_getBufferFlagEndOfStream(codec); if (s->surface) { - pts = av_rescale_q(pts, avctx->pkt_timebase, av_make_q(1, 1000000)); + pts = av_rescale_q(pts, avctx->pkt_timebase, AV_TIME_BASE_Q); } av_log(avctx, AV_LOG_DEBUG, "Sending End Of Stream signal\n"); @@ -634,7 +634,7 @@ int ff_mediacodec_dec_send(AVCodecContext *avctx, MediaCodecDecContext *s, offset += size; if (avctx->pkt_timebase.num && avctx->pkt_timebase.den) { - pts = av_rescale_q(pts, avctx->pkt_timebase, av_make_q(1, 1000000)); + pts = av_rescale_q(pts, avctx->pkt_timebase, AV_TIME_BASE_Q); } status = ff_AMediaCodec_queueInputBuffer(codec, index, 0, size, pts, 0);