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

dxv: Support RAW intermediate compression

Browse Source 
Sample-Id: boombox64.mov
Reported-by: Aarni Koskela
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Vittorio Giovara 2015-09-22 13:57:59 +02:00
parent bbf71d46db
commit 1bcd4a476b
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavcodec/dxv.c
View File

@ -314,6 +314,15 @@ static int dxv_decompress_lzf(AVCodecContext *avctx)
return ff_lzf_uncompress(&ctx->gbc, &ctx->tex_data, &ctx->tex_size); return ff_lzf_uncompress(&ctx->gbc, &ctx->tex_data, &ctx->tex_size);
} }
static int dxv_decompress_raw(AVCodecContext *avctx)
{
DXVContext *ctx = avctx->priv_data;
GetByteContext *gbc = &ctx->gbc;
bytestream2_get_buffer(gbc, ctx->tex_data, ctx->tex_size);
return 0;
}
static int dxv_decode(AVCodecContext *avctx, void *data, static int dxv_decode(AVCodecContext *avctx, void *data,
int *got_frame, AVPacket *avpkt) int *got_frame, AVPacket *avpkt)
{ {
@ -356,7 +365,14 @@ static int dxv_decode(AVCodecContext *avctx, void *data,
size = tag & 0x00FFFFFF; size = tag & 0x00FFFFFF;
old_type = tag >> 24; old_type = tag >> 24;
version_major = (old_type & 0x0F) - 1; version_major = (old_type & 0x0F) - 1;
msgcomp = "LZF";
if (old_type & 0x80) {
msgcomp = "RAW";
decompress_tex = dxv_decompress_raw;
} else {
msgcomp = "LZF";
decompress_tex = dxv_decompress_lzf;
}
if (old_type & 0x40) { if (old_type & 0x40) {
msgtext = "DXT5"; msgtext = "DXT5";
@ -372,7 +388,6 @@ static int dxv_decode(AVCodecContext *avctx, void *data,
av_log(avctx, AV_LOG_ERROR, "Unsupported header (0x%08X)\n.", tag); av_log(avctx, AV_LOG_ERROR, "Unsupported header (0x%08X)\n.", tag);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
decompress_tex = dxv_decompress_lzf;
ctx->tex_rat = 1; ctx->tex_rat = 1;
break; break;
} }
@ -382,7 +397,14 @@ static int dxv_decode(AVCodecContext *avctx, void *data,
version_major = bytestream2_get_byte(gbc) - 1; version_major = bytestream2_get_byte(gbc) - 1;
version_minor = bytestream2_get_byte(gbc); version_minor = bytestream2_get_byte(gbc);
bytestream2_skip(gbc, 2); // unknown /* Encoder copies texture data when compression is not advantageous. */
if (bytestream2_get_byte(gbc)) {
msgcomp = "RAW";
ctx->tex_rat = 1;
decompress_tex = dxv_decompress_raw;
}
bytestream2_skip(gbc, 1); // unknown
size = bytestream2_get_le32(gbc); size = bytestream2_get_le32(gbc);
} }
av_log(avctx, AV_LOG_DEBUG, av_log(avctx, AV_LOG_DEBUG,