From patchwork Mon Dec 25 02:28:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: misty@brew.sh X-Patchwork-Id: 6957 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp5294120jad; Sun, 24 Dec 2017 18:29:29 -0800 (PST) X-Google-Smtp-Source: ACJfBotye8tnOTpHQWUehWRSAS1adk1yBFWissq2ih3n94dcdkmawU6+9s4oF6CfvEP/k4Z1Q2HA X-Received: by 10.223.196.71 with SMTP id a7mr15046672wrg.158.1514168969714; Sun, 24 Dec 2017 18:29:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514168969; cv=none; d=google.com; s=arc-20160816; b=Sq4gIIxhJLn6aZEyxf6QvFd2TNUsl+7yZaO6i2fEbv7QuUYEclXrGk5PPL7fJ/cxn/ RY5u6iGPgdKLmKlHg1GzmoovJbVLp77opbYgF5YKf2BhWdvSJKkGmzbNgvA2YwTSPYYz T7K6KnwHWTuOo9l5hKU+W3Ig9HSwIko8ABjcdDeuuA1uLrCBHGtNsSYd8zFlSS4E+AHb B5tb4P2X2E5lKTwpleyaQXtbhVRsE0vt7xYKchOCuFpIwC/Sqz+XDuBYy+zwF5qshTUK /vJoNU7GzXaxJb8BQuWahbXJuc8x7pEAGdxA27jPWO0NKBhyalwv1DTzJILddWpFvOeC AfFQ== 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=2RqQ+5fu5ySxCBXPDXuU1dXDo3SFL8aMjqOxb1D+Xiw=; b=QMn5rPUoaLPoYuS4j33xdnVl2+BtrgBplXJEEhEDns+DvLeXYbgJZQ6QeSJZvnViTS u4d2zVbgbUhsnQ44zoB6uJON3Y+UvjyCGOP8/Y0yjzHHI8e6QeQDKvBpTZxQ5Smedyu2 u2hUM/BYrAdCzBF+JzKqJxgL5bmj9fDiy+66fHQT1HeCSs8k8omCHpTrL2+hBMojpMnz 66oUkZKXRUvVYLcB3mupIdZIj+x4oNQ+I9kMEloGMZpRTPi0iqGABsW/vpCFRJWUVt9q PkD+EHmw6ekW/fCnyRtezkVH5zt9zzXn7QpRRKgyzlmRMtDZmufQJBsfs6Un0uYYL/KX 90oQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=fWOQ+NIe; 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 v191si9968463wmd.76.2017.12.24.18.29.29; Sun, 24 Dec 2017 18:29:29 -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=fWOQ+NIe; 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 CF6B0688279; Mon, 25 Dec 2017 04:28:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A8ED7688249 for ; Mon, 25 Dec 2017 04:28:51 +0200 (EET) Received: by mail-pf0-f196.google.com with SMTP id j124so17492437pfc.2 for ; Sun, 24 Dec 2017 18:29:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=u8ve0X1ePeDDDOl9Bw9rI7AlB+d7SPpOZTQaejZ9EM8=; b=fWOQ+NIeIRyBZI3FIGKNo7c0v+vZ+q07glml8fAqH5fHKAGwn7mDRAZKn2THyAkYa+ X/5UesLji/RtCxcUfiEGVz4jLx8kCxUsvegDHb/CJami8y+qQ1uFl36vXDriOhr6YJmE YCeEFVXZEwBkXeTeBmyOE0LwzA/BPGMQ9mmAR6RNRqauOBxikc2uOoemsT+iRcV96Wes 7pg9F5+FXJww02k7GkoDO0G08jdP9CdOvRd8DrCz+z25lHj7sVR9I9kgfCULJojBMp3+ W8Ogq2+Yt0xJLdZrGlTUIGnWdKiJBUprNeXpbrICpd80ZvWmTZuf76KxFHDsijYxOwo1 2ggQ== 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=u8ve0X1ePeDDDOl9Bw9rI7AlB+d7SPpOZTQaejZ9EM8=; b=cHKo1N7beks73GTHrGL1g1j5UJ7jFVrTU4/P0mcLYXgeMyF2KQMW3YgoFa7BJDlAWB uSrFDP0swHojBGEynNK3i9ctTO27LTmHT8BUpNORYPdZ1lUDbFdnYPfVx+8IKhTmVRTE IK0osP/nEfOv6milS4mMEfwBpL7weto3uk2qo7GgHWPVVE6Ws1Nq6BBLqkh82U7xzbmF wi/wIZdMV2VSqpYnnch5mks9odOxILT3CevF+j1mGw9Y+B2QI0uJhTPhFlmbF92SJA/j 1qiK+ySSEtU5qUzmmv+6805iIHc5UdwqDz2WxAh0Sv/gwc0gV41TGuuoFOeEudJF9moD Shrg== X-Gm-Message-State: AKGB3mJsDnrUUwRVRJvXjhMm+Aq6SUNsPnlXsGr4Uwi40uhxwZvcjiak 92peedOuwmjnXqfAdiPQ0Qn8r/Pp X-Received: by 10.98.194.71 with SMTP id l68mr20920846pfg.221.1514168942937; Sun, 24 Dec 2017 18:29:02 -0800 (PST) Received: from localhost.localdomain (124-148-94-180.dyn.iinet.net.au. [124.148.94.180]) by smtp.gmail.com with ESMTPSA id n22sm27888708pgc.76.2017.12.24.18.29.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 24 Dec 2017 18:29:02 -0800 (PST) From: misty@brew.sh To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Dec 2017 10:28:31 +0800 Message-Id: <20171225022834.33865-4-misty@brew.sh> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171225022834.33865-1-misty@brew.sh> References: <20171225022834.33865-1-misty@brew.sh> Subject: [FFmpeg-devel] [PATCH 3/6] atrac3plus_parser: use libavcodec's oma 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: Misty De Meo MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Misty De Meo --- libavcodec/atrac3plus_parser.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/atrac3plus_parser.c b/libavcodec/atrac3plus_parser.c index 01fcad4c45..f58f3d58ef 100644 --- a/libavcodec/atrac3plus_parser.c +++ b/libavcodec/atrac3plus_parser.c @@ -20,7 +20,7 @@ #include "parser.h" #include "get_bits.h" -#include "libavformat/oma.h" +#include "oma.h" typedef struct Atrac3PlusParseContext { ParseContext pc; @@ -38,7 +38,7 @@ static int parse_sound_frame_header(Atrac3PlusParseContext *c, return AVERROR_INVALIDDATA; atrac_config = AV_RB16(&buf[2]); - c->sample_rate = ff_oma_srate_tab[(atrac_config >> 13) & 7] * 100; + c->sample_rate = oma_srate_tab[(atrac_config >> 13) & 7] * 100; c->channel_id = (atrac_config >> 10) & 7; c->frame_size = ((atrac_config & 0x3FF) * 8) + 8; @@ -120,8 +120,8 @@ static int ff_atrac3p_parse(AVCodecParserContext *s, avctx->sample_rate = ctx->sample_rate; avctx->block_align = ctx->frame_size; avctx->bit_rate = ctx->sample_rate * ctx->frame_size * 8 / 2048; - avctx->channels = ff_oma_chid_to_num_channels[ctx->channel_id - 1]; - avctx->channel_layout = ff_oma_chid_to_native_layout[ctx->channel_id - 1]; + avctx->channels = oma_chid_to_num_channels[ctx->channel_id - 1]; + avctx->channel_layout = oma_chid_to_native_layout[ctx->channel_id - 1]; next += hdr_bytes; buf += hdr_bytes;