Skip to content
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

Jump to bottom

fix(qq): fix audio encoding #289

Merged
merged 5 commits into from
Jul 16, 2024
Merged

fix(qq): fix audio encoding #289

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
99edb5b
fix(qq): arraybuffer to string
idranme Jun 29, 2024
f2ddc1a
fix: cannot send some wav
idranme Jul 10, 2024
fafb916
chore
idranme Jul 13, 2024
5d1e54c
Merge branch 'satorijs:master' into master
idranme Jul 16, 2024
4283fa7
opt
idranme Jul 16, 2024
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
11 changes: 6 additions & 5 deletions adapters/qq/src/message.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,28 +403,29 @@ export class QQMessageEncoder<C extends Context = Context> extends MessageEncode
} else if (type === 'audio' && (attrs.src || attrs.url)) {
await this.flush()
const { data } = await this.bot.ctx.http.file(attrs.src || attrs.url, attrs)
if (data.slice(0, 7).toString().includes('#!SILK')) {
if (new TextDecoder().decode(data.slice(0, 7)).includes('#!SILK')) {
const onlineFile = await this.sendFile(type, {
src: `data:audio/amr;base64,` + Buffer.from(data).toString('base64'),
})
this.attachedFile = onlineFile
} else {
const silk = this.bot.ctx.get('silk')
if (!silk) return this.bot.logger.warn('missing silk service, cannot send non-silk audio')
if (silk.isWav(data)) {
const allowSampleRate = [8000, 12000, 16000, 24000, 32000, 44100, 48000]
if (silk.isWav(data) && allowSampleRate.includes(silk.getWavFileInfo(data).fmt.sampleRate)) {
const result = await silk.encode(data, 0)
const onlineFile = await this.sendFile(type, {
src: `data:audio/amr;base64,` + Buffer.from(result.data).toString('base64'),
})
if (onlineFile) this.attachedFile = onlineFile
} else {
if (!this.bot.ctx.get('ffmpeg')) return this.bot.logger.warn('missing ffmpeg service, cannot send non-silk audio except wav')
const wavBuf = await this.bot.ctx.get('ffmpeg')
if (!this.bot.ctx.get('ffmpeg')) return this.bot.logger.warn('missing ffmpeg service, cannot send non-silk audio except some wav')
const pcmBuf = await this.bot.ctx.get('ffmpeg')
.builder()
.input(Buffer.from(data))
.outputOption('-ar', '24000', '-ac', '1', '-f', 's16le')
.run('buffer')
const result = await silk.encode(wavBuf, 24000)
const result = await silk.encode(pcmBuf, 24000)
const onlineFile = await this.sendFile(type, {
src: `data:audio/amr;base64,` + Buffer.from(result.data).toString('base64'),
})
Expand Down
Loading