Showing the changes to libavcodec (1 of 1 file). Show all
Unified · Split
| @@ -412,13 +412,13 @@ static int ac_init(AVCodecContext *avctx, · 411 unmodified lines | ||
| 412 | 412 | return 0; |
| 413 | 413 | } |
| 414 | 414 | |
| 415 | −static unsigned ac_get_prob(WavArcContext *s) | |
| 415 | +static uint16_t ac_get_prob(WavArcContext *s) | |
| 416 | 416 | { |
| 417 | − return ((s->freq_range - 1) + ((unsigned)s->ac_value - (unsigned)s->ac_low) * | |
| 418 | − (unsigned)s->freq_range) / (((unsigned)s->ac_high - (unsigned)s->ac_low) + 1) & 0xffffu; | |
| 417 | + return ((s->freq_range - 1) + (s->ac_value - s->ac_low) * s->freq_range) / | |
| 418 | + ((s->ac_high - s->ac_low) + 1U); | |
| 419 | 419 | } |
| 420 | 420 | |
| 421 | −static unsigned ac_map_symbol(WavArcContext *s, unsigned prob) | |
| 421 | +static uint8_t ac_map_symbol(WavArcContext *s, uint16_t prob) | |
| 422 | 422 | { |
| 423 | 423 | int idx = 255; |
| 424 | 424 | |
| @@ -435,33 +435,43 @@ static int ac_normalize(AVCodecContext *avctx, WavArcContext *s, GetBitContext * · 10 unmodified lines | ||
| 435 | 435 | { |
| 436 | 436 | int range; |
| 437 | 437 | |
| 438 | − range = (unsigned)s->ac_high - (unsigned)s->ac_low + 1; | |
| 439 | − s->ac_high = (int16_t)((range * (unsigned)s->range_high) / (unsigned)s->freq_range) + -1 + s->ac_low; | |
| 440 | − s->ac_low += (int16_t)((range * (unsigned)s->range_low) / (unsigned)s->freq_range); | |
| 438 | + if (s->ac_high < s->ac_low) | |
| 439 | + goto fail; | |
| 440 | + | |
| 441 | + range = (s->ac_high - s->ac_low) + 1; | |
| 442 | + s->ac_high = (range * s->range_high) / s->freq_range + s->ac_low - 1; | |
| 443 | + s->ac_low += (range * s->range_low) / s->freq_range; | |
| 444 | + | |
| 445 | + if (s->ac_high < s->ac_low) | |
| 446 | + goto fail; | |
| 441 | 447 | |
| 442 | 448 | for (;;) { |
| 443 | 449 | if ((s->ac_high & 0x8000) != (s->ac_low & 0x8000)) { |
| 444 | − if ((s->ac_low & 0x4000) == 0 || (s->ac_high & 0x4000) != 0) | |
| 450 | + if (((s->ac_low & 0x4000) == 0) || ((s->ac_high & 0x4000) != 0)) | |
| 445 | 451 | return 0; |
| 446 | 452 | s->ac_value ^= 0x4000; |
| 447 | 453 | s->ac_low &= 0x3fff; |
| 448 | 454 | s->ac_high |= 0x4000; |
| 449 | 455 | } |
| 450 | 456 | |
| 451 | − s->ac_low = s->ac_low << 1; | |
| 452 | − s->ac_high = s->ac_high * 2 + 1; | |
| 453 | − if (s->ac_high < s->ac_low) { | |
| 454 | − av_log(avctx, AV_LOG_ERROR, "invalid state\n"); | |
| 455 | − return AVERROR_INVALIDDATA; | |
| 456 | − } | |
| 457 | + s->ac_low = s->ac_low * 2; | |
| 458 | + s->ac_high = s->ac_high * 2 | 1; | |
| 459 | + if (s->ac_high < s->ac_low) | |
| 460 | + goto fail; | |
| 457 | 461 | |
| 458 | 462 | if (get_bits_left(gb) <= 0) { |
| 459 | 463 | av_log(avctx, AV_LOG_ERROR, "overread in arithmetic coder\n"); |
| 460 | − return AVERROR_INVALIDDATA; | |
| 464 | + goto fail; | |
| 461 | 465 | } |
| 462 | 466 | |
| 463 | 467 | s->ac_value = s->ac_value * 2 + get_bits1(gb); |
| 468 | + if (s->ac_low > s->ac_value || s->ac_high < s->ac_value) | |
| 469 | + goto fail; | |
| 464 | 470 | } |
| 471 | + | |
| 472 | +fail: | |
| 473 | + av_log(avctx, AV_LOG_ERROR, "invalid state\n"); | |
| 474 | + return AVERROR_INVALIDDATA; | |
| 465 | 475 | } |
| 466 | 476 | |
| 467 | 477 | static void ac_init_model(WavArcContext *s) |
| @@ -484,11 +494,11 @@ static int ac_read_model(AVCodecContext *avctx, · 16 unmodified lines | ||
| 484 | 494 | end = get_bits(gb, 8); |
| 485 | 495 | |
| 486 | 496 | for (;;) { |
| 487 | − while (start <= end) | |
| 497 | + while (start <= end) { | |
| 498 | + if (get_bits_left(gb) < 8) | |
| 499 | + return AVERROR_INVALIDDATA; | |
| 488 | 500 | s->model[start++] = get_bits(gb, 8); |
| 489 | − | |
| 490 | − if (get_bits_left(gb) < 8) | |
| 491 | − return AVERROR_INVALIDDATA; | |
| 501 | + } | |
| 492 | 502 | |
| 493 | 503 | if (get_bits_left(gb) < 8) |
| 494 | 504 | return AVERROR_INVALIDDATA; |
| @@ -568,9 +578,9 @@ static int decode_5elp(AVCodecContext *avctx, · 73 unmodified lines | ||
| 568 | 578 | } |
| 569 | 579 | |
| 570 | 580 | for (int n = 0; n < s->nb_samples; n++) { |
| 571 | − unsigned prob = ac_get_prob(s); | |
| 572 | − prob = ac_map_symbol(s, prob); | |
| 573 | − ac_out[n] = prob - 0x80; | |
| 581 | + uint16_t prob = ac_get_prob(s); | |
| 582 | + int ac = ac_map_symbol(s, prob); | |
| 583 | + ac_out[n] = ac - 0x80; | |
| 574 | 584 | if ((ret = ac_normalize(avctx, s, &ac_gb)) < 0) |
| 575 | 585 | return ret; |
| 576 | 586 | } |
| @@ -620,11 +630,16 @@ static int decode_5elp(AVCodecContext *avctx, · 43 unmodified lines | ||
| 620 | 630 | case 20: |
| 621 | 631 | case 7: |
| 622 | 632 | for (int n = 0; n < s->nb_samples; n++) |
| 623 | − samples[n + 70] = ac_out[n] + samples[n + 69] * 3 - samples[n + 68] * 3 + samples[n + 67]; | |
| 633 | + samples[n + 70] += ac_out[n] + samples[n + 69] * 3 - samples[n + 68] * 3 + samples[n + 67]; | |
| 624 | 634 | finished = 1; |
| 625 | 635 | break; |
| 626 | 636 | case 19: |
| 627 | 637 | case 6: |
| 638 | + for (int n = 0; n < 70; n++) { | |
| 639 | + ac_pred[n] = samples[n]; | |
| 640 | + samples[n] = 0; | |
| 641 | + } | |
| 642 | + | |
| 628 | 643 | for (int n = 0; n < s->nb_samples; n++) { |
| 629 | 644 | int sum = 15; |
| 630 | 645 | |
| @@ -633,24 +648,31 @@ static int decode_5elp(AVCodecContext *avctx, · 2 unmodified lines | ||
| 633 | 648 | |
| 634 | 649 | samples[n + 70] += ac_out[n] + (sum >> 4); |
| 635 | 650 | } |
| 651 | + | |
| 652 | + for (int n = 0; n < 70; n++) | |
| 653 | + samples[n] = ac_pred[n]; | |
| 654 | + | |
| 655 | + for (int n = 0; n < s->nb_samples; n++) | |
| 656 | + samples[n + 70] += ac_out[n] + samples[n + 69] * 3 - samples[n + 68] * 3 + samples[n + 67]; | |
| 657 | + | |
| 636 | 658 | finished = 1; |
| 637 | 659 | break; |
| 638 | 660 | case 18: |
| 639 | 661 | case 5: |
| 640 | 662 | for (int n = 0; n < s->nb_samples; n++) |
| 641 | − samples[n + 70] = ac_out[n] + samples[n + 69] * 2 - samples[n + 68]; | |
| 663 | + samples[n + 70] += ac_out[n] + samples[n + 69] * 2 - samples[n + 68]; | |
| 642 | 664 | finished = 1; |
| 643 | 665 | break; |
| 644 | 666 | case 17: |
| 645 | 667 | case 4: |
| 646 | 668 | for (int n = 0; n < s->nb_samples; n++) |
| 647 | − samples[n + 70] = ac_out[n]; | |
| 669 | + samples[n + 70] += ac_out[n]; | |
| 648 | 670 | finished = 1; |
| 649 | 671 | break; |
| 650 | 672 | case 16: |
| 651 | 673 | case 3: |
| 652 | 674 | for (int n = 0; n < s->nb_samples; n++) |
| 653 | − samples[n + 70] = ac_out[n] + samples[n + 69]; | |
| 675 | + samples[n + 70] += ac_out[n] + samples[n + 69]; | |
| 654 | 676 | finished = 1; |
| 655 | 677 | break; |
| 656 | 678 | case 15: |