aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-23 03:28:20 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-23 03:28:20 +0100
commite9c372362cb736240dcd87658a027ecfb7b9d240 (patch)
tree1334c141053765de50f336f5dcddbe1d63a975ed /libavformat
parent0560b28f12794b747adc1dd9d25b98cc418dff73 (diff)
downloadffmpeg-e9c372362cb736240dcd87658a027ecfb7b9d240.tar.gz
id3v2: restructure compressed and unsync code
This should fix the interaction between the 2. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/id3v2.c76
1 files changed, 39 insertions, 37 deletions
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index 82ed3728c9..c6f88ec24c 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -584,8 +584,8 @@ static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t
unsigned char *buffer = NULL;
int buffer_size = 0;
const ID3v2EMFunc *extra_func = NULL;
- unsigned char *compressed_buffer = NULL;
- int compressed_buffer_size = 0;
+ unsigned char *uncompressed_buffer = NULL;
+ int uncompressed_buffer_size = 0;
av_log(s, AV_LOG_DEBUG, "id3v2 ver:%d flags:%02X len:%d\n", version, flags, len);
@@ -690,61 +690,63 @@ static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t
avio_skip(s->pb, tlen);
/* check for text tag or supported special meta tag */
} else if (tag[0] == 'T' || (extra_meta && (extra_func = get_extra_meta_func(tag, isv34)))) {
- if (unsync || tunsync || tcomp) {
- int64_t end = avio_tell(s->pb) + tlen;
- uint8_t *b;
+ pbx = s->pb;
- av_fast_malloc(&buffer, &buffer_size, dlen);
+ if (unsync || tunsync || tcomp) {
+ av_fast_malloc(&buffer, &buffer_size, tlen);
if (!buffer) {
- av_log(s, AV_LOG_ERROR, "Failed to alloc %ld bytes\n", dlen);
+ av_log(s, AV_LOG_ERROR, "Failed to alloc %d bytes\n", tlen);
goto seek;
}
+ }
+ if (unsync || tunsync) {
+ int64_t end = avio_tell(s->pb) + tlen;
+ uint8_t *b;
+
b = buffer;
+ while (avio_tell(s->pb) < end) {
+ *b++ = avio_r8(s->pb);
+ if (*(b - 1) == 0xff && avio_tell(s->pb) < end - 1) {
+ uint8_t val = avio_r8(s->pb);
+ *b++ = val ? val : avio_r8(s->pb);
+ }
+ }
+ ffio_init_context(&pb, buffer, b - buffer, 0, NULL, NULL, NULL, NULL);
+ tlen = b - buffer;
+ pbx = &pb; // read from sync buffer
+ }
+
#if CONFIG_ZLIB
if (tcomp) {
- int n, err;
+ int err;
av_log(s, AV_LOG_DEBUG, "Compresssed frame %s tlen=%d dlen=%ld\n", tag, tlen, dlen);
- av_fast_malloc(&compressed_buffer, &compressed_buffer_size, tlen);
- if (!compressed_buffer) {
- av_log(s, AV_LOG_ERROR, "Failed to alloc %d bytes\n", tlen);
+ av_fast_malloc(&uncompressed_buffer, &uncompressed_buffer_size, dlen);
+ if (!uncompressed_buffer) {
+ av_log(s, AV_LOG_ERROR, "Failed to alloc %ld bytes\n", dlen);
goto seek;
}
- n = avio_read(s->pb, compressed_buffer, tlen);
- if (n < 0) {
- av_log(s, AV_LOG_ERROR, "Failed to read compressed tag\n");
- goto seek;
+ if (!(unsync || tunsync)) {
+ err = avio_read(s->pb, buffer, tlen);
+ if (err < 0) {
+ av_log(s, AV_LOG_ERROR, "Failed to read compressed tag\n");
+ goto seek;
+ }
+ tlen = err;
}
- err = uncompress(buffer, &dlen, compressed_buffer, n);
+ err = uncompress(uncompressed_buffer, &dlen, buffer, tlen);
if (err != Z_OK) {
av_log(s, AV_LOG_ERROR, "Failed to uncompress tag: %d\n", err);
goto seek;
}
- b += dlen;
+ ffio_init_context(&pb, uncompressed_buffer, dlen, 0, NULL, NULL, NULL, NULL);
+ tlen = dlen;
+ pbx = &pb; // read from sync buffer
}
#endif
- if (unsync || tunsync) {
- if (tcomp) {
- av_log_ask_for_sample(s, "tcomp with unsync\n");
- goto seek;
- }
- while (avio_tell(s->pb) < end) {
- *b++ = avio_r8(s->pb);
- if (*(b - 1) == 0xff && avio_tell(s->pb) < end - 1) {
- uint8_t val = avio_r8(s->pb);
- *b++ = val ? val : avio_r8(s->pb);
- }
- }
- }
- ffio_init_context(&pb, buffer, b - buffer, 0, NULL, NULL, NULL, NULL);
- tlen = b - buffer;
- pbx = &pb; // read from sync buffer
- } else {
- pbx = s->pb; // read straight from input
- }
if (tag[0] == 'T')
/* parse text tag */
read_ttag(s, pbx, tlen, tag);
@@ -771,7 +773,7 @@ seek:
av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n", version, reason);
avio_seek(s->pb, end, SEEK_SET);
av_free(buffer);
- av_free(compressed_buffer);
+ av_free(uncompressed_buffer);
return;
}