From patchwork Fri May 10 16:56:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48704 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp718260pzb; Fri, 10 May 2024 09:56:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVH9Pu0uZ+6U2mUL7L0AUQgvO4GyMZl5g59I79hKIOHrBPNSUa6m9Hgk66d7tRK7RkPo7BYVhSJHyXsaEs230o/IHYEI26M2Wph9Q== X-Google-Smtp-Source: AGHT+IG55qD21wVIqjuIgxbbFCjBX0fOo3QhqDXMZmmtGPryHn5WyaYoHvD2AmPFTraxDjEelq+G X-Received: by 2002:ac2:4284:0:b0:51f:b781:72a7 with SMTP id 2adb3069b0e04-522105846afmr2199306e87.60.1715360206932; Fri, 10 May 2024 09:56:46 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a5a17ba39b8si241925566b.551.2024.05.10.09.56.46; Fri, 10 May 2024 09:56:46 -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=@outlook.com header.s=selector1 header.b=t5WCrKJd; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 50B7368D352; Fri, 10 May 2024 19:56:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2095.outbound.protection.outlook.com [40.92.91.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF38D68D4BF for ; Fri, 10 May 2024 19:56:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NCpKHE3OxSN8Ru/EEztKYoR2RxTyr/MIUld1BryE6aCSbVw+4aOq89RYlZewazYp+YAbLYXug0zHm2gF65712J/yASUHPFqGcn4uzmmWlTHXzqAHu2pX+04ys0kooo96w6ZMof+6lzq+5MgdOc/nL7Ya4y0zO03GDL1q3uM6Lbbcw5CDyx4f3dKsNV8wz8ai3ynkBfdwKC9RGK20Qj+ifiSwhb0E0IieZlruUh/zxlDLksK6+YzkmQubt8JK8H1Wgwli22Wz1xDivDnQfgpKeQT9fTA8gEbZjSZZZgrgj+ZWCLKUT6zP+0rQWRed7TpdaFpAY64/dQNt//jMPJVGbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Mf2Fv1QTMyBfpvkLgHHQhVooQiVRWarSbY+asCxqT14=; b=jCw/7AJ91bjVDCiokwMGPPAQcgyA09ZoOc5aOBhgzcDq3WWYY1r+AJY6D12YJziliAB0tjRczWbdBAFHn+glx+DdxkZrhLTa4ot0wvI+FwikT6WrS9HlxNac3STnRt/n6CWDCZS8n3lxxyDRNa6hFHWjt+FXt4Y3xLUrRpxVe3pwS8M+r7w1rgTBZkZi22R88NG0mEBUh482/w9gD3zoXIwH89sTTQWYcRdgd2AOB85sOQPggYUY5PM8eoJmRm/GEfjV9Zcgw7YSd8VTkttVDbxQN9LDbaJCX3OdpmKo75cu0YW2og80IVuSKdxmoydSOtISiWyJrIwavEpw2syAGw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Mf2Fv1QTMyBfpvkLgHHQhVooQiVRWarSbY+asCxqT14=; b=t5WCrKJd9Bb2UIf7OxKzo5Eq/bAd4OWwL7KzzoM0nlpS3u3JUx48W4QFh01RmwaMzleygn/iOqo8MROF66Df8qNCdLlrhS6edHL0iN478goAVAXEiiiGcIWKoEMPboGLjjWRx5ch3KQNkDHCMKOE7nzzqQGFrhyQyX4cse63PWszsA5+VGEIBS+pZZ2D3ugouLwdAUAOTPTtcpBhvbzHtkxotOyKsO5vM/JMI2DqktzFyjzncMF44Cn0DqUP/2moBjqzVrnifdPbpph1cjDrUEwwJCP4VAISRhhNMAcKa310yW6XHOZAHDvHPabE0bm6yE3jg5/3OA5xbHXkVwsg1w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0283.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.49; Fri, 10 May 2024 16:56:35 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.048; Fri, 10 May 2024 16:56:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 May 2024 18:56:25 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [AsGcROfLpwd4jPFWWAayum+uQCtDVSdlxxr/rpAQuFM=] X-ClientProxiedBy: ZR0P278CA0015.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::25) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240510165627.507659-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0283:EE_ X-MS-Office365-Filtering-Correlation-Id: 22d17844-1a1e-4acc-3f4b-08dc71122687 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: xLl0IEESNk6WG1twnq61sLlRI1OXD3wcrGIB34kR5zv3vqgv0Kp6Js2PMbS8qMcVUz7OAPOl8Gydsfx9igWBRip4aS1+bhanObX78UUUBD6l/WCBPWsa10t7r/YkxON82kACmyMaT75aakD0vedzhmMQrBWJmOzg5XdyVTQ3VFLphSRzomYSERMu7ASW/tguE/pwMLcjPWBnr7jHM5Ra+m+24WGDcDu1ID6jeHFA+TarAchH1IlWP/v3Yi2cLqSZe1Cuq/VIQLbYZeeKRsbDzN8j1eLo1mwnAMSAWKQv91zIjEqF6T4mvO4/0Ssl2YKTiR4E22TRsYFLH+jPXgyvie3bwMkkf+qrwRnJKsrJFCFTt/koCiwHrFX9HjGL3pEAy0mJ2KkY/yzam4J6Dj/PZ0PHKTnnxQbBH3WVw/j+DABk0EEulHPTEJ0J4kHqvy9Y97jC4WqHD+Vv4/5ajiBZkzoD9j27RbpdK6vZ//GNbSNOI5V3GbKngw1MQbOTBeqWEbU5GJbre15B9cO5B9HrwZOazy7lBdTs9guz/xd0nH39gqQ1UM17g66JXPtRMJ+CQoADUyMPWeY28NOr3nd5BdIQ9Wlaq8MaxmTjbAyss37JRmRL2xn8CbPj+dySFrhN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MGzYuKzblK7il4aWka67ysrSKrdewdrS2+ci1VAn9v6kyjhe2XhH38NygLXJ8mNIaK7rzH83O3Ckpk2vQaFzG3PacIwhiDY1FqrcVqSwFrRNulew977KosQTKVOaw60QvkQX4SGzC+GB3DwCuMALFXehxzheuaQuSTxW9i3n4K+LJXkoIDu5/vtx1XOvcuVE9twW80HNk/+l6U6P836lwtBlNcIcxlrecS3GkTjCnQludIbbqWy1CBCEkyew4MI+FUwCDHux8i51Fnz3Hmp3/Wi7dSqM1RxfBx3UbmixMu//h2GGaSUmNHjT9ecQQks+5/mk9t8b/HJ4H/2vl0ss6yI6u3SL6M40XKygLzSHIOFXrMRWNRrQggBkiEBFNYuSTlMO04SFci4dS7taT7EIzU+5faLklMgB2eLBYCidldRV5axrVFI/xrTm/db7qKKb3F/Uu3Fo2X8wjahmTrNjO5KcIK8AMb2uj/WdmUd1zGUS2aiwHq9dwANG68ZY7HnN0/Hlh+/K8t9L42/PtlOl1s9JiRYjesLIYor8lvb6ak1xIAM4xdgkZ2XwRYakA34elSLbwvkMcojsbeRW1w0PTRDeNyEdrovPyDHvHvrtJ3JJO33xm4GmDFbSxu5+fkqNOy9Hh7lVR24Njrj6zIsFbrSmZ3+Tyy7adRVwbQHxII8xJFdKIA/+Ff5o6GXJ7mKcDuOOhEf/aRHyz39TWd4oeGqJlXwTcuMFSKVnjeKWjsIpWah5dxb4vNMjmYBc0S+wfhJoNyapzevt/kCJJk5AZKJjRJdcxfiHMstCYJpb2juhC75FKf0u2pjWDIspQ8uRaiuUYjGO6J0C2yytakF9YKSWBK9vz4LIzaHu+Wgy4k5tuCZ9cxk+BwFc95WKHiY/nmDC/ukCG6O5yRuIY39Li8U34u8DrkIReY4GVLwytOhkagdWFTNYbcxESk/AnhoJRgnUCbrEfspKVcBQsoze3hfzRLoAEqkbuqYH4dqOgJ2samjQ67Ah3UA21rTSAqK+tH/yMTxi7MIjydLsrr2rdd2D2q8bGn6geYizrcmTCWgczr1pAL2K+6OJT1dq7fFDf+Y/Yenyp5JnZ0lvYQjlOgdo+Jhy/CGWsz2uRHoG6xzfM1jVySyvoATG/yKti+N6GhBDvb3A1L6q0NP8gtl7gAyLa+UK9Do5BpFAh2NZitC096sDlVukaGwri8h/V2S5oxYtEkpJ3FEhRLbycjOleTnYcMl+g6U+qlIr/QSkSlREixKWON2LpwndyPj4mz2m9A0a16s8vKdfcj8Liq5SzQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22d17844-1a1e-4acc-3f4b-08dc71122687 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2024 16:56:35.1298 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0283 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/aac_ac3_parser: Untangle AAC and AC3 parsing error codes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jCyssQR6OesE Also remove the (unused) AAC_AC3_PARSE_ERROR_CHANNEL_CFG while at it; furthermore, fix the documentation of ff_ac3_parse_header() and (ff|avpriv)_adts_header_parse(). Signed-off-by: Andreas Rheinhardt --- libavcodec/aac_ac3_parser.h | 10 ---------- libavcodec/ac3_parser.c | 14 +++++++------- libavcodec/ac3_parser_internal.h | 13 ++++++++++--- libavcodec/ac3dec.c | 18 ++++++++---------- libavcodec/adts_header.c | 7 +++---- libavcodec/adts_header.h | 16 ++++++++++------ libavcodec/eac3dec.c | 6 +++--- 7 files changed, 41 insertions(+), 43 deletions(-) diff --git a/libavcodec/aac_ac3_parser.h b/libavcodec/aac_ac3_parser.h index bc16181a19..e3259d1841 100644 --- a/libavcodec/aac_ac3_parser.h +++ b/libavcodec/aac_ac3_parser.h @@ -28,16 +28,6 @@ #include "avcodec.h" #include "parser.h" -typedef enum { - AAC_AC3_PARSE_ERROR_SYNC = -0x1030c0a, - AAC_AC3_PARSE_ERROR_BSID = -0x2030c0a, - AAC_AC3_PARSE_ERROR_SAMPLE_RATE = -0x3030c0a, - AAC_AC3_PARSE_ERROR_FRAME_SIZE = -0x4030c0a, - AAC_AC3_PARSE_ERROR_FRAME_TYPE = -0x5030c0a, - AAC_AC3_PARSE_ERROR_CRC = -0x6030c0a, - AAC_AC3_PARSE_ERROR_CHANNEL_CFG = -0x7030c0a, -} AACAC3ParseError; - typedef struct AACAC3ParseContext { ParseContext pc; int header_size; diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c index 4e0ba73481..69989690dd 100644 --- a/libavcodec/ac3_parser.c +++ b/libavcodec/ac3_parser.c @@ -81,12 +81,12 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) hdr->sync_word = get_bits(gbc, 16); if(hdr->sync_word != 0x0B77) - return AAC_AC3_PARSE_ERROR_SYNC; + return AC3_PARSE_ERROR_SYNC; /* read ahead to bsid to distinguish between AC-3 and E-AC-3 */ hdr->bitstream_id = show_bits_long(gbc, 29) & 0x1F; if(hdr->bitstream_id > 16) - return AAC_AC3_PARSE_ERROR_BSID; + return AC3_PARSE_ERROR_BSID; hdr->num_blocks = 6; hdr->ac3_bit_rate_code = -1; @@ -103,11 +103,11 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) hdr->crc1 = get_bits(gbc, 16); hdr->sr_code = get_bits(gbc, 2); if(hdr->sr_code == 3) - return AAC_AC3_PARSE_ERROR_SAMPLE_RATE; + return AC3_PARSE_ERROR_SAMPLE_RATE; frame_size_code = get_bits(gbc, 6); if(frame_size_code > 37) - return AAC_AC3_PARSE_ERROR_FRAME_SIZE; + return AC3_PARSE_ERROR_FRAME_SIZE; hdr->ac3_bit_rate_code = (frame_size_code >> 1); @@ -138,19 +138,19 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) hdr->crc1 = 0; hdr->frame_type = get_bits(gbc, 2); if(hdr->frame_type == EAC3_FRAME_TYPE_RESERVED) - return AAC_AC3_PARSE_ERROR_FRAME_TYPE; + return AC3_PARSE_ERROR_FRAME_TYPE; hdr->substreamid = get_bits(gbc, 3); hdr->frame_size = (get_bits(gbc, 11) + 1) << 1; if(hdr->frame_size < AC3_HEADER_SIZE) - return AAC_AC3_PARSE_ERROR_FRAME_SIZE; + return AC3_PARSE_ERROR_FRAME_SIZE; hdr->sr_code = get_bits(gbc, 2); if (hdr->sr_code == 3) { int sr_code2 = get_bits(gbc, 2); if(sr_code2 == 3) - return AAC_AC3_PARSE_ERROR_SAMPLE_RATE; + return AC3_PARSE_ERROR_SAMPLE_RATE; hdr->sample_rate = ff_ac3_sample_rate_tab[sr_code2] / 2; hdr->sr_shift = 1; } else { diff --git a/libavcodec/ac3_parser_internal.h b/libavcodec/ac3_parser_internal.h index 2ac0e67ec2..2c4eb546e5 100644 --- a/libavcodec/ac3_parser_internal.h +++ b/libavcodec/ac3_parser_internal.h @@ -64,15 +64,22 @@ typedef struct AC3HeaderInfo { /** @} */ } AC3HeaderInfo; +typedef enum { + AC3_PARSE_ERROR_SYNC = -0x1030c0a, + AC3_PARSE_ERROR_BSID = -0x2030c0a, + AC3_PARSE_ERROR_SAMPLE_RATE = -0x3030c0a, + AC3_PARSE_ERROR_FRAME_SIZE = -0x4030c0a, + AC3_PARSE_ERROR_FRAME_TYPE = -0x5030c0a, + AC3_PARSE_ERROR_CRC = -0x6030c0a, +} AC3ParseError; + /** * Parse AC-3 frame header. * Parse the header up to the lfeon element, which is the first 52 or 54 bits * depending on the audio coding mode. * @param[in] gbc BitContext containing the first 54 bits of the frame. * @param[out] hdr Pointer to struct where header info is written. - * @return Returns 0 on success, -1 if there is a sync word mismatch, - * -2 if the bsid (version) element is invalid, -3 if the fscod (sample rate) - * element is invalid, or -4 if the frmsizecod (bit rate) element is invalid. + * @return Returns 0 on success and AC3_PARSE_ERROR_* values otherwise. */ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr); diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 2d7e11c5b8..0a4d3375ee 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -39,7 +39,6 @@ #include "libavutil/opt.h" #include "libavutil/thread.h" #include "bswapdsp.h" -#include "aac_ac3_parser.h" #include "ac3_parser_internal.h" #include "ac3dec.h" #include "ac3dec_data.h" @@ -1538,19 +1537,19 @@ dependent_frame: if (err) { switch (err) { - case AAC_AC3_PARSE_ERROR_SYNC: + case AC3_PARSE_ERROR_SYNC: av_log(avctx, AV_LOG_ERROR, "frame sync error\n"); return AVERROR_INVALIDDATA; - case AAC_AC3_PARSE_ERROR_BSID: + case AC3_PARSE_ERROR_BSID: av_log(avctx, AV_LOG_ERROR, "invalid bitstream id\n"); break; - case AAC_AC3_PARSE_ERROR_SAMPLE_RATE: + case AC3_PARSE_ERROR_SAMPLE_RATE: av_log(avctx, AV_LOG_ERROR, "invalid sample rate\n"); break; - case AAC_AC3_PARSE_ERROR_FRAME_SIZE: + case AC3_PARSE_ERROR_FRAME_SIZE: av_log(avctx, AV_LOG_ERROR, "invalid frame size\n"); break; - case AAC_AC3_PARSE_ERROR_FRAME_TYPE: + case AC3_PARSE_ERROR_FRAME_TYPE: /* skip frame if CRC is ok. otherwise use error concealment. */ /* TODO: add support for substreams */ if (s->substreamid) { @@ -1563,8 +1562,7 @@ dependent_frame: av_log(avctx, AV_LOG_ERROR, "invalid frame type\n"); } break; - case AAC_AC3_PARSE_ERROR_CRC: - case AAC_AC3_PARSE_ERROR_CHANNEL_CFG: + case AC3_PARSE_ERROR_CRC: break; default: // Normal AVERROR do not try to recover. *got_frame_ptr = 0; @@ -1574,7 +1572,7 @@ dependent_frame: /* check that reported frame size fits in input buffer */ if (s->frame_size > buf_size) { av_log(avctx, AV_LOG_ERROR, "incomplete frame\n"); - err = AAC_AC3_PARSE_ERROR_FRAME_SIZE; + err = AC3_PARSE_ERROR_FRAME_SIZE; } else if (avctx->err_recognition & (AV_EF_CRCCHECK|AV_EF_CAREFUL)) { /* check for crc mismatch */ if (av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, &buf[2], @@ -1582,7 +1580,7 @@ dependent_frame: av_log(avctx, AV_LOG_ERROR, "frame CRC mismatch\n"); if (avctx->err_recognition & AV_EF_EXPLODE) return AVERROR_INVALIDDATA; - err = AAC_AC3_PARSE_ERROR_CRC; + err = AC3_PARSE_ERROR_CRC; } } } diff --git a/libavcodec/adts_header.c b/libavcodec/adts_header.c index 00fa0a5a99..8663d00f4c 100644 --- a/libavcodec/adts_header.c +++ b/libavcodec/adts_header.c @@ -21,7 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "aac_ac3_parser.h" #include "adts_header.h" #include "adts_parser.h" #include "get_bits.h" @@ -35,7 +34,7 @@ int ff_adts_header_parse(GetBitContext *gbc, AACADTSHeaderInfo *hdr) memset(hdr, 0, sizeof(*hdr)); if (get_bits(gbc, 12) != 0xfff) - return AAC_AC3_PARSE_ERROR_SYNC; + return AAC_PARSE_ERROR_SYNC; skip_bits1(gbc); /* id */ skip_bits(gbc, 2); /* layer */ @@ -43,7 +42,7 @@ int ff_adts_header_parse(GetBitContext *gbc, AACADTSHeaderInfo *hdr) aot = get_bits(gbc, 2); /* profile_objecttype */ sr = get_bits(gbc, 4); /* sample_frequency_index */ if (!ff_mpeg4audio_sample_rates[sr]) - return AAC_AC3_PARSE_ERROR_SAMPLE_RATE; + return AAC_PARSE_ERROR_SAMPLE_RATE; skip_bits1(gbc); /* private_bit */ ch = get_bits(gbc, 3); /* channel_configuration */ @@ -55,7 +54,7 @@ int ff_adts_header_parse(GetBitContext *gbc, AACADTSHeaderInfo *hdr) skip_bits1(gbc); /* copyright_identification_start */ size = get_bits(gbc, 13); /* aac_frame_length */ if (size < AV_AAC_ADTS_HEADER_SIZE) - return AAC_AC3_PARSE_ERROR_FRAME_SIZE; + return AAC_PARSE_ERROR_FRAME_SIZE; skip_bits(gbc, 11); /* adts_buffer_fullness */ rdb = get_bits(gbc, 2); /* number_of_raw_data_blocks_in_frame */ diff --git a/libavcodec/adts_header.h b/libavcodec/adts_header.h index 354d07e1f8..d89d487025 100644 --- a/libavcodec/adts_header.h +++ b/libavcodec/adts_header.h @@ -25,6 +25,12 @@ #include "get_bits.h" +typedef enum { + AAC_PARSE_ERROR_SYNC = -0x1030c0a, + AAC_PARSE_ERROR_SAMPLE_RATE = -0x3030c0a, + AAC_PARSE_ERROR_FRAME_SIZE = -0x4030c0a, +} AACParseError; + typedef struct AACADTSHeaderInfo { uint32_t sample_rate; uint32_t samples; @@ -42,9 +48,8 @@ typedef struct AACADTSHeaderInfo { * the first 54 bits. * @param[in] gbc BitContext containing the first 54 bits of the frame. * @param[out] hdr Pointer to struct where header info is written. - * @return Returns 0 on success, -1 if there is a sync word mismatch, - * -2 if the version element is invalid, -3 if the sample rate - * element is invalid, or -4 if the bit rate element is invalid. + * @return Returns the size in bytes of the header parsed on success + * and AAC_PARSE_ERROR_* values otherwise. */ int ff_adts_header_parse(GetBitContext *gbc, AACADTSHeaderInfo *hdr); @@ -56,9 +61,8 @@ int ff_adts_header_parse(GetBitContext *gbc, AACADTSHeaderInfo *hdr); * @param[out] phdr Pointer to pointer to struct AACADTSHeaderInfo for which * memory is allocated and header info is written into it. After using the header * information, the allocated memory must be freed by using av_free. - * @return Returns 0 on success, -1 if there is a sync word mismatch, - * -2 if the version element is invalid, -3 if the sample rate - * element is invalid, or -4 if the bit rate element is invalid. + * @return Returns 0 on success, AAC_PARSE_ERROR_* values on invalid input + * and ordinary AVERROR codes otherwise. */ int avpriv_adts_header_parse(AACADTSHeaderInfo **phdr, const uint8_t *buf, size_t size); diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c index 5c71751a0c..2b3bffda6e 100644 --- a/libavcodec/eac3dec.c +++ b/libavcodec/eac3dec.c @@ -39,8 +39,8 @@ #include "avcodec.h" -#include "aac_ac3_parser.h" #include "ac3.h" +#include "ac3_parser_internal.h" #include "ac3dec.h" #include "ac3dec_data.h" #include "eac3_data.h" @@ -300,7 +300,7 @@ static int ff_eac3_parse_header(AC3DecodeContext *s) dependent streams which are used to add or replace channels. */ if (s->frame_type == EAC3_FRAME_TYPE_RESERVED) { av_log(s->avctx, AV_LOG_ERROR, "Reserved frame type\n"); - return AAC_AC3_PARSE_ERROR_FRAME_TYPE; + return AC3_PARSE_ERROR_FRAME_TYPE; } /* The substream id indicates which substream this frame belongs to. each @@ -312,7 +312,7 @@ static int ff_eac3_parse_header(AC3DecodeContext *s) s->eac3_subsbtreamid_found = 1; avpriv_request_sample(s->avctx, "Additional substreams"); } - return AAC_AC3_PARSE_ERROR_FRAME_TYPE; + return AC3_PARSE_ERROR_FRAME_TYPE; } if (s->bit_alloc_params.sr_code == EAC3_SR_CODE_REDUCED) {