MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-05-03 16:30:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1646 from owntone/raop_alac_endtag1

Browse Source 
[raop] Add ALAC end tag to each frame
This commit is contained in:
ejurgensen 2023-08-31 17:10:06 +02:00 committed by GitHub
commit 174aa86033
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/outputs/raop.c
View File

@ -13,6 +13,10 @@
* Copyright (C) 2005 Shiro Ninomiya <shiron@snino.com> * Copyright (C) 2005 Shiro Ninomiya <shiron@snino.com>
* GPLv2+ * GPLv2+
* *
* ALAC update to add end tags for compatibility with the FFmpeg ALAC decoder
* Copyright (C) 2023 Mike Brady <4265913+mikebrady@users.noreply.github.com>
* GPLv2+
*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
@ -411,6 +415,8 @@ alac_encode(uint8_t *dst, uint8_t *raw, int len)
alac_write_bits(&dst, *(raw + 3), 8, &bpos); alac_write_bits(&dst, *(raw + 3), 8, &bpos);
alac_write_bits(&dst, *(raw + 2), 8, &bpos); alac_write_bits(&dst, *(raw + 2), 8, &bpos);
} }
alac_write_bits(&dst, 7, 3, &bpos); /* end tag */
} }
/* AirTunes v2 time synchronization helpers */ /* AirTunes v2 time synchronization helpers */
@ -2842,7 +2848,8 @@ packets_send(struct raop_master_session *rms)
struct raop_session *rs; struct raop_session *rs;
int ret; int ret;
pkt = rtp_packet_next(rms->rtp_session, ALAC_HEADER_LEN + rms->rawbuf_size, rms->samples_per_packet, RAOP_RTP_PAYLOADTYPE, 0); pkt = rtp_packet_next(rms->rtp_session, ALAC_HEADER_LEN + rms->rawbuf_size + 1, rms->samples_per_packet, RAOP_RTP_PAYLOADTYPE, 0);
/* the "+ 1" above is space for the end tag (3 bits) */
ret = packet_prepare(pkt, rms->rawbuf, rms->rawbuf_size, rms->encrypt); ret = packet_prepare(pkt, rms->rawbuf, rms->rawbuf_size, rms->encrypt);
if (ret < 0) if (ret < 0)