[SCM] libav/experimental: mlpdec: Prettify substream parity check.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:42:49 UTC 2013
The following commit has been merged in the experimental branch:
commit d544dcdf38411c8f4ebd872d69f89f087cf69751
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date: Mon Mar 30 03:37:19 2009 +0000
mlpdec: Prettify substream parity check.
Originally committed as revision 18237 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index 3be27b4..7bda703 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -1040,15 +1040,13 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size,
substream_parity_present[substr]) {
uint8_t parity, checksum;
- parity = ff_mlp_calculate_parity(buf, substream_data_len[substr] - 2);
- if ((parity ^ get_bits(&gb, 8)) != 0xa9)
- av_log(m->avctx, AV_LOG_ERROR,
- "Substream %d parity check failed.\n", substr);
+ parity = ff_mlp_calculate_parity(buf, substream_data_len[substr] - 2);
+ checksum = ff_mlp_checksum8 (buf, substream_data_len[substr] - 2);
- checksum = ff_mlp_checksum8(buf, substream_data_len[substr] - 2);
- if (checksum != get_bits(&gb, 8))
- av_log(m->avctx, AV_LOG_ERROR, "Substream %d checksum failed.\n",
- substr);
+ if ((get_bits(&gb, 8) ^ parity) != 0xa9 )
+ av_log(m->avctx, AV_LOG_ERROR, "Substream %d parity check failed.\n", substr);
+ if ( get_bits(&gb, 8) != checksum)
+ av_log(m->avctx, AV_LOG_ERROR, "Substream %d checksum failed.\n" , substr);
}
if (substream_data_len[substr] * 8 != get_bits_count(&gb)) {
av_log(m->avctx, AV_LOG_ERROR, "substream %d length mismatch\n",
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list