From patchwork Mon Dec 18 01:41:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 6849 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp2150538jah; Sun, 17 Dec 2017 17:48:07 -0800 (PST) X-Google-Smtp-Source: ACJfBou+wFzVakTjQeQzElk4L5tBTD8C720tcvKfUdQUy2N8Dw4ggkLOUG3ZI5vw5KjMCiRXJoI/ X-Received: by 10.28.131.73 with SMTP id f70mr11323707wmd.137.1513561687232; Sun, 17 Dec 2017 17:48:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513561687; cv=none; d=google.com; s=arc-20160816; b=Xvzz5DJGLWUy9cATGI6ps2xsf8/vcJ/3uPchjXH7QAPLwupgi9J2pNMtdrWLFcF4ws 8wFopd9gNilgfgEDQY0gW1qLNYLs4gXgdJo/lc1+5PeU9KGt9o9udMQcjeEtm9hpqaB6 IbP/bAAQFVxOcI2083cnwtp8vSMxCeh9Fv7f2+3kaEFBAOB7qqDodX7Iar4hssTkKkyu B5yIlqgv/0grL4Z/8JO1TBJEedx13rsBdq/2cGqx9foPmemOZMBuQayvt8uWo/wfv+ut iPQOppbf86Tc5a76t4Mrv9aSov2JWikD3LBNIF01fN02QlXiAx9yzeW7krRjvUJIRGs5 LIcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=YLau2fotuttArIqcDkplnehXXUr2ErhjHdMU6vl+l0o=; b=Bv69gGnfUrs+Aj0rY03NIlM4dRDhFmIqDCjYbnhGWPxLJ2a/SrJeFWg1ZRgCBeQoPX VqXCQvFVyISsKbzvJ5W8eixyeOWfVrYs0ZATsy61IO8VCPLdHwwAWDtEnzM2RsrAOZg+ iwvDdrZWY9JWT9IdOUogK8GvvFZnLJrsl6PKFnP4f0qiYKajByvHteE5yhVh6wARU5u7 Ux2yQOALtTsYUUfSCdFMVQrIy1nts0OQQHhgFLtax17G/RU6jpBQEQ2JC6ZodidGJcX+ Mf8DLFFZ+/jb8sJzyF+Vvp3tgoWBZqtwXHfXd5lKEstkqOZbvYXnRlPpbH6gz7UiyZkn fz+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=e77ZkEzT; 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=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w93si9257166wrb.231.2017.12.17.17.48.06; Sun, 17 Dec 2017 17:48:07 -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=@gmail.com header.s=20161025 header.b=e77ZkEzT; 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=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 3C5B8689C12; Mon, 18 Dec 2017 03:47:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f50.google.com (mail-pg0-f50.google.com [74.125.83.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 98979689B97 for ; Mon, 18 Dec 2017 03:47:54 +0200 (EET) Received: by mail-pg0-f50.google.com with SMTP id b18so8561742pgv.10 for ; Sun, 17 Dec 2017 17:48:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=XrdjMXWofibRQ++HTYpxVlDqRCWxN5Ju9vjxrqG+c+Y=; b=e77ZkEzT+umPeJgxgN2eVE9l6OEVH3Fu7FkKmwH29S78S4NgXBPHJl7mnr4596Ngdq 1XAUuG/k8Ey4cqS5bwhVKEJt49O2huDvXH7EONXq3wFykyCwAiWMoWnypRo3xYvef+cu xG/oR5dR9vDr9PqnJkHZ/+qz7pCrpqs5ksVmOnoJbCRCiLV1p60aErJKVqLs1zOvyaCZ T6thyYjJ81/DFQwJ9lTE0gO1R0E7cWaBWZ9MA3OxOv1/MFjmLqyFZ/QBy24lO00eCbJm CC8y0PY06RA/IX45cgMcgX79dObkVbqtuW1YOXzjzwl8qThLSr7Bhum19CxblwJ6ahrU CabA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=XrdjMXWofibRQ++HTYpxVlDqRCWxN5Ju9vjxrqG+c+Y=; b=k8+WOvi6WIfTShDoCozagGm0oSR+zoBZ/JizpBoeAaM2M6bNJlFSVvNNewZYONkfzx ZZpmYd0Aq99i1tnqEnZENImk6z+aiA2xsDXJHxhDC0peeh4APARZbBt9fRKxu7PUa1ex c9Nx+lLMg2UfXFfxsPaHe1hS7dvXLuXcImoijYrh/SE7Z7HtD/FNcOxX382/L0/jyixJ 2RIcrOwjp08t/gJXn0Pvw4Z6CaBthtoyQ5BlPjtG0viJKih+Eyg51RmqPxs73UARRV7h qEJ4dr7ANPEtnuxbat3x3xpK9RSC4+Zziw3Ua/keW80bPdoMhd0TbQFCdh5hV8Rz54ea Oojg== X-Gm-Message-State: AKGB3mIBZRFpOHqmFxEvGmCP9CynMXyWG8w5rqsce4Sc1ZYJH8oADfqE MHJw3QCSQVp+uW23lEYdzFc= X-Received: by 10.98.215.19 with SMTP id b19mr20363660pfh.94.1513561271261; Sun, 17 Dec 2017 17:41:11 -0800 (PST) Received: from [10.67.68.22] ([192.55.54.40]) by smtp.gmail.com with ESMTPSA id x11sm16036612pge.16.2017.12.17.17.41.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Dec 2017 17:41:10 -0800 (PST) To: FFmpeg development discussions and patches , Michael Niedermayer From: Jun Zhao Message-ID: <98e2fbdd-76a8-0d0d-778b-7193152e2197@gmail.com> Date: Mon, 18 Dec 2017 09:41:08 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH 2/2] tests/audiomatch: Refine the code. 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" From d2e3ba49180883dc71eb0eb0f5fa228368b4c9d5 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Mon, 18 Dec 2017 09:16:52 +0800 Subject: [PATCH 2/2] tests/audiomatch: Refine the code. Refine the coding style and change to use sizeof date type. Signed-off-by: Jun Zhao --- tests/audiomatch.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/audiomatch.c b/tests/audiomatch.c index e63e494add..b432b66ec5 100644 --- a/tests/audiomatch.c +++ b/tests/audiomatch.c @@ -25,23 +25,23 @@ #define FFMIN(a,b) ((a) > (b) ? (b) : (a)) #define FFMAX(a,b) ((a) > (b) ? (a) : (b)) -static int64_t fsize(FILE *f){ - int64_t end, pos= ftell(f); +static int64_t fsize(FILE *f) { + int64_t end, pos = ftell(f); fseek(f, 0, SEEK_END); end = ftell(f); fseek(f, pos, SEEK_SET); return end; } -int main(int argc, char **argv){ +int main(int argc, char **argv) { FILE *f[2]; int i, pos; int siglen, datlen; int bestpos = 0; - double bestc=0; - double sigamp= 0; + double bestc = 0; + double sigamp = 0; int16_t *signal, *data; - int maxshift= 16384; + int maxshift = 16384; if (argc < 3) { printf("audiomatch \n"); @@ -77,8 +77,8 @@ int main(int argc, char **argv){ datlen = fsize(f[0]) - ftell(f[0]); siglen = fsize(f[1]) - ftell(f[1]); - data = malloc(datlen * sizeof(*data)); - signal = malloc(siglen * sizeof(*signal)); + data = malloc(datlen * sizeof(int16_t)); + signal = malloc(siglen * sizeof(int16_t)); if (fread(data , 1, datlen, f[0]) != datlen) return 1; @@ -87,24 +87,24 @@ int main(int argc, char **argv){ datlen /= 2; siglen /= 2; - for(i=0; i sigamp * 0.94) + if (fabs(c) > sigamp * 0.94) maxshift = FFMIN(maxshift, fabs(pos)+32); - if(fabs(c)>fabs(bestc)){ - bestc= c; + if (fabs(c) > fabs(bestc)) { + bestc = c; bestpos = pos; } }