Skip to content
Snippets Groups Projects
Commit 7ed42d54 authored by Alexandre Lision's avatar Alexandre Lision Committed by Gerrit Code Review
Browse files

contrib: clean up libav configuration

We now activate symmetrically encoders and decoders
Disable speex for OSX (symbol issue)

Refs #68286

Change-Id: I70be8401d7d94fff9a70a84dbf27616de811c0af
parent 4361081e
No related branches found
No related tags found
No related merge requests found
HASH=1cc6fef0671c5522c952671ee06bf973135a22c4 #Libav 11-1 (git version packaged for ubuntu 14.10)
LIBAV_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=$(HASH);sf=tgz LIBAV_HASH := f851477889ae48e2f17073cf7486e1d5561b7ae4
LIBAV_GITURL := git://git.libav.org/libav.git
PKGS += libav PKGS += libav
LIBAVCONF = \ LIBAVCONF = \
--cc="$(CC)" \ --cc="$(CC)" \
--pkg-config="$(PKG_CONFIG)" \ --pkg-config="$(PKG_CONFIG)" \
--disable-everything \ --enable-zlib \
--enable-gpl \ --enable-gpl \
--enable-version3 \ --enable-swscale \
--enable-decoders \ --enable-protocols
--enable-protocols \
#disable everything
LIBAVCONF += \
--disable-everything
#enable muxers/demuxers
LIBAVCONF += \
--enable-demuxers \ --enable-demuxers \
--enable-muxers \ --enable-muxers
--enable-swscale
#enable parsers
LIBAVCONF += \
--enable-parser=h263 \
--enable-parser=h264 \
--enable-parser=mpeg4video \
--enable-parser=opus \
--enable-parser=vp8
#encoders #librairies
LIBAVCONF += \ LIBAVCONF += \
--enable-libx264 \ --enable-libx264 \
--enable-libopus \ --enable-libopus \
--enable-libspeex \ --enable-libvpx
--enable-libvpx \
--enable-encoder=g722 \ #encoders/decoders
LIBAVCONF += \
--enable-encoder=adpcm_g722 \
--enable-decoder=adpcm_g722 \
--enable-encoder=rawvideo \
--enable-decoder=rawvideo \
--enable-encoder=libx264 \ --enable-encoder=libx264 \
--enable-decoder=h264 \
--enable-encoder=pcm_alaw \ --enable-encoder=pcm_alaw \
--enable-decoder=pcm_alaw \
--enable-encoder=pcm_mulaw \ --enable-encoder=pcm_mulaw \
--enable-decoder=pcm_mulaw \
--enable-encoder=libopus \ --enable-encoder=libopus \
--enable-decoder=libopus \
--enable-encoder=mpeg4 \
--enable-decoder=mpeg4 \
--enable-encoder=libvpx_vp8 \
--enable-decoder=vp8 \
--enable-encoder=h263 \
--enable-decoder=h263
# Linux
ifdef HAVE_LINUX
LIBAVCONF += \
--enable-x11grab
endif
# There is an unresolved symbol for speex when linking statically
ifndef HAVE_DARWIN_OS
LIBAVCONF += \
--enable-libspeex \
--enable-encoder=libspeex \ --enable-encoder=libspeex \
--enable-encoder=libvpx \ --enable-decoder=libspeex
--disable-decoder=libvpx \ endif
--disable-decoder=libvpx_vp8 \
--disable-decoder=libvpx_vp9 \
--enable-encoder=h263p
DEPS_libav = zlib x264 vpx $(DEPS_vpx) DEPS_libav = zlib x264 vpx $(DEPS_vpx)
...@@ -117,17 +154,18 @@ ifeq ($(call need_pkg,"libavcodec >= 53.5.0 libavformat >= 54.20.3 libswscale li ...@@ -117,17 +154,18 @@ ifeq ($(call need_pkg,"libavcodec >= 53.5.0 libavformat >= 54.20.3 libswscale li
PKGS_FOUND += libav PKGS_FOUND += libav
endif endif
$(TARBALLS)/libav-$(HASH).tar.gz: $(TARBALLS)/libav-$(LIBAV_HASH).tar.xz:
$(call download,$(LIBAV_SNAPURL)) $(call download_git,$(LIBAV_GITURL),master,$(LIBAV_HASH))
.sum-libav: $(TARBALLS)/libav-$(HASH).tar.gz .sum-libav: libav-$(LIBAV_HASH).tar.xz
$(warning Not implemented.) $(warning Not implemented.)
touch $@ touch $@
libav: libav-$(HASH).tar.gz .sum-libav libav: libav-$(LIBAV_HASH).tar.xz .sum-libav
rm -Rf $@ $@-$(HASH) rm -Rf $@ $@-$(LIBAV_HASH)
mkdir -p $@-$(HASH) mkdir -p $@-$(LIBAV_HASH)
$(ZCAT) "$<" | (cd $@-$(HASH) && tar xv --strip-components=1) (cd $@-$(LIBAV_HASH) && tar xv --strip-components=1 -f ../$<)
$(UPDATE_AUTOCONFIG)
$(MOVE) $(MOVE)
.libav: libav .libav: libav
......
...@@ -60,8 +60,8 @@ SystemCodecContainer::initCodecConfig() ...@@ -60,8 +60,8 @@ SystemCodecContainer::initCodecConfig()
"H264", "libx264", "H264", "libx264",
CODEC_ENCODER_DECODER), CODEC_ENCODER_DECODER),
std::make_shared<SystemVideoCodecInfo>(AV_CODEC_ID_H263P, std::make_shared<SystemVideoCodecInfo>(AV_CODEC_ID_H263,
"H263-2000", "h263p", "H263", "h263",
CODEC_ENCODER_DECODER), CODEC_ENCODER_DECODER),
std::make_shared<SystemVideoCodecInfo>(AV_CODEC_ID_VP8, std::make_shared<SystemVideoCodecInfo>(AV_CODEC_ID_VP8,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment