generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

matroskadec: add support for bzlib compressed tracks

Browse Source 
Originally committed as revision 13177 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-05-15 23:12:41 +00:00
parent e8214e0e48
commit 54dddf095c
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavformat/matroskadec.c
View File

@ -38,6 +38,9 @@
#ifdef CONFIG_ZLIB #ifdef CONFIG_ZLIB
#include <zlib.h> #include <zlib.h>
#endif #endif
#ifdef CONFIG_BZLIB
#include <bzlib.h>
#endif
typedef struct Track { typedef struct Track {
MatroskaTrackType type; MatroskaTrackType type;
@ -1505,6 +1508,9 @@ matroska_add_stream (MatroskaDemuxContext *matroska)
if (num != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP && if (num != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP &&
#ifdef CONFIG_ZLIB #ifdef CONFIG_ZLIB
num != MATROSKA_TRACK_ENCODING_COMP_ZLIB && num != MATROSKA_TRACK_ENCODING_COMP_ZLIB &&
#endif
#ifdef CONFIG_BZLIB
num != MATROSKA_TRACK_ENCODING_COMP_BZLIB &&
#endif #endif
num != MATROSKA_TRACK_ENCODING_COMP_LZO) num != MATROSKA_TRACK_ENCODING_COMP_LZO)
av_log(matroska->ctx, AV_LOG_ERROR, av_log(matroska->ctx, AV_LOG_ERROR,
@ -2749,6 +2755,30 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size,
} }
break; break;
} }
#endif
#ifdef CONFIG_BZLIB
case MATROSKA_TRACK_ENCODING_COMP_BZLIB: {
bz_stream bzstream = {0};
pkt_data = NULL;
if (BZ2_bzDecompressInit(&bzstream, 0, 0) != BZ_OK)
continue;
bzstream.next_in = data;
bzstream.avail_in = lace_size[n];
do {
pkt_size *= 3;
pkt_data = av_realloc(pkt_data, pkt_size);
bzstream.avail_out = pkt_size - bzstream.total_out_lo32;
bzstream.next_out = pkt_data + bzstream.total_out_lo32;
result = BZ2_bzDecompress(&bzstream);
} while (result==BZ_OK && pkt_size<10000000);
pkt_size = bzstream.total_out_lo32;
BZ2_bzDecompressEnd(&bzstream);
if (result != BZ_STREAM_END) {
av_free(pkt_data);
continue;
}
break;
}
#endif #endif
} }
} }