diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-04-06 13:26:02 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-04-07 21:48:22 +0000 |
| commit | 1adf54de56be13a6df51c5d42f0ecf2e1ec0c648 (patch) | |
| tree | 49ecc7b6bc13a5be50c0910538a6d3e078018757 | |
| parent | 4bcb75cc48be18341919f86ce26fa1f4db624f67 (diff) | |
| download | ffmpeg-1adf54de56be13a6df51c5d42f0ecf2e1ec0c648.tar.gz | |
dfa: implement tdlt chunk decoding
Sample & pseudo code provided by Vladimir "VAG" Gneushev.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
| -rw-r--r-- | libavcodec/dfa.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c index fcfcd30f8c..4c77f4e273 100644 --- a/libavcodec/dfa.c +++ b/libavcodec/dfa.c @@ -288,9 +288,24 @@ static int decode_wdlt(GetByteContext *gb, uint8_t *frame, int width, int height return 0; } -static int decode_unk6(GetByteContext *gb, uint8_t *frame, int width, int height) +static int decode_tdlt(GetByteContext *gb, uint8_t *frame, int width, int height) { - return AVERROR_PATCHWELCOME; + const uint8_t *frame_end = frame + width * height; + uint32_t segments = bytestream2_get_le32(gb); + + while (segments--) { + int count = bytestream2_get_byte(gb) << 1; + int skip = bytestream2_get_byte(gb) << 1; + + if (frame_end - frame < skip + count) + return AVERROR_INVALIDDATA; + frame += skip; + if (bytestream2_get_buffer(gb, frame, count) != count) + return AVERROR_INVALIDDATA; + frame += count; + } + + return 0; } static int decode_blck(GetByteContext *gb, uint8_t *frame, int width, int height) @@ -304,11 +319,11 @@ typedef int (*chunk_decoder)(GetByteContext *gb, uint8_t *frame, int width, int static const chunk_decoder decoder[8] = { decode_copy, decode_tsw1, decode_bdlt, decode_wdlt, - decode_unk6, decode_dsw1, decode_blck, decode_dds1, + decode_tdlt, decode_dsw1, decode_blck, decode_dds1, }; static const char* chunk_name[8] = { - "COPY", "TSW1", "BDLT", "WDLT", "????", "DSW1", "BLCK", "DDS1" + "COPY", "TSW1", "BDLT", "WDLT", "TDLT", "DSW1", "BLCK", "DDS1" }; static int dfa_decode_frame(AVCodecContext *avctx, |