|
|
|
@ -331,11 +331,14 @@ static int mace3_decode_frame(AVCodecContext *avctx, |
|
|
|
|
for (j=0; j < buf_size / 2 / avctx->channels; j++) |
|
|
|
|
for (k=0; k < 2; k++) { |
|
|
|
|
uint8_t pkt = buf[i*2 + j*2*avctx->channels + k]; |
|
|
|
|
chomp3(&ctx->chd[i], output, pkt &7, MACEtab1, MACEtab2, avctx->channels); |
|
|
|
|
chomp3(&ctx->chd[i], output, pkt &7, MACEtab1, MACEtab2, |
|
|
|
|
avctx->channels); |
|
|
|
|
output += avctx->channels; |
|
|
|
|
chomp3(&ctx->chd[i], output,(pkt >> 3) &3, MACEtab3, MACEtab4, avctx->channels); |
|
|
|
|
chomp3(&ctx->chd[i], output,(pkt >> 3) &3, MACEtab3, MACEtab4, |
|
|
|
|
avctx->channels); |
|
|
|
|
output += avctx->channels; |
|
|
|
|
chomp3(&ctx->chd[i], output, pkt >> 5 , MACEtab1, MACEtab2, avctx->channels); |
|
|
|
|
chomp3(&ctx->chd[i], output, pkt >> 5 , MACEtab1, MACEtab2, |
|
|
|
|
avctx->channels); |
|
|
|
|
output += avctx->channels; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
@ -359,11 +362,14 @@ static int mace6_decode_frame(AVCodecContext *avctx, |
|
|
|
|
for (j = 0; j < buf_size / avctx->channels; j++) { |
|
|
|
|
uint8_t pkt = buf[i + j*avctx->channels]; |
|
|
|
|
|
|
|
|
|
chomp6(&ctx->chd[i], output, pkt >> 5 , MACEtab1, MACEtab2, avctx->channels); |
|
|
|
|
chomp6(&ctx->chd[i], output, pkt >> 5 , MACEtab1, MACEtab2, |
|
|
|
|
avctx->channels); |
|
|
|
|
output += avctx->channels << 1; |
|
|
|
|
chomp6(&ctx->chd[i], output,(pkt >> 3) & 3, MACEtab3, MACEtab4, avctx->channels); |
|
|
|
|
chomp6(&ctx->chd[i], output,(pkt >> 3) & 3, MACEtab3, MACEtab4, |
|
|
|
|
avctx->channels); |
|
|
|
|
output += avctx->channels << 1; |
|
|
|
|
chomp6(&ctx->chd[i], output, pkt & 7, MACEtab1, MACEtab2, avctx->channels); |
|
|
|
|
chomp6(&ctx->chd[i], output, pkt & 7, MACEtab1, MACEtab2, |
|
|
|
|
avctx->channels); |
|
|
|
|
output += avctx->channels << 1; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|