From b3441350fadee0703eb935262c77dfb5c6269c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?= <alexandra@khirnov.net>
Date: Tue, 12 Apr 2016 18:28:14 +0200
Subject: [PATCH] opus: Convert to the new bitstream reader
Signed-off-by: Anton Khirnov <anton@khirnov.net>
---
libavcodec/opus.h | 6 +++---
libavcodec/opusdec.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavcodec/opus.h b/libavcodec/opus.h
index 55c91fa0120..fbf67c9b9f6 100644
--- a/libavcodec/opus.h
+++ b/libavcodec/opus.h
@@ -32,7 +32,7 @@
#include "libavresample/avresample.h"
#include "avcodec.h"
-#include "get_bits.h"
+#include "bitstream.h"
#define MAX_FRAME_SIZE 1275
#define MAX_FRAMES 48
@@ -92,7 +92,7 @@ typedef struct RawBitsContext {
} RawBitsContext;
typedef struct OpusRangeCoder {
- GetBitContext gb;
+ BitstreamContext bc;
RawBitsContext rb;
unsigned int range;
unsigned int value;
@@ -196,7 +196,7 @@ typedef struct OpusContext {
static av_always_inline void opus_rc_normalize(OpusRangeCoder *rc)
{
while (rc->range <= 1<<23) {
- rc->value = ((rc->value << 8) | (get_bits(&rc->gb, 8) ^ 0xFF)) & ((1u << 31) - 1);
+ rc->value = ((rc->value << 8) | (bitstream_read(&rc->bc, 8) ^ 0xFF)) & ((1u << 31) - 1);
rc->range <<= 8;
rc->total_read_bits += 8;
}
diff --git a/libavcodec/opusdec.c b/libavcodec/opusdec.c
index 92e651c787f..163f0d5ed5a 100644
--- a/libavcodec/opusdec.c
+++ b/libavcodec/opusdec.c
@@ -43,9 +43,9 @@
#include "libavresample/avresample.h"
#include "avcodec.h"
+#include "bitstream.h"
#include "celp_filters.h"
#include "fft.h"
-#include "get_bits.h"
#include "internal.h"
#include "mathops.h"
#include "opus.h"
@@ -80,12 +80,12 @@ static int get_silk_samplerate(int config)
*/
static int opus_rc_init(OpusRangeCoder *rc, const uint8_t *data, int size)
{
- int ret = init_get_bits8(&rc->gb, data, size);
+ int ret = bitstream_init8(&rc->bc, data, size);
if (ret < 0)
return ret;
rc->range = 128;
- rc->value = 127 - get_bits(&rc->gb, 7);
+ rc->value = 127 - bitstream_read(&rc->bc, 7);
rc->total_read_bits = 9;
opus_rc_normalize(rc);
--
GitLab