From patchwork Wed Jul 19 04:57:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 4365 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp361749vsb; Tue, 18 Jul 2017 22:05:04 -0700 (PDT) X-Received: by 10.28.206.202 with SMTP id e193mr4521941wmg.0.1500440704210; Tue, 18 Jul 2017 22:05:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500440704; cv=none; d=google.com; s=arc-20160816; b=FqNBZfPREIbmfSB0xYVTj/0TSS253qjp8tw0L7PGXNVIH/kpVPq4IJI0Rh+2IWUoRJ 9rhGVhcr85MTW888SgTnroerl6k76ahe+ALeBbEAngevTVUf6WEmLPNy7jy9T7qLTItn b8cDd/F0DkvhKCMPkgjLT8uHvgBTsRtkk1q62TI1f5SjCPjipEBlkWH81xViQrIokaXT pJxzLWVTl+moX6rBzk8TAtNvJ0AOAcif4RvG69zNpmO6ZwA7NzXQD49ePZgH8vr6qs7H Mhu4sd1PW7/JNKLWMuEDSjkznFSXsHain/JBPoRKnAwpmS0zXEKPzzixzHEsB50H4qgd NpYg== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=J00kUYaC5ZmreCf/Zg9OfD8P21bAtDnK3XqXLWDw0/c=; b=v2rwC6DfiaqOvcT4SAOPFTXkHp0Yd8MWZi+cB5hcPGUw1qb+aboY6EP2bSOpiZ28yT aoX79lnJJOFoqiCj8myHd7MwHucwTq61oH3vIwJ46GX5FwIo6S+YTEGvB7L/DN6yBSqg Nhez7DZc9KxLyGEHI1cRu9WWc/+JhOCbsECpFA7nb71YB2W6wP/sNVVUsi09t907ymmK UvMnlu72W4ZxI42SKuQyu/b+Tj3CjsuoxayJDeGQQ7/hZEtq6zFsmVxE7rFpFolcdyPs 1uLAgWMbN6WBuDYkKvvIFH/30V/hOWVTON2aimJEh2l3JKCHJKgiBx7atRpR9QJJsLx9 xI1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=VPhTqr0q; 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 g7si3483287wrd.178.2017.07.18.22.05.03; Tue, 18 Jul 2017 22:05:04 -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=VPhTqr0q; 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 E5AAA68836C; Wed, 19 Jul 2017 08:04:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 464BC688280 for ; Wed, 19 Jul 2017 08:04:46 +0300 (EEST) Received: by mail-qk0-f196.google.com with SMTP id d136so4973854qkg.3 for ; Tue, 18 Jul 2017 22:04:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=PHT1CceJHCcczGd7U69gTMzD8+Vkevhxd23a1o+mn9Y=; b=VPhTqr0qChhxKqXH2jqgeK/s9tFz5uYNRNu4dZrxyykIEDSoNuqkph8DbopmPKLkkA 7ua1uR017bmCzYFmeAvDZuEGncgo4fZvN3/c8sEC5y/mt9hR4tveo7Yfc8RV3MFR6H1J ZRYjmUKjXC3R9JwuEcQW/sD47w+YguTHUn/hCZ9nxD+80dWIGlCqLXAwl3dJPk6Y/d4U uL6+LHusqhTCUzglvc/xd7lTqYsux4pGU/j/0cfKih4NCW0keTlI+EnZ/k/LJLy/rpzX 7xGDAG6qwCzt25hWAsjKWOSGKwaAZtwFcRjOiptPmRqaQLb6vil3n6+YAyx2yJWw5Ua3 rJgg== 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; bh=PHT1CceJHCcczGd7U69gTMzD8+Vkevhxd23a1o+mn9Y=; b=hg+8K7HZIk68L07UaARt7Mmgm/9I6TSNRCLgjkbdT4vx/B9sC+biQkIAKCjtilxqg4 tuOtUomvkhA1jNcc0mmhEb5Fk9LhatKCfKANOirUdyU6VwMiWmHBUmtwO5vj8NhAPuJS NbV8xCtCP9jaXAOmDy649ZBcsS6eg/mqyL2Col2UlymabmUOdJQuzAadPlkQMLNzZmcy q7ViLmzRMOvmdLvDtTu1zQwU8HcnWgplyPgIPuML+IHvMBQqgwTaDM0QVLGb+djl94WN GjFRrJGOltvdQaQzd8RGWzV7SITCgUNi/EiVwHJSkuhi+yKEldVBU5PATA1jxcY09yIy We3g== X-Gm-Message-State: AIVw111WujOOJTnmVLoTRNg84SQ3AYAlp+Xu5d6kUUJSy/X4bx7UM+ZI ZpDvLkIQJDwnyjR/ X-Received: by 10.55.215.157 with SMTP id t29mr1184517qkt.187.1500440253742; Tue, 18 Jul 2017 21:57:33 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id e32sm3085868qtb.63.2017.07.18.21.57.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Jul 2017 21:57:33 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jul 2017 01:57:21 -0300 Message-Id: <20170719045721.8904-1-jamrial@gmail.com> X-Mailer: git-send-email 2.13.3 Subject: [FFmpeg-devel] [PATCH] avcodec/dca: remove GetBitContext usage from avpriv_dca_parse_core_frame_header() 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" This prevents ABI issues with GetBitContext. Signed-off-by: James Almer --- libavcodec/dca.c | 15 ++++++++++++++- libavcodec/dca.h | 7 +++++-- libavcodec/dca_core.c | 2 +- libavcodec/dca_parser.c | 4 +--- libavformat/dtsdec.c | 4 +--- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/libavcodec/dca.c b/libavcodec/dca.c index 39f8f3d81c..3f2ed67013 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -88,7 +88,7 @@ int avpriv_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst, } } -int avpriv_dca_parse_core_frame_header(GetBitContext *gb, DCACoreFrameHeader *h) +int ff_dca_parse_core_frame_header(DCACoreFrameHeader *h, GetBitContext *gb) { if (get_bits_long(gb, 32) != DCA_SYNCWORD_CORE_BE) return DCA_PARSE_ERROR_SYNC_WORD; @@ -145,3 +145,16 @@ int avpriv_dca_parse_core_frame_header(GetBitContext *gb, DCACoreFrameHeader *h) h->dn_code = get_bits(gb, 4); return 0; } + +int avpriv_dca_parse_core_frame_header(DCACoreFrameHeader *h, uint8_t *buf, int size) +{ + GetBitContext gb; + + if (size < DCA_CORE_FRAME_HEADER_SIZE) + return DCA_PARSE_ERROR_INVALIDDATA; + + if (init_get_bits8(&gb, buf, size) < 0) + return DCA_PARSE_ERROR_INVALIDDATA; + + return ff_dca_parse_core_frame_header(h, &gb); +} diff --git a/libavcodec/dca.h b/libavcodec/dca.h index cf6204e554..172c965b3b 100644 --- a/libavcodec/dca.h +++ b/libavcodec/dca.h @@ -45,7 +45,8 @@ enum DCAParseError { DCA_PARSE_ERROR_SAMPLE_RATE = -6, DCA_PARSE_ERROR_RESERVED_BIT = -7, DCA_PARSE_ERROR_LFE_FLAG = -8, - DCA_PARSE_ERROR_PCM_RES = -9 + DCA_PARSE_ERROR_PCM_RES = -9, + DCA_PARSE_ERROR_INVALIDDATA = -10, }; typedef struct DCACoreFrameHeader { @@ -212,6 +213,8 @@ int avpriv_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst, * Parse and validate core frame header * @return 0 on success, negative DCA_PARSE_ERROR_ code on failure */ -int avpriv_dca_parse_core_frame_header(GetBitContext *gb, DCACoreFrameHeader *h); +int avpriv_dca_parse_core_frame_header(DCACoreFrameHeader *h, uint8_t *buf, int size); + +int ff_dca_parse_core_frame_header(DCACoreFrameHeader *h, GetBitContext *gb); #endif /* AVCODEC_DCA_H */ diff --git a/libavcodec/dca_core.c b/libavcodec/dca_core.c index 3add9f812b..6cb1f30a3c 100644 --- a/libavcodec/dca_core.c +++ b/libavcodec/dca_core.c @@ -82,7 +82,7 @@ static void get_array(GetBitContext *s, int32_t *array, int size, int n) static int parse_frame_header(DCACoreDecoder *s) { DCACoreFrameHeader h = { 0 }; - int err = avpriv_dca_parse_core_frame_header(&s->gb, &h); + int err = ff_dca_parse_core_frame_header(&h, &s->gb); if (err < 0) { switch (err) { diff --git a/libavcodec/dca_parser.c b/libavcodec/dca_parser.c index 7e99b16bf0..11ddb8f188 100644 --- a/libavcodec/dca_parser.c +++ b/libavcodec/dca_parser.c @@ -263,9 +263,7 @@ static int dca_parse_params(DCAParseContext *pc1, const uint8_t *buf, if ((ret = avpriv_dca_convert_bitstream(buf, DCA_CORE_FRAME_HEADER_SIZE, hdr, DCA_CORE_FRAME_HEADER_SIZE)) < 0) return ret; - if ((ret = init_get_bits8(&gb, hdr, ret)) < 0) - return ret; - if (avpriv_dca_parse_core_frame_header(&gb, &h) < 0) + if (avpriv_dca_parse_core_frame_header(&h, hdr, ret) < 0) return AVERROR_INVALIDDATA; *duration = h.npcmblocks * DCA_PCMBLOCK_SAMPLES; diff --git a/libavformat/dtsdec.c b/libavformat/dtsdec.c index 6e0048f9bc..a3e52cd596 100644 --- a/libavformat/dtsdec.c +++ b/libavformat/dtsdec.c @@ -101,9 +101,7 @@ static int dts_probe(AVProbeData *p) if ((ret = avpriv_dca_convert_bitstream(buf - 2, DCA_CORE_FRAME_HEADER_SIZE, hdr, DCA_CORE_FRAME_HEADER_SIZE)) < 0) continue; - if (init_get_bits8(&gb, hdr, ret) < 0) - continue; - if (avpriv_dca_parse_core_frame_header(&gb, &h) < 0) + if (avpriv_dca_parse_core_frame_header(&h, hdr, ret) < 0) continue; marker += 4 * h.sr_code;