Mercurial > libavcodec.hg
comparison flac.c @ 2859:079b5cca2497 libavcodec
AV_LOG_DEBUG vs. AV_LOG_ERROR
author | michael |
---|---|
date | Mon, 05 Sep 2005 09:28:46 +0000 |
parents | 511e3afc43e1 |
children | ef2149182f1c |
comparison
equal
deleted
inserted
replaced
2858:99a5981878a2 | 2859:079b5cca2497 |
---|---|
404 s->curr_bps++; | 404 s->curr_bps++; |
405 } | 405 } |
406 | 406 |
407 if (get_bits1(&s->gb)) | 407 if (get_bits1(&s->gb)) |
408 { | 408 { |
409 av_log(s->avctx, AV_LOG_DEBUG, "invalid subframe padding\n"); | 409 av_log(s->avctx, AV_LOG_ERROR, "invalid subframe padding\n"); |
410 return -1; | 410 return -1; |
411 } | 411 } |
412 type = get_bits(&s->gb, 6); | 412 type = get_bits(&s->gb, 6); |
413 // wasted = get_bits1(&s->gb); | 413 // wasted = get_bits1(&s->gb); |
414 | 414 |
460 if (decode_subframe_lpc(s, channel, (type & ~0x20)+1) < 0) | 460 if (decode_subframe_lpc(s, channel, (type & ~0x20)+1) < 0) |
461 return -1; | 461 return -1; |
462 } | 462 } |
463 else | 463 else |
464 { | 464 { |
465 av_log(s->avctx, AV_LOG_DEBUG, "invalid coding type\n"); | 465 av_log(s->avctx, AV_LOG_ERROR, "invalid coding type\n"); |
466 return -1; | 466 return -1; |
467 } | 467 } |
468 | 468 |
469 if (wasted) | 469 if (wasted) |
470 { | 470 { |
490 decorrelation = INDEPENDENT; | 490 decorrelation = INDEPENDENT; |
491 else if (assignment >=8 && assignment < 11 && s->channels == 2) | 491 else if (assignment >=8 && assignment < 11 && s->channels == 2) |
492 decorrelation = LEFT_SIDE + assignment - 8; | 492 decorrelation = LEFT_SIDE + assignment - 8; |
493 else | 493 else |
494 { | 494 { |
495 av_log(s->avctx, AV_LOG_DEBUG, "unsupported channel assignment %d (channels=%d)\n", assignment, s->channels); | 495 av_log(s->avctx, AV_LOG_ERROR, "unsupported channel assignment %d (channels=%d)\n", assignment, s->channels); |
496 return -1; | 496 return -1; |
497 } | 497 } |
498 | 498 |
499 sample_size_code = get_bits(&s->gb, 3); | 499 sample_size_code = get_bits(&s->gb, 3); |
500 if(sample_size_code == 0) | 500 if(sample_size_code == 0) |
501 bps= s->bps; | 501 bps= s->bps; |
502 else if((sample_size_code != 3) && (sample_size_code != 7)) | 502 else if((sample_size_code != 3) && (sample_size_code != 7)) |
503 bps = sample_size_table[sample_size_code]; | 503 bps = sample_size_table[sample_size_code]; |
504 else | 504 else |
505 { | 505 { |
506 av_log(s->avctx, AV_LOG_DEBUG, "invalid sample size code (%d)\n", sample_size_code); | 506 av_log(s->avctx, AV_LOG_ERROR, "invalid sample size code (%d)\n", sample_size_code); |
507 return -1; | 507 return -1; |
508 } | 508 } |
509 | 509 |
510 if (get_bits1(&s->gb)) | 510 if (get_bits1(&s->gb)) |
511 { | 511 { |
512 av_log(s->avctx, AV_LOG_DEBUG, "broken stream, invalid padding\n"); | 512 av_log(s->avctx, AV_LOG_ERROR, "broken stream, invalid padding\n"); |
513 return -1; | 513 return -1; |
514 } | 514 } |
515 | 515 |
516 if(get_utf8(&s->gb) < 0){ | 516 if(get_utf8(&s->gb) < 0){ |
517 av_log(s->avctx, AV_LOG_ERROR, "utf8 fscked\n"); | 517 av_log(s->avctx, AV_LOG_ERROR, "utf8 fscked\n"); |