Advertisement
Guest User

Untitled

a guest
Jul 7th, 2017
90
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.52 KB | None | 0 0
  1. diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
  2. index 71186969bf..0ff09b4716 100644
  3. --- a/libavcodec/aacdec_template.c
  4. +++ b/libavcodec/aacdec_template.c
  5. @@ -1320,13 +1320,13 @@ static int decode_ics_info(AACContext *ac, IndividualChannelStream *ics,
  6. }
  7. }
  8. ics->num_windows = 8;
  9. - if (m4ac->frame_length_short) {
  10. - ics->swb_offset = ff_swb_offset_120[sampling_index];
  11. - ics->num_swb = ff_aac_num_swb_120[sampling_index];
  12. - } else {
  13. + //if (m4ac->frame_length_short) {
  14. + // ics->swb_offset = ff_swb_offset_128[sampling_index];
  15. + // ics->num_swb = ff_aac_num_swb_128[sampling_index];
  16. + //} else {
  17. ics->swb_offset = ff_swb_offset_128[sampling_index];
  18. ics->num_swb = ff_aac_num_swb_128[sampling_index];
  19. - }
  20. + //}
  21. ics->tns_max_bands = ff_tns_max_bands_128[sampling_index];
  22. ics->predictor_present = 0;
  23. } else {
  24. @@ -2641,8 +2641,8 @@ static void imdct_and_windowing_960(AACContext *ac, SingleChannelElement *sce)
  25.  
  26. // imdct
  27. if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) {
  28. - for (i = 0; i < 960; i += 120)
  29. - ac->mdct120->imdct_half(ac->mdct120, buf + i, in + i, 1, 1);
  30. + for (i = 0; i < 8; i++)
  31. + ac->mdct120->imdct_half(ac->mdct120, buf + i * 120, in + i * 128, 1, 1);
  32. } else {
  33. ac->mdct960->imdct_half(ac->mdct960, buf, in, 1, 1);
  34. }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement