Skip to content

fix: saturate eSBR QMF synthesis output #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HansKeksnascher wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: saturate eSBR QMF synthesis output #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions decoder/armv7/ixheaacd_esbr_qmfsyn64_winadd.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,12 @@ ixheaacd_esbr_qmfsyn64_winadd: @ PROC
VMLAL.S32 Q13, D16, D18
VMLAL.S32 Q14, D17, D19

VSHRN.S64 D26 , Q13, #31
VQSHRN.S64 D26 , Q13, #31

VST1.32 D26[0], [R3], R5
VST1.32 D26[1], [R3], R5

VSHRN.S64 D27 , Q14, #31
VQSHRN.S64 D27 , Q14, #31

VST1.32 D27[0], [R3], R5
VST1.32 D27[1], [R3], R5
Expand Down Expand Up @@ -207,12 +207,12 @@ LOOP_1:
VMLAL.S32 Q13, D16, D18
VMLAL.S32 Q14, D17, D19

VSHRN.S64 D26 , Q13, #31
VQSHRN.S64 D26 , Q13, #31

VST1.32 D26[0], [R3], R5
VST1.32 D26[1], [R3], R5

VSHRN.S64 D27 , Q14, #31
VQSHRN.S64 D27 , Q14, #31

VST1.32 D27[0], [R3], R5
VST1.32 D27[1], [R3], R5
Expand Down Expand Up @@ -299,12 +299,12 @@ LOOP_1:
VMLAL.S32 Q13, D16, D18
VMLAL.S32 Q14, D17, D19

VSHRN.S64 D26 , Q13, #31
VQSHRN.S64 D26 , Q13, #31

VST1.32 D26[0], [R3], R5
VST1.32 D26[1], [R3], R5

VSHRN.S64 D27 , Q14, #31
VQSHRN.S64 D27 , Q14, #31

VST1.32 D27[0], [R3], R5
VST1.32 D27[1], [R3], R5
Expand Down Expand Up @@ -395,12 +395,12 @@ LOOP_1:
VMLAL.S32 Q13, D16, D18
VMLAL.S32 Q14, D17, D19

VSHRN.S64 D26 , Q13, #31
VQSHRN.S64 D26 , Q13, #31

VST1.32 D26[0], [R3], R5
VST1.32 D26[1], [R3], R5

VSHRN.S64 D27, Q14, #31
VQSHRN.S64 D27, Q14, #31

VST1.32 D27[0], [R3], R5
VST1.32 D27[1], [R3], R5
Expand Down
2 changes: 1 addition & 1 deletion decoder/armv7/ixheaacd_qmf_dec_armv7.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,6 @@ VOID ixheaacd_esbr_qmfsyn32_winadd(WORD32 *tmp1, WORD32 *tmp2, WORD32 *inp1,
syn_out =
ixheaac_add64(syn_out, ixheaac_mult64(tmp2[576 + k], inp1[2 * (k + 288)]));

sample_buffer[ch_fac * k] = (WORD32)(syn_out >> 31);
sample_buffer[ch_fac * k] = ixheaac_sat64_32(syn_out >> 31);
}
}
2 changes: 1 addition & 1 deletion decoder/armv8/ixheaacd_qmf_dec_armv8.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1323,7 +1323,7 @@ VOID ixheaacd_esbr_qmfsyn32_winadd(WORD32 *tmp1, WORD32 *tmp2, WORD32 *inp1,
syn_out =
ixheaac_add64(syn_out, ixheaac_mult64(tmp2[576 + k], inp1[2 * (k + 288)]));

sample_buffer[ch_fac * k] = (WORD32)(syn_out >> 31);
sample_buffer[ch_fac * k] = ixheaac_sat64_32(syn_out >> 31);
}
}

Expand Down
4 changes: 2 additions & 2 deletions decoder/generic/ixheaacd_qmf_dec_generic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1570,7 +1570,7 @@ VOID ixheaacd_esbr_qmfsyn64_winadd(WORD32 *tmp1, WORD32 *tmp2, WORD32 *inp1,
syn_out =
ixheaac_add64(syn_out, ixheaac_mult64(tmp2[1152 + k], inp1[k + 576]));

sample_buffer[ch_fac * k] = (WORD32)(syn_out >> 31);
sample_buffer[ch_fac * k] = ixheaac_sat64_32(syn_out >> 31);
}
}

Expand Down Expand Up @@ -1603,7 +1603,7 @@ VOID ixheaacd_esbr_qmfsyn32_winadd(WORD32 *tmp1, WORD32 *tmp2, WORD32 *inp1,
syn_out =
ixheaac_add64(syn_out, ixheaac_mult64(tmp2[576 + k], inp1[2 * (k + 288)]));

sample_buffer[ch_fac * k] = (WORD32)(syn_out >> 31);
sample_buffer[ch_fac * k] = ixheaac_sat64_32(syn_out >> 31);
}
}

Expand Down