summaryrefslogblamecommitdiffstats
path: root/source/ap/moc/0001-Refreshed-opus-patch-from-Tomasz-Golinski-tomaszg-al.patch
blob: 60751bdd3d65e9eaf13b252937ed0edf174188bc (plain) (tree)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586









































































































































































































































































































































































































































































































































































































                                                                                                         
From 9cff5bc22740bf80e59b76f20ccaa2888d9d6426 Mon Sep 17 00:00:00 2001
From: Elimar Riesebieter <riesebie@lxtec.de>
Date: Sun, 27 Nov 2016 12:12:43 +0100
Subject: [PATCH] Refreshed opus patch from Tomasz Golinski
 <tomaszg@alpha.uwb.edu.pl>

---
 decoder_plugins/Makefile.am      |   4 +
 decoder_plugins/decoders.m4      |   1 +
 decoder_plugins/opus/Makefile.am |   6 +
 decoder_plugins/opus/opus.c      | 473 +++++++++++++++++++++++++++++++++++++++
 decoder_plugins/opus/opus.m4     |  25 +++
 options.c                        |   4 +-
 6 files changed, 511 insertions(+), 2 deletions(-)
 create mode 100644 decoder_plugins/opus/Makefile.am
 create mode 100644 decoder_plugins/opus/opus.c
 create mode 100644 decoder_plugins/opus/opus.m4

diff --git a/decoder_plugins/Makefile.am b/decoder_plugins/Makefile.am
index 32a6376..d746099 100644
--- a/decoder_plugins/Makefile.am
+++ b/decoder_plugins/Makefile.am
@@ -16,6 +16,10 @@ if BUILD_vorbis
     SUBDIRS += vorbis
 endif
 
+if BUILD_opus
+    SUBDIRS += opus
+endif
+
 if BUILD_flac
     SUBDIRS += flac
 endif
diff --git a/decoder_plugins/decoders.m4 b/decoder_plugins/decoders.m4
index 77bc2b3..a851967 100644
--- a/decoder_plugins/decoders.m4
+++ b/decoder_plugins/decoders.m4
@@ -20,6 +20,7 @@ m4_include(decoder_plugins/flac/flac.m4)
 m4_include(decoder_plugins/modplug/modplug.m4)
 m4_include(decoder_plugins/mp3/mp3.m4)
 m4_include(decoder_plugins/musepack/musepack.m4)
+m4_include(decoder_plugins/opus/opus.m4)
 m4_include(decoder_plugins/sidplay2/sidplay2.m4)
 m4_include(decoder_plugins/sndfile/sndfile.m4)
 m4_include(decoder_plugins/speex/speex.m4)
diff --git a/decoder_plugins/opus/Makefile.am b/decoder_plugins/opus/Makefile.am
new file mode 100644
index 0000000..d0c183d
--- /dev/null
+++ b/decoder_plugins/opus/Makefile.am
@@ -0,0 +1,6 @@
+lib_LTLIBRARIES = libopus_decoder.la
+libdir = $(plugindir)/$(DECODER_PLUGIN_DIR)
+libopus_decoder_la_LDFLAGS = @PLUGIN_LDFLAGS@
+libopus_decoder_la_LIBADD = $(OPUSFILE_LIBS)
+libopus_decoder_la_CFLAGS = $(OPUSFILE_CFLAGS) -I$(top_srcdir)
+libopus_decoder_la_SOURCES = opus.c
diff --git a/decoder_plugins/opus/opus.c b/decoder_plugins/opus/opus.c
new file mode 100644
index 0000000..6cc9d55
--- /dev/null
+++ b/decoder_plugins/opus/opus.c
@@ -0,0 +1,473 @@
+/*
+ * MOC - music on console
+ * Copyright (C) 2002 - 2005 Damian Pietras <daper@daper.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+#include <strings.h>
+#include <stdio.h>
+#include <errno.h>
+#include <assert.h>
+#include <opusfile.h>
+
+#define DEBUG
+
+#include "common.h"
+#include "log.h"
+#include "decoder.h"
+#include "io.h"
+#include "audio.h"
+
+
+struct opus_data
+{
+	struct io_stream *stream;
+	OggOpusFile *of;
+	int last_section;
+	opus_int32 bitrate;
+	opus_int32 avg_bitrate;
+	int duration;
+	struct decoder_error error;
+	int ok; /* was this stream successfully opened? */
+	int tags_change; /* the tags were changed from the last call of
+			    ogg_current_tags */
+	struct file_tags *tags;
+};
+
+
+static void get_comment_tags (OggOpusFile *of, struct file_tags *info)
+{
+	int i;
+	const OpusTags *comments;
+
+	comments = op_tags (of, -1);
+	for (i = 0; i < comments->comments; i++) {
+		if (!strncasecmp(comments->user_comments[i], "title=",
+				 strlen ("title=")))
+			info->title = xstrdup(comments->user_comments[i]
+					+ strlen ("title="));
+		else if (!strncasecmp(comments->user_comments[i],
+					"artist=", strlen ("artist=")))
+			info->artist = xstrdup (
+					comments->user_comments[i]
+					+ strlen ("artist="));
+		else if (!strncasecmp(comments->user_comments[i],
+					"album=", strlen ("album=")))
+			info->album = xstrdup (
+					comments->user_comments[i]
+					+ strlen ("album="));
+		else if (!strncasecmp(comments->user_comments[i],
+					"tracknumber=",
+					strlen ("tracknumber=")))
+			info->track = atoi (comments->user_comments[i]
+					+ strlen ("tracknumber="));
+		else if (!strncasecmp(comments->user_comments[i],
+					"track=", strlen ("track=")))
+			info->track = atoi (comments->user_comments[i]
+					+ strlen ("track="));
+	}
+}
+
+/* Return a malloc()ed description of an op_*() error. */
+static char *opus_str_error (const int code)
+{
+	char *err;
+
+	switch (code) {
+		case OP_FALSE:
+			err = "Request was not successful";
+			break;
+		case OP_EOF:
+			err = "End Of File";
+			break;
+		case OP_HOLE:
+			err = "Hole in stream";
+			break;
+		case OP_EREAD:
+			err = "An underlying read, seek, or tell operation failed.";
+			break;
+		case OP_EFAULT:
+			err = "Internal (Opus) logic fault";
+			break;
+		case OP_EIMPL:
+			err = "Unimplemented feature";
+			break;
+		case OP_EINVAL:
+			err = "Invalid argument";
+			break;
+		case OP_ENOTFORMAT:
+			err = "Not an Opus file";
+			break;
+		case OP_EBADHEADER:
+			err = "Invalid or corrupt header";
+			break;
+		case OP_EVERSION:
+			err = "Opus header version mismatch";
+			break;
+		case OP_EBADPACKET:
+			err = "An audio packet failed to decode properly";
+			break;
+		case OP_ENOSEEK:
+			err = "Requested seeking in unseekable stream";
+			break;
+		case OP_EBADTIMESTAMP:
+			err = "File timestamps fail sanity tests";
+			break;
+		default:
+			err = "Unknown error";
+	}
+
+	return xstrdup (err);
+}
+
+
+/* Fill info structure with data from ogg comments */
+static void opus_tags (const char *file_name, struct file_tags *info,
+		const int tags_sel)
+{
+	OggOpusFile *of;
+	int err_code;
+
+	// op_test() is faster than op_open(), but we can't read file time with it.
+	if (tags_sel & TAGS_TIME) {
+                of = op_open_file(file_name,&err_code);
+		if (err_code < 0) {
+			char *opus_err = opus_str_error (err_code);
+
+			logit ("Can't open %s: %s", file_name, opus_err);
+			free (opus_err);
+			op_free(of);
+
+			return;
+		}
+	}
+	else {
+                of = op_open_file(file_name,&err_code);
+		if (err_code < 0) {
+			char *opus_err = opus_str_error (err_code);
+
+			logit ("Can't open %s: %s", file_name, opus_err);
+			free (opus_err);
+			op_free (of);
+
+			return;
+		}
+	}
+
+	if (tags_sel & TAGS_COMMENTS)
+		get_comment_tags (of, info);
+
+	if (tags_sel & TAGS_TIME) {
+	    ogg_int64_t opus_time;
+
+	    opus_time = op_pcm_total (of, -1);
+	    if (opus_time >= 0)
+			info->time = opus_time / 48000;
+			debug("Duration tags: %d, samples %lld",info->time,(long long)opus_time);
+	}
+
+	op_free (of);
+}
+
+static int read_callback (void *datasource, unsigned char *ptr, int bytes)
+{
+	ssize_t res;
+
+	res = io_read (datasource, ptr, bytes);
+
+	if (res < 0) {
+		logit ("Read error");
+		res = -1;
+	}
+
+	return res;
+}
+
+static int seek_callback (void *datasource, opus_int64 offset, int whence)
+{
+ 	debug ("Seek request to %ld (%s)", (long)offset,
+ 			whence == SEEK_SET ? "SEEK_SET"
+ 			: (whence == SEEK_CUR ? "SEEK_CUR" : "SEEK_END"));
+ 	return io_seek (datasource, offset, whence)<0 ? -1 : 0;
+}
+
+static int close_callback (void *datasource ATTR_UNUSED)
+{
+	return 0;
+}
+
+static opus_int64 tell_callback (void *datasource)
+{
+	return io_tell (datasource);
+}
+
+static void opus_open_stream_internal (struct opus_data *data)
+{
+	int res;
+	OpusFileCallbacks callbacks = {
+		read_callback,
+		seek_callback,
+		tell_callback,
+		close_callback
+	};
+
+	data->tags = tags_new ();
+
+        data->of = op_open_callbacks(data->stream, &callbacks, NULL, 0, &res);
+	if (res < 0) {
+		char *opus_err = opus_str_error (res);
+
+		decoder_error (&data->error, ERROR_FATAL, 0, "%s",
+				opus_err);
+		debug ("op_open error: %s", opus_err);
+		free (opus_err);
+		op_free (data->of);
+		data->of = NULL;
+		io_close (data->stream);
+	}
+	else {
+		ogg_int64_t samples;
+		data->last_section = -1;
+		data->avg_bitrate = op_bitrate (data->of, -1) / 1000;
+		data->bitrate = data->avg_bitrate;
+		samples = op_pcm_total (data->of, -1);
+		if (samples == OP_EINVAL)
+			data->duration = -1;
+		else
+			data->duration =samples/48000;
+		debug("Duration: %d, samples %lld",data->duration,(long long)samples);
+		data->ok = 1;
+		get_comment_tags (data->of, data->tags);
+	}
+}
+
+static void *opus_open (const char *file)
+{
+	struct opus_data *data;
+	data = (struct opus_data *)xmalloc (sizeof(struct opus_data));
+	data->ok = 0;
+
+	decoder_error_init (&data->error);
+	data->tags_change = 0;
+	data->tags = NULL;
+
+	data->stream = io_open (file, 1);
+	if (!io_ok(data->stream)) {
+		decoder_error (&data->error, ERROR_FATAL, 0,
+				"Can't load Opus: %s",
+				io_strerror(data->stream));
+		io_close (data->stream);
+	}
+	else
+		opus_open_stream_internal (data);
+
+	return data;
+}
+
+static int opus_can_decode (struct io_stream *stream)
+{
+	char buf[36];
+
+	if (io_peek (stream, buf, 36) == 36 && !memcmp (buf, "OggS", 4)
+			&& !memcmp (buf + 28, "OpusHead", 8))
+		return 1;
+
+	return 0;
+}
+
+static void *opus_open_stream (struct io_stream *stream)
+{
+	struct opus_data *data;
+
+	data = (struct opus_data *)xmalloc (sizeof(struct opus_data));
+	data->ok = 0;
+
+	decoder_error_init (&data->error);
+	data->stream = stream;
+	opus_open_stream_internal (data);
+
+	return data;
+}
+
+static void opus_close (void *prv_data)
+{
+	struct opus_data *data = (struct opus_data *)prv_data;
+
+	if (data->ok) {
+		op_free (data->of);
+		io_close (data->stream);
+	}
+
+	decoder_error_clear (&data->error);
+	if (data->tags)
+		tags_free (data->tags);
+	free (data);
+}
+
+static int opus_seek (void *prv_data, int sec)
+{
+	struct opus_data *data = (struct opus_data *)prv_data;
+
+	assert (sec >= 0);
+
+	return op_pcm_seek (data->of, sec * (ogg_int64_t)48000)<0 ? -1 : sec;
+}
+
+static int opus_decodeX (void *prv_data, char *buf, int buf_len,
+		struct sound_params *sound_params)
+{
+	struct opus_data *data = (struct opus_data *)prv_data;
+	int ret;
+	int current_section;
+	int bitrate;
+
+	decoder_error_clear (&data->error);
+
+	while (1) {
+#ifdef HAVE_OPUSFILE_FLOAT
+		ret = op_read_float(data->of, (float *)buf, buf_len/sizeof(float), &current_section);
+debug("opus float!");
+#else
+		ret = op_read(data->of, (opus_int16 *)buf, buf_len/sizeof(opus_int16), &current_section);
+debug("opus fixed!");
+#endif
+		if (ret == 0)
+			return 0;
+		if (ret < 0) {
+			decoder_error (&data->error, ERROR_STREAM, 0,
+					"Error in the stream!");
+			continue;
+		}
+
+		if (current_section != data->last_section) {
+			logit ("section change or first section");
+
+			data->last_section = current_section;
+			data->tags_change = 1;
+			tags_free (data->tags);
+			data->tags = tags_new ();
+			get_comment_tags (data->of, data->tags);
+		}
+
+		sound_params->channels = op_channel_count (data->of, current_section);
+		sound_params->rate = 48000;
+#ifdef HAVE_OPUSFILE_FLOAT
+		sound_params->fmt = SFMT_FLOAT;
+                ret *= sound_params->channels * sizeof(float);
+#else
+		sound_params->fmt = SFMT_S16 | SFMT_NE;
+                ret *= sound_params->channels * sizeof(opus_int16);
+#endif
+		/* Update the bitrate information */
+		bitrate = op_bitrate_instant (data->of);
+		if (bitrate > 0)
+			data->bitrate = bitrate / 1000;
+
+		break;
+	}
+	return ret;
+}
+
+static int opus_current_tags (void *prv_data, struct file_tags *tags)
+{
+	struct opus_data *data = (struct opus_data *)prv_data;
+
+	tags_copy (tags, data->tags);
+
+	if (data->tags_change) {
+		data->tags_change = 0;
+		return 1;
+	}
+
+	return 0;
+}
+
+
+static int opus_get_bitrate (void *prv_data)
+{
+	struct opus_data *data = (struct opus_data *)prv_data;
+
+	return data->bitrate;
+}
+
+static int opus_get_avg_bitrate (void *prv_data)
+{
+	struct opus_data *data = (struct opus_data *)prv_data;
+
+	return data->avg_bitrate;
+}
+
+static int opus_get_duration (void *prv_data)
+{
+
+	struct opus_data *data = (struct opus_data *)prv_data;
+
+	return data->duration;
+}
+
+static struct io_stream *opus_get_stream (void *prv_data)
+{
+	struct opus_data *data = (struct opus_data *)prv_data;
+
+	return data->stream;
+}
+
+static void opus_get_name (const char *file ATTR_UNUSED, char buf[4])
+{
+	strcpy (buf, "OPS");
+}
+
+static int opus_our_format_ext (const char *ext)
+{
+	return !strcasecmp (ext, "opus");
+}
+
+static void opus_get_error (void *prv_data, struct decoder_error *error)
+{
+	struct opus_data *data = (struct opus_data *)prv_data;
+
+	decoder_error_copy (error, &data->error);
+}
+
+static int opus_our_mime (const char *mime)
+{
+	return !strcasecmp (mime, "audio/ogg")
+		|| !strcasecmp (mime, "audio/ogg; codecs=opus");
+}
+
+static struct decoder opus_decoder = {
+	DECODER_API_VERSION,
+	NULL,
+	NULL,
+	opus_open,
+	opus_open_stream,
+	opus_can_decode,
+	opus_close,
+	opus_decodeX,
+	opus_seek,
+	opus_tags,
+	opus_get_bitrate,
+	opus_get_duration,
+	opus_get_error,
+	opus_our_format_ext,
+	opus_our_mime,
+	opus_get_name,
+	opus_current_tags,
+	opus_get_stream,
+	opus_get_avg_bitrate
+};
+
+struct decoder *plugin_init ()
+{
+	return &opus_decoder;
+}
diff --git a/decoder_plugins/opus/opus.m4 b/decoder_plugins/opus/opus.m4
new file mode 100644
index 0000000..08cceb9
--- /dev/null
+++ b/decoder_plugins/opus/opus.m4
@@ -0,0 +1,25 @@
+dnl opus
+
+AC_ARG_WITH(opus, AS_HELP_STRING([--without-opus],
+                                   [Compile without Opus support]))
+
+	if test "x$with_opus" != "xno"
+	then
+		PKG_CHECK_MODULES(OPUSFILE,
+			      [opusfile >= 0.1],
+			      [AC_SUBST(OPUSFILE_LIBS)
+			       AC_SUBST(OPUSFILE_CFLAGS)
+			       want_opus="yes"
+			       DECODER_PLUGINS="$DECODER_PLUGINS opus"],
+			      [true])
+		if test "x$want_opus" = "xyes"
+		then
+			AC_SEARCH_LIBS(op_read_float, opusfile,
+                        [AC_DEFINE([HAVE_OPUSFILE_FLOAT], 1,
+                                [Define to 1 if you have the `op_read_float' function.])])
+                fi
+
+	fi
+
+AM_CONDITIONAL([BUILD_opus], [test "$want_opus"])
+AC_CONFIG_FILES([decoder_plugins/opus/Makefile])
diff --git a/options.c b/options.c
index 62835ac..bb97b94 100644
--- a/options.c
+++ b/options.c
@@ -659,9 +659,9 @@ void options_init ()
 	                 "audio/aac(aac):audio/aacp(aac):audio/m4a(ffmpeg):"
 	                 "audio/wav(sndfile,*):"
 	                 "ogg(vorbis,*,ffmpeg):oga(vorbis,*,ffmpeg):ogv(ffmpeg):"
-	                 "application/ogg(vorbis):audio/ogg(vorbis):"
+	                 "application/ogg(vorbis,opus):audio/ogg(vorbis,opus):"
 	                 "flac(flac,*,ffmpeg):"
-	                 "opus(ffmpeg):"
+	                 "opus(opus,ffmpeg):"
 	                 "spx(speex)",
 	                 CHECK_FUNCTION);
 
-- 
2.10.2