From patchwork Tue Oct 31 03:47:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5775 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp3468952jah; Mon, 30 Oct 2017 20:47:34 -0700 (PDT) X-Google-Smtp-Source: ABhQp+S6FqQmQMWs0bwbb3KwT0lGckW2/wXhiN0bhM2dw7zWQNHyGXz76k9Tje2RestSm050UAV/ X-Received: by 10.223.169.80 with SMTP id u74mr388548wrc.178.1509421654114; Mon, 30 Oct 2017 20:47:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509421654; cv=none; d=google.com; s=arc-20160816; b=IcrE9IIwRWGfggXuNFbrMS1Uk04VkxNMZs+mx+vvYs/spYPfBynT4SZWKXFoJTYLRi ifxuHK8BVm+MarEPP3clrIdhwusSOrdQoHw11P439ZuXYkWXiVqNSTxHAWIFjxYrvmcF 8ZvUZeTt6fnx9/80SXQrIbtwjmrmVZzwJhFxUTDL4SgR9BVYoZSIiuyl+g2wRXW5VJp/ CXheKjISBLsgbqUyw7N/96PFhUEY/dlI6rw1d6g8a+baxcrGW06etqIpgCtzB6GrU3d5 lyi1AOfLgCf7y7FZ5P+o5lqi59/KCTbDjzUYfTjEdHdAKv9nUKeyhltqMstAMdmHWncD Tmvw== 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=v27QZUNj9QjuqVqTFs7zEeI5AsL/EXyT8y4zwrrDn0c=; b=bwmWPo2K1En54L/QOJVZuI2NfYk1LW+cQMWZYHvo6WmWmUlmfs5SXtr7Ene3RllYCY yYvB4oFk3F4O+tskdzAEB0jciMQ1HXfHNJW80H20hc2f8TexuQKC4ejVoscxhxXs5zZg AWryxzTRyqDlR7AryVTJjCTn8zU0lFPJi6VWz1YjNgmyH4UW9bZ65aAYShZk4SQMroRn xpG+IRbQ9KjVWLAvCuMeXcOjSGaUebfJvRFyUC6tSwaMSs9EyW9uai/kjv+sIdh1Hbrq OytNJMfH0iraJLAp3XY3eFez25KHL5WX0aH48IupsALXqracf0OyvL9sLo3dC9kgvdr9 LLjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=DS9MOvtz; 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 n26si418907wra.549.2017.10.30.20.47.33; Mon, 30 Oct 2017 20:47:34 -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=DS9MOvtz; 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 91EB868A031; Tue, 31 Oct 2017 05:47:22 +0200 (EET) 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 299B1689F9E for ; Tue, 31 Oct 2017 05:47:20 +0200 (EET) Received: by mail-qk0-f196.google.com with SMTP id q83so18846054qke.6 for ; Mon, 30 Oct 2017 20:47:30 -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=2vHwz9bVNXnmpXT+UXMyelExmQphcvF6SHe5JAlfm7E=; b=DS9MOvtzFbEDCW2B+xqHz8si2dkYzVjWybJFKlPN4QKdFYuX11P/0kmcISu5sIbTCm odY9WyZKdPBD9vFxKUkFnarq5rjVzpZMqyZY+qIwBD+mE+RKbB4TFOIujpd1ZryxbIzU hs7t5xjpdlcJUFTubCUPOmHMUv7pj/5BzcsdGarxt09ApAJSiiVz/QVL0G46W8l/IFZt w9DiayYp0bjMrpWQwaUTjPUnOUshnB6WTc1VGGXmA4dcXw1v6nKIkezCIhFmRqhMtKi6 JfVBA84dXD8D4X5tN9GoTo+Y1X6GYgQIbFg3J3fGWqhIY2a0E/TRjcH6osqFCf0VaWfg WFTA== 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=2vHwz9bVNXnmpXT+UXMyelExmQphcvF6SHe5JAlfm7E=; b=MLtXraSZcLap5a9bBAa8ABPlurdxBYA96XIKqwMsgnYGlFQPvecW7jKeeAzrKH882x 3Qq/sdPTjm01KshW8/AOWgAu6UirgsrFjVhHABDlcAmPakOty2DWSrL41QgrvY0tJH8q VwRP2PZHEzKjKZu+NHjC4gLUBC6mxnaLIRP9zd5WNJ2VRa+E52IjvDZBaU8RpPA0xwz3 Iel4RGwzMyI6OPT9IkxBCsW0r6LuTOf274edW52BEAytDyK5R4x1RjRhI6iQLPTx9Yje +7Z3y3YPEg9EVPkQjnC9K32E86bcgTLE6KGk25WOoPBqZrnETrG0k+Y9nXgpA2d1CMpY nCdw== X-Gm-Message-State: AMCzsaW0AstH9qZwDDvCPmt9TkVN5QXRX+EoHgNnsS7h6z2gi0UqIqd9 ImMaAQb6rpbJtJK/aVKz94h9rA== X-Received: by 10.233.235.149 with SMTP id b143mr708639qkg.218.1509421649341; Mon, 30 Oct 2017 20:47:29 -0700 (PDT) Received: from localhost.localdomain ([181.231.59.220]) by smtp.gmail.com with ESMTPSA id v40sm306250qtj.81.2017.10.30.20.47.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Oct 2017 20:47:28 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Oct 2017 00:47:06 -0300 Message-Id: <20171031034706.8952-1-jamrial@gmail.com> X-Mailer: git-send-email 2.14.2 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 --- 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..799c414259 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 */