From 083cbc930d077651ea7e3fbc32ec45352cfed7e7 Mon Sep 17 00:00:00 2001 From: Tom Butterworth Date: Tue, 21 Jul 2015 01:21:38 +0100 Subject: snappy: Refactor so ff_snappy_uncompress() uses an existing buffer Some uses of Snappy require uncompressing to positions within an existing buffer. Also adds a function to get the uncompressed length of Snappy data. --- libavcodec/hapdec.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libavcodec/hapdec.c') diff --git a/libavcodec/hapdec.c b/libavcodec/hapdec.c index a4880cd3e7..0398efe6ca 100644 --- a/libavcodec/hapdec.c +++ b/libavcodec/hapdec.c @@ -108,8 +108,13 @@ static int setup_texture(AVCodecContext *avctx, size_t length) compressorstr = "none"; break; case HAP_COMP_SNAPPY: + snappy_size = ff_snappy_peek_uncompressed_length(gbc); + ret = av_reallocp(&ctx->snappied, snappy_size); + if (ret < 0) { + return ret; + } /* Uncompress the frame */ - ret = ff_snappy_uncompress(gbc, &ctx->snappied, &snappy_size); + ret = ff_snappy_uncompress(gbc, ctx->snappied, &snappy_size); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Snappy uncompress error\n"); return ret; -- cgit v1.2.3