bbac3280c1
(This commit also modifies the following modules: UI,
deps/media-playback, coreaudio-encoder, decklink, linux-alsa,
linux-pulseaudio, mac-capture, obs-ffmpeg, obs-filters, obs-libfdk,
obs-outputs, win-dshow, and win-wasapi)
Adds surround sound audio support to the core, core plugins, and user
interface.
Compatible streaming services: Twitch, FB 360 live
Compatible protocols: rtmp / mpeg-ts tcp udp
Compatible file formats: mkv mp4 ts (others untested)
Compatible codecs: ffmpeg aac, fdk_aac, CoreAudio aac,
opus, vorbis, pcm (others untested).
Tested streaming servers: wowza, nginx
HLS, mpeg-dash : surround passthrough
Html5 players tested with live surround:
videojs, mediaelement, viblast (hls+dash), hls.js
Decklink: on win32, swap channels order for 5.1 7.1
(due to different channel mapping on wav, mpeg, ffmpeg)
Audio filters: surround working.
Monitoring: surround working (win macOs linux (pulse-audio)).
VST: stereo plugins keep in general only the first two channels.
surround plugins should work (e.g. mcfx does).
OS: win, macOs, linux (alsa, pulse-audio).
Misc: larger audio bitrates unlocked to accommodate more channels
NB: mf-aac only supports mono and stereo + 5.1 on win 10
(not implemented due to lack of usefulness)
Closes jp9000/obs-studio#968
44 lines
876 B
C
44 lines
876 B
C
#pragma once
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#include <stdint.h>
|
|
#include <string.h>
|
|
|
|
#include <obs.h>
|
|
|
|
struct audio_repack;
|
|
|
|
typedef int (*audio_repack_func_t)(struct audio_repack *,
|
|
const uint8_t *, uint32_t);
|
|
|
|
struct audio_repack {
|
|
uint8_t *packet_buffer;
|
|
uint32_t packet_size;
|
|
|
|
uint32_t base_src_size;
|
|
uint32_t base_dst_size;
|
|
uint32_t extra_dst_size;
|
|
|
|
audio_repack_func_t repack_func;
|
|
};
|
|
|
|
enum _audio_repack_mode {
|
|
repack_mode_8to4ch_swap23,
|
|
repack_mode_8to5ch_swap23,
|
|
repack_mode_8to6ch_swap23,
|
|
repack_mode_8ch_swap23_swap46_swap57,
|
|
};
|
|
|
|
typedef enum _audio_repack_mode audio_repack_mode_t;
|
|
|
|
extern int audio_repack_init(struct audio_repack *repack,
|
|
audio_repack_mode_t repack_mode, uint8_t sample_bit);
|
|
extern void audio_repack_free(struct audio_repack *repack);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|