From 9f555bc4e7c04ce8c2119979e0138a1a7ae9c2c4 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jmvalin@jmvalin.ca>
Date: Tue, 23 Aug 2011 02:56:12 -0400
Subject: [PATCH] encode_size() moved out of opus_encoder.c
---
src/opus.c | 14 ++++++++++++++
src/opus_private.h | 2 ++
src/repacketizer.c | 13 +------------
3 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/opus.c b/src/opus.c
index 9f3a4ecf7..0181e11d1 100644
--- a/src/opus.c
+++ b/src/opus.c
@@ -30,11 +30,25 @@
#endif
#include "opus.h"
+#include "opus_private.h"
#ifndef OPUS_VERSION
#define OPUS_VERSION "unknown"
#endif
+int encode_size(int size, unsigned char *data)
+{
+ if (size < 252)
+ {
+ data[0] = size;
+ return 1;
+ } else {
+ data[0] = 252+(size&0x3);
+ data[1] = (size-(int)data[0])>>2;
+ return 2;
+ }
+}
+
const char *opus_strerror(int error)
{
static const char *error_strings[8] = {
diff --git a/src/opus_private.h b/src/opus_private.h
index 6d03a94c7..9015e3897 100644
--- a/src/opus_private.h
+++ b/src/opus_private.h
@@ -29,6 +29,8 @@
#ifndef OPUS_PRIVATE_H
#define OPUS_PRIVATE_H
+int encode_size(int size, unsigned char *data);
+
/* Make sure everything's aligned to 4 bytes (this may need to be increased
on really weird architectures) */
static inline int align(int i)
diff --git a/src/repacketizer.c b/src/repacketizer.c
index f6a76e675..76c15cfde 100644
--- a/src/repacketizer.c
+++ b/src/repacketizer.c
@@ -42,18 +42,7 @@ struct OpusRepacketizer {
int framesize;
};
-static int encode_size(int size, unsigned char *data)
-{
- if (size < 252)
- {
- data[0] = size;
- return 1;
- } else {
- data[0] = 252+(size&0x3);
- data[1] = (size-(int)data[0])>>2;
- return 2;
- }
-}
+
int opus_repacketizer_get_size(void)
{
--
GitLab