Showing 794 changed files with 91,549 additions and 53,368 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@ configure text eol=lf

#tests
tests/media/xmlin4/input.txt text eol=crlf
tests/media/xmlin4/input.xml text eol=lf
tests/media/laser/*.xml text eol=lf
tests/media/ttml/ebu-ttd_sample.ttml text eol=lf
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ before_install:
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y update -qq ; fi
install:
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y install build-essential fakeroot dpkg-dev devscripts ccache debhelper pkg-config g++ mesa-utils ; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y install -y zlib1g-dev libfreetype6-dev libjpeg62-dev libpng12-dev libopenjpeg-dev libmad0-dev libfaad-dev libogg-dev libvorbis-dev libtheora-dev liba52-0.7.4-dev libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libavdevice-dev libxv-dev x11proto-video-dev libgl1-mesa-dev x11proto-gl-dev linux-sound-base libxvidcore-dev libssl-dev libjack-dev libasound2-dev libpulse-dev libsdl1.2-dev dvb-apps libavcodec-extra-53 libmozjs185-dev ; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y install -y gcc-mingw-w64-i686 g++-mingw-w64-i686 binutils-mingw-w64-i686 gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 mingw-w64-dev ; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y install -y zlib1g-dev libfreetype6-dev libjpeg62-dev libpng12-dev libopenjpeg-dev libmad0-dev libfaad-dev libogg-dev libvorbis-dev libtheora-dev liba52-0.7.4-dev libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libavdevice-dev libxv-dev x11proto-video-dev libgl1-mesa-dev x11proto-gl-dev linux-sound-base libxvidcore-dev libssl-dev libjack-dev libasound2-dev libpulse-dev libsdl1.2-dev dvb-apps libavcodec-extra libavutil-dev libmozjs185-dev ; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y install -y gcc-mingw-w64-i686 g++-mingw-w64-i686 binutils-mingw-w64-i686 gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 mingw-w64-x86-64-dev ; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -qq -y install lcov time; fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then sudo chown -R "$USER":admin /usr/local; fi
# - if [ "$TRAVIS_OS_NAME" == "osx" ]; then sudo chown -R "$USER":admin /usr/local; fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install gnu-time gnu-sed gnu-tar xz lcov ; fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install faad2 sdl freetype libvorbis theora openjpeg libmad xvid libogg spidermonkey ffmpeg ; fi
Expand All @@ -34,7 +34,7 @@ matrix:
- os: linux
env: GPAC_CONFIGURE_OPTIONS="--prefix=build/all --enable-debug --disable-all" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="make install" DOTRAVIS=""
- os: linux
env: GPAC_CONFIGURE_OPTIONS="--enable-debug --use-js=no --use-mad=no --use-xvid=no --use-ogg=no --use-vorbis=no --use-theora=no --use-openjpeg=no --disable-streaming --disable-isoff-frag --disable-isoff-hint --disable-isoff-write --disable-loader-xmt --disable-loader-bt --disable-loader-isoff --disable-scene-encode --disable-mcrypt --disable-od-dump --disable-scene-dump --disable-scene-stats --disable-swf --disable-export --disable-import --disable-m2ps --disable-ogg -disable-avi --disable-qtvr --disable-seng --disable-smgr --disable-x3d --disable-3d --disable-ssl --disable-jack --disable-pulse --use-a52=no --disable-odf --disable-isoff --disable-m2ts-mux --disable-dvbx --disable-saf --disable-vobsub --disable-ttxt --disable-od-parse" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="" DOTRAVIS=""
env: GPAC_CONFIGURE_OPTIONS="--enable-debug --use-js=no --use-mad=no --use-xvid=no --use-ogg=no --use-vorbis=no --use-theora=no --use-openjpeg=no --disable-streaming --disable-isoff-frag --disable-isoff-hint --disable-isoff-write --disable-loader-xmt --disable-loader-bt --disable-loader-isoff --disable-scene-encode --disable-mcrypt --disable-od-dump --disable-scene-dump --disable-scene-stats --disable-swf --disable-export --disable-import --disable-m2ps --disable-ogg -disable-avi --disable-qtvr --disable-seng --disable-smgr --disable-x3d --disable-3d --disable-ssl --disable-jack --disable-pulse --use-a52=no --disable-odf --disable-isoff --disable-m2ts-mux --disable-dvbx --disable-saf --disable-vobsub --disable-ttxt --disable-od-parse --disable-atsc" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="" DOTRAVIS=""
- os: osx
env: GPAC_CONFIGURE_OPTIONS="--enable-mem-track" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="sudo make install" DOTRAVIS="" AUDIODEV=null
script:
Expand Down
31 changes: 31 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,34 @@
26/04/2017: GPAC 0.7.1
- Full changelog at https://github.com/gpac/gpac/wiki/GPAC-0.7.0
- Many security fixes (static compile and fuzzing through [AFL](http://lcamtuf.coredump.cx/afl/), always ongoing)
- Colorized log.
- Fix pkg-config Private.libs.
- Changed default audio volume to 100% instead of 75%.
- Expose more experimental options through the [documentation](http://htmlpreview.github.io/?https://github.com/gpac/gpac/blob/master/doc/configuration.html).
- Improved GLES renderer on mobile platforms
- YUV422 and YUV444 8 and 10 bit support in GLES renderer
- Improvements on AVI dump.
- SAT>IP modified RTSP client.
- Added L-HEVC File Format support (SHVC/MV-HEVC tracks and HEVC Tile Tracks).
- Added MPEG IFF (image File Format) support.
- Range extension support for AVC and HEVC.
- SHVC and MV-HEVC importers and playback: moved to final spec version (SHM6+).
- Support of HLS with fragmented MP4 playback.
- APIs: gf_mpd_() functions and new segmenter API.
- Improved alternate groups.
- More support for PIFF PSEC and Smooth Streaming ( file format & playback).
- DASH client: pluggable algorithms + improvements with scalable contents.
- The counter source from the DASH sequences added to the public content.
- HLS and DASH playback minor fixes.
- Cleanup of DASH client logs.
- Added support for DASH SRD in 360 for independent videos videos (NxM partial spheres) [more](https://gpac.wp.imt.fr/2016/05/25/srd/)
- Added support for DASH SRD in 360 for HEV Ctiled videos (NxM tiles on one sphere) - [checkout tuto](https://gpac.wp.imt.fr/2017/02/01/hevc-tile-based-adaptation-guide/)
- Apple VideoToolBox hardware decoding support for OSX and iOS for AVC|H264.
- Android hardware decoding hardware acceleration for AVC|H264 (HEVC on its way).
- Android build is based on Android Studio.
- Android: new File Manager.
- Import of TTML via NHML according to MPEG-4 part 30 improved.

19/02/2016: GPAC 0.6.0
Many things added, improved and fixed - see https://github.com/gpac/gpac/releases/tag/v0.6.0

Expand Down
57 changes: 32 additions & 25 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ mods:

instmoz:
$(MAKE) -C applications/osmozilla install

depend:
$(MAKE) -C src dep
$(MAKE) -C applications dep
Expand All @@ -60,6 +60,8 @@ distclean:
@find . -type f -name '*.gcno*' -delete
@find . -type f -name '*.gcda*' -delete
@rm -f coverage.info 2> /dev/null
@rm -f bin/gcc/gm_*$(DYN_LIB_SUFFIX) 2> /dev/null
@rm -f bin/gcc/gf_*$(DYN_LIB_SUFFIX) 2> /dev/null

docs:
@cd $(SRC_PATH)/doc && doxygen
Expand All @@ -73,7 +75,7 @@ lcov_clean:
lcov_only:
@echo "Generating lcov info in coverage.info"
@rm -f ./gpac-conf-* > /dev/null
@lcov -q -capture --directory . --output-file all.info
@lcov -q -capture --directory . --output-file all.info
@lcov --remove all.info /usr/* /usr/include/* /usr/local/include/* /usr/include/libkern/i386/* /usr/include/sys/_types/* /opt/* /opt/local/include/* /opt/local/include/mozjs185/* --output coverage.info
@rm all.info
@echo "Purging lcov info"
Expand Down Expand Up @@ -112,7 +114,7 @@ ifneq ($(CONFIG_WIN32), yes)
ifneq ($(CONFIG_FFMPEG), no)
ifneq ($(DISABLE_CORE_TOOLS), yes)
ifneq ($(DISABLE_AV_PARSERS), yes)
if [ -f bin/gcc/DashCast$(EXE_SUFFIX)g ] ; then \
if [ -f bin/gcc/DashCast$(EXE_SUFFIX) ] ; then \
$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/DashCast$(EXE_SUFFIX) "$(DESTDIR)$(prefix)/bin" ; \
fi
endif
Expand Down Expand Up @@ -140,28 +142,33 @@ ifneq ($(MP4BOX_STATIC),yes)
endif
$(INSTALL) -d "$(DESTDIR)$(mandir)"
$(INSTALL) -d "$(DESTDIR)$(mandir)/man1"
$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/
$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/
$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/
$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/
$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/man/gpac.1 $(DESTDIR)$(mandir)/man1/
$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac"
$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/
$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/
$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/gui"
$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/gui.bt "$(DESTDIR)$(prefix)/share/gpac/gui/"
$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/gui.js "$(DESTDIR)$(prefix)/share/gpac/gui/"
$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/gwlib.js "$(DESTDIR)$(prefix)/share/gpac/gui/"
$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/gui.bt "$(DESTDIR)$(prefix)/share/gpac/gui/"
$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/gui.js "$(DESTDIR)$(prefix)/share/gpac/gui/"
$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/gwlib.js "$(DESTDIR)$(prefix)/share/gpac/gui/"
$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/mpegu-core.js "$(DESTDIR)$(prefix)/share/gpac/gui/"
$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/webvtt-renderer.js "$(DESTDIR)$(prefix)/share/gpac/gui/"
$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/gui/icons"
$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/gui/extensions"
$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/shaders/"

$(INSTALL) -d "$(DESTDIR)$(prefix)/include"

ifeq ($(CONFIG_DARWIN),yes)
cp $(SRC_PATH)/gui/icons/* "$(DESTDIR)$(prefix)/share/gpac/gui/icons/"
cp -R $(SRC_PATH)/gui/extensions/* "$(DESTDIR)$(prefix)/share/gpac/gui/extensions/"
cp $(SRC_PATH)/shaders/* "$(DESTDIR)$(prefix)/share/gpac/shaders/"
cp $(SRC_PATH)/gui/icons/* "$(DESTDIR)$(prefix)/share/gpac/gui/icons/"
cp -R $(SRC_PATH)/gui/extensions/* "$(DESTDIR)$(prefix)/share/gpac/gui/extensions/"
cp $(SRC_PATH)/shaders/* "$(DESTDIR)$(prefix)/share/gpac/shaders/"
cp -R $(SRC_PATH)/include/* "$(DESTDIR)$(prefix)/include/"
else
cp --no-preserve=mode,ownership,timestamp $(SRC_PATH)/gui/icons/* $(DESTDIR)$(prefix)/share/gpac/gui/icons/
cp -R --no-preserve=mode,ownership,timestamp $(SRC_PATH)/gui/extensions/* $(DESTDIR)$(prefix)/share/gpac/gui/extensions/
cp --no-preserve=mode,ownership,timestamp $(SRC_PATH)/shaders/* $(DESTDIR)$(prefix)/share/gpac/shaders/
cp -R --no-preserve=mode,ownership,timestamp $(SRC_PATH)/include/* $(DESTDIR)$(prefix)/include/
endif

lninstall:
Expand All @@ -187,8 +194,9 @@ endif
endif
endif
ifeq ($(CONFIG_DARWIN),yes)
ln -s $(BUILD_PATH)/bin/gcc/libgpac$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_MAJOR)
ln -sf $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_MAJOR) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX)
ln -s $(BUILD_PATH)/bin/gcc/libgpac$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION_SONAME)$(DYN_LIB_SUFFIX)
ln -sf $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION_SONAME)$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION_MAJOR)$(DYN_LIB_SUFFIX)
ln -sf $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION_SONAME)$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX)
else
ln -s $(BUILD_PATH)/bin/gcc/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME)
ln -sf $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so.$(VERSION_MAJOR)
Expand Down Expand Up @@ -223,11 +231,12 @@ ifeq ($(CONFIG_WIN32),yes)
$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll $(DESTDIR)$(prefix)/bin
else
ifeq ($(DEBUGBUILD),no)
$(STRIP) bin/gcc/libgpac$(DYN_LIB_SUFFIX)
$(STRIP) -S bin/gcc/libgpac$(DYN_LIB_SUFFIX)
endif
ifeq ($(CONFIG_DARWIN),yes)
$(INSTALL) -m 755 bin/gcc/libgpac$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION)$(DYN_LIB_SUFFIX)
ln -sf libgpac.$(VERSION)$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX)
$(INSTALL) -m 755 bin/gcc/libgpac$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION_SONAME)$(DYN_LIB_SUFFIX)
ln -sf libgpac.$(VERSION_SONAME)$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION_MAJOR)$(DYN_LIB_SUFFIX)
ln -sf libgpac.$(VERSION_SONAME)$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX)
else
$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME)
ln -sf libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so.$(VERSION_MAJOR)
Expand All @@ -253,6 +262,9 @@ ifeq ($(GPAC_ENST), yes)
endif
mkdir -p "$(DESTDIR)$(prefix)/$(libdir)"
$(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)"
if [ -d $(DESTDIR)$(prefix)/$(libdir)/pkgconfig ] ; then \
$(INSTALL) $(INSTFLAGS) -m 644 gpac.pc "$(DESTDIR)$(prefix)/$(libdir)/pkgconfig" ; \
fi
$(MAKE) installdylib

uninstall-lib:
Expand All @@ -275,11 +287,6 @@ endif

ifeq ($(CONFIG_LINUX),yes)
deb:
@if [ ! -z "$(shell git diff FETCH_HEAD)" ]; then \
echo "Local revision and remote revision are not congruent; you may have local commit."; \
echo "Please consider pushing your commit before generating an installer"; \
exit 1; \
fi
git checkout -- debian/changelog
fakeroot debian/rules clean
sed -i "s/-DEV/-DEV-rev$(VERSION)-$(BRANCH)/" debian/changelog
Expand All @@ -298,10 +305,10 @@ help:
@echo "modules: builds modules only"
@echo "instmoz: build and local install of osmozilla"
@echo "sggen: builds scene graph generators"
@echo
@echo
@echo "clean: clean src repository"
@echo "distclean: clean src repository and host config file"
@echo
@echo
@echo "install: install applications and modules on system"
@echo "uninstall: uninstall applications and modules"
ifeq ($(CONFIG_DARWIN),yes)
Expand All @@ -310,7 +317,7 @@ endif
ifeq ($(CONFIG_LINUX),yes)
@echo "deb: creates DEB package file for debian based systems"
endif
@echo
@echo
@echo "install-lib: install gpac library (dyn and static) and headers <gpac/*.h>, <gpac/modules/*.h> and <gpac/internal/*.h>"
@echo "uninstall-lib: uninstall gpac library (dyn and static) and headers"
@echo
Expand Down
39 changes: 29 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,40 @@
[![Build Status](https://travis-ci.org/gpac/gpac.svg?branch=master)](https://travis-ci.org/gpac/gpac)
[![codecov.io](https://codecov.io/github/gpac/gpac/coverage.svg?branch=master)](https://codecov.io/github/gpac/gpac?branch=master)
[![Build Status](https://tests.gpac.io/testres/badge/build/ubuntu64)](https://buildbot.gpac.io/#/grid?branch=master)
[![Tests](https://tests.gpac.io/testres/badge/tests/linux64)](https://tests.gpac.io/)

README for GPAC version 0.7.1
[![Build Status](https://tests.gpac.io/testres/badge/build/ubuntu32)](https://buildbot.gpac.io/#/grid?branch=master)
[![Tests](https://tests.gpac.io/testres/badge/tests/linux32)](https://tests.gpac.io/)

[![Build Status](https://tests.gpac.io/testres/badge/build/windows64)](https://buildbot.gpac.io/#/grid?branch=master)
[![Tests](https://tests.gpac.io/testres/badge/tests/win64)](https://tests.gpac.io/)

[![Build Status](https://tests.gpac.io/testres/badge/build/windows32)](https://buildbot.gpac.io/#/grid?branch=master)
[![Tests](https://tests.gpac.io/testres/badge/tests/win32)](https://tests.gpac.io/)

[![Build Status](https://tests.gpac.io/testres/badge/build/macos)](https://buildbot.gpac.io/#/grid?branch=master)
[![Tests](https://tests.gpac.io/testres/badge/tests/macos)](https://tests.gpac.io/)

[![Build Status](https://tests.gpac.io/testres/badge/build/ios)](https://buildbot.gpac.io/#/grid?branch=master)

[![Build Status](https://tests.gpac.io/testres/badge/build/android)](https://buildbot.gpac.io/#/grid?branch=master)

[![Coverage](https://tests.gpac.io/testres/badge/cov/linux64)](https://tests.gpac.io/)

![License](https://img.shields.io/badge/license-LGPL-blue.svg)

README for GPAC version 0.8.0

GPAC is a multimedia framework oriented towards rich media and distributed under the LGPL license (see COPYING).
GPAC supports many multimedia formats, from simple audiovisual containers (avi, mov, mpg) to complex
presentation formats (MPEG-4 Systems, SVG Tiny 1.2, VRML/X3D). GPAC supports scripting of presentation for MPEG4/VRML/X3D through
mozilla SpiderMonkey javascript engine.

GPAC supports many multimedia formats, from simple audiovisual containers (avi, mov, mpg) to complex
presentation formats (MPEG-4 Systems, SVG Tiny 1.2, VRML/X3D) and 360 videos. GPAC supports presentation scripting for MPEG4/VRML/X3D through mozilla SpiderMonkey javascript engine.

GPAC currently supports local playback, http progressive download, Adaptive HTTP Streaming (MPEG-DASH, HLS), RTP/RTSP streaming over UDP (unicast or multicast) or TCP and TS demuxing (from file, IP or DVB4Linux).
GPAC also features MP4Box, a multimedia swiss-army knife for the prompt.

GPAC also features MP4Box, a multimedia swiss-army knife for the prompt, and MP42TS, a fast TS multiplexer from MP4 and RTP sources.

For compilation and installation instruction, check INSTALLME file

For GPAC configuration instruction, check gpac/doc/configuration.html or gpac/doc/man/gpac.1 (man gpac when installed)

For more information, visit the GPAC website:
http://gpac.io

14 changes: 7 additions & 7 deletions applications/dashcast/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include ../../config.mak

vpath %.c $(SRC_PATH)/applications/dashcast

CFLAGS= $(OPTFLAGS) -D_GNU_SOURCE -I"$(SRC_PATH)/include" -I../../ $(ffmpeg_cflags)
CFLAGS= $(OPTFLAGS) -D_GNU_SOURCE -Wno-deprecated-declarations -I"$(SRC_PATH)/include" -I../../ $(ffmpeg_cflags)

LINKFLAGS=$(GPAC_SH_FLAGS)

Expand Down Expand Up @@ -48,24 +48,24 @@ OBJS= dashcast.o audio_data.o audio_decoder.o audio_encoder.o audio_muxer.o circ

LINKFLAGS+= $(ffmpeg_lflags_dashcast)

ifneq ($(CONFIG_LIBAVRESAMPLE),no)
ifneq ($(CONFIG_LIBSWRESAMPLE),no)
CFLAGS+=-DDC_AUDIO_RESAMPLER
LINKFLAGS+=-lavresample
LINKFLAGS+=-lswresample
endif

ifeq ($(CONFIG_DARWIN), yes)
#fixme - use proper detection of libavdevice dependencies
#LINKFLAGS+=-lavfilter -lswresample -lbz2
#LINKFLAGS+=-lavfilter -lswresample -lbz2
endif

SRCS := $(OBJS:.o=.c)
SRCS := $(OBJS:.o=.c)

all: $(PROG)

DashCast$(EXE): $(OBJS)
$(CC) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc $(LDFLAGS) $(LINKFLAGS)

clean:
clean:
rm -f $(OBJS) ../../bin/gcc/$(PROG)

install: clean
Expand All @@ -77,7 +77,7 @@ uninstall:
dep: depend

depend:
rm -f .depend
rm -f .depend
$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend

distclean: clean
Expand Down
3 changes: 2 additions & 1 deletion applications/dashcast/audio_data.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

#include "../../modules/ffmpeg_in/ffmpeg_in.h"
#include "libavcodec/avcodec.h"
#include "libavutil/channel_layout.h"
#include "libavutil/mem.h"
#include "libav_compat.h"
#include "circular_buffer.h"
Expand Down Expand Up @@ -93,7 +94,7 @@ typedef struct {
time_t end_time;

/* RFC6381 codec name, only valid when VIDEO_MUXER == GPAC_INIT_VIDEO_MUXER_AVC1 */
char codec6381[GF_MAX_PATH];
char codec6381[RFC6381_CODEC_NAME_SIZE_MAX];
} AudioDataConf;

/*
Expand Down
Loading