TT#30901 convert codec list to hash table

Change-Id: I0956b441101b4c33e0f186399ef5558f89744e12

daemon/.gitignore

@@ -9,3 +9,4 @@ loglib.c
 rtplib.c
 codeclib.c
 resample.c
+str.c

daemon/Makefile

@@ -63,11 +63,11 @@ LDFLAGS+=	`pkg-config --libs libavfilter`
 include ../lib/lib.Makefile
 
 SRCS=		main.c kernel.c poller.c aux.c control_tcp.c streambuf.c call.c control_udp.c redis.c \
-		bencode.c cookie_cache.c udp_listener.c control_ng.c sdp.c str.c stun.c rtcp.c \
+		bencode.c cookie_cache.c udp_listener.c control_ng.c sdp.c stun.c rtcp.c \
 		crypto.c rtp.c call_interfaces.c dtls.c log.c cli.c graphite.c ice.c socket.c \
 		media_socket.c homer.c recording.c statistics.c cdr.c ssrc.c iptables.c tcp_listener.c \
 		codec.c
-LIBSRCS=	loglib.c auxlib.c rtplib.c codeclib.c resample.c
+LIBSRCS=	loglib.c auxlib.c rtplib.c codeclib.c resample.c str.c
 OBJS=		$(SRCS:.c=.o) $(LIBSRCS:.c=.o)
 
 

daemon/aux.h

@@ -18,8 +18,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include "compat.h"
-#include <openssl/rand.h>
-#include <assert.h>
+#include "auxlib.h"
 
 #if !(GLIB_CHECK_VERSION(2,30,0))
 #define g_atomic_int_and(atomic, val) \
@@ -195,10 +194,6 @@ INLINE int strmemcmp(const void *mem, int len, const char *str) {
 	return memcmp(mem, str, len);
 }
 
-INLINE void random_string(unsigned char *buf, int len) {
-	int ret = RAND_bytes(buf, len);
-	assert(ret == 1);
-}
 INLINE long unsigned int ssl_random() {
 	long unsigned int ret;
 	random_string((void *) &ret, sizeof(ret));

lib/auxlib.h

@@ -2,6 +2,9 @@
 #define _AUXLIB_H_
 
 #include <glib.h>
+#include <assert.h>
+#include "compat.h"
+#include <openssl/rand.h>
 
 struct rtpengine_common_config {
 	char *config_file;
@@ -21,5 +24,9 @@ void config_load(int *argc, char ***argv, GOptionEntry *entries, const char *des
 		char *default_config, char *default_section,
 		struct rtpengine_common_config *);
 
+INLINE void random_string(unsigned char *buf, int len) {
+	int ret = RAND_bytes(buf, len);
+	assert(ret == 1);
+}
 
 #endif

lib/codeclib.c

@@ -31,7 +31,7 @@ packetizer_f packetizer_samplestream; // flat stream of samples
 
 
 
-static const struct codec_def_s codecs[] = {
+static codec_def_t __codec_defs[] = {
 	{
 		.rtpname = "PCMA",
 		.avcodec_id = AV_CODEC_ID_PCM_ALAW,
@@ -290,13 +290,13 @@ static const struct codec_def_s codecs[] = {
 
 
 
-// XXX use hashtable for quicker lookup
+static GHashTable *codecs_ht;
+
+
+
 const codec_def_t *codec_find(const str *name) {
-	for (int i = 0; i < G_N_ELEMENTS(codecs); i++) {
-		if (!str_cmp(name, codecs[i].rtpname))
-			return &codecs[i];
-	}
-	return NULL;
+	codec_def_t *ret = g_hash_table_lookup(codecs_ht, name);
+	return ret;
 }
 
 
@@ -548,6 +548,15 @@ void codeclib_init() {
 	avfilter_register_all();
 	avformat_network_init();
 	av_log_set_callback(avlog_ilog);
+
+	codecs_ht = g_hash_table_new(str_hash, str_equal);
+
+	for (int i = 0; i < G_N_ELEMENTS(__codec_defs); i++) {
+		codec_def_t *def = &__codec_defs[i];
+		str_init(&def->rtpname_str, (char *) def->rtpname);
+		assert(g_hash_table_lookup(codecs_ht, &def->rtpname_str) == NULL);
+		g_hash_table_insert(codecs_ht, &def->rtpname_str, def);
+	}
 }
 
 

lib/codeclib.h

@@ -40,6 +40,7 @@ struct codec_def_s {
 	const int default_ptime;
 	packetizer_f * const packetizer;
 	const int bits_per_sample;
+	str rtpname_str;
 };
 
 struct format_s {

lib/str.c

@@ -1,5 +1,5 @@
 #include "str.h"
-#include "aux.h"
+#include "auxlib.h"
 #include <assert.h>
 #include <stdarg.h>
 

recording-daemon/.gitignore

@@ -9,3 +9,4 @@ loglib.c
 rtplib.c
 codeclib.c
 resample.c
+str.c

recording-daemon/Makefile

@@ -11,6 +11,7 @@ CFLAGS+=	`pkg-config --cflags libavutil`
 CFLAGS+=	`pkg-config --cflags libavresample`
 CFLAGS+=	`pkg-config --cflags libavfilter`
 CFLAGS+=	`mysql_config --cflags`
+CFLAGS+=	`pkg-config --cflags openssl`
 
 LDFLAGS=	-lm
 LDFLAGS+=	`pkg-config --libs glib-2.0`
@@ -21,12 +22,13 @@ LDFLAGS+=	`pkg-config --libs libavutil`
 LDFLAGS+=	`pkg-config --libs libavresample`
 LDFLAGS+=	`pkg-config --libs libavfilter`
 LDFLAGS+=	`mysql_config --libs`
+LDFLAGS+=	`pkg-config --libs openssl`
 
 include ../lib/lib.Makefile
 
 SRCS=		epoll.c garbage.c inotify.c main.c metafile.c stream.c recaux.c packet.c \
 		decoder.c output.c mix.c db.c log.c forward.c
-LIBSRCS=	loglib.c auxlib.c rtplib.c codeclib.c resample.c
+LIBSRCS=	loglib.c auxlib.c rtplib.c codeclib.c resample.c str.c
 OBJS=		$(SRCS:.c=.o) $(LIBSRCS:.c=.o)