Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC
Commits: 3f01feb4 by Rémi Denis-Courmont at 2022-01-31T22:53:26+02:00 alsa: fix compilation with SALSA-lib - - - - - 950c019b by Rémi Denis-Courmont at 2022-01-31T22:53:26+02:00 contrib: salsa: add SALSA-lib 0.2.0 This provides for audio input/output on embedded Linux. - - - - - 2 changed files: - + contrib/src/salsa/rules.mak - modules/audio_output/alsa.c Changes: ===================================== contrib/src/salsa/rules.mak ===================================== @@ -0,0 +1,53 @@ +# SALSA-lib + +SALSA_URL = https://github.com/tiwai/salsa-lib.git +SALSA_TAG = v0.2.0 +SALSA_HASH = a3e5accc0b34ddc59fea2342f1ab1f8be179cf9d + +SALSACONF = \ + --enable-chmap \ + --enable-conf \ + --enable-float \ + --enable-output \ + --enable-pcm \ + --disable-4bit \ + --disable-mixer \ + --disable-user-elem + +$(TARBALLS)/salsa-lib-$(SALSA_TAG).tar.xz: + $(call download_git,$(SALSA_URL),$(SALSA_TAG),$(SALSA_HASH)) + +.sum-salsa: $(TARBALLS)/salsa-lib-$(SALSA_TAG).tar.xz + $(call check_githash,$(SALSA_HASH)) + touch $@ + +salsa-lib: salsa-lib-$(SALSA_TAG).tar.xz .sum-salsa + $(UNPACK) + $(MOVE) + +.salsa: salsa-lib + $(RECONF) + cd $< && ./configure $(HOSTVARS) $(HOSTCONF) $(SALSACONF) + cd $< && $(MAKE) install + touch $@ + +# ALSA placeholder + +PKGS_ALL += alsa + +ifdef HAVE_LINUX +ifndef HAVE_ANDROID +PKGS += alsa +endif +endif +ifeq ($(call need_pkg, "alsa >= 1.0.24"),) +PKGS_FOUND += alsa +endif + +DEPS_alsa = salsa $(DEPS_salsa) + +.sum-alsa: .sum-salsa + touch $@ + +.alsa: .sum-alsa + touch $@ ===================================== modules/audio_output/alsa.c ===================================== @@ -382,6 +382,7 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt) char *devbuf = NULL; if (sep != '\0') { +#ifdef IEC958_AES3_CON_FS_22050 unsigned aes3; switch (fmt->i_rate) @@ -405,6 +406,11 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt) 0, aes3) == -1) return VLC_ENOMEM; device = devbuf; +#else + /* SALSA-lib lacks many AES definitions, but it does not matter much, + * as it does note support parametric device names either. */ + return VLC_ENOTSUP; +#endif } /* Open the device */ View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/827394029074561a7f44ec7c0c477f6f7b483768...950c019b1f0f8aa785e7ecd91fe93880bb141586 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/827394029074561a7f44ec7c0c477f6f7b483768...950c019b1f0f8aa785e7ecd91fe93880bb141586 You're receiving this email because of your account on code.videolan.org.
_______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
