From patchwork Mon Jul 10 14:11:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: foo86 X-Patchwork-Id: 4289 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp3619351vsb; Mon, 10 Jul 2017 07:29:31 -0700 (PDT) X-Received: by 10.28.139.204 with SMTP id n195mr8135166wmd.14.1499696971357; Mon, 10 Jul 2017 07:29:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499696971; cv=none; d=google.com; s=arc-20160816; b=EiaDKQo9SOWCt1KfTQw/vibF9DNq0E/+zSqGmKLxhEPFMtT3fTIjP6f+Dm2od2+mlq kxjGPO0HDTP3pL1hEvS4xFlzWfYM0zUaiezHVaYgI+HW7h1iA4lfBvU7JDyZFx1vlnkK CFntYXk8tPfNdOP23wGx6uQi0A5mCCjzy4UaP0x+1CEZjMQwD1LBC2BHUmA14QHU81Ur +2zIdiARn077v0zloV1jk2ZNeTrwTiJtPkWfzgmUk6Z3yNE99ZUAx8EN27e+U42g5jss GgOUrqX7eILAVmn/TZ8Rou3MUGcbeMawkQxhK1kJP8kTTUh73yexlg4sptQ0qkj7aoyT 0yeA== 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: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=7Z74xKiqwawdOYxIqINiOEP0MTKw9tdNzA73krw5IMM=; b=hVXqrMXeob/r9CxM24+m89vZb6ozT2HxM/QGZEhW7vr7FrkheKiU4vgE0WWimSaydK UhuvCezgK5YtXBj/NwFx6tuqcqDFEBJae1+y0NucYPvbwrgT2LN2YZab8fTohZHvciCr LAhQKa3Xwp2pA0PrCi/y8WjjZr3tscMZvQ3qi4il0qON69GyHIQ8B/ptZbr5zMTSLV4p 1211jhphGyev/UY1kjO2rwQAiwl7PS5oeGpLiTF8zhJrHufCydClpI9pFSmLlf7C5vFu u5q/TyYXibpsGvvxCXB71oe1jRSFWm3q2LD84uBUQrBK8QBDAHE6xh25BlJT8ATra2Jt rLQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=ipvktwYS; 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 w127si6797189wmw.126.2017.07.10.07.29.30; Mon, 10 Jul 2017 07:29:31 -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 header.b=ipvktwYS; 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 ABC9D689E0C; Mon, 10 Jul 2017 17:29:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 43510689DDC for ; Mon, 10 Jul 2017 17:29:16 +0300 (EEST) Received: by mail-lf0-f66.google.com with SMTP id g21so10795048lfk.1 for ; Mon, 10 Jul 2017 07:29:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=+AjQTnc4GPvVgqmLWRIRgyqbQaawzJUCkNYU1Rjsfdk=; b=ipvktwYS22MbKHlauhgTDaJ8IFAGkTvxwU1Myy0frid3p5rSyGxf7dS6Q3A7KvCRJe +TQShTtgBrnkn1V2wl7cnABxuxKztq6UDfi1JHECXwErIkNIy644qg2edlYgN3/S5ij5 d/XMt+odBIMyzeH54QxTMFGecjdkmDPuEtujcFjqpbONPM88yBSo94h06cb/aWFxaCNn tuiX4qtFm8nas1rJY5DB7Q3mvgiugnGOoOoLrUDZp8KSMHOBfmb8FKWE2a+BJQZ9IJrZ j66pNPOUSIDTH9rT3r1uI676dR2Cf9rRQeG+iLSg3l84lTUTA+XNDkXujRVmY1UgoWDt 78vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=+AjQTnc4GPvVgqmLWRIRgyqbQaawzJUCkNYU1Rjsfdk=; b=uYVcfbdltv/VfJs/VHLQ3/IygMhZiI38JqrYfhFWMe+bnMCmhVZ+7Y7e0T8DnLSGgt oxFNCTooOIbuGXlyRvRBk6FAnQrwAbHvPIKoPsmR5H5m9saZ/AKJsoJNBNXcVDpKfl8p aDj3IMzRmcI0dJer4GplQho0xxjIC09hNHvHthwsgRXDdEowq8Nr2t6XhjhAcgokLbaQ NlLaxlYqpfwouIFveKEvQO3/M5YYhKNseGrO+AaOnaNOz2FwTKRupbadL75gCGcPp998 QU96xbGjZE3/L5blHF06VlrRykVkc8K/KWbChke4TV6861eLNRHun7ISeB1ZNVTeYoHz 29ag== X-Gm-Message-State: AIVw112JlD4QOIFxRJ5798apId0bLkibXMcF/xJyAk02jRo/Bq6oGMfA zEnMySUgfDTt3w8p X-Received: by 10.46.20.83 with SMTP id 19mr4922083lju.81.1499696532128; Mon, 10 Jul 2017 07:22:12 -0700 (PDT) Received: from foohost.foodomain ([2001:470:28:661::4]) by smtp.gmail.com with ESMTPSA id v196sm2722713lfa.16.2017.07.10.07.22.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 07:22:11 -0700 (PDT) From: foo86 To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jul 2017 17:11:38 +0300 Message-Id: <20170710141140.20075-8-foobaz86@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170710141140.20075-1-foobaz86@gmail.com> References: <20170710141140.20075-1-foobaz86@gmail.com> Subject: [FFmpeg-devel] [PATCH 08/10] avcodec/dca_parser: avoid use of magic values 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Duration computation can be simplified because number of PCM blocks is only allowed to be a multiple of 8. --- libavcodec/dca_parser.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/dca_parser.c b/libavcodec/dca_parser.c index 390f7975f9..7e99b16bf0 100644 --- a/libavcodec/dca_parser.c +++ b/libavcodec/dca_parser.c @@ -25,6 +25,7 @@ #include "dca.h" #include "dca_core.h" #include "dca_exss.h" +#include "dca_lbr.h" #include "dca_syncwords.h" #include "get_bits.h" #include "parser.h" @@ -214,9 +215,9 @@ static int dca_parse_params(DCAParseContext *pc1, const uint8_t *buf, return AVERROR_INVALIDDATA; switch (get_bits(&gb, 8)) { - case 2: + case DCA_LBR_HEADER_DECODER_INIT: pc1->sr_code = get_bits(&gb, 8); - case 1: + case DCA_LBR_HEADER_SYNC_ONLY: break; default: return AVERROR_INVALIDDATA; @@ -267,7 +268,7 @@ static int dca_parse_params(DCAParseContext *pc1, const uint8_t *buf, if (avpriv_dca_parse_core_frame_header(&gb, &h) < 0) return AVERROR_INVALIDDATA; - *duration = 256 * (h.npcmblocks / 8); + *duration = h.npcmblocks * DCA_PCMBLOCK_SAMPLES; *sample_rate = avpriv_dca_sample_rates[h.sr_code]; if (*profile != FF_PROFILE_UNKNOWN) return 0;