From patchwork Tue Oct 31 20:27:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5797 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp4451558jah; Tue, 31 Oct 2017 13:28:12 -0700 (PDT) X-Google-Smtp-Source: ABhQp+QnSj5nTHE9iy/t3fwIqet9b12fH9udGxbxtOI3R98yI0UPL8ZaKD6OWp+sAxQB7teXrzMO X-Received: by 10.223.164.66 with SMTP id e2mr3100916wra.14.1509481692787; Tue, 31 Oct 2017 13:28:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509481692; cv=none; d=google.com; s=arc-20160816; b=TFYuZepjg52qwMbBonH+xeTFZyxVbEdeJuJ15CtoHKXj050CvspwWQusankeLEpn9g Fjf5oRIgqCyzDlKRAHYl4Tnhyf/59EXokBtLnyVBEYLZzodWQ6iprhwIuersbkyFX7kE jrXdZbdn3a1l0EsC5mv1+a3um+BZipBBIc7M/pLrY/UidWUwAfYrYo4Da/wSWn6UzBHA yKvTk7aK+5V28XHxkvDeyhqNOoV2WDDykvb38/UgyhxLg9l9rpuIa8dPMNhYjYk20RcJ Tg0er0hg26JT2f7ZaltfHSHk3SviKJ4nADdGa9fSEELMBuzEiC32j8g5e27yYsiz51Et pnhg== 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=z7YWWRuFtOYMgy9dOVtgPGFc7/frzEh0PddTbtM8oKI=; b=KUjHq3vnRyROeT2zqATRcdBeJQ8z9IsrYyQvl96wdbcqYikiUERidVHYAOdSf8TXd7 cBcMN1I35dOiwqocJanIbyVVPESMHwc3bJ/w70qmf1UexagxnO2t2x3b2bnObQ9pN1jE vvTo4Kf6Z0OWBSP02a7Dw2WEudi399yvYEcAxq0d4eNNuOiFBGVs40uvgJHHxXVUzfhq ZK7WbitbVw915ZEpeGJ9ggTk0kLFf9l9YDUBrNFFJR8J/nkgNW0BBJIvZOZ0dofYqNvp QVBIClJpNhk/LGgvjNoDH9+Ibv4viP48ZlvuJ+qsTC37tKvfB7LRYgcAmYCeSbT2uv47 jPyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=C9G+foaD; 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 c22si2117713wre.230.2017.10.31.13.28.12; Tue, 31 Oct 2017 13:28:12 -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.s=20161025 header.b=C9G+foaD; 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 36591689D4B; Tue, 31 Oct 2017 22:28:01 +0200 (EET) 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 E09E0689D27 for ; Tue, 31 Oct 2017 22:27:54 +0200 (EET) Received: by mail-qk0-f194.google.com with SMTP id r64so335908qkc.1 for ; Tue, 31 Oct 2017 13:28:04 -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=BS0GuIuzR5F5pwvOExUpYS1KkLsH3vOV5z1ve81apXs=; b=C9G+foaDHUAgQyucKhrS6Ai9R2ymVwLJtfvnlGHR+l9DPYCZaGe1GCQ0uWAVSyb4jK QD1L+GMaESD/kxGlM5z6ULGuUzgn8qGA16AFz25DJEsgsutrNgIvtzUM/uMRK5R4MQU8 yf1YQLy9DYUOJJekUQGPZYS71A/JjScY9G/bu8Wk6F+Mp0G7tRU5+0rxD0iql3nMVbHn 49ukJP/Lg5TmouImLqyj155dNnfvQ5dkfLS2CXAPSyidCc6yErNkoVu8dll2x+Cp1J4n GmofKsGj4Tp8bmuTSZPI4N2HrnIE95yttioJDNHj1vUEcS+ZfAs8H2Sna+zQUi/Jf0tM nhjQ== 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=BS0GuIuzR5F5pwvOExUpYS1KkLsH3vOV5z1ve81apXs=; b=Q5slAlve95CsGq9apyU2S24oFmUAkIaFgzeo1ae5R8UQc6fqcoEXz4v6K3oLwDM7eL oxopRwk/TGZ8Oe0h1Rlu/XVZOVyLh8dR6kS7ZzHjBCc1IrHKZ0IX9y2nQtKSpI0MXHED w2mba2WtxLfY3/+zTS7Ni6OHkJEg4jXBKrU1XX2hA05VpBSk7crib7RPU/IRl5nSnkJl UkiVnIlt1PH68wVbQuRE4+/tpO6w+LnQwQAsicl5rEY0NzlR8xMzLk+JytcfqR9QIjx6 vZa6dTQ5+OmEM7gOa7y50xaZ+UhaJIJmfV1PJ40WLKB1a+18/JEoYeWD949faCFT0GWr 4Ung== X-Gm-Message-State: AMCzsaW5Vd8Y9RO6Vj4/P37SwLY6Kt5jRy8Y8xwEnpOBCiLvjRM9Iiuc Vn4Aw+7UB+jfnCVPRVMv9bnEbg== X-Received: by 10.55.121.194 with SMTP id u185mr4859953qkc.128.1509481683742; Tue, 31 Oct 2017 13:28:03 -0700 (PDT) Received: from localhost.localdomain ([181.231.59.220]) by smtp.gmail.com with ESMTPSA id t49sm1485254qta.54.2017.10.31.13.28.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 31 Oct 2017 13:28:03 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Oct 2017 17:27:35 -0300 Message-Id: <20171031202735.4292-1-jamrial@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171031191700.GW6009@nb4> References: <20171031191700.GW6009@nb4> Subject: [FFmpeg-devel] [PATCH] avcodec/dca: return standard error codes in 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 making the DCAParseError enum part of the ABI. Signed-off-by: James Almer --- Now actually paying attention to -Wempty-body warnings. libavcodec/dca.c | 11 ++++++++--- libavcodec/dca.h | 12 ++++++++++-- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/libavcodec/dca.c b/libavcodec/dca.c index 942fe6c3c9..a0729e61ab 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -149,9 +149,14 @@ int ff_dca_parse_core_frame_header(DCACoreFrameHeader *h, GetBitContext *gb) int avpriv_dca_parse_core_frame_header(DCACoreFrameHeader *h, const uint8_t *buf, int size) { GetBitContext gb; + int ret; - if (init_get_bits8(&gb, buf, size) < 0) - return DCA_PARSE_ERROR_INVALIDDATA; + ret = init_get_bits8(&gb, buf, size); + if (ret < 0) + return ret; - return ff_dca_parse_core_frame_header(h, &gb); + if (ff_dca_parse_core_frame_header(h, &gb) < 0) + return AVERROR_INVALIDDATA; + + return 0; } diff --git a/libavcodec/dca.h b/libavcodec/dca.h index c70598af92..b05e5f896e 100644 --- a/libavcodec/dca.h +++ b/libavcodec/dca.h @@ -46,7 +46,6 @@ enum DCAParseError { DCA_PARSE_ERROR_RESERVED_BIT = -7, DCA_PARSE_ERROR_LFE_FLAG = -8, DCA_PARSE_ERROR_PCM_RES = -9, - DCA_PARSE_ERROR_INVALIDDATA = -10, }; typedef struct DCACoreFrameHeader { @@ -211,10 +210,19 @@ 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 + * @param[out] h Pointer to struct where header info is written. + * @param[in] buf Pointer to the data buffer + * @param[in] size Size of the data buffer + * @return 0 on success, negative AVERROR code on failure */ int avpriv_dca_parse_core_frame_header(DCACoreFrameHeader *h, const uint8_t *buf, int size); +/** + * Parse and validate core frame header + * @param[out] h Pointer to struct where header info is written. + * @param[in] gbc BitContext containing the first 54 bits of the frame. + * @return 0 on success, negative DCA_PARSE_ERROR_ code on failure + */ int ff_dca_parse_core_frame_header(DCACoreFrameHeader *h, GetBitContext *gb); #endif /* AVCODEC_DCA_H */