RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '588a5619da0d041e55b365f63d0fa9c72bdbd4d3' 

* commit '588a5619da0d041e55b365f63d0fa9c72bdbd4d3':
  dxv: Parse ancillary encoder information

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-09-26 11:11:06 +02:00
parent 2b61cc4443 588a5619da
commit d0aec0aae8
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/dxv.c
View File

@ -322,7 +322,8 @@ static int dxv_decode(AVCodecContext *avctx, void *data,
GetByteContext *gbc = &ctx->gbc; GetByteContext *gbc = &ctx->gbc;
int (*decompress_tex)(AVCodecContext *avctx); int (*decompress_tex)(AVCodecContext *avctx);
uint32_t tag; uint32_t tag;
int channels, size = 0, old_type = 0; int version_major, version_minor = 0;
int size = 0, old_type = 0;
int ret; int ret;
bytestream2_init(gbc, avpkt->data, avpkt->size); bytestream2_init(gbc, avpkt->data, avpkt->size);
@ -351,7 +352,8 @@ static int dxv_decode(AVCodecContext *avctx, void *data,
/* Old version does not have a real header, just size and type. */ /* Old version does not have a real header, just size and type. */
size = tag & 0x00FFFFFF; size = tag & 0x00FFFFFF;
old_type = tag >> 24; old_type = tag >> 24;
channels = old_type & 0x0F; version_major = (old_type & 0x0F) - 1;
if (old_type & 0x40) { if (old_type & 0x40) {
av_log(avctx, AV_LOG_DEBUG, "LZF compression and DXT5 texture "); av_log(avctx, AV_LOG_DEBUG, "LZF compression and DXT5 texture ");
ctx->tex_funct = ctx->texdsp.dxt5_block; ctx->tex_funct = ctx->texdsp.dxt5_block;
@ -371,11 +373,13 @@ static int dxv_decode(AVCodecContext *avctx, void *data,
/* New header is 12 bytes long. */ /* New header is 12 bytes long. */
if (!old_type) { if (!old_type) {
channels = bytestream2_get_byte(gbc); version_major = bytestream2_get_byte(gbc) - 1;
bytestream2_skip(gbc, 3); // unknown version_minor = bytestream2_get_byte(gbc);
bytestream2_skip(gbc, 2); // unknown
size = bytestream2_get_le32(gbc); size = bytestream2_get_le32(gbc);
} }
av_log(avctx, AV_LOG_DEBUG, "(%d channels)\n", channels); av_log(avctx, AV_LOG_DEBUG, "(version %d.%d)\n", version_major, version_minor);
if (size != bytestream2_get_bytes_left(gbc)) { if (size != bytestream2_get_bytes_left(gbc)) {
av_log(avctx, AV_LOG_ERROR, "Incomplete or invalid file (%u > %u)\n.", av_log(avctx, AV_LOG_ERROR, "Incomplete or invalid file (%u > %u)\n.",