Commit c4912dac authored by Sebastian Dröge's avatar Sebastian Dröge

Decode the codec private data and following ContentEncoding if necessary.

Original commit message from CVS:
* configure.ac:
* gst/matroska/Makefile.am:
* gst/matroska/lzo.c: (get_byte), (get_len), (copy),
(copy_backptr), (lzo1x_decode), (main):
* gst/matroska/lzo.h:
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_read_track_encoding),
(gst_matroska_decompress_data), (gst_matroska_decode_data),
(gst_matroska_decode_buffer),
(gst_matroska_decode_content_encodings),
(gst_matroska_demux_read_track_encodings),
(gst_matroska_demux_add_stream),
(gst_matroska_demux_parse_blockgroup_or_simpleblock):
* gst/matroska/matroska-ids.h:
Decode the codec private data and following ContentEncoding if
necessary.
Support bzip2, lzo and header stripped compression. For lzo use the
ffmpeg lzo implementation as liblzo is GPL licensed.
Fix zlib decompression.
parent aedf04f9
2008-08-02 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* configure.ac:
* gst/matroska/Makefile.am:
* gst/matroska/lzo.c: (get_byte), (get_len), (copy),
(copy_backptr), (lzo1x_decode), (main):
* gst/matroska/lzo.h:
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_read_track_encoding),
(gst_matroska_decompress_data), (gst_matroska_decode_data),
(gst_matroska_decode_buffer),
(gst_matroska_decode_content_encodings),
(gst_matroska_demux_read_track_encodings),
(gst_matroska_demux_add_stream),
(gst_matroska_demux_parse_blockgroup_or_simpleblock):
* gst/matroska/matroska-ids.h:
Decode the codec private data and following ContentEncoding if
necessary.
Support bzip2, lzo and header stripped compression. For lzo use the
ffmpeg lzo implementation as liblzo is GPL licensed.
Fix zlib decompression.
2008-08-02 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/matroska/matroska-mux.c:
......
......@@ -933,9 +933,9 @@ AG_GST_CHECK_FEATURE(WAVPACK, [wavpack plug-in], wavpack, [
AC_SUBST(WAVPACK_LIBS)
])
dnl *** qtdemux & id3demux prefer to have zlib ***
dnl *** qtdemux & id3demux & matroska prefer to have zlib ***
translit(dnm, m, l) AM_CONDITIONAL(USE_ZLIB, true)
AG_GST_CHECK_FEATURE(ZLIB, [zlib support for id3demux/qtdemux],, [
AG_GST_CHECK_FEATURE(ZLIB, [zlib support for id3demux/qtdemux/matroska],, [
AG_GST_CHECK_LIBHEADER(ZLIB,
z, uncompress,, zlib.h, [
HAVE_ZLIB="yes"
......@@ -944,6 +944,13 @@ AG_GST_CHECK_FEATURE(ZLIB, [zlib support for id3demux/qtdemux],, [
])
])
dnl *** matroska prefers to have bz2 ***
translit(dnm, m, l) AM_CONDITIONAL(USE_BZ2, true)
AG_GST_CHECK_FEATURE(BZ2, [bz2 library for matroska ],, [
AG_GST_CHECK_LIBHEADER(BZ2, bz2, BZ2_bzCompress, ,bzlib.h, BZ2_LIBS="-lbz2")
AC_SUBST(BZ2_LIBS)
])
else
dnl not building plugins with external dependencies,
......
......@@ -6,7 +6,8 @@ libgstmatroska_la_SOURCES = \
matroska.c \
matroska-demux.c \
matroska-ids.c \
matroska-mux.c
matroska-mux.c \
lzo.c
noinst_HEADERS = \
ebml-ids.h \
......@@ -14,7 +15,8 @@ noinst_HEADERS = \
ebml-write.h \
matroska-demux.h \
matroska-ids.h \
matroska-mux.h
matroska-mux.h \
lzo.h
libgstmatroska_la_CFLAGS = \
$(GST_BASE_CFLAGS) \
......@@ -28,5 +30,6 @@ libgstmatroska_la_LIBADD = \
-lgstriff-@GST_MAJORMINOR@ \
-lgsttag-@GST_MAJORMINOR@ \
$(ZLIB_LIBS) \
$(BZ2_LIBS) \
$(LIBM)
libgstmatroska_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
/*
* LZO 1x decompression
* Copyright (c) 2006 Reimar Doeffinger
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <gst/gst.h>
#include <stdlib.h>
#include <string.h>
#include "_stdint.h"
#include "lzo.h"
/*! define if we may write up to 12 bytes beyond the output buffer */
/* #define OUTBUF_PADDED 1 */
/*! define if we may read up to 8 bytes beyond the input buffer */
/* #define INBUF_PADDED 1 */
typedef struct LZOContext
{
const uint8_t *in, *in_end;
uint8_t *out_start, *out, *out_end;
int error;
} LZOContext;
/**
* \brief read one byte from input buffer, avoiding overrun
* \return byte read
*/
static inline int
get_byte (LZOContext * c)
{
if (c->in < c->in_end)
return *c->in++;
c->error |= LZO_INPUT_DEPLETED;
return 1;
}
#ifdef INBUF_PADDED
#define GETB(c) (*(c).in++)
#else
#define GETB(c) get_byte(&(c))
#endif
/**
* \brief decode a length value in the coding used by lzo
* \param x previous byte value
* \param mask bits used from x
* \return decoded length value
*/
static inline int
get_len (LZOContext * c, int x, int mask)
{
int cnt = x & mask;
if (!cnt) {
while (!(x = get_byte (c)))
cnt += 255;
cnt += mask + x;
}
return cnt;
}
/*#define UNALIGNED_LOADSTORE */
#define BUILTIN_MEMCPY
#ifdef UNALIGNED_LOADSTORE
#define COPY2(d, s) *(uint16_t *)(d) = *(uint16_t *)(s);
#define COPY4(d, s) *(uint32_t *)(d) = *(uint32_t *)(s);
#elif defined(BUILTIN_MEMCPY)
#define COPY2(d, s) memcpy(d, s, 2);
#define COPY4(d, s) memcpy(d, s, 4);
#else
#define COPY2(d, s) (d)[0] = (s)[0]; (d)[1] = (s)[1];
#define COPY4(d, s) (d)[0] = (s)[0]; (d)[1] = (s)[1]; (d)[2] = (s)[2]; (d)[3] = (s)[3];
#endif
/**
* \brief copy bytes from input to output buffer with checking
* \param cnt number of bytes to copy, must be >= 0
*/
static inline void
copy (LZOContext * c, int cnt)
{
register const uint8_t *src = c->in;
register uint8_t *dst = c->out;
if (cnt > c->in_end - src) {
cnt = MAX (c->in_end - src, 0);
c->error |= LZO_INPUT_DEPLETED;
}
if (cnt > c->out_end - dst) {
cnt = MAX (c->out_end - dst, 0);
c->error |= LZO_OUTPUT_FULL;
}
#if defined(INBUF_PADDED) && defined(OUTBUF_PADDED)
COPY4 (dst, src);
src += 4;
dst += 4;
cnt -= 4;
if (cnt > 0)
#endif
memcpy (dst, src, cnt);
c->in = src + cnt;
c->out = dst + cnt;
}
/**
* \brief copy previously decoded bytes to current position
* \param back how many bytes back we start
* \param cnt number of bytes to copy, must be >= 0
*
* cnt > back is valid, this will copy the bytes we just copied,
* thus creating a repeating pattern with a period length of back.
*/
static inline void
copy_backptr (LZOContext * c, int back, int cnt)
{
register const uint8_t *src = &c->out[-back];
register uint8_t *dst = c->out;
if (src < c->out_start || src > dst) {
c->error |= LZO_INVALID_BACKPTR;
return;
}
if (cnt > c->out_end - dst) {
cnt = MAX (c->out_end - dst, 0);
c->error |= LZO_OUTPUT_FULL;
}
if (back == 1) {
memset (dst, *src, cnt);
dst += cnt;
} else {
#ifdef OUTBUF_PADDED
COPY2 (dst, src);
COPY2 (dst + 2, src + 2);
src += 4;
dst += 4;
cnt -= 4;
if (cnt > 0) {
COPY2 (dst, src);
COPY2 (dst + 2, src + 2);
COPY2 (dst + 4, src + 4);
COPY2 (dst + 6, src + 6);
src += 8;
dst += 8;
cnt -= 8;
}
#endif
if (cnt > 0) {
int blocklen = back;
while (cnt > blocklen) {
memcpy (dst, src, blocklen);
dst += blocklen;
cnt -= blocklen;
blocklen <<= 1;
}
memcpy (dst, src, cnt);
}
dst += cnt;
}
c->out = dst;
}
/**
* \brief decode LZO 1x compressed data
* \param out output buffer
* \param outlen size of output buffer, number of bytes left are returned here
* \param in input buffer
* \param inlen size of input buffer, number of bytes left are returned here
* \return 0 on success, otherwise error flags, see lzo.h
*
* make sure all buffers are appropriately padded, in must provide
* LZO_INPUT_PADDING, out must provide LZO_OUTPUT_PADDING additional bytes
*/
int
lzo1x_decode (void *out, int *outlen, const void *in, int *inlen)
{
int state = 0;
int x;
LZOContext c;
c.in = in;
c.in_end = (const uint8_t *) in + *inlen;
c.out = c.out_start = out;
c.out_end = (uint8_t *) out + *outlen;
c.error = 0;
x = GETB (c);
if (x > 17) {
copy (&c, x - 17);
x = GETB (c);
if (x < 16)
c.error |= LZO_ERROR;
}
if (c.in > c.in_end)
c.error |= LZO_INPUT_DEPLETED;
while (!c.error) {
int cnt, back;
if (x > 15) {
if (x > 63) {
cnt = (x >> 5) - 1;
back = (GETB (c) << 3) + ((x >> 2) & 7) + 1;
} else if (x > 31) {
cnt = get_len (&c, x, 31);
x = GETB (c);
back = (GETB (c) << 6) + (x >> 2) + 1;
} else {
cnt = get_len (&c, x, 7);
back = (1 << 14) + ((x & 8) << 11);
x = GETB (c);
back += (GETB (c) << 6) + (x >> 2);
if (back == (1 << 14)) {
if (cnt != 1)
c.error |= LZO_ERROR;
break;
}
}
} else if (!state) {
cnt = get_len (&c, x, 15);
copy (&c, cnt + 3);
x = GETB (c);
if (x > 15)
continue;
cnt = 1;
back = (1 << 11) + (GETB (c) << 2) + (x >> 2) + 1;
} else {
cnt = 0;
back = (GETB (c) << 2) + (x >> 2) + 1;
}
copy_backptr (&c, back, cnt + 2);
state = cnt = x & 3;
copy (&c, cnt);
x = GETB (c);
}
*inlen = c.in_end - c.in;
if (c.in > c.in_end)
*inlen = 0;
*outlen = c.out_end - c.out;
return c.error;
}
#ifdef TEST
#include <stdio.h>
#include <lzo/lzo1x.h>
#include "log.h"
#define MAXSZ (10*1024*1024)
int
main (int argc, char *argv[])
{
FILE *in = fopen (argv[1], "rb");
uint8_t *orig = av_malloc (MAXSZ + 16);
uint8_t *comp = av_malloc (2 * MAXSZ + 16);
uint8_t *decomp = av_malloc (MAXSZ + 16);
size_t s = fread (orig, 1, MAXSZ, in);
lzo_uint clen = 0;
long tmp[LZO1X_MEM_COMPRESS];
int inlen, outlen;
int i;
av_log_level = AV_LOG_DEBUG;
lzo1x_999_compress (orig, s, comp, &clen, tmp);
for (i = 0; i < 300; i++) {
START_TIMER inlen = clen;
outlen = MAXSZ;
#ifdef LIBLZO
if (lzo1x_decompress_safe (comp, inlen, decomp, &outlen, NULL))
#elif defined(LIBLZO_UNSAFE)
if (lzo1x_decompress (comp, inlen, decomp, &outlen, NULL))
#else
if (lzo1x_decode (decomp, &outlen, comp, &inlen))
#endif
av_log (NULL, AV_LOG_ERROR, "decompression error\n");
STOP_TIMER ("lzod")
}
if (memcmp (orig, decomp, s))
av_log (NULL, AV_LOG_ERROR, "decompression incorrect\n");
else
av_log (NULL, AV_LOG_ERROR, "decompression ok\n");
return 0;
}
#endif
/*
* LZO 1x decompression
* copyright (c) 2006 Reimar Doeffinger
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef FFMPEG_LZO_H
#define FFMPEG_LZO_H
#define LZO_INPUT_DEPLETED 1
#define LZO_OUTPUT_FULL 2
#define LZO_INVALID_BACKPTR 4
#define LZO_ERROR 8
#define LZO_INPUT_PADDING 8
#define LZO_OUTPUT_PADDING 12
int lzo1x_decode(void *out, int *outlen, const void *in, int *inlen);
#endif /* FFMPEG_LZO_H */
This diff is collapsed.
......@@ -554,6 +554,19 @@ typedef struct _Wavpack4Header {
guint32 crc; /* crc for actual decoded data */
} Wavpack4Header;
typedef enum {
GST_MATROSKA_TRACK_ENCODING_SCOPE_FRAME = (1<<0),
GST_MATROSKA_TRACK_ENCODING_SCOPE_CODEC_DATA = (1<<1),
GST_MATROSKA_TRACK_ENCODING_SCOPE_NEXT_CONTENT_ENCODING = (1<<2)
} GstMatroskaTrackEncodingScope;
typedef enum {
GST_MATROSKA_TRACK_COMPRESSION_ALGORITHM_ZLIB = 0,
GST_MATROSKA_TRACK_COMPRESSION_ALGORITHM_BZLIB = 1,
GST_MATROSKA_TRACK_COMPRESSION_ALGORITHM_LZO1X = 2,
GST_MATROSKA_TRACK_COMPRESSION_ALGORITHM_HEADERSTRIP = 3
} GstMatroskaTrackCompressionAlgorithm;
typedef struct _GstMatroskaTrackEncoding {
guint order;
guint scope : 3;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment