har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

matroskadec: refactor matroska_decode_buffer

Browse Source 
Make MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP behave like
the other encodings and spare few lines of boilerplate code.
This commit is contained in:
Luca Barbato 2012-09-14 18:51:49 +02:00
parent 581281e242
commit 8d4dd55c37
1 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
libavformat/matroskadec.c
View File

@ -994,8 +994,22 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size,
return -1; return -1;
switch (encodings[0].compression.algo) { switch (encodings[0].compression.algo) {
case MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP: case MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP: {
return encodings[0].compression.settings.size; int header_size = encodings[0].compression.settings.size;
uint8_t *header = encodings[0].compression.settings.data;
if (!header_size)
return 0;
pkt_size = isize + header_size;
pkt_data = av_malloc(pkt_size);
if (!pkt_data)
return AVERROR(ENOMEM);
memcpy(pkt_data, header, header_size);
memcpy(pkt_data + header_size, data, isize);
break;
}
case MATROSKA_TRACK_ENCODING_COMP_LZO: case MATROSKA_TRACK_ENCODING_COMP_LZO:
do { do {
olen = pkt_size *= 3; olen = pkt_size *= 3;
@ -1421,22 +1435,16 @@ static int matroska_read_header(AVFormatContext *s)
"Unsupported encoding type"); "Unsupported encoding type");
} else if (track->codec_priv.size && encodings[0].scope&2) { } else if (track->codec_priv.size && encodings[0].scope&2) {
uint8_t *codec_priv = track->codec_priv.data; uint8_t *codec_priv = track->codec_priv.data;
int offset = matroska_decode_buffer(&track->codec_priv.data, int ret = matroska_decode_buffer(&track->codec_priv.data,
&track->codec_priv.size, &track->codec_priv.size,
track); track);
if (offset < 0) { if (ret < 0) {
track->codec_priv.data = NULL; track->codec_priv.data = NULL;
track->codec_priv.size = 0; track->codec_priv.size = 0;
av_log(matroska->ctx, AV_LOG_ERROR, av_log(matroska->ctx, AV_LOG_ERROR,
"Failed to decode codec private data\n"); "Failed to decode codec private data\n");
} else if (offset > 0) {
track->codec_priv.data = av_malloc(track->codec_priv.size + offset);
memcpy(track->codec_priv.data,
encodings[0].compression.settings.data, offset);
memcpy(track->codec_priv.data+offset, codec_priv,
track->codec_priv.size);
track->codec_priv.size += offset;
} }
if (codec_priv != track->codec_priv.data) if (codec_priv != track->codec_priv.data)
av_free(codec_priv); av_free(codec_priv);
} }
@ -1916,7 +1924,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
} }
} else { } else {
MatroskaTrackEncoding *encodings = track->encodings.elem; MatroskaTrackEncoding *encodings = track->encodings.elem;
int offset = 0, pkt_size = lace_size[n]; int pkt_size = lace_size[n];
uint8_t *pkt_data = data; uint8_t *pkt_data = data;
if (pkt_size > size) { if (pkt_size > size) {
@ -1925,21 +1933,20 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
} }
if (encodings && encodings->scope & 1) { if (encodings && encodings->scope & 1) {
offset = matroska_decode_buffer(&pkt_data,&pkt_size, track); res = matroska_decode_buffer(&pkt_data, &pkt_size, track);
if (offset < 0) if (res < 0)
continue; break;
} }
pkt = av_mallocz(sizeof(AVPacket)); pkt = av_mallocz(sizeof(AVPacket));
/* XXX: prevent data copy... */ /* XXX: prevent data copy... */
if (av_new_packet(pkt, pkt_size+offset) < 0) { if (av_new_packet(pkt, pkt_size) < 0) {
av_free(pkt); av_free(pkt);
res = AVERROR(ENOMEM); res = AVERROR(ENOMEM);
break; break;
} }
if (offset)
memcpy (pkt->data, encodings->compression.settings.data, offset); memcpy(pkt->data, pkt_data, pkt_size);
memcpy (pkt->data+offset, pkt_data, pkt_size);
if (pkt_data != data) if (pkt_data != data)
av_free(pkt_data); av_free(pkt_data);