From patchwork Wed Jul 19 19:43:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 4373 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp1205033vsb; Wed, 19 Jul 2017 12:44:21 -0700 (PDT) X-Received: by 10.223.179.67 with SMTP id k3mr5091242wrd.198.1500493461524; Wed, 19 Jul 2017 12:44:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500493461; cv=none; d=google.com; s=arc-20160816; b=jmDnm/HTilcxnCN4UoC+I58ME1+c3SUowPSQiJq0Eu9bC4jDR6n7srBRdpfSqgtbZE B6mNjoGm6lBSjtyOKxNd7fn51iuUJtbQkKcihyELcf7EwFG/vcdBHodklUsf6OYhmkLo D1VyAmIz0f1TvHNHBdHVMp80NhD79Dxx8uASNc+gyH/Q5kH79tuuJIMKpKQM/JGgG0FF Cs84Fj2uZFSCezRIbi/QBVNhr3OcVCSN8lBlOxXJHHxWIZgZKWjSLI+EhRvSUFh/tET0 bPKHC9DGBQ0RD8LxawQl+T1r+mJaVVE99a9C5VRhNkUSuTnpZDtF6JB2zU9SWIvYfDJx enhQ== 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=UbFR1dVAKXs8xI6srRZTDl7yo0xDJOfUq5Rk8f4WahM=; b=aJ4bFOm3K+g/pBWriMDAdVHfr7bZLwBA2ECzKQzikXYLBaoAWleEA8dsldzkkCp6GX xKST4cPCftZDDAVJxrxDfIJ1YEC4aX3yWaR8HGmS9FWhRDmjFutXvMBYwd2M1G6i5qmK WZLTHOXh15gFjOaEW9MCivI+H/kHEfoLGl9OTrkd0ngaBBlGz/cryyeZYUgjk+EG3gvJ 0JnmA2gzUFHWSWT+w9Ym67OTXAgQelNg68bDlYeSFVn3L2MJzxP9G9o/3EUS60ue8/if jMrGl7Uc6cnDsqbvh6jEfEm8Ymn/6yXbqzwYodh/7FPM0fXPcMEFgHbXHY+M9T+phYlz nlvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=d1Gt7+4t; 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 q27si841014wrc.492.2017.07.19.12.44.20; Wed, 19 Jul 2017 12:44:21 -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=d1Gt7+4t; 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 50CDF689B17; Wed, 19 Jul 2017 22:44:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F2EE689A5C for ; Wed, 19 Jul 2017 22:44:04 +0300 (EEST) Received: by mail-qk0-f194.google.com with SMTP id q66so561337qki.1 for ; Wed, 19 Jul 2017 12:44:12 -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=ooWwN9c3kC/BEd3A/CW/hgbW0I4k79TZRdkjC4KzrB0=; b=d1Gt7+4tMHS1vWyong/hwQtth9MPOX8ME9KMpfMVN6HRDk0/pJzw+wAR28MZ+SrKvE gJkSc3HR86FBSKJAXoYakeje5DAWsJHctI3YRDaVJDuBSf2CWyRbHXoRLQO1BBd3hCNQ YmVCVXVipA0giub7UGStv2Q1T2sQjHwDbOY7cvtIq58BEj+QskM2JsOMyg/sbJg2BLsA jF+gRUNk7YdIMuIWIL9dc37tiUpKJFG5xNs/RgWGZrqdZJSC0Y9HXggQUdalXRieJ7fi Id2+QHn7vOo1LpH0jCos0c/5z0PAevWNRXAqy2gOMEztMi0WOqtMZncmHhVU5X92ReDp qFEg== 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=ooWwN9c3kC/BEd3A/CW/hgbW0I4k79TZRdkjC4KzrB0=; b=SR9holY/PkQ1/mN5sEUlHftXmFY6D+FRQU1LkY0BQpcDCYEpOA96mRNQjBgwleFgwW f7r5eqOLaCIuaTRcMfvVWfyhieFCyHZXZMnloDvqGmqRcQ2HTt6yojOMPeJusg9bNqH2 vmOdPjBnhMwPUG2O2GDS6NXzbMkv61VNB76CLGGxRM4TcGknOuCzXR0BeCMW8e7Bey0m 08nTHlU9CoIsLl5MwJMtLecwr0JnaVqjkF6+Zq23Y8frvzXKkmzcMrRbE+1jZA81YTze 1sfHZupKP/AM2BsNOWeQbXPN8z8xphBX6UqRMKYMFVqyHL+IaGt8NoyCXcuZBHTbmawv KMcw== X-Gm-Message-State: AIVw1111Bl7Wul83Mcqd36giXYD1etO9sd53hySFKHHWJDoEYz8yrTvJ 4vOEkY2pjv+Z+SJQ X-Received: by 10.55.31.150 with SMTP id n22mr1775192qkh.46.1500493450733; Wed, 19 Jul 2017 12:44:10 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id z10sm568454qtz.80.2017.07.19.12.44.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 19 Jul 2017 12:44:10 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jul 2017 16:43:58 -0300 Message-Id: <20170719194358.6452-1-jamrial@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170719192057.GD3740@nb4> References: <20170719192057.GD3740@nb4> 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 potential ABI issues with GetBitContext. Signed-off-by: James Almer --- libavcodec/dca.c | 12 +++++++++++- libavcodec/dca.h | 7 +++++-- libavcodec/dca_core.c | 2 +- libavcodec/dca_parser.c | 4 +--- libavformat/dtsdec.c | 4 +--- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/libavcodec/dca.c b/libavcodec/dca.c index 39f8f3d81c..307b21471e 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,13 @@ 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 (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;