From patchwork Mon Jan 3 11:50:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33033 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp16048529iog; Mon, 3 Jan 2022 03:51:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzyfuZ8GnFPt1amEWfJe/Mr8NB7GGrwbuqlqGCbBs/Xe+QT4km8FCzdT6+gkk33GHknXltM X-Received: by 2002:a17:907:3e0c:: with SMTP id hp12mr34835117ejc.686.1641210676538; Mon, 03 Jan 2022 03:51:16 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g3si16740514edz.300.2022.01.03.03.51.15; Mon, 03 Jan 2022 03:51:16 -0800 (PST) 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=JoiditDI; 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 2432D68B192; Mon, 3 Jan 2022 13:51:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2088.outbound.protection.outlook.com [40.92.89.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CADE6688132 for ; Mon, 3 Jan 2022 13:51:04 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EqC4zxPAQS/C2lNp33AkmvqrpV289CT/gmX+rjIvR4/H7g4lH047mXbhTtmVj3GCqhAhIgzzhTFFm4nLtBYvn/T0ly8vGdh3xjOyps8+lBE80AiM4KSNsCbR27irvYLZ5GUTzrcmi4ZtuzTv80LSBoYlyWpLxJS4DgC3EXDLDd73tebNgKa45dqSDpKkGK5hsXyAJiPpW3/C7b+ckVcKy7P09QXHik7Dhm3Ie6aRIHLNqEt+8NS0Lwt0kheFv4WrzGtO8AmfQzf/40r0mSZdFKxCGWL0bnBcOb5JZ+iEM5VPbCBcVOQly1p6bA4+qd7go54gUCS+dWhZC1ScmZbYow== 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=wCiVLs5S135d0hH985/2FNhWArRnmaa/GMDzLp++eCA=; b=cLXt3V7lL35mnTWZan1QVBgrmV/lF7FpvvIc4ZWDry9ylX/51FBm3BmdWIVvP4sBnvrO1ovGdCVw9z2+hRL2lapyiH9YgvUg4u4E4hXZy2FdAjXztHq7FZJXTxxL1oN9wLG3Ndwc39c2hJru1DWjBGap+hUZw56HvDbfVv/mPlysRUuTZABpHvNGex304VgWxj0+Mo4HofCqMLSnyHsm4oO6Nc+BfgM2enbN8n3Qgxg+YjHVnRZRsp1w/AUY52bvi6GnXehEbH4PAsfKhQsXDDPQeXNQa3NdCCfqwmcuP/IBmM1MU9NlPW4BCcTdnQVeM/vaLpRH8ODWZYzPu7IWDA== 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=wCiVLs5S135d0hH985/2FNhWArRnmaa/GMDzLp++eCA=; b=JoiditDI1XH2uKZBoIAW+W/+6bDEGWi0ffImOhFWr5O+iz3ZFyn6ZnOyWc8s51XSiFlUcf/9RqaJIWqBiCHT/5WTf9IXBkjatbLYBpNKmRB4aCMQsKmlZHVsP55I8DVHIccj6XB79SHbiy96XOlUl1h0ot2kIeSFFSY7Ou1JMHajhL/NlQruKKigdZEHjL/Gu1mmIKYXwXXE8IWAB8pPOfM3rFnc7jb7yBUy6JR2kc1M8zEK/LUeqWEeD2E7guJLd9hlxiwryQcAPpyxS6Aw7GIm3Ek1VYKRLpIwj6n6yknPSHIxMM7vl2sA50AZ9EKTGW/Puqn1b/T/dMhss6XwFw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7270.eurprd03.prod.outlook.com (2603:10a6:20b:2e4::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.14; Mon, 3 Jan 2022 11:51:03 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%6]) with mapi id 15.20.4844.016; Mon, 3 Jan 2022 11:51:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Jan 2022 12:50:56 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [s84RM/4XoIRAF4iRjgTWzOM064qQAPUQ] X-ClientProxiedBy: AM6PR08CA0033.eurprd08.prod.outlook.com (2603:10a6:20b:c0::21) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220103115056.156200-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0c24e7c1-32c3-4ea1-0349-08d9ceaf5173 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJ+cHfC79vTguh6WqLpD1ahOteLuVYzy+6fqHY+Xbd54NfZzLGhanaeHvi1b3LPEdn79Rq8FMCjZ8YmYyW+gwWm7n2YAG4fNGJjdT7blQpDNi3AZEe3Y0cE3JC7QoYKBMyMf6UKaXWW0/a/bIg+qq74FToOXX9cvj2LKXeF+o3eyKAfZlx44BHuHlUs2UyHZRWM24mGk+q1mXu2Zso9xlmAlhK9msybxE10aRQw2PkgnS/TwxSrW3XABlgEcIkcxKMHxBZawa+Xjz2sLk/fVXXRJdPg6seSiKjnaEWEkR/ChvxBeSdaB2vm8ieWr/hpk+ZlAVTgNtuac5TMWgT3o8k5lBg8gNCU/dZWXwcjtnxFJwCnoAincf06HbpNVeO+PGMfFrR3Af9LCooV1VDF6l1/EjKS7Dz4v31iEPpTKeKyHJ04gT47d6ljl4IuZFslH8n9voL5UkeHjPFOYraQzWLzCYekCTW2Mx9hnKIjfSLd+Vv+7+fMlkPgyvB7+T+qI+0nrA8hA5h7Vcj4IV5ZqM8QyP5A5u6w+b7zCnF+QZ/UGCtDna53lsrYw+LRHHFDM94GCgD4342WYHbO6HYwgGYqMORupnwDJp3+FVIUpTeo58WexUFcHwa3FksQ/BoAjQxWjdB4qoGBKbVtvLJV951DaZ0lORMP1jtkQWr8tHVvkkbPPjFAyXhiaKpm+CLV/FBHE7H1Q9jneQ== X-MS-TrafficTypeDiagnostic: AS8PR03MB7270:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /djpd8DP43vroDl5wrbrTTLNZOlL7VzyBACJlHlfzVOv+THVeVsW/JAeXVUxSYMm1OvjQnP6BuampmE+GM0rGhQgUNP/qOlDfWNbkXhf/5WcvNqa1sD37X4jkOCTBy8bGe/t6sRnWJdfO1/lTqTMT9C3co3MVoUjAHHzJ5etB7SHvRdJ62pU5LWGM3FUDnYITRaC3MOakXoU57SRGeD2iW+de1SKf7V/nI+GL0vet0DaHxkWgj1vuI7HHSn0TiAOO7spHjhfT3w80ck1e5X085iJzkGTD289PRaCMTXfh+8y5RogmCDtVm7zy0DX6CXe2a3+fMweAWXVHVd+3XDGNJe7bpAsLzAICHnQhwcUTEsXcNqH1f4+dqDmFEoMk+Jyt/iUlQFKBBquEjsF8OiicmDeRpd+ZbXfMxfxUNA1e4+267Cu7Zhrx3QyPe2zxBZnSDK7aWmsrhtxX1OKC8QYT0mJ7n0Z9i1PU29TgzffuyhFQQNx7C41X5WtQSlqeqjcKPps7yth4N5jCzJ85phTpyA1YTb+ufs/aD6/63CT8itEPgER2usByIz7u2tOoF4eKnQg7iMQ3PTcrVN6qpKtEw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sT/n7Nm8vXhBreeJurnfvYy+h0lZbaLEsAiXOLS8RjrpcKxlKrfWJ8ZHRsf2NkyQ+sVG5IVdF90Oq5Buz52Hx9L/wnc6RKDh9WdKkCnIaoug4Qs7nyT02ewZDp1fG92IQFEaDTX7ndRvRlLzD33HHZ/mwZwngI8n2LcdKsHyvoRXcSpjK2ouSDgJwcTVZGVMvYDri+G6ImmWNgfmsNLtsqJT9jTUGmG4D/si59WqWDp6joKtdqnuG/oBKvCyRGJ0y0+oTfbCyg8YqEyprDFCt0jCNcjBFo9agXJ4GfvmgFXyUlYt5SFLjibeLVBTfPOr0Cn4tAPkbTTq2+USOig7tmGe1AoEOw1WFNgH/Mo7HCMQHOqLi8mLyqLYSrg2WDP70ajVridkXf23Xbx+5+mGuwRJarlx7h1dmnKEtmFjRkHvj7/GnEbq1LXzo1qqJ/tLk4VB0DyfLCmSCZwUmoKt4wb2vhyo2p6cDOdg3SEZCZ86Abri3XnZ7uQh4Gx/faz3MuasqcgDQ8dOUwwQYRbQ+H1a2tlQxVaERp3VrXLuq1dQ/Db6q0NEVDB4Wm2w6ciqOiPNptcGtoCnxMW9iIBlOq4ZGibiyEnVifvNygM0M8bouuD5y65DL8E4wZh3VfoOwfpQgiKFVTdDYI/w9hPvA9L1lLgQcFyHWJbi7mVCKLMEyz5ANVxw7ND+Ldzk8+OPCF+DFird+G8KssowyQEe4odFGITNpoPZwMDbmpD9rRJWhsG0WE1Xum37+UnQHoKVtG4TmbKBPu4fy/h75UEhDpgbSugxHSf7rqYNdrLoGBxwnuuHKWG2V7rTocJcxjczKp4S9oFHVNgOCcZM0i2g5lGU7uWGDWJ8kkux2fHVbBhtQBz6VTJoXSmCHX8j8cJyydS/myfek6Vx4hY29+WU/XAVICCJokSpMqKhNdpLFuXUlUf16Gy8wM/79SL4hu+KmtHyRwmrCZIDBv2GID3FIA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c24e7c1-32c3-4ea1-0349-08d9ceaf5173 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2022 11:51:03.3070 (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: AS8PR03MB7270 Subject: [FFmpeg-devel] [PATCH] avcodec/golomb: Factor writing golomb codes out 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: hIwZ1s6eSsII Most users only want to either read or write golomb codes, not both. By splitting these headers one avoids having unnecesssary (get|put)_hits.h inclusions. Signed-off-by: Andreas Rheinhardt --- libavcodec/ffv1enc.c | 2 +- libavcodec/flacenc.c | 2 +- libavcodec/golomb.h | 132 ------------------------------ libavcodec/hevc_ps_enc.c | 2 +- libavcodec/jpeglsenc.c | 2 +- libavcodec/put_golomb.h | 168 ++++++++++++++++++++++++++++++++++++++ libavcodec/sonic.c | 1 + libavcodec/tests/golomb.c | 1 + 8 files changed, 174 insertions(+), 136 deletions(-) create mode 100644 libavcodec/put_golomb.h diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 69b9065343..d29f62bf56 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -36,8 +36,8 @@ #include "encode.h" #include "internal.h" #include "put_bits.h" +#include "put_golomb.h" #include "rangecoder.h" -#include "golomb.h" #include "mathops.h" #include "ffv1.h" diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index 595928927d..9f6f449323 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -30,7 +30,7 @@ #include "bswapdsp.h" #include "encode.h" #include "put_bits.h" -#include "golomb.h" +#include "put_golomb.h" #include "internal.h" #include "lpc.h" #include "flac.h" diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index 4d531cf805..8233871137 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -33,7 +33,6 @@ #include #include "get_bits.h" -#include "put_bits.h" #define INVALID_VLC 0x80000000 @@ -615,135 +614,4 @@ static inline int get_te(GetBitContext *s, int r, char *file, const char *func, #define get_te0_golomb(a, r) get_te(a, r, __FILE__, __func__, __LINE__) #endif /* TRACE */ - -/** - * write unsigned exp golomb code. 2^16 - 2 at most - */ -static inline void set_ue_golomb(PutBitContext *pb, int i) -{ - av_assert2(i >= 0); - av_assert2(i <= 0xFFFE); - - if (i < 256) - put_bits(pb, ff_ue_golomb_len[i], i + 1); - else { - int e = av_log2(i + 1); - put_bits(pb, 2 * e + 1, i + 1); - } -} - -/** - * write unsigned exp golomb code. 2^32-2 at most. - */ -static inline void set_ue_golomb_long(PutBitContext *pb, uint32_t i) -{ - av_assert2(i <= (UINT32_MAX - 1)); - - if (i < 256) - put_bits(pb, ff_ue_golomb_len[i], i + 1); - else { - int e = av_log2(i + 1); - put_bits64(pb, 2 * e + 1, i + 1); - } -} - -/** - * write truncated unsigned exp golomb code. - */ -static inline void set_te_golomb(PutBitContext *pb, int i, int range) -{ - av_assert2(range >= 1); - av_assert2(i <= range); - - if (range == 2) - put_bits(pb, 1, i ^ 1); - else - set_ue_golomb(pb, i); -} - -/** - * write signed exp golomb code. 16 bits at most. - */ -static inline void set_se_golomb(PutBitContext *pb, int i) -{ - i = 2 * i - 1; - if (i < 0) - i ^= -1; //FIXME check if gcc does the right thing - set_ue_golomb(pb, i); -} - -/** - * write unsigned golomb rice code (ffv1). - */ -static inline void set_ur_golomb(PutBitContext *pb, int i, int k, int limit, - int esc_len) -{ - int e; - - av_assert2(i >= 0); - - e = i >> k; - if (e < limit) - put_bits(pb, e + k + 1, (1 << k) + av_mod_uintp2(i, k)); - else - put_bits(pb, limit + esc_len, i - limit + 1); -} - -/** - * write unsigned golomb rice code (jpegls). - */ -static inline void set_ur_golomb_jpegls(PutBitContext *pb, int i, int k, - int limit, int esc_len) -{ - int e; - - av_assert2(i >= 0); - - e = (i >> k) + 1; - if (e < limit) { - while (e > 31) { - put_bits(pb, 31, 0); - e -= 31; - } - put_bits(pb, e, 1); - if (k) - put_sbits(pb, k, i); - } else { - while (limit > 31) { - put_bits(pb, 31, 0); - limit -= 31; - } - put_bits(pb, limit, 1); - put_bits(pb, esc_len, i - 1); - } -} - -/** - * write signed golomb rice code (ffv1). - */ -static inline void set_sr_golomb(PutBitContext *pb, int i, int k, int limit, - int esc_len) -{ - int v; - - v = -2 * i - 1; - v ^= (v >> 31); - - set_ur_golomb(pb, v, k, limit, esc_len); -} - -/** - * write signed golomb rice code (flac). - */ -static inline void set_sr_golomb_flac(PutBitContext *pb, int i, int k, - int limit, int esc_len) -{ - int v; - - v = -2 * i - 1; - v ^= (v >> 31); - - set_ur_golomb_jpegls(pb, v, k, limit, esc_len); -} - #endif /* AVCODEC_GOLOMB_H */ diff --git a/libavcodec/hevc_ps_enc.c b/libavcodec/hevc_ps_enc.c index 47f252dd2c..72641b2ffb 100644 --- a/libavcodec/hevc_ps_enc.c +++ b/libavcodec/hevc_ps_enc.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "golomb.h" +#include "put_golomb.h" #include "hevc_ps.h" #include "put_bits.h" diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c index beae3bb77f..83b2350a15 100644 --- a/libavcodec/jpeglsenc.c +++ b/libavcodec/jpeglsenc.c @@ -32,7 +32,7 @@ #include "encode.h" #include "get_bits.h" #include "put_bits.h" -#include "golomb.h" +#include "put_golomb.h" #include "internal.h" #include "mathops.h" #include "mjpeg.h" diff --git a/libavcodec/put_golomb.h b/libavcodec/put_golomb.h new file mode 100644 index 0000000000..9ca911fc3c --- /dev/null +++ b/libavcodec/put_golomb.h @@ -0,0 +1,168 @@ +/* + * exp golomb vlc writing stuff + * Copyright (c) 2003 Michael Niedermayer + * Copyright (c) 2004 Alex Beregszaszi + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * @brief + * exp golomb vlc writing stuff + * @author Michael Niedermayer and Alex Beregszaszi + */ + +#ifndef AVCODEC_PUT_GOLOMB_H +#define AVCODEC_PUT_GOLOMB_H + +#include +#include "put_bits.h" + +extern const uint8_t ff_ue_golomb_len[256]; + +/** + * write unsigned exp golomb code. 2^16 - 2 at most + */ +static inline void set_ue_golomb(PutBitContext *pb, int i) +{ + av_assert2(i >= 0); + av_assert2(i <= 0xFFFE); + + if (i < 256) + put_bits(pb, ff_ue_golomb_len[i], i + 1); + else { + int e = av_log2(i + 1); + put_bits(pb, 2 * e + 1, i + 1); + } +} + +/** + * write unsigned exp golomb code. 2^32-2 at most. + */ +static inline void set_ue_golomb_long(PutBitContext *pb, uint32_t i) +{ + av_assert2(i <= (UINT32_MAX - 1)); + + if (i < 256) + put_bits(pb, ff_ue_golomb_len[i], i + 1); + else { + int e = av_log2(i + 1); + put_bits64(pb, 2 * e + 1, i + 1); + } +} + +/** + * write truncated unsigned exp golomb code. + */ +static inline void set_te_golomb(PutBitContext *pb, int i, int range) +{ + av_assert2(range >= 1); + av_assert2(i <= range); + + if (range == 2) + put_bits(pb, 1, i ^ 1); + else + set_ue_golomb(pb, i); +} + +/** + * write signed exp golomb code. 16 bits at most. + */ +static inline void set_se_golomb(PutBitContext *pb, int i) +{ + i = 2 * i - 1; + if (i < 0) + i ^= -1; //FIXME check if gcc does the right thing + set_ue_golomb(pb, i); +} + +/** + * write unsigned golomb rice code (ffv1). + */ +static inline void set_ur_golomb(PutBitContext *pb, int i, int k, int limit, + int esc_len) +{ + int e; + + av_assert2(i >= 0); + + e = i >> k; + if (e < limit) + put_bits(pb, e + k + 1, (1 << k) + av_mod_uintp2(i, k)); + else + put_bits(pb, limit + esc_len, i - limit + 1); +} + +/** + * write unsigned golomb rice code (jpegls). + */ +static inline void set_ur_golomb_jpegls(PutBitContext *pb, int i, int k, + int limit, int esc_len) +{ + int e; + + av_assert2(i >= 0); + + e = (i >> k) + 1; + if (e < limit) { + while (e > 31) { + put_bits(pb, 31, 0); + e -= 31; + } + put_bits(pb, e, 1); + if (k) + put_sbits(pb, k, i); + } else { + while (limit > 31) { + put_bits(pb, 31, 0); + limit -= 31; + } + put_bits(pb, limit, 1); + put_bits(pb, esc_len, i - 1); + } +} + +/** + * write signed golomb rice code (ffv1). + */ +static inline void set_sr_golomb(PutBitContext *pb, int i, int k, int limit, + int esc_len) +{ + int v; + + v = -2 * i - 1; + v ^= (v >> 31); + + set_ur_golomb(pb, v, k, limit, esc_len); +} + +/** + * write signed golomb rice code (flac). + */ +static inline void set_sr_golomb_flac(PutBitContext *pb, int i, int k, + int limit, int esc_len) +{ + int v; + + v = -2 * i - 1; + v ^= (v >> 31); + + set_ur_golomb_jpegls(pb, v, k, limit, esc_len); +} + +#endif /* AVCODEC_PUT_GOLOMB_H */ diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c index 63a613f77d..cf1cfb1460 100644 --- a/libavcodec/sonic.c +++ b/libavcodec/sonic.c @@ -23,6 +23,7 @@ #include "get_bits.h" #include "golomb.h" #include "internal.h" +#include "put_golomb.h" #include "rangecoder.h" diff --git a/libavcodec/tests/golomb.c b/libavcodec/tests/golomb.c index 85b8a9390b..061cc013ce 100644 --- a/libavcodec/tests/golomb.c +++ b/libavcodec/tests/golomb.c @@ -27,6 +27,7 @@ #include "libavcodec/get_bits.h" #include "libavcodec/golomb.h" #include "libavcodec/put_bits.h" +#include "libavcodec/put_golomb.h" #define COUNT 8191 #define SIZE (COUNT * 4)