diff options
| author | Rajat Kumar <rajat.kumar@ittiam.com> | 2019-03-05 13:23:27 +0530 |
|---|---|---|
| committer | Ray Essick <essick@google.com> | 2019-07-03 10:23:20 -0700 |
| commit | f6b2d777878b43a04b8930dd5edeca485d617f58 (patch) | |
| tree | f56d75b27eebbe0bc4ff9ef84f68ad118400fdaa /decoder/ixheaacd_create.c | |
| parent | 08225b931ee98f56837d5c2329e164601635789d (diff) | |
| download | libxaac-f6b2d777878b43a04b8930dd5edeca485d617f58.tar.gz | |
Fixes to incorporate latest conformance criteria
Bug:128648229
Test: atest android.media.cts.DecoderTestXheAac
Test: atest android.media.cts.DecoderTestAacDrc
Change-Id: Ic85bacc660c91096e29cd0cbe24323f4a6109c9a
Diffstat (limited to 'decoder/ixheaacd_create.c')
| -rw-r--r-- | decoder/ixheaacd_create.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/decoder/ixheaacd_create.c b/decoder/ixheaacd_create.c index 962b98c..fad1d05 100644 --- a/decoder/ixheaacd_create.c +++ b/decoder/ixheaacd_create.c @@ -279,8 +279,11 @@ WORD32 ixheaacd_decode_init( for (i = 0; i < MAX_NUM_CHANNELS; i++) { usac_data->str_tddec[i] = &usac_data->arr_str_tddec[i]; - usac_data->str_tddec[i]->fscale = - ((fscale)*usac_data->ccfl) / LEN_SUPERFRAME; + if (usac_data->ccfl == 768) + usac_data->str_tddec[i]->fscale = pstr_stream_config->sampling_frequency; + else + usac_data->str_tddec[i]->fscale = + ((fscale)*usac_data->ccfl) / LEN_SUPERFRAME; usac_data->len_subfrm = usac_data->ccfl / 4; usac_data->num_subfrm = (MAX_NUM_SUBFR * usac_data->ccfl) / LEN_SUPERFRAME; |