*
* This library 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.0
+ * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
****************************************************************************/
#endif
#include <vlc_plugin.h>
-#include <vlc_codecs.h>
+#include "../../demux/xiph.h"
#include "rtp.h"
-#include <srtp.h>
-/* PT=dynamic
- * vorbis: Xiph Vorbis audio (draft-ietf-avt-rtp-vorbis-09, RFC FIXME)
- */
-typedef struct rtp_vorbis_t
+typedef struct rtp_xiph_t
{
es_out_id_t *id;
block_t *block;
uint32_t ident;
-} rtp_vorbis_t;
+ bool vorbis;
+} rtp_xiph_t;
-static void *vorbis_init (demux_t *demux)
+static void *xiph_init (bool vorbis)
{
- rtp_vorbis_t *self = malloc (sizeof (*self));
+ rtp_xiph_t *self = malloc (sizeof (*self));
if (self == NULL)
return NULL;
self->id = NULL;
self->block = NULL;
self->ident = 0xffffffff; /* impossible value on the wire */
- (void)demux;
+ self->vorbis = vorbis;
return self;
}
-static void vorbis_destroy (demux_t *demux, void *data)
+#if 0
+/* PT=dynamic
+ * vorbis: Xiph Vorbis audio (RFC 5215)
+ */
+static void *vorbis_init (demux_t *demux)
+{
+ (void)demux;
+ return xiph_init (true);
+}
+#endif
+
+/* PT=dynamic
+ * vorbis: Xiph Theora video
+ */
+void *theora_init (demux_t *demux)
+{
+ (void)demux;
+ return xiph_init (false);
+}
+
+void xiph_destroy (demux_t *demux, void *data)
{
- rtp_vorbis_t *self = data;
+ rtp_xiph_t *self = data;
if (!data)
return;
}
/* Convert configuration from RTP to VLC format */
-static ssize_t vorbis_header (void **pextra, const uint8_t *buf, size_t len)
+static ssize_t xiph_header (void **pextra, const uint8_t *buf, size_t len)
{
/* Headers number */
if (len == 0)
setuplen = len - (idlen + cmtlen);
/* Create the VLC extra format header */
- uint8_t *extra = malloc ((size_t)6 + idlen + cmtlen + setuplen);
- if (extra == NULL)
- return -1;
- uint8_t *ptr = *pextra = extra;
- /* Identification header */
- *ptr++ = idlen >> 8;
- *ptr++ = idlen & 0xff;
- memcpy (ptr, buf, idlen);
- buf += idlen;
- ptr += idlen;
- /* Comments header */
- *ptr++ = cmtlen >> 8;
- *ptr++ = cmtlen & 0xff;
- memcpy (ptr, buf, cmtlen);
- buf += cmtlen;
- ptr += cmtlen;
- /* Setup header */
- *ptr++ = setuplen >> 8;
- *ptr++ = setuplen & 0xff;
- memcpy (ptr, buf, setuplen);
- ptr += setuplen;
- return ptr - extra;
+ unsigned sizes[3] = {
+ idlen, cmtlen, setuplen
+ };
+ const void *payloads[3] = {
+ buf + 0,
+ buf + idlen,
+ buf + idlen + cmtlen
+ };
+ void *extra;
+ int extra_size;
+ if (xiph_PackHeaders (&extra_size, &extra, sizes, payloads, 3))
+ return -1;;
+ *pextra = extra;
+ return extra_size;
}
-static void vorbis_decode (demux_t *demux, void *data, block_t *block)
+void xiph_decode (demux_t *demux, void *data, block_t *block)
{
- rtp_vorbis_t *self = data;
+ rtp_xiph_t *self = data;
if (!data || block->i_buffer < 4)
goto drop;
- /* 32-bits Vorbis RTP header (§2.2) */
+ /* 32-bits RTP header (§2.2) */
uint32_t ident = GetDWBE (block->p_buffer);
block->i_buffer -= 4;
block->p_buffer += 4;
unsigned pkts = (ident) & 15;
ident >>= 8;
- /* Vorbis RTP defragmentation */
+ /* RTP defragmentation */
if (self->block && (block->i_flags & BLOCK_FLAG_DISCONTINUITY))
{ /* Screwed! discontinuity within a fragmented packet */
- msg_Warn (demux, "discontinuity in fragmented Vorbis packet");
+ msg_Warn (demux, self->vorbis ?
+ "discontinuity in fragmented Vorbis packet" :
+ "discontinuity in fragmented Theora packet");
block_Release (self->block);
self->block = NULL;
}
pkts = 1;
}
- /* Vorbis RTP payload packets processing */
+ /* RTP payload packets processing */
while (pkts > 0)
{
if (block->i_buffer < 2)
switch (datatype)
{
- case 0: /* Raw audio frame */
+ case 0: /* Raw payload */
{
if (self->ident != ident)
- break; /* Ignore raw without configuration */
+ {
+ msg_Warn (demux, self->vorbis ?
+ "ignoring raw Vorbis payload without configuration" :
+ "ignoring raw Theora payload without configuration");
+ break;
+ }
block_t *raw = block_Alloc (len);
memcpy (raw->p_buffer, block->p_buffer, len);
raw->i_pts = block->i_pts; /* FIXME: what about pkts > 1 */
break; /* Ignore config retransmission */
void *extv;
- ssize_t extc = vorbis_header (&extv, block->p_buffer, len);
+ ssize_t extc = xiph_header (&extv, block->p_buffer, len);
if (extc < 0)
break;
es_format_t fmt;
- es_format_Init (&fmt, AUDIO_ES, VLC_CODEC_VORBIS);
+ es_format_Init (&fmt, self->vorbis ? AUDIO_ES : VIDEO_ES,
+ self->vorbis ? VLC_CODEC_VORBIS
+ : VLC_CODEC_THEORA);
fmt.p_extra = extv;
fmt.i_extra = extc;
codec_destroy (demux, self->id);
- msg_Dbg (demux, "Vorbis packed configuration received "
- "(%06"PRIx32")", ident);
+ msg_Dbg (demux, self->vorbis ?
+ "Vorbis packed configuration received (%06"PRIx32")" :
+ "Theora packed configuration received (%06"PRIx32")",
+ ident);
self->ident = ident;
self->id = codec_init (demux, &fmt);
break;
projects / vlc / blobdiff