From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id DE45940039 for ; Sat, 18 Oct 2025 17:27:37 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'7HNtIXhc3dyH2Q9NdwEgQqmcGzRJfroElykLVtxBvy8=', expected b'7FQpvIO1mT4fQ5o8iTvV+jvUhgBwk8cRen/qek8L86A=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1760808440; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=7HNtIXhc3dyH2Q9NdwEgQqmcGzRJfroElykLVtxBvy8=; b=rk3ny2ryM5KcMn07xGNEaHZyIZaKg9JkGbTHZEJ+lWU1Nh63NiRkp8Zkj/afVVyDPj1Pe Rrl5071LsTIITbAakHnts5o24BqJIENJqi6043R9V9IDr98sN7DVrlB+EGgAMYCt2B0Ll+q Oo1VWiB2lSV593iZuulBRxsUQOw+lFvd8ShcKb4YzobRXPexSM3kIOi39HIPtioVK0lJTJ1 uK6k9y0mNSCW/6UZnpLb+/or/IuIYEYGEGndHYAX4yWVYmF0XPw6Y5LnfEdKjqzdhtwGL1J cHpVYPJ9B/p9R+pfJdQZTUsz7waoFABsDX7ExgMPjK+TibeHElmFw2MmloiA== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 0418468F4BF; Sat, 18 Oct 2025 20:27:20 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1760808425; b=g76+SBQUsMV31cpcwSzo7DM8mCfyNx/1Cb8smxc+YS20fOor+AIUaddZU8L5u5hvGEEH4 fdohTTo9WXo8BBDfLPx0WPgzbJzB94fPFATMTm37tiTVr7ONBQpk+kdLzf2c5MKtb48twLV GaDP4SaugFfFTf3kkx4uZJmvFV5BQ0tyBTtNugl9utfTA17rnQbYM4/9tG6Bzt+1yH5KIny EG/hqGrYdQAIE8XlIkncy47va51qJqph2yJ9TC/n1VOWxb+R3Bz7jtMwqt9VFwQ40HVQrKB hWayDO/HOu58FdzHzSA+4JOsIM1qWa1IeJewWPWYG4G2fQYLZ1oB2ijn1o4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1760808425; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=7WZp7gTTVT6WExipUmFUTZ/D1MY/ez8mR8kMRhHiJD4=; b=ncBjusaB1Q9QNka0vUp+fpV7S/whDqgnBS1yiJL2GVNiJWQ+tM4dhkot+M1fJQKONArWc QnC61G95J/T8EVIl/OcnKjJJKc2J3misDLpKC3F8sr7LVqQ+dZkhgpZa1XxfpBpDfy9tLwa qGOunC76YQVvflnZBmbWxFnsNhgQQiARVSpnLRmS2iBKJLk2yj7PeLhOBrIBQRo1lxPQ5gn pVhzGwV7ZS6ize3wSIc67XpuysUvb3OItnS72D75jITWRV6PvOQKKRwcYNeeQxf7/1xpwl6 iYSjq6rex0l7C0SVEwwWc/6s9GoP/sn8Jd4v/GJO8MgbRQ10fJSSpCesZIyA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1760808418; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=7FQpvIO1mT4fQ5o8iTvV+jvUhgBwk8cRen/qek8L86A=; b=yvISWALVsfKfdfTVFVfn21yqaZwWKoaFnt4MLwrMCe0/Xhl+501TAo1jC1S17tzsP5dmk RatmwAO7aeBC9nI5FPLqb1nqhOPoBLaaxJsvJ9w/q3m9O6yHFkcyvsPgDmlCH6S/4RLrqOx pazshWRHWQwwEcYiPQNcidY+wsOjiZlC9EwhXTOuC6TPWNU/3SLxO8Js29g28lt+BOnzNT9 r7Gl42Wj1EERuvYujDru+zp3biQsN/u1ojcRccBhAd7LQDwEAWQ20EGgaNQFFcW23ZqgwPi yz2NG1dWKTR2VtX44Em663aesSDsGnUp7F2Dp5VGSiP/ud7UwzALXsz8mvgA== Received: from 547bf0a948a1 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id CCCAA68EEF1 for ; Sat, 18 Oct 2025 20:26:58 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Oct 2025 17:26:58 -0000 Message-ID: <176080841895.62.830144648391342506@bf907ddaa564> Message-ID-Hash: CAGQC4AHPUDMYBORWXJ7NUFDBLXHFBT7 X-Message-ID-Hash: CAGQC4AHPUDMYBORWXJ7NUFDBLXHFBT7 X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] Added new celt with opus 1.5.2 (PR #20716) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Jamaika1 via ffmpeg-devel Cc: Jamaika1 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20716 opened by Jamaika1 URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20716 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20716.patch >>From f1276fe5217d07fda6d7dba77d0740a32d4fdc15 Mon Sep 17 00:00:00 2001 From: Jamaika1 Date: Sat, 18 Oct 2025 17:26:10 +0000 Subject: [PATCH] Added new celt with opus 1.5.2 --- libavcodec/libcelt_dec.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/libavcodec/libcelt_dec.c b/libavcodec/libcelt_dec.c index fcd4fc7736..bdaf89e3de 100644 --- a/libavcodec/libcelt_dec.c +++ b/libavcodec/libcelt_dec.c @@ -1,6 +1,6 @@ /* - * Xiph CELT decoder using libcelt - * Copyright (c) 2011 Nicolas George + * Xiph OPUS decoder using libcelt + * Copyright (c) 2023 Nicolas George * * This file is part of FFmpeg. * @@ -21,6 +21,7 @@ #include #include +#include #include "avcodec.h" #include "codec_internal.h" #include "decode.h" @@ -35,17 +36,17 @@ struct libcelt_context { static int ff_celt_error_to_averror(int err) { switch (err) { - case CELT_BAD_ARG: return AVERROR(EINVAL); + case OPUS_BAD_ARG: return AVERROR(EINVAL); #ifdef CELT_BUFFER_TOO_SMALL - case CELT_BUFFER_TOO_SMALL: return AVERROR(ENOBUFS); + case OPUS_BUFFER_TOO_SMALL: return AVERROR(ENOBUFS); #endif - case CELT_INTERNAL_ERROR: return AVERROR(EFAULT); - case CELT_CORRUPTED_DATA: return AVERROR_INVALIDDATA; - case CELT_UNIMPLEMENTED: return AVERROR(ENOSYS); + case OPUS_INTERNAL_ERROR: return AVERROR(EFAULT); + //case OPUS_CORRUPTED_DATA: return AVERROR_INVALIDDATA; + case OPUS_UNIMPLEMENTED: return AVERROR(ENOSYS); #ifdef ENOTRECOVERABLE - case CELT_INVALID_STATE: return AVERROR(ENOTRECOVERABLE); + case OPUS_INVALID_STATE: return AVERROR(ENOTRECOVERABLE); #endif - case CELT_ALLOC_FAIL: return AVERROR(ENOMEM); + case OPUS_ALLOC_FAIL: return AVERROR(ENOMEM); default: return AVERROR(EINVAL); } } @@ -65,12 +66,12 @@ static av_cold int libcelt_dec_init(AVCodecContext *c) if (!c->ch_layout.nb_channels || !c->frame_size || c->frame_size > INT_MAX / sizeof(int16_t) / c->ch_layout.nb_channels) return AVERROR(EINVAL); - celt->mode = celt_mode_create(c->sample_rate, c->frame_size, &err); + celt->mode = opus_custom_mode_create(c->sample_rate, c->frame_size, &err); if (!celt->mode) return ff_celt_error_to_averror(err); - celt->dec = celt_decoder_create_custom(celt->mode, c->ch_layout.nb_channels, &err); + celt->dec = opus_custom_decoder_create(celt->mode, c->ch_layout.nb_channels, &err); if (!celt->dec) { - celt_mode_destroy(celt->mode); + opus_custom_mode_destroy(celt->mode); return ff_celt_error_to_averror(err); } if (c->extradata_size >= 4) { @@ -98,8 +99,8 @@ static av_cold int libcelt_dec_close(AVCodecContext *c) { struct libcelt_context *celt = c->priv_data; - celt_decoder_destroy(celt->dec); - celt_mode_destroy(celt->mode); + opus_custom_decoder_destroy(celt->dec); + opus_custom_mode_destroy(celt->mode); return 0; } @@ -114,7 +115,7 @@ static int libcelt_dec_decode(AVCodecContext *c, AVFrame *frame, if ((err = ff_get_buffer(c, frame, 0)) < 0) return err; pcm = (int16_t *)frame->data[0]; - err = celt_decode(celt->dec, pkt->data, pkt->size, pcm, c->frame_size); + err = opus_custom_decode(celt->dec, pkt->data, pkt->size, pcm, c->frame_size); if (err < 0) return ff_celt_error_to_averror(err); if (celt->discard) { -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org