Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

mlpdec: Prettify substream parity check.

Browse Source 
Originally committed as revision 18237 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Ramiro Polla 16 years ago
parent 7b18e13a7c
commit d544dcdf38
1 changed files with 6 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      libavcodec/mlpdec.c

12
libavcodec/mlpdec.c
Unescape View File

@ -1041,14 +1041,12 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size,
uint8_t parity, checksum; uint8_t parity, checksum;
parity = ff_mlp_calculate_parity(buf, substream_data_len[substr] - 2); 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);
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", if ((get_bits(&gb, 8) ^ parity) != 0xa9 )
substr); 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)) { if (substream_data_len[substr] * 8 != get_bits_count(&gb)) {
av_log(m->avctx, AV_LOG_ERROR, "substream %d length mismatch\n", av_log(m->avctx, AV_LOG_ERROR, "substream %d length mismatch\n",

Write Preview
Loading…
Cancel
Save