Packman Build Service PMBS

Changes of Revision 13

gpac.changes Changed

gpac.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package gpac
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,89 +15,87 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%define soname		3
 
+%define soname		4
 Name:           gpac
-Version:        0.5.1.svn5491
-Release:        1.pm.1
-License:        LGPL-2.1+
+Version:        0.5.1.svn5619
+Release:        0
 Summary:        A multimedia framework covering MPEG-4, VRML/X3D and SVG
+License:        LGPL-2.1+
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Url:            http://gpac.sourceforge.net
-Source:		%{name}-%{version}.tar.xz
+Source:         %{name}-%{version}.tar.xz
 Source90:       %{name}-rpmlintrc
 #PATCH-FIX-UPSTREAM i@marguerite.su - enable osmozilla and osmo4_wx
-Patch1:		gpac-0.5.1-enable_V4Studio.patch
+Patch1:         gpac-0.5.1-enable_V4Studio.patch
 #PATCH-FIX-UPSTREAM i@marguerite.su - fix SVGGen ldflags
-Patch2:		gpac-0.5.0-SVGGen_abuild.patch
+Patch2:         gpac-0.5.0-SVGGen_abuild.patch
 #PATCH-FIX-UPSTREAM wengxuetian@gmail.com - fix E: 64bit-portability-issue
-Patch3:		gpac-0.5.0-64bit-portability.patch
+Patch3:         gpac-0.5.0-64bit-portability.patch
 #PATCH-FIX-OPENSUSE marguerite@opensuse.org - libpng include dir fix
-Patch4:		gpac-0.5.0-libpng-version-detection.patch
+Patch4:         gpac-0.5.0-libpng-version-detection.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - use system amrnb/amrwb
-Patch5:		gpac-0.5.0-system-amr.patch
+Patch5:         gpac-0.5.0-system-amr.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - no gpac.pc in devel package
-Patch6:		gpac-0.5.0-no-pc.patch
-#PATCH-FIX-UPSTREAM marguerite@opensuse.org - I:Statement is overflowing a buffer
-Patch8:		gpac-0.5.1-bufferoverflow.patch
+Patch6:         gpac-0.5.0-no-pc.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix gf_isom_set_pixel_aspect_ratio
 # not available to the public
-Patch9:		gpac-0.5.0-x264-export.patch
+Patch9:         gpac-0.5.0-x264-export.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix u32 count redelaration
-Patch10:	gpac-0.5.1-u32-count-redeclaration.patch
+Patch10:        gpac-0.5.1-u32-count-redeclaration.patch
 BuildRequires:  DirectFB-devel
 BuildRequires:  ImageMagick
 BuildRequires:  Mesa-devel
 BuildRequires:  alsa-devel
 BuildRequires:  dos2unix
 BuildRequires:  doxygen
-BuildRequires:	fdupes
+BuildRequires:  fdupes
 BuildRequires:  freeglut-devel
 BuildRequires:  freetype2-devel
-BuildRequires:	graphviz
 BuildRequires:  gcc-c++
-%if 0%{?suse_version} >= 1140
-BuildRequires:  libSDL-devel
-%else
-BuildRequires:  SDL-devel
-%endif
+BuildRequires:  graphviz
 BuildRequires:  liba52-devel
 BuildRequires:  libfaad-devel
 BuildRequires:  libffmpeg-devel
-# fix for evergreen 11
-%if 0%{?suse_version} == 1110
-BuildRequires:  libidl
-%endif
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmad-devel
 BuildRequires:  libogg-devel
+BuildRequires:  libopenssl-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libpulse-devel
 BuildRequires:  librsvg-devel >= 2.5.0
 BuildRequires:  libtheora-devel
 BuildRequires:  libvorbis-devel
 BuildRequires:  libxvidcore-devel
+BuildRequires:  unzip
+BuildRequires:  update-desktop-files
+BuildRequires:  xz
+BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} >= 1140
+BuildRequires:  libSDL-devel
+%else
+BuildRequires:  SDL-devel
+%endif
+# fix for evergreen 11
+%if 0%{?suse_version} == 1110
+BuildRequires:  libidl
+%endif
 %if 0%{?suse_version} == 1140
 BuildRequires:  mozilla-js192
 %endif
 %if 0%{?suse_version} > 1140
 BuildRequires:  js-devel
 %endif
-BuildRequires:  libopenssl-devel
 %if 0%{?suse_version} > 1140
 BuildRequires:  pkgconfig(libopenjpeg)
 %endif
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  unzip
-BuildRequires:  update-desktop-files
 %if 0%{?suse_version} >= 1140
 BuildRequires:  wxWidgets-wxcontainer-devel
 %else
 BuildRequires:  wxGTK-devel
 %endif
-BuildRequires:  zlib-devel
-BuildRequires:	xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 GPAC is a multimedia framework for MPEG-4, VRML/X3D and SVG/SMIL.
@@ -180,7 +178,6 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch8 -p1
 %patch9 -p1
 %patch10 -p1
 
@@ -199,6 +196,7 @@
 echo '#define GPAC_SVN_REVISION "5491"' > ./include/gpac/revision.h
 
 sed -i~ '1 {s@^.*$@/*@}' src/utils/xml_parser.c
+
 %build
 # configure the beast
 ./configure \
@@ -207,14 +205,14 @@
     --libdir=lib64 \
 %endif
     --mandir=%{_mandir} \
-    --extra-cflags="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DXP_UNIX -fPIC" 
+    --extra-cflags="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DXP_UNIX -fPIC"
 
 # make the beast (NO parallel build possible ...)
 # fix I: File is compiled without RPM_OPT_FLAGS gpac doesn't respect any flags at all
-make all CFLAG="%{optflags}"
-make sggen 
-make -C applications/generators/SVG
-make -C applications/udptsseg
+make %{?_smp_mflags} all CFLAG="%{optflags}"
+make %{?_smp_mflags} sggen
+make %{?_smp_mflags} -C applications/generators/SVG
+make %{?_smp_mflags} -C applications/udptsseg
 
 # create dev-docs
 pushd doc
@@ -223,7 +221,7 @@
 popd
 
 %install
-%make_install 
+%make_install
 
 # header files
 make install-lib \
@@ -234,8 +232,6 @@
     install -m 755 applications/generators/$i/${i}Gen \
     	%{buildroot}%{_bindir}
 done
-install -m 755 bin/gcc/mp4* \
-    %{buildroot}%{_bindir}
 
 # udptsseg
 install -m 755 bin/gcc/udptsseg \
@@ -280,12 +276,12 @@
 %doc AUTHORS BUGS Changelog COPYING README TODO
 %doc doc/configuration.html
 %{_bindir}/DashCast
+%{_bindir}/MP42TS
 %{_bindir}/MP4Box
 %{_bindir}/MP4Client
 %{_bindir}/MPEG4Gen
 %{_bindir}/X3DGen
 %{_bindir}/SVGGen
-%{_bindir}/mp42ts
 %{_bindir}/udptsseg
 %{_libdir}/%{name}/
 %{_datadir}/%{name}/
@@ -293,14 +289,14 @@
 
 %files -n libgpac%{soname}
 %defattr(-,root,root)
-%{_libdir}/*.so.%{soname}
-%{_libdir}/*.so.%{soname}.*
+%{_libdir}/libgpac.so.%{soname}
+%{_libdir}/libgpac.so.%{soname}.*
 
 %files -n libgpac-devel
 %defattr(-,root,root)
 %doc doc/CODING_STYLE doc/ipmpx_syntax.bt
 %{_includedir}/%{name}/
-%{_libdir}/*.so
+%{_libdir}/libgpac.so
 %{_libdir}/pkgconfig/%{name}.pc
 
 %files -n Osmo4

gpac-0.5.1-bufferoverflow.patch Deleted

gpac-0.5.1-u32-count-redeclaration.patch Changed

gpac-0.5.1.svn5491.tar.xz/.travis.yml -> gpac-0.5.1.svn5619.tar.xz/.travis.yml Changed

@@ -1,4 +1,11 @@
 language: c
 compiler: gcc
-#script: configure --use-zlib=no --use-js=no --use-png=no --use-jpeg=no --use-faad=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 && make 
-script: ./configure --disable-all && make
\ No newline at end of file
+before_install: 
+  - sudo apt-get update -qq
+install:
+  - sudo apt-get install -y pkg-config g++ 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 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 libavdevice-dev libmozjs185-dev
+env:
+  - GPAC_CONFIGURE_OPTIONS=--disable-all
+  - GPAC_CONFIGURE_OPTIONS=
+script: 
+  - ./configure $GPAC_CONFIGURE_OPTIONS && make

gpac-0.5.1.svn5491.tar.xz/INSTALLME -> gpac-0.5.1.svn5619.tar.xz/INSTALLME Changed

gpac-0.5.1.svn5491.tar.xz/Makefile -> gpac-0.5.1.svn5619.tar.xz/Makefile Changed

@@ -55,6 +55,21 @@
 	$(MAKE) -C modules distclean
 	rm -f config.mak config.h
 
+lcov_clean:
+	lcov --directory . --zerocounters
+
+lcov:
+	lcov --capture --directory . --output-file all.info
+	rm -rf coverage/
+	lcov  --remove all.info /usr/pkg/include/gtest/* /usr/pkg/include/gtest/internal/gtest-* \
+ /usr/pkg/gcc44/include/c++/4.4.1/backward/binders.h /usr/pkg/gcc44/include/c++/4.4.1/bits/* \
+ /usr/pkg/gcc44/include/c++/4.4.1/ext/*.h \
+ /usr/pkg/gcc44/include/c++/4.4.1/x86_64-unknown-netbsd4.99.62/bits/gthr-default.h \
+ /usr/include/machine/byte_swap.h /usr/pkg/gcc44/include/c++/4.4.1/* \
+ /opt/local/include/mozjs185/*.h /usr/include/libkern/i386/*.h /usr/include/sys/_types/*.h /usr/include/*.h \
+ --output cover.info
+	genhtml -o coverage cover.info 
+
 dep:	depend
 
 # tar release (use 'make -k tar' on a checkouted tree)
@@ -77,6 +92,7 @@
 endif
 ifeq ($(DISABLE_ISOFF), no)
 	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/MP4Box "$(DESTDIR)$(prefix)/bin"
+	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/MP42TS "$(DESTDIR)$(prefix)/bin"
 endif
 ifeq ($(DISABLE_PLAYER), no)
 	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/MP4Client "$(DESTDIR)$(prefix)/bin"
@@ -110,6 +126,31 @@
 	rm -rf "$(DESTDIR)$(prefix)/share/gpac/gui/extensions/*.svn" ; \
 	fi
 
+lninstall:
+	$(INSTALL) -d "$(DESTDIR)$(prefix)"
+	$(INSTALL) -d "$(DESTDIR)$(prefix)/$(libdir)"
+	$(INSTALL) -d "$(DESTDIR)$(prefix)/bin"
+ifeq ($(DISABLE_ISOFF), no) 
+ifneq ($(CONFIG_FFMPEG), no)
+	ln -s $(SRC_PATH)/bin/gcc/DashCast "$(DESTDIR)$(prefix)/bin/DashCast"
+endif
+endif
+ifeq ($(DISABLE_ISOFF), no)
+	ln -s $(SRC_PATH)/bin/gcc/MP4Box "$(DESTDIR)$(prefix)/bin/MP4Box"
+	ln -s $(SRC_PATH)/bin/gcc/MP42TS "$(DESTDIR)$(prefix)/bin/MP42TS"
+endif
+ifeq ($(DISABLE_PLAYER), no)
+	ln -s $(SRC_PATH)/bin/gcc/MP4Client "$(DESTDIR)$(prefix)/bin/MP4Client"
+endif
+ifeq ($(CONFIG_DARWIN),yes)
+	ln -s $(SRC_PATH)/bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION).$(DYN_LIB_SUFFIX)
+	ln -sf $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX)
+else
+	ln -s $(SRC_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)
+	ln -sf $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so
+endif
+
 uninstall:
 	$(MAKE) -C applications uninstall
 	rm -rf $(DESTDIR)$(moddir)
@@ -120,6 +161,7 @@
 	rm -rf $(DESTDIR)$(prefix)/$(libdir)/pkgconfig/gpac.pc
 	rm -rf $(DESTDIR)$(prefix)/bin/MP4Box
 	rm -rf $(DESTDIR)$(prefix)/bin/MP4Client
+	rm -rf $(DESTDIR)$(prefix)/bin/MP42TS
 	rm -rf $(DESTDIR)$(prefix)/bin/DashCast
 	rm -rf $(DESTDIR)$(mandir)/man1/mp4box.1
 	rm -rf $(DESTDIR)$(mandir)/man1/mp4client.1

gpac-0.5.1.svn5491.tar.xz/applications/dashcast/Makefile -> gpac-0.5.1.svn5619.tar.xz/applications/dashcast/Makefile Changed

gpac-0.5.1.svn5491.tar.xz/applications/dashcast/cmd_data.c -> gpac-0.5.1.svn5619.tar.xz/applications/dashcast/cmd_data.c Changed

@@ -449,7 +449,7 @@
 	 " -vfr N force the input video framerate\n"
 	 " -vres WxH force the video resolution (e.g. 640x480)\n"
 	 " -vcrop XxY crop the source video from X pixels left and Y pixels top. Must be used with -vres.\n"
-		"* Audio options:\n"
+	 "* Audio options:\n"
 	 " -a string set the source name for an audio input\n"
 	 " - if input is from microphone, use \"plughw:[x],[y]\"\n"
 	 " where x is the card number and y is the device number\n"
@@ -463,8 +463,8 @@
 #endif
 	 " -vcustom string send custom parameters directly to the video encoder\n"
 	 " -gdr use Gradual Decoder Refresh feature for video encoding (h264 codec only)\n"
-		" -gop specify GOP size in frames - default is framerate (1 sec gop)\n"
-		" -low-delay specify that low delay settings should be used (no B-frames, fast encoding)\n"
+	 " -gop specify GOP size in frames - default is framerate (1 sec gop)\n"
+	 " -low-delay specify that low delay settings should be used (no B-frames, fast encoding)\n"
 	 "* Audio encoding options:\n"
 	 " -acodec string set the output audio codec (default: aac)\n"
 #if 0 //TODO: bind to option and params - test first how it binds to current input parameters
@@ -528,6 +528,7 @@
 
 	/* Initialize command data */
 	dc_cmd_data_init(cmd_data);
+	cmd_data->use_mem_track = use_mem_track;
 
 	i = 1;
 	while (i < argc) {

gpac-0.5.1.svn5491.tar.xz/applications/dashcast/cmd_data.h -> gpac-0.5.1.svn5619.tar.xz/applications/dashcast/cmd_data.h Changed

gpac-0.5.1.svn5491.tar.xz/applications/dashcast/dashcast.c -> gpac-0.5.1.svn5619.tar.xz/applications/dashcast/dashcast.c Changed

gpac-0.5.1.svn5491.tar.xz/applications/dashcast/video_muxer.c -> gpac-0.5.1.svn5619.tar.xz/applications/dashcast/video_muxer.c Changed

gpac-0.5.1.svn5491.tar.xz/applications/dashcast/video_scaler.c -> gpac-0.5.1.svn5619.tar.xz/applications/dashcast/video_scaler.c Changed

gpac-0.5.1.svn5491.tar.xz/applications/mp42avi/main.c -> gpac-0.5.1.svn5619.tar.xz/applications/mp42avi/main.c Changed

@@ -365,9 +365,9 @@
 	for (viewpoint_index = 1; viewpoint_index <= nb_viewpoints; viewpoint_index++) {
 		GF_SAFEALLOC(rendered_frames[viewpoint_index-1], fb.width*fb.height*3);
 		gf_sc_set_viewpoint(b2v.sr, viewpoint_index, NULL);
-		gf_sc_draw_frame(b2v.sr);
+		gf_sc_draw_frame(b2v.sr, 0, NULL);
 		/*needed for background2D !!*/
-		gf_sc_draw_frame(b2v.sr);
+		gf_sc_draw_frame(b2v.sr, 0, NULL);
 		strcpy(out_path, "");
 		if (out_dir) {
 			strcat(out_path, out_dir);
@@ -583,7 +583,7 @@
 	}
 
 	gf_sc_set_size(b2v.sr, width, height);
-	gf_sc_draw_frame(b2v.sr);
+	gf_sc_draw_frame(b2v.sr, 0, NULL);
 
 	gf_sc_get_screen_buffer(b2v.sr, &fb);
 	width = fb.width;
@@ -613,10 +613,10 @@
 		if ((frameID>=0) && (j<(u32)frameID)) continue;
 		if ((dump_time>=0) && ((u32) dump_time>b2v.cts)) continue;
 		/*render frame*/
-		gf_sc_draw_frame(b2v.sr);
+		gf_sc_draw_frame(b2v.sr, 0, NULL);
 		/*needed for background2D !!*/
 		if (first_dump) {
-			gf_sc_draw_frame(b2v.sr);
+			gf_sc_draw_frame(b2v.sr, 0, NULL);
 			first_dump = 0;
 		}

gpac-0.5.1.svn5491.tar.xz/applications/mp42ts/Makefile -> gpac-0.5.1.svn5619.tar.xz/applications/mp42ts/Makefile Changed

gpac-0.5.1.svn5491.tar.xz/applications/mp42ts/main.c -> gpac-0.5.1.svn5619.tar.xz/applications/mp42ts/main.c Changed

@@ -115,7 +115,7 @@
 	        "-rap                   forces RAP/IDR to be aligned with PES start for video streams (disabled by default)\n"
 	        "                          in this mode, PAT, PMT and PCR will be inserted before the first TS packet of the RAP PES\n"
 	        "-flush-rap             same as -rap but flushes all other streams (sends remaining PES packets) before inserting PAT/PMT\n"
-	        "-nb-pack N             specifies to pack N TS packets together before sending on network or writing to file\n"
+	        "-nb-pack N             specifies to pack up to N TS packets together before sending on network or writing to file\n"
 	        "-pcr-ms N              sets max interval in ms between 2 PCR. Default is 100 ms\n"
 	        "-ttl N                 specifies Time-To-Live for multicast. Default is 1.\n"
 	        "-ifce IPIFCE           specifies default IP interface to use. Default is IF_ANY.\n"
@@ -1749,6 +1749,10 @@
 		}
 }
 
+#ifdef GPAC_MEMORY_TRACKING
+static Bool enable_mem_tracker = GF_FALSE;
+#endif
+
 /*macro to keep retro compatibility with '=' and spaces in parse_args*/
 #define CHECK_PARAM(param) (!strnicmp(arg, param, strlen(param)) \
         && (   ((arg[strlen(param)] == '=') && (next_arg = arg+strlen(param)+1)) \
@@ -1863,6 +1867,7 @@
 		} else if (!strcmp(arg, "-mem-track")) {
 #ifdef GPAC_MEMORY_TRACKING
 			gf_sys_close();
+			enable_mem_tracker = GF_TRUE;
 			gf_sys_init(GF_TRUE);
 			gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_INFO);
 #else
@@ -2692,6 +2697,13 @@
 
 	if (logfile) fclose(logfile);
 	gf_sys_close();
+
+#ifdef GPAC_MEMORY_TRACKING
+	if (enable_mem_tracker && (gf_memory_size() != 0)) {
+        gf_memory_print();
+		return 2;
+	}
+#endif
 	return 0;
 }

gpac-0.5.1.svn5491.tar.xz/applications/mp4box/filedump.c -> gpac-0.5.1.svn5619.tar.xz/applications/mp4box/filedump.c Changed

@@ -757,8 +757,9 @@
 
 void dump_file_rtp(GF_ISOFile *file, char *inName)
 {
-	u32 i, j;
+	u32 i, j, size;
 	FILE *dump;
+	const char *sdp;
 	char szBuf[1024];
 
 	if (inName) {
@@ -777,6 +778,9 @@
 		if (gf_isom_get_media_type(file, i+1) != GF_ISOM_MEDIA_HINT) continue;
 
 		fprintf(dump, "<RTPHintTrack trackID=\"%d\">\n", gf_isom_get_track_id(file, i+1));
+		gf_isom_sdp_track_get(file, i+1, &sdp, &size);
+		fprintf(dump, "<SDPInfo>%s</SDPInfo>", sdp);
+
 		for (j=0; j<gf_isom_get_sample_count(file, i+1); j++) {
 			gf_isom_dump_hint_sample(file, i+1, j+1, dump);
 		}
@@ -806,17 +810,21 @@
 	for (i=0; i<gf_isom_get_track_count(file); i++) {
 		u32 has_cts_offset = gf_isom_has_time_offset(file, i+1);
 
-		fprintf(dump, "#dumping track ID %d timing: Num DTS CTS Size RAP Offset\n", gf_isom_get_track_id(file, i+1));
+		fprintf(dump, "#dumping track ID %d timing: Num DTS CTS Size RAP Offset isLeading DependsOn DependedOn Redundant RAP-SampleGroup Roll-SampleGroup Roll-Distance\n", gf_isom_get_track_id(file, i+1));
 		count = gf_isom_get_sample_count(file, i+1);
 
 		for (j=0; j<count; j++) {
 			u64 dts, cts, offset;
+			u32 isLeading, dependsOn, dependedOn, redundant;
+			Bool is_rap, has_roll;
+			s32 roll_distance;
 			u32 index;
 			GF_ISOSample *samp = gf_isom_get_sample_info(file, i+1, j+1, &index, &offset);
+			gf_isom_get_sample_flags(file, i+1, j+1, &isLeading, &dependsOn, &dependedOn, &redundant);
+			gf_isom_get_sample_rap_roll_info(file, i+1, j+1, &is_rap, &has_roll, &roll_distance);
 			dts = samp->DTS;
 			cts = dts + (s32) samp->CTS_Offset;
-
-			fprintf(dump, "Sample %d\tDTS "LLD"\tCTS "LLD"\t%d\t%d\t"LLD, j+1, LLD_CAST dts, LLD_CAST cts, samp->dataLength, samp->IsRAP, offset);
+			fprintf(dump, "Sample %d\tDTS "LLD"\tCTS "LLD"\t%d\t%d\t"LLD"\t%d\t%d\t%d\t%d\t%d\t%d\t%d", j+1, LLD_CAST dts, LLD_CAST cts, samp->dataLength, samp->IsRAP, offset, isLeading, dependsOn, dependedOn, redundant, is_rap, has_roll, roll_distance);
 			if (cts<dts) {
 				fprintf(dump, " #NEGATIVE CTS OFFSET!!!");
 				has_error = 1;
@@ -1091,13 +1099,13 @@
 	u32 i, count, track, nalh_size, timescale, cur_extract_mode;
 	FILE *dump;
 	s32 countRef;
+	Bool is_adobe_protection = GF_FALSE;
 #ifndef GPAC_DISABLE_AV_PARSERS
-	Bool is_hevc = 0;
+	Bool is_hevc = GF_FALSE;
 	AVCState avc;
 	GF_AVCConfig *avccfg, *svccfg;
 	GF_HEVCConfig *hevccfg, *shvccfg;
 	GF_AVCConfigSlot *slc;
-	Bool is_adobe_protection = GF_FALSE;
 
 	memset(&avc, 0, sizeof(AVCState));
 #endif
@@ -1447,7 +1455,63 @@
 	return szTime;
 }
 
+void print_udta(GF_ISOFile *file, u32 track_number)
+{
+	u32 i, count;
 
+	count = gf_isom_get_udta_count(file, track_number);
+	if (!count) return;
+
+	fprintf(stderr, "%d UDTA types: ", count);
+
+	for (i=0; i<count; i++) {
+		u32 type;
+		bin128 uuid;
+		gf_isom_get_udta_type(file, track_number, i+1, &type, &uuid);
+		fprintf(stderr, "%s (%d) ", gf_4cc_to_str(type), gf_isom_get_user_data_count(file, track_number, type, uuid) );
+	}
+	fprintf(stderr, "\n");
+}
+
+GF_Err dump_udta(GF_ISOFile *file, char *inName, u32 dump_udta_type, u32 dump_udta_track)
+{
+	char szName[1024], *data;
+	FILE *t;
+	bin128 uuid;
+	u32 count, res;
+	GF_Err e;
+
+	memset(uuid, 0, 16);
+	count = gf_isom_get_user_data_count(file, dump_udta_track, dump_udta_type, uuid);
+	if (!count) {
+		fprintf(stderr, "No UDTA for type %s found\n", gf_4cc_to_str(dump_udta_type) );
+		return GF_OK;
+	}
+
+	data = NULL;
+	count = 0;
+	e = gf_isom_get_user_data(file, dump_udta_track, dump_udta_type, uuid, 0, &data, &count);
+	if (e) {
+		fprintf(stderr, "Error dumping UDTA %s: %s\n", gf_4cc_to_str(dump_udta_type), gf_error_to_string(e) );
+		return e;
+	} 
+	sprintf(szName, "%s_%s.udta", inName, gf_4cc_to_str(dump_udta_type) );
+	t = fopen(szName, "wb");
+	if (!t) {
+		gf_free(data);
+		fprintf(stderr, "Cannot open file %s\n", szName );
+		return GF_IO_ERR;
+	}
+	res = (u32) fwrite(data, 1, count, t);
+	fclose(t);
+	gf_free(data);
+	if (count != res) {
+		fprintf(stderr, "Error writing udta to file\n");
+		gf_free(data);
+		return GF_IO_ERR;
+	}
+	return GF_OK;
+}
 
 
 GF_Err dump_chapters(GF_ISOFile *file, char *inName, Bool dump_ogg)
@@ -1635,6 +1699,8 @@
 		fprintf(stderr, "Handler name: %s\n", handler_name);
 	}
 
+	print_udta(file, trackNum);
+
 	if (mtype==GF_ISOM_MEDIA_VISUAL) {
 		s32 tx, ty;
 		u32 w, h;
@@ -2396,6 +2462,7 @@
 		}
 	}
 
+	print_udta(file, 0);
 	fprintf(stderr, "\n");
 	for (i=0; i<gf_isom_get_track_count(file); i++) {
 		DumpTrackInfo(file, gf_isom_get_track_id(file, i+1), 0);

gpac-0.5.1.svn5491.tar.xz/applications/mp4box/fileimport.c -> gpac-0.5.1.svn5619.tar.xz/applications/mp4box/fileimport.c Changed

@@ -27,13 +27,14 @@
 #include <gpac/tools.h>
 #include <gpac/media_tools.h>
 #include <gpac/constants.h>
+#include <gpac/scene_manager.h>
+#include <gpac/network.h>
+#include <gpac/base_coding.h>
 
 #if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_X3D) && !defined(GPAC_DISABLE_SVG)
 #include <gpac/scenegraph.h>
 #endif
-#ifndef GPAC_DISABLE_SMGR
-#include <gpac/scene_manager.h>
-#endif
+
 
 #ifndef GPAC_DISABLE_BIFS
 #include <gpac/bifs.h>
@@ -41,7 +42,6 @@
 #ifndef GPAC_DISABLE_VRML
 #include <gpac/nodes_mpeg4.h>
 #endif
-#include <gpac/network.h>
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
@@ -194,9 +194,53 @@
 	}
 }
 
+GF_Err set_file_udta(GF_ISOFile *dest, u32 tracknum, u32 udta_type, char *src, Bool is_box_array)
+{
+	char *data = NULL;
+	u32 size;
+	bin128 uuid;
+	memset(uuid, 0 , 16);
+
+	if (!udta_type && !is_box_array) return GF_BAD_PARAM;
+
+	if (!src) {
+		return gf_isom_remove_user_data(dest, tracknum, udta_type, uuid);
+	}
+
+	if (!strnicmp(src, "base64", 6)) {
+		src += 7;
+		size = (u32) strlen(src);
+		data = gf_malloc(sizeof(char) * size);
+		size = gf_base64_decode(src, size, data, size);
+	} else {
+		FILE *t = fopen(src, "rb");
+		if (!t) return GF_IO_ERR;
+		fseek(t, 0, SEEK_END);
+		size = ftell(t);
+		fseek(t, 0, SEEK_SET);
+		data = gf_malloc(sizeof(char)*size);
+		if (size != fread(data, 1, size, t) ) {
+			gf_free(data);
+			fclose(t);
+			return GF_IO_ERR;
+		}
+		fclose(t);
+	}
+
+	if (size && data) {
+		if (is_box_array) {
+			gf_isom_add_user_data_boxes(dest, tracknum, data, size);
+		} else {
+			gf_isom_add_user_data(dest, tracknum, udta_type, uuid, data, size);
+		}
+		gf_free(data);
+	}
+	return GF_OK;
+}
+
 GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, Double force_fps, u32 frames_per_sample)
 {
-	u32 track_id, i, j, timescale, track, stype, profile, level, new_timescale, rescale, svc_mode, tile_mode;
+	u32 track_id, i, j, timescale, track, stype, profile, level, new_timescale, rescale, svc_mode, tile_mode, txt_flags;
 	s32 par_d, par_n, prog_id, delay;
 	s32 tw, th, tx, ty, txtw, txth, txtx, txty;
 	Bool do_audio, do_video, do_all, disable, track_layout, text_layout, chap_ref, is_chap, is_chap_file, keep_handler, negative_cts_offset, rap_only;
@@ -206,6 +250,7 @@
 	GF_MediaImporter import;
 	char *ext, szName[1000], *handler_name, *rvc_config, *chapter_name;
 	GF_List *kinds;
+	GF_TextFlagsMode txt_mode = GF_ISOM_TEXT_FLAGS_OVERWRITE;
 
 	rvc_predefined = 0;
 	chapter_name = NULL;
@@ -237,6 +282,7 @@
 	negative_cts_offset = 0;
 	tile_mode = 0;
 	rap_only = 0;
+	txt_flags = 0;
 
 	tw = th = tx = ty = txtw = txth = txtx = txty = 0;
 	par_d = par_n = -2;
@@ -401,6 +447,19 @@
 			gf_list_add(kinds, kind_scheme);
 			gf_list_add(kinds, kind_value);
 		}
+		else if (!strnicmp(ext+1, "txtflags", 8)) {
+			if (!strnicmp(ext+1, "txtflags=", 9)) {
+				sscanf(ext+10, "%x", &txt_flags);
+			}
+			else if (!strnicmp(ext+1, "txtflags+=", 10)) {
+				sscanf(ext+11, "%x", &txt_flags);
+				txt_mode = GF_ISOM_TEXT_FLAGS_TOGGLE;
+			}
+			else if (!strnicmp(ext+1, "txtflags-=", 10)) {
+				sscanf(ext+11, "%x", &txt_flags);
+				txt_mode = GF_ISOM_TEXT_FLAGS_UNTOGGLE;
+			}
+		}
 
 		/*EXPERIMENTAL OPTIONS NOT DOCUMENTED*/
 		else if (!strnicmp(ext+1, "tiles", 5)) {
@@ -591,6 +650,11 @@
 			if (gf_isom_get_hevc_shvc_type(import.dest, i+1, 1)>=GF_ISOM_HEVCTYPE_HEVC_SHVC)
 				check_track_for_shvc = i+1;
 
+			if (txt_flags) {
+				gf_isom_text_set_display_flags(import.dest, i+1, 0, txt_flags, txt_mode);
+			}
+
+
 			if (tile_mode) {
 				switch (gf_isom_get_media_subtype(import.dest, i+1, 1)) {
 				case GF_ISOM_SUBTYPE_HVC1:
@@ -739,6 +803,10 @@
 			if (gf_isom_get_hevc_shvc_type(import.dest, track, 1)>=GF_ISOM_HEVCTYPE_HEVC_SHVC)
 				check_track_for_shvc = track;
 
+			if (txt_flags) {
+				gf_isom_text_set_display_flags(import.dest, track, 0, txt_flags, txt_mode);
+			}
+
 			if (tile_mode) {
 				switch (gf_isom_get_media_subtype(import.dest, track, 1)) {
 				case GF_ISOM_SUBTYPE_HVC1:
@@ -799,6 +867,7 @@
 		gf_list_rem(kinds, 0);
 		if (kind) gf_free(kind);
 	}
+	gf_list_del(kinds);
 	if (handler_name) gf_free(handler_name);
 	if (chapter_name ) gf_free(chapter_name );
 	if (import.fontName) gf_free(import.fontName);
@@ -2167,6 +2236,7 @@
 			gf_log_set_tool_level(GF_LOG_CODING, GF_LOG_DEBUG);
 			prev_logs = gf_log_set_callback(logs, scene_coding_log);
 		}
+		opts->src_url = in;
 		e = gf_sm_encode_to_file(ctx, mp4, opts);
 		if (logs) {
 			gf_log_set_tool_level(GF_LOG_CODING, GF_LOG_ERROR);

gpac-0.5.1.svn5491.tar.xz/applications/mp4box/main.c -> gpac-0.5.1.svn5619.tar.xz/applications/mp4box/main.c Changed

@@ -84,6 +84,8 @@
 
 GF_Err dump_cover_art(GF_ISOFile *file, char *inName);
 GF_Err dump_chapters(GF_ISOFile *file, char *inName, Bool dump_ogg);
+void dump_udta(GF_ISOFile *file, char *inName, u32 dump_udta_type, u32 dump_udta_track);
+GF_Err set_file_udta(GF_ISOFile *dest, u32 tracknum, u32 udta_type, char *src, Bool is_box_array);
 u32 id3_get_genre_tag(const char *name);
 
 /*in filedump.c*/
@@ -141,8 +143,8 @@
 int mp4boxTerminal(int argc, char **argv);
 
 u32 quiet = 0;
-Bool dvbhdemux =0;
-Bool keep_sys_tracks = 0;
+Bool dvbhdemux = GF_FALSE;
+Bool keep_sys_tracks = GF_FALSE;
 
 
 /*some global vars for swf import :(*/
@@ -176,6 +178,7 @@
 	{GF_ISOM_ITUNE_COVER_ART, "cover", "usage: cover=file.jpg,file.png"},
 	{GF_ISOM_ITUNE_ENCODER, "encoder", "usage: encoder=name"},
 	{GF_ISOM_ITUNE_GAPLESS, "gapless", "usage: gapless=yes,no"},
+	{GF_ISOM_ITUNE_ALL, "all", "usage: all=NULL"},
 };
 
 u32 nb_itunes_tags = sizeof(itags) / sizeof(itunes_tag);
@@ -227,11 +230,13 @@
 	 " -rb ABCD removes given brand from file's alternate brand list\n"
 	 " -cprt string adds copyright string to movie\n"
 	 " -chap file adds chapter information contained in file\n"
+	 " -set-track-id id1:id2 changes the id of a track from id1 to id2\n"
 	 " -rem trackID removes track from file\n"
 	 " -rap trackID removes all non-RAP samples from track\n"
 	 " -enable trackID enables track\n"
 	 " -disable trackID disables track\n"
 	 " -new forces creation of a new destination file\n"
+			" -timescale VAL sets movie timescale to VAL ticks per second (default is 600).\n"
 	 " -lang [tkID=]LAN sets track language. LAN is the BCP-47 code (eng, en-UK, ...)\n"
 	 " -delay tkID=TIME sets track start delay in ms.\n"
 	 " -par tkID=PAR sets visual track pixel aspect ratio (PAR=N:D or \"none\")\n"
@@ -270,6 +275,13 @@
 	 " -group-single puts all tracks in a single group\n"
 	 " -ref id:XXXX:refID adds a reference of type 4CC from track ID to track refID\n"
 	 " -keep-utc keeps UTC timing in the file after edit\n"
+			" -udta ID:[OPTS] sets udta for given track or movie if ID is 0. OPTS is a colon separated list of:\n"
+			" type=CODE where code is the 4CC code of the UDTA (not needed for box= option)\n"
+			" box=FILE	 where FILE is the location of the udta data, formatted as serialized boxes\n"
+			" box=base64,DATA where DATA is the base64 encoded udta data, formatted as serialized boxes\n"
+			" src=FILE	 where FILE is the location of the udta data (will be stored in a single box of type CODE)\n"
+			" src=base64,DATA where DATA is the base64 encoded udta data (will be stored in a single box of type CODE)\n"
+			"	 If no source is set, UDTA of type CODE will be removed\n"
 	 "\n");
 }
 
@@ -365,13 +377,14 @@
 
 void PrintFormats()
 {
-	fprintf(stderr, "Suppported raw formats and file extensions:\n"
+	fprintf(stderr, "Supported raw formats and file extensions:\n"
 	 " NHNT .media .nhnt .info\n"
 	 " NHML .nhml (opt: .media .info)\n"
 	 " MPEG-1-2 Video .m1v .m2v\n"
 	 " MPEG-4 Video .cmp .m4v\n"
 	 " H263 Video .263 .h263\n"
-	 " AVC/H264 Video .h264 .h26L .264 .26L\n"
+ " AVC/H264 Video .h264 .h26L .264 .26L .x264 .svc\n"
+ " HEVC Video .hevc .h265 .265 .hvc .shvc\n"
 	 " JPEG Images .jpg .jpeg\n"
 	 " PNG Images .png\n"
 	 " MPEG 1-2 Audio .mp3, .m1a, .m2a\n"
@@ -445,7 +458,7 @@
 	 " \":subsamples\" adds SubSample information for AVC+SVC\n"
 	 " \":forcesync\" forces non IDR samples with I slices to be marked as sync points (AVC GDR)\n"
 	 " !! RESULTING FILE IS NOT COMPLIANT WITH THE SPEC but will fix seeking in most players\n"
-	 " \":negctts\" uses negative CTTS table\n"			
+	 " \":negctts\" uses negative CTS-DTS offsets (ISO4 brand)\n"
 	 " \":stype=4CC\" forces the sample description type to a different value\n"
 	 " !! THIS MAY BREAK THE FILE WRITING !!\n"
 	 " \":chap\" specifies the track is a chapter track\n"
@@ -463,9 +476,9 @@
 	 " \":timescale=TS\" sets import timescale to TS\n"
 	 " \":noedit\" do not set edit list when importing B-frames video tracks\n"
 	 " \":rvc=FILENAME\" sets TVC configuration for the media\n"
-			" \":fmt=FORMAT\" overrides format detection with given format (cf BT/XMTA doc)\n"
-			" \":profile=INT\" overrides AVC profile\n"
-			" \":level=INT\" overrides AVC level\n"
+	 " \":fmt=FORMAT\" overrides format detection with given format (cf BT/XMTA doc)\n"
+	 " \":profile=INT\" overrides AVC profile\n"
+	 " \":level=INT\" overrides AVC level\n"
 
 	 " \":font=name\" specifies font name for text import (default \"Serif\")\n"
 	 " \":size=s\" specifies font size for text import (default 18)\n"
@@ -476,7 +489,7 @@
 	 " track area\n"
 	 " - X and Y can be omitted (:layout=WxH)\n"
 
-			" \":swf-global\" all SWF defines are placed in first scene replace\n"
+	 " \":swf-global\" all SWF defines are placed in first scene replace\n"
 	 " * Note: By default SWF defines are sent when needed\n"
 	 " \":swf-no-ctrl\" uses a single stream for movie control and dictionary\n"
 	 " * Note: this will disable ActionScript\n"
@@ -490,8 +503,11 @@
 	 " \":swf-same-app\" appearance nodes are reused\n"
 	 " \":swf-flatten=ang\" complementary angle below which 2 lines are merged\n"
 	 " * Note: angle \'0\' means no flattening\n"
+			" \":kind=SCHEMA:type\" sets kind for the track\n"
+			" \":txtflags=flags\" sets display flags (hexa number) of text track\n"
+			" \":txtflags+=flags\" adds display flags (hexa number) to text track\n"
+			" \":txtflags-=flags\" removes display flags (hexa number) from text track\n"
 	 "\n"
-	 " \":negctts\" uses negative CTS-DTS offsets (ISO4 brand)\n"
 	 " -add file add file tracks to (new) output file\n"
 	 " -cat file concatenates file samples to (new) output file\n"
 	 " * Note: creates tracks if needed\n"
@@ -564,7 +580,7 @@
 	 " -decrypt [drm_file] decrypts a specific track using ISMA AES CTR 128\n"
 	 " * Note: drm_file can be omitted if keys are in file\n"
 	 " -set-kms kms_uri changes KMS location for all tracks or a given one.\n"
-	 " * to adress a track, use \'tkID=kms_uri\'\n"
+	 " * to address a track, use \'tkID=kms_uri\'\n"
 	 "\n"
 	 "DRM file syntax for GPAC ISMACryp:\n"
 	 " File is XML and shall start with xml header\n"
@@ -677,6 +693,7 @@
 	 " -dcr ISMACryp samples structure to XML output\n"
 	 " -dump-cover Extracts cover art\n"
 	 " -dump-chap Extracts chapter file\n"
+			" -dump-udta [ID:]4cc Extracts udta for the given 4CC. If ID is given, dumps from UDTA of the given track ID, otherwise moov is used.\n"
 	 "\n"
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	 " -ttxt Converts input subtitle to GPAC TTXT format\n"
@@ -692,6 +709,7 @@
 	 " -statx generates node/field statistics for scene after each AU\n"
 	 "\n"
 	 " -hash generates SHA-1 Hash of the input file\n"
+	 " -bin converts input XML file using NHML bitstream syntax to binary\n"
 	 "\n");
 }
 
@@ -705,7 +723,7 @@
 	 " if ID is not 0 use track meta\n"
 	 " -add-item args adds resource to meta\n"
 	 " * syntax: file_path + options (\':\' separated):\n"
-	 " tk=ID: meta adressing (file, moov, track)\n"
+	 " tk=ID: meta addressing (file, moov, track)\n"
 	 " name=str: item name\n"
 	 " mime=mtype: item mime type\n"
 	 " encoding=enctype: item content-encoding type\n"
@@ -1268,9 +1286,8 @@
 	u32 switchGroupID;
 } TSELAction;
 
-static Bool parse_tsel_args(TSELAction **__tsel_list, char *opts, u32 *nb_tsel_act)
+static Bool parse_tsel_args(TSELAction **__tsel_list, char *opts, u32 *nb_tsel_act, TSELActionType act)
 {
-	TSELActionType act;
 	u32 refTrackID = 0;
 	Bool has_switch_id;
 	u32 switch_id = 0;
@@ -1281,7 +1298,6 @@
 	TSELAction *tsel_list = *__tsel_list;
 
 	has_switch_id = 0;
-	act = tsel_list[*nb_tsel_act].act_type;
 
 
 	if (!opts) return 0;
@@ -1319,7 +1335,7 @@
 			}
 		}
 		else if (!strnicmp(szSlot, "trackID=", 8) || !strchr(szSlot, '=') ) {
-			__tsel_list = gf_realloc(__tsel_list, sizeof(TSELAction) * (*nb_tsel_act + 1));
+			*__tsel_list = gf_realloc(*__tsel_list, sizeof(TSELAction) * (*nb_tsel_act + 1));
 			tsel_list = *__tsel_list;
 
 			tsel_act = &tsel_list[*nb_tsel_act];
@@ -1359,6 +1375,8 @@
 	TRAC_ACTION_REM_NON_RAP		= 10,
 	TRAC_ACTION_SET_KIND		= 11,
 	TRAC_ACTION_REM_KIND		= 12,
+	TRAC_ACTION_SET_ID			= 13,
+	TRAC_ACTION_SET_UDTA		= 14,
 } TrackActionType;
 
 typedef struct
@@ -1372,7 +1390,10 @@
 	s32 par_num, par_den;
 	u32 dump_type, sample_num;
 	char *out_name;
+	char *src_name;
+	u32 udta_type;
 	char *kind_scheme, *kind_value;
+	u32 newTrackID;
 } TrackAction;
 
 enum
@@ -1392,6 +1413,8 @@
 		for (i=0; i<nb_track_act; i++) { \
 			if (tracks[i].out_name) \
 				gf_free(tracks[i].out_name); \
+			if (tracks[i].src_name) \
+				gf_free(tracks[i].src_name); \
 			if (tracks[i].kind_scheme) \
 				gf_free(tracks[i].kind_scheme); \
 			if (tracks[i].kind_value) \
@@ -1423,14 +1446,22 @@
 		gf_free(dash_inputs); \
 	} \
 	gf_sys_close();	\
-	return __ret_code; \
+	if (__ret_code) return __ret_code; \
+	goto exit; \
 
 
 GF_DashSegmenterInput *set_dash_input(GF_DashSegmenterInput *dash_inputs, char *name, u32 *nb_dash_inputs)
 {
 	GF_DashSegmenterInput *di;
-	char *sep = strchr(name, ':');
-	if (sep && (sep[1]=='\\')) sep = strchr(sep+1, ':');
+ char *sep;
+ // skip ./ and ../, and look for first . to figure out extension
+ if ((name[1]=='/') || (name[2]=='/') || (name[1]=='\\') || (name[2]=='\\') ) sep = strchr(name+3, '.');
+ else sep = strchr(name, '.');
+ 
+ //then look for our opt separator :
+ sep = strchr(sep ? sep : name, ':');
+ 
+ if (sep && (sep[1]=='\\')) sep = strchr(sep+1, ':');
 
 	dash_inputs = gf_realloc(dash_inputs, sizeof(GF_DashSegmenterInput) * (*nb_dash_inputs + 1) );
 	memset(&dash_inputs[*nb_dash_inputs], 0, sizeof(GF_DashSegmenterInput) );
@@ -1478,9 +1509,9 @@
 			else if (!strnicmp(opts, "bandwidth=", 10)) di->bandwidth = atoi(opts+10);
 			else if (!strnicmp(opts, "role=", 5)) strncpy(di->role, opts+5, 99);
 			else if (!strnicmp(opts, "desc", 4)) {
-				u32 *nb_descs;
-				char ***descs;
-				u32 opt_offset;
+				u32 *nb_descs=NULL;
+				char ***descs=NULL;
+				u32 opt_offset=0;
 				u32 len;
 				if (!strnicmp(opts, "desc_p=", 7)) {
 					nb_descs = &di->nb_p_descs;
@@ -1499,19 +1530,22 @@
 					descs = &di->rep_descs;
 					opt_offset = 9;
 				}
-				(*nb_descs)++;
-				opts += opt_offset;
-				len = (u32) strlen(opts);
-				(*descs) = (char **)gf_realloc((*descs), (*nb_descs)*sizeof(char *));
-				(*descs)[(*nb_descs)-1] = (char *)gf_malloc((len+1)*sizeof(char));
-				strncpy((*descs)[(*nb_descs)-1], opts, len);
-				(*descs)[(*nb_descs)-1][len] = 0;
+				if (opt_offset) {
+					(*nb_descs)++;
+					opts += opt_offset;
+					len = (u32) strlen(opts);
+					(*descs) = (char **)gf_realloc((*descs), (*nb_descs)*sizeof(char *));
+					(*descs)[(*nb_descs)-1] = (char *)gf_malloc((len+1)*sizeof(char));
+					strncpy((*descs)[(*nb_descs)-1], opts, len);
+					(*descs)[(*nb_descs)-1][len] = 0;
+				}
+
 			}
 			else if (!strnicmp(opts, "xlink=", 6)) {
-				if (strlen(opts+6) > 199) {
+				if (strlen(opts+6) > 99) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] XLink cannot exceed 99 characters in MP4Box, truncating ...\n"));
 				}
-				strncpy(di->xlink, opts+6, 199);
+				strncpy(di->xlink, opts+6, 99);
 			}
 
 			if (!sep) break;
@@ -1544,6 +1578,13 @@
 				action->dump_type |= GF_EXPORT_WEBVTT_META_EMBEDDED;
 			} else if (!strncmp("output=", param, 7)) {
 				action->out_name = gf_strdup(param+7);
+			} else if (!strncmp("src=", param, 4)) {
+				action->src_name = gf_strdup(param+4);
+			} else if (!strncmp("box=", param, 4)) {
+				action->src_name = gf_strdup(param+4);
+				action->sample_num = 1;
+			} else if (!strncmp("type=", param, 4)) {
+				action->udta_type = GF_4CC(param[5], param[6], param[7], param[8]);
 			} else if (action->dump_type == GF_EXPORT_RAW_SAMPLES) {
 				action->sample_num = atoi(param);
 			}
@@ -1569,6 +1610,60 @@
 	return dump_type;
 }
 
+static GF_Err nhml_bs_to_bin(char *inName, char *outName, u32 dump_std)
+{
+	GF_Err e;
+	GF_XMLNode *root;
+	char *data = NULL;
+	u32 data_size;
+
+	GF_DOMParser *dom = gf_xml_dom_new();
+	e = gf_xml_dom_parse(dom, inName, NULL, NULL);
+	if (e) {	
+		gf_xml_dom_del(dom);
+		fprintf(stderr, "Failed to parse XML file: %s\n", gf_error_to_string(e));
+		return e;
+	}
+	root = gf_xml_dom_get_root_idx(dom, 0);
+	if (!root) {
+		gf_xml_dom_del(dom);
+		return GF_OK;
+	}
+
+	e = gf_xml_parse_bit_sequence(root, &data, &data_size);
+	gf_xml_dom_del(dom);
+
+	if (e) {	
+		fprintf(stderr, "Failed to parse binary sequence: %s\n", gf_error_to_string(e));
+		return e;
+	}
+
+	if (dump_std) {
+		fwrite(data, 1, data_size, stdout);
+	} else {
+		FILE *t;
+		char szFile[GF_MAX_PATH];
+		if (outName) {
+			strcpy(szFile, outName);
+		} else {
+			strcpy(szFile, inName);
+			strcat(szFile, ".bin");
+		}
+		t = fopen(szFile, "wb");
+		if (!t) {
+			fprintf(stderr, "Failed to open file %s\n", szFile);
+			e = GF_IO_ERR;
+		} else {
+			if (fwrite(data, 1, data_size, t) != data_size) {
+				fprintf(stderr, "Failed to write output to file %s\n", szFile);
+				e = GF_IO_ERR;
+			}
+			fclose(t);
+		}
+	}
+	gf_free(data);
+	return e;
+}
 
 
 static GF_Err hash_file(char *name, u32 dump_std)
@@ -1582,7 +1677,7 @@
 	} else if (dump_std==1) {
 		for (i=0; i<20; i++) fprintf(stdout, "%02X", hash[i]);
 	}
-	fprintf(stderr, "File %s hash (SHA-1): ", name);
+	fprintf(stderr, "File hash (SHA-1): ");
 	for (i=0; i<20; i++) fprintf(stderr, "%02X", hash[i]);
 	fprintf(stderr, "\n");
 
@@ -1614,7 +1709,9 @@
 	u32 *brand_rem = NULL;
 	GF_DashSwitchingMode bitstream_switching_mode = GF_DASH_BSMODE_INBAND;
 	u32 i, stat_level, hint_flags, info_track_id, import_flags, nb_add, nb_cat, crypt, agg_samples, nb_sdp_ex, max_ptime, raw_sample_num, split_size, nb_meta_act, nb_track_act, rtp_rate, major_brand, nb_alt_brand_add, nb_alt_brand_rem, old_interleave, car_dur, minor_version, conv_type, nb_tsel_acts, program_number, dump_nal, time_shift_depth, dash_dynamic, initial_moof_sn, dump_std, import_subtitle;
+#ifndef GPAC_DISABLE_SCENE_DUMP
 	GF_SceneDumpFormat dump_mode;
+#endif
 	Bool HintIt, needSave, FullInter, Frag, HintInter, dump_rtp, regular_iod, remove_sys_tracks, remove_hint, force_new, remove_root_od;
 	Bool print_sdp, print_info, open_edit, dump_isom, dump_cr, force_ocr, encode, do_log, do_flat, dump_srt, dump_ttxt, dump_timestamps, do_saf, dump_m2ts, dump_cart, do_hash, verbose, force_cat, align_cat, pack_wgt, single_group, dash_live, no_fragments_defaults, single_traf_per_moof;
 	char *inName, *outName, *arg, *mediaSource, *tmpdir, *input_ctx, *output_ctx, *drm_file, *avi2raw, *cprt, *chap_file, *pes_dump, *itunes_tags, *pack_file, *raw_cat, *seg_name, *dash_ctx_file;
@@ -1623,6 +1720,8 @@
 	Double min_buffer = 1.5;
 	u32 ast_shift_sec = 1;
 	u32 dump_chap = 0;
+	u32 dump_udta_type = 0;
+	u32 dump_udta_track = 0;
 	char **mpd_base_urls = NULL;
 	u32 nb_mpd_base_urls=0;
 	u32 dash_scale = 1000;
@@ -1657,6 +1756,8 @@
 	Bool adjust_split_end = 0;
 	Bool memory_frags = 1;
 	Bool keep_utc = 0;
+	Bool do_bin_nhml = 0;
+	u32 timescale = 0;
 	const char *do_wget = NULL;
 	GF_DashSegmenterInput *dash_inputs = NULL;
 	u32 nb_dash_inputs = 0;
@@ -1683,7 +1784,9 @@
 	movie_time = 0;
 	dump_nal = 0;
 	FullInter = HintInter = encode = do_log = old_interleave = do_saf = do_hash = verbose = 0;
+#ifndef GPAC_DISABLE_SCENE_DUMP
 	dump_mode = GF_SM_DUMP_NONE;
+#endif
 	Frag = force_ocr = remove_sys_tracks = agg_samples = remove_hint = keep_sys_tracks = remove_root_od = single_group = 0;
 	conv_type = HintIt = needSave = print_sdp = print_info = regular_iod = dump_std = open_edit = dump_isom = dump_rtp = dump_cr = dump_srt = dump_ttxt = force_new = dump_timestamps = dump_m2ts = dump_cart = import_subtitle = force_cat = pack_wgt = dash_live = 0;
 	no_fragments_defaults = 0;
@@ -1811,7 +1914,7 @@
 			grab_ifce = argv[i+1];
 			i++;
 		}
-		
+
 #endif
 #if !defined(GPAC_DISABLE_CORE_TOOLS)
 		else if (!stricmp(arg, "-wget")) {
@@ -1946,6 +2049,23 @@
 		else if (!stricmp(arg, "-dump-chap")) dump_chap = 1;
 		else if (!stricmp(arg, "-dump-chap-ogg")) dump_chap = 2;
 		else if (!stricmp(arg, "-hash")) do_hash = 1;
+		else if (!stricmp(arg, "-bin")) do_bin_nhml = 1;
+		else if (!stricmp(arg, "-dump-udta")) {
+			char *sep, *code;
+			CHECK_NEXT_ARG 
+			sep = strchr(argv[i+1], ':');
+			if (sep) {
+				sep[0] = 0;
+				dump_udta_track = atoi(argv[i+1]);
+				sep[0] = ':';
+				code = &sep[1];
+			} else {
+				code = argv[i+1];
+			}
+			dump_udta_type = GF_4CC(code[0], code[1], code[2], code[3]);
+			i++;
+		}
+
 
 #if 0
 		else if (!stricmp(arg, "-conf")) {
@@ -2204,7 +2324,6 @@
 			nb_mpd_base_urls++;
 			i++;
 		}
-
 		else if (!stricmp(arg, "-dash-ctx")) {
 			CHECK_NEXT_ARG
 			dash_ctx_file = argv[i+1];
@@ -2225,10 +2344,8 @@
 			else if (!stricmp(argv[i+1], "onDemand")) dash_profile = GF_DASH_PROFILE_ONDEMAND;
 			else if (!stricmp(argv[i+1], "dashavc264:live")) {
 				dash_profile = GF_DASH_PROFILE_AVC264_LIVE;
-				no_fragments_defaults = 1;
 			} else if (!stricmp(argv[i+1], "dashavc264:onDemand")) {
 				dash_profile = GF_DASH_PROFILE_AVC264_ONDEMAND;
-				no_fragments_defaults = 1;
 			} else if (!stricmp(argv[i+1], "main")) dash_profile = GF_DASH_PROFILE_MAIN;
 			else dash_profile = GF_DASH_PROFILE_FULL;
 			i++;
@@ -2365,6 +2482,19 @@
 		else if (!stricmp(arg, "-flat")) do_flat = 1;
 		else if (!stricmp(arg, "-keep-utc")) keep_utc = 1;
 		else if (!stricmp(arg, "-new")) force_new = 1;
+		else if (!stricmp(arg, "-timescale")) {
+			CHECK_NEXT_ARG
+			timescale = atoi(argv[i+1]);
+			open_edit = 1;
+			i++;
+		}
+		else if (!stricmp(arg, "-udta")) {
+			CHECK_NEXT_ARG
+			create_new_track_action(argv[i+1], &tracks, &nb_track_act, 0);
+			tracks[nb_track_act-1].act_type = TRAC_ACTION_SET_UDTA;
+			open_edit = 1;
+			i++;
+		}
 		else if (!stricmp(arg, "-add") || !stricmp(arg, "-import") || !stricmp(arg, "-convert")) {
 			CHECK_NEXT_ARG
 			if (!stricmp(arg, "-import")) fprintf(stderr, "\tWARNING: \"-import\" is deprecated - use \"-add\"\n");
@@ -2410,6 +2540,22 @@
 			nb_track_act++;
 			i++;
 		}
+		else if (!stricmp(arg, "-set-track-id")) {
+			char *sep;
+			CHECK_NEXT_ARG
+			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
+			tracks[nb_track_act].act_type = TRAC_ACTION_SET_ID;
+			sep = strchr(argv[i+1], ':');
+			*sep = 0;
+			tracks[nb_track_act].trackID = atoi(argv[i+1]);
+			*sep = ':';
+			sep++;
+			tracks[nb_track_act].newTrackID = atoi(sep);
+			open_edit = 1;
+			nb_track_act++;
+			i++;
+		}
 		else if (!stricmp(arg, "-par")) {
 			char szTK[20], *ext;
 			CHECK_NEXT_ARG
@@ -2509,8 +2655,8 @@
 				ext[0] = 0;
 				tracks[nb_track_act].kind_scheme = gf_strdup(scheme_start);
 				ext[0] = '=';
-				tracks[nb_track_act].kind_value = gf_strdup(ext+1);				
-			}						
+				tracks[nb_track_act].kind_value = gf_strdup(ext+1);
+			}
 			open_edit = 1;
 			nb_track_act++;
 			i++;
@@ -2828,14 +2974,15 @@
 			i++;
 		}
 		else if (!stricmp(arg, "-group-add") || !stricmp(arg, "-group-rem-track") || !stricmp(arg, "-group-rem")) {
+			TSELActionType act_type;
 			if (!stricmp(arg, "-group-rem")) {
-				tsel_acts[nb_tsel_acts].act_type = TSEL_ACTION_REMOVE_ALL_TSEL_IN_GROUP;
+				act_type = TSEL_ACTION_REMOVE_ALL_TSEL_IN_GROUP;
 			} else if ( !stricmp(arg, "-group-rem-track")) {
-				tsel_acts[nb_tsel_acts].act_type = TSEL_ACTION_REMOVE_TSEL;
+				act_type = TSEL_ACTION_REMOVE_TSEL;
 			} else {
-				tsel_acts[nb_tsel_acts].act_type = TSEL_ACTION_SET_PARAM;
+				act_type = TSEL_ACTION_SET_PARAM;
 			}
-			if (parse_tsel_args(&tsel_acts, argv[i+1], &nb_tsel_acts)==0) {
+			if (parse_tsel_args(&tsel_acts, argv[i+1], &nb_tsel_acts, act_type)==0) {
 				fprintf(stderr, "Invalid group syntax - check usage\n");
 				MP4BOX_EXIT_WITH_CODE(1);
 			}
@@ -3056,7 +3203,7 @@
 
 #ifndef GPAC_DISABLE_MPD
 	if (do_mpd) {
-		Bool remote = 0;
+		Bool remote = GF_FALSE;
 		char *mpd_base_url = gf_strdup(inName);
 		if (!strnicmp(inName, "http://", 7)) {
 #if !defined(GPAC_DISABLE_CORE_TOOLS)
@@ -3067,13 +3214,14 @@
 				MP4BOX_EXIT_WITH_CODE(1);
 			}
 			inName = "tmp_main.m3u8";
-			remote = 1;
+			remote = GF_TRUE;
 #else
+			gf_free(mpd_base_url);
 			fprintf(stderr, "HTTP Downloader disabled in this build\n");
 			MP4BOX_EXIT_WITH_CODE(1);
 #endif
 		}
-		e = gf_m3u8_to_mpd(inName, mpd_base_url, (outName ? outName : inName), 0, "video/mp2t", 1, use_url_template, NULL);
+		e = gf_m3u8_to_mpd(inName, mpd_base_url, (outName ? outName : inName), 0, "video/mp2t", GF_TRUE, use_url_template, NULL);
 		gf_free(mpd_base_url);
 
 		if (remote) {
@@ -3116,13 +3264,15 @@
 
 
 	if (import_subtitle && !trackID) {
-		/* We import the subtitle file, 
+		/* We import the subtitle file,
 		 i.e. we parse it and store the content as samples of a 3GPP Timed Text track in an ISO file,
 		 possibly for later export (e.g. when converting SRT to TTXT, ...) */
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 		GF_MediaImporter import;
 		/* Prepare the importer */
 		file = gf_isom_open("ttxt_convert", GF_ISOM_OPEN_WRITE, NULL);
+		if (timescale && file) gf_isom_set_timescale(file, timescale);
+
 		memset(&import, 0, sizeof(GF_MediaImporter));
 		import.dest = file;
 		import.in_name = inName;
@@ -3142,10 +3292,10 @@
 		}
 #ifndef GPAC_DISABLE_ISOM_DUMP
 		/* Start the export of the track #1, in the appropriate dump type, indicating it's a conversion */
-		dump_timed_text_track(file, gf_isom_get_track_id(file, 1), 
-							 dump_std ? NULL : outfile, 
-							 GF_TRUE, 
-							 (import_subtitle==2) ? GF_TEXTDUMPTYPE_SVG : (dump_srt ? GF_TEXTDUMPTYPE_SRT : GF_TEXTDUMPTYPE_TTXT));
+		dump_timed_text_track(file, gf_isom_get_track_id(file, 1),
+		 dump_std ? NULL : outfile,
+		 GF_TRUE,
+		 (import_subtitle==2) ? GF_TEXTDUMPTYPE_SVG : (dump_srt ? GF_TEXTDUMPTYPE_SRT : GF_TEXTDUMPTYPE_TTXT));
 #endif
 		/* Clean the importer */
 		gf_isom_delete(file);
@@ -3186,6 +3336,7 @@
 			fprintf(stderr, "Cannot open destination file %s: %s\n", inName, gf_error_to_string(gf_isom_last_error(NULL)) );
 			MP4BOX_EXIT_WITH_CODE(1);
 		}
+
 		for (i=0; i<(u32) argc; i++) {
 			if (!strcmp(argv[i], "-add")) {
 				char *src = argv[i+1];
@@ -3220,8 +3371,6 @@
 		/*unless explicitly asked, remove all systems tracks*/
 		if (!keep_sys_tracks) remove_systems_tracks(file);
 		needSave = 1;
-		/*JLF commented: if you want ISMA, just ask for it, no more auto-detect*/
-//		if (!conv_type && can_convert_to_isma(file)) conv_type = GF_ISOM_CONV_TYPE_ISMA;
 	}
 
 	if (nb_cat) {
@@ -3484,7 +3633,11 @@
 			if (!open_edit && file_exists && !gf_isom_probe_file(inName) && track_dump_type) {
 			}
 #ifndef GPAC_DISABLE_ISOM_WRITE
-			else if (!open_edit && file_exists /* && !gf_isom_probe_file(inName) */ && dump_mode == GF_SM_DUMP_NONE) {
+			else if (!open_edit && file_exists /* && !gf_isom_probe_file(inName) */
+#ifndef GPAC_DISABLE_SCENE_DUMP
+			 && dump_mode == GF_SM_DUMP_NONE
+#endif
+			 ) {
 				/*************************************************************************************************/
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 				if(dvbhdemux)
@@ -3513,10 +3666,12 @@
 #ifndef GPAC_DISABLE_MPEG2TS
 					dump_mpeg2_ts(inName, pes_dump, program_number);
 #endif
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
+				} else if (do_bin_nhml) {
+					nhml_bs_to_bin(inName, outName, dump_std);
 				} else if (do_hash) {
 					hash_file(inName, dump_std);
 				} else {
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
 					convert_file_info(inName, info_track_id);
 #endif
 				}
@@ -3633,7 +3788,7 @@
 #ifndef GPAC_DISABLE_ISOM_DUMP
 	if (dump_isom) dump_isom_xml(file, dump_std ? NULL : outfile);
 	if (dump_cr) dump_file_ismacryp(file, dump_std ? NULL : outfile);
-	if ((dump_ttxt || dump_srt) && trackID) dump_timed_text_track(file, trackID, dump_std ? NULL : outfile, 0, dump_srt);
+ if ((dump_ttxt || dump_srt) && trackID) dump_timed_text_track(file, trackID, dump_std ? NULL : outfile, 0, dump_srt ? GF_TEXTDUMPTYPE_SRT : GF_TEXTDUMPTYPE_TTXT);
 #ifndef GPAC_DISABLE_ISOM_HINTING
 	if (dump_rtp) dump_file_rtp(file, dump_std ? NULL : outfile);
 #endif
@@ -3646,8 +3801,14 @@
 		e = hash_file(inName, dump_std);
 		if (e) goto err_exit;
 	}
+	if (do_bin_nhml) {
+		e = nhml_bs_to_bin(inName, outName, dump_std);
+		if (e) goto err_exit;
+	}
+
 	if (dump_cart) dump_cover_art(file, outfile);
 	if (dump_chap) dump_chapters(file, outfile, (dump_chap==2) ? 1 : 0);
+	if (dump_udta_type) dump_udta(file, outfile, dump_udta_type, dump_udta_track);
 
 	if (dump_iod) {
 		GF_InitialObjectDescriptor *iod = (GF_InitialObjectDescriptor *)gf_isom_get_root_od(file);
@@ -3794,7 +3955,7 @@
 				fprintf(stderr, "No meta box in input file\n");
 			}
 			break;
-		default: 
+		default:
 			break;
 		}
 		if (e) goto err_exit;
@@ -3862,6 +4023,10 @@
 	}
 #endif
 
+	if (timescale && (timescale != gf_isom_get_timescale(file))) {
+		gf_isom_set_timescale(file, timescale);
+		needSave = 1;
+	}
 
 	if (!encode) {
 		if (!file) {
@@ -4068,6 +4233,20 @@
 				needSave = 1;
 			}
 			break;
+		case TRAC_ACTION_SET_ID:
+			if (track) {
+				u32 newTrack;
+				newTrack = gf_isom_get_track_by_id(file, tka->newTrackID);
+				if (newTrack != 0) {
+					fprintf(stderr, "Error: Cannot set track id with value %d because a track already exists - ignoring", tka->newTrackID);
+				} else {
+					e = gf_isom_set_track_id(file, track, tka->newTrackID);
+					needSave = 1;
+				}
+			} else {
+				fprintf(stderr, "Error: Cannot change id for track %d because it does not exist - ignoring", tka->trackID);
+			}
+			break;
 		case TRAC_ACTION_SET_PAR:
 			e = gf_media_change_par(file, track, tka->par_num, tka->par_den);
 			needSave = 1;
@@ -4097,6 +4276,10 @@
 			e = gf_media_remove_non_rap(file, track);
 			needSave = 1;
 			break;
+		case TRAC_ACTION_SET_UDTA:
+			set_file_udta(file, track, tka->udta_type, tka->src_name, tka->sample_num ? GF_TRUE : GF_FALSE);
+			needSave = 1;
+			break;
 		default:
 			break;
 		}
@@ -4373,6 +4556,16 @@
 	if (file) gf_isom_delete(file);
 	fprintf(stderr, "\n\tError: %s\n", gf_error_to_string(e));
 	MP4BOX_EXIT_WITH_CODE(1);
+
+exit:
+
+#ifdef GPAC_MEMORY_TRACKING
+	if (enable_mem_tracker && (gf_memory_size() != 0)) {
+ gf_memory_print();
+		return 2;
+	}
+#endif	
+	return 0;
 }
 
 int main( int argc, char** argv )

gpac-0.5.1.svn5491.tar.xz/applications/mp4client/carbon_events.c -> gpac-0.5.1.svn5619.tar.xz/applications/mp4client/carbon_events.c Changed

@@ -42,66 +42,68 @@
 
 static pascal OSErr ae_open_app (const AppleEvent *ae_event, AppleEvent *ae_reply, long ae_ref_count)
 {
-    if (main_evt_loop_run) {
-        QuitApplicationEventLoop();
-        main_evt_loop_run = 0;
-    }
-    return (noErr);
+	if (main_evt_loop_run) {
+		QuitApplicationEventLoop();
+		main_evt_loop_run = 0;
+	}
+	return (noErr);
 }
 
 static pascal OSErr ae_open_doc (const AppleEvent *ae_event, AppleEvent *ae_reply, long ae_ref_count)
 {
-    OSErr err;
-    FSRef	ref;
-    AEDescList	docList;
-    long	count;
-
-    err = AEGetParamDesc(ae_event, keyDirectObject, typeAEList, &docList);
-    if (err)
-        return (noErr);
-    
-    err = AECountItems(&docList, &count);
-    if (err == noErr) {
-        err = AEGetNthPtr(&docList, 1, typeFSRef, NULL, NULL, &ref, sizeof(FSRef), NULL);
-        if (err == noErr) {
-            char path[4096];
-            FSRefMakePath(&ref, (UInt8 *) path, 4096);
-            if (main_evt_loop_run) {
-                my_argv[1] = strdup(path);
-                gf_sys_set_args(2, (const char **) my_argv);
-            } else {
-                send_open_url(path);
-            }
-        }
-    }
-    err = AEDisposeDesc(&docList);
-
-    if (main_evt_loop_run) {
-        QuitApplicationEventLoop();
-        main_evt_loop_run = 0;
-    }
-    return (noErr);
+	OSErr err;
+	FSRef	ref;
+	AEDescList	docList;
+	long	count;
+
+	err = AEGetParamDesc(ae_event, keyDirectObject, typeAEList, &docList);
+	if (err)
+		return (noErr);
+
+	err = AECountItems(&docList, &count);
+	if (err == noErr) {
+		err = AEGetNthPtr(&docList, 1, typeFSRef, NULL, NULL, &ref, sizeof(FSRef), NULL);
+		if (err == noErr) {
+			char path[4096];
+			FSRefMakePath(&ref, (UInt8 *) path, 4096);
+			if (main_evt_loop_run) {
+				my_argv[1] = strdup(path);
+				gf_sys_set_args(2, (const char **) my_argv);
+			} else {
+				send_open_url(path);
+			}
+		}
+	}
+	err = AEDisposeDesc(&docList);
+
+	if (main_evt_loop_run) {
+		QuitApplicationEventLoop();
+		main_evt_loop_run = 0;
+	}
+	return (noErr);
 }
 
 void carbon_init ()
 {
-    my_argv[0] = "GPAC";
-    my_argv[1] = NULL;
+	my_argv[0] = "GPAC";
+	my_argv[1] = NULL;
+
     open_app_UPP = NewAEEventHandlerUPP(ae_open_app);
-    AEInstallEventHandler(kCoreEventClass, kAEOpenApplication, open_app_UPP, 0L, false);
-    open_doc_UPP = NewAEEventHandlerUPP(ae_open_doc);
-    AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments, open_doc_UPP, 0L, false);
-    
-    main_evt_loop_run = 1;
-    RunApplicationEventLoop();
+	AEInstallEventHandler(kCoreEventClass, kAEOpenApplication, open_app_UPP, 0L, false);
+	open_doc_UPP = NewAEEventHandlerUPP(ae_open_doc);
+	AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments, open_doc_UPP, 0L, false);
+
+	main_evt_loop_run = 1;
+	RunApplicationEventLoop();
 }
 
 void carbon_uninit()
 {
+
     DisposeAEEventHandlerUPP(open_app_UPP);
-    DisposeAEEventHandlerUPP(open_doc_UPP);
-    
-    if (my_argv[1]) free(my_argv[1]);
+	DisposeAEEventHandlerUPP(open_doc_UPP);
+
+	if (my_argv[1]) free(my_argv[1]);
 }

gpac-0.5.1.svn5491.tar.xz/applications/mp4client/extract.c -> gpac-0.5.1.svn5619.tar.xz/applications/mp4client/extract.c Changed

@@ -63,6 +63,23 @@
 #include <gpac/internal/terminal_dev.h>
 #include <gpac/internal/compositor_dev.h>
 
+
+enum
+{
+	DUMP_NONE = 0,
+	DUMP_AVI = 1,
+	DUMP_BMP = 2,
+	DUMP_PNG = 3,
+	DUMP_RAW = 4,
+	DUMP_SHA1 = 5,
+
+	//DuMP flags
+	DUMP_DEPTH_ONLY = 1<<16,
+	DUMP_RGB_DEPTH = 1<<17,
+	DUMP_RGB_DEPTH_SHAPE = 1<<18
+};
+
+
 extern Bool is_connected;
 extern GF_Terminal *term;
 extern u64 Duration;
@@ -87,16 +104,9 @@
 
 	case GF_PIXEL_BGR_32:
 	case GF_PIXEL_RGBA:
-		//probably due to tinygl bug - verify
-#ifndef GPAC_USE_TINYGL
-		fputc(ptr[3], fout);
-		fputc(ptr[2], fout);
-		fputc(ptr[1], fout);
-#else
 		fputc(ptr[2], fout);
 		fputc(ptr[1], fout);
 		fputc(ptr[0], fout);
-#endif
 		return 4;
 
 	case GF_PIXEL_RGB_24:
@@ -177,7 +187,7 @@
 	if (fb->pixel_format==GF_PIXEL_GREYSCALE) fi.biBitCount = 24;
 	else fi.biBitCount = 24;
 	fi.biCompression = BI_RGB;
-	fi.biSizeImage = fb->pitch_y * fb->height;
+	fi.biSizeImage = fb->width * fb->height * 3;
 
 	/*NOT ALIGNED!!*/
 	gf_fwrite(&fh.bfType, 2, 1, fout);
@@ -278,7 +288,7 @@
 	fclose(fout);
 }
 
-void write_texture_file(GF_VideoSurface *fb, char *rad_name, u32 img_num, u32 dump_mode)
+void write_texture_file(GF_VideoSurface *fb, char *rad_name, u32 img_num, u32 dump_mode_flags)
 {
 
 	FILE *fout;
@@ -287,8 +297,8 @@
 
 	buf = (unsigned char *) fb->video_buffer;
 
-	if (dump_mode==6) fout = gf_f64_open("dump_rgbds", "wb");
-	else if (dump_mode==9) fout = gf_f64_open("dump_rgbd", "wb");
+	if (dump_mode_flags & DUMP_RGB_DEPTH_SHAPE) fout = gf_f64_open("dump_rgbds", "wb");
+	else if (dump_mode_flags & DUMP_RGB_DEPTH) fout = gf_f64_open("dump_rgbd", "wb");
 	else return;
 
 	if (!fout) return;
@@ -332,22 +342,30 @@
 	fclose(fout);
 }
 
+void write_hash(FILE *sha_out, char *buf, u32 size)
+{
+	u8 hash[20];
+	gf_sha1_csum((u8 *)buf, size, hash);
+	fwrite(hash, 1, 20, sha_out);
+}
+
 
 /* creates a .bmp format greyscale image of the byte depthbuffer and a binary with only the content of the depthbuffer */
-void dump_depth (GF_Terminal *term, char *rad_name, u32 dump_type, u32 frameNum, char *conv_buf, void *avi_out)
+void dump_depth (GF_Terminal *term, char *rad_name, u32 dump_mode_flags, u32 frameNum, char *conv_buf, void *avi_out, FILE *sha_out)
 {
 	GF_Err e;
 	u32 i, k;
+
 	GF_VideoSurface fb;
+	u32 dump_mode = dump_mode_flags & 0x0000FFFF;
 
 	/*lock it*/
 	e = gf_sc_get_screen_buffer(term->compositor, &fb, 1);
 	if (e) fprintf(stderr, "Error grabbing depth buffer: %s\n", gf_error_to_string(e));
 	else fprintf(stderr, "OK\n");
 	/*export frame*/
-	switch (dump_type) {
-	case 1:
-	case 8:
+	switch (dump_mode) {
+	case DUMP_AVI:
 		/*reverse frame*/
 		for (k=0; k<fb.height; k++) {
 			char *dst, *src;
@@ -409,62 +427,68 @@
 				dst += 3;
 			}
 		}
+		if (avi_out) {
 #ifndef GPAC_DISABLE_AVILIB
-		if (AVI_write_frame(avi_out, conv_buf, fb.height*fb.width*3, 1) <0)
-			fprintf(stderr, "Error writing frame\n");
+			if (AVI_write_frame(avi_out, conv_buf, fb.height*fb.width*3, 1) <0)
+				fprintf(stderr, "Error writing frame\n");
+		} else
 #endif
+		if (sha_out) {
+			write_hash(sha_out, conv_buf, fb.height*fb.width*3);
+		}
+
+		/*in -depth -avi mode, do not release it yet*/
+		if (dump_mode_flags & DUMP_DEPTH_ONLY) return;
 		break;
-	case 2:
+	case DUMP_BMP:
 		write_bmp(&fb, rad_name, frameNum);
 		break;
-	case 12:
+	case DUMP_PNG:
 		write_png(&fb, rad_name, frameNum);
 		break;
-	case 3:
+	case DUMP_RAW:
 		write_raw(&fb, rad_name, frameNum);
 		break;
-	case 4:
+	default:
 		write_depthfile(&fb, rad_name, frameNum);
 		break;
-	case 7:
-		write_bmp(&fb, rad_name, frameNum);
-		break;
-
 	}
 	/*unlock it*/
-	/*in -depth -avi mode, do not release it yet*/
-	if (dump_type!=8) gf_sc_release_screen_buffer(term->compositor, &fb);
+	gf_sc_release_screen_buffer(term->compositor, &fb);
 }
 
-void dump_frame(GF_Terminal *term, char *rad_name, u32 dump_type, u32 frameNum, char *conv_buf, void *avi_out)
+void dump_frame(GF_Terminal *term, char *rad_name, u32 dump_mode_flags, u32 frameNum, char *conv_buf, void *avi_out, FILE *sha_out)
 {
 	GF_Err e = GF_OK;
 	u32 i, k, out_size;
 	GF_VideoSurface fb;
 
+	u32 dump_mode = dump_mode_flags & 0x0000FFFF;
+	u32 depth_dump_mode = 0;
+
+	if (dump_mode_flags & DUMP_RGB_DEPTH_SHAPE) depth_dump_mode = 3;
+	else if (dump_mode_flags & DUMP_RGB_DEPTH) depth_dump_mode = 2;
+	else if (dump_mode_flags & DUMP_DEPTH_ONLY) depth_dump_mode = 1;
+
 	/*lock it*/
-	if (dump_type==5 || dump_type==6) e = gf_sc_get_screen_buffer(term->compositor, &fb, 2);
-	else if (dump_type== 9 || dump_type==10) e = gf_sc_get_screen_buffer(term->compositor, &fb, 3);
-	else e = gf_sc_get_screen_buffer(term->compositor, &fb, 0);
+	e = gf_sc_get_screen_buffer(term->compositor, &fb, depth_dump_mode);
 	if (e) fprintf(stderr, "Error grabbing frame buffer: %s\n", gf_error_to_string(e));
 
 	/*export frame*/
-	switch (dump_type) {
-	case 1:
-	case 5:
-	case 10:
-	case 8:
+	switch (dump_mode) {
+	case DUMP_AVI:
+	case DUMP_SHA1:
 		/*reverse frame*/
 		for (k=0; k<fb.height; k++) {
 			char *dst, *src;
 			u16 src_16;
-			if (dump_type==5 || dump_type==10) dst = conv_buf + k*fb.width*4;
+			if (dump_mode_flags & (DUMP_RGB_DEPTH | DUMP_RGB_DEPTH_SHAPE)) dst = conv_buf + k*fb.width*4;
 			else dst = conv_buf + k*fb.width*3;
+
 			src = fb.video_buffer + (fb.height-k-1) * fb.pitch_y;
 
 			switch (fb.pixel_format) {
 			case GF_PIXEL_RGB_32:
-			case GF_PIXEL_RGBA:
 				for (i=0; i<fb.width; i++) {
 					dst[0] = src[0];
 					dst[1] = src[1];
@@ -473,6 +497,15 @@
 					dst += 3;
 				}
 				break;
+			case GF_PIXEL_RGBA:
+				for (i=0; i<fb.width; i++) {
+					dst[0] = src[2];
+					dst[1] = src[1];
+					dst[2] = src[0];
+					src+=4;
+					dst += 3;
+				}
+				break;
 			case GF_PIXEL_RGBDS:
 				for (i=0; i<fb.width; i++) {
 					dst[0] = src[2];
@@ -551,41 +584,99 @@
 				break;
 			}
 		}
-		if (dump_type!=5 && dump_type!= 10 && dump_type!= 11) {
-			out_size = fb.height*fb.width*3;
-		} else {
+		if (dump_mode_flags & (DUMP_RGB_DEPTH | DUMP_RGB_DEPTH_SHAPE)) {
 			out_size = fb.height*fb.width*4;
+		} else {
+			out_size = fb.height*fb.width*3;
 		}
+		if (avi_out) {
 #ifndef GPAC_DISABLE_AVILIB
-		if (dump_type!=5 && dump_type!= 10) {
 			if (AVI_write_frame(avi_out, conv_buf, out_size, 1) <0)
 				fprintf(stderr, "Error writing frame\n");
-		} else {
-			if (AVI_write_frame(avi_out, conv_buf, out_size, 1) <0)
-				fprintf(stderr, "Error writing frame\n");
-		}
+		} else 
 #endif
+		if (sha_out) {
+			write_hash(sha_out, conv_buf, out_size);
+		}
 		break;
-	case 2:
+	case DUMP_BMP:
 		write_bmp(&fb, rad_name, frameNum);
 		break;
-	case 11:
+	case DUMP_PNG:
 		write_png(&fb, rad_name, frameNum);
 		break;
-	case 6:
-	case 9:
-		write_texture_file(&fb, rad_name, frameNum, dump_type);
+	case DUMP_RAW:
+		write_raw(&fb, rad_name, frameNum);
 		break;
 
-	case 3:
-		write_raw(&fb, rad_name, frameNum);
+	default:
+		write_texture_file(&fb, rad_name, frameNum, dump_mode_flags);
 		break;
 	}
 	/*unlock it*/
 	gf_sc_release_screen_buffer(term->compositor, &fb);
 }
 
-Bool dump_file(char *url, char *out_url, u32 dump_mode, Double fps, u32 width, u32 height, Float scale, u32 *times, u32 nb_times)
+#ifndef GPAC_DISABLE_AVILIB
+
+typedef struct 
+{
+	GF_AudioListener al;
+	GF_Mutex *mx;
+	avi_t *avi;
+	u32 time_scale;
+	u64 max_dur, nb_bytes, audio_time;
+	u32 next_video_time, audio_time_init, flush_retry, nb_write, audio_clock_at_video_init;
+ u32 samplerate, bits_per_sample, nb_channel;
+} AVI_AudioListener;
+
+void avi_audio_frame(void *udta, char *buffer, u32 buffer_size, u32 time, u32 delay)
+{
+	AVI_AudioListener *avil = (AVI_AudioListener *)udta;
+
+	if (avil->audio_clock_at_video_init > time) 
+		return;
+
+	if (avil->audio_time >= avil->audio_time_init + avil->max_dur)
+		return;
+
+	gf_mx_p(avil->mx);
+
+ if (!avil->time_scale) {
+ AVI_set_audio(avil->avi, avil->nb_channel, avil->samplerate, avil->bits_per_sample, WAVE_FORMAT_PCM, 0);
+ avil->time_scale = avil->nb_channel*avil->bits_per_sample*avil->samplerate/8;
+		gf_term_set_option(term, GF_OPT_FORCE_AUDIO_CONFIG, 1);
+ }
+ 
+	avil->nb_bytes+=buffer_size;
+	avil->flush_retry=0;
+
+	if (avil->audio_time >= avil->audio_time_init) {
+		avil->nb_write++;
+		AVI_write_audio(avil->avi, buffer, buffer_size);
+	}
+
+
+	avil->audio_time = 1000*avil->nb_bytes/avil->time_scale;
+
+	//we are behind video dump, force audio flush 
+	if (avil->audio_time < avil->next_video_time) {
+		gf_term_step_clocks(term, 0);
+	}
+	gf_mx_v(avil->mx);
+}
+
+void avi_audio_reconfig(void *udta, u32 samplerate, u32 bits_per_sample, u32 nb_channel, u32 channel_cfg)
+{
+	AVI_AudioListener *avil = (AVI_AudioListener *)udta;
+
+ avil->nb_channel = nb_channel;
+ avil->samplerate = samplerate;
+ avil->bits_per_sample = bits_per_sample;
+}
+#endif
+
+Bool dump_file(char *url, char *out_url, u32 dump_mode_flags, Double fps, u32 width, u32 height, Float scale, u32 *times, u32 nb_times)
 {
 	GF_Err e;
 	u32 i = 0;
@@ -593,7 +684,23 @@
 	char szPath[GF_MAX_PATH];
 	char szOutPath[GF_MAX_PATH];
 	char *prev=NULL;
-
+	u32 time, prev_time, nb_frames, init_time;
+	u64 dump_dur;
+	char *conv_buf = NULL;
+#ifndef GPAC_DISABLE_AVILIB
+	avi_t *avi_out = NULL;
+	avi_t *depth_avi_out = NULL;
+	GF_Mutex *avi_mx = NULL;
+	AVI_AudioListener avi_al;
+#endif
+	FILE *sha_out = NULL;
+	FILE *sha_depth_out = NULL;
+	char szPath_depth[GF_MAX_PATH];
+	char comp[5];
+	u32 cur_time_idx;
+	u32 mode = dump_mode_flags & 0x0000FFFF;
+
+ if (!out_url) out_url = url;
 	prev = strstr(url, "://");
 	if (prev) {
 		prev = strrchr(url, '/');
@@ -665,105 +772,195 @@
 		gf_sc_release_screen_buffer(term->compositor, &fb);
 	}
 
-	if (dump_mode==1 || dump_mode==5 || dump_mode==8 || dump_mode==10) {
+
+	strcpy(szPath_depth, szOutPath);
+
+	if (mode==DUMP_AVI) {
 #ifdef GPAC_DISABLE_AVILIB
 		fprintf(stderr, "AVILib is disabled in this build of GPAC\n");
 		return 0;
 #else
-		u32 time, prev_time, nb_frames;
-		u64 dump_dur;
-		char *conv_buf;
-		avi_t *avi_out = NULL;
-		avi_t *depth_avi_out = NULL;
-		char szPath_depth[GF_MAX_PATH];
-		char comp[5];
-		strcpy(szPath_depth, szOutPath);
 		strcat(szOutPath, ".avi");
 		avi_out = AVI_open_output_file(szOutPath);
 		if (!avi_out) {
 			fprintf(stderr, "Error creating AVI file %s\n", szOutPath);
 			return 1;
 		}
-		if (dump_mode==8) {
+#endif
+	}
+	
+	if (mode==DUMP_SHA1) {
+		strcat(szOutPath, ".sha1");
+		sha_out = fopen(szOutPath, "wb");
+		if (!sha_out) {
+			fprintf(stderr, "Error creating SHA file %s\n", szOutPath);
+			return 1;
+		}
+	}
+
+	if (dump_mode_flags & DUMP_DEPTH_ONLY) {
+		if (mode==DUMP_AVI) {
+#ifndef GPAC_DISABLE_AVILIB
 			strcat(szPath_depth, "_depth.avi");
 			depth_avi_out = AVI_open_output_file(szPath_depth);
 			if (!depth_avi_out) {
-				fprintf(stderr, "Error creating AVI file %s\n", szPath_depth);
+				fprintf(stderr, "Error creating depth AVI file %s\n", szPath_depth);
+				return 1;
+			}
+#endif
+		}
+		if (mode==DUMP_SHA1) {
+			strcat(szPath_depth, "_depth.sha1");
+			sha_depth_out = fopen(szPath_depth, "wb");
+			if (!sha_depth_out) {
+				fprintf(stderr, "Error creating depgth SHA file %s\n", szPath_depth);
 				return 1;
 			}
 		}
+	}
 
-		if (!fps) fps = GF_IMPORT_DEFAULT_FPS;
-		time = prev_time = 0;
-		nb_frames = 0;
 
-		if (nb_times==2) {
-			prev_time = times[0];
-			dump_dur = times[1] - times[0];
-		} else {
-			dump_dur = times[0] ? times[0] : Duration;
-		}
-		if (!dump_dur) {
-			fprintf(stderr, "Warning: file has no duration, defaulting to 1 sec\n");
-			dump_dur = 1000;
-		}
+	if (!fps) fps = GF_IMPORT_DEFAULT_FPS;
+	time = prev_time = 0;
+	nb_frames = 0;
 
+	if (nb_times==2) {
+		prev_time = times[0];
+		dump_dur = times[1] - times[0];
+	} else if ((mode==DUMP_AVI) || (mode==DUMP_SHA1)) {
+		dump_dur = times[0] ? times[0] : Duration;
+	} else {
+		dump_dur = times[nb_times-1];
+		dump_dur ++;
+	}
+	if (!dump_dur) {
+		fprintf(stderr, "Warning: file has no duration, defaulting to 1 sec\n");
+		dump_dur = 1000;
+	}
+
+	if (mode==DUMP_AVI) {
+#ifndef GPAC_DISABLE_AVILIB
 		comp[0] = comp[1] = comp[2] = comp[3] = comp[4] = 0;
 		AVI_set_video(avi_out, width, height, fps, comp);
-		if (dump_mode==8) AVI_set_video(depth_avi_out, width, height, fps, comp);
-		if (dump_mode != 5 && dump_mode!=10) conv_buf = gf_malloc(sizeof(char) * width * height * 3);
-		else conv_buf = gf_malloc(sizeof(char) * width * height * 4);
-		/*step to first frame*/
-		if (prev_time) gf_term_step_clocks(term, prev_time);
-
-		while (time < dump_dur) {
-			while ((gf_term_get_option(term, GF_OPT_PLAY_STATE) == GF_STATE_STEP_PAUSE)) {
-				gf_term_process_flush(term);
-			}
+
+		avi_mx = gf_mx_new("AVIMutex");
+		
+		if (! (term->user->init_flags & GF_TERM_NO_AUDIO)) {
+			memset(&avi_al, 0, sizeof(avi_al));
+			avi_al.al.udta = &avi_al;
+			avi_al.al.on_audio_frame = avi_audio_frame;
+			avi_al.al.on_audio_reconfig = avi_audio_reconfig;
+			avi_al.mx = avi_mx;
+			avi_al.avi = avi_out;
+			avi_al.max_dur=dump_dur;
+
+			gf_sc_add_audio_listener(term->compositor, &avi_al.al);
+		}
+
+		if (dump_mode_flags & DUMP_DEPTH_ONLY) 
+			AVI_set_video(depth_avi_out, width, height, fps, comp);
+#endif
+	}
+
+	if ((mode==DUMP_AVI) || (mode==DUMP_SHA1)) {
+		
+		if (dump_mode_flags & (DUMP_RGB_DEPTH | DUMP_RGB_DEPTH_SHAPE) ) 
+			conv_buf = gf_malloc(sizeof(char) * width * height * 4);
+		else
+			conv_buf = gf_malloc(sizeof(char) * width * height * 3);
+	}
+
+	cur_time_idx = 0;
+	init_time = 0;
+	/*step to first frame*/
+	if (prev_time) {
+		gf_term_step_clocks(term, prev_time);
+		init_time = prev_time;
+		prev_time=0;
+	}
+#ifndef GPAC_DISABLE_AVILIB
+	avi_al.audio_time_init = avi_al.next_video_time = init_time;
+	avi_al.audio_clock_at_video_init = gf_term_get_clock(term);
+#endif
+
+	while (time < dump_dur) {
+		while ((gf_term_get_option(term, GF_OPT_PLAY_STATE) == GF_STATE_STEP_PAUSE)) {
+			gf_term_process_flush(term);
+		}
+
+		if ((mode==DUMP_AVI) || (mode==DUMP_SHA1)) {
+
 			fprintf(stderr, "Dumping %02d/100 %% - time %.02f sec\r", (u32) ((100.0*prev_time)/dump_dur), prev_time/1000.0 );
 
-			if (dump_mode==8) {
+			if (avi_mx) gf_mx_p(avi_mx);
+
+			if (dump_mode_flags & DUMP_DEPTH_ONLY) {
+
 				/*we'll dump both buffers at once*/
 				gf_mx_p(term->compositor->mx);
-				dump_depth(term, szPath_depth, dump_mode, i+1, conv_buf, depth_avi_out);
-				dump_frame(term, szOutPath, dump_mode, i+1, conv_buf, avi_out);
+				dump_depth(term, szPath_depth, dump_mode_flags, i+1, conv_buf, depth_avi_out, sha_depth_out);
+				dump_frame(term, szOutPath, mode, i+1, conv_buf, avi_out, sha_out);
 				gf_mx_v(term->compositor->mx);
-
+			} else {
+				dump_frame(term, szOutPath, dump_mode_flags, i+1, conv_buf, avi_out, sha_out);
 			}
-			else dump_frame(term, szOutPath, dump_mode, i+1, conv_buf, avi_out);
 
-			nb_frames++;
-			time = (u32) (nb_frames*1000/fps);
-			gf_term_step_clocks(term, time - prev_time);
-			prev_time = time;
+			if (avi_mx) gf_mx_v(avi_mx);
 
-			if (gf_prompt_has_input() && (gf_prompt_get_char()=='q')) {
-				fprintf(stderr, "Aborting dump\n");
-				break;
+		} else {
+			if ( times[cur_time_idx] <= time) {
+				if (dump_mode_flags & (DUMP_DEPTH_ONLY | DUMP_RGB_DEPTH | DUMP_RGB_DEPTH_SHAPE) ) {
+					dump_depth(term, szOutPath, dump_mode_flags, cur_time_idx+1, NULL, NULL, NULL);
+				} else {
+					dump_frame(term, out_url, dump_mode_flags, cur_time_idx+1, NULL, NULL, NULL);
+				}
+
+				cur_time_idx++;
+				if (cur_time_idx>=nb_times)
+					break;
 			}
 		}
-		AVI_close(avi_out);
-		if (dump_mode==8) AVI_close(depth_avi_out);
-		gf_free(conv_buf);
-		fprintf(stderr, "AVI Extraction 100/100\n");
-#endif /*GPAC_DISABLE_AVILIB*/
-	} else {
-		if (times[0]) gf_term_step_clocks(term, times[0]);
 
-		for (i=0; i<nb_times; i++) {
-			while ((gf_term_get_option(term, GF_OPT_PLAY_STATE) == GF_STATE_STEP_PAUSE)) {
-				gf_term_process_flush(term);
-			}
+		nb_frames++;
+		time = (u32) (nb_frames*1000/fps);
+		avi_al.next_video_time = init_time + time;
+		gf_term_step_clocks(term, time - prev_time);
+		prev_time = time;
 
-			if (dump_mode==4 || dump_mode==7 || dump_mode==12) {
-				dump_depth(term, szOutPath, dump_mode, i+1, NULL, NULL);
-			} else {
-				dump_frame(term, out_url, dump_mode, i+1, NULL, NULL);
-			}
+		if (gf_prompt_has_input() && (gf_prompt_get_char()=='q')) {
+			fprintf(stderr, "Aborting dump\n");
+			dump_dur=0;
+			break;
+		}
+	}
 
-			if (i+1<nb_times) gf_term_step_clocks(term, times[i+1] - times[i]);
+	//flush audio dump
+	if (! (term->user->init_flags & GF_TERM_NO_AUDIO)) {
+		avi_al.flush_retry=0;
+		while ((avi_al.flush_retry <100) && (avi_al.audio_time < dump_dur)) {
+			gf_term_step_clocks(term, 0);
+			gf_sleep(1);
+			avi_al.flush_retry++;
 		}
 	}
+
+#ifndef GPAC_DISABLE_AVILIB
+	if (! (term->user->init_flags & GF_TERM_NO_AUDIO)) {
+		gf_sc_remove_audio_listener(term->compositor, &avi_al.al);
+	}
+	if (avi_out) AVI_close(avi_out);
+	if (depth_avi_out) AVI_close(depth_avi_out);
+	if (avi_mx) gf_mx_del(avi_mx);
+#endif
+
+	if (sha_out) fclose(sha_out);
+	if (sha_depth_out) fclose(sha_depth_out);
+
+	if (conv_buf) {
+		gf_free(conv_buf);
+		fprintf(stderr, "Dumping done: %d frames at %g FPS\n", nb_frames, fps);
+	}
+
 	return 0;
 }

gpac-0.5.1.svn5491.tar.xz/applications/mp4client/main.c -> gpac-0.5.1.svn5619.tar.xz/applications/mp4client/main.c Changed

@@ -73,8 +73,10 @@
 #if defined(__DARWIN__) || defined(__APPLE__)
 //we keep no decoder thread because of JS_GC deadlocks between threads ...
 static u32 threading_flags = GF_TERM_NO_COMPOSITOR_THREAD | GF_TERM_NO_DECODER_THREAD;
+#define VK_MOD GF_KEY_MOD_ALT
 #else
 static u32 threading_flags = 0;
+#define VK_MOD GF_KEY_MOD_CTRL
 #endif
 static Bool no_audio = GF_FALSE;
 static Bool term_step = GF_FALSE;
@@ -119,6 +121,22 @@
 Bool right_down = GF_FALSE;
 
 void dump_frame(GF_Terminal *term, char *rad_path, u32 dump_type, u32 frameNum);
+
+enum
+{
+	DUMP_NONE = 0,
+	DUMP_AVI = 1,
+	DUMP_BMP = 2,
+	DUMP_PNG = 3,
+	DUMP_RAW = 4,
+	DUMP_SHA1 = 5,
+
+	//DuMP flags
+	DUMP_DEPTH_ONLY = 1<<16,
+	DUMP_RGB_DEPTH = 1<<17,
+	DUMP_RGB_DEPTH_SHAPE = 1<<18
+};
+
 Bool dump_file(char *the_url, char *out_url, u32 dump_mode, Double fps, u32 width, u32 height, Float scale, u32 *times, u32 nb_times);
 
 
@@ -227,6 +245,8 @@
 	 "\t-exit: automatically exits when presentation is over\n"
 	 "\t-run-for TIME: runs for TIME seconds and exits\n"
 	 "\t-service ID: auto-tune to given service ID in a multiplex\n"
+ "\t-noprog: disable progress report\n"
+ "\t-no-save: disable saving config file on exit\n"
 	 "\t-no-addon: disable automatic loading of media addons declared in source URL\n"
 	 "\t-gui: starts in GUI mode. The GUI is indicated in GPAC config, section General, by the key [StartupFile]\n"
 	 "\n"
@@ -235,6 +255,7 @@
 	 "\t-png [times]: dumps given frames to png\n"
 	 "\t-raw [times]: dumps given frames to raw\n"
 	 "\t-avi [times]: dumps given file to raw avi\n"
+			"\t-sha [times]: dumps given file to raw SHA-1 (1 hash per frame)\n"
 	 "\r-out filename: name of the output file\n"
 	 "\t-rgbds: dumps the RGBDS pixel format texture\n"
 	 "\t with -avi [times]: dumps an rgbds-format .avi\n"
@@ -532,8 +553,7 @@
 
 	switch (evt->type) {
 	case GF_EVENT_DURATION:
-		Duration = 1000;
-		Duration = (u64) (((s64) Duration) * evt->duration.duration);
+		Duration = (u64) ( 1000 * (s64) evt->duration.duration);
 		CanSeek = evt->duration.can_seek;
 		break;
 	case GF_EVENT_MESSAGE:
@@ -715,21 +735,21 @@
 			gf_term_toggle_addons(term, addon_visible);
 			break;
 		case GF_KEY_UP:
-			if (evt->key.flags & GF_KEY_MOD_CTRL && is_connected) {
+			if (evt->key.flags & VK_MOD && is_connected) {
 				playback_speed *= 2;
 				fprintf(stderr, "Playing at %g speed\n", FIX2FLT(playback_speed));
 				gf_term_set_speed(term, playback_speed);
 			}
 			break;
 		case GF_KEY_DOWN:
-			if (evt->key.flags & GF_KEY_MOD_CTRL && is_connected) {
+			if (evt->key.flags & VK_MOD && is_connected) {
 				playback_speed /= 2;
 				fprintf(stderr, "Playing at %g speed\n", FIX2FLT(playback_speed));
 				gf_term_set_speed(term, playback_speed);
 			}
 			break;
 		case GF_KEY_LEFT:
-			if (evt->key.flags & GF_KEY_MOD_CTRL && is_connected) {
+			if (evt->key.flags & VK_MOD && is_connected) {
 				playback_speed = -playback_speed;
 				fprintf(stderr, "Playing at %g speed\n", FIX2FLT(playback_speed));
 				gf_term_set_speed(term, playback_speed);
@@ -1031,6 +1051,8 @@
 #include <wincon.h>
 #endif
 
+static void progress_quiet(const void *cbck, const char *title, u64 done, u64 total) { }
+
 int main (int argc, char **argv)
 {
 	char c;
@@ -1042,10 +1064,9 @@
 	Bool logs_set = GF_FALSE;
 	Bool start_fs = GF_FALSE;
 	Bool use_rtix = GF_FALSE;
-	Bool rgbds_dump = GF_FALSE;
-	Bool rgbd_dump = GF_FALSE;
-	Bool depth_dump = GF_FALSE;
 	Bool pause_at_first = GF_FALSE;
+	Bool no_cfg_safe = GF_FALSE;
+
 	Double play_from = 0;
 #ifdef GPAC_MEMORY_TRACKING
 	Bool enable_mem_tracker = GF_FALSE;
@@ -1064,7 +1085,7 @@
 
 	memset(&user, 0, sizeof(GF_User));
 
-	dump_mode = 0;
+	dump_mode = DUMP_NONE;
 	fill_ar = visible = GF_FALSE;
 	url_arg = out_arg = the_cfg = rti_file = views = default_com = NULL;
 	nb_times = 0;
@@ -1116,7 +1137,7 @@
 
 	for (i=1; i<(u32) argc; i++) {
 		char *arg = argv[i];
-		
+
 		if (!strcmp(arg, "-rti")) {
 			rti_file = argv[i+1];
 			i++;
@@ -1166,51 +1187,54 @@
 			gf_cfg_set_key(cfg_file, "Network", "DefaultMCastInterface", argv[i+1]);
 			i++;
 		}
-		else if (!stricmp(arg, "-help")) {
-			PrintUsage();
-			return 1;
-		}
+ else if (!stricmp(arg, "-help")) {
+ PrintUsage();
+ return 1;
+ }
+ else if (!stricmp(arg, "-noprog")) {
+ gf_set_progress_callback(NULL, progress_quiet);
+ }
+ else if (!stricmp(arg, "--no-save")) {
+			no_cfg_safe=1;
+ }
+		
 
 		/*arguments only used in non-gui mode*/
 		else if (!gui_mode) {
 			if (arg[0] != '-') {
 				url_arg = arg;
-			} 
+			}
 			else if (!strcmp(arg, "-out")) {
-				out_arg = gf_strdup(argv[i+1]);
+				out_arg = argv[i+1];
+ i++;
 			}
 			else if (!stricmp(arg, "-fps")) {
 				fps = atof(argv[i+1]);
 				i++;
-			} else if (!strcmp(arg, "-avi")) {
-				if (rgbds_dump) dump_mode = 5;
-				else if (depth_dump) dump_mode = 8;
-				else if (rgbd_dump) dump_mode = 10;
-				else dump_mode=1;
+			} else if (!strcmp(arg, "-avi") || !strcmp(arg, "-sha")) {
+				dump_mode &= 0xFFFF0000;
+
+				if (!strcmp(arg, "-sha")) dump_mode |= DUMP_SHA1;
+				else dump_mode |= DUMP_AVI;
+
 				if ((url_arg || (i+2<(u32)argc)) && get_time_list(argv[i+1], times, &nb_times)) i++;
 			} else if (!strcmp(arg, "-rgbds")) { /*get dump in rgbds pixel format*/
-				rgbds_dump = 1;
-				dump_mode=6; /* rgbds texture directly*/
-				if (dump_mode==1) dump_mode = 5; /* .avi rgbds dump*/
+				dump_mode |= DUMP_RGB_DEPTH_SHAPE;
 			} else if (!strcmp(arg, "-rgbd")) { /*get dump in rgbd pixel format*/
-				rgbd_dump = 1;
-				dump_mode=9; /* rgbd texture directly*/
-				if (dump_mode==1) dump_mode = 10; /* .avi rgbds dump*/
+				dump_mode |= DUMP_RGB_DEPTH;
 			} else if (!strcmp(arg, "-depth")) {
-				depth_dump = 1;
-				if (dump_mode==2) dump_mode=7; /* grayscale .bmp depth dump*/
-				else if (dump_mode==1) dump_mode=8; /* .avi depth dump*/
-				else if (dump_mode==11)dump_mode=12;
-				else dump_mode=4; /*depth dump*/
+				dump_mode |= DUMP_DEPTH_ONLY;
 			} else if (!strcmp(arg, "-bmp")) {
-				if(depth_dump) dump_mode=7; /*grayscale depth .bmp dump*/
-				else dump_mode=2;
+				dump_mode &= 0xFFFF0000;
+				dump_mode |= DUMP_BMP;
 				if ((url_arg || (i+2<(u32)argc)) && get_time_list(argv[i+1], times, &nb_times)) i++;
 			} else if (!strcmp(arg, "-png")) {
-				dump_mode=11;
+				dump_mode &= 0xFFFF0000;
+				dump_mode |= DUMP_PNG;
 				if ((url_arg || (i+2<(u32)argc)) && get_time_list(argv[i+1], times, &nb_times)) i++;
 			} else if (!strcmp(arg, "-raw")) {
-				dump_mode = 3;
+				dump_mode &= 0xFFFF0000;
+				dump_mode |= DUMP_RAW;
 				if ((url_arg || (i+2<(u32)argc)) && get_time_list(argv[i+1], times, &nb_times)) i++;
 			} else if (!stricmp(arg, "-scale")) {
 				sscanf(argv[i+1], "%f", &scale);
@@ -1262,6 +1286,8 @@
 			else if (!stricmp(arg, "-service")) {
 				initial_service_id = atoi(argv[i+1]);
 				i++;
+			} else if (!strcmp(arg, "-mem-track")) {
+
 			} else {
 				fprintf(stderr, "Unrecognized option %s - skipping\n", arg);
 			}
@@ -1289,6 +1315,10 @@
 		}
 	}
 
+#if defined(__DARWIN__) || defined(__APPLE__)
+ carbon_init();
+#endif
+ 
 
 	if (dump_mode) rti_file = NULL;
 
@@ -1307,8 +1337,10 @@
 
 	/*setup dumping options*/
 	if (dump_mode) {
-		user.init_flags |= GF_TERM_NO_AUDIO | GF_TERM_NO_DECODER_THREAD | GF_TERM_NO_COMPOSITOR_THREAD | GF_TERM_NO_REGULATION /*| GF_TERM_INIT_HIDE*/;
+		user.init_flags |= GF_TERM_NO_DECODER_THREAD | GF_TERM_NO_COMPOSITOR_THREAD | GF_TERM_NO_REGULATION /*| GF_TERM_INIT_HIDE*/;
 		if (visible || dump_mode==8) user.init_flags |= GF_TERM_INIT_HIDE;
+		gf_cfg_set_key(cfg_file, "Audio", "DriverName", "Raw Audio Output");
+		no_cfg_safe=GF_TRUE;
 	} else {
 		init_w = forced_width;
 		init_h = forced_height;
@@ -1365,10 +1397,6 @@
 	}
 	fprintf(stderr, "Terminal Loaded in %d ms\n", gf_sys_clock()-i);
 
-#if defined(__DARWIN__) || defined(__APPLE__)
- carbon_init();
-#endif
- 
 	if (bench_mode) {
 		display_rti = 2;
 		gf_term_set_option(term, GF_OPT_VIDEO_BENCH, (bench_mode==3) ? 2 : 1);
@@ -1415,9 +1443,9 @@
 		}
 		dump_file(url_arg, out_arg, dump_mode, fps, forced_width, forced_height, scale, times, nb_times);
 		Run = 0;
-	} 
+	}
 	else if (views) {
-	} 
+	}
 	/*connect if requested*/
 	else if (!gui_mode && url_arg) {
 		char *ext;
@@ -1483,8 +1511,8 @@
 
 
 	while (Run) {
-		
- /*we don't want getchar to block*/
+
+		/*we don't want getchar to block*/
 		if (gui_mode || !gf_prompt_has_input()) {
 			if (reload) {
 				reload = 0;
@@ -1536,7 +1564,13 @@
 force_input:
 		switch (c) {
 		case 'q':
-			Run = 0;
+			{
+				GF_Event evt;
+				memset(&evt, 0, sizeof(GF_Event));
+				evt.type = GF_EVENT_QUIT;
+				gf_term_send_event(term, &evt);
+			}
+//			Run = 0;
 			break;
 		case 'X':
 			exit(0);
@@ -2053,6 +2087,12 @@
 		PrintAVInfo(GF_TRUE);
 	}
 
+	/*FIXME: we have an issue in cleaning up after playing in bench mode and run-for 0 (buildbot tests). We for now disable error checks after run-for is done*/
+	if (simulation_time_in_ms) {
+		gf_log_set_strict_error(0);
+	}
+
+
 	i = gf_sys_clock();
 	gf_term_disconnect(term);
 	if (rti_file) UpdateRTInfo("Disconnected\n");
@@ -2061,23 +2101,36 @@
 	if (playlist) fclose(playlist);
 
 #if defined(__DARWIN__) || defined(__APPLE__)
- carbon_uninit();
+	carbon_uninit();
 #endif
-	
- gf_term_del(term);
+
+	gf_term_del(term);
 	fprintf(stderr, "done (in %d ms) - ran for %d ms\n", gf_sys_clock() - i, gf_sys_clock());
 
 	fprintf(stderr, "GPAC cleanup ...\n");
 	gf_modules_del(user.modules);
+
+	if (no_cfg_safe)
+		gf_cfg_discard_changes(cfg_file);
+
 	gf_cfg_del(cfg_file);
 
 	gf_sys_close();
+
 	if (rti_logs) fclose(rti_logs);
 	if (logfile) fclose(logfile);
 
 	if (gui_mode) {
 		hide_shell(2);
 	}
+
+#ifdef GPAC_MEMORY_TRACKING
+	if (enable_mem_tracker && (gf_memory_size() != 0)) {
+ gf_memory_print();
+		return 2;
+	}
+#endif
+
 	return 0;
 }

gpac-0.5.1.svn5491.tar.xz/applications/osmo4_android/jni/wrapper.cpp -> gpac-0.5.1.svn5619.tar.xz/applications/osmo4_android/jni/wrapper.cpp Changed

gpac-0.5.1.svn5491.tar.xz/applications/osmo4_android/src/com/gpac/Osmo4/GPACInstance.java -> gpac-0.5.1.svn5619.tar.xz/applications/osmo4_android/src/com/gpac/Osmo4/GPACInstance.java Changed

@@ -1,7 +1,7 @@
 /**
 * $URL: svn://svn.code.sf.net/p/gpac/code/trunk/gpac/applications/osmo4_android/src/com/gpac/Osmo4/GPACInstance.java $
 *
- * $LastChangedBy: jeanlf $ - $LastChangedDate: 2013-03-15 00:54:01 +0800 (五, 2013-03-15) $
+ * $LastChangedBy: jeanlf $ - $LastChangedDate: 2014-12-11 22:23:39 +0800 (四, 2014-12-11) $
 */
 package com.gpac.Osmo4;
 
@@ -16,7 +16,7 @@
 import android.view.MotionEvent;
 
 /**
- * @version $Revision: 4366 $
+ * @version $Revision: 5552 $
 * 
 */
 public class GPACInstance implements GPACInstanceInterface {
@@ -59,8 +59,9 @@
 "jpegdroid", "javaenv", //$NON-NLS-1$ //$NON-NLS-2$ 
 "mad", "editline", "ft2", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 "js_osmo", "openjpeg", "png", "z", //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$
- "stlport_shared", "stdc++", "ffmpeg", "faad", "gpac", //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ "stlport_shared", "stdc++", "faad", "gpac", //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
 "gm_droid_cam", "gm_droid_mpegv", //$NON-NLS-1$ //$NON-NLS-2$
+								 "avutil", "swscale", "swresample", "avcodec", "avformat", "avfilter",
 "gpacWrapper" }; // //$NON-NLS-1$ //$NON-NLS-2$
 HashMap<String, Throwable> exceptions = new HashMap<String, Throwable>();
 for (String s : toLoad) {
@@ -86,7 +87,7 @@
 if (!exceptions.isEmpty()) {
 try {
 PrintStream out = new PrintStream(config.getGpacConfigDirectory() + "debug_libs.txt", "UTF-8"); //$NON-NLS-1$//$NON-NLS-2$
- out.println("$Revision: 4366 $"); //$NON-NLS-1$
+ out.println("$Revision: 5552 $"); //$NON-NLS-1$
 out.println(new Date());
 out.println("\n*** Configuration\n"); //$NON-NLS-1$
 out.println(config.getConfigAsText());

gpac-0.5.1.svn5491.tar.xz/applications/osmo4_android/src/com/gpac/Osmo4/Osmo4.java -> gpac-0.5.1.svn5619.tar.xz/applications/osmo4_android/src/com/gpac/Osmo4/Osmo4.java Changed

@@ -2,7 +2,7 @@
  *  Osmo on Android
  *  Aug/2010
  *  NGO Van Luyen
- * $Id: Osmo4.java 4366 2013-03-14 16:54:01Z jeanlf $
+ * $Id: Osmo4.java 5596 2015-01-09 10:00:55Z jeanlf $
  *
  */
 package com.gpac.Osmo4;
@@ -78,7 +78,7 @@
 /**
  * The main Osmo4 activity, used to launch everything
  * 
- * @version $Revision: 4366 $
+ * @version $Revision: 5596 $
  * 
  */
 public class Osmo4 extends Activity implements GpacCallback {
@@ -732,7 +732,7 @@
     // long start = System.currentTimeMillis();
     // byte buffer[] = new byte[1024];
     // int[] ids = getAllRawResources();
-    //        String currentRevision = "$Revision: 4366 $"; //$NON-NLS-1$
+    //        String currentRevision = "$Revision: 5596 $"; //$NON-NLS-1$
     // File revisionFile = gpacConfig.getGpacLastRevFile();
     // boolean fastStartup = false;
     // // We check if we already copied all the modules once without error...
@@ -894,7 +894,8 @@
     private void displayPopup(final CharSequence message, final CharSequence title) {
         final String fullMsg = getResources().getString(R.string.displayPopupFormat, title, message);
         synchronized (this) {
-            if (fullMsg.equals(lastDisplayedMessage))
+			// In case of an error message, always popup it
+            if (fullMsg.equals(lastDisplayedMessage) && !title.equals("Error"))
                 return;
             lastDisplayedMessage = fullMsg;
         }
@@ -956,6 +957,8 @@
     @Override
     public void onLog(int level, int module, String message) {
         logger.onLog(level, module, message);
+		if (level == Log.ERROR)
+			displayPopup(message, "Error");
     }
 
     /**
@@ -1014,7 +1017,7 @@
                 sb.append("Description: "); //$NON-NLS-1$
                 sb.append(e.getLocalizedMessage());
                 sb.append('\n');
-                sb.append("Revision: $Revision: 4366 $"); //$NON-NLS-1$
+                sb.append("Revision: $Revision: 5596 $"); //$NON-NLS-1$
                 sb.append("\nConfiguration information :\n") //$NON-NLS-1$
                   .append(gpacConfig.getConfigAsText());
                 builder.setMessage(sb.toString());

gpac-0.5.1.svn5491.tar.xz/applications/osmo4_ios/Resources/Default-568h@2x.png -> gpac-0.5.1.svn5619.tar.xz/applications/osmo4_ios/Resources/Default-568h@2x.png Changed

gpac-0.5.1.svn5491.tar.xz/applications/osmo4_ios/Resources/icon.png -> gpac-0.5.1.svn5619.tar.xz/applications/osmo4_ios/Resources/icon.png Changed

gpac-0.5.1.svn5491.tar.xz/applications/osmo4_ios/Resources/icon_ipad.png -> gpac-0.5.1.svn5619.tar.xz/applications/osmo4_ios/Resources/icon_ipad.png Changed

gpac-0.5.1.svn5491.tar.xz/applications/osmo4_ios/Resources/icon_ipad_retina.png -> gpac-0.5.1.svn5619.tar.xz/applications/osmo4_ios/Resources/icon_ipad_retina.png Changed

gpac-0.5.1.svn5491.tar.xz/applications/osmo4_ios/Resources/icon_retina.png -> gpac-0.5.1.svn5619.tar.xz/applications/osmo4_ios/Resources/icon_retina.png Changed

gpac-0.5.1.svn5491.tar.xz/applications/osmo4_ios/Resources/osmo.icns -> gpac-0.5.1.svn5619.tar.xz/applications/osmo4_ios/Resources/osmo.icns Changed

gpac-0.5.1.svn5491.tar.xz/applications/osmo4_ios/main.c -> gpac-0.5.1.svn5619.tar.xz/applications/osmo4_ios/main.c Changed

@@ -30,42 +30,15 @@
 #include <gpac/options.h>
 #include <gpac/modules/service.h>
 
-
-#ifndef WIN32
 #include <pwd.h>
 #include <unistd.h>
 
-#else
-#include <windows.h> /*for GetModuleFileName*/
-#include <direct.h> /*for _mkdir*/
-#include <shlobj.h> /*for getting user-dir*/
-#ifndef SHGFP_TYPE_CURRENT
-#define SHGFP_TYPE_CURRENT 0 /*needed for MinGW*/
-#endif
-
-#ifdef _MSC_VER
-/*get rid of console*/
-#if 0
-#pragma comment(linker,"/SUBSYSTEM:WINDOWS")
-#pragma comment(linker,"/ENTRY:main")
-#else
-#pragma comment(linker,"/SUBSYSTEM:CONSOLE")
-#endif
-
-#endif // _MSC_VER
-
-#endif	//WIN32
-
 
 static Bool restart = 0;
-#if defined(__DARWIN__) || defined(__APPLE__)
 static Bool not_threaded = 1;
-#else
-static Bool not_threaded = 0;
-#endif
+
 static Bool no_audio = 0;
 static Bool no_regulation = 0;
-static Bool bench_mode = 0;
 Bool is_connected = 0;
 Bool startup_file = 0;
 GF_User user;
@@ -73,16 +46,11 @@
 u64 Duration;
 GF_Err last_error = GF_OK;
 
-static Fixed bench_speed = FLT2FIX(20);
-
-static Bool request_next_playlist_item = 0;
-
 static GF_Config *cfg_file;
 static Bool display_rti = 0;
 static Bool Run;
 static Bool CanSeek = 0;
 static char the_url[GF_MAX_PATH];
-static char pl_path[GF_MAX_PATH];
 static Bool no_mime_check = 1;
 static Bool be_quiet = 0;
 static u32 log_time_start = 0;
@@ -97,95 +65,6 @@
 u32 last_x, last_y;
 Bool right_down = 0;
 
-void dump_frame(GF_Terminal *term, char *rad_path, u32 dump_type, u32 frameNum);
-Bool dump_file(char *the_url, u32 dump_mode, Double fps, u32 width, u32 height, Float scale, u32 *times, u32 nb_times);
-
-void PrintUsage()
-{
-	fprintf(stdout, "Usage Osmo4iOS [options] [filename]\n"
-	 "\t-c fileName: user-defined configuration file\n"
-	 "\t-rti fileName: logs run-time info (FPS, CPU, Mem usage) to file\n"
-	 "\t-rtix fileName: same as -rti but driven by GPAC logs\n"
-	 "\t-quiet: removes script message, buffering and downloading status\n"
-	 "\t-opt	option: Overrides an option in the configuration file. String format is section:key=value\n"
-	 "\t-log-file file: sets output log file.\n"
-	 "\t-log-level lev: sets log level. Possible values are:\n"
-	 "\t \"error\" : logs only error messages\n"
-	 "\t \"warning\" : logs error+warning messages\n"
-	 "\t \"info\" : logs error+warning+info messages\n"
-	 "\t \"debug\" : logs all messages\n"
-	 "\n"
-	 "\t-log-tools lt: sets tool(s) to log. List of \':\'-separated values:\n"
-	 "\t \"core\" : libgpac core\n"
-	 "\t \"coding\" : bitstream formats (audio, video, scene)\n"
-	 "\t \"container\" : container formats (ISO File, MPEG-2 TS, AVI, ...)\n"
-	 "\t \"network\" : network data exept RTP trafic\n"
-	 "\t \"rtp\" : rtp trafic\n"
-	 "\t \"author\" : authoring tools (hint, import, export)\n"
-	 "\t \"sync\" : terminal sync layer\n"
-	 "\t \"codec\" : terminal codec messages\n"
-	 "\t \"parser\" : scene parsers (svg, xmt, bt) and other\n"
-	 "\t \"media\" : terminal media object management\n"
-	 "\t \"scene\" : scene graph and scene manager\n"
-	 "\t \"script\" : scripting engine messages\n"
-	 "\t \"interact\" : interaction engine (events, scripts, etc)\n"
-	 "\t \"compose\" : composition engine (2D, 3D, etc)\n"
-	 "\t \"service\" : network service management\n"
-	 "\t \"mmio\" : Audio/Video HW I/O management\n"
-	 "\t \"none\" : no tool logged\n"
-	 "\t \"all\" : all tools logged\n"
-	 "\n"
-	 "\t-size WxH: specifies visual size (default: scene size)\n"
-	 "\t-scale s: scales the visual size (default: 1)\n"
-#if defined(__DARWIN__) || defined(__APPLE__)
-	 "\t-thread: enables thread usage for terminal and compositor \n"
-#else
-	 "\t-no-thread: disables thread usage (except for audio)\n"
-#endif
-	 "\t-no-audio:	 disables audio \n"
-	 "\t-no-wnd: uses windowless mode (Win32 only)\n"
-	 "\t-align vh: specifies v and h alignment for windowless mode\n"
-	 " possible v values: t(op), m(iddle), b(ottom)\n"
-	 " possible h values: l(eft), m(iddle), r(ight)\n"
-	 " default alignment is top-left\n"
-	 " default alignment is top-left\n"
-	 "\t-pause: pauses at first frame\n"
-	 "\n"
-	 "Dumper Options:\n"
-	 "\t-bmp [times]: dumps given frames to bmp\n"
-	 "\t-raw [times]: dumps given frames to bmp\n"
-	 "\t-avi [times]: dumps given file to raw avi\n"
-	 "\t-rgbds: dumps the RGBDS pixel format texture\n"
-	 " with -avi [times]: dumps an rgbds-format .avi\n"
-	 "\t-rgbd: dumps the RGBD pixel format texture\n"
-	 "					with -avi [times]: dumps an rgbd-format .avi\n"
-	 "\t-depth: dumps depthmap (z-buffer) frames\n"
-	 " with -avi [times]: dumps depthmap in grayscale .avi\n"
-	 " with -bmp: dumps depthmap in grayscale .bmp\n"
-	 "\t-fps FPS: specifies frame rate for AVI dumping (default: 25.0)\n"
-	 "\t-2d: uses 2D compositor\n"
-	 "\t-3d: uses 3D compositor\n"
-	 "\t-fill: uses fill aspect ratio for dumping (default: none)\n"
-	 "\t-show: show window while dumping (default: no)\n"
-	 "MP4Client - GPAC command line player and dumper - version %s\n"
-	 "GPAC Written by Jean Le Feuvre (c) 2001-2005 - ENST (c) 2005-200X\n",
-
-	 GPAC_FULL_VERSION
-	 );
-}
-
-
-static void PrintTime(u64 time)
-{
-	u32 ms, h, m, s;
-	h = (u32) (time / 1000 / 3600);
-	m = (u32) (time / 1000 / 60 - h*60);
-	s = (u32) (time / 1000 - h*3600 - m*60);
-	ms = (u32) (time - (h*3600 + m*60 + s) * 1000);
-	fprintf(stdout, "%02d:%02d:%02d.%02d", h, m, s, ms);
-}
-
-
 static u32 rti_update_time_ms = 200;
 static FILE *rti_logs = NULL;
 static u64 memory_at_gpac_startup = 0;
@@ -202,20 +81,6 @@
 	if (display_rti) {
 		if (!rti.process_memory) rti.process_memory = (u32) (memory_at_gpac_startup-rti.physical_memory_avail);
 		if (!rti.gpac_memory) rti.gpac_memory = (u32) (memory_at_gpac_startup-rti.physical_memory_avail);
-
-		if (display_rti==2) {
-			fprintf(stdout, "FPS %02.2f - CPU %02d (%02d) - Mem %d kB\r",
-			 gf_term_get_framerate(term, 0), rti.total_cpu_usage, rti.process_cpu_usage, (u32) (rti.gpac_memory / 1024) );
-		} else {
-			char szMsg[1024];
-			GF_Event evt;
-
-			sprintf(szMsg, "FPS %02.2f - CPU %02d (%02d) - Mem %d kB",
-			 gf_term_get_framerate(term, 0), rti.total_cpu_usage, rti.process_cpu_usage, (u32) (rti.gpac_memory / 1024) );
-			evt.type = GF_EVENT_SET_CAPTION;
-			evt.caption.caption = szMsg;
-			gf_term_user_event(term, &evt);
-		}
 	}
 	if (rti_logs) {
 		fprintf(rti_logs, "% 8d\t% 8d\t% 8d\t% 4d\t% 8d\t%s",
@@ -289,16 +154,6 @@
 }
 #endif
 
-void switch_bench()
-{
-	if (is_connected) {
-		bench_mode = !bench_mode;
-		display_rti = !display_rti;
-		ResetCaption();
-		gf_term_set_speed(term, bench_mode ? bench_speed : FIX_ONE);
-	}
-}
-
 Bool GPAC_EventProc(void *ptr, GF_Event *evt)
 {
 	if (!term) return 0;
@@ -322,133 +177,19 @@
 		if (!evt->message.message) return 0;
 		if (evt->message.error) {
 			if (!is_connected) last_error = evt->message.error;
-			fprintf(stderr, "%s (%s): %s\n", evt->message.message, servName, gf_error_to_string(evt->message.error));
-		} else if (!be_quiet)
-			fprintf(stderr, "(%s) %s\r", servName, evt->message.message);
-	}
-	break;
-	case GF_EVENT_PROGRESS:
-	{
-		char *szTitle = "";
-		if (evt->progress.progress_type==0) szTitle = "Buffer ";
-		else if (evt->progress.progress_type==1) szTitle = "Download ";
-		else if (evt->progress.progress_type==2) szTitle = "Import ";
-		gf_set_progress(szTitle, evt->progress.done, evt->progress.total);
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s (%s): %s\n", evt->message.message, servName, gf_error_to_string(evt->message.error) ));
+		} else if (!be_quiet) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("(%s) %s\r", servName, evt->message.message ));
+		}
 	}
 	break;
 
-
-	case GF_EVENT_DBLCLICK:
-		gf_term_set_option(term, GF_OPT_FULLSCREEN, !gf_term_get_option(term, GF_OPT_FULLSCREEN));
-		return 0;
-
-	case GF_EVENT_MOUSEDOWN:
-		if (evt->mouse.button==GF_MOUSE_RIGHT) {
-			right_down = 1;
-			last_x = evt->mouse.x;
-			last_y = evt->mouse.y;
-		}
-		return 0;
-	case GF_EVENT_MOUSEUP:
-		if (evt->mouse.button==GF_MOUSE_RIGHT) {
-			right_down = 0;
-			last_x = evt->mouse.x;
-			last_y = evt->mouse.y;
-		}
-		return 0;
-	case GF_EVENT_MOUSEMOVE:
-		if (right_down && (user.init_flags & GF_TERM_WINDOWLESS) ) {
-			GF_Event move;
-			move.move.x = evt->mouse.x - last_x;
-			move.move.y = last_y-evt->mouse.y;
-			move.type = GF_EVENT_MOVE;
-			move.move.relative = 1;
-			gf_term_user_event(term, &move);
-		}
-		return 0;
-
-	case GF_EVENT_KEYUP:
-		switch (evt->key.key_code) {
-		case GF_KEY_SPACE:
-			if (evt->key.flags & GF_KEY_MOD_CTRL) switch_bench();
-			break;
-		}
-		break;
-	case GF_EVENT_KEYDOWN:
-		gf_term_process_shortcut(term, evt);
-		switch (evt->key.key_code) {
-		case GF_KEY_SPACE:
-			if (evt->key.flags & GF_KEY_MOD_CTRL) {
-				/*ignore key repeat*/
-				if (!bench_mode) switch_bench();
-			}
-			break;
-		case GF_KEY_PAGEDOWN:
-		case GF_KEY_MEDIANEXTTRACK:
-			request_next_playlist_item = 1;
-			break;
-		case GF_KEY_MEDIAPREVIOUSTRACK:
-			break;
-		case GF_KEY_ESCAPE:
-			gf_term_set_option(term, GF_OPT_FULLSCREEN, !gf_term_get_option(term, GF_OPT_FULLSCREEN));
-			break;
-		case GF_KEY_F:
-			if (evt->key.flags & GF_KEY_MOD_CTRL) fprintf(stderr, "Rendering rate: %f FPS\n", gf_term_get_framerate(term, 0));
-			break;
-		case GF_KEY_T:
-			if (evt->key.flags & GF_KEY_MOD_CTRL) fprintf(stderr, "Scene Time: %f \n", gf_term_get_time_in_ms(term)/1000.0);
-			break;
-		case GF_KEY_D:
-			if (evt->key.flags & GF_KEY_MOD_CTRL) gf_term_set_option(term, GF_OPT_DRAW_MODE, (gf_term_get_option(term, GF_OPT_DRAW_MODE)==GF_DRAW_MODE_DEFER) ? GF_DRAW_MODE_IMMEDIATE : GF_DRAW_MODE_DEFER );
-			break;
-		case GF_KEY_4:
-			if (evt->key.flags & GF_KEY_MOD_CTRL)
-				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3);
-			break;
-		case GF_KEY_5:
-			if (evt->key.flags & GF_KEY_MOD_CTRL)
-				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9);
-			break;
-		case GF_KEY_6:
-			if (evt->key.flags & GF_KEY_MOD_CTRL)
-				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
-			break;
-		case GF_KEY_7:
-			if (evt->key.flags & GF_KEY_MOD_CTRL)
-				gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
-			break;
-		case GF_KEY_P:
-			if (evt->key.flags & GF_KEY_MOD_CTRL && is_connected) {
-				Bool is_pause = gf_term_get_option(term, GF_OPT_PLAY_STATE);
-				fprintf(stderr, "[Status: %s]\n", is_pause ? "Playing" : "Paused");
-				gf_term_set_option(term, GF_OPT_PLAY_STATE, (gf_term_get_option(term, GF_OPT_PLAY_STATE)==GF_STATE_PAUSED) ? GF_STATE_PLAYING : GF_STATE_PAUSED);
-			}
-			break;
-		case GF_KEY_S:
-			if ((evt->key.flags & GF_KEY_MOD_CTRL) && is_connected) {
-				gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
-				fprintf(stderr, "Step time: ");
-				PrintTime(gf_term_get_time_in_ms(term));
-				fprintf(stderr, "\n");
-			}
-			break;
-		case GF_KEY_H:
-			if ((evt->key.flags & GF_KEY_MOD_CTRL) && is_connected)
-				gf_term_switch_quality(term, 1);
-			break;
-		case GF_KEY_L:
-			if ((evt->key.flags & GF_KEY_MOD_CTRL) && is_connected)
-				gf_term_switch_quality(term, 0);
-			break;
-		}
-		break;
-
 	case GF_EVENT_CONNECT:
 		if (evt->connect.is_connected) {
 			is_connected = 1;
-			fprintf(stderr, "Service Connected\n");
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Service Connected\n"));
 		} else if (is_connected) {
-			fprintf(stderr, "Service %s\n", is_connected ? "Disconnected" : "Connection Failed");
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Service %s\n", is_connected ? "Disconnected" : "Connection Failed"));
 			is_connected = 0;
 			Duration = 0;
 		}
@@ -457,32 +198,6 @@
 		}
 		ResetCaption();
 		break;
-	case GF_EVENT_EOS:
-		restart = 1;
-		break;
-	case GF_EVENT_SIZE:
-		if (user.init_flags & GF_TERM_WINDOWLESS) {
-			GF_Event move;
-			move.type = GF_EVENT_MOVE;
-			move.move.align_x = align_mode & 0xFF;
-			move.move.align_y = (align_mode>>8) & 0xFF;
-			move.move.relative = 2;
-			gf_term_user_event(term, &move);
-		}
-		break;
-	case GF_EVENT_SCENE_SIZE:
-		if (forced_width && forced_height) {
-			GF_Event size;
-			size.type = GF_EVENT_SIZE;
-			size.size.width = forced_width;
-			size.size.height = forced_height;
-			gf_term_user_event(term, &size);
-		}
-		break;
-
-	case GF_EVENT_METADATA:
-		ResetCaption();
-		break;
 
 	case GF_EVENT_QUIT:
 		Run = 0;
@@ -490,168 +205,22 @@
 	case GF_EVENT_DISCONNECT:
 		gf_term_disconnect(term);
 		break;
-	case GF_EVENT_MIGRATE:
-	{
-	}
-	break;
-	case GF_EVENT_NAVIGATE_INFO:
-		if (evt->navigate.to_url) fprintf(stderr, "Go to URL: \"%s\"\r", evt->navigate.to_url);
-		break;
+
 	case GF_EVENT_NAVIGATE:
 		if (gf_term_is_supported_url(term, evt->navigate.to_url, 1, no_mime_check)) {
 			strcpy(the_url, evt->navigate.to_url);
-			fprintf(stderr, "Navigating to URL %s\n", the_url);
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Navigating to URL %s\n", the_url));
 			gf_term_navigate_to(term, evt->navigate.to_url);
 			return 1;
 		} else {
-			fprintf(stderr, "Navigation destination not supported\nGo to URL: %s\n", evt->navigate.to_url);
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Navigation destination not supported\nGo to URL: %s\n", evt->navigate.to_url ));
 		}
 		break;
-	case GF_EVENT_SET_CAPTION:
-		gf_term_user_event(term, evt);
-		break;
-	case GF_EVENT_AUTHORIZATION:
-		if (!strlen(evt->auth.user)) {
-			fprintf(stderr, "Authorization required for site %s\n", evt->auth.site_url);
-			fprintf(stderr, "login: ");
-			scanf("%s", evt->auth.user);
-		} else {
-			fprintf(stderr, "Authorization required for %s@%s\n", evt->auth.user, evt->auth.site_url);
-		}
-		fprintf(stderr, "password: ");
-		gf_prompt_set_echo_off(1);
-		scanf("%s", evt->auth.password);
-		gf_prompt_set_echo_off(0);
-		return 1;
-	case GF_EVENT_SYS_COLORS:
-#ifdef WIN32
-		evt->sys_cols.sys_colors[0] = get_sys_col(COLOR_ACTIVEBORDER);
-		evt->sys_cols.sys_colors[1] = get_sys_col(COLOR_ACTIVECAPTION);
-		evt->sys_cols.sys_colors[2] = get_sys_col(COLOR_APPWORKSPACE);
-		evt->sys_cols.sys_colors[3] = get_sys_col(COLOR_BACKGROUND);
-		evt->sys_cols.sys_colors[4] = get_sys_col(COLOR_BTNFACE);
-		evt->sys_cols.sys_colors[5] = get_sys_col(COLOR_BTNHIGHLIGHT);
-		evt->sys_cols.sys_colors[6] = get_sys_col(COLOR_BTNSHADOW);
-		evt->sys_cols.sys_colors[7] = get_sys_col(COLOR_BTNTEXT);
-		evt->sys_cols.sys_colors[8] = get_sys_col(COLOR_CAPTIONTEXT);
-		evt->sys_cols.sys_colors[9] = get_sys_col(COLOR_GRAYTEXT);
-		evt->sys_cols.sys_colors[10] = get_sys_col(COLOR_HIGHLIGHT);
-		evt->sys_cols.sys_colors[11] = get_sys_col(COLOR_HIGHLIGHTTEXT);
-		evt->sys_cols.sys_colors[12] = get_sys_col(COLOR_INACTIVEBORDER);
-		evt->sys_cols.sys_colors[13] = get_sys_col(COLOR_INACTIVECAPTION);
-		evt->sys_cols.sys_colors[14] = get_sys_col(COLOR_INACTIVECAPTIONTEXT);
-		evt->sys_cols.sys_colors[15] = get_sys_col(COLOR_INFOBK);
-		evt->sys_cols.sys_colors[16] = get_sys_col(COLOR_INFOTEXT);
-		evt->sys_cols.sys_colors[17] = get_sys_col(COLOR_MENU);
-		evt->sys_cols.sys_colors[18] = get_sys_col(COLOR_MENUTEXT);
-		evt->sys_cols.sys_colors[19] = get_sys_col(COLOR_SCROLLBAR);
-		evt->sys_cols.sys_colors[20] = get_sys_col(COLOR_3DDKSHADOW);
-		evt->sys_cols.sys_colors[21] = get_sys_col(COLOR_3DFACE);
-		evt->sys_cols.sys_colors[22] = get_sys_col(COLOR_3DHIGHLIGHT);
-		evt->sys_cols.sys_colors[23] = get_sys_col(COLOR_3DLIGHT);
-		evt->sys_cols.sys_colors[24] = get_sys_col(COLOR_3DSHADOW);
-		evt->sys_cols.sys_colors[25] = get_sys_col(COLOR_WINDOW);
-		evt->sys_cols.sys_colors[26] = get_sys_col(COLOR_WINDOWFRAME);
-		evt->sys_cols.sys_colors[27] = get_sys_col(COLOR_WINDOWTEXT);
-		return 1;
-#else
-		memset(evt->sys_cols.sys_colors, 0, sizeof(u32)*28);
-		return 1;
-#endif
-		break;
 	}
 	return 0;
 }
 
 
-void list_modules(GF_ModuleManager *modules)
-{
-	u32 i;
-	fprintf(stderr, "\rAvailable modules:\n");
-	for (i=0; i<gf_modules_get_count(modules); i++) {
-		char *str = (char *) gf_modules_get_file_name(modules, i);
-		if (str) fprintf(stderr, "\t%s\n", str);
-	}
-	fprintf(stderr, "\n");
-}
-
-
-void set_navigation()
-{
-	GF_Err e;
-	char navstr[20], nav;
-	u32 type = gf_term_get_option(term, GF_OPT_NAVIGATION_TYPE);
-	e = GF_OK;
-	if (!type) {
-		fprintf(stdout, "Content/compositor doesn't allow user-selectable navigation\n");
-	} else if (type==1) {
-		fprintf(stdout, "Select Navigation (\'N\'one, \'E\'xamine, \'S\'lide): ");
-		scanf("%s", navstr);
-		nav = navstr[0];
-		if (nav=='N') e = gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_NONE);
-		else if (nav=='E') e = gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_EXAMINE);
-		else if (nav=='S') e = gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_SLIDE);
-		else fprintf(stdout, "Unknown selector \'%c\' - only \'N\',\'E\',\'S\' allowed\n", nav);
-	} else if (type==2) {
-		fprintf(stdout, "Select Navigation (\'N\'one, \'W\'alk, \'F\'ly, \'E\'xamine, \'P\'an, \'S\'lide, \'G\'ame, \'V\'R, \'O\'rbit): ");
-		scanf("%s", navstr);
-		nav = navstr[0];
-		if (nav=='N') e = gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_NONE);
-		else if (nav=='W') e = gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_WALK);
-		else if (nav=='F') e = gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_FLY);
-		else if (nav=='E') e = gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_EXAMINE);
-		else if (nav=='P') e = gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_PAN);
-		else if (nav=='S') e = gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_SLIDE);
-		else if (nav=='G') e = gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_GAME);
-		else if (nav=='O') e = gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_ORBIT);
-		else if (nav=='V') e = gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_VR);
-		else fprintf(stdout, "Unknown selector %c - only \'N\',\'W\',\'F\',\'E\',\'P\',\'S\',\'G\', \'V\', \'O\' allowed\n", nav);
-	}
-	if (e) fprintf(stdout, "Error setting mode: %s\n", gf_error_to_string(e));
-}
-
-
-static Bool get_time_list(char *arg, u32 *times, u32 *nb_times)
-{
-	char *str;
-	Float var;
-	Double sec;
-	u32 h, m, s, ms, f, fps;
-	if (!arg || (arg[0]=='-') || !isdigit(arg[0])) return 0;
-
-	/*SMPTE time code*/
-	if (strchr(arg, ':') && strchr(arg, ';') && strchr(arg, '/')) {
-		if (sscanf(arg, "%02d:%02d:%02d;%02d/%02d", &h, &m, &s, &f, &fps)==5) {
-			sec = 0;
-			if (fps) sec = ((Double)f) / fps;
-			sec += 3600*h + 60*m + s;
-			times[*nb_times] = (u32) (1000*sec);
-			(*nb_times) ++;
-			return 1;
-		}
-	}
-	while (arg) {
-		str = strchr(arg, '-');
-		if (str) str[0] = 0;
-		/*HH:MM:SS:MS time code*/
-		if (strchr(arg, ':') && (sscanf(arg, "%02d:%02d:%02d:%02d", &h, &m, &s, &ms)==4)) {
-			sec = ms;
-			sec /= 1000;
-			sec += 3600*h + 60*m + s;
-			times[*nb_times] = (u32) (1000*sec);
-			(*nb_times) ++;
-		} else if (sscanf(arg, "%f", &var)==1) {
-			sec = atof(arg);
-			times[*nb_times] = (u32) (1000*sec);
-			(*nb_times) ++;
-		}
-		if (!str) break;
-		str[0] = '-';
-		arg = str+1;
-	}
-	return 1;
-}
-
 static void on_gpac_log(void *cbk, u32 ll, u32 lm, const char *fmt, va_list list)
 {
 	FILE *logs = cbk;
@@ -696,172 +265,38 @@
 int main (int argc, char *argv[])
 #endif
 {
-	char c;
 	const char *str;
-	u32 i, times[100], nb_times, dump_mode;
+	u32 i;
 	u32 simulation_time = 0;
 	Bool auto_exit = 0;
-	Bool start_fs = 1;
 	Bool use_rtix = 0;
-	Bool rgbds_dump = 0;
-	Bool rgbd_dump = 0;
-	Bool depth_dump = 0;
-	Bool pause_at_first = 0;
 	Bool enable_mem_tracker = 0;
-	Double fps = 25.0;
 	Bool ret, fill_ar, visible;
 	char *url_arg, *the_cfg, *rti_file;
 	GF_SystemRTInfo rti;
-	FILE *playlist = NULL;
 	FILE *logfile = NULL;
-	Float scale = 1;
 
 	/*by default use current dir*/
 	strcpy(the_url, ".");
 
 	memset(&user, 0, sizeof(GF_User));
 
-	dump_mode = 0;
 	fill_ar = visible = 0;
 	url_arg = the_cfg = rti_file = NULL;
-	nb_times = 0;
-	times[0] = 0;
-
-	/*first locate config file if specified*/
-	for (i=1; i<(u32) argc; i++) {
-		char *arg = argv[i];
-		if (!strcmp(arg, "-c") || !strcmp(arg, "-cfg")) {
-			the_cfg = argv[i+1];
-			i++;
-		}
-		else if (!strcmp(arg, "-mem-track")) enable_mem_tracker = 1;
-	}
 
 	gf_sys_init(enable_mem_tracker);
 
 	cfg_file = gf_cfg_init(the_cfg, NULL);
 	if (!cfg_file) {
-		fprintf(stdout, "Error: Configuration File \"GPAC.cfg\" not found\n");
+		fprintf(stderr, "Error: Configuration File \"GPAC.cfg\" not found\n");
 		if (logfile) fclose(logfile);
 		return 1;
 	}
 
 	gf_log_set_tools_levels( gf_cfg_get_key(cfg_file, "General", "Logs") );
 
-	for (i=1; i<(u32) argc; i++) {
-		char *arg = argv[i];
-//		if (isalnum(arg[0]) || (arg[0]=='/') || (arg[0]=='.') || (arg[0]=='\\') ) {
-		if (arg[0] != '-') {
-			url_arg = arg;
-		} else if (!strcmp(arg, "-c") || !strcmp(arg, "-cfg")) {
-			the_cfg = argv[i+1];
-			i++;
-		} else if (!strcmp(arg, "-rti")) {
-			rti_file = argv[i+1];
-			i++;
-		} else if (!strcmp(arg, "-rtix")) {
-			rti_file = argv[i+1];
-			i++;
-			use_rtix = 1;
-		} else if (!strcmp(arg, "-fill")) {
-			fill_ar = 1;
-		} else if (!strcmp(arg, "-show")) {
-			visible = 1;
-		} else if (!strcmp(arg, "-avi")) {
-			if (rgbds_dump) dump_mode = 5;
-			else if (depth_dump) dump_mode = 8;
-			else if (rgbd_dump) dump_mode = 10;
-			else dump_mode=1;
-			if ((url_arg || (i+2<(u32)argc)) && get_time_list(argv[i+1], times, &nb_times)) i++;
-		} else if (!strcmp(arg, "-rgbds")) { /*get dump in rgbds pixel format*/
-			rgbds_dump = 1;
-			dump_mode=6; /* rgbds texture directly*/
-			if (dump_mode==1) dump_mode = 5; /* .avi rgbds dump*/
-		} else if (!strcmp(arg, "-rgbd")) { /*get dump in rgbd pixel format*/
-			rgbd_dump = 1;
-			dump_mode=9; /* rgbd texture directly*/
-			if (dump_mode==1) dump_mode = 10; /* .avi rgbds dump*/
-		} else if (!strcmp(arg, "-depth")) {
-			depth_dump = 1;
-			if (dump_mode==2) dump_mode=7; /* grayscale .bmp depth dump*/
-			else if (dump_mode==1) dump_mode=8; /* .avi depth dump*/
-			else dump_mode=4; /*depth dump*/
-		} else if (!strcmp(arg, "-bmp")) {
-			if(depth_dump) dump_mode=7; /*grayscale depth .bmp dump*/
-			else dump_mode=2;
-			if ((url_arg || (i+2<(u32)argc)) && get_time_list(argv[i+1], times, &nb_times)) i++;
-		} else if (!strcmp(arg, "-raw")) {
-			dump_mode = 3;
-			if ((url_arg || (i+2<(u32)argc)) && get_time_list(argv[i+1], times, &nb_times)) i++;
 
-		} else if (!stricmp(arg, "-size")) {
-			if (sscanf(argv[i+1], "%dx%d", &forced_width, &forced_height) != 2) {
-				forced_width = forced_height = 0;
-			}
-			i++;
-		} else if (!stricmp(arg, "-scale")) {
-			sscanf(argv[i+1], "%f", &scale);
-			i++;
-		} else if (!stricmp(arg, "-fps")) {
-			fps = atof(argv[i+1]);
-			i++;
-		} else if (!strcmp(arg, "-quiet")) {
-			be_quiet = 1;
-		} else if (!strcmp(arg, "-log-file") || !strcmp(arg, "-lf")) {
-			logfile = gf_f64_open(argv[i+1], "wt");
-			gf_log_set_callback(logfile, on_gpac_log);
-			i++;
-		} else if (!strcmp(arg, "-logs")) {
-			gf_log_set_tools_levels( argv[i+1] );
-			i++;
-		} else if (!strcmp(arg, "-log-clock") || !strcmp(arg, "-lc")) {
-			log_time_start = 1;
-		} else if (!strcmp(arg, "-align")) {
-			if (argv[i+1][0]=='m') align_mode = 1;
-			else if (argv[i+1][0]=='b') align_mode = 2;
-			align_mode <<= 8;
-			if (argv[i+1][1]=='m') align_mode |= 1;
-			else if (argv[i+1][1]=='r') align_mode |= 2;
-			i++;
-		}
-		else if (!strcmp(arg, "-no-wnd")) user.init_flags |= GF_TERM_WINDOWLESS;
-#if defined(__DARWIN__) || defined(__APPLE__)
-		else if (!strcmp(arg, "-thread")) not_threaded = 0;
-#else
-		else if (!strcmp(arg, "-no-thread")) not_threaded = 1;
-#endif
-		else if (!strcmp(arg, "-no-audio")) no_audio = 1;
-		else if (!strcmp(arg, "-no-regulation")) no_regulation = 1;
-		else if (!strcmp(arg, "-fs")) start_fs = 1;
-		else if (!strcmp(arg, "-pause")) pause_at_first = 1;
-		else if (!strcmp(arg, "-exit")) auto_exit = 1;
-		else if (!strcmp(arg, "-mem-track")) enable_mem_tracker = 1;
-		else if (!strcmp(arg, "-opt")) {
-			char *sep, *sep2, szSec[1024], szKey[1024], szVal[1024];
-			sep = strchr(argv[i+1], ':');
-			if (sep) {
-				sep[0] = 0;
-				strcpy(szSec, argv[i+1]);
-				sep[0] = ':';
-				sep ++;
-				sep2 = strchr(sep, '=');
-				if (sep2) {
-					sep2[0] = 0;
-					strcpy(szKey, sep);
-					strcpy(szVal, sep2+1);
-					sep2[0] = '=';
-					if (!stricmp(szVal, "null")) szVal[0]=0;
-					gf_cfg_set_key(cfg_file, szSec, szKey, szVal[0] ? szVal : NULL);
-				}
-			}
-			i++;
-		}
-		else if (!strncmp(arg, "-run-for=", 9)) simulation_time = atoi(arg+9);
-		else {
-			PrintUsage();
-			return 1;
-		}
-	}
+
 	if (!logfile) {
 		const char *opt = gf_cfg_get_key(cfg_file, "General", "LogFile");
 		if (opt) {
@@ -871,41 +306,28 @@
 		}
 	}
 
-	if (dump_mode && !url_arg) {
-		fprintf(stdout, "Missing argument for dump\n");
-		PrintUsage();
-		if (logfile) fclose(logfile);
-		return 1;
-	}
-	if (dump_mode) rti_file = NULL;
-
 	gf_sys_get_rti(500, &rti, GF_RTI_SYSTEM_MEMORY_ONLY);
 	memory_at_gpac_startup = rti.physical_memory_avail;
 	if (rti_file) init_rti_logs(rti_file, url_arg, use_rtix);
 
-	/*setup dumping options*/
-	if (dump_mode) {
-		user.init_flags |= GF_TERM_NO_AUDIO | GF_TERM_NO_COMPOSITOR_THREAD | GF_TERM_NO_REGULATION /*| GF_TERM_INIT_HIDE*/;
-		if (visible || dump_mode==8) user.init_flags |= GF_TERM_INIT_HIDE;
-	} else {
-		init_w = forced_width;
-		init_h = forced_height;
-	}
+	init_w = forced_width;
+	init_h = forced_height;
 
-	fprintf(stderr, "Loading modules\n");
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Loading modules\n" ));
 	str = gf_cfg_get_key(cfg_file, "General", "ModulesDirectory");
 
 	user.modules = gf_modules_new((const char *) str, cfg_file);
 	if (user.modules) i = gf_modules_get_count(user.modules);
 	if (!i || !user.modules) {
-		fprintf(stdout, "Error: no modules found in %s - exiting\n", str);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Error: no modules found in %s - exiting\n", str));
 		if (user.modules) gf_modules_del(user.modules);
 		gf_cfg_del(cfg_file);
 		gf_sys_close();
 		if (logfile) fclose(logfile);
 		return 1;
 	}
-	fprintf(stderr, "Modules Loaded (%d found in %s)\n", i, str);
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Modules Loaded (%d found in %s)\n", i, str));
 
 	user.config = cfg_file;
 	user.EventProc = GPAC_EventProc;
@@ -914,40 +336,38 @@
 	if (not_threaded) user.init_flags |= GF_TERM_NO_COMPOSITOR_THREAD;
 	if (no_audio) user.init_flags |= GF_TERM_NO_AUDIO;
 	if (no_regulation) user.init_flags |= GF_TERM_NO_REGULATION;
-
-	fprintf(stderr, "Loading GPAC Terminal\n");
+ user.init_flags |= GF_TERM_NO_DECODER_THREAD;
+ 
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Loading GPAC Terminal\n"));
 	term = gf_term_new(&user);
 	if (!term) {
-		fprintf(stderr, "\nInit error - check you have at least one video out and one rasterizer...\nFound modules:\n");
-		list_modules(user.modules);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("\nInit error - check you have at least one video out and one rasterizer...\nFound modules:\n"));
 		gf_modules_del(user.modules);
 		gf_cfg_del(cfg_file);
 		gf_sys_close();
 		if (logfile) fclose(logfile);
 		return 1;
 	}
-	fprintf(stderr, "Terminal Loaded\n");
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Terminal Loaded\n"));
 
 
-	if (dump_mode) {
-//		gf_term_set_option(term, GF_OPT_VISIBLE, 0);
-		if (fill_ar) gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
-	} else {
-		/*check video output*/
-		str = gf_cfg_get_key(cfg_file, "Video", "DriverName");
-		if (!strcmp(str, "Raw Video Output")) fprintf(stdout, "WARNING: using raw output video (memory only) - no display used\n");
-		/*check audio output*/
-		str = gf_cfg_get_key(cfg_file, "Audio", "DriverName");
-		if (!str || !strcmp(str, "No Audio Output Available")) fprintf(stdout, "WARNING: no audio output availble - make sure no other program is locking the sound card\n");
-
-		str = gf_cfg_get_key(cfg_file, "General", "NoMIMETypeFetch");
-		no_mime_check = (str && !stricmp(str, "yes")) ? 1 : 0;
+	/*check video output*/
+	str = gf_cfg_get_key(cfg_file, "Video", "DriverName");
+	if (!strcmp(str, "Raw Video Output")) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("WARNING: using raw output video (memory only) - no display used\n"));
 	}
+	/*check audio output*/
+	str = gf_cfg_get_key(cfg_file, "Audio", "DriverName");
+	if (!str || !strcmp(str, "No Audio Output Available")) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("WARNING: no audio output availble - make sure no other program is locking the sound card\n"));
+	}
+	str = gf_cfg_get_key(cfg_file, "General", "NoMIMETypeFetch");
+	no_mime_check = (str && !stricmp(str, "yes")) ? 1 : 0;
 
 	str = gf_cfg_get_key(cfg_file, "HTTPProxy", "Enabled");
 	if (str && !strcmp(str, "yes")) {
 		str = gf_cfg_get_key(cfg_file, "HTTPProxy", "Name");
-		if (str) fprintf(stdout, "HTTP Proxy %s enabled\n", str);
+		if (str) GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("HTTP Proxy %s enabled\n", str));
 	}
 
 	if (rti_file) {
@@ -963,69 +383,22 @@
 	Run = 1;
 	ret = 1;
 
-	if (dump_mode) {
-		if (!nb_times) {
-			times[0] = 0;
-			nb_times++;
-		}
-		ret = dump_file(url_arg, dump_mode, fps, forced_width, forced_height, scale, times, nb_times);
-		Run = 0;
-	} else
+	str = gf_cfg_get_key(cfg_file, "General", "StartupFile");
+	if (str) {
+		strcpy(the_url, "MP4Client "GPAC_FULL_VERSION);
+		gf_term_connect(term, str);
+		startup_file = 1;
+	}
 
-		/*connect if requested*/
-		if (url_arg) {
-			char *ext;
-			strcpy(the_url, url_arg);
-			ext = strrchr(the_url, '.');
-			if (ext && (!stricmp(ext, ".m3u") || !stricmp(ext, ".pls"))) {
-				fprintf(stdout, "Opening Playlist %s\n", the_url);
-				playlist = gf_f64_open(the_url, "rt");
-				if (playlist) {
-					strcpy(pl_path, the_url);
-					fscanf(playlist, "%s", the_url);
-					fprintf(stdout, "Opening URL %s\n", the_url);
-					gf_term_connect_with_path(term, the_url, pl_path);
-				} else {
-					fprintf(stdout, "Hit 'h' for help\n\n");
-				}
-			} else {
-				fprintf(stdout, "Opening URL %s\n", the_url);
-				if (pause_at_first) fprintf(stdout, "[Status: Paused]\n");
-				gf_term_connect_from_time(term, the_url, 0, pause_at_first);
-			}
-		} else {
-			fprintf(stdout, "Hit 'h' for help\n\n");
-			str = gf_cfg_get_key(cfg_file, "General", "StartupFile");
-			if (str) {
-				strcpy(the_url, "MP4Client "GPAC_FULL_VERSION);
-				gf_term_connect(term, str);
-				startup_file = 1;
-			}
-		}
 	/*force fullscreen*/
-	if (0 && start_fs)
-		gf_term_set_option(term, GF_OPT_FULLSCREEN, 1);
+	//gf_term_set_option(term, GF_OPT_FULLSCREEN, 1);
 
 	while (Run) {
 		if (restart) {
 			restart = 0;
 			gf_term_play_from_time(term, 0, 0);
 		}
-		if (request_next_playlist_item) {
-			c = '\n';
-			request_next_playlist_item = 0;
-			if (playlist) {
-				gf_term_disconnect(term);
 
-				if (fscanf(playlist, "%s", the_url) == EOF) {
-					fprintf(stdout, "No more items - exiting\n");
-					Run = 0;
-				} else {
-					fprintf(stdout, "Opening URL %s\n", the_url);
-					gf_term_connect_with_path(term, the_url, pl_path);
-				}
-			}
-		}
 		if (!use_rtix || display_rti) UpdateRTInfo(NULL);
 		if (not_threaded) {
 			//printf("gf_term_process_step from run loop\n");
@@ -1047,28 +420,23 @@
 	gf_term_disconnect(term);
 	if (rti_file) UpdateRTInfo("Disconnected\n");
 
-	fprintf(stdout, "Deleting terminal... ");
-	if (playlist) fclose(playlist);
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Deleting terminal... "));
 	gf_term_del(term);
-	fprintf(stdout, "OK\n");
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("OK\n"));
 
-	fprintf(stdout, "GPAC cleanup ...\n");
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("GPAC cleanup ...\n"));
 	gf_modules_del(user.modules);
 	gf_cfg_del(cfg_file);
 
 #ifdef GPAC_MEMORY_TRACKING
 	if (enable_mem_tracker) {
 		gf_memory_print();
-		fprintf(stdout, "print any key\n");
-		while (!gf_prompt_has_input()) {
-			gf_sleep(100);
-		}
 	}
 #endif
 
 	gf_sys_close();
 	if (rti_logs) fclose(rti_logs);
 	if (logfile) fclose(logfile);
-	fprintf(stdout, "Bye\n");
+
 	return 0;
 }

gpac-0.5.1.svn5491.tar.xz/applications/osmo4_ios/osmo4ios-Info.plist -> gpac-0.5.1.svn5619.tar.xz/applications/osmo4_ios/osmo4ios-Info.plist Changed

gpac-0.5.1.svn5491.tar.xz/applications/osmo4_w32/Options.cpp -> gpac-0.5.1.svn5619.tar.xz/applications/osmo4_w32/Options.cpp Changed

gpac-0.5.1.svn5491.tar.xz/applications/osmo4_wx/wxGPACControl.cpp -> gpac-0.5.1.svn5619.tar.xz/applications/osmo4_wx/wxGPACControl.cpp Changed

gpac-0.5.1.svn5491.tar.xz/applications/testapps/bmp4demux/bmp4demux.vcxproj -> gpac-0.5.1.svn5619.tar.xz/applications/testapps/bmp4demux/bmp4demux.vcxproj Changed

@@ -51,6 +51,7 @@
 <ClCompile Include="..\..\..\src\utils\error.c" />
 <ClCompile Include="..\..\..\src\utils\list.c" />
 <ClCompile Include="..\..\..\src\utils\os_divers.c" />
+ <ClCompile Include="..\..\..\src\utils\os_file.c" />
 <ClCompile Include="..\..\..\src\utils\os_thread.c" />
 <ClCompile Include="..\..\..\src\utils\url.c" />
 <ClCompile Include="main.c" />
@@ -68,7 +69,7 @@
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 <ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
 <UseOfMfc>false</UseOfMfc>
 <CharacterSet>MultiByte</CharacterSet>
 </PropertyGroup>
@@ -111,7 +112,7 @@
 <ClCompile>
 <Optimization>Disabled</Optimization>
 <AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>GPAC_DISABLE_MEDIA_IMPORT;GPAC_DISABLE_CORE_TOOLS;GPAC_DISABLE_ISOM_HINTING;GPAC_MINIMAL_ODF;GPAC_DISABLE_AV_PARSERS;GPAC_DISABLE_ISOM_DUMP;GPAC_DISABLE_ZILB;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>GPAC_DISABLE_MEDIA_IMPORT;GPAC_DISABLE_ISOM_HINTING;GPAC_MINIMAL_ODF;GPAC_DISABLE_AV_PARSERS;GPAC_DISABLE_ISOM_DUMP;GPAC_DISABLE_ZILB;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <MinimalRebuild>true</MinimalRebuild>
 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -155,7 +156,7 @@
 <Optimization>MaxSpeed</Optimization>
 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
 <AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>GPAC_DISABLE_MEDIA_IMPORT;GPAC_DISABLE_CORE_TOOLS;GPAC_DISABLE_ISOM_HINTING;GPAC_MINIMAL_ODF;GPAC_DISABLE_AV_PARSERS;GPAC_DISABLE_ISOM_DUMP;GPAC_DISABLE_ZILB;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>GPAC_DISABLE_MEDIA_IMPORT;GPAC_DISABLE_ISOM_HINTING;GPAC_MINIMAL_ODF;GPAC_DISABLE_AV_PARSERS;GPAC_DISABLE_ISOM_DUMP;GPAC_DISABLE_ZILB;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <StringPooling>true</StringPooling>
 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 <FunctionLevelLinking>true</FunctionLevelLinking>

gpac-0.5.1.svn5491.tar.xz/applications/testapps/bmp4demux/bmp4demux.vcxproj.filters -> gpac-0.5.1.svn5619.tar.xz/applications/testapps/bmp4demux/bmp4demux.vcxproj.filters Changed

gpac-0.5.1.svn5491.tar.xz/applications/testapps/bmp4demux/build.sh -> gpac-0.5.1.svn5619.tar.xz/applications/testapps/bmp4demux/build.sh Changed

@@ -1,2 +1,2 @@
 #!/bin/sh
-gcc -o fmp4demux main.c ../../../src/utils/os_config_init.c ../../../src/utils/os_divers.c ../../../src/utils/os_thread.c ../../../src/utils/alloc.c ../../../src/utils/bitstream.c ../../../src/utils/configfile.c ../../../src/odf/desc_private.c ../../../src/odf/descriptors.c ../../../src/utils/error.c ../../../src/utils/list.c ../../../src/odf/odf_code.c ../../../src/odf/odf_codec.c ../../../src/odf/odf_command.c ../../../src/odf/odf_parse.c ../../../src/odf/slc.c ../../../src/utils/url.c ../../../src/media_tools/webvtt.c ../../../src/isomedia/avc_ext.c ../../../src/isomedia/box_code_3gpp.c ../../../src/isomedia/box_code_adobe.c ../../../src/isomedia/box_code_apple.c ../../../src/isomedia/box_code_base.c ../../../src/isomedia/box_code_drm.c ../../../src/isomedia/box_code_meta.c ../../../src/isomedia/box_funcs.c ../../../src/isomedia/data_map.c ../../../src/isomedia/drm_sample.c ../../../src/isomedia/isom_intern.c ../../../src/isomedia/isom_read.c ../../../src/isomedia/isom_store.c ../../../src/isomedia/isom_write.c ../../../src/isomedia/media.c ../../../src/isomedia/media_odf.c ../../../src/isomedia/meta.c ../../../src/isomedia/movie_fragments.c ../../../src/isomedia/sample_descs.c ../../../src/isomedia/stbl_read.c ../../../src/isomedia/stbl_write.c ../../../src/isomedia/track.c ../../../src/isomedia/tx3g.c -L../../../bin/gcc -lpthread -ldl -I../../../include -DGPAC_MINIMAL_ODF -DGPAC_DISABLE_AV_PARSERS -DGPAC_DISABLE_ISOM_DUMP -DGPAC_DISABLE_ZLIB
+gcc -o fmp4demux main.c ../../../src/utils/os_config_init.c ../../../src/utils/os_divers.c ../../../src/utils/os_file.c ../../../src/utils/os_thread.c ../../../src/utils/alloc.c ../../../src/utils/bitstream.c ../../../src/utils/configfile.c ../../../src/odf/desc_private.c ../../../src/odf/descriptors.c ../../../src/utils/error.c ../../../src/utils/list.c ../../../src/odf/odf_code.c ../../../src/odf/odf_codec.c ../../../src/odf/odf_command.c ../../../src/odf/odf_parse.c ../../../src/odf/slc.c ../../../src/utils/url.c ../../../src/media_tools/webvtt.c ../../../src/isomedia/avc_ext.c ../../../src/isomedia/box_code_3gpp.c ../../../src/isomedia/box_code_adobe.c ../../../src/isomedia/box_code_apple.c ../../../src/isomedia/box_code_base.c ../../../src/isomedia/box_code_drm.c ../../../src/isomedia/box_code_meta.c ../../../src/isomedia/box_funcs.c ../../../src/isomedia/data_map.c ../../../src/isomedia/drm_sample.c ../../../src/isomedia/isom_intern.c ../../../src/isomedia/isom_read.c ../../../src/isomedia/isom_store.c ../../../src/isomedia/isom_write.c ../../../src/isomedia/media.c ../../../src/isomedia/media_odf.c ../../../src/isomedia/meta.c ../../../src/isomedia/movie_fragments.c ../../../src/isomedia/sample_descs.c ../../../src/isomedia/stbl_read.c ../../../src/isomedia/stbl_write.c ../../../src/isomedia/track.c ../../../src/isomedia/tx3g.c -L../../../bin/gcc -lpthread -ldl -I../../../include -DGPAC_MINIMAL_ODF -DGPAC_DISABLE_AV_PARSERS -DGPAC_DISABLE_ISOM_DUMP -DGPAC_DISABLE_ZLIB

gpac-0.5.1.svn5491.tar.xz/applications/testapps/fmp4demux/build.sh -> gpac-0.5.1.svn5619.tar.xz/applications/testapps/fmp4demux/build.sh Changed

gpac-0.5.1.svn5491.tar.xz/applications/testapps/fmp4demux/fmp4demux.vcxproj -> gpac-0.5.1.svn5619.tar.xz/applications/testapps/fmp4demux/fmp4demux.vcxproj Changed

@@ -52,12 +52,13 @@
 <ClCompile Include="..\..\..\src\utils\list.c" />
 <ClCompile Include="..\..\..\src\utils\os_config_init.c" />
 <ClCompile Include="..\..\..\src\utils\os_divers.c" />
+ <ClCompile Include="..\..\..\src\utils\os_file.c" />
 <ClCompile Include="..\..\..\src\utils\os_thread.c" />
 <ClCompile Include="..\..\..\src\utils\url.c" />
 <ClCompile Include="main.c" />
 </ItemGroup>
 <PropertyGroup Label="Globals">
- <ProjectGuid>{978A2D9F-E44F-4073-8032-333563BCC160}</ProjectGuid>
+ <ProjectGuid>{BEBEB264-EEA8-4FCF-9467-2E7988DD923B}</ProjectGuid>
 <ProjectName>fmp4demux</ProjectName>
 </PropertyGroup>
 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -69,7 +70,7 @@
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 <ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
 <UseOfMfc>false</UseOfMfc>
 <CharacterSet>MultiByte</CharacterSet>
 </PropertyGroup>

gpac-0.5.1.svn5491.tar.xz/applications/testapps/fmp4demux/fmp4demux.vcxproj.filters -> gpac-0.5.1.svn5619.tar.xz/applications/testapps/fmp4demux/fmp4demux.vcxproj.filters Changed

gpac-0.5.1.svn5491.tar.xz/applications/testapps/segmp4demux/build.sh -> gpac-0.5.1.svn5619.tar.xz/applications/testapps/segmp4demux/build.sh Changed

gpac-0.5.1.svn5491.tar.xz/applications/testapps/segmp4demux/segmp4demux.vcxproj -> gpac-0.5.1.svn5619.tar.xz/applications/testapps/segmp4demux/segmp4demux.vcxproj Changed

@@ -51,12 +51,13 @@
 <ClCompile Include="..\..\..\src\utils\error.c" />
 <ClCompile Include="..\..\..\src\utils\list.c" />
 <ClCompile Include="..\..\..\src\utils\os_divers.c" />
+ <ClCompile Include="..\..\..\src\utils\os_file.c" />
 <ClCompile Include="..\..\..\src\utils\os_thread.c" />
 <ClCompile Include="..\..\..\src\utils\url.c" />
 <ClCompile Include="main.c" />
 </ItemGroup>
 <PropertyGroup Label="Globals">
- <ProjectGuid>{978A2D9F-E44F-4073-8032-333563BCC160}</ProjectGuid>
+ <ProjectGuid>{365CEAE9-305B-43C9-B531-904E500F0809}</ProjectGuid>
 <ProjectName>segmp4demux</ProjectName>
 </PropertyGroup>
 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -68,7 +69,7 @@
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 <ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
 <UseOfMfc>false</UseOfMfc>
 <CharacterSet>MultiByte</CharacterSet>
 </PropertyGroup>

gpac-0.5.1.svn5491.tar.xz/applications/testapps/segmp4demux/segmp4demux.vcxproj.filters -> gpac-0.5.1.svn5619.tar.xz/applications/testapps/segmp4demux/segmp4demux.vcxproj.filters Changed

gpac-0.5.1.svn5491.tar.xz/build/android/jni/Application.mk -> gpac-0.5.1.svn5619.tar.xz/build/android/jni/Application.mk Changed

gpac-0.5.1.svn5491.tar.xz/build/android/jni/common.mk -> gpac-0.5.1.svn5619.tar.xz/build/android/jni/common.mk Changed

gpac-0.5.1.svn5491.tar.xz/build/android/jni/gpac_build_android -> gpac-0.5.1.svn5619.tar.xz/build/android/jni/gpac_build_android Changed

gpac-0.5.1.svn5491.tar.xz/build/android/jni/libgpac/Android.mk -> gpac-0.5.1.svn5619.tar.xz/build/android/jni/libgpac/Android.mk Changed

gpac-0.5.1.svn5491.tar.xz/build/android/jni/libgpac/Application.mk -> gpac-0.5.1.svn5619.tar.xz/build/android/jni/libgpac/Application.mk Changed

gpac-0.5.1.svn5491.tar.xz/build/android/jni/modules/Application.mk -> gpac-0.5.1.svn5619.tar.xz/build/android/jni/modules/Application.mk Changed

gpac-0.5.1.svn5491.tar.xz/build/android/jni/modules/gm_ffmpeg_in.mk -> gpac-0.5.1.svn5619.tar.xz/build/android/jni/modules/gm_ffmpeg_in.mk Changed

gpac-0.5.1.svn5491.tar.xz/build/android/jni/mp4box/Application.mk -> gpac-0.5.1.svn5619.tar.xz/build/android/jni/mp4box/Application.mk Changed

gpac-0.5.1.svn5491.tar.xz/build/android/jni/wrapper/Application.mk -> gpac-0.5.1.svn5619.tar.xz/build/android/jni/wrapper/Application.mk Changed

gpac-0.5.1.svn5491.tar.xz/build/codeblocks/libgpac.cbp -> gpac-0.5.1.svn5619.tar.xz/build/codeblocks/libgpac.cbp Changed

gpac-0.5.1.svn5491.tar.xz/build/msevc4/libgpac.vcp -> gpac-0.5.1.svn5619.tar.xz/build/msevc4/libgpac.vcp Changed

gpac-0.5.1.svn5619.tar.xz/build/msvc10/dektec_out.vcxproj Added

@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{CAC981C2-5665-4E90-80D3-604C1A785D91}</ProjectGuid>
+ <RootNamespace>dektec_out</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dektec_out_rel/dektec_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>dtapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/dektec_out_rel/dektec_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>dtapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dektec_out_deb/dektec_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>dtapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\obj/dektec_out_deb/dektec_out.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>dtapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\dektec_out\dektec_video.cpp" />
+ <ClCompile Include="..\..\modules\dx_hw\copy_pixels.c" />
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="libgpac_dll.vcxproj">
+ <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.1.svn5491.tar.xz/build/msvc10/gpac.sln -> gpac-0.5.1.svn5619.tar.xz/build/msvc10/gpac.sln Changed

@@ -174,6 +174,7 @@
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Win32.Build.0 = Debug|Win32
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|x64.ActiveCfg = Debug|x64
+		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|x64.Build.0 = Debug|x64
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Win32.ActiveCfg = Release|Win32
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Win32.Build.0 = Release|Win32
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|x64.ActiveCfg = Release|x64
@@ -277,6 +278,7 @@
 		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Win32.Build.0 = Debug|Win32
 		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|x64.ActiveCfg = Debug|x64
+		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|x64.Build.0 = Debug|x64
 		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Win32.ActiveCfg = Release|Win32
 		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Win32.Build.0 = Release|Win32
 		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|x64.ActiveCfg = Release|x64
@@ -410,6 +412,7 @@
 		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Win32.Build.0 = Debug|Win32
 		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|x64.ActiveCfg = Debug|x64
+		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|x64.Build.0 = Debug|x64
 		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Win32.ActiveCfg = Release|Win32
 		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Win32.Build.0 = Release|Win32
 		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|x64.ActiveCfg = Release|x64
@@ -488,6 +491,7 @@
 		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Win32.Build.0 = Debug|Win32
 		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|x64.ActiveCfg = Debug|x64
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|x64.Build.0 = Debug|x64
 		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Win32.ActiveCfg = Release|Win32
 		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Win32.Build.0 = Release|Win32
 		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|x64.ActiveCfg = Release|x64

gpac-0.5.1.svn5491.tar.xz/build/msvc10/libgpac.vcxproj -> gpac-0.5.1.svn5619.tar.xz/build/msvc10/libgpac.vcxproj Changed

gpac-0.5.1.svn5491.tar.xz/build/msvc10/libgpac.vcxproj.filters -> gpac-0.5.1.svn5619.tar.xz/build/msvc10/libgpac.vcxproj.filters Changed

gpac-0.5.1.svn5491.tar.xz/build/msvc11/libgpac.vcxproj -> gpac-0.5.1.svn5619.tar.xz/build/msvc11/libgpac.vcxproj Changed

gpac-0.5.1.svn5491.tar.xz/build/msvc8/libgpac.vcproj -> gpac-0.5.1.svn5619.tar.xz/build/msvc8/libgpac.vcproj Changed

gpac-0.5.1.svn5491.tar.xz/build/msvc9/libgpac.vcproj -> gpac-0.5.1.svn5619.tar.xz/build/msvc9/libgpac.vcproj Changed

@@ -822,6 +822,46 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\src\utils\os_file.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\..\src\utils\os_module.c"
 				>
 				<FileConfiguration

gpac-0.5.1.svn5491.tar.xz/build/msvc9/libgpac_static.vcproj -> gpac-0.5.1.svn5619.tar.xz/build/msvc9/libgpac_static.vcproj Changed

gpac-0.5.1.svn5491.tar.xz/build/xcode/generate_ios.sh -> gpac-0.5.1.svn5619.tar.xz/build/xcode/generate_ios.sh Changed

@@ -7,7 +7,7 @@
 rev=`LANG=en_US svn info | grep Revision | tr -d 'Revision: '`
 if [ "$rev" != "" ]
 then
-	svn revert ../../applications/osmo4_ios/osmo4ios-Info.plist
+#	svn revert ../../applications/osmo4_ios/osmo4ios-Info.plist
 	sed 's/<string>.*<\/string>/<string>'"$version"'<\/string>/' ../../applications/osmo4_ios/osmo4ios-Info.plist > ../../applications/osmo4_ios/osmo4ios-Info.plist.new
 	sed 's/<string>.*<\/string>/<string>'"$rev"'<\/string>/' ../../applications/osmo4_ios/osmo4ios-Info.plist.new > ../../applications/osmo4_ios/osmo4ios-Info.plist
 	rm ../../applications/osmo4_ios/osmo4ios-Info.plist.new
@@ -15,15 +15,15 @@
 
 echo "*** Clean previous build files ***"
 #xcodebuild -alltargets -sdk iphoneos -configuration Debug -project gpac4ios.xcodeproj clean
-xcodebuild -alltargets -sdk iphoneos -configuration Release -project gpac4ios.xcodeproj clean
-if [ $? != 0 ] ; then
-	exit 1
-fi
+#xcodebuild -alltargets -sdk iphoneos -configuration Release -project gpac4ios.xcodeproj clean
+#if [ $? != 0 ] ; then
+#	exit 1
+#fi
 
 echo "*** Compile osmo4ios for iOS (arm) ***"
 #link must occur at debug to avoid optimizing that leads to freezes
 #xcodebuild -target osmo4ios -sdk iphoneos -configuration Debug -project gpac4ios.xcodeproj
-xcodebuild -target osmo4ios -sdk iphoneos -configuration Release -project gpac4ios.xcodeproj
+xcodebuild -target osmo4ios -configuration Release -project gpac4ios.xcodeproj
 if [ $? != 0 ] ; then
 	exit 1
 fi
@@ -69,4 +69,4 @@
 svn up -r $rev
 cd ../../build/xcode/
 
-echo "*** Extra Libs generation for iOS completed (full_version)! ***"
+echo "*** GPAC generation for iOS completed ($full_version)! ***"

gpac-0.5.1.svn5491.tar.xz/build/xcode/gpac.xcodeproj/project.pbxproj -> gpac-0.5.1.svn5619.tar.xz/build/xcode/gpac.xcodeproj/project.pbxproj Changed

@@ -7,6 +7,34 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		2839E2821A162C48002D73E1 /* opensvc_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1D018D70D4B00E2FF12 /* opensvc_dec.c */; };
+		2839E2831A162CC9002D73E1 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
+		2839E28D1A1635F7002D73E1 /* DashCast.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2839E28C1A1635F7002D73E1 /* DashCast.1 */; };
+		2839E2B21A16363E002D73E1 /* audio_data.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2921A16363E002D73E1 /* audio_data.c */; };
+		2839E2B31A16363E002D73E1 /* audio_decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2941A16363E002D73E1 /* audio_decoder.c */; };
+		2839E2B41A16363E002D73E1 /* audio_encoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2961A16363E002D73E1 /* audio_encoder.c */; };
+		2839E2B51A16363E002D73E1 /* audio_muxer.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2981A16363E002D73E1 /* audio_muxer.c */; };
+		2839E2B61A16363E002D73E1 /* circular_buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E29A1A16363E002D73E1 /* circular_buffer.c */; };
+		2839E2B71A16363E002D73E1 /* cmd_data.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E29C1A16363E002D73E1 /* cmd_data.c */; };
+		2839E2B81A16363E002D73E1 /* controler.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E29E1A16363E002D73E1 /* controler.c */; };
+		2839E2B91A16363E002D73E1 /* dashcast.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2A01A16363E002D73E1 /* dashcast.c */; };
+		2839E2BA1A16363E002D73E1 /* message_queue.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2A21A16363E002D73E1 /* message_queue.c */; };
+		2839E2BB1A16363E002D73E1 /* register.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2A41A16363E002D73E1 /* register.c */; };
+		2839E2BC1A16363E002D73E1 /* task.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2A61A16363E002D73E1 /* task.c */; };
+		2839E2BD1A16363E002D73E1 /* video_data.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2A81A16363E002D73E1 /* video_data.c */; };
+		2839E2BE1A16363E002D73E1 /* video_decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2AA1A16363E002D73E1 /* video_decoder.c */; };
+		2839E2BF1A16363E002D73E1 /* video_encoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2AC1A16363E002D73E1 /* video_encoder.c */; };
+		2839E2C01A16363E002D73E1 /* video_muxer.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2AE1A16363E002D73E1 /* video_muxer.c */; };
+		2839E2C11A16363E002D73E1 /* video_scaler.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2B01A16363E002D73E1 /* video_scaler.c */; };
+		2839E2C21A1636A7002D73E1 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
+		2839E2C31A163700002D73E1 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28C5AA641A15240800372C59 /* AVFoundation.framework */; };
+		2839E2C51A163712002D73E1 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2839E2C41A163711002D73E1 /* CoreMedia.framework */; };
+		2839E2CB1A16375C002D73E1 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2839E2CA1A16375C002D73E1 /* QTKit.framework */; };
+		2839E2CD1A163E1E002D73E1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2839E2CC1A163E1E002D73E1 /* Foundation.framework */; };
+		28C5AA651A15240800372C59 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28C5AA641A15240800372C59 /* AVFoundation.framework */; };
+		28C5AA671A152BB700372C59 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28C5AA661A152BB700372C59 /* CoreFoundation.framework */; };
+		28C5AA691A152BC400372C59 /* VideoDecodeAcceleration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28C5AA681A152BC400372C59 /* VideoDecodeAcceleration.framework */; };
+		28C5AA801A16277200372C59 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28C5AA741A15FF0000372C59 /* Carbon.framework */; };
 		920100B018D5A444003D1ACA /* arith_decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF8A18D5A444003D1ACA /* arith_decoder.c */; };
 		920100B118D5A444003D1ACA /* bifs_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF8B18D5A444003D1ACA /* bifs_codec.c */; };
 		920100B218D5A444003D1ACA /* bifs_node_tables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF8C18D5A444003D1ACA /* bifs_node_tables.c */; };
@@ -256,7 +284,6 @@
 		920101A918D5A445003D1ACA /* cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009018D5A444003D1ACA /* cache.c */; };
 		920101AA18D5A445003D1ACA /* color.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009118D5A444003D1ACA /* color.c */; };
 		920101AB18D5A445003D1ACA /* configfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009218D5A444003D1ACA /* configfile.c */; };
-		920101AC18D5A445003D1ACA /* dlmalloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009318D5A444003D1ACA /* dlmalloc.c */; };
 		920101AD18D5A445003D1ACA /* downloader.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009418D5A444003D1ACA /* downloader.c */; };
 		920101AE18D5A445003D1ACA /* error.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009518D5A444003D1ACA /* error.c */; };
 		920101B018D5A445003D1ACA /* list.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009718D5A444003D1ACA /* list.c */; };
@@ -265,7 +292,6 @@
 		920101B318D5A445003D1ACA /* module.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009A18D5A444003D1ACA /* module.c */; };
 		920101B418D5A445003D1ACA /* module_wrap.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201009B18D5A444003D1ACA /* module_wrap.h */; };
 		920101B518D5A445003D1ACA /* os_config_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009C18D5A444003D1ACA /* os_config_init.c */; };
-		920101B618D5A445003D1ACA /* os_divers.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009D18D5A444003D1ACA /* os_divers.c */; };
 		920101B718D5A445003D1ACA /* os_module.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009E18D5A444003D1ACA /* os_module.c */; };
 		920101B818D5A445003D1ACA /* os_net.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009F18D5A444003D1ACA /* os_net.c */; };
 		920101B918D5A445003D1ACA /* os_thread.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100A018D5A444003D1ACA /* os_thread.c */; };
@@ -287,8 +313,6 @@
 		9225733218D7269700D6FD98 /* theora_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9225732D18D7269700D6FD98 /* theora_dec.c */; };
 		9225733318D7269700D6FD98 /* vorbis_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9225732E18D7269700D6FD98 /* vorbis_dec.c */; };
 		9225733418D726D800D6FD98 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
-		929F891C19FE83AE0076FC13 /* carbon_events.c in Sources */ = {isa = PBXBuildFile; fileRef = 929F891B19FE83AE0076FC13 /* carbon_events.c */; };
-		929F891F19FE84AB0076FC13 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 929F891E19FE84AB0076FC13 /* Carbon.framework */; };
 		92AAF0E418D6DB8600E2FF12 /* audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0D818D6DB5500E2FF12 /* audio.c */; };
 		92AAF0E518D6DB8600E2FF12 /* sdl_out.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0DA18D6DB5500E2FF12 /* sdl_out.c */; };
 		92AAF0E618D6DB8600E2FF12 /* sdl_out.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF0DB18D6DB5500E2FF12 /* sdl_out.h */; };
@@ -364,13 +388,8 @@
 		92AAF1B918D70A5200E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
 		92AAF1C518D70B4600E2FF12 /* openhevc_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1C318D70B4100E2FF12 /* openhevc_dec.c */; };
 		92AAF1C618D70BAE00E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
-		92AAF1D218D70D5100E2FF12 /* opensvc_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1D018D70D4B00E2FF12 /* opensvc_dec.c */; };
-		92AAF1D318D70DE500E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
 		92AAF1D918D710A000E2FF12 /* vtt_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1D518D7109A00E2FF12 /* vtt_dec.c */; };
 		92AAF1DA18D710A000E2FF12 /* vtt_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1D618D7109A00E2FF12 /* vtt_in.c */; };
-		92AAF1E318D7129A00E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
-		92AAF1EA18D712C500E2FF12 /* x11_out.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1E718D712C500E2FF12 /* x11_out.c */; };
-		92AAF1EB18D712C500E2FF12 /* x11_out.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF1E818D712C500E2FF12 /* x11_out.h */; };
 		92BE50A318D632DA00AA59D8 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
 		92BE50A818D6348A00AA59D8 /* filedump.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50A418D6348A00AA59D8 /* filedump.c */; };
 		92BE50A918D6348A00AA59D8 /* fileimport.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50A518D6348A00AA59D8 /* fileimport.c */; };
@@ -381,6 +400,9 @@
 		92BE50D418D6D62600AA59D8 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50D218D6D62600AA59D8 /* main.c */; };
 		92BE50D518D6D66C00AA59D8 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
 		92BE50D618D6D6C100AA59D8 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
+		92D535711A5C0D1400F2442A /* carbon_events.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D5356F1A5C0CF700F2442A /* carbon_events.c */; };
+		92F930821A5ADB870072A85C /* os_divers.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F930801A5ADB870072A85C /* os_divers.c */; };
+		92F930831A5ADB870072A85C /* os_file.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F930811A5ADB870072A85C /* os_file.c */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXBuildRule section */
@@ -424,20 +446,6 @@
 			remoteGlobalIDString = 92AAF1BD18D70B1C00E2FF12;
 			remoteInfo = openhevc_dec;
 		};
-		9225731618D717BA00D6FD98 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 92AAF1CA18D70C3100E2FF12;
-			remoteInfo = opensvc_dec;
-		};
-		9225731818D717BD00D6FD98 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 92AAF1DE18D7126900E2FF12;
-			remoteInfo = x11_out;
-		};
 		9225733518D727B500D6FD98 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
@@ -469,6 +477,16 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
+		2839E2861A1635F7002D73E1 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+				2839E28D1A1635F7002D73E1 /* DashCast.1 in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
 		92BE508E18D6325E00AA59D8 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -499,6 +517,61 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		2839E27E1A162C24002D73E1 /* libopensvc.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libopensvc.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		2839E2881A1635F7002D73E1 /* DashCast */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DashCast; sourceTree = BUILT_PRODUCTS_DIR; };
+		2839E28A1A1635F7002D73E1 /* main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
+		2839E28C1A1635F7002D73E1 /* DashCast.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = DashCast.1; sourceTree = "<group>"; };
+		2839E2921A16363E002D73E1 /* audio_data.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio_data.c; path = ../../applications/dashcast/audio_data.c; sourceTree = "<group>"; };
+		2839E2931A16363E002D73E1 /* audio_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = audio_data.h; path = ../../applications/dashcast/audio_data.h; sourceTree = "<group>"; };
+		2839E2941A16363E002D73E1 /* audio_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio_decoder.c; path = ../../applications/dashcast/audio_decoder.c; sourceTree = "<group>"; };
+		2839E2951A16363E002D73E1 /* audio_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = audio_decoder.h; path = ../../applications/dashcast/audio_decoder.h; sourceTree = "<group>"; };
+		2839E2961A16363E002D73E1 /* audio_encoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio_encoder.c; path = ../../applications/dashcast/audio_encoder.c; sourceTree = "<group>"; };
+		2839E2971A16363E002D73E1 /* audio_encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = audio_encoder.h; path = ../../applications/dashcast/audio_encoder.h; sourceTree = "<group>"; };
+		2839E2981A16363E002D73E1 /* audio_muxer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio_muxer.c; path = ../../applications/dashcast/audio_muxer.c; sourceTree = "<group>"; };
+		2839E2991A16363E002D73E1 /* audio_muxer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = audio_muxer.h; path = ../../applications/dashcast/audio_muxer.h; sourceTree = "<group>"; };
+		2839E29A1A16363E002D73E1 /* circular_buffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = circular_buffer.c; path = ../../applications/dashcast/circular_buffer.c; sourceTree = "<group>"; };
+		2839E29B1A16363E002D73E1 /* circular_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = circular_buffer.h; path = ../../applications/dashcast/circular_buffer.h; sourceTree = "<group>"; };
+		2839E29C1A16363E002D73E1 /* cmd_data.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmd_data.c; path = ../../applications/dashcast/cmd_data.c; sourceTree = "<group>"; };
+		2839E29D1A16363E002D73E1 /* cmd_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cmd_data.h; path = ../../applications/dashcast/cmd_data.h; sourceTree = "<group>"; };
+		2839E29E1A16363E002D73E1 /* controler.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = controler.c; path = ../../applications/dashcast/controler.c; sourceTree = "<group>"; };
+		2839E29F1A16363E002D73E1 /* controler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = controler.h; path = ../../applications/dashcast/controler.h; sourceTree = "<group>"; };
+		2839E2A01A16363E002D73E1 /* dashcast.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dashcast.c; path = ../../applications/dashcast/dashcast.c; sourceTree = "<group>"; };
+		2839E2A11A16363E002D73E1 /* libav_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libav_compat.h; path = ../../applications/dashcast/libav_compat.h; sourceTree = "<group>"; };
+		2839E2A21A16363E002D73E1 /* message_queue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = message_queue.c; path = ../../applications/dashcast/message_queue.c; sourceTree = "<group>"; };
+		2839E2A31A16363E002D73E1 /* message_queue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = message_queue.h; path = ../../applications/dashcast/message_queue.h; sourceTree = "<group>"; };
+		2839E2A41A16363E002D73E1 /* register.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = register.c; path = ../../applications/dashcast/register.c; sourceTree = "<group>"; };
+		2839E2A51A16363E002D73E1 /* register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = register.h; path = ../../applications/dashcast/register.h; sourceTree = "<group>"; };
+		2839E2A61A16363E002D73E1 /* task.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = task.c; path = ../../applications/dashcast/task.c; sourceTree = "<group>"; };
+		2839E2A71A16363E002D73E1 /* task.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = task.h; path = ../../applications/dashcast/task.h; sourceTree = "<group>"; };
+		2839E2A81A16363E002D73E1 /* video_data.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = video_data.c; path = ../../applications/dashcast/video_data.c; sourceTree = "<group>"; };
+		2839E2A91A16363E002D73E1 /* video_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = video_data.h; path = ../../applications/dashcast/video_data.h; sourceTree = "<group>"; };
+		2839E2AA1A16363E002D73E1 /* video_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = video_decoder.c; path = ../../applications/dashcast/video_decoder.c; sourceTree = "<group>"; };
+		2839E2AB1A16363E002D73E1 /* video_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = video_decoder.h; path = ../../applications/dashcast/video_decoder.h; sourceTree = "<group>"; };
+		2839E2AC1A16363E002D73E1 /* video_encoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = video_encoder.c; path = ../../applications/dashcast/video_encoder.c; sourceTree = "<group>"; };
+		2839E2AD1A16363E002D73E1 /* video_encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = video_encoder.h; path = ../../applications/dashcast/video_encoder.h; sourceTree = "<group>"; };
+		2839E2AE1A16363E002D73E1 /* video_muxer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = video_muxer.c; path = ../../applications/dashcast/video_muxer.c; sourceTree = "<group>"; };
+		2839E2AF1A16363E002D73E1 /* video_muxer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = video_muxer.h; path = ../../applications/dashcast/video_muxer.h; sourceTree = "<group>"; };
+		2839E2B01A16363E002D73E1 /* video_scaler.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = video_scaler.c; path = ../../applications/dashcast/video_scaler.c; sourceTree = "<group>"; };
+		2839E2B11A16363E002D73E1 /* video_scaler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = video_scaler.h; path = ../../applications/dashcast/video_scaler.h; sourceTree = "<group>"; };
+		2839E2C41A163711002D73E1 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
+		2839E2C61A16371B002D73E1 /* CoreMediaIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMediaIO.framework; path = System/Library/Frameworks/CoreMediaIO.framework; sourceTree = SDKROOT; };
+		2839E2C81A16373B002D73E1 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = SDKROOT; };
+		2839E2CA1A16375C002D73E1 /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = System/Library/Frameworks/QTKit.framework; sourceTree = SDKROOT; };
+		2839E2CC1A163E1E002D73E1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		28C5AA621A1523A600372C59 /* libOpenSVCDec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libOpenSVCDec.a; path = ../../extra_lib/lib/gcc/libOpenSVCDec.a; sourceTree = "<group>"; };
+		28C5AA641A15240800372C59 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
+		28C5AA661A152BB700372C59 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
+		28C5AA681A152BC400372C59 /* VideoDecodeAcceleration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoDecodeAcceleration.framework; path = System/Library/Frameworks/VideoDecodeAcceleration.framework; sourceTree = SDKROOT; };
+		28C5AA6A1A15FCD200372C59 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; };
+		28C5AA6C1A15FE4A00372C59 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
+		28C5AA6E1A15FE7300372C59 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; };
+		28C5AA701A15FE8C00372C59 /* ForceFeedback.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ForceFeedback.framework; path = System/Library/Frameworks/ForceFeedback.framework; sourceTree = SDKROOT; };
+		28C5AA721A15FED100372C59 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
+		28C5AA741A15FF0000372C59 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
+		28C5AA761A15FF2600372C59 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
+		28C5AA781A15FF3600372C59 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
+		28C5AA7A1A15FF4700372C59 /* libiconv.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.2.dylib; path = usr/lib/libiconv.2.dylib; sourceTree = SDKROOT; };
+		28C5AA7C1A15FF5700372C59 /* libiconv.2.4.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.2.4.0.dylib; path = usr/lib/libiconv.2.4.0.dylib; sourceTree = SDKROOT; };
 		9201000018D5A444003D1ACA /* isom_intern.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = isom_intern.c; sourceTree = "<group>"; };
 		9201000118D5A444003D1ACA /* isom_read.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = isom_read.c; sourceTree = "<group>"; };
 		9201000218D5A444003D1ACA /* isom_store.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = isom_store.c; sourceTree = "<group>"; };
@@ -534,7 +607,6 @@
 		9201002418D5A444003D1ACA /* av_parsers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = av_parsers.c; sourceTree = "<group>"; };
 		9201002518D5A444003D1ACA /* avilib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = avilib.c; sourceTree = "<group>"; };
 		9201002618D5A444003D1ACA /* dash_client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dash_client.c; sourceTree = "<group>"; };
-		9201002718D5A444003D1ACA /* dash_client.c alias */ = {isa = PBXFileReference; lastKnownFileType = file; path = "dash_client.c alias"; sourceTree = "<group>"; };
 		9201002818D5A444003D1ACA /* dash_segmenter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dash_segmenter.c; sourceTree = "<group>"; };
 		9201002918D5A444003D1ACA /* dsmcc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dsmcc.c; sourceTree = "<group>"; };
 		9201002A18D5A444003D1ACA /* dvb_mpe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dvb_mpe.c; sourceTree = "<group>"; };
@@ -646,7 +718,6 @@
 		9201009A18D5A444003D1ACA /* module.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = module.c; sourceTree = "<group>"; };
 		9201009B18D5A444003D1ACA /* module_wrap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = module_wrap.h; sourceTree = "<group>"; };
 		9201009C18D5A444003D1ACA /* os_config_init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = os_config_init.c; sourceTree = "<group>"; };
-		9201009D18D5A444003D1ACA /* os_divers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = os_divers.c; sourceTree = "<group>"; };
 		9201009E18D5A444003D1ACA /* os_module.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = os_module.c; sourceTree = "<group>"; };
 		9201009F18D5A444003D1ACA /* os_net.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = os_net.c; sourceTree = "<group>"; };
 		920100A018D5A444003D1ACA /* os_thread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = os_thread.c; sourceTree = "<group>"; };
@@ -901,7 +972,6 @@
 		9201FF7818D5A444003D1ACA /* math.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = math.dep; sourceTree = "<group>"; };
 		9201FF7918D5A444003D1ACA /* module.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = module.dep; sourceTree = "<group>"; };
 		9201FF7A18D5A444003D1ACA /* os_config_init.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = os_config_init.dep; sourceTree = "<group>"; };
-		9201FF7B18D5A444003D1ACA /* os_divers.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = os_divers.dep; sourceTree = "<group>"; };
 		9201FF7C18D5A444003D1ACA /* os_module.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = os_module.dep; sourceTree = "<group>"; };
 		9201FF7D18D5A444003D1ACA /* os_net.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = os_net.dep; sourceTree = "<group>"; };
 		9201FF7E18D5A444003D1ACA /* os_thread.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = os_thread.dep; sourceTree = "<group>"; };
@@ -1025,7 +1095,6 @@
 		9201FFFA18D5A444003D1ACA /* box_funcs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box_funcs.c; sourceTree = "<group>"; };
 		9201FFFB18D5A444003D1ACA /* data_map.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = data_map.c; sourceTree = "<group>"; };
 		9201FFFC18D5A444003D1ACA /* drm_sample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = drm_sample.c; sourceTree = "<group>"; };
-		9201FFFD18D5A444003D1ACA /* generic_subtitle.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = generic_subtitle.o; sourceTree = "<group>"; };
 		9201FFFE18D5A444003D1ACA /* hint_track.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hint_track.c; sourceTree = "<group>"; };
 		9201FFFF18D5A444003D1ACA /* hinting.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hinting.c; sourceTree = "<group>"; };
 		9225732418D7267900D6FD98 /* gm_ogg_in.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_ogg_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1034,8 +1103,7 @@
 		9225732C18D7269700D6FD98 /* ogg_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ogg_load.c; path = ../../modules/ogg/ogg_load.c; sourceTree = "<group>"; };
 		9225732D18D7269700D6FD98 /* theora_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = theora_dec.c; path = ../../modules/ogg/theora_dec.c; sourceTree = "<group>"; };
 		9225732E18D7269700D6FD98 /* vorbis_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vorbis_dec.c; path = ../../modules/ogg/vorbis_dec.c; sourceTree = "<group>"; };
-		929F891B19FE83AE0076FC13 /* carbon_events.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = carbon_events.c; path = ../../applications/mp4client/carbon_events.c; sourceTree = "<group>"; };
-		929F891E19FE84AB0076FC13 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Carbon.framework; sourceTree = DEVELOPER_DIR; };
+		922B48781A5ADAB3006CBBBA /* os_module.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = os_module.c; sourceTree = "<group>"; };
 		92AAF0D318D6DB2D00E2FF12 /* gm_sdl_out.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_sdl_out.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		92AAF0D818D6DB5500E2FF12 /* audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio.c; path = ../../modules/sdl_out/audio.c; sourceTree = "<group>"; };
 		92AAF0DA18D6DB5500E2FF12 /* sdl_out.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sdl_out.c; path = ../../modules/sdl_out/sdl_out.c; sourceTree = "<group>"; };
@@ -1102,13 +1170,9 @@
 		92AAF1B418D70A0A00E2FF12 /* mp3_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mp3_in.c; path = ../../modules/mp3_in/mp3_in.c; sourceTree = "<group>"; };
 		92AAF1BE18D70B1C00E2FF12 /* gm_openhevc_dec.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_openhevc_dec.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		92AAF1C318D70B4100E2FF12 /* openhevc_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = openhevc_dec.c; path = ../../modules/openhevc_dec/openhevc_dec.c; sourceTree = "<group>"; };
-		92AAF1CB18D70C3100E2FF12 /* gm_opensvc_dec.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_opensvc_dec.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		92AAF1D018D70D4B00E2FF12 /* opensvc_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = opensvc_dec.c; path = ../../modules/opensvc_dec/opensvc_dec.c; sourceTree = "<group>"; };
 		92AAF1D518D7109A00E2FF12 /* vtt_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vtt_dec.c; path = ../../modules/vtt_in/vtt_dec.c; sourceTree = "<group>"; };
 		92AAF1D618D7109A00E2FF12 /* vtt_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vtt_in.c; path = ../../modules/vtt_in/vtt_in.c; sourceTree = "<group>"; };
-		92AAF1DF18D7126900E2FF12 /* gm_x11_out.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_x11_out.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		92AAF1E718D712C500E2FF12 /* x11_out.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = x11_out.c; path = ../../modules/x11_out/x11_out.c; sourceTree = "<group>"; };
-		92AAF1E818D712C500E2FF12 /* x11_out.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = x11_out.h; path = ../../modules/x11_out/x11_out.h; sourceTree = "<group>"; };
 		92BE509018D6325E00AA59D8 /* MP4Box */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MP4Box; sourceTree = BUILT_PRODUCTS_DIR; };
 		92BE50A418D6348A00AA59D8 /* filedump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filedump.c; path = ../../applications/mp4box/filedump.c; sourceTree = SOURCE_ROOT; };
 		92BE50A518D6348A00AA59D8 /* fileimport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fileimport.c; path = ../../applications/mp4box/fileimport.c; sourceTree = SOURCE_ROOT; };
@@ -1128,9 +1192,32 @@
 		92BE510E18D6DA6300AA59D8 /* raster_rgb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster_rgb.c; path = ../../modules/soft_raster/raster_rgb.c; sourceTree = "<group>"; };
 		92BE510F18D6DA6300AA59D8 /* stencil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stencil.c; path = ../../modules/soft_raster/stencil.c; sourceTree = "<group>"; };
 		92BE511018D6DA6300AA59D8 /* surface.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = surface.c; path = ../../modules/soft_raster/surface.c; sourceTree = "<group>"; };
+		92D5356F1A5C0CF700F2442A /* carbon_events.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = carbon_events.c; path = ../../applications/mp4client/carbon_events.c; sourceTree = "<group>"; };
+		92F930801A5ADB870072A85C /* os_divers.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = os_divers.c; sourceTree = "<group>"; };
+		92F930811A5ADB870072A85C /* os_file.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = os_file.c; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+		2839E27B1A162C24002D73E1 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2839E2831A162CC9002D73E1 /* libgpac.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		2839E2851A1635F7002D73E1 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2839E2CD1A163E1E002D73E1 /* Foundation.framework in Frameworks */,
+				2839E2CB1A16375C002D73E1 /* QTKit.framework in Frameworks */,
+				2839E2C51A163712002D73E1 /* CoreMedia.framework in Frameworks */,
+				2839E2C31A163700002D73E1 /* AVFoundation.framework in Frameworks */,
+				2839E2C21A1636A7002D73E1 /* libgpac.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		9201F93418D5A38A003D1ACA /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -1184,6 +1271,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				28C5AA691A152BC400372C59 /* VideoDecodeAcceleration.framework in Frameworks */,
+				28C5AA671A152BB700372C59 /* CoreFoundation.framework in Frameworks */,
+				28C5AA651A15240800372C59 /* AVFoundation.framework in Frameworks */,
 				92AAF19C18D6FDD900E2FF12 /* libgpac.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1204,22 +1294,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		92AAF1C818D70C3100E2FF12 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				92AAF1D318D70DE500E2FF12 /* libgpac.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		92AAF1DC18D7126900E2FF12 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				92AAF1E318D7129A00E2FF12 /* libgpac.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		92BE508D18D6325E00AA59D8 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -1240,7 +1314,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				929F891F19FE84AB0076FC13 /* Carbon.framework in Frameworks */,
+				28C5AA801A16277200372C59 /* Carbon.framework in Frameworks */,
 				92BE50D518D6D66C00AA59D8 /* libgpac.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1248,6 +1322,54 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		2839E2891A1635F7002D73E1 /* DashCast */ = {
+			isa = PBXGroup;
+			children = (
+				2839E28A1A1635F7002D73E1 /* main.c */,
+				2839E28C1A1635F7002D73E1 /* DashCast.1 */,
+			);
+			path = DashCast;
+			sourceTree = "<group>";
+		};
+		2839E2911A1635FE002D73E1 /* DashCast */ = {
+			isa = PBXGroup;
+			children = (
+				2839E2921A16363E002D73E1 /* audio_data.c */,
+				2839E2931A16363E002D73E1 /* audio_data.h */,
+				2839E2941A16363E002D73E1 /* audio_decoder.c */,
+				2839E2951A16363E002D73E1 /* audio_decoder.h */,
+				2839E2961A16363E002D73E1 /* audio_encoder.c */,
+				2839E2971A16363E002D73E1 /* audio_encoder.h */,
+				2839E2981A16363E002D73E1 /* audio_muxer.c */,
+				2839E2991A16363E002D73E1 /* audio_muxer.h */,
+				2839E29A1A16363E002D73E1 /* circular_buffer.c */,
+				2839E29B1A16363E002D73E1 /* circular_buffer.h */,
+				2839E29C1A16363E002D73E1 /* cmd_data.c */,
+				2839E29D1A16363E002D73E1 /* cmd_data.h */,
+				2839E29E1A16363E002D73E1 /* controler.c */,
+				2839E29F1A16363E002D73E1 /* controler.h */,
+				2839E2A01A16363E002D73E1 /* dashcast.c */,
+				2839E2A11A16363E002D73E1 /* libav_compat.h */,
+				2839E2A21A16363E002D73E1 /* message_queue.c */,
+				2839E2A31A16363E002D73E1 /* message_queue.h */,
+				2839E2A41A16363E002D73E1 /* register.c */,
+				2839E2A51A16363E002D73E1 /* register.h */,
+				2839E2A61A16363E002D73E1 /* task.c */,
+				2839E2A71A16363E002D73E1 /* task.h */,
+				2839E2A81A16363E002D73E1 /* video_data.c */,
+				2839E2A91A16363E002D73E1 /* video_data.h */,
+				2839E2AA1A16363E002D73E1 /* video_decoder.c */,
+				2839E2AB1A16363E002D73E1 /* video_decoder.h */,
+				2839E2AC1A16363E002D73E1 /* video_encoder.c */,
+				2839E2AD1A16363E002D73E1 /* video_encoder.h */,
+				2839E2AE1A16363E002D73E1 /* video_muxer.c */,
+				2839E2AF1A16363E002D73E1 /* video_muxer.h */,
+				2839E2B01A16363E002D73E1 /* video_scaler.c */,
+				2839E2B11A16363E002D73E1 /* video_scaler.h */,
+			);
+			name = DashCast;
+			sourceTree = "<group>";
+		};
 		9201000E18D5A444003D1ACA /* laser */ = {
 			isa = PBXGroup;
 			children = (
@@ -1286,7 +1408,6 @@
 				9201002418D5A444003D1ACA /* av_parsers.c */,
 				9201002518D5A444003D1ACA /* avilib.c */,
 				9201002618D5A444003D1ACA /* dash_client.c */,
-				9201002718D5A444003D1ACA /* dash_client.c alias */,
 				9201002818D5A444003D1ACA /* dash_segmenter.c */,
 				9201002918D5A444003D1ACA /* dsmcc.c */,
 				9201002A18D5A444003D1ACA /* dvb_mpe.c */,
@@ -1418,6 +1539,9 @@
 		9201008C18D5A444003D1ACA /* utils */ = {
 			isa = PBXGroup;
 			children = (
+				92F930801A5ADB870072A85C /* os_divers.c */,
+				92F930811A5ADB870072A85C /* os_file.c */,
+				922B48781A5ADAB3006CBBBA /* os_module.c */,
 				9201008D18D5A444003D1ACA /* alloc.c */,
 				9201008E18D5A444003D1ACA /* base_encoding.c */,
 				9201008F18D5A444003D1ACA /* bitstream.c */,
@@ -1433,7 +1557,6 @@
 				9201009A18D5A444003D1ACA /* module.c */,
 				9201009B18D5A444003D1ACA /* module_wrap.h */,
 				9201009C18D5A444003D1ACA /* os_config_init.c */,
-				9201009D18D5A444003D1ACA /* os_divers.c */,
 				9201009E18D5A444003D1ACA /* os_module.c */,
 				9201009F18D5A444003D1ACA /* os_net.c */,
 				920100A018D5A444003D1ACA /* os_thread.c */,
@@ -1454,11 +1577,30 @@
 		9201F92718D5A359003D1ACA = {
 			isa = PBXGroup;
 			children = (
-				929F891E19FE84AB0076FC13 /* Carbon.framework */,
+				2839E2CC1A163E1E002D73E1 /* Foundation.framework */,
+				2839E2CA1A16375C002D73E1 /* QTKit.framework */,
+				2839E2C81A16373B002D73E1 /* QuickTime.framework */,
+				2839E2C61A16371B002D73E1 /* CoreMediaIO.framework */,
+				2839E2C41A163711002D73E1 /* CoreMedia.framework */,
+				28C5AA7C1A15FF5700372C59 /* libiconv.2.4.0.dylib */,
+				28C5AA7A1A15FF4700372C59 /* libiconv.2.dylib */,
+				28C5AA781A15FF3600372C59 /* libiconv.dylib */,
+				28C5AA761A15FF2600372C59 /* Cocoa.framework */,
+				28C5AA741A15FF0000372C59 /* Carbon.framework */,
+				28C5AA721A15FED100372C59 /* IOKit.framework */,
+				28C5AA701A15FE8C00372C59 /* ForceFeedback.framework */,
+				28C5AA6E1A15FE7300372C59 /* AudioUnit.framework */,
+				28C5AA6C1A15FE4A00372C59 /* CoreAudio.framework */,
+				28C5AA6A1A15FCD200372C59 /* ApplicationServices.framework */,
+				28C5AA681A152BC400372C59 /* VideoDecodeAcceleration.framework */,
+				28C5AA661A152BB700372C59 /* CoreFoundation.framework */,
+				28C5AA641A15240800372C59 /* AVFoundation.framework */,
+				28C5AA621A1523A600372C59 /* libOpenSVCDec.a */,
 				92BE50AE18D6378C00AA59D8 /* xcode */,
 				92BE50AC18D6375100AA59D8 /* applications */,
 				92BE50AD18D6376A00AA59D8 /* modules */,
 				9201FE7E18D5A444003D1ACA /* libgpac */,
+				2839E2891A1635F7002D73E1 /* DashCast */,
 			);
 			sourceTree = "<group>";
 		};
@@ -1476,9 +1618,9 @@
 				92AAF19818D6FDC300E2FF12 /* gm_ffmpeg_in.dylib */,
 				92AAF1AE18D709D900E2FF12 /* gm_mp3_in.dylib */,
 				92AAF1BE18D70B1C00E2FF12 /* gm_openhevc_dec.dylib */,
-				92AAF1CB18D70C3100E2FF12 /* gm_opensvc_dec.dylib */,
-				92AAF1DF18D7126900E2FF12 /* gm_x11_out.dylib */,
 				9225732418D7267900D6FD98 /* gm_ogg_in.dylib */,
+				2839E27E1A162C24002D73E1 /* libopensvc.dylib */,
+				2839E2881A1635F7002D73E1 /* DashCast */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1842,7 +1984,6 @@
 				9201FF7818D5A444003D1ACA /* math.dep */,
 				9201FF7918D5A444003D1ACA /* module.dep */,
 				9201FF7A18D5A444003D1ACA /* os_config_init.dep */,
-				9201FF7B18D5A444003D1ACA /* os_divers.dep */,
 				9201FF7C18D5A444003D1ACA /* os_module.dep */,
 				9201FF7D18D5A444003D1ACA /* os_net.dep */,
 				9201FF7E18D5A444003D1ACA /* os_thread.dep */,
@@ -1994,7 +2135,6 @@
 				9201FFFA18D5A444003D1ACA /* box_funcs.c */,
 				9201FFFB18D5A444003D1ACA /* data_map.c */,
 				9201FFFC18D5A444003D1ACA /* drm_sample.c */,
-				9201FFFD18D5A444003D1ACA /* generic_subtitle.o */,
 				9201FFFE18D5A444003D1ACA /* hint_track.c */,
 				9201FFFF18D5A444003D1ACA /* hinting.c */,
 				9201000018D5A444003D1ACA /* isom_intern.c */,
@@ -2323,15 +2463,6 @@
 			name = vtt_in;
 			sourceTree = "<group>";
 		};
-		92AAF1E418D712A300E2FF12 /* x11_out */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF1E718D712C500E2FF12 /* x11_out.c */,
-				92AAF1E818D712C500E2FF12 /* x11_out.h */,
-			);
-			name = x11_out;
-			sourceTree = "<group>";
-		};
 		92BE509218D6325E00AA59D8 /* MP4Box */ = {
 			isa = PBXGroup;
 			children = (
@@ -2346,7 +2477,8 @@
 		92BE50AC18D6375100AA59D8 /* applications */ = {
 			isa = PBXGroup;
 			children = (
-				929F891B19FE83AE0076FC13 /* carbon_events.c */,
+				92D5356F1A5C0CF700F2442A /* carbon_events.c */,
+				2839E2911A1635FE002D73E1 /* DashCast */,
 				92BE50C918D6D60100AA59D8 /* MP4Client */,
 				92BE50B518D6D53000AA59D8 /* MP42TS */,
 				92BE509218D6325E00AA59D8 /* MP4Box */,
@@ -2366,7 +2498,6 @@
 				92AAF1C218D70B3000E2FF12 /* openhevc_dec */,
 				92AAF1CF18D70D3E00E2FF12 /* opensvc_dec */,
 				92AAF0D718D6DB3400E2FF12 /* sdl_out */,
-				92AAF1E418D712A300E2FF12 /* x11_out */,
 			);
 			name = modules;
 			sourceTree = "<group>";
@@ -2424,6 +2555,13 @@
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
+		2839E27C1A162C24002D73E1 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		9201F93518D5A38A003D1ACA /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -2513,24 +2651,43 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		92AAF1C918D70C3100E2FF12 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		2839E27D1A162C24002D73E1 /* opensvc */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 2839E27F1A162C24002D73E1 /* Build configuration list for PBXNativeTarget "opensvc" */;
+			buildPhases = (
+				2839E27A1A162C24002D73E1 /* Sources */,
+				2839E27B1A162C24002D73E1 /* Frameworks */,
+				2839E27C1A162C24002D73E1 /* Headers */,
 			);
-			runOnlyForDeploymentPostprocessing = 0;
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = opensvc;
+			productName = opensvc;
+			productReference = 2839E27E1A162C24002D73E1 /* libopensvc.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
 		};
-		92AAF1DD18D7126900E2FF12 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				92AAF1EB18D712C500E2FF12 /* x11_out.h in Headers */,
+		2839E2871A1635F7002D73E1 /* DashCast */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 2839E28E1A1635F7002D73E1 /* Build configuration list for PBXNativeTarget "DashCast" */;
+			buildPhases = (
+				2839E2841A1635F7002D73E1 /* Sources */,
+				2839E2851A1635F7002D73E1 /* Frameworks */,
+				2839E2861A1635F7002D73E1 /* CopyFiles */,
 			);
-			runOnlyForDeploymentPostprocessing = 0;
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = DashCast;
+			productName = DashCast;
+			productReference = 2839E2881A1635F7002D73E1 /* DashCast */;
+			productType = "com.apple.product-type.tool";
 		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
 		9201F93618D5A38A003D1ACA /* libgpac */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 9201F93B18D5A38A003D1ACA /* Build configuration list for PBXNativeTarget "libgpac" */;
@@ -2685,40 +2842,6 @@
 			productReference = 92AAF1BE18D70B1C00E2FF12 /* gm_openhevc_dec.dylib */;
 			productType = "com.apple.product-type.library.dynamic";
 		};
-		92AAF1CA18D70C3100E2FF12 /* opensvc_dec */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 92AAF1CC18D70C3100E2FF12 /* Build configuration list for PBXNativeTarget "opensvc_dec" */;
-			buildPhases = (
-				92AAF1C718D70C3100E2FF12 /* Sources */,
-				92AAF1C818D70C3100E2FF12 /* Frameworks */,
-				92AAF1C918D70C3100E2FF12 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = opensvc_dec;
-			productName = opensvc_dec;
-			productReference = 92AAF1CB18D70C3100E2FF12 /* gm_opensvc_dec.dylib */;
-			productType = "com.apple.product-type.library.dynamic";
-		};
-		92AAF1DE18D7126900E2FF12 /* x11_out */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 92AAF1E018D7126900E2FF12 /* Build configuration list for PBXNativeTarget "x11_out" */;
-			buildPhases = (
-				92AAF1DB18D7126900E2FF12 /* Sources */,
-				92AAF1DC18D7126900E2FF12 /* Frameworks */,
-				92AAF1DD18D7126900E2FF12 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = x11_out;
-			productName = x11_out;
-			productReference = 92AAF1DF18D7126900E2FF12 /* gm_x11_out.dylib */;
-			productType = "com.apple.product-type.library.dynamic";
-		};
 		92BE508F18D6325E00AA59D8 /* MP4Box */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 92BE509918D6325E00AA59D8 /* Build configuration list for PBXNativeTarget "MP4Box" */;
@@ -2765,8 +2888,6 @@
 			);
 			dependencies = (
 				9225733618D727B500D6FD98 /* PBXTargetDependency */,
-				9225731918D717BD00D6FD98 /* PBXTargetDependency */,
-				9225731718D717BA00D6FD98 /* PBXTargetDependency */,
 				9225731518D717B400D6FD98 /* PBXTargetDependency */,
 				9225731318D717B100D6FD98 /* PBXTargetDependency */,
 				9225731118D717AE00D6FD98 /* PBXTargetDependency */,
@@ -2786,7 +2907,7 @@
 		9201F92918D5A359003D1ACA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0510;
 				ORGANIZATIONNAME = "Telecom ParisTech";
 			};
 			buildConfigurationList = 9201F92C18D5A359003D1ACA /* Build configuration list for PBXProject "gpac" */;
@@ -2805,6 +2926,7 @@
 				92BE508F18D6325E00AA59D8 /* MP4Box */,
 				92BE50B218D6D53000AA59D8 /* MP42TS */,
 				92BE50C618D6D60100AA59D8 /* MP4Client */,
+				2839E2871A1635F7002D73E1 /* DashCast */,
 				92AAF0D218D6DB2D00E2FF12 /* sdl_out */,
 				92AAF16418D6F40400E2FF12 /* ft_font */,
 				92AAF17718D6F89B00E2FF12 /* aac_in */,
@@ -2812,18 +2934,51 @@
 				92AAF19718D6FDC300E2FF12 /* ffmpeg_in */,
 				92AAF1AD18D709D900E2FF12 /* mp3_in */,
 				92AAF1BD18D70B1C00E2FF12 /* openhevc_dec */,
-				92AAF1CA18D70C3100E2FF12 /* opensvc_dec */,
-				92AAF1DE18D7126900E2FF12 /* x11_out */,
 				9225732318D7267900D6FD98 /* ogg_in */,
+				2839E27D1A162C24002D73E1 /* opensvc */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXSourcesBuildPhase section */
+		2839E27A1A162C24002D73E1 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2839E2821A162C48002D73E1 /* opensvc_dec.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		2839E2841A1635F7002D73E1 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2839E2B91A16363E002D73E1 /* dashcast.c in Sources */,
+				2839E2BB1A16363E002D73E1 /* register.c in Sources */,
+				2839E2B21A16363E002D73E1 /* audio_data.c in Sources */,
+				2839E2B41A16363E002D73E1 /* audio_encoder.c in Sources */,
+				2839E2BE1A16363E002D73E1 /* video_decoder.c in Sources */,
+				2839E2C01A16363E002D73E1 /* video_muxer.c in Sources */,
+				2839E2B51A16363E002D73E1 /* audio_muxer.c in Sources */,
+				2839E2B81A16363E002D73E1 /* controler.c in Sources */,
+				2839E2B61A16363E002D73E1 /* circular_buffer.c in Sources */,
+				2839E2BF1A16363E002D73E1 /* video_encoder.c in Sources */,
+				2839E2BA1A16363E002D73E1 /* message_queue.c in Sources */,
+				2839E2C11A16363E002D73E1 /* video_scaler.c in Sources */,
+				2839E2BD1A16363E002D73E1 /* video_data.c in Sources */,
+				2839E2B31A16363E002D73E1 /* audio_decoder.c in Sources */,
+				2839E2BC1A16363E002D73E1 /* task.c in Sources */,
+				2839E2B71A16363E002D73E1 /* cmd_data.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		9201F93318D5A38A003D1ACA /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				92F930821A5ADB870072A85C /* os_divers.c in Sources */,
+				92F930831A5ADB870072A85C /* os_file.c in Sources */,
+				920101B718D5A445003D1ACA /* os_module.c in Sources */,
 				920100B018D5A444003D1ACA /* arith_decoder.c in Sources */,
 				920100B118D5A444003D1ACA /* bifs_codec.c in Sources */,
 				920100B218D5A444003D1ACA /* bifs_node_tables.c in Sources */,
@@ -3058,7 +3213,6 @@
 				920101A918D5A445003D1ACA /* cache.c in Sources */,
 				920101AA18D5A445003D1ACA /* color.c in Sources */,
 				920101AB18D5A445003D1ACA /* configfile.c in Sources */,
-				920101AC18D5A445003D1ACA /* dlmalloc.c in Sources */,
 				920101AD18D5A445003D1ACA /* downloader.c in Sources */,
 				920101AE18D5A445003D1ACA /* error.c in Sources */,
 				920101B018D5A445003D1ACA /* list.c in Sources */,
@@ -3066,8 +3220,6 @@
 				920101B218D5A445003D1ACA /* math.c in Sources */,
 				920101B318D5A445003D1ACA /* module.c in Sources */,
 				920101B518D5A445003D1ACA /* os_config_init.c in Sources */,
-				920101B618D5A445003D1ACA /* os_divers.c in Sources */,
-				920101B718D5A445003D1ACA /* os_module.c in Sources */,
 				920101B818D5A445003D1ACA /* os_net.c in Sources */,
 				920101B918D5A445003D1ACA /* os_thread.c in Sources */,
 				920101BA18D5A445003D1ACA /* path2d.c in Sources */,
@@ -3204,22 +3356,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		92AAF1C718D70C3100E2FF12 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				92AAF1D218D70D5100E2FF12 /* opensvc_dec.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		92AAF1DB18D7126900E2FF12 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				92AAF1EA18D712C500E2FF12 /* x11_out.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		92BE508C18D6325E00AA59D8 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -3243,9 +3379,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				92D535711A5C0D1400F2442A /* carbon_events.c in Sources */,
 				92BE50D318D6D62600AA59D8 /* extract.c in Sources */,
 				92BE50D418D6D62600AA59D8 /* main.c in Sources */,
-				929F891C19FE83AE0076FC13 /* carbon_events.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3272,16 +3408,6 @@
 			target = 92AAF1BD18D70B1C00E2FF12 /* openhevc_dec */;
 			targetProxy = 9225731418D717B400D6FD98 /* PBXContainerItemProxy */;
 		};
-		9225731718D717BA00D6FD98 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 92AAF1CA18D70C3100E2FF12 /* opensvc_dec */;
-			targetProxy = 9225731618D717BA00D6FD98 /* PBXContainerItemProxy */;
-		};
-		9225731918D717BD00D6FD98 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 92AAF1DE18D7126900E2FF12 /* x11_out */;
-			targetProxy = 9225731818D717BD00D6FD98 /* PBXContainerItemProxy */;
-		};
 		9225733618D727B500D6FD98 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 9225732318D7267900D6FD98 /* ogg_in */;
@@ -3305,11 +3431,217 @@
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
+		2839E2801A162C24002D73E1 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				EXECUTABLE_PREFIX = lib;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				LD_DYLIB_INSTALL_NAME = gm_opensvc.dylib;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				OTHER_LDFLAGS = "-lOpenSVCDec";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		2839E2811A162C24002D73E1 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				EXECUTABLE_PREFIX = lib;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				LD_DYLIB_INSTALL_NAME = gm_opensvc.dylib;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				OTHER_LDFLAGS = "-lOpenSVCDec";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		2839E28F1A1635F7002D73E1 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					/usr/local/lib,
+					/opt/local/lib,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				OTHER_LDFLAGS = (
+					"-lz",
+					"-lavcodec",
+					"-lavformat",
+					"-lavutil",
+					"-lswscale",
+					"-lbz2",
+					"-lswresample",
+					"-lx264",
+					"-lx265",
+					"-lavdevice",
+					"-lavfilter",
+					"-lavresample",
+					"-lpostproc",
+					"-liconv",
+					"-weak_framework",
+					VideoDecodeAcceleration,
+					"-weak_framework",
+					CoreFoundation,
+					"-weak_framework",
+					QuartzCore,
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		2839E2901A1635F7002D73E1 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					/usr/local/lib,
+					/opt/local/lib,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				OTHER_LDFLAGS = (
+					"-lz",
+					"-lavcodec",
+					"-lavformat",
+					"-lavutil",
+					"-lswscale",
+					"-lbz2",
+					"-lswresample",
+					"-lx264",
+					"-lx265",
+					"-lavdevice",
+					"-lavfilter",
+					"-lavresample",
+					"-lpostproc",
+					"-liconv",
+					"-weak_framework",
+					VideoDecodeAcceleration,
+					"-weak_framework",
+					CoreFoundation,
+					"-weak_framework",
+					QuartzCore,
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
 		9201F92E18D5A359003D1ACA /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				HEADER_SEARCH_PATHS = ../../include;
+				GCC_PREPROCESSOR_DEFINITIONS = GPAC_CONFIG_DARWIN;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					../../extra_lib/include,
+				);
+				LIBRARY_SEARCH_PATHS = ../../extra_lib/lib/gcc;
 				OBJROOT = build;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-Wno-conversion";
 				SYMROOT = ../../bin/osx/;
 			};
@@ -3318,7 +3650,12 @@
 		9201F92F18D5A359003D1ACA /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				HEADER_SEARCH_PATHS = ../../include;
+				GCC_PREPROCESSOR_DEFINITIONS = GPAC_CONFIG_DARWIN;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					../../extra_lib/include,
+				);
+				LIBRARY_SEARCH_PATHS = ../../extra_lib/lib/gcc;
 				OBJROOT = build;
 				OTHER_CFLAGS = "-Wno-conversion";
 				SYMROOT = ../../bin/osx/;
@@ -3329,7 +3666,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = lib;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3384,7 +3720,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = lib;
@@ -3394,6 +3729,8 @@
 					GPAC_STATIC_MODULES,
 					GPAC_CONFIG_DARWIN,
 					CONFIG_DARWIN_GL,
+					NO_JS_RUNTIMETHREAD,
+					SPIDERMONKEY_NEW_API,
 				);
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -3433,7 +3770,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3454,6 +3790,7 @@
 					../../include,
 					/opt/local/include,
 				);
+				INSTALL_PATH = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3465,7 +3802,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = gm_;
@@ -3480,6 +3816,7 @@
 					../../include,
 					/opt/local/include,
 				);
+				INSTALL_PATH = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
@@ -3490,9 +3827,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = gm_;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LOCAL_LIBRARY_DIR)/Frameworks",
+				);
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -3510,8 +3850,13 @@
 				HEADER_SEARCH_PATHS = (
 					/usr/local/include/SDL2,
 					../../include,
+					/opt/local/include/SDL2,
+				);
+				INSTALL_PATH = "";
+				LIBRARY_SEARCH_PATHS = (
+					/usr/local/lib,
+					/opt/local/lib,
 				);
-				LIBRARY_SEARCH_PATHS = /usr/local/lib;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-lSDL2";
@@ -3524,10 +3869,13 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = gm_;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LOCAL_LIBRARY_DIR)/Frameworks",
+				);
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -3538,8 +3886,13 @@
 				HEADER_SEARCH_PATHS = (
 					/usr/local/include/SDL2,
 					../../include,
+					/opt/local/include/SDL2,
+				);
+				INSTALL_PATH = "";
+				LIBRARY_SEARCH_PATHS = (
+					/usr/local/lib,
+					/opt/local/lib,
 				);
-				LIBRARY_SEARCH_PATHS = /usr/local/lib;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OTHER_LDFLAGS = "-lSDL2";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3551,7 +3904,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3573,6 +3925,7 @@
 					/usr/include/freetype2,
 					/opt/local/include/freetype2,
 				);
+				INSTALL_PATH = "";
 				LIBRARY_SEARCH_PATHS = /opt/local/lib;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				ONLY_ACTIVE_ARCH = YES;
@@ -3586,7 +3939,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = gm_;
@@ -3602,6 +3954,7 @@
 					/usr/include/freetype2,
 					/opt/local/include/freetype2,
 				);
+				INSTALL_PATH = "";
 				LIBRARY_SEARCH_PATHS = /opt/local/lib;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OTHER_LDFLAGS = "-lfreetype";
@@ -3614,7 +3967,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3635,6 +3987,7 @@
 					/opt/local/include,
 					../../include,
 				);
+				INSTALL_PATH = "";
 				LIBRARY_SEARCH_PATHS = /opt/local/lib;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				ONLY_ACTIVE_ARCH = YES;
@@ -3648,7 +4001,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = gm_;
@@ -3664,6 +4016,7 @@
 					/opt/local/include,
 					../../include,
 				);
+				INSTALL_PATH = "";
 				LIBRARY_SEARCH_PATHS = /opt/local/lib;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OTHER_LDFLAGS = "-lfaad";
@@ -3676,7 +4029,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3697,6 +4049,7 @@
 					/opt/local/include/a52dec,
 					../../include,
 				);
+				INSTALL_PATH = "";
 				LIBRARY_SEARCH_PATHS = /opt/local/lib;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				ONLY_ACTIVE_ARCH = YES;
@@ -3710,7 +4063,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = gm_;
@@ -3725,6 +4077,7 @@
 					/opt/local/include/a52dec,
 					../../include,
 				);
+				INSTALL_PATH = "";
 				LIBRARY_SEARCH_PATHS = /opt/local/lib;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OTHER_LDFLAGS = "-la52";
@@ -3737,7 +4090,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3759,6 +4111,7 @@
 					/usr/local/include/,
 					/opt/local/include/,
 				);
+				INSTALL_PATH = "";
 				LIBRARY_SEARCH_PATHS = (
 					/usr/local/lib,
 					/opt/local/lib,
@@ -3772,6 +4125,16 @@
 					"-lavutil",
 					"-lswscale",
 					"-lbz2",
+					"-lswresample",
+					"-lx264",
+					"-lx265",
+					"-liconv",
+					"-weak_framework",
+					VideoDecodeAcceleration,
+					"-weak_framework",
+					CoreFoundation,
+					"-weak_framework",
+					QuartzCore,
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
@@ -3782,7 +4145,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = gm_;
@@ -3798,6 +4160,7 @@
 					/usr/local/include/,
 					/opt/local/include/,
 				);
+				INSTALL_PATH = "";
 				LIBRARY_SEARCH_PATHS = (
 					/usr/local/lib,
 					/opt/local/lib,
@@ -3810,6 +4173,16 @@
 					"-lavutil",
 					"-lswscale",
 					"-lbz2",
+					"-lswresample",
+					"-lx264",
+					"-lx265",
+					"-liconv",
+					"-weak_framework",
+					VideoDecodeAcceleration,
+					"-weak_framework",
+					CoreFoundation,
+					"-weak_framework",
+					QuartzCore,
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
@@ -3820,7 +4193,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3842,6 +4214,7 @@
 					/opt/local/include,
 					../../include,
 				);
+				INSTALL_PATH = "";
 				LIBRARY_SEARCH_PATHS = /opt/local/lib;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				ONLY_ACTIVE_ARCH = YES;
@@ -3855,7 +4228,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = gm_;
@@ -3871,6 +4243,7 @@
 					/opt/local/include,
 					../../include,
 				);
+				INSTALL_PATH = "";
 				LIBRARY_SEARCH_PATHS = /opt/local/lib;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OTHER_LDFLAGS = "-lmad";
@@ -3883,7 +4256,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3903,8 +4275,14 @@
 				HEADER_SEARCH_PATHS = (
 					../../include,
 					/usr/local/include,
+					../../extra_lib/include,
+				);
+				INSTALL_PATH = "";
+				LIBRARY_SEARCH_PATHS = (
+					/usr/local/lib,
+					../../extra_lib/lib/gcc,
+					/opt/local/lib,
 				);
-				LIBRARY_SEARCH_PATHS = /usr/local/lib;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-lLibOpenHevcWrapper";
@@ -3917,7 +4295,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = gm_;
@@ -3931,142 +4308,16 @@
 				HEADER_SEARCH_PATHS = (
 					../../include,
 					/usr/local/include,
+					../../extra_lib/include,
 				);
-				LIBRARY_SEARCH_PATHS = /usr/local/lib;
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				OTHER_LDFLAGS = "-lLibOpenHevcWrapper";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-			};
-			name = Release;
-		};
-		92AAF1CD18D70C3100E2FF12 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					/usr/local/include,
-				);
-				LIBRARY_SEARCH_PATHS = /usr/local/lib;
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_LDFLAGS = "-lOpenSVCDec";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-			};
-			name = Debug;
-		};
-		92AAF1CE18D70C3100E2FF12 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				EXECUTABLE_PREFIX = gm_;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					/usr/local/include,
-				);
-				LIBRARY_SEARCH_PATHS = /usr/local/lib;
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				OTHER_LDFLAGS = "-lOpenSVCDec";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-			};
-			name = Release;
-		};
-		92AAF1E118D7126900E2FF12 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-					GPAC_CONFIG_DARWIN,
-					CONFIG_DARWIN_GL,
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					/usr/X11R6/include,
-				);
-				LIBRARY_SEARCH_PATHS = "/usr/X11R6/lib\n/usr/X11R6/lib\n/usr/X11R6/lib";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_LDFLAGS = (
-					"-lX11",
-					"-lGL",
-					"-lGLU",
-				);
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-			};
-			name = Debug;
-		};
-		92AAF1E218D7126900E2FF12 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				EXECUTABLE_PREFIX = gm_;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					/usr/X11R6/include,
+				INSTALL_PATH = "";
+				LIBRARY_SEARCH_PATHS = (
+					/usr/local/lib,
+					../../extra_lib/lib/gcc,
+					/opt/local/lib,
 				);
-				LIBRARY_SEARCH_PATHS = "/usr/X11R6/lib\n/usr/X11R6/lib\n/usr/X11R6/lib";
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				OTHER_LDFLAGS = (
-					"-lX11",
-					"-lGL",
-					"-lGLU",
-				);
+				OTHER_LDFLAGS = "-lLibOpenHevcWrapper";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 			};
@@ -4076,7 +4327,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -4093,6 +4343,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../../include;
+				INSTALL_PATH = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OBJROOT = build;
 				ONLY_ACTIVE_ARCH = YES;
@@ -4106,7 +4357,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -4117,6 +4367,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../../include;
+				INSTALL_PATH = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OBJROOT = build;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4129,7 +4380,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -4145,6 +4395,7 @@
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				INSTALL_PATH = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OBJROOT = build;
 				ONLY_ACTIVE_ARCH = YES;
@@ -4157,7 +4408,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -4167,6 +4417,7 @@
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				INSTALL_PATH = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OBJROOT = build;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4178,7 +4429,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -4194,6 +4444,7 @@
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				INSTALL_PATH = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4205,7 +4456,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -4215,6 +4465,7 @@
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				INSTALL_PATH = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
@@ -4224,6 +4475,24 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		2839E27F1A162C24002D73E1 /* Build configuration list for PBXNativeTarget "opensvc" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2839E2801A162C24002D73E1 /* Debug */,
+				2839E2811A162C24002D73E1 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		2839E28E1A1635F7002D73E1 /* Build configuration list for PBXNativeTarget "DashCast" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2839E28F1A1635F7002D73E1 /* Debug */,
+				2839E2901A1635F7002D73E1 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		9201F92C18D5A359003D1ACA /* Build configuration list for PBXProject "gpac" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -4313,24 +4582,6 @@
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
-		};
-		92AAF1CC18D70C3100E2FF12 /* Build configuration list for PBXNativeTarget "opensvc_dec" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				92AAF1CD18D70C3100E2FF12 /* Debug */,
-				92AAF1CE18D70C3100E2FF12 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		92AAF1E018D7126900E2FF12 /* Build configuration list for PBXNativeTarget "x11_out" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				92AAF1E118D7126900E2FF12 /* Debug */,
-				92AAF1E218D7126900E2FF12 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
 		};
 		92BE509918D6325E00AA59D8 /* Build configuration list for PBXNativeTarget "MP4Box" */ = {
 			isa = XCConfigurationList;

gpac-0.5.1.svn5491.tar.xz/build/xcode/gpac4ios.xcodeproj/project.pbxproj -> gpac-0.5.1.svn5619.tar.xz/build/xcode/gpac4ios.xcodeproj/project.pbxproj Changed

@@ -16,17 +16,14 @@
 		0496F09B16DE35C9009D9D8D /* libgpac_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71CCF1311277037A00339E12 /* libgpac_static.a */; };
 		0496F09C16DE36BC009D9D8D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847813127860F000917298 /* libz.dylib */; };
 		04EFB63516E51E4200D1D44A /* libglues.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 04EFB63416E51E4200D1D44A /* libglues.a */; };
-		285DBB44170F17C500AF2B9B /* ffmpeg_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 285DBB42170F17C500AF2B9B /* ffmpeg_decode.c */; };
-		285DBB47170F17CC00AF2B9B /* ffmpeg_demux.c in Sources */ = {isa = PBXBuildFile; fileRef = 285DBB45170F17CC00AF2B9B /* ffmpeg_demux.c */; };
 		285DBB49170F17D700AF2B9B /* ffmpeg_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 285DBB48170F17D700AF2B9B /* ffmpeg_in.h */; };
 		285DBBA01712C80E00AF2B9B /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 285DBB9B1712C80E00AF2B9B /* libavcodec.a */; };
 		285DBBA11712C80E00AF2B9B /* libavformat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 285DBB9C1712C80E00AF2B9B /* libavformat.a */; };
 		285DBBA21712C80E00AF2B9B /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 285DBB9D1712C80E00AF2B9B /* libavutil.a */; };
-		285DBBA31712C80E00AF2B9B /* libswresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 285DBB9E1712C80E00AF2B9B /* libswresample.a */; };
 		285DBBA41712C80E00AF2B9B /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 285DBB9F1712C80E00AF2B9B /* libswscale.a */; };
+		2897039C1A13C4050063E9C0 /* libswresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2897039B1A13C4050063E9C0 /* libswresample.a */; };
 		28F2240417D6367000E9D2BE /* ffmpeg_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F2240317D6367000E9D2BE /* ffmpeg_decode.c */; };
 		28F2240617D6369700E9D2BE /* ffmpeg_demux.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F2240517D6369700E9D2BE /* ffmpeg_demux.c */; };
-		28F2240817D636C300E9D2BE /* ffmpeg_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 28F2240717D636C300E9D2BE /* ffmpeg_in.h */; };
 		28F2240A17D636DA00E9D2BE /* ffmpeg_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F2240917D636DA00E9D2BE /* ffmpeg_load.c */; };
 		7141FF301292CB9200FCB27D /* alloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 7141FF2F1292CB9200FCB27D /* alloc.c */; };
 		7147426012B918C900DB5A59 /* cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 7147425F12B918C900DB5A59 /* cache.c */; };
@@ -275,7 +272,7 @@
 		71CCF3341277045100339E12 /* math.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2331277045100339E12 /* math.c */; };
 		71CCF3351277045100339E12 /* module.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2341277045100339E12 /* module.c */; };
 		71CCF3361277045100339E12 /* module_wrap.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF2351277045100339E12 /* module_wrap.h */; };
-		71CCF3371277045100339E12 /* os_divers.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2361277045100339E12 /* os_divers.c */; };
+		71CCF3371277045100339E12 /* os_file.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2361277045100339E12 /* os_file.c */; };
 		71CCF3381277045100339E12 /* os_module.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2371277045100339E12 /* os_module.c */; };
 		71CCF3391277045100339E12 /* os_net.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2381277045100339E12 /* os_net.c */; };
 		71CCF33A1277045100339E12 /* os_thread.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2391277045100339E12 /* os_thread.c */; };
@@ -368,7 +365,8 @@
 		71CCF3FE12770A8C00339E12 /* utf.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF3AF12770A8C00339E12 /* utf.h */; };
 		71CCF3FF12770A8C00339E12 /* xml.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF3B012770A8C00339E12 /* xml.h */; };
 		71EC88E11396273B004DCB6A /* osmo.icns in Resources */ = {isa = PBXBuildFile; fileRef = 71EC88E01396273B004DCB6A /* osmo.icns */; };
-		926B9D7116EFA5AC00773B53 /* osmo4ios.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = 926B9D7016EFA5AC00773B53 /* osmo4ios.entitlements */; };
+		925730A21A0916D20057FF04 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 925730A11A0916D20057FF04 /* libiconv.dylib */; };
+		925730A41A0916DB0057FF04 /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 925730A31A0916DB0057FF04 /* libbz2.dylib */; };
 		929A929C16EF8BC200B7C64F /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 929A929616EF8BC200B7C64F /* Default-568h@2x.png */; };
 		929A929D16EF8BC200B7C64F /* icon_ipad_retina.png in Resources */ = {isa = PBXBuildFile; fileRef = 929A929716EF8BC200B7C64F /* icon_ipad_retina.png */; };
 		929A929E16EF8BC200B7C64F /* icon_ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 929A929816EF8BC200B7C64F /* icon_ipad.png */; };
@@ -428,18 +426,17 @@
 		92BC213516EF8E7A000E0620 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199891278777A00ACFF58 /* unzip.c */; };
 		92BC213616EF8E7A000E0620 /* unzip.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A1998A1278777A00ACFF58 /* unzip.h */; };
 		92BC213716EF8E7A000E0620 /* video.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1999E1278778800ACFF58 /* video.c */; };
-		92BC213816EF8E7A000E0620 /* video2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1999F1278778800ACFF58 /* video2d.c */; };
 		92BC213916EF8E7A000E0620 /* wgt_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1998B1278777A00ACFF58 /* wgt_load.c */; };
 		92BC213A16EF8E7A000E0620 /* widget.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1998D1278777A00ACFF58 /* widget.c */; };
 		92BC213B16EF8E7A000E0620 /* widgetman.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1998E1278777A00ACFF58 /* widgetman.c */; };
 		92BC213C16EF8E7A000E0620 /* widgetman.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A1998F1278777A00ACFF58 /* widgetman.h */; };
-		92FA814116F235520002629E /* ios_cam.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA813E16F235520002629E /* ios_cam.c */; };
-		92FA825A16F2549D0002629E /* validator.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825916F2549D0002629E /* validator.c */; };
-		92FA825C16F254AF0002629E /* audio_filter.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825B16F254AF0002629E /* audio_filter.c */; };
-		92FA825E16F254C60002629E /* saf_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825D16F254C60002629E /* saf_in.c */; };
-		92FA826016F254DA0002629E /* isma_ea.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825F16F254DA0002629E /* isma_ea.c */; };
-		92FA826316F254F50002629E /* timedtext_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA826116F254F50002629E /* timedtext_dec.c */; };
-		92FA826416F254F50002629E /* timedtext_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA826216F254F50002629E /* timedtext_in.c */; };
+		92E8C78B1A0CD57A00E0436D /* timedtext_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA826116F254F50002629E /* timedtext_dec.c */; };
+		92E8C78C1A0CD57A00E0436D /* timedtext_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA826216F254F50002629E /* timedtext_in.c */; };
+		92E8C78D1A0CD57A00E0436D /* isma_ea.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825F16F254DA0002629E /* isma_ea.c */; };
+		92E8C78E1A0CD57A00E0436D /* saf_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825D16F254C60002629E /* saf_in.c */; };
+		92E8C78F1A0CD57A00E0436D /* audio_filter.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825B16F254AF0002629E /* audio_filter.c */; };
+		92E8C7901A0CD58300E0436D /* validator.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825916F2549D0002629E /* validator.c */; };
+		92F930861A5ADC1A0072A85C /* os_divers.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F930841A5ADC1A0072A85C /* os_divers.c */; };
 		970A26C913434D2C0007362C /* m3u8.c in Sources */ = {isa = PBXBuildFile; fileRef = 970A26C713434D2C0007362C /* m3u8.c */; };
 		970A26CA13434D2C0007362C /* mpd.c in Sources */ = {isa = PBXBuildFile; fileRef = 970A26C813434D2C0007362C /* mpd.c */; };
 		970A26CD13434D780007362C /* m3u8.h in Headers */ = {isa = PBXBuildFile; fileRef = 970A26CB13434D780007362C /* m3u8.h */; };
@@ -488,90 +485,13 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		04E81AC016E0FF0A004796EF /* applications-system.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "applications-system.svg"; sourceTree = "<group>"; };
-		04E81AC116E0FF0A004796EF /* init.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = init.js; sourceTree = "<group>"; };
-		04E81AC216E0FF0A004796EF /* gui.bt */ = {isa = PBXFileReference; lastKnownFileType = text; path = gui.bt; sourceTree = "<group>"; };
-		04E81AC316E0FF0A004796EF /* gui.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = gui.js; sourceTree = "<group>"; };
-		04E81AC416E0FF0A004796EF /* gui_old.bt */ = {isa = PBXFileReference; lastKnownFileType = text; path = gui_old.bt; sourceTree = "<group>"; };
-		04E81AC516E0FF0A004796EF /* gui_old.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = gui_old.js; sourceTree = "<group>"; };
-		04E81AC616E0FF0A004796EF /* gwlib.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = gwlib.js; sourceTree = "<group>"; };
-		04E81AC816E0FF0A004796EF /* applications-internet.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "applications-internet.svg"; sourceTree = "<group>"; };
-		04E81AC916E0FF0A004796EF /* applications-multimedia.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "applications-multimedia.svg"; sourceTree = "<group>"; };
-		04E81ACA16E0FF0A004796EF /* applications-system.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "applications-system.svg"; sourceTree = "<group>"; };
-		04E81ACB16E0FF0A004796EF /* audio-volume-high.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "audio-volume-high.svg"; sourceTree = "<group>"; };
-		04E81ACC16E0FF0A004796EF /* audio-volume-low.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "audio-volume-low.svg"; sourceTree = "<group>"; };
-		04E81ACD16E0FF0A004796EF /* audio-volume-medium.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "audio-volume-medium.svg"; sourceTree = "<group>"; };
-		04E81ACE16E0FF0A004796EF /* audio-volume-muted.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "audio-volume-muted.svg"; sourceTree = "<group>"; };
-		04E81ACF16E0FF0A004796EF /* audio-x-generic.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "audio-x-generic.svg"; sourceTree = "<group>"; };
-		04E81AD016E0FF0A004796EF /* battery-caution.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "battery-caution.svg"; sourceTree = "<group>"; };
-		04E81AD116E0FF0A004796EF /* camera-photo.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "camera-photo.svg"; sourceTree = "<group>"; };
-		04E81AD216E0FF0A004796EF /* camera-video.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "camera-video.svg"; sourceTree = "<group>"; };
-		04E81AD316E0FF0A004796EF /* dialog-error.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "dialog-error.svg"; sourceTree = "<group>"; };
-		04E81AD416E0FF0A004796EF /* dialog-information.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "dialog-information.svg"; sourceTree = "<group>"; };
-		04E81AD516E0FF0A004796EF /* dialog-warning.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "dialog-warning.svg"; sourceTree = "<group>"; };
-		04E81AD616E0FF0A004796EF /* document-new.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "document-new.svg"; sourceTree = "<group>"; };
-		04E81AD716E0FF0A004796EF /* document-print-preview.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "document-print-preview.svg"; sourceTree = "<group>"; };
-		04E81AD816E0FF0A004796EF /* document-print.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "document-print.svg"; sourceTree = "<group>"; };
-		04E81AD916E0FF0A004796EF /* document-save-as.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "document-save-as.svg"; sourceTree = "<group>"; };
-		04E81ADA16E0FF0A004796EF /* document-save.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "document-save.svg"; sourceTree = "<group>"; };
-		04E81ADB16E0FF0A004796EF /* edit-find.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "edit-find.svg"; sourceTree = "<group>"; };
-		04E81ADC16E0FF0A004796EF /* emblem-symbolic-link.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "emblem-symbolic-link.svg"; sourceTree = "<group>"; };
-		04E81ADD16E0FF0A004796EF /* emblem-unreadable.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "emblem-unreadable.svg"; sourceTree = "<group>"; };
-		04E81ADE16E0FF0A004796EF /* face-surprise.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "face-surprise.svg"; sourceTree = "<group>"; };
-		04E81ADF16E0FF0A004796EF /* folder-open.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "folder-open.svg"; sourceTree = "<group>"; };
-		04E81AE016E0FF0A004796EF /* folder.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = folder.svg; sourceTree = "<group>"; };
-		04E81AE116E0FF0A004796EF /* go-bottom.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-bottom.svg"; sourceTree = "<group>"; };
-		04E81AE216E0FF0A004796EF /* go-down.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-down.svg"; sourceTree = "<group>"; };
-		04E81AE316E0FF0A004796EF /* go-first.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-first.svg"; sourceTree = "<group>"; };
-		04E81AE416E0FF0A004796EF /* go-home.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-home.svg"; sourceTree = "<group>"; };
-		04E81AE516E0FF0A004796EF /* go-jump.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-jump.svg"; sourceTree = "<group>"; };
-		04E81AE616E0FF0A004796EF /* go-last.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-last.svg"; sourceTree = "<group>"; };
-		04E81AE716E0FF0A004796EF /* go-next.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-next.svg"; sourceTree = "<group>"; };
-		04E81AE816E0FF0A004796EF /* go-previous.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-previous.svg"; sourceTree = "<group>"; };
-		04E81AE916E0FF0A004796EF /* go-top.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-top.svg"; sourceTree = "<group>"; };
-		04E81AEA16E0FF0B004796EF /* go-up.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-up.svg"; sourceTree = "<group>"; };
-		04E81AEB16E0FF0B004796EF /* image-missing.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "image-missing.svg"; sourceTree = "<group>"; };
-		04E81AEC16E0FF0B004796EF /* left_arrow.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = left_arrow.svg; sourceTree = "<group>"; };
-		04E81AED16E0FF0B004796EF /* list-add.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "list-add.svg"; sourceTree = "<group>"; };
-		04E81AEE16E0FF0B004796EF /* list-remove.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "list-remove.svg"; sourceTree = "<group>"; };
-		04E81AEF16E0FF0B004796EF /* media-eject.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "media-eject.svg"; sourceTree = "<group>"; };
-		04E81AF016E0FF0B004796EF /* media-playback-pause.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "media-playback-pause.svg"; sourceTree = "<group>"; };
-		04E81AF116E0FF0B004796EF /* media-playback-start.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "media-playback-start.svg"; sourceTree = "<group>"; };
-		04E81AF216E0FF0B004796EF /* media-playback-stop.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "media-playback-stop.svg"; sourceTree = "<group>"; };
-		04E81AF316E0FF0B004796EF /* media-record.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "media-record.svg"; sourceTree = "<group>"; };
-		04E81AF416E0FF0B004796EF /* media-seek-backward.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "media-seek-backward.svg"; sourceTree = "<group>"; };
-		04E81AF516E0FF0B004796EF /* media-seek-forward.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "media-seek-forward.svg"; sourceTree = "<group>"; };
-		04E81AF616E0FF0B004796EF /* media-skip-backward.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "media-skip-backward.svg"; sourceTree = "<group>"; };
-		04E81AF716E0FF0B004796EF /* media-skip-forward.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "media-skip-forward.svg"; sourceTree = "<group>"; };
-		04E81AF816E0FF0B004796EF /* preferences-desktop-remote-desktop.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "preferences-desktop-remote-desktop.svg"; sourceTree = "<group>"; };
-		04E81AF916E0FF0B004796EF /* preferences-system-windows.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "preferences-system-windows.svg"; sourceTree = "<group>"; };
-		04E81AFA16E0FF0B004796EF /* process-stop.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "process-stop.svg"; sourceTree = "<group>"; };
-		04E81AFB16E0FF0B004796EF /* right_arrow.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = right_arrow.svg; sourceTree = "<group>"; };
-		04E81AFC16E0FF0B004796EF /* tennis_ball.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = tennis_ball.svg; sourceTree = "<group>"; };
-		04E81AFD16E0FF0B004796EF /* tennis_black.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = tennis_black.svg; sourceTree = "<group>"; };
-		04E81AFE16E0FF0B004796EF /* tennis_racket.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = tennis_racket.svg; sourceTree = "<group>"; };
-		04E81AFF16E0FF0B004796EF /* tennis_racket_color.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = tennis_racket_color.svg; sourceTree = "<group>"; };
-		04E81B0016E0FF0B004796EF /* user-trash.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "user-trash.svg"; sourceTree = "<group>"; };
-		04E81B0116E0FF0B004796EF /* video-display.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "video-display.svg"; sourceTree = "<group>"; };
-		04E81B0216E0FF0B004796EF /* video-x-generic.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "video-x-generic.svg"; sourceTree = "<group>"; };
-		04E81B0316E0FF0B004796EF /* view-fullscreen.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "view-fullscreen.svg"; sourceTree = "<group>"; };
-		04E81B0416E0FF0B004796EF /* iphone_wm_gui.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = iphone_wm_gui.js; sourceTree = "<group>"; };
-		04E81B0516E0FF0B004796EF /* iphone_wm_gui.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = iphone_wm_gui.svg; sourceTree = "<group>"; };
-		04E81B0616E0FF0B004796EF /* mpegu-core.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = "mpegu-core.js"; sourceTree = "<group>"; };
-		04E81B0716E0FF0B004796EF /* mpegu-wm.bt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "mpegu-wm.bt"; sourceTree = "<group>"; };
-		04E81B0816E0FF0B004796EF /* mpegu-wm.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = "mpegu-wm.js"; sourceTree = "<group>"; };
-		04E81B0916E0FF0B004796EF /* mpegu-wm.xmt */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "mpegu-wm.xmt"; sourceTree = "<group>"; };
-		04E81B0A16E0FF0B004796EF /* tv_wm_gui.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = tv_wm_gui.js; sourceTree = "<group>"; };
-		04E81B0B16E0FF0B004796EF /* tv_wm_gui.svg */ = {isa = PBXFileReference; lastKnownFileType = text; path = tv_wm_gui.svg; sourceTree = "<group>"; };
 		04EFB63416E51E4200D1D44A /* libglues.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libglues.a; path = ../../extra_lib/lib/iOS/libglues.a; sourceTree = "<group>"; };
-		285DBB42170F17C500AF2B9B /* ffmpeg_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ffmpeg_decode.c; path = ../../modules/ffmpeg_in/ffmpeg_decode.c; sourceTree = "<group>"; };
-		285DBB45170F17CC00AF2B9B /* ffmpeg_demux.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ffmpeg_demux.c; path = ../../modules/ffmpeg_in/ffmpeg_demux.c; sourceTree = "<group>"; };
 		285DBB48170F17D700AF2B9B /* ffmpeg_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ffmpeg_in.h; path = ../../modules/ffmpeg_in/ffmpeg_in.h; sourceTree = "<group>"; };
 		285DBB9B1712C80E00AF2B9B /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = ../../extra_lib/lib/iOS/libavcodec.a; sourceTree = "<group>"; };
 		285DBB9C1712C80E00AF2B9B /* libavformat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavformat.a; path = ../../extra_lib/lib/iOS/libavformat.a; sourceTree = "<group>"; };
 		285DBB9D1712C80E00AF2B9B /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = ../../extra_lib/lib/iOS/libavutil.a; sourceTree = "<group>"; };
-		285DBB9E1712C80E00AF2B9B /* libswresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswresample.a; path = ../../extra_lib/lib/iOS/libswresample.a; sourceTree = "<group>"; };
 		285DBB9F1712C80E00AF2B9B /* libswscale.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswscale.a; path = ../../extra_lib/lib/iOS/libswscale.a; sourceTree = "<group>"; };
+		2897039B1A13C4050063E9C0 /* libswresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswresample.a; path = ../../extra_lib/lib/iOS/libswresample.a; sourceTree = "<group>"; };
 		28F2240317D6367000E9D2BE /* ffmpeg_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ffmpeg_decode.c; path = ../../modules/ffmpeg_in/ffmpeg_decode.c; sourceTree = "<group>"; };
 		28F2240517D6369700E9D2BE /* ffmpeg_demux.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ffmpeg_demux.c; path = ../../modules/ffmpeg_in/ffmpeg_demux.c; sourceTree = "<group>"; };
 		28F2240717D636C300E9D2BE /* ffmpeg_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ffmpeg_in.h; path = ../../modules/ffmpeg_in/ffmpeg_in.h; sourceTree = "<group>"; };
@@ -633,7 +553,6 @@
 		71A1999C1278778800ACFF58 /* sdl_out.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdl_out.c; sourceTree = "<group>"; };
 		71A1999D1278778800ACFF58 /* sdl_out.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sdl_out.h; sourceTree = "<group>"; };
 		71A1999E1278778800ACFF58 /* video.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = video.c; sourceTree = "<group>"; };
-		71A1999F1278778800ACFF58 /* video2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = video2d.c; sourceTree = "<group>"; };
 		71A19B1A12796B5600ACFF58 /* osmo4ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = osmo4ios.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		71A19B1C12796B5700ACFF58 /* osmo4ios-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "osmo4ios-Info.plist"; path = "../../applications/osmo4_ios/osmo4ios-Info.plist"; sourceTree = "<group>"; };
 		71A19B2012796B6F00ACFF58 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../../applications/osmo4_ios/main.c; sourceTree = SOURCE_ROOT; };
@@ -882,7 +801,7 @@
 		71CCF2331277045100339E12 /* math.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = math.c; sourceTree = "<group>"; };
 		71CCF2341277045100339E12 /* module.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = module.c; sourceTree = "<group>"; };
 		71CCF2351277045100339E12 /* module_wrap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = module_wrap.h; sourceTree = "<group>"; };
-		71CCF2361277045100339E12 /* os_divers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = os_divers.c; sourceTree = "<group>"; };
+		71CCF2361277045100339E12 /* os_file.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = os_file.c; sourceTree = "<group>"; };
 		71CCF2371277045100339E12 /* os_module.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = os_module.c; sourceTree = "<group>"; };
 		71CCF2381277045100339E12 /* os_net.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = os_net.c; sourceTree = "<group>"; };
 		71CCF2391277045100339E12 /* os_thread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = os_thread.c; sourceTree = "<group>"; };
@@ -981,7 +900,8 @@
 		71F2A45412830B1400C384DE /* libjs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjs.a; path = ../../extra_lib/lib/iOS/libjs.a; sourceTree = SOURCE_ROOT; };
 		71F2A45512830B1400C384DE /* libmad.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmad.a; path = ../../extra_lib/lib/iOS/libmad.a; sourceTree = SOURCE_ROOT; };
 		71F2A45612830B1400C384DE /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../extra_lib/lib/iOS/libpng.a; sourceTree = SOURCE_ROOT; };
-		926B9D7016EFA5AC00773B53 /* osmo4ios.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = osmo4ios.entitlements; sourceTree = "<group>"; };
+		925730A11A0916D20057FF04 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
+		925730A31A0916DB0057FF04 /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = usr/lib/libbz2.dylib; sourceTree = SDKROOT; };
 		929A929616EF8BC200B7C64F /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "../../applications/osmo4_ios/Resources/Default-568h@2x.png"; sourceTree = SOURCE_ROOT; };
 		929A929716EF8BC200B7C64F /* icon_ipad_retina.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon_ipad_retina.png; path = ../../applications/osmo4_ios/Resources/icon_ipad_retina.png; sourceTree = SOURCE_ROOT; };
 		929A929816EF8BC200B7C64F /* icon_ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon_ipad.png; path = ../../applications/osmo4_ios/Resources/icon_ipad.png; sourceTree = SOURCE_ROOT; };
@@ -992,9 +912,81 @@
 		92B32CA31A08ABBF0065F44A /* webvtt_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = webvtt_smjs.c; sourceTree = "<group>"; };
 		92B32CA71A08AC130065F44A /* vtt_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vtt_dec.c; path = ../../modules/vtt_in/vtt_dec.c; sourceTree = "<group>"; };
 		92B32CA81A08AC130065F44A /* vtt_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vtt_in.c; path = ../../modules/vtt_in/vtt_in.c; sourceTree = "<group>"; };
-		92FA813A16F235520002629E /* cam_wrap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cam_wrap.h; path = ../../modules/ios_cam/cam_wrap.h; sourceTree = SOURCE_ROOT; };
-		92FA813C16F235520002629E /* CameraObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CameraObject.h; path = ../../modules/ios_cam/CameraObject.h; sourceTree = SOURCE_ROOT; };
-		92FA813E16F235520002629E /* ios_cam.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ios_cam.c; path = ../../modules/ios_cam/ios_cam.c; sourceTree = SOURCE_ROOT; };
+		92B69DB31A091CFC004E74AA /* h2b2vs.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = h2b2vs.js; sourceTree = "<group>"; };
+		92B69DB41A091CFC004E74AA /* H2B2VS.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = H2B2VS.png; sourceTree = "<group>"; };
+		92B69DB51A091CFC004E74AA /* init.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = init.js; sourceTree = "<group>"; };
+		92B69DB71A091CFC004E74AA /* applications-multimedia.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "applications-multimedia.svg"; sourceTree = "<group>"; };
+		92B69DB81A091CFC004E74AA /* fileopen.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = fileopen.js; sourceTree = "<group>"; };
+		92B69DB91A091CFC004E74AA /* init.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = init.js; sourceTree = "<group>"; };
+		92B69DBA1A091CFC004E74AA /* player.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = player.js; sourceTree = "<group>"; };
+		92B69DBB1A091CFC004E74AA /* playlist.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = playlist.js; sourceTree = "<group>"; };
+		92B69DBC1A091CFC004E74AA /* stats.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = stats.js; sourceTree = "<group>"; };
+		92B69DBE1A091CFC004E74AA /* applications-system.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "applications-system.svg"; sourceTree = "<group>"; };
+		92B69DBF1A091CFC004E74AA /* init.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = init.js; sourceTree = "<group>"; };
+		92B69DC01A091CFC004E74AA /* gui.bt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gui.bt; sourceTree = "<group>"; };
+		92B69DC11A091CFC004E74AA /* gui.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = gui.js; sourceTree = "<group>"; };
+		92B69DC41A091CFC004E74AA /* gwlib.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = gwlib.js; sourceTree = "<group>"; };
+		92B69DC61A091CFC004E74AA /* add.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = add.svg; sourceTree = "<group>"; };
+		92B69DC71A091CFC004E74AA /* app.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = app.svg; sourceTree = "<group>"; };
+		92B69DC81A091CFC004E74AA /* audio.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = audio.svg; sourceTree = "<group>"; };
+		92B69DC91A091CFC004E74AA /* audio_full.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = audio_full.svg; sourceTree = "<group>"; };
+		92B69DCA1A091CFC004E74AA /* audio_mute.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = audio_mute.svg; sourceTree = "<group>"; };
+		92B69DCB1A091CFC004E74AA /* check.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = check.svg; sourceTree = "<group>"; };
+		92B69DCC1A091CFC004E74AA /* close.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = close.svg; sourceTree = "<group>"; };
+		92B69DCD1A091CFC004E74AA /* cross.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = cross.svg; sourceTree = "<group>"; };
+		92B69DCE1A091CFC004E74AA /* down.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = down.svg; sourceTree = "<group>"; };
+		92B69DCF1A091CFC004E74AA /* expand.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = expand.svg; sourceTree = "<group>"; };
+		92B69DD01A091CFC004E74AA /* file.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = file.svg; sourceTree = "<group>"; };
+		92B69DD11A091CFC004E74AA /* film.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = film.svg; sourceTree = "<group>"; };
+		92B69DD21A091CFC004E74AA /* folder.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = folder.svg; sourceTree = "<group>"; };
+		92B69DD31A091CFC004E74AA /* harddrive.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = harddrive.svg; sourceTree = "<group>"; };
+		92B69DD41A091CFC004E74AA /* heart.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = heart.svg; sourceTree = "<group>"; };
+		92B69DD51A091CFC004E74AA /* home.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = home.svg; sourceTree = "<group>"; };
+		92B69DD61A091CFC004E74AA /* image.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = image.svg; sourceTree = "<group>"; };
+		92B69DD71A091CFC004E74AA /* info.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = info.svg; sourceTree = "<group>"; };
+		92B69DD81A091CFC004E74AA /* laptop.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = laptop.svg; sourceTree = "<group>"; };
+		92B69DD91A091CFC004E74AA /* left.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = left.svg; sourceTree = "<group>"; };
+		92B69DDA1A091CFC004E74AA /* list.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = list.svg; sourceTree = "<group>"; };
+		92B69DDB1A091CFC004E74AA /* live.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = live.svg; sourceTree = "<group>"; };
+		92B69DDC1A091CFC004E74AA /* media_next.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = media_next.svg; sourceTree = "<group>"; };
+		92B69DDD1A091CFC004E74AA /* media_prev.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = media_prev.svg; sourceTree = "<group>"; };
+		92B69DDE1A091CFC004E74AA /* monitor.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = monitor.svg; sourceTree = "<group>"; };
+		92B69DDF1A091CFC004E74AA /* more.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = more.svg; sourceTree = "<group>"; };
+		92B69DE01A091CFC004E74AA /* musical.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = musical.svg; sourceTree = "<group>"; };
+		92B69DE11A091CFC004E74AA /* navigation.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = navigation.svg; sourceTree = "<group>"; };
+		92B69DE21A091CFC004E74AA /* network.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = network.svg; sourceTree = "<group>"; };
+		92B69DE31A091CFC004E74AA /* next.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = next.svg; sourceTree = "<group>"; };
+		92B69DE41A091CFC004E74AA /* osmo.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = osmo.svg; sourceTree = "<group>"; };
+		92B69DE51A091CFC004E74AA /* overflowing.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = overflowing.svg; sourceTree = "<group>"; };
+		92B69DE61A091CFC004E74AA /* pause.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = pause.svg; sourceTree = "<group>"; };
+		92B69DE71A091CFC004E74AA /* pl_next.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = pl_next.svg; sourceTree = "<group>"; };
+		92B69DE81A091CFC004E74AA /* pl_prev.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = pl_prev.svg; sourceTree = "<group>"; };
+		92B69DE91A091CFC004E74AA /* play.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = play.svg; sourceTree = "<group>"; };
+		92B69DEA1A091CFC004E74AA /* play_loop.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = play_loop.svg; sourceTree = "<group>"; };
+		92B69DEB1A091CFC004E74AA /* play_shuffle.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = play_shuffle.svg; sourceTree = "<group>"; };
+		92B69DEC1A091CFC004E74AA /* play_single.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = play_single.svg; sourceTree = "<group>"; };
+		92B69DED1A091CFC004E74AA /* power.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = power.svg; sourceTree = "<group>"; };
+		92B69DEE1A091CFC004E74AA /* previous.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = previous.svg; sourceTree = "<group>"; };
+		92B69DEF1A091CFC004E74AA /* remove.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = remove.svg; sourceTree = "<group>"; };
+		92B69DF01A091CFC004E74AA /* resize.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = resize.svg; sourceTree = "<group>"; };
+		92B69DF11A091CFC004E74AA /* rewind.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = rewind.svg; sourceTree = "<group>"; };
+		92B69DF21A091CFC004E74AA /* right.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = right.svg; sourceTree = "<group>"; };
+		92B69DF31A091CFC004E74AA /* seek_forward.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = seek_forward.svg; sourceTree = "<group>"; };
+		92B69DF41A091CFC004E74AA /* shrink.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = shrink.svg; sourceTree = "<group>"; };
+		92B69DF51A091CFC004E74AA /* sort.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = sort.svg; sourceTree = "<group>"; };
+		92B69DF61A091CFC004E74AA /* speed.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = speed.svg; sourceTree = "<group>"; };
+		92B69DF71A091CFC004E74AA /* star.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = star.svg; sourceTree = "<group>"; };
+		92B69DF81A091CFC004E74AA /* stop.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = stop.svg; sourceTree = "<group>"; };
+		92B69DF91A091CFC004E74AA /* stop2.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = stop2.svg; sourceTree = "<group>"; };
+		92B69DFA1A091CFC004E74AA /* trash.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = trash.svg; sourceTree = "<group>"; };
+		92B69DFB1A091CFC004E74AA /* tray.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = tray.svg; sourceTree = "<group>"; };
+		92B69DFC1A091CFC004E74AA /* tv.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = tv.svg; sourceTree = "<group>"; };
+		92B69DFD1A091CFC004E74AA /* up.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = up.svg; sourceTree = "<group>"; };
+		92B69DFE1A091CFC004E74AA /* world.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = world.svg; sourceTree = "<group>"; };
+		92B69E011A091CFC004E74AA /* mpegu-core.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "mpegu-core.js"; sourceTree = "<group>"; };
+		92B69EB61A091CFC004E74AA /* webvtt-renderer.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "webvtt-renderer.js"; sourceTree = "<group>"; };
+		92F930841A5ADC1A0072A85C /* os_divers.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = os_divers.c; sourceTree = "<group>"; };
+		92F930851A5ADC1A0072A85C /* os_file.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = os_file.c; sourceTree = "<group>"; };
 		92FA825916F2549D0002629E /* validator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = validator.c; path = ../../modules/validator/validator.c; sourceTree = SOURCE_ROOT; };
 		92FA825B16F254AF0002629E /* audio_filter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio_filter.c; path = ../../modules/audio_filter/audio_filter.c; sourceTree = SOURCE_ROOT; };
 		92FA825D16F254C60002629E /* saf_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = saf_in.c; path = ../../modules/saf_in/saf_in.c; sourceTree = SOURCE_ROOT; };
@@ -1043,10 +1035,12 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				2897039C1A13C4050063E9C0 /* libswresample.a in Frameworks */,
+				925730A41A0916DB0057FF04 /* libbz2.dylib in Frameworks */,
+				925730A21A0916D20057FF04 /* libiconv.dylib in Frameworks */,
 				285DBBA01712C80E00AF2B9B /* libavcodec.a in Frameworks */,
 				285DBBA11712C80E00AF2B9B /* libavformat.a in Frameworks */,
 				285DBBA21712C80E00AF2B9B /* libavutil.a in Frameworks */,
-				285DBBA31712C80E00AF2B9B /* libswresample.a in Frameworks */,
 				285DBBA41712C80E00AF2B9B /* libswscale.a in Frameworks */,
 				04EFB63516E51E4200D1D44A /* libglues.a in Frameworks */,
 				0496F09C16DE36BC009D9D8D /* libz.dylib in Frameworks */,
@@ -1081,113 +1075,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		04E81ABD16E0FF0A004796EF /* gui */ = {
-			isa = PBXGroup;
-			children = (
-				04E81ABE16E0FF0A004796EF /* extensions */,
-				04E81AC216E0FF0A004796EF /* gui.bt */,
-				04E81AC316E0FF0A004796EF /* gui.js */,
-				04E81AC416E0FF0A004796EF /* gui_old.bt */,
-				04E81AC516E0FF0A004796EF /* gui_old.js */,
-				04E81AC616E0FF0A004796EF /* gwlib.js */,
-				04E81AC716E0FF0A004796EF /* icons */,
-				04E81B0416E0FF0B004796EF /* iphone_wm_gui.js */,
-				04E81B0516E0FF0B004796EF /* iphone_wm_gui.svg */,
-				04E81B0616E0FF0B004796EF /* mpegu-core.js */,
-				04E81B0716E0FF0B004796EF /* mpegu-wm.bt */,
-				04E81B0816E0FF0B004796EF /* mpegu-wm.js */,
-				04E81B0916E0FF0B004796EF /* mpegu-wm.xmt */,
-				04E81B0A16E0FF0B004796EF /* tv_wm_gui.js */,
-				04E81B0B16E0FF0B004796EF /* tv_wm_gui.svg */,
-			);
-			name = gui;
-			path = ../../gui;
-			sourceTree = "<group>";
-		};
-		04E81ABE16E0FF0A004796EF /* extensions */ = {
-			isa = PBXGroup;
-			children = (
-				04E81ABF16E0FF0A004796EF /* widget_manager */,
-			);
-			path = extensions;
-			sourceTree = "<group>";
-		};
-		04E81ABF16E0FF0A004796EF /* widget_manager */ = {
-			isa = PBXGroup;
-			children = (
-				04E81AC016E0FF0A004796EF /* applications-system.svg */,
-				04E81AC116E0FF0A004796EF /* init.js */,
-			);
-			path = widget_manager;
-			sourceTree = "<group>";
-		};
-		04E81AC716E0FF0A004796EF /* icons */ = {
-			isa = PBXGroup;
-			children = (
-				04E81AC816E0FF0A004796EF /* applications-internet.svg */,
-				04E81AC916E0FF0A004796EF /* applications-multimedia.svg */,
-				04E81ACA16E0FF0A004796EF /* applications-system.svg */,
-				04E81ACB16E0FF0A004796EF /* audio-volume-high.svg */,
-				04E81ACC16E0FF0A004796EF /* audio-volume-low.svg */,
-				04E81ACD16E0FF0A004796EF /* audio-volume-medium.svg */,
-				04E81ACE16E0FF0A004796EF /* audio-volume-muted.svg */,
-				04E81ACF16E0FF0A004796EF /* audio-x-generic.svg */,
-				04E81AD016E0FF0A004796EF /* battery-caution.svg */,
-				04E81AD116E0FF0A004796EF /* camera-photo.svg */,
-				04E81AD216E0FF0A004796EF /* camera-video.svg */,
-				04E81AD316E0FF0A004796EF /* dialog-error.svg */,
-				04E81AD416E0FF0A004796EF /* dialog-information.svg */,
-				04E81AD516E0FF0A004796EF /* dialog-warning.svg */,
-				04E81AD616E0FF0A004796EF /* document-new.svg */,
-				04E81AD716E0FF0A004796EF /* document-print-preview.svg */,
-				04E81AD816E0FF0A004796EF /* document-print.svg */,
-				04E81AD916E0FF0A004796EF /* document-save-as.svg */,
-				04E81ADA16E0FF0A004796EF /* document-save.svg */,
-				04E81ADB16E0FF0A004796EF /* edit-find.svg */,
-				04E81ADC16E0FF0A004796EF /* emblem-symbolic-link.svg */,
-				04E81ADD16E0FF0A004796EF /* emblem-unreadable.svg */,
-				04E81ADE16E0FF0A004796EF /* face-surprise.svg */,
-				04E81ADF16E0FF0A004796EF /* folder-open.svg */,
-				04E81AE016E0FF0A004796EF /* folder.svg */,
-				04E81AE116E0FF0A004796EF /* go-bottom.svg */,
-				04E81AE216E0FF0A004796EF /* go-down.svg */,
-				04E81AE316E0FF0A004796EF /* go-first.svg */,
-				04E81AE416E0FF0A004796EF /* go-home.svg */,
-				04E81AE516E0FF0A004796EF /* go-jump.svg */,
-				04E81AE616E0FF0A004796EF /* go-last.svg */,
-				04E81AE716E0FF0A004796EF /* go-next.svg */,
-				04E81AE816E0FF0A004796EF /* go-previous.svg */,
-				04E81AE916E0FF0A004796EF /* go-top.svg */,
-				04E81AEA16E0FF0B004796EF /* go-up.svg */,
-				04E81AEB16E0FF0B004796EF /* image-missing.svg */,
-				04E81AEC16E0FF0B004796EF /* left_arrow.svg */,
-				04E81AED16E0FF0B004796EF /* list-add.svg */,
-				04E81AEE16E0FF0B004796EF /* list-remove.svg */,
-				04E81AEF16E0FF0B004796EF /* media-eject.svg */,
-				04E81AF016E0FF0B004796EF /* media-playback-pause.svg */,
-				04E81AF116E0FF0B004796EF /* media-playback-start.svg */,
-				04E81AF216E0FF0B004796EF /* media-playback-stop.svg */,
-				04E81AF316E0FF0B004796EF /* media-record.svg */,
-				04E81AF416E0FF0B004796EF /* media-seek-backward.svg */,
-				04E81AF516E0FF0B004796EF /* media-seek-forward.svg */,
-				04E81AF616E0FF0B004796EF /* media-skip-backward.svg */,
-				04E81AF716E0FF0B004796EF /* media-skip-forward.svg */,
-				04E81AF816E0FF0B004796EF /* preferences-desktop-remote-desktop.svg */,
-				04E81AF916E0FF0B004796EF /* preferences-system-windows.svg */,
-				04E81AFA16E0FF0B004796EF /* process-stop.svg */,
-				04E81AFB16E0FF0B004796EF /* right_arrow.svg */,
-				04E81AFC16E0FF0B004796EF /* tennis_ball.svg */,
-				04E81AFD16E0FF0B004796EF /* tennis_black.svg */,
-				04E81AFE16E0FF0B004796EF /* tennis_racket.svg */,
-				04E81AFF16E0FF0B004796EF /* tennis_racket_color.svg */,
-				04E81B0016E0FF0B004796EF /* user-trash.svg */,
-				04E81B0116E0FF0B004796EF /* video-display.svg */,
-				04E81B0216E0FF0B004796EF /* video-x-generic.svg */,
-				04E81B0316E0FF0B004796EF /* view-fullscreen.svg */,
-			);
-			path = icons;
-			sourceTree = "<group>";
-		};
 		28F2240B17D6372100E9D2BE /* ffmpeg_in */ = {
 			isa = PBXGroup;
 			children = (
@@ -1202,11 +1089,6 @@
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
-				285DBB9B1712C80E00AF2B9B /* libavcodec.a */,
-				285DBB9C1712C80E00AF2B9B /* libavformat.a */,
-				285DBB9D1712C80E00AF2B9B /* libavutil.a */,
-				285DBB9E1712C80E00AF2B9B /* libswresample.a */,
-				285DBB9F1712C80E00AF2B9B /* libswscale.a */,
 				71CCF1381277041D00339E12 /* libgpac */,
 				929A929516EF8A7500B7C64F /* modules */,
 				71A19B1412796AC700ACFF58 /* osmo4iOS */,
@@ -1219,6 +1101,13 @@
 		7184780712785F7B00917298 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				2897039B1A13C4050063E9C0 /* libswresample.a */,
+				925730A31A0916DB0057FF04 /* libbz2.dylib */,
+				925730A11A0916D20057FF04 /* libiconv.dylib */,
+				285DBB9B1712C80E00AF2B9B /* libavcodec.a */,
+				285DBB9C1712C80E00AF2B9B /* libavformat.a */,
+				285DBB9D1712C80E00AF2B9B /* libavutil.a */,
+				285DBB9F1712C80E00AF2B9B /* libswscale.a */,
 				92B039F616F2050100B2568F /* libSDL2.a */,
 				970A270D1343540C0007362C /* libgcc_s.1.dylib */,
 				04EFB63416E51E4200D1D44A /* libglues.a */,
@@ -1324,7 +1213,6 @@
 				71A1999C1278778800ACFF58 /* sdl_out.c */,
 				71A1999D1278778800ACFF58 /* sdl_out.h */,
 				71A1999E1278778800ACFF58 /* video.c */,
-				71A1999F1278778800ACFF58 /* video2d.c */,
 			);
 			name = sdl_out;
 			path = ../../modules/sdl_out;
@@ -1333,8 +1221,7 @@
 		71A19B1412796AC700ACFF58 /* osmo4iOS */ = {
 			isa = PBXGroup;
 			children = (
-				926B9D7016EFA5AC00773B53 /* osmo4ios.entitlements */,
-				04E81ABD16E0FF0A004796EF /* gui */,
+				92B69DB01A091CFC004E74AA /* gui */,
 				929A929616EF8BC200B7C64F /* Default-568h@2x.png */,
 				929A929716EF8BC200B7C64F /* icon_ipad_retina.png */,
 				929A929816EF8BC200B7C64F /* icon_ipad.png */,
@@ -1711,6 +1598,8 @@
 		71CCF2291277045100339E12 /* utils */ = {
 			isa = PBXGroup;
 			children = (
+				92F930841A5ADC1A0072A85C /* os_divers.c */,
+				92F930851A5ADC1A0072A85C /* os_file.c */,
 				97DDAFEE1569631900528219 /* sha1.c */,
 				97FF065F138CE4C400D6C707 /* os_config_init.c */,
 				970A26D513434DAC0007362C /* ringbuffer.c */,
@@ -1727,7 +1616,7 @@
 				71CCF2331277045100339E12 /* math.c */,
 				71CCF2341277045100339E12 /* module.c */,
 				71CCF2351277045100339E12 /* module_wrap.h */,
-				71CCF2361277045100339E12 /* os_divers.c */,
+				71CCF2361277045100339E12 /* os_file.c */,
 				71CCF2371277045100339E12 /* os_module.c */,
 				71CCF2381277045100339E12 /* os_net.c */,
 				71CCF2391277045100339E12 /* os_thread.c */,
@@ -1879,7 +1768,6 @@
 				92FA825D16F254C60002629E /* saf_in.c */,
 				92FA825B16F254AF0002629E /* audio_filter.c */,
 				92FA825916F2549D0002629E /* validator.c */,
-				92FA813816F235470002629E /* camera */,
 				71A1993D127876E300ACFF58 /* img_in */,
 				71A199531278770900ACFF58 /* isom_in */,
 				71A1996A1278774A00ACFF58 /* rtp_in */,
@@ -1915,14 +1803,125 @@
 			name = vtt;
 			sourceTree = "<group>";
 		};
-		92FA813816F235470002629E /* camera */ = {
+		92B69DB01A091CFC004E74AA /* gui */ = {
+			isa = PBXGroup;
+			children = (
+				92B69DB11A091CFC004E74AA /* extensions */,
+				92B69DC01A091CFC004E74AA /* gui.bt */,
+				92B69DC11A091CFC004E74AA /* gui.js */,
+				92B69DC41A091CFC004E74AA /* gwlib.js */,
+				92B69DC51A091CFC004E74AA /* icons */,
+				92B69E011A091CFC004E74AA /* mpegu-core.js */,
+				92B69EB61A091CFC004E74AA /* webvtt-renderer.js */,
+			);
+			name = gui;
+			path = ../../gui;
+			sourceTree = "<group>";
+		};
+		92B69DB11A091CFC004E74AA /* extensions */ = {
+			isa = PBXGroup;
+			children = (
+				92B69DB21A091CFC004E74AA /* H2B2VS */,
+				92B69DB61A091CFC004E74AA /* player */,
+				92B69DBD1A091CFC004E74AA /* widget_manager */,
+			);
+			path = extensions;
+			sourceTree = "<group>";
+		};
+		92B69DB21A091CFC004E74AA /* H2B2VS */ = {
+			isa = PBXGroup;
+			children = (
+				92B69DB31A091CFC004E74AA /* h2b2vs.js */,
+				92B69DB41A091CFC004E74AA /* H2B2VS.png */,
+				92B69DB51A091CFC004E74AA /* init.js */,
+			);
+			path = H2B2VS;
+			sourceTree = "<group>";
+		};
+		92B69DB61A091CFC004E74AA /* player */ = {
+			isa = PBXGroup;
+			children = (
+				92B69DB71A091CFC004E74AA /* applications-multimedia.svg */,
+				92B69DB81A091CFC004E74AA /* fileopen.js */,
+				92B69DB91A091CFC004E74AA /* init.js */,
+				92B69DBA1A091CFC004E74AA /* player.js */,
+				92B69DBB1A091CFC004E74AA /* playlist.js */,
+				92B69DBC1A091CFC004E74AA /* stats.js */,
+			);
+			path = player;
+			sourceTree = "<group>";
+		};
+		92B69DBD1A091CFC004E74AA /* widget_manager */ = {
 			isa = PBXGroup;
 			children = (
-				92FA813A16F235520002629E /* cam_wrap.h */,
-				92FA813C16F235520002629E /* CameraObject.h */,
-				92FA813E16F235520002629E /* ios_cam.c */,
+				92B69DBE1A091CFC004E74AA /* applications-system.svg */,
+				92B69DBF1A091CFC004E74AA /* init.js */,
 			);
-			name = camera;
+			path = widget_manager;
+			sourceTree = "<group>";
+		};
+		92B69DC51A091CFC004E74AA /* icons */ = {
+			isa = PBXGroup;
+			children = (
+				92B69DC61A091CFC004E74AA /* add.svg */,
+				92B69DC71A091CFC004E74AA /* app.svg */,
+				92B69DC81A091CFC004E74AA /* audio.svg */,
+				92B69DC91A091CFC004E74AA /* audio_full.svg */,
+				92B69DCA1A091CFC004E74AA /* audio_mute.svg */,
+				92B69DCB1A091CFC004E74AA /* check.svg */,
+				92B69DCC1A091CFC004E74AA /* close.svg */,
+				92B69DCD1A091CFC004E74AA /* cross.svg */,
+				92B69DCE1A091CFC004E74AA /* down.svg */,
+				92B69DCF1A091CFC004E74AA /* expand.svg */,
+				92B69DD01A091CFC004E74AA /* file.svg */,
+				92B69DD11A091CFC004E74AA /* film.svg */,
+				92B69DD21A091CFC004E74AA /* folder.svg */,
+				92B69DD31A091CFC004E74AA /* harddrive.svg */,
+				92B69DD41A091CFC004E74AA /* heart.svg */,
+				92B69DD51A091CFC004E74AA /* home.svg */,
+				92B69DD61A091CFC004E74AA /* image.svg */,
+				92B69DD71A091CFC004E74AA /* info.svg */,
+				92B69DD81A091CFC004E74AA /* laptop.svg */,
+				92B69DD91A091CFC004E74AA /* left.svg */,
+				92B69DDA1A091CFC004E74AA /* list.svg */,
+				92B69DDB1A091CFC004E74AA /* live.svg */,
+				92B69DDC1A091CFC004E74AA /* media_next.svg */,
+				92B69DDD1A091CFC004E74AA /* media_prev.svg */,
+				92B69DDE1A091CFC004E74AA /* monitor.svg */,
+				92B69DDF1A091CFC004E74AA /* more.svg */,
+				92B69DE01A091CFC004E74AA /* musical.svg */,
+				92B69DE11A091CFC004E74AA /* navigation.svg */,
+				92B69DE21A091CFC004E74AA /* network.svg */,
+				92B69DE31A091CFC004E74AA /* next.svg */,
+				92B69DE41A091CFC004E74AA /* osmo.svg */,
+				92B69DE51A091CFC004E74AA /* overflowing.svg */,
+				92B69DE61A091CFC004E74AA /* pause.svg */,
+				92B69DE71A091CFC004E74AA /* pl_next.svg */,
+				92B69DE81A091CFC004E74AA /* pl_prev.svg */,
+				92B69DE91A091CFC004E74AA /* play.svg */,
+				92B69DEA1A091CFC004E74AA /* play_loop.svg */,
+				92B69DEB1A091CFC004E74AA /* play_shuffle.svg */,
+				92B69DEC1A091CFC004E74AA /* play_single.svg */,
+				92B69DED1A091CFC004E74AA /* power.svg */,
+				92B69DEE1A091CFC004E74AA /* previous.svg */,
+				92B69DEF1A091CFC004E74AA /* remove.svg */,
+				92B69DF01A091CFC004E74AA /* resize.svg */,
+				92B69DF11A091CFC004E74AA /* rewind.svg */,
+				92B69DF21A091CFC004E74AA /* right.svg */,
+				92B69DF31A091CFC004E74AA /* seek_forward.svg */,
+				92B69DF41A091CFC004E74AA /* shrink.svg */,
+				92B69DF51A091CFC004E74AA /* sort.svg */,
+				92B69DF61A091CFC004E74AA /* speed.svg */,
+				92B69DF71A091CFC004E74AA /* star.svg */,
+				92B69DF81A091CFC004E74AA /* stop.svg */,
+				92B69DF91A091CFC004E74AA /* stop2.svg */,
+				92B69DFA1A091CFC004E74AA /* trash.svg */,
+				92B69DFB1A091CFC004E74AA /* tray.svg */,
+				92B69DFC1A091CFC004E74AA /* tv.svg */,
+				92B69DFD1A091CFC004E74AA /* up.svg */,
+				92B69DFE1A091CFC004E74AA /* world.svg */,
+			);
+			path = icons;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -2045,7 +2044,6 @@
 				9747B6F014864C6400280D95 /* dsmcc.h in Headers */,
 				9747B6F114864C6400280D95 /* events_constants.h in Headers */,
 				285DBB49170F17D700AF2B9B /* ffmpeg_in.h in Headers */,
-				28F2240817D636C300E9D2BE /* ffmpeg_in.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2093,7 +2091,12 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0460;
+				LastUpgradeCheck = 0510;
+				TargetAttributes = {
+					71A19B1912796B5600ACFF58 = {
+						DevelopmentTeam = Q46G522WGV;
+					};
+				};
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "gpac4ios" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -2127,7 +2130,6 @@
 				929A929E16EF8BC200B7C64F /* icon_ipad.png in Resources */,
 				929A929F16EF8BC200B7C64F /* icon_retina.png in Resources */,
 				929A92A016EF8BC200B7C64F /* icon.png in Resources */,
-				926B9D7116EFA5AC00773B53 /* osmo4ios.entitlements in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2140,15 +2142,6 @@
 			files = (
 				71A19B2112796B6F00ACFF58 /* main.c in Sources */,
 				92A3A03E16F0C10C004EE581 /* extract.c in Sources */,
-				92FA814116F235520002629E /* ios_cam.c in Sources */,
-				92FA825A16F2549D0002629E /* validator.c in Sources */,
-				92FA825C16F254AF0002629E /* audio_filter.c in Sources */,
-				92FA825E16F254C60002629E /* saf_in.c in Sources */,
-				92FA826016F254DA0002629E /* isma_ea.c in Sources */,
-				92FA826316F254F50002629E /* timedtext_dec.c in Sources */,
-				92FA826416F254F50002629E /* timedtext_in.c in Sources */,
-				285DBB44170F17C500AF2B9B /* ffmpeg_decode.c in Sources */,
-				285DBB47170F17CC00AF2B9B /* ffmpeg_demux.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2156,6 +2149,14 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				92F930861A5ADC1A0072A85C /* os_divers.c in Sources */,
+				71CCF3371277045100339E12 /* os_file.c in Sources */,
+				92E8C7901A0CD58300E0436D /* validator.c in Sources */,
+				92E8C78B1A0CD57A00E0436D /* timedtext_dec.c in Sources */,
+				92E8C78C1A0CD57A00E0436D /* timedtext_in.c in Sources */,
+				92E8C78D1A0CD57A00E0436D /* isma_ea.c in Sources */,
+				92E8C78E1A0CD57A00E0436D /* saf_in.c in Sources */,
+				92E8C78F1A0CD57A00E0436D /* audio_filter.c in Sources */,
 				92BC210E16EF8E7A000E0620 /* ftgrays.c in Sources */,
 				92BC212316EF8E7A000E0620 /* raster_565.c in Sources */,
 				92BC212416EF8E7A000E0620 /* raster_argb.c in Sources */,
@@ -2171,7 +2172,6 @@
 				92BC213A16EF8E7A000E0620 /* widget.c in Sources */,
 				92BC213B16EF8E7A000E0620 /* widgetman.c in Sources */,
 				92BC213716EF8E7A000E0620 /* video.c in Sources */,
-				92BC213816EF8E7A000E0620 /* video2d.c in Sources */,
 				92BC212916EF8E7A000E0620 /* rtp_in.c in Sources */,
 				92BC212B16EF8E7A000E0620 /* rtp_session.c in Sources */,
 				92BC212C16EF8E7A000E0620 /* rtp_signaling.c in Sources */,
@@ -2424,7 +2424,7 @@
 				71CCF3331277045100339E12 /* list.c in Sources */,
 				71CCF3341277045100339E12 /* math.c in Sources */,
 				71CCF3351277045100339E12 /* module.c in Sources */,
-				71CCF3371277045100339E12 /* os_divers.c in Sources */,
+				71CCF3371277045100339E12 /* os_file.c in Sources */,
 				71CCF3381277045100339E12 /* os_module.c in Sources */,
 				71CCF3391277045100339E12 /* os_net.c in Sources */,
 				71CCF33A1277045100339E12 /* os_thread.c in Sources */,
@@ -2485,16 +2485,18 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = NO;
+				DEPLOYMENT_LOCATION = YES;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OBJC_CALL_CXX_CDTORS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_VERSION = "";
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				HEADER_SEARCH_PATHS = (
 					../../include,
@@ -2507,7 +2509,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				MACOSX_DEPLOYMENT_TARGET = "";
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "";
 				OTHER_LDFLAGS = "";
@@ -2515,7 +2517,7 @@
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
+				SKIP_INSTALL = NO;
 			};
 			name = Debug;
 		};
@@ -2523,13 +2525,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD)";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = YES;
+				COPY_PHASE_STRIP = NO;
+				DEPLOYMENT_LOCATION = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_VERSION = "";
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				HEADER_SEARCH_PATHS = (
 					../../include,
@@ -2537,12 +2540,13 @@
 				);
 				INFOPLIST_FILE = "../../applications/osmo4_ios/osmo4ios-Info.plist";
 				INSTALL_PATH = /Applications;
-				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				MACOSX_DEPLOYMENT_TARGET = "";
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = "";
@@ -2562,11 +2566,17 @@
 				EXECUTABLE_PREFIX = "";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					GPAC_CONFIG_DARWIN,
+					GPAC_IPHONE,
+				);
 				GCC_THUMB_SUPPORT = NO;
+				GCC_VERSION = "";
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				HEADER_SEARCH_PATHS = (
 					../../include,
 					../..,
+					../../extra_lib/include/ios/,
 					../../extra_lib/include/png,
 					../../extra_lib/include/jpeg,
 					../../extra_lib/include/js,
@@ -2575,14 +2585,15 @@
 					../../extra_lib/include/freetype,
 					../../extra_lib/include,
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				ONLY_ACTIVE_ARCH = NO;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				LIBRARY_SEARCH_PATHS = ../../extra_lib/lib/iOS;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-fms-extensions",
 					"-D__IPHONEOS__",
 				);
 				PRODUCT_NAME = libgpac_static;
+				VALID_ARCHS = "arm64 armv7 armv7s";
 			};
 			name = Debug;
 		};
@@ -2592,11 +2603,17 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = YES;
 				EXECUTABLE_PREFIX = "";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					GPAC_CONFIG_DARWIN,
+					GPAC_IPHONE,
+				);
 				GCC_THUMB_SUPPORT = NO;
+				GCC_VERSION = "";
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				HEADER_SEARCH_PATHS = (
 					../../include,
 					../..,
+					../../extra_lib/include/ios/,
 					../../extra_lib/include/png,
 					../../extra_lib/include/jpeg,
 					../../extra_lib/include/js,
@@ -2605,15 +2622,16 @@
 					../../extra_lib/include/freetype,
 					../../extra_lib/include,
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				ONLY_ACTIVE_ARCH = NO;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				LIBRARY_SEARCH_PATHS = ../../extra_lib/lib/iOS;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-fms-extensions",
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-D__IPHONEOS__",
 				);
 				PRODUCT_NAME = libgpac_static;
+				VALID_ARCHS = "arm64 armv7 armv7s";
 				ZERO_LINK = NO;
 			};
 			name = Release;
@@ -2621,10 +2639,10 @@
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CLANG_CXX_LIBRARY = "compiler-default";
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				DEPLOYMENT_LOCATION = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_FAST_OBJC_DISPATCH = NO;
 				GCC_OBJC_CALL_CXX_CDTORS = NO;
@@ -2638,9 +2656,9 @@
 				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = ../../../extra_lib/include;
+				HEADER_SEARCH_PATHS = ../../include;
 				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-				ONLY_ACTIVE_ARCH = NO;
+				ONLY_ACTIVE_ARCH = YES;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SDKROOT = iphoneos;
@@ -2651,10 +2669,10 @@
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CLANG_CXX_LIBRARY = "compiler-default";
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				DEPLOYMENT_LOCATION = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_FAST_OBJC_DISPATCH = NO;
 				GCC_OBJC_CALL_CXX_CDTORS = NO;
@@ -2668,7 +2686,7 @@
 				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = ../../../extra_lib/include;
+				HEADER_SEARCH_PATHS = ../../include;
 				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";

gpac-0.5.1.svn5491.tar.xz/configure -> gpac-0.5.1.svn5619.tar.xz/configure Changed

@@ -102,6 +102,7 @@
 gprof_build="no"
 static_build="no"
 want_pic="no"
+want_gcov="no"
 has_joystick="no"
 has_xul="no"
 enable_joystick="no"
@@ -184,7 +185,7 @@
 OSS_LDFLAGS=""
 INSTFLAGS=""
 is_64="no"
-
+ffmpeg_extra_ldflags=""
 
 
 #configure usage
@@ -216,9 +217,11 @@
   --dxsdk-path=DX_PATH     specify directX SDK for MinGW [$dxsdk_path]
   --xulsdk-path=XUL_PATH   specify Mozilla XUL (Gecko) SDK include path [$xulsdk_path]
   --mozdir=MOZ_PATH        specify mozilla main directory path for system install
+  --extra-ff-ldflags=ELDFLAGS add ELDFLAGS to FFMPEG LDFLAGS [$ffmpeg_extra_ldflags]
 
   --enable-debug           produce debug version
   --enable-gprof           enable profiling
+  --enable-gcov            enable coverage
   --enable-pic             enable Position Independant Code for shared objects
   --strip                  enable strip
   --std-allocator          uses standard lib memory allocator
@@ -339,6 +342,8 @@
             ;;
         --extra-ldflags=*) LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
             ;;
+        --extra-ff-ldflags=*) ffmpeg_extra_ldflags=`echo $opt | cut -d '=' -f 2`
+            ;;
         --extra-libs=*) extralibs=${opt#--extra-libs=}
             ;;
         --cpu=*) cpu=`echo $opt | cut -d '=' -f 2`
@@ -349,11 +354,14 @@
             ;;
         --enable-pic) want_pic="yes";
             ;;
+        --enable-gcov) want_gcov="yes";
+            ;;
         --verbose) verbose="yes";
             ;;
     esac
 done
 
+
 cc="${cc_orig}"
 cxx="${cxx_orig}"
 
@@ -658,6 +666,11 @@
     CXXFLAGS="$CXXFLAGS -fPIC -DPIC"
 fi
 
+if test "$want_gcov"  = "yes" ; then
+    CFLAGS="$CFLAGS --coverage"
+    CXXFLAGS="$CXXFLAGS --coverage"
+    LDFLAGS="$LDFLAGS --coverage"
+fi
 
 #force use of cflags with cc
 cc_naked=$cc
@@ -1288,7 +1301,8 @@
 #look for FFMPEG support
 
 ffmpeg_cflags=""
-ffmpeg_lflags="-lz -lavcodec -lavformat -lavutil -lswscale -lavdevice"
+ffmpeg_lflags="-lz -lavcodec -lavformat -lavutil -lswscale -lavdevice $ffmpeg_extra_ldflags"
+
 if test "$cross_prefix" = "" -a "$pkg_config" != "no"; then
   if $pkg_config --exists libavcodec libavformat libswscale libavdevice libavutil 2> /dev/null  ; then
     ffmpeg_cflags=`$pkg_config --cflags libavcodec libavformat libswscale libavutil libavdevice`
@@ -1731,7 +1745,7 @@
             ;;
         --enable-sdl-static=*) sdl_static="yes"
             ;;
-        --enable-jack=*) has_jack="yes"
+        --enable-jack) has_jack="yes"
             ;;
         --X11-path=*) X11_PATH=`echo $opt | cut -d '=' -f 2`
             ;;
@@ -1743,7 +1757,7 @@
             ;;
         --enable-amr-nb-fixed) has_amr_nb_fixed="yes"
             ;;
-        --disable-pulseaudio=*) has_pulseaudio="no"
+        --disable-pulseaudio) has_pulseaudio="no"
             ;;
         --enable-amr-nb) has_amr_nb="yes"
             ;;
@@ -1753,7 +1767,7 @@
             ;;
         --disable-oggvorbis) has_oggvorbis="no"
             ;;
-        --disable-jack=*) has_jack="no"
+        --disable-jack) has_jack="no"
             ;;
         --disable-alsa) has_alsa="no"
             ;;
@@ -1854,7 +1868,7 @@
             ;;
         --enable-joystick) enable_joystick="yes"
             ;;
-        --enable-pulseaudio=*) has_pulseaudio="yes"
+        --enable-pulseaudio) has_pulseaudio="yes"
             ;;
         --disable-all) has_pulseaudio="no"; has_alsa="no"; disable_core_tools="yes"; disable_3d="yes"; disable_svg="yes"; disable_vrml="yes"; disable_od="yes"; disable_bifs="yes"; disable_bifs_enc="yes"; disable_laser="yes"; disable_seng="yes"; disable_qtvr="yes";  disable_avi="yes"; disable_ogg="yes"; disable_m2ps="yes"; disable_m2ts="yes"; disable_m2ts_mux="yes"; disable_parsers="yes"; disable_import="yes"; disable_export="yes"; disable_swf="yes"; disable_scene_stats="yes"; disable_scene_dump="yes"; disable_scene_encode="yes"; disable_loader_isoff="yes"; disable_od_dump="yes"; disable_od_parse="yes"; disable_isom_dump="yes"; disable_mcrypt="yes"; disable_isoff="yes"; disable_isoff_write="yes"; disable_isoff_hint="yes"; disable_isoff_frag="yes"; disable_streaming="yes"; disable_x3d="yes"; disable_loader_bt="yes"; disable_loader_xmt="yes"; has_dvb4linux="no"; disable_player="yes"; disable_vobsub="yes"; disable_scenegraph="yes"; disable_dvbx="yes"; disable_ttxt="yes"; disable_ttml="yes"; disable_saf="yes"; disable_smgr="yes"; disable_mpd="yes"; disable_dash="yes"; disable_isoff_hds="yes"; disable_hevc="yes"
             ;;
@@ -2326,6 +2340,22 @@
     has_js="no"
     has_jpeg="no"
     has_png="no"
+    has_mad="no"
+    has_ft="no"
+    has_openjpeg="no"
+    has_mad="no"
+    has_faad="no"
+    has_xvid="no"
+    has_ffmpeg="no"
+    has_ogg="no"
+    has_theora="no"
+    has_vorbis="no"
+    has_a52="no"
+    has_opensvc="no"
+    has_openhevc="no"
+    has_freenect="no"
+    has_platinum="no"
+    disable_player="yes"
 fi
 
 if test "$cpu" = "sh4"; then
@@ -2970,6 +3000,7 @@
 echo "DISABLE_AVILIB=$disable_avi" >> config.mak
 echo "DISABLE_M2PS=$disable_m2ps" >> config.mak
 echo "DISABLE_OGG=$disable_ogg" >> config.mak
+echo "DISABLE_ISOFF=$disable_isoff" >> config.mak
 echo "DISABLE_ISOFF_HINT=$disable_isoff_hint" >> config.mak
 echo "DISABLE_VOBSUB=$disable_vobsub" >> config.mak
 echo "DISABLE_TTXT=$disable_ttxt" >> config.mak
@@ -2996,12 +3027,6 @@
 echo "GPAC_USE_TINYGL=$has_tinygl" >> config.mak
 echo "OGL_INCLS=$INCL3D" >> config.mak
 
-if test "$disable_isoff" = "yes" -o "$disable_isoff_write" = "yes" ; then
-	echo "DISABLE_ISOFF=yes" >> config.mak
-else
-        echo "DISABLE_ISOFF=no" >> config.mak
-fi
-
 echo "HAS_OPENGL=$has_opengl" >> config.mak
 
 if test "$has_opengl" = "yes" ; then

gpac-0.5.1.svn5491.tar.xz/doc/configuration.html -> gpac-0.5.1.svn5619.tar.xz/doc/configuration.html Changed

@@ -10,7 +10,7 @@
 
 GPAC Configuration file documentation Version 0.5.0
 
-Last Modified $LastChangedDate: 2014-08-05 18:59:31 +0800 (二, 2014-08-05) $
+Last Modified $LastChangedDate: 2014-11-10 00:53:39 +0800 (一, 2014-11-10) $
 
 
 
@@ -43,8 +43,10 @@
 <a href="#DASH" style="text-decoration: underline;">DASH</a>
 <a href="#ALSA" style="text-decoration: underline;">ALSA</a>
 <a href="#SHORTCUTS" style="text-decoration: underline;">Shortcuts</a>
-<a href="#OpenHEVC" style="text-decoration: underline;">OpenHEVC</a>
 <a href="#DSMCC" style="text-decoration: underline;">DSMCC</a>
+<a href="#OpenHEVC" style="text-decoration: underline;">OpenHEVC</a>
+<a href="#DirectFB" style="text-decoration: underline;">DirectFB</a>
+<a href="#DektecVideo" style="text-decoration: underline;">DektecVideo</a>
 
 
 
@@ -878,5 +880,17 @@
 
 Specifies the underlying windowing library.
 
+
+ 
+
+<a name="DektecVideo"></a>
+Section "DektecVideo" <a href="#Overview">Back to top</a>
+
+The "DektecVideo" section of the config file holds the configuration options for the Dektec SDI video output module.</a>
+
+SDIOutput [value: unsigned integer]
+
+Specifies the output port of the card. Default value is 1.
+
 </body>
 </html>

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/DTAPI.h Added

@@ -0,0 +1,5855 @@
+//*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#* DTAPI.h *#*#*#*#*#*#*#*#*#* (C) 2000-2014 DekTec
+//
+// DTAPI - C++ API for DekTec PCI/PCI-Express cards, USB-2 adapters and network devices
+//
+ 
+#ifndef __DTAPI_H
+#define __DTAPI_H
+
+// DTAPI version
+#define DTAPI_VERSION_MAJOR 5
+#define DTAPI_VERSION_MINOR 8
+#define DTAPI_VERSION_BUGFIX 0
+#define DTAPI_VERSION_BUILD 43
+
+//-.-.-.-.-.-.-.-.-.-.-.-.- Additional Libraries to be Linked In -.-.-.-.-.-.-.-.-.-.-.-.-
+
+#ifdef _WIN32
+
+#ifndef _LIB // Do not link libraries into DTAPI itself
+#pragma comment(lib, "iphlpapi.lib")
+#pragma comment(lib, "ws2_32.lib")
+#pragma comment(lib, "setupapi.lib")
+#pragma comment(lib, "comctl32.lib")
+#pragma comment(lib, "wbemuuid.lib")
+#endif
+
+#ifndef _DTAPI_DISABLE_AUTO_LINK
+ // Are we using multi-threaded-DLL or static runtime libraries?
+ #ifdef _DLL
+ // Link with DLL runtime version (/MD)
+ #ifdef _DEBUG
+ #ifdef _WIN64
+ #pragma comment(lib, "DTAPI64MDd.lib") // Debug 64bit
+ #pragma message("Automatically linking with DTAPI64MDd.lib")
+ #else
+ #pragma comment(lib, "DTAPIMDd.lib") // Debug 32bit
+ #pragma message("Automatically linking with DTAPIMDd.lib") 
+ #endif
+ #else
+ #ifdef _WIN64
+ #pragma comment(lib, "DTAPI64MD.lib") // Release 64bit
+ #pragma message("Automatically linking with DTAPI64MD.lib")
+ #else
+ #pragma comment(lib, "DTAPIMD.lib") // Release 32bit
+ #pragma message("Automatically linking with DTAPIMD.lib") 
+ #endif
+ #endif
+ #else
+ // Link to static runtime version (/MT)
+ #ifdef _DEBUG
+ #ifdef _WIN64
+ #pragma comment(lib, "DTAPI64MTd.lib") // Debug 64bit
+ #pragma message("Automatically linking with DTAPI64MTd.lib")
+ #else
+ #pragma comment(lib, "DTAPIMTd.lib") // Debug 32bit
+ #pragma message("Automatically linking with DTAPIMTd.lib") 
+ #endif
+ #else
+ #ifdef _WIN64
+ #pragma comment(lib, "DTAPI64MT.lib") // Release 64bit
+ #pragma message("Automatically linking with DTAPI64MT.lib")
+ #else
+ #pragma comment(lib, "DTAPIMT.lib") // Release 32bit
+ #pragma message("Automatically linking with DTAPIMT.lib") 
+ #endif
+ #endif
+ #endif
+#endif
+#endif // #ifdef _WIN32
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Includes -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+
+#ifndef _WIN32
+ // Linux specific includes: For NULL type definition
+ #include </usr/include/linux/stddef.h>
+ // For intptr_t
+ #include <stdint.h>
+#endif
+
+// STL includes
+#include <list>
+#include <map>
+#include <string>
+#include <vector>
+#include <limits>
+
+// When creating a DLL under Windows, disable warnings related to exporting STL
+// instantiations in classes.
+// See also: http://support.microsoft.com/kb/q168958/
+#ifdef _MSC_VER
+ #pragma warning(disable: 4251)
+#endif
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Support Types -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+
+#ifndef _WIN32
+ typedef signed long long __int64;
+#endif
+
+// All DTAPI code lives in namespace Dtapi
+namespace Dtapi
+{
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Forward declarations -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+
+class AdvDemod;
+class DtaPlusDevice;
+class DtDvbT2Pars;
+class DteDevice;
+class DtSdiUtility;
+class FrameBufImpl;
+class IDevice;
+class IDtDemodEvent;
+class InpChannel;
+class IXpMutex;
+class MplpHelper;
+class OutpChannel;
+class SdiMatrixImpl;
+
+struct DtDabEnsembleInfo;
+struct DtDabEtiStreamSelPars;
+struct DtDabStreamSelPars;
+struct DtDemodParsAtsc;
+struct DtDemodParsDab;
+struct DtDemodParsDvbC2;
+struct DtDemodParsDvbS;
+struct DtDemodParsDvbS2;
+struct DtDemodParsDvbT;
+struct DtDemodParsDvbT2;
+struct DtDemodParsIq;
+struct DtDemodParsIq2131;
+struct DtDemodParsIsdbt;
+struct DtDemodParsQam;
+struct DtDemodLdpcStats;
+struct DtDemodMaLayerData;
+struct DtDemodMaLayerStats;
+struct DtDemodPlpBlocks;
+struct DtDvbC2DemodL1Part2Data;
+struct DtDvbC2DemodL1PlpSigData;
+struct DtDvbC2ModStatus;
+struct DtDvbC2Pars;
+struct DtDvbC2PlpPars;
+struct DtDvbC2StreamSelPars;
+struct DtDvbC2XFecFrameHeader;
+struct DtDvbS2ModStatus;
+struct DtDvbS2ModCod;
+struct DtDvbS2Pars;
+struct DtDemodParsDvbS2Adv;
+struct DtDvbTStreamSelPars;
+struct DtDvbTTpsInfo;
+struct DtDvbT2DemodL1Data;
+struct DtDvbT2ModStatus;
+struct DtDvbT2StreamSelPars;
+struct DtIsdbtStreamSelPars;
+struct DtIsdbTmmPars;
+struct DtPar;
+struct DtPlpInpPars;
+struct DtStatistic;
+struct DtT2MiStreamSelPars;
+struct DtVirtualOutData;
+struct DtRsDecStats;
+struct DtVitDecStats;
+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+//=+=+=+=+=+=+=+=+=+=+=+=+ DTAPI HELPER CLASSES AND HELPER TYPES +=+=+=+=+=+=+=+=+=+=+=+=+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DTAPI_RESULT -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+
+// Type returned by most API calls
+typedef unsigned int DTAPI_RESULT;
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtExc -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Exception object thrown from API calls (if API call throws an exception)
+//
+class DtExc
+{
+public:
+ const DTAPI_RESULT m_Error; // DTAPI result code (i.e. reason of exception)
+ 
+public:
+ DtExc(DTAPI_RESULT e) : m_Error(e) {}
+ virtual ~DtExc() {}
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtBufferInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+struct DtBufferInfo
+{
+ int m_VidStd; // Video standard 
+ int m_NumColumns; // Number of columns 
+ __int64 m_NumReceived; // Number of frames received
+ __int64 m_NumDropped; // Number of frames dropped
+ __int64 m_NumTransmitted; // Number of frames transmitted
+ __int64 m_NumDuplicated; // Number of frames duplicated
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtCaps - Capabilities -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Scalable type for storing (combinations of) capability flags.
+// It can be used with bitwise operators for testing and setting of capabilities.
+//
+class DtCaps 
+{
+ // Number of 64-bit integers used to represent a capability
+ static const int DTCAPS_SIZE = 3;
+
+public:
+ DtCaps();
+ DtCaps(int BitNr);
+ DtCaps(__int64 F1, __int64 F2, __int64 F3);
+
+public:
+ int GetCapIndex() const;
+ std::string ToString() const;
+ DtCaps operator & (const DtCaps& Caps) const;
+ DtCaps& operator &= (const DtCaps& Caps);
+ DtCaps operator | (const DtCaps& Caps) const;
+ DtCaps& operator |= (const DtCaps& Caps);
+ bool operator == (const DtCaps& Caps) const;
+ bool operator == (const int Zero) const;
+ bool operator != (const DtCaps& Caps) const;
+ bool operator != (const int Zero) const;
+ __int64 operator [] (const int n) const;
+ DtCaps operator ~ () const;
+ // Implementation data
+private:
+ __int64 m_Flags[DTCAPS_SIZE];
+};
+
+// Capabilities
+#define DTAPI_CAP_EMPTY Dtapi::DtCaps() // DtCaps without any capability flags
+
+// Capability group 3GLVL - 3G-SDI level config
+#define DTAPI_CAP_3GLVLA Dtapi::DtCaps(0) // 3G-SDI level A
+#define DTAPI_CAP_3GLVLB Dtapi::DtCaps(1) // 3G-SDI level B
+
+// Capability group APPS - Applications
+#define DTAPI_CAP_C2X Dtapi::DtCaps(2) // C2Xpert
+#define DTAPI_CAP_DP Dtapi::DtCaps(3) // DtGrabber+ and DtTV
+#define DTAPI_CAP_DTTV Dtapi::DtCaps(4) // DtTV
+#define DTAPI_CAP_E Dtapi::DtCaps(5) // DtEncode
+#define DTAPI_CAP_J Dtapi::DtCaps(6) // DtJitter
+#define DTAPI_CAP_MR Dtapi::DtCaps(7) // MuxXpert runtime
+#define DTAPI_CAP_MS Dtapi::DtCaps(8) // MuxXpert SDK
+#define DTAPI_CAP_MX Dtapi::DtCaps(9) // MuxXpert
+#define DTAPI_CAP_RC Dtapi::DtCaps(10) // StreamXpress remote control
+#define DTAPI_CAP_RX Dtapi::DtCaps(11) // RFXpert
+#define DTAPI_CAP_SP Dtapi::DtCaps(12) // StreamXpress stream player
+#define DTAPI_CAP_SX Dtapi::DtCaps(13) // StreamXpert analyzer
+#define DTAPI_CAP_SXDGL Dtapi::DtCaps(14) // StreamXpert analyzer (dongled)
+#define DTAPI_CAP_SY Dtapi::DtCaps(15) // SdEye
+#define DTAPI_CAP_XP Dtapi::DtCaps(16) // Xpect
+#define DTAPI_CAP_T2X Dtapi::DtCaps(17) // T2Xpert
+
+// Capability group BOOLIO - Boolean I/O capabilities
+#define DTAPI_CAP_BW Dtapi::DtCaps(18) // Isochronous bandwidth allocated
+#define DTAPI_CAP_FAILSAFE Dtapi::DtCaps(19) // A fail-over relay is available
+#define DTAPI_CAP_FRACMODE Dtapi::DtCaps(20) // Fractional mode is supported
+#define DTAPI_CAP_GENLOCKED Dtapi::DtCaps(21) // Locked to a genlock reference
+#define DTAPI_CAP_GENREF Dtapi::DtCaps(22) // Genlock reference input
+#define DTAPI_CAP_SWS2APSK Dtapi::DtCaps(23) // DVB-S2 APSK mode
+
+// Capability group DEMODPROPS - Demodulation properties
+#define DTAPI_CAP_ANTPWR Dtapi::DtCaps(24) // Antenna power
+#define DTAPI_CAP_LNB Dtapi::DtCaps(25) // LNB
+#define DTAPI_CAP_RX_ADV Dtapi::DtCaps(26) // Advanced demodulation
+
+// Capability group FREQBAND - Frequency band
+#define DTAPI_CAP_LBAND Dtapi::DtCaps(27) // L-band 950-2150MHz
+#define DTAPI_CAP_VHF Dtapi::DtCaps(28) // VHF-band 47-470MHz
+#define DTAPI_CAP_UHF Dtapi::DtCaps(29) // UHF-band 400-862MHz
+
+// Capability group IODIR - I/O direction
+#define DTAPI_CAP_DISABLED Dtapi::DtCaps(30) // Port is disabled
+#define DTAPI_CAP_INPUT Dtapi::DtCaps(31) // Uni-directional input
+#define DTAPI_CAP_OUTPUT Dtapi::DtCaps(32) // Uni-directional output
+
+// Subcapabilities of IODIR, DTAPI_CAP_INPUT
+#define DTAPI_CAP_SHAREDANT Dtapi::DtCaps(33) // Get antenna signal from another port
+
+// Subcapabilities of IODIR, DTAPI_CAP_OUTPUT
+#define DTAPI_CAP_DBLBUF Dtapi::DtCaps(34) // Double buffered output
+#define DTAPI_CAP_LOOPS2L3 Dtapi::DtCaps(35) // Loop-through of DVB-S2 in L3-frames
+#define DTAPI_CAP_LOOPS2TS Dtapi::DtCaps(36) // Loop-through of an DVB-S(2) input
+#define DTAPI_CAP_LOOPTHR Dtapi::DtCaps(37) // Loop-through of another input
+
+// Capability group IOPROPS - Miscellaneous I/O properties
+#define DTAPI_CAP_ASIPOL Dtapi::DtCaps(38) // ASI output signal can be inverted
+#define DTAPI_CAP_HUFFMAN Dtapi::DtCaps(39) // Huffman coding for SDI
+#define DTAPI_CAP_IPPAIR Dtapi::DtCaps(40) // Network port supports failover
+#define DTAPI_CAP_L3MODE Dtapi::DtCaps(41) // L3-frame mode
+#define DTAPI_CAP_MATRIX Dtapi::DtCaps(42) // Matrix API support
+#define DTAPI_CAP_RAWASI Dtapi::DtCaps(43) // Raw ASI
+#define DTAPI_CAP_SDI10BNBO Dtapi::DtCaps(44) // 10-bit network byte order
+#define DTAPI_CAP_SDITIME Dtapi::DtCaps(45) // SDI timestamping
+#define DTAPI_CAP_TIMESTAMP64 Dtapi::DtCaps(46) // 64-bit timestamping
+#define DTAPI_CAP_TRPMODE Dtapi::DtCaps(47) // Transparent mode
+#define DTAPI_CAP_TS Dtapi::DtCaps(48) // MPEG-2 transport stream
+#define DTAPI_CAP_TXONTIME Dtapi::DtCaps(49) // Transmit on timestamp
+
+// Capability group IOSTD - I/O standard
+#define DTAPI_CAP_3GSDI Dtapi::DtCaps(50) // 3G-SDI
+#define DTAPI_CAP_ASI Dtapi::DtCaps(51) // DVB-ASI transport stream
+#define DTAPI_CAP_DEMOD Dtapi::DtCaps(52) // Demodulation
+#define DTAPI_CAP_HDSDI Dtapi::DtCaps(53) // HD-SDI
+#define DTAPI_CAP_IFADC Dtapi::DtCaps(54) // IF A/D converter
+#define DTAPI_CAP_IP Dtapi::DtCaps(55) // Transport stream over IP
+#define DTAPI_CAP_MOD Dtapi::DtCaps(56) // Modulator output
+#define DTAPI_CAP_RS422 Dtapi::DtCaps(57) // RS422 port
+#define DTAPI_CAP_SDI Dtapi::DtCaps(58) // SD-SDI
+#define DTAPI_CAP_SPI Dtapi::DtCaps(59) // DVB-SPI transport stream
+#define DTAPI_CAP_SPISDI Dtapi::DtCaps(60) // SD-SDI on a parallel port
+
+// Subcapabilities of IOSTD, DTAPI_CAP_3GSDI
+#define DTAPI_CAP_1080P50 Dtapi::DtCaps(61) // 1080p/50
+#define DTAPI_CAP_1080P59_94 Dtapi::DtCaps(62) // 1080p/59.94
+#define DTAPI_CAP_1080P60 Dtapi::DtCaps(63) // 1080p/60
+
+// Subcapabilities of IOSTD, DTAPI_CAP_HDSDI
+#define DTAPI_CAP_1080I50 Dtapi::DtCaps(64) // 1080i/50
+#define DTAPI_CAP_1080I59_94 Dtapi::DtCaps(65) // 1080i/59.94
+#define DTAPI_CAP_1080I60 Dtapi::DtCaps(66) // 1080i/60
+#define DTAPI_CAP_1080P23_98 Dtapi::DtCaps(67) // 1080p/23.98
+#define DTAPI_CAP_1080P24 Dtapi::DtCaps(68) // 1080p/24
+#define DTAPI_CAP_1080P25 Dtapi::DtCaps(69) // 1080p/25
+#define DTAPI_CAP_1080P29_97 Dtapi::DtCaps(70) // 1080p/29.97
+#define DTAPI_CAP_1080P30 Dtapi::DtCaps(71) // 1080p/30
+#define DTAPI_CAP_720P23_98 Dtapi::DtCaps(72) // 720p/23.98
+#define DTAPI_CAP_720P24 Dtapi::DtCaps(73) // 720p/24
+#define DTAPI_CAP_720P25 Dtapi::DtCaps(74) // 720p/25
+#define DTAPI_CAP_720P29_97 Dtapi::DtCaps(75) // 720p/29.97
+#define DTAPI_CAP_720P30 Dtapi::DtCaps(76) // 720p/30
+#define DTAPI_CAP_720P50 Dtapi::DtCaps(77) // 720p/50
+#define DTAPI_CAP_720P59_94 Dtapi::DtCaps(78) // 720p/59.94
+#define DTAPI_CAP_720P60 Dtapi::DtCaps(79) // 720p/60
+
+// Subcapabilities of IOSTD, DTAPI_CAP_SDI
+#define DTAPI_CAP_525I59_94 Dtapi::DtCaps(80) // 525i/59.94
+#define DTAPI_CAP_625I50 Dtapi::DtCaps(81) // 625i/50
+
+// Subcapabilities of IOSTD, DTAPI_CAP_SPISDI
+#define DTAPI_CAP_SPI525I59_94 Dtapi::DtCaps(82) // SPI 525i/59.94
+#define DTAPI_CAP_SPI625I50 Dtapi::DtCaps(83) // SPI 625i/50
+
+// Capability group MODSTD - Modulation standards
+#define DTAPI_CAP_TX_ATSC Dtapi::DtCaps(84) // ATSC 8-VSB modulation
+#define DTAPI_CAP_TX_CMMB Dtapi::DtCaps(85) // CMMB modulation
+#define DTAPI_CAP_TX_DAB Dtapi::DtCaps(86) // DAB modulation
+#define DTAPI_CAP_TX_DTMB Dtapi::DtCaps(87) // DTMB modulation
+#define DTAPI_CAP_TX_DVBC2 Dtapi::DtCaps(88) // DVB-C2 modulation
+#define DTAPI_CAP_TX_DVBS Dtapi::DtCaps(89) // DVB-S modulation
+#define DTAPI_CAP_TX_DVBS2 Dtapi::DtCaps(90) // DVB-S2 modulation
+#define DTAPI_CAP_TX_DVBS2X Dtapi::DtCaps(91) // DVB-S2X modulation
+#define DTAPI_CAP_TX_DVBT Dtapi::DtCaps(92) // DVB-T modulation
+#define DTAPI_CAP_TX_DVBT2 Dtapi::DtCaps(93) // DVB-T2 modulation
+#define DTAPI_CAP_TX_GOLD Dtapi::DtCaps(94) // GOLD for modulators
+#define DTAPI_CAP_TX_IQ Dtapi::DtCaps(95) // I/Q sample modulation
+#define DTAPI_CAP_TX_ISDBS Dtapi::DtCaps(96) // ISDB-S modulation
+#define DTAPI_CAP_TX_ISDBT Dtapi::DtCaps(97) // ISDB-T modulation
+#define DTAPI_CAP_TX_ISDBTMM Dtapi::DtCaps(98) // ISDB-Tmm modulation
+#define DTAPI_CAP_TX_MH Dtapi::DtCaps(99) // ATSC-MH modulation
+#define DTAPI_CAP_TX_QAMA Dtapi::DtCaps(100) // QAM-A modulation
+#define DTAPI_CAP_TX_QAMB Dtapi::DtCaps(101) // QAM-B modulation
+#define DTAPI_CAP_TX_QAMC Dtapi::DtCaps(102) // QAM-C modulation
+#define DTAPI_CAP_TX_T2MI Dtapi::DtCaps(103) // T2MI transmission
+#define DTAPI_CAP_TX_T2SPLP Dtapi::DtCaps(104) // DVB-T2 single PLP modulation
+
+// Capability group MODPROPS - Modulation properties
+#define DTAPI_CAP_ADJLVL Dtapi::DtCaps(105) // Adjustable output level
+#define DTAPI_CAP_CM Dtapi::DtCaps(106) // Channel simulation
+#define DTAPI_CAP_CW Dtapi::DtCaps(107) // Continuous wave
+#define DTAPI_CAP_DIGIQ Dtapi::DtCaps(108) // Digital I/Q sample output
+#define DTAPI_CAP_IF Dtapi::DtCaps(109) // IF output
+#define DTAPI_CAP_MUTE Dtapi::DtCaps(110) // Mute RF output signal
+#define DTAPI_CAP_ROLLOFF Dtapi::DtCaps(111) // Adjustable roll-off factor
+#define DTAPI_CAP_S2APSK Dtapi::DtCaps(112) // DVB-S2 16-APSK/32-APSK
+#define DTAPI_CAP_SNR Dtapi::DtCaps(113) // AWGN insertion
+#define DTAPI_CAP_TX_16MHZ Dtapi::DtCaps(114) // 16MHz bandwidth mode
+
+// Capability group RFCLKSEL - RF clock source selection
+#define DTAPI_CAP_RFCLKEXT Dtapi::DtCaps(115) // External RF clock input
+#define DTAPI_CAP_RFCLKINT Dtapi::DtCaps(116) // Internal RF clock reference
+
+// Capability group RXSTD - Receiver standards
+#define DTAPI_CAP_RX_ATSC Dtapi::DtCaps(117) // ATSC 8-VSB reception
+#define DTAPI_CAP_RX_CMMB Dtapi::DtCaps(118) // CMMB reception
+#define DTAPI_CAP_RX_DAB Dtapi::DtCaps(119) // DAB reception
+#define DTAPI_CAP_RX_DTMB Dtapi::DtCaps(120) // DTMB reception
+#define DTAPI_CAP_RX_DVBC2 Dtapi::DtCaps(121) // DVB-C2 reception
+#define DTAPI_CAP_RX_DVBS Dtapi::DtCaps(122) // DVB-S reception
+#define DTAPI_CAP_RX_DVBS2 Dtapi::DtCaps(123) // DVB-S2 reception
+#define DTAPI_CAP_RX_DVBT Dtapi::DtCaps(124) // DVB-T reception
+#define DTAPI_CAP_RX_DVBT2 Dtapi::DtCaps(125) // DVB-T2 reception
+#define DTAPI_CAP_RX_GOLD Dtapi::DtCaps(126) // GOLD for receivers
+#define DTAPI_CAP_RX_IQ Dtapi::DtCaps(127) // I/Q sample reception
+#define DTAPI_CAP_RX_ISDBS Dtapi::DtCaps(128) // ISDB-S reception
+#define DTAPI_CAP_RX_ISDBT Dtapi::DtCaps(129) // ISDB-T reception
+#define DTAPI_CAP_RX_MH Dtapi::DtCaps(130) // ATSC-MH reception
+#define DTAPI_CAP_RX_QAMA Dtapi::DtCaps(131) // QAM-A reception
+#define DTAPI_CAP_RX_QAMB Dtapi::DtCaps(132) // QAM-B reception
+#define DTAPI_CAP_RX_QAMC Dtapi::DtCaps(133) // QAM-C reception
+#define DTAPI_CAP_RX_T2MI Dtapi::DtCaps(134) // T2MI reception
+
+// Capability group SPICLKSEL - Parallel port clock source selection
+#define DTAPI_CAP_SPICLKEXT Dtapi::DtCaps(135) // External clock input
+#define DTAPI_CAP_SPICLKINT Dtapi::DtCaps(136) // Internal clock reference
+
+// Capability group SPIMODE - Parallel port mode
+#define DTAPI_CAP_SPIFIXEDCLK Dtapi::DtCaps(137) // SPI fixed clock with valid signal
+#define DTAPI_CAP_SPIDVBMODE Dtapi::DtCaps(138) // SPI DVB mode
+#define DTAPI_CAP_SPISER8B Dtapi::DtCaps(139) // SPI serial 8-bit mode
+#define DTAPI_CAP_SPISER10B Dtapi::DtCaps(140) // SPI serial 10-bit mode
+
+// Capability group SPISTD - Parallel port I/O standard
+#define DTAPI_CAP_SPILVDS1 Dtapi::DtCaps(141) // LVDS1
+#define DTAPI_CAP_SPILVDS2 Dtapi::DtCaps(142) // LVDS2
+#define DTAPI_CAP_SPILVTTL Dtapi::DtCaps(143) // LVTTL
+
+// Capability group TSRATESEL - Transport-stream rate selection
+#define DTAPI_CAP_EXTTSRATE Dtapi::DtCaps(144) // External TS rate clock input
+#define DTAPI_CAP_EXTRATIO Dtapi::DtCaps(145) // External TS rate clock with ratio
+#define DTAPI_CAP_INTTSRATE Dtapi::DtCaps(146) // Internal TS rate clock reference
+#define DTAPI_CAP_LOCK2INP Dtapi::DtCaps(147) // Lock TS rate to input port
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtCmmbPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// CMMB Modulation Parameters
+//
+struct DtCmmbPars
+{
+ int m_Bandwidth; // CMMB Bandwitdh
+ int m_TsRate; // CMMB TS rate in bps
+ int m_TsPid; // PID on which the CMMB stream is found
+ int m_AreaId; // Area ID (0..127)
+ int m_TxId; // Transmitter ID (128..255)
+ 
+public:
+ DtCmmbPars();
+ DTAPI_RESULT RetrieveTsRateFromTs(char* pBuffer, int NumBytes);
+ bool operator == (DtCmmbPars& Rhs);
+ bool operator != (DtCmmbPars& Rhs);
+};
+
+// DtOutpChannel::SetModControl - Bandwidth
+#define DTAPI_CMMB_BW_2MHZ 0x00000000
+#define DTAPI_CMMB_BW_8MHZ 0x00000001
+
+//-.-.-.-.-.-.-.-.-.-.-.- DtCmPars - Channel Modelling Parameters -.-.-.-.-.-.-.-.-.-.-.-.
+
+// Maximum number of fading paths
+#define DTAPI_CM_MAX_PATHS 32
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtCmPath -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// This structure describes the fading parameters for a single path in a
+// multi-path simulation.
+//
+struct DtCmPath
+{
+ enum Type
+ {
+ CONSTANT_DELAY, // Constant delay/phase
+ CONSTANT_DOPPLER, // Constant frequency shift
+ RAYLEIGH_JAKES, // Rayleigh fading with Jakes power spectral density
+ // (mobile path model)
+ RAYLEIGH_GAUSSIAN // Rayleigh fading with Gaussian power spectral
+ // density (ionospheric path model)
+ };
+ Type m_Type; // Type of path fading
+ double m_Attenuation; // Attenuation in dB
+ double m_Delay; // Delay in us
+ double m_Phase; // Phase shift in degrees for CONSTANT_DELAY paths
+ double m_Doppler; // Doppler frequency in Hz
+
+ // Constructor - Gives parameters a default value
+ DtCmPath() :
+ m_Type(CONSTANT_DELAY),
+ m_Attenuation(0.0), m_Delay(0.0), m_Phase(0.0), m_Doppler(0.0)
+ {}
+ // Operators
+ bool operator == (DtCmPath& Rhs);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtCmPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// This structure describes channel-modeling parameters. It\92s used to simulate the 
+// transmission distortions that may occur in the channel between a transmitter and
+// a receiver.
+//
+struct DtCmPars
+{
+ bool m_EnableAwgn; // Enable white Gaussian noise (AWGN) injection
+ double m_Snr; // Signal-to-noise ratio in dB
+ bool m_EnablePaths; // Enable multi-path simulation
+ std::vector<DtCmPath> m_Paths; // Parameters per path
+
+ // Constructor and operators
+ DtCmPars();
+ bool operator == (DtCmPars&);
+ bool operator != (DtCmPars& Rhs) { return !(*this == Rhs); }
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtConstelPoint -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// This structure describes a constellation point in a receiver constellation diagram
+//
+struct DtConstelPoint
+{
+ int m_X, m_Y; // X and Y coordinates
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- IDtDemodEvent -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Callback event interface for demodulators
+//
+class IDtDemodEvent
+{
+public:
+ virtual void TuningFreqHasChanged(__int64 OldFreqHz, __int64 NewFreqHz) {}
+ virtual void TuningParsHaveChanged(
+ __int64 OldFreqHz, int OldModType, int OldParXtra[3],
+ __int64 NewFreqHz, int NewModType, int NewParXtra[3]) {}
+};
+
+
+// Maximum number of IpV6 addresses per interface
+#define MAX_IPV6_ADDR 3
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDeviceDesc -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// This structure describes a DekTec device
+//
+struct DtDeviceDesc
+{
+ int m_Category; // Device category (DTAPI_CAT_XXX)
+ __int64 m_Serial; // Unique serial number of the device
+ int m_PciBusNumber; // PCI-bus number
+ int m_SlotNumber; // PCI-slot number
+ int m_UsbAddress; // USB address
+ int m_TypeNumber; // Device type number
+ int m_SubType; // Device subtype (0=none, 1=A, ...)
+ int m_DeviceId; // Device ID
+ int m_VendorId; // Vendor ID
+ int m_SubsystemId; // Subsystem ID
+ int m_SubVendorId; // Subsystem Vendor ID
+ int m_NumHwFuncs; // Number of hardware funtions hosted by device
+ int m_HardwareRevision; // Hardware revision (e.g. 302 = 3.2)
+ int m_FirmwareVersion; // Firmware version
+ int m_FirmwareVariant; // Firmware variant
+ int m_NumDtInpChan; // Number of input channels (max)
+ int m_NumDtOutpChan; // Number of output channels (max)
+ int m_NumPorts; // Number of physical ports
+ unsigned char m_Ip[4]; // IP address (only valid for DTE-31xx devices)
+ unsigned char m_IpV6[MAX_IPV6_ADDR][16];
+ // IP address (only valid for DTE-31xx devices)
+ unsigned char m_MacAddr[6]; // MAC address (only valid for DTE-31xx devices)
+ int m_PcieNumLanes; // Number of allocated PCIe lanes
+ int m_PcieMaxLanes; // Maximum number of PCIe lanes
+ int m_PcieLinkSpeed; // Current PCIe link speed (GEN1, 2 or 3)
+ int m_PcieMaxSpeed; // Maximum PCIe link speed (GEN1, 2 or 3)
+};
+
+// Device categories
+#define DTAPI_CAT_PCI 0 // PCI or PCI-Express device
+#define DTAPI_CAT_USB 1 // USB-2 or USB-3 device
+#define DTAPI_CAT_NW 2 // Network device
+#define DTAPI_CAT_IP 3 // Network appliance: DTE-31xx
+#define DTAPI_CAT_NIC 4 // Non-DekTec network card
+#define DTAPI_CAT_NWAP 5 // Network Advanced Protocol(VLAN device)
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDtaPlusDeviceDesc -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// This structure describes a DekTec DTA-plus device
+//
+struct DtDtaPlusDeviceDesc
+{
+ __int64 m_Serial; // Unique serial number of the device
+ std::string m_DevicePath; // Path of file to open to interface with the device
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtEventArgs -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Details for a specific event
+//
+struct DtEventArgs
+{
+ DtEventArgs() : m_Value1(0), m_Value2(0), m_pContext(0) {};
+
+ int m_HwCat; // Hardware category: DTAPI_CAT_XXX
+ __int64 m_Serial; // Serial number of device causing event
+ int m_Value1; // Event value #1
+ int m_Value2; // Event value #2
+ void* m_pContext; // Context-specific pointer
+};
+
+// Event call back function
+typedef void (*pDtEventCallback)(int Event, const DtEventArgs* pArgs);
+
+// Global events
+#define DT_EVENT_TYPE_ADD 0x00000001
+#define DT_EVENT_TYPE_REMOVE 0x00000002
+// Device events
+#define DT_EVENT_TYPE_POWER 0x00000004
+#define DT_EVENT_TYPE_GENLOCK 0x00000008
+#define DT_EVENT_TYPE_TEST 0x80000000
+// Network events
+#define DT_EVENT_IP_CHANGED 0x01000000
+#define DT_EVENT_ADMINST_CHANGED 0x02000000
+
+#define DT_EVENT_TYPE_ALL 0xFFFFFFFF
+
+// Event values
+#define DT_EVENT_VALUE1_POWER_UP 1
+#define DT_EVENT_VALUE1_POWER_DOWN 2
+#define DT_EVENT_VALUE1_NO_LOCK 1
+#define DT_EVENT_VALUE1_LOCKED 2
+#define DT_EVENT_VALUE2_XXX 1
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFiltCoeff -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// A single FIR filter coefficient
+//
+struct DtFiltCoeff
+{
+ int m_TapIdx; // Tap number
+ double m_Coeff; // FIR coefficient
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFilterPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Filter coefficients for use in a FIR filter
+//
+struct DtFilterPars
+{
+ std::vector<DtFiltCoeff> m_FiltCoeffs;
+};
+
+// Maximum number of filter coefficients
+#define DTAPI_MAX_NUM_COEFFS 64
+
+#define DTAPI_FRAME_STATUS_OK 0
+#define DTAPI_FRAME_STATUS_ERR_NO_SIGNAL 1
+#define DTAPI_FRAME_STATUS_ERR_STD_MISMATCH 2
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+struct DtFrameInfo
+{
+ int m_VidStd; // Video standard 
+ __int64 m_Timestamp; // 64-bit timestamp
+ __int64 m_FrameNumber; // 64-bit frame number
+ __int64 m_Rp188; // RP188 timestamp
+ int m_RxMode; // RX mode at the time this frame was received
+ int m_Status; // One of DTAPI_FRAME_STATUS_*
+};
+
+//-.-.-.-.-.-.-.-.-.-.- DtHwFuncDesc - Hardware Function Descriptor -.-.-.-.-.-.-.-.-.-.-.
+//
+// Structure describing a hardware function
+//
+struct DtHwFuncDesc
+{
+ DtDeviceDesc m_DvcDesc; // Device descriptor
+ int m_ChanType; // Channel type (OR-able)
+ DtCaps m_Flags; // Capability flags (OR-able)
+ int m_IndexOnDvc; // Relative index of hardware function
+ int m_Port; // Physical port number
+ unsigned char m_Ip[4]; // IP V4 address (TS-over-IP functions only)
+ unsigned char m_IpV6[MAX_IPV6_ADDR][16];
+ // IP V6 address (TS-over-IP functions only)
+ unsigned char m_MacAddr[6]; // MAC address (TS-over-IP functions only)
+};
+
+// Hardware Function - Channel types
+// For IP hardware functions, both DTAPI_CHAN_INPUT and DTAPI_CHAN_OUTPUT are set
+#define DTAPI_CHAN_DISABLED 0 // Channel is disabled
+#define DTAPI_CHAN_INPUT 1 // Input channel
+#define DTAPI_CHAN_OUTPUT 2 // Output channel
+#define DTAPI_CHAN_DBLBUF 4 // Double-buffered copy of an output
+#define DTAPI_CHAN_LOOPTHR 8 // Loop-through copy of another port
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIoConfig - I/O Configuration -.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Stores the I/O configuration parameters for one I/O port configuration
+//
+struct DtIoConfig
+{
+ int m_Port; // Port number
+ int m_Group; // Config group, linked to I/O capability groups
+ int m_Value; // Config value, linked to I/O capabilities
+ int m_SubValue; // Config sub value, linked to I/O sub capabilities
+ __int64 m_ParXtra[2]; // Extra parameters, e.g. source port number
+
+ // Constructor - Gives parameters a default value
+ DtIoConfig()
+ {
+ m_Port = -1;
+ m_Group = -1;
+ m_Value = m_SubValue = -1;
+ m_ParXtra[0] = m_ParXtra[1] = -1;
+ }
+ DtIoConfig(int Port, int Group)
+ {
+ m_Port = Port;
+ m_Group = Group;
+ m_Value = m_SubValue = -1;
+ m_ParXtra[0] = m_ParXtra[1] = -1;
+ }
+};
+
+// I/O configuration groups
+#define DTAPI_IOCONFIG_3GLVL 0 // 3G-SDI level config
+#define DTAPI_IOCONFIG_IODIR 1 // I/O direction
+#define DTAPI_IOCONFIG_IOSTD 2 // I/O standard
+#define DTAPI_IOCONFIG_RFCLKSEL 3 // RF clock source selection
+#define DTAPI_IOCONFIG_SPICLKSEL 4 // Parallel port clock source selection
+#define DTAPI_IOCONFIG_SPIMODE 5 // Parallel port mode
+#define DTAPI_IOCONFIG_SPISTD 6 // Parallel port I/O standard
+#define DTAPI_IOCONFIG_TSRATESEL 7 // Transport-stream rate selection
+
+// I/O configuration groups - Boolean I/O
+#define DTAPI_IOCONFIG_BW 8 // Isochronous bandwidth allocated
+#define DTAPI_IOCONFIG_FAILSAFE 9 // A fail-over relay is available
+#define DTAPI_IOCONFIG_FRACMODE 10 // Fractional mode is supported
+#define DTAPI_IOCONFIG_GENLOCKED 11 // Locked to a genlock reference
+#define DTAPI_IOCONFIG_GENREF 12 // Genlock reference input
+#define DTAPI_IOCONFIG_SWS2APSK 13 // DVB-S2 APSK mode
+
+// Values for group IO_CONFIG_3GLVL (3G-SDI level config)
+#define DTAPI_IOCONFIG_3GLVLA 14 // 3G-SDI level A
+#define DTAPI_IOCONFIG_3GLVLB 15 // 3G-SDI level B
+
+// Values for boolean I/O configuration options
+#define DTAPI_IOCONFIG_TRUE 16 // Turn I/O capability on
+#define DTAPI_IOCONFIG_FALSE 17 // Turn I/O capability off
+
+// Values for group IO_CONFIG_IODIR (I/O direction)
+#define DTAPI_IOCONFIG_DISABLED 18 // Port is disabled
+#define DTAPI_IOCONFIG_INPUT 19 // Uni-directional input
+#define DTAPI_IOCONFIG_OUTPUT 20 // Uni-directional output
+
+// SubValues for group DTAPI_IOCONFIG_IODIR, value DTAPI_IOCONFIG_INPUT
+#define DTAPI_IOCONFIG_SHAREDANT 21 // Get antenna signal from another port
+
+// SubValues for group DTAPI_IOCONFIG_IODIR, value DTAPI_IOCONFIG_OUTPUT
+#define DTAPI_IOCONFIG_DBLBUF 22 // Double buffered output
+#define DTAPI_IOCONFIG_LOOPS2L3 23 // Loop-through of DVB-S2 in L3-frames
+#define DTAPI_IOCONFIG_LOOPS2TS 24 // Loop-through of an DVB-S(2) input
+#define DTAPI_IOCONFIG_LOOPTHR 25 // Loop-through of another input
+
+// Values for group IO_CONFIG_IOSTD (I/O standard)
+#define DTAPI_IOCONFIG_3GSDI 26 // 3G-SDI
+#define DTAPI_IOCONFIG_ASI 27 // DVB-ASI transport stream
+#define DTAPI_IOCONFIG_DEMOD 28 // Demodulation
+#define DTAPI_IOCONFIG_HDSDI 29 // HD-SDI
+#define DTAPI_IOCONFIG_IFADC 30 // IF A/D converter
+#define DTAPI_IOCONFIG_IP 31 // Transport stream over IP
+#define DTAPI_IOCONFIG_MOD 32 // Modulator output
+#define DTAPI_IOCONFIG_RS422 33 // RS422 port
+#define DTAPI_IOCONFIG_SDI 34 // SD-SDI
+#define DTAPI_IOCONFIG_SPI 35 // DVB-SPI transport stream
+#define DTAPI_IOCONFIG_SPISDI 36 // SD-SDI on a parallel port
+
+// SubValues for group DTAPI_IOCONFIG_IOSTD, value DTAPI_IOCONFIG_3GSDI
+#define DTAPI_IOCONFIG_1080P50 37 // 1080p/50
+#define DTAPI_IOCONFIG_1080P59_94 38 // 1080p/59.94
+#define DTAPI_IOCONFIG_1080P60 39 // 1080p/60
+
+// SubValues for group DTAPI_IOCONFIG_IOSTD, value DTAPI_IOCONFIG_HDSDI
+#define DTAPI_IOCONFIG_1080I50 40 // 1080i/50
+#define DTAPI_IOCONFIG_1080I59_94 41 // 1080i/59.94
+#define DTAPI_IOCONFIG_1080I60 42 // 1080i/60
+#define DTAPI_IOCONFIG_1080P23_98 43 // 1080p/23.98
+#define DTAPI_IOCONFIG_1080P24 44 // 1080p/24
+#define DTAPI_IOCONFIG_1080P25 45 // 1080p/25
+#define DTAPI_IOCONFIG_1080P29_97 46 // 1080p/29.97
+#define DTAPI_IOCONFIG_1080P30 47 // 1080p/30
+#define DTAPI_IOCONFIG_720P23_98 48 // 720p/23.98
+#define DTAPI_IOCONFIG_720P24 49 // 720p/24
+#define DTAPI_IOCONFIG_720P25 50 // 720p/25
+#define DTAPI_IOCONFIG_720P29_97 51 // 720p/29.97
+#define DTAPI_IOCONFIG_720P30 52 // 720p/30
+#define DTAPI_IOCONFIG_720P50 53 // 720p/50
+#define DTAPI_IOCONFIG_720P59_94 54 // 720p/59.94
+#define DTAPI_IOCONFIG_720P60 55 // 720p/60
+
+// SubValues for group DTAPI_IOCONFIG_IOSTD, value DTAPI_IOCONFIG_SDI
+#define DTAPI_IOCONFIG_525I59_94 56 // 525i/59.94
+#define DTAPI_IOCONFIG_625I50 57 // 625i/50
+
+// SubValues for group DTAPI_IOCONFIG_IOSTD, value DTAPI_IOCONFIG_SPISDI
+#define DTAPI_IOCONFIG_SPI525I59_94 58 // SPI 525i/59.94
+#define DTAPI_IOCONFIG_SPI625I50 59 // SPI 625i/50
+
+// Values for group IO_CONFIG_RFCLKSEL (RF clock source selection)
+#define DTAPI_IOCONFIG_RFCLKEXT 60 // External RF clock input
+#define DTAPI_IOCONFIG_RFCLKINT 61 // Internal RF clock reference
+
+// Values for group IO_CONFIG_SPICLKSEL (Parallel port clock source selection)
+#define DTAPI_IOCONFIG_SPICLKEXT 62 // External clock input
+#define DTAPI_IOCONFIG_SPICLKINT 63 // Internal clock reference
+
+// Values for group IO_CONFIG_SPIMODE (Parallel port mode)
+#define DTAPI_IOCONFIG_SPIFIXEDCLK 64 // SPI fixed clock with valid signal
+#define DTAPI_IOCONFIG_SPIDVBMODE 65 // SPI DVB mode
+#define DTAPI_IOCONFIG_SPISER8B 66 // SPI serial 8-bit mode
+#define DTAPI_IOCONFIG_SPISER10B 67 // SPI serial 10-bit mode
+
+// Values for group IO_CONFIG_SPISTD (Parallel port I/O standard)
+#define DTAPI_IOCONFIG_SPILVDS1 68 // LVDS1
+#define DTAPI_IOCONFIG_SPILVDS2 69 // LVDS2
+#define DTAPI_IOCONFIG_SPILVTTL 70 // LVTTL
+
+// Values for group IO_CONFIG_TSRATESEL (Transport-stream rate selection)
+#define DTAPI_IOCONFIG_EXTTSRATE 71 // External TS rate clock input
+#define DTAPI_IOCONFIG_EXTRATIO 72 // External TS rate clock with ratio
+#define DTAPI_IOCONFIG_INTTSRATE 73 // Internal TS rate clock reference
+#define DTAPI_IOCONFIG_LOCK2INP 74 // Lock TS rate to input port
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIqData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure representing an I/Q data sample
+//
+struct DtIqData
+{
+ int m_I, m_Q; // I/Q sample pair
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbsLayerPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// DtIsdbsLayerPars
+//
+struct DtIsdbsLayerPars
+{
+ int m_NumSlots; // Number of slots
+ int m_ModCod; // Modulation method and Code rate
+};
+
+// Number of slots per ISDB-S frame
+#define DTAPI_ISDBS_SLOTS_PER_FRAME 48
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbsPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// ISDB-S parameters including per-layer parameters
+//
+struct DtIsdbsPars
+{
+ DtIsdbsPars() : m_DoMux(false) {}
+
+ bool m_DoMux; // Hierarchical multiplexing yes/no
+ int m_Emergency; // Switch-on control for emergency broadcast
+ int m_RelTs2TsId[8]; // Relative TS to TS-ID mapping
+ // Slot to relative TS mapping
+ int m_Slot2RelTs[DTAPI_ISDBS_SLOTS_PER_FRAME];
+ // Modulation parameters per hierarchical layer
+ DtIsdbsLayerPars m_LayerPars[4];
+
+ DTAPI_RESULT CheckValidity(void);
+ void Init(void);
+ bool operator == (DtIsdbsPars& Rhs);
+ bool operator != (DtIsdbsPars& Rhs);
+};
+
+// ISDB-S modulation method and code rate
+#define DTAPI_ISDBS_MODCOD_BPSK_1_2 1
+#define DTAPI_ISDBS_MODCOD_QPSK_1_2 2
+#define DTAPI_ISDBS_MODCOD_QPSK_2_3 3
+#define DTAPI_ISDBS_MODCOD_QPSK_3_4 4
+#define DTAPI_ISDBS_MODCOD_QPSK_5_6 5
+#define DTAPI_ISDBS_MODCOD_QPSK_7_8 6
+#define DTAPI_ISDBS_MODCOD_8PSK_2_3 7
+#define DTAPI_ISDBS_MODCOD_NOT_ALLOC 15
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbtLayerData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Parameters per hierarchical ISDB-T layer used for statistic: DTAPI_STAT_ISDBT_PARSDATA
+//
+struct DtIsdbtLayerData
+{
+ int m_NumSegments; // Number of segments
+ int m_Modulation; // Modulation type
+ int m_CodeRate; // Code rate
+ int m_TimeInterleave; // Time interleaving 0..4 (new spec limits the
+ // maximum value to 3 instead of 4).
+ // Time interleaving I = 0 if ti = 0 or
+ // I = (1 << (ti + 2 - mode)) if ti != 0
+ DtIsdbtLayerData();
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbtLayerPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Parameters per hierarchical ISDB-T layer
+//
+struct DtIsdbtLayerPars
+{
+ int m_NumSegments; // Number of segments
+ int m_Modulation; // Modulation type
+ int m_CodeRate; // Code rate
+ int m_TimeInterleave; // Time interleaving
+ // Derived:
+ int m_BitRate; // Bits per second assuming 6 MHz channel
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbtParamsData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// ISDB-T parameters including per-layer parameters used for statistic: 
+// DTAPI_STAT_ISDBT_PARSDATA
+//
+struct DtIsdbtParamsData
+{
+ int m_BType; // Broadcast type
+ int m_Mode; // Transmission mode: 1, 2 or 3 
+ int m_Guard; // Guard interval
+ int m_PartialRx; // Use first layer for partial reception.
+ // Ignored for radio broadcasts 
+ // Layer-A/B/C parameters
+ DtIsdbtLayerData m_LayerPars[3];
+
+ DtIsdbtParamsData();
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbtPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// ISDB-T parameters including per-layer parameters
+//
+struct DtIsdbtPars
+{
+ bool m_DoMux; // Hierarchical multiplexing yes/no
+ bool m_FilledOut; // Members have been given a value
+ int m_ParXtra0; // #Segments, bandwidth, sample rate, sub channel
+ int m_BType; // Broadcast type
+ int m_Mode; // Transmission mode
+ int m_Guard; // Guard interval
+ int m_PartialRx; // Partal reception
+ int m_Emergency; // Switch-on control for emergency broadcast
+ int m_IipPid; // PID used for multiplexing IIP packet
+ int m_LayerOther; // Other PIDs are mapped to this layer
+ int m_Virtual13Segm; // Virtual 13-segment mode
+ 
+ // Layer-A/B/C parameters
+ DtIsdbtLayerPars m_LayerPars[3];
+
+ // PID-to-layer mapping
+ std::map<int, int> m_Pid2Layer;
+
+ // Derived:
+ bool m_Valid; // The parameter set is valid
+ int m_TotalBitrate; // Bitrate of entire stream
+
+ // Member function
+ DtIsdbtPars();
+ static bool BTypeCompat(int BType, int NumSegm);
+ DTAPI_RESULT CheckValidity(int& ResultCode);
+ DTAPI_RESULT ComputeRates(void);
+ void MakeConsistent();
+ void MakeNumSegmConsistent();
+ int NumSegm();
+ DTAPI_RESULT RetrieveParsFromTs(char* pBuffer, int NumBytes);
+ bool operator == (DtIsdbtPars& Rhs);
+ bool operator != (DtIsdbtPars& Rhs);
+};
+
+ 
+
+
+// ISDB-T layer selection used for demodulation
+#define DTAPI_ISDBT_LAYER_NONE -1
+#define DTAPI_ISDBT_LAYER_AUTO -2
+
+// PID-to-layer mapping
+#define DTAPI_ISDBT_LAYER_A 1
+#define DTAPI_ISDBT_LAYER_B 2
+#define DTAPI_ISDBT_LAYER_C 4
+
+// DtIsdbtPars.m_BType - Broadcast type
+#define DTAPI_ISDBT_BTYPE_TV 0 // 1/3/13-segment TV broadcast
+#define DTAPI_ISDBT_BTYPE_RAD1 1 // 1-segment radio broadcast
+#define DTAPI_ISDBT_BTYPE_RAD3 2 // 3-segment radio broadcast
+
+// DtIsdbtPars.m_Guard - Guard interval
+#define DTAPI_ISDBT_GUARD_1_32 0
+#define DTAPI_ISDBT_GUARD_1_16 1
+#define DTAPI_ISDBT_GUARD_1_8 2
+#define DTAPI_ISDBT_GUARD_1_4 3
+
+// DtIsdbtLayerPars.m_Modulation - Modulation type
+#define DTAPI_ISDBT_MOD_DQPSK 0
+#define DTAPI_ISDBT_MOD_QPSK 1
+#define DTAPI_ISDBT_MOD_QAM16 2
+#define DTAPI_ISDBT_MOD_QAM64 3
+
+// DtIsdbtLayerPars.m_CodeRate - Code rate
+#define DTAPI_ISDBT_RATE_1_2 0
+#define DTAPI_ISDBT_RATE_2_3 1
+#define DTAPI_ISDBT_RATE_3_4 2
+#define DTAPI_ISDBT_RATE_5_6 3
+#define DTAPI_ISDBT_RATE_7_8 4
+
+// DtOutpChannel::SetModControl - Initial Total Number of Segments
+#define DTAPI_ISDBT_SEGM_1 0x00000001
+#define DTAPI_ISDBT_SEGM_3 0x00000003
+#define DTAPI_ISDBT_SEGM_13 0x0000000D
+#define DTAPI_ISDBT_SEGM_MSK 0x0000000F
+
+// DtOutpChannel::SetModControl - Bandwidth
+#define DTAPI_ISDBT_BW_5MHZ 0x00000010
+#define DTAPI_ISDBT_BW_6MHZ 0x00000020
+#define DTAPI_ISDBT_BW_7MHZ 0x00000030
+#define DTAPI_ISDBT_BW_8MHZ 0x00000040
+#define DTAPI_ISDBT_BW_MSK 0x000000F0
+
+// DtOutpChannel::SetModControl - Sample Rate
+#define DTAPI_ISDBT_SRATE_1_1 0x00000100
+#define DTAPI_ISDBT_SRATE_1_2 0x00000200
+#define DTAPI_ISDBT_SRATE_1_4 0x00000300
+#define DTAPI_ISDBT_SRATE_1_8 0x00000400
+#define DTAPI_ISDBT_SRATE_27_32 0x00000500
+#define DTAPI_ISDBT_SRATE_135_64 0x00000600
+#define DTAPI_ISDBT_SRATE_MSK 0x00000F00
+
+// DtOutpChannel::SetModControl - Sub Channel
+#define DTAPI_ISDBT_SUBCH_MSK 0x0003F000
+#define DTAPI_ISDBT_SUBCH_SHIFT 12
+
+// Result codes for DtIsdbtPars::CheckValidity
+#define DTAPI_ISDBT_OK 0
+#define DTAPI_ISDBT_E_BTYPE 1
+#define DTAPI_ISDBT_E_NSEGM 2
+#define DTAPI_ISDBT_E_PARTIAL 3
+#define DTAPI_ISDBT_E_NOT_FILLED 4
+#define DTAPI_ISDBT_E_SUBCHANNEL 5
+#define DTAPI_ISDBT_E_SRATE 6
+#define DTAPI_ISDBT_E_BANDWIDTH 7
+#define DTAPI_ISDBT_E_MODE 8
+#define DTAPI_ISDBT_E_GUARD 9
+
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtMatrixInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+struct DtMatrixInfo
+{
+ int m_VidStd; // Video standard
+ int m_Scaling; // Scaled frame format
+ int m_NumColumns; // Number of columns 
+};
+
+// Maximum number of fading paths, used in DtModPars
+#define DTAPI_MAX_OUTPUTS 16
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtModPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure for storing a complete set of modulation parameters.
+//
+// NOTE FOR ISDB-T: DtModPars.m_ParXtra0 is never used, all ISDB-T parameters are stored
+// in DtIsdbtPars (in *m_pXtraPars).
+//
+struct DtModPars
+{
+ // Modulation parameters
+ int m_ModType; // Modulation type; -1 = not set
+ int m_ParXtra0; // ParXtra0 (Code Rate / J.83 Annex); -1 = not set
+ int m_ParXtra1; // ParXtra1; -1 = not set
+ int m_ParXtra2; // ParXtra2; -1 = not set
+ void* m_pXtraPars; // Extra CMMB/ISDB-S/ISDB-T/DVB-C2/DVB-T2 parameters
+
+ // Rates; Set to -1 (not set) by SetModControl, except for symbol rate which is set
+ // to a default value for modulation types that support a symbol rate.
+ // If both symbol and TS rate are set, TS rate takes precedence.
+ int m_SymRate; // Symbol rate in baud
+ int m_TsRate; // Transport-stream rate in bps
+
+ // Channel modelling per output channel
+ bool m_IsCmEnable[DTAPI_MAX_OUTPUTS];
+ // Channel modelling is enabled yes/no
+ DtCmPars m_CmPars[DTAPI_MAX_OUTPUTS];
+ // Channel modelling parameters
+
+ // Custom roll-off filter
+ bool m_IsRoEnable; // Custom roll-off filter enable yes/no
+ DtFilterPars m_RollOffFilter; // Custom roll-off filter parameters
+
+ // Miscellaneous
+ int m_OutputLevel; // Output level; -9999 = not set
+ __int64 m_RfFreqHz; // RF frequency in Hz
+ unsigned char m_S2PlHdrScrSeq[12];
+ // DVB-S2 PL header scrambling sequence
+ int m_TxMode; // Transmit mode; Included here because packet
+ // size affects the modulation process
+ int m_StuffMode; // Stuffing mode
+
+ // Operations
+ DTAPI_RESULT CheckPars();
+ DTAPI_RESULT SetModControl(int ModType, int, int, int, void* pXtraPars);
+
+ // Member functions
+ DtCmmbPars* pCmmbPars() { return (DtCmmbPars*)m_pXtraPars; }
+ DtDvbC2Pars* pDvbC2Pars() { return (DtDvbC2Pars*)m_pXtraPars; }
+ DtDvbS2Pars* pDvbS2Pars() { return (DtDvbS2Pars*)m_pXtraPars; }
+ DtDvbT2Pars* pDvbT2Pars() { return (DtDvbT2Pars*)m_pXtraPars; }
+ DtIsdbsPars* pIsdbsPars() { return (DtIsdbsPars*)m_pXtraPars; }
+ DtIsdbtPars* pIsdbtPars() { return (DtIsdbtPars*)m_pXtraPars; }
+ DtIsdbTmmPars* pIsdbTmmPars() { return (DtIsdbTmmPars*)m_pXtraPars; }
+
+ // Predicates
+ bool HasSymRate();
+ bool IsAdtbT(), IsAdtbtDtmb(), IsAtsc(), IsAtscMh(), IsCmmb(), IsCmEnable(int i=0);
+ bool IsDab();
+ bool IsDtmb(), IsDvbC2(), IsDvbS(), IsDvbS2(), IsDvbS2Apsk(), IsDvbS2L3(),
+ IsDvbS2X(), IsDvbS2XL3();
+ bool IsDvbS2Mux();
+ bool IsDvbT(), IsDvbT2(), IsIqDirect(), IsIsdbS(), IsIsdbT(), IsIsdbTmm();
+ bool IsModTypeSet(), IsOfdm(), IsQam(), IsQamA(), IsQamB(), IsQamC(), IsQamAC();
+ bool IsRoEnable(), IsT2Mi();
+ bool RequiresMplpMod();
+
+ // Constructor, destructor
+ DtModPars();
+ ~DtModPars();
+private:
+ // No implementation is provided for the copy constructor
+ DtModPars(const DtModPars&);
+
+private:
+ void CleanUpXtraPars();
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtPar .-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Generic structure to represent a single parameter setting.
+// It is used in the advanced demodulator for setting and retrieving parameter settings.
+//
+struct DtPar
+{
+ DtPar();
+ DtPar(int ParId); // Constructor with DTAPI_PAR_xxx initialization
+ virtual ~DtPar();
+
+ // Value types supported for parameters
+ enum ParValueType
+ {
+ PAR_VT_UNDEFINED, PAR_VT_BOOL, PAR_VT_DOUBLE, PAR_VT_INT
+ };
+
+ DTAPI_RESULT m_Result; // Result of retrieving the parameters
+ int m_ParId; // Identifies the parameter: DTAPI_PAR_XXX
+ int m_IdXtra[4]; // Extra identification parameters
+ ParValueType m_ValueType; // Value type of parameter: PAR_VT_XXX
+ union {
+ bool m_ValueBool; // Value if value type is PAR_VT_BOOL
+ double m_ValueDouble; // Value if value type is PAR_VT_DOUBLE
+ int m_ValueInt; // Value if value type is PAR_VT_INT
+ void* m_pValue; // Pointer for complex types
+ };
+ void Cleanup();
+ DTAPI_RESULT GetName(const char*& pName, const char*& pShortName);
+ DTAPI_RESULT GetName(const wchar_t*& pName, const wchar_t*& pShortName);
+ DTAPI_RESULT GetValue(int &Value);
+ DTAPI_RESULT GetValue(double &Value);
+ DTAPI_RESULT GetValue(bool &Value);
+ DTAPI_RESULT SetId(int ParameterId);
+ DTAPI_RESULT SetValue(int Value);
+ DTAPI_RESULT SetValue(double Value);
+ DTAPI_RESULT SetValue(bool Value);
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+
+ // Serialisation of an array of parameters
+ static DTAPI_RESULT FromXml(const std::wstring&, DtPar*& pPars, int& Count);
+ static DTAPI_RESULT ToXml(DtPar* pPars, int Count, std::wstring& XmlString);
+
+ // Assignment operator
+ DtPar& operator=(const DtPar&);
+
+private:
+ // No implementation is provided for the copy constructor
+ DtPar(const DtPar&);
+};
+
+// Integer parameters
+#define DTAPI_PAR_DEMOD_THREADS 0x001 // Number of Threads/CPU cores used for
+ // software demodulation: default 4
+#define DTAPI_PAR_DEMOD_LDPC_MAX 0x002 // LDPC maximum iterations: default 50
+#define DTAPI_PAR_DEMOD_LDPC_AVG 0x003 // LDPC average iterations limit, used
+ // to limit CPU load; default 16
+// Boolean parameters
+#define DTAPI_PAR_DEMOD_MER_ENA 0x004 // Enable MER calculation; default on
+// Undefined parameter
+#define DTAPI_PAR_UNDEFINED 0x000 // Value is not defined yet
+
+// Unsported item values
+#define DTAPI_PAR_UNSUP_INTITEM 0x80000000 // Unsupported integer item
+#define DTAPI_PAR_UNSUP_UINTITEM 0xFFFFFFFF // Unsupported unsigned integer item
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtRawIpHeader -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Header placed in front of all IP Packets when DTAPI_RXMODE_IPRAW mode is used
+//
+struct DtRawIpHeader
+{
+ unsigned short m_Tag; // 0x44A0h = \91D\92160
+ unsigned short m_Length; // IP packet length
+ unsigned int m_TimeStamp; // IP packet arrival/transmit timestamp
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtStatistic -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+struct DtStatistic
+{
+ DtStatistic();
+ DtStatistic(int StatisticId); // Constructor with DTAPI_STAT_xxx initialization
+ virtual ~DtStatistic();
+
+ // Value types supported for statistics
+ // NOTE: ALWAYS ADD NEW TYPES TO END OF LIST, FOR BACKWARDS COMPATIBILITY
+ enum StatValueType
+ {
+ STAT_VT_UNDEFINED, STAT_VT_BOOL, STAT_VT_DOUBLE, STAT_VT_INT, 
+ STAT_VT_DVBC2_L1P2, STAT_VT_DVBC2_PLPSIG, STAT_VT_DVBT2_L1,
+ STAT_VT_ISDBT_PARS, STAT_VT_LDPC_STATS, STAT_VT_MA_DATA,
+ STAT_VT_MA_STATS, STAT_VT_PLP_BLOCKS, STAT_VT_VIT_STATS,
+ STAT_VT_DAB_ENSEM, STAT_VT_RS_STATS, STAT_VT_DVBT_TPS
+ };
+
+
+ DTAPI_RESULT m_Result; // Result of retrieving the statistic
+ int m_StatisticId; // Identifies the statistic: DTAPI_STAT_XXX
+ int m_IdXtra[4]; // Extra identification parameters
+ StatValueType m_ValueType; // Value type of statistic: STAT_VT_XXX
+ union {
+ bool m_ValueBool; // Value if value type is STAT_VT_BOOL
+ double m_ValueDouble; // Value if value type is STAT_VT_DOUBLE
+ int m_ValueInt; // Value if value type is STAT_VT_INT
+ void* m_pValue; // Pointer if value type is STAT_VT_DVBC2_L1P2,
+ // STAT_VT_DVBC2_PLPSIG, STAT_VT_DVBT_TPS,
+ // STAT_VT_DVBT2_L1, STAT_VT_VIT_STATS
+ // STAT_VT_DAB_ENSEM or STAT_VT_RS_STATS
+ };
+ void Cleanup();
+ DTAPI_RESULT GetName(const char*& pName, const char*& pShortName);
+ DTAPI_RESULT GetName(const wchar_t*& pName, const wchar_t*& pShortName);
+ DTAPI_RESULT GetValue(int &Value);
+ DTAPI_RESULT GetValue(double &Value);
+ DTAPI_RESULT GetValue(bool &Value);
+ DTAPI_RESULT GetValue(DtDabEnsembleInfo*& pValue);
+ DTAPI_RESULT GetValue(DtDvbC2DemodL1Part2Data*& pValue);
+ DTAPI_RESULT GetValue(DtDvbC2DemodL1PlpSigData*& pValue);
+ DTAPI_RESULT GetValue(DtDvbTTpsInfo*& pValue);
+ DTAPI_RESULT GetValue(DtDvbT2DemodL1Data*& pValue);
+ DTAPI_RESULT GetValue(DtDemodLdpcStats*& pValue);
+ DTAPI_RESULT GetValue(DtDemodMaLayerData*& pValue);
+ DTAPI_RESULT GetValue(DtDemodMaLayerStats*& pValue);
+ DTAPI_RESULT GetValue(DtDemodPlpBlocks*& pValue);
+ DTAPI_RESULT GetValue(DtIsdbtParamsData*& pValue);
+ DTAPI_RESULT GetValue(DtRsDecStats*& pValue);
+ DTAPI_RESULT GetValue(DtVitDecStats*& pValue);
+ DTAPI_RESULT SetId(int StatisticId);
+ DTAPI_RESULT SetValue(int Value);
+ DTAPI_RESULT SetValue(double Value);
+ DTAPI_RESULT SetValue(bool Value);
+ DTAPI_RESULT SetValue(DtDabEnsembleInfo& pValue);
+ DTAPI_RESULT SetValue(DtDvbC2DemodL1Part2Data& Value);
+ DTAPI_RESULT SetValue(DtDvbC2DemodL1PlpSigData& Value);
+ DTAPI_RESULT SetValue(DtDvbTTpsInfo& pValue);
+ DTAPI_RESULT SetValue(DtDvbT2DemodL1Data& Value);
+ DTAPI_RESULT SetValue(DtDemodLdpcStats& Value);
+ DTAPI_RESULT SetValue(DtDemodMaLayerData& Value);
+ DTAPI_RESULT SetValue(DtDemodMaLayerStats& Value);
+ DTAPI_RESULT SetValue(DtDemodPlpBlocks& Value);
+ DTAPI_RESULT SetValue(DtIsdbtParamsData& Value);
+ DTAPI_RESULT SetValue(DtRsDecStats& pValue);
+ DTAPI_RESULT SetValue(DtVitDecStats& pValue);
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+
+ // Serialisation of an array of statistics
+ static DTAPI_RESULT FromXml(const std::wstring&, DtStatistic*&, int& Count);
+ static DTAPI_RESULT ToXml(DtStatistic* pStatistics, int Count, std::wstring&);
+
+ // Assignment operator
+ DtStatistic& operator=(const DtStatistic&);
+
+private:
+ // No implementation is given of the copy constructor
+ DtStatistic(const DtStatistic&);
+};
+
+// Integer statistics
+#define DTAPI_STAT_BADPCKCNT 0x003 // Count of uncorrected packets
+#define DTAPI_STAT_CNR 0x105 // Carrier-to-noise ratio in dB
+#define DTAPI_STAT_DVBC2_DSLICEDISC 0x010 // DVB-C2 Data slice discontinuity count
+#define DTAPI_STAT_DVBC2_L1HDR_ERR 0x00E // DVB-C2 L1 Preamble header error count
+#define DTAPI_STAT_DVBC2_L1P2_ERR 0x00F // DVB-C2 L1-Part 2 error count
+#define DTAPI_STAT_DVBT2_L1PRE_ERR 0x00C // DVB-T2 L1-Pre error count
+#define DTAPI_STAT_DVBT2_L1POST_ERR 0x00D // DVB-T2 L1-Post error count
+#define DTAPI_STAT_EBN0 0x111 // Eb/N0 in dB (estimated on MER)
+#define DTAPI_STAT_ESN0 0x110 // Es/N0 in dB (estimated on MER)
+#define DTAPI_STAT_LINKMARGIN 0x10F // Link margin in dB
+#define DTAPI_STAT_MER 0x106 // Modulation error rate in dB
+#define DTAPI_STAT_MOD_SAT 0x004 // Modulator saturation count
+#define DTAPI_STAT_RELOCKCNT 0x00A // Receiver re-lock count
+#define DTAPI_STAT_RFLVL_CHAN 0x005 // RF power level for channel bandwidth
+#define DTAPI_STAT_RFLVL_CHAN_QS 0x015 // Quick scan of channel level
+#define DTAPI_STAT_RFLVL_NARROW 0x006 // RF power level for a narrow bandwidth
+#define DTAPI_STAT_RFLVL_NARROW_QS 0x016 // Quick scan of channel level
+#define DTAPI_STAT_RS 0x008 // Reed-Solomon error counter
+#define DTAPI_STAT_SNR 0x107 // Signal-to-noise ratio in dB
+#define DTAPI_STAT_TEMP_TUNER 0x009 // Tuner temperature
+#define DTAPI_STAT_T2MI_OVFS 0x00B // DVB-T2 T2-MI overflow count
+
+// Double statistics
+#define DTAPI_STAT_BER_POSTBCH 0x100 // Post-BCH bit error rate
+#define DTAPI_STAT_BER_POSTLDPC 0x101 // Post-LDPC bit error rate
+#define DTAPI_STAT_BER_POSTVIT 0x102 // Post-Viterbi bit error rate
+#define DTAPI_STAT_BER_PREBCH 0x10D // Pre-BCH bit error rate
+#define DTAPI_STAT_BER_PRELDPC 0x10E // Pre-LDPC bit error rate
+#define DTAPI_STAT_BER_PRERS 0x103 // Pre-Reed-Solomon bit error rate
+#define DTAPI_STAT_BER_PREVIT 0x104 // Pre-Viterbi bit error rate
+#define DTAPI_STAT_FER_POSTBCH 0x116 // Post-BCH frame error rate
+#define DTAPI_STAT_FREQ_SHIFT 0x10B // Input frequency shift (Hz)
+#define DTAPI_STAT_OCCUPIEDBW 0x112 // Occupied bandwidth
+#define DTAPI_STAT_PER 0x108 // Packet error rate
+#define DTAPI_STAT_ROLLOFF 0x113 // Roll-off factor in percentage
+#define DTAPI_STAT_SAMPRATE_OFFSET 0x10C // Sample rate offset (ppm) 
+
+// Boolean lock statistics
+#define DTAPI_STAT_CARRIER_LOCK 0x201 // Carrier lock
+#define DTAPI_STAT_FEC_LOCK 0x202 // FEC lock
+#define DTAPI_STAT_LOCK 0x200 // Overall lock status
+#define DTAPI_STAT_PACKET_LOCK 0x203 // Packet lock
+#define DTAPI_STAT_SPECTRUMINV 0x205 // Spectrum inversion
+#define DTAPI_STAT_VIT_LOCK 0x204 // Viterbi lock
+
+// Complex statistics
+#define DTAPI_STAT_DAB_ENSEM_INFO 0x308 // DAB ensemble information from the
+ // Fast Information Channel (FIC)
+#define DTAPI_STAT_DVBC2_L1P2DATA 0x300 // DVB-C2 Layer-1 Part 2 data
+#define DTAPI_STAT_DVBC2_PLPSIGDATA 0x301 // DVB-C2 Layer-1 PLP signalling data
+#define DTAPI_STAT_DVBT_TPS_INFO 0x30B // DVB-T TPS information
+#define DTAPI_STAT_DVBT2_L1DATA 0x302 // DVB-T2 Layer-1 data
+#define DTAPI_STAT_ISDBT_PARSDATA 0x303 // ISDB-T parameters data
+#define DTAPI_STAT_LDPC_STATS 0x304 // DVB-C2/T2 LDPC statistics
+#define DTAPI_STAT_MA_DATA 0x305 // DVB-C2/T2 mode adaptation data
+#define DTAPI_STAT_MA_STATS 0x306 // DVB-C2/T2 mode adaptation statistics
+#define DTAPI_STAT_PLP_BLOCKS 0x307 // DVB-C2/T2 PLP number of FEC blocks
+#define DTAPI_STAT_RSDEC_STATS 0x30A // Reed-Solomon decoder statistics
+#define DTAPI_STAT_VITDEC_STATS 0x309 // Viterbi decoder statistics 
+
+// DekTec internal statistics
+#define DTAPI_STAT_AGC1 0x001 // First AGC value
+#define DTAPI_STAT_AGC2 0x002 // Second AGC value
+#define DTAPI_STAT_RFLVL_UNCALIB 0x007 // Uncalibrated RF power level
+#define DTAPI_STAT_RFLVL_UNCALIB_DBM 0x10A // Uncalibrated RF power level in dBm
+#define DTAPI_STAT_SYNTAX_ERR_CNT 0x114 // Num syntax errors in usb bitstream
+#define DTAPI_STAT_OVERFLOW_CNT 0x115 // Number of dtapi<>kernel buf overflows
+
+// Unsupported item values
+#define DTAPI_STAT_UNDEFINED 0x000 // Value is not defined yet
+#define DTAPI_STAT_UNSUP_INTITEM 0x80000000 // Unsupported integer item
+#define DTAPI_STAT_UNSUP_UINTITEM 0xFFFFFFFF // Unsupported unsigned integer item
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtTransmitter -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure describing a transmitter. Used by DtInpChannel::BlindScan to return the
+// transmitters found by scanning a frequency band.
+//
+struct DtTransmitter
+{
+ __int64 m_FreqHz; // Center frequency of the transmitter
+ int m_ModType; // Modulation type
+ int m_SymbolRate; // Symbol rate
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure for storing TSoIP parameters
+//
+struct DtIpPars
+{
+public:
+ unsigned char m_Ip[16]; // IP address (IPv4/IPv6)
+ unsigned short m_Port; // Port number
+ unsigned char m_SrcFltIp[16]; // Source filter: IP address (IPv4/IPv6)
+ unsigned short m_SrcFltPort; // Source filter: port number
+ int m_VlanId; // VLAN ID
+ int m_VlanPriority; // VLAN priority
+
+ // Redundant link
+ unsigned char m_Ip2[16]; // IP address (IPv4/IPv6)
+ unsigned short m_Port2; // Port number
+ unsigned char m_SrcFltIp2[16]; // Source filter: IP address (IPv4/IPv6)
+ unsigned short m_SrcFltPort2; // Source filter: port number
+ int m_VlanId2; // VLAN ID
+ int m_VlanPriority2; // VLAN priority
+
+ int m_TimeToLive; // Time-to-Live setting for IP TX
+ int m_NumTpPerIp; // #TPs per IP packet
+ int m_Protocol; // Protocol: DTAPI_PROTO_UDP/RTP
+ int m_DiffServ; // Differentiated services
+ int m_FecMode; // Error correction mode: DTAPI_FEC_DISABLE/2D
+ int m_FecNumRows; // \91D\92 = #rows in FEC matrix
+ int m_FecNumCols; // \91L\92 = #columns in FEC matrix
+ int m_Flags; // Optional control/status flags: IPv4/IPv6
+ int m_Mode; // DTAPI_IP_NORMAL, DTAPI_IP_TX_DBLBUF,
+ // DTAPI_IP_RX_DBLBUF, DTAPI_IP_RX_FAILOVER
+public:
+ DtIpPars();
+ ~DtIpPars();
+};
+
+// Legacy
+#define DtTsIpPars DtIpPars
+
+// Error correction modes (DtIpPars::m_FecMode)
+#define DTAPI_FEC_DISABLE 0
+#define DTAPI_FEC_2D 1 // FEC reconstruction
+#define DTAPI_FEC_2D_M1 1 // Mode1: FECdT = DVBdT + .5 * DVBdT
+#define DTAPI_FEC_2D_M2 2 // Mode2: FECdT = DVBdT
+
+// Optional control/status flags (DtIpPars::m_Flags)
+#define DTAPI_IP_V4 0x00
+#define DTAPI_IP_V6 0x01
+#define DTAPI_IP_TX_MANSRCPORT 0x10
+
+// Transmission/reception mode (DtIpPars::m_Mode)
+#define DTAPI_IP_NORMAL 0
+#define DTAPI_IP_TX_DBLBUF 1
+#define DTAPI_IP_RX_DBLBUF 2
+#define DTAPI_IP_RX_FAILOVER 3
+
+// IP protocol (DtIpPars::m_Protocol)
+#define DTAPI_PROTO_UDP 0
+#define DTAPI_PROTO_RTP 1
+#define DTAPI_PROTO_AUTO 2
+#define DTAPI_PROTO_UNKN 2
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIpStat -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure for retrieving IP statistics from drivers.
+//
+struct DtIpStat
+{
+ unsigned int m_TotNumIpPackets;
+ unsigned int m_LostIpPacketsBeforeFec; // #Lost IP packets before FEC 
+ unsigned int m_LostIpPacketsAfterFec; // #Lost IP packets after FEC
+};
+
+// Legacy
+#define DtTsIpStat DtIpStat
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtTunePars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Structure for setting tuner specific parameters
+//
+struct DtTunePars
+{
+ union {
+ // DTA-2131 specific tuner parameters
+ struct {
+ int m_TunerStandard; // DTAPI_TUNMOD_xxx
+ int m_TunerBandwidth; // Tuning bandwidth in Hz
+ int m_IfFrequency; // IF frequency in Hz
+ // (-1 according tuner standard)
+ int m_LpfCutOff; // Low-pass filter cutoff; DTAPI_TUN31_LPF_x
+ int m_LpfOffset; // Low-pass filter offset; DTAPI_TUN31_LPF_x
+ int m_HiPass; // Hi Pass filter; DTAPI_TUN31_HPF_x
+ int m_DcNotchIfPpf; // Enable DC notch IF PPF; DTAPI_TUN31_NOTCH_x
+ int m_IfNotch; // Enable IF notch; DTAPI_TUN31_NOTCH_x
+ int m_IfNotchToRssi; // Enable IF notch to RSSI; DTAPI_TUN31_NOTCH_x
+ } m_Dta2131TunePars;
+ } u;
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtVidStdInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+struct DtVidStdInfo
+{
+ int m_VidStd; // Video Standard
+ bool m_IsHd; // true: is an HD format: false: is SD format
+
+ bool m_IsInterlaced; // Is interlaced
+ int m_NumLines; // Number of lines per frame
+ double m_Fps; // Frame rate
+ bool m_IsFractional; // Fractional framerate
+ 
+ int m_FrameNumSym; // Size of frame (in # symbols)
+ int m_LineNumSym; // # of symbol per line
+ int m_LineNumSymHanc; // # of HANC symbols per line
+ int m_LineNumSymVanc; // # of VANC symbols per line
+ int m_LineNumSymEav; // # of EAV symbols per line
+ int m_LineNumSymSav; // # of SAV symbols per line
+
+ // Field 1
+ int m_Field1StartLine; // Line # of first line for field 1
+ int m_Field1EndLine; // Line # of last line for field 1
+ int m_Field1VidStartLine; // Line # of first line containing active video
+ int m_Field1VidEndLine; // Line # of last line containing active video
+ 
+ // Field 2
+ int m_Field2StartLine; // Line # of first line for field 2
+ int m_Field2EndLine; // Line # of last line for field 2
+ int m_Field2VidStartLine; // Line # of first line containing active video
+ int m_Field2VidEndLine; // Line # of last line containing active video
+};
+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ DEMODULATION PARAMETERS +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDemodDvbS2ModCodSettings -.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure for storing the DVB-S2 
+// 
+struct DtDemodDvbS2ModCodSettings
+{
+ bool m_Enable; // Demodulation of this MODCOD (yes/no)
+ int m_SnrThreshold; // SNR threshold of this MODCOD for automute algorithm
+ DtDemodDvbS2ModCodSettings() : m_Enable(false), m_SnrThreshold(0) {}
+ DtDemodDvbS2ModCodSettings(bool Enable, int SnrThreshold) : 
+ m_Enable(Enable), m_SnrThreshold(SnrThreshold) {}
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Structure for storing a complete set of demodulation parameters
+//
+class DtDemodPars
+{
+public:
+ DtDemodPars();
+ DtDemodPars(const DtDemodPars&);
+ ~DtDemodPars();
+public:
+ DTAPI_RESULT CheckValidity();
+ int GetModType() const;
+ DTAPI_RESULT SetModType(int ModType);
+ DtDemodParsAtsc* Atsc() const;
+ DtDemodParsDab* Dab() const;
+ DtDemodParsDvbC2* DvbC2() const;
+ DtDemodParsDvbS* DvbS() const;
+ DtDemodParsDvbS2* DvbS2() const;
+ DtDemodParsDvbS2Adv* DvbS2Adv() const; 
+ DtDemodParsDvbT* DvbT() const;
+ DtDemodParsDvbT2* DvbT2() const;
+ DtDemodParsIq* Iq() const;
+ DtDemodParsIq2131* Iq2131() const; 
+ DtDemodParsIsdbt* Isdbt() const;
+ DtDemodParsQam* Qam() const;
+
+ // Predicates
+ bool IsAtsc() const, IsDab() const, IsDvbC2() const, IsDvbS() const, 
+ IsDvbS2() const, IsDvbT() const,IsDvbT2() const, IsIq() const, IsIq2131() const,
+ IsIsdbt() const, IsQam() const;
+
+ // Operators
+ void operator=(const DtDemodPars& Pars);
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+
+ // Conversion helper
+ DTAPI_RESULT FromOldStyle(int ModType, int ParXtra0, int ParXtra1, int ParXtra2);
+ DTAPI_RESULT ToOldStyle(int& ModType, int& ParXtra0, int& ParXtra1, int& ParXtra2);
+private:
+ int m_ModType; // Modulation type
+ void* m_pDemodPars; // Demodulation parameters; Type depends on m_ModType
+private:
+ void CleanUpDemodPars();
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsAtsc -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Demodulation parameters for modulation type DTAPI_MOD_ATSC
+//
+struct DtDemodParsAtsc
+{
+ int m_Constellation; // VSB constellation
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDab -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Demodulation parameters for modulation type DTAPI_MOD_DAB
+//
+struct DtDemodParsDab
+{
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDvbC2 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Demodulation parameters for modulation type DTAPI_MOD_DVBC2
+//
+struct DtDemodParsDvbC2
+{
+ int m_Bandwidth; // Bandwidth
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDvbS -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Demodulation parameters for modulation type DTAPI_MOD_DVBS
+//
+struct DtDemodParsDvbS
+{
+ int m_CodeRate; // DVB-S coderate
+ int m_SpecInv; // Spectral inversion (yes/no)
+ int m_SymRate; // Symbol rate in baud
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDvbS2 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Demodulation parameters for modulation type DTAPI_MOD_DVBS2
+//
+struct DtDemodParsDvbS2
+{
+ int m_CodeRate; // Coderate
+ int m_Pilots; // Pilots (yes/no)
+ int m_SpecInv; // Spectral inversion (yes/no)
+ int m_FecFrame; // Long or short FECFRAME
+ int m_SymRate; // Symbol rate in baud
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDvbS2Adv -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Advanced demodulation parameters for modulation type DTAPI_MOD_DVBS2
+//
+struct DtDemodParsDvbS2Adv : DtDemodParsDvbS2
+{
+ bool m_AutoMuteModCods; // MODCODS with an SNR threshold above the current SNR
+ // will not be demodulated
+ int m_HysteresisMargin; // Margin to add on top of the SNR threshold before 
+ // re-enabling a certain modcod, in units of 0.1 dB
+ std::map<DtDvbS2ModCod, DtDemodDvbS2ModCodSettings> m_ModCods; 
+ // List with supported modcods 
+ DtDemodParsDvbS2Adv();
+ DTAPI_RESULT DeleteModCod(DtDvbS2ModCod ModCod);
+ DTAPI_RESULT InitSnrThreshold(int TypeNumber);
+ DTAPI_RESULT SetModCod(DtDvbS2ModCod ModCod, DtDemodDvbS2ModCodSettings &Settings);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDvbT -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Demodulation parameters for modulation type DTAPI_MOD_DVBT
+//
+struct DtDemodParsDvbT
+{
+ int m_CodeRate; // Coderate
+ int m_Bandwidth; // Bandwidth
+ int m_Constellation; // Constellation
+ int m_Guard; // Guard interval
+ int m_Interleaving; // Interleaving
+ int m_Mode; // Transmission mode
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDvbT2 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Demodulation parameters for modulation type DTAPI_MOD_DVBT2
+//
+struct DtDemodParsDvbT2
+{
+ int m_Bandwidth; // Bandwidth
+ int m_T2Profile; // DVB-T2 profile (Base/Lite)
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsIq -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Demodulation parameters for modulation type DTAPI_MOD_IQ
+//
+struct DtDemodParsIq
+{
+ int m_Bandwidth; // Signal bandwidth in Hz
+ int m_IqDemodType; // IQ demodulation type (DTAPI_DEMOD_QAM or
+ // DTAPI_DEMOD_OFDM)
+ int m_SampleRate; // Sample rate in Hz
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsIq2131 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Demodulation parameters for modulation type DTAPI_MOD_IQ_2131 (DTA-2131 specific)
+//
+struct DtDemodParsIq2131
+{
+ int m_IqDemodFreq; // IQ demodulation frequency in Hz
+ DtFilterPars m_LpfFilter; // Anti-aliasing filter
+ double m_LpfScaleFactor; // Scale factor after anti-aliasing filter
+ int m_SampleRate; // Sample rate in Hz
+ DtTunePars m_TunePars; // Tuning parameters
+};
+
+// IQ-demodulation type
+#define DTAPI_DEMOD_OFDM 0 // OFDM IQ-demodulation type
+#define DTAPI_DEMOD_QAM 1 // QAM IQ-demodulation type
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsIsdbt .-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Demodulation parameters for modulation type DTAPI_MOD_ISDBT
+//
+struct DtDemodParsIsdbt
+{
+ int m_Bandwidth; // Bandwidth DTAPI_ISDBT_BW_xMHZ
+ int m_SubChannel; // Sub channel number, 0..41, default= 22
+ int m_NumberOfSegments; // Number of segments DTAPI_ISDBT_SEGM_x
+ DtDemodParsIsdbt() : m_SubChannel(22) {}
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsQam -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Demodulation parameters for modulation type DTAPI_MOD_QAMxxx
+//
+struct DtDemodParsQam
+{
+ int m_Annex; // ITU-T J.83 Annex
+ int m_Interleaving; // Interleaving; ignored for Annex A and C
+ int m_SymRate; // Symbol rate in baud 
+};
+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+ Common Demodulation Structures +=+=+=+=+=+=+=+=+=+=+=+=+=+=
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodLdpcStats -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// LDCP statistic information for DVB-T2 and DVB-C2
+//
+struct DtDemodLdpcStats
+{
+ __int64 m_FecBlocksCount; // #Decoded FEC blocks
+ __int64 m_UncorrFecBlocksCount;// #Uncorrected FEC blocks after BCH (not exact)
+ __int64 m_FecBlocksCount1; // #Decoded FEC blocks, reset at the same time
+ // as m_FecBlocksItCount/min/max
+ __int64 m_FecBlocksItCount; // Total #LDPC iterations
+ // Average #LDPC iteration =
+ // m_FecBlocksItCount / m_FecBlocksCount1
+ int m_FecBlocksItMin; // Minimum #LDPC iterations (-1 after reset)
+ int m_FecBlocksItMax; // Maximum #LDPC iterations (-1 after reset)
+ __int64 m_BchBitCount; // #Decoded data bits, including BCH bits
+ // Currently only data+BCH bits are taken into account (LDPC parity bits are ignored),
+ // so the BER before LDPC is approximatively: m_BchBitErrorCount / m_BchBitCount
+ // This is accurate only if there are no uncorrected blocks (m_UncorrFecBlocksCount=0)
+ __int64 m_BchBitErrorCount; // Bit error count before LDPC
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodMaLayerStats -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// LMode adaption layer statistics for DVB-T2 and DVB-C2
+//
+struct DtDemodMaLayerStats
+{
+ __int64 m_HdrCrc8ErrorCount; // #CRC8 errors for BBframe header
+ __int64 m_PckCrc8ErrorCount; // #CRC8 errors for packets (only for m_Hem = 0)
+ __int64 m_FramingErrorCount; // SYNCD/DFL/UPL consistency errors
+ __int64 m_CommonPlpResyncCount;// Number of times a resynchronization between data
+ // and common PLP was needed. It normally happens
+ // only in case of receive errors. This field is only
+ // updated in the corresponding data PLP.
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtRsDecStats -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Reed-Solomon decoder info
+//
+struct DtRsDecStats
+{
+ bool m_Locked; // Decoder is locked 
+ __int64 m_ByteSkipCount; // Bytes skipped while looking for sync 
+ __int64 m_PacketCount; // Decoded packets 
+ __int64 m_UncorrPacketCount; // Uncorrected packets 
+ __int64 m_ByteErrorCount; // Byte error count 
+ __int64 m_BitErrorCount; // Bit error count
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtVitDecStats -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Viterbi decoder info (pre-viterbi BER) 
+//
+struct DtVitDecStats
+{
+ __int64 m_BitCount; // Input bit count 
+ __int64 m_BitErrorCount; // Bit error count
+};
+
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodMaLayerData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Mode adaption layer info for DVB-T2 and DVB-C2
+struct DtDemodMaLayerData
+{
+ bool m_Hem; // High efficiency mode
+ bool m_Npd; // Null packet deletion
+ int m_Issy; // ISSY: mode, see DTAPI_DVBx2_ISSY_x
+ int m_IssyBufs; // ISSY: current 'BUFS' value
+ int m_IssyTto; // ISSY: last 'TTO' value (DVB-T2 only)
+ int m_IssyBufStat; // ISSY: last 'BUFSTAT' value (DVB-C2/S2 only)
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodPlpBlocks -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Number of FEC blocks per frame
+//
+struct DtDemodPlpBlocks
+{
+ int m_NumBlocks; // Last plp_num_blocks
+ int m_NumBlocksMin; // Minimum plp_num_blocks (-1 = no new value since 
+ // reset)
+ int m_NumBlocksMax; // Maximum plp_num_blocks 
+};
+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ MAIN DTAPI CLASSES +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDevice -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class representing a DekTec Device
+//
+class DtDevice
+{
+ // Constructor, destructor
+public:
+ DtDevice();
+ virtual ~DtDevice();
+private:
+ // No implementation is provided for the copy constructor
+ DtDevice(const DtDevice&);
+
+ // Public access functions
+public:
+ virtual int Category(void);
+ virtual int ChanType(int Port);
+ virtual int FirmwareVersion(void);
+ virtual bool IsAttached(void);
+ virtual int TypeNumber(void);
+ virtual bool HasCaps(int Port, const DtCaps Caps) const;
+
+ // Public member functions
+public:
+ virtual DTAPI_RESULT AttachToIpAddr(unsigned char Ip[4]);
+ virtual DTAPI_RESULT AttachToSerial(__int64 SerialNumber);
+ virtual DTAPI_RESULT AttachToSlot(int PciBusNumber, int SlotNumber);
+ virtual DTAPI_RESULT AttachToType(int TypeNumber, int DeviceNo=0);
+ virtual DTAPI_RESULT Detach(void);
+ virtual DTAPI_RESULT DetectIoStd(int Port, int& Value, int& SubValue);
+ virtual DTAPI_RESULT FlashDisplay(int NumFlashes=5, int OnTime=100, int OffTime=100);
+ virtual DTAPI_RESULT GetAttribute(int AttrId, int& AttrValue);
+ virtual DTAPI_RESULT GetAttribute(int Port, int AttrId, int& AttrValue);
+ virtual DTAPI_RESULT GetAttribute(int Port, int AttrId, DtModPars& ModParVals, 
+ int& AttrValue);
+ virtual DTAPI_RESULT GetDescriptor(DtDeviceDesc& DvcDesc);
+ virtual DTAPI_RESULT GetDeviceDriverVersion(int& Major, int& Minor, int& BugFix,
+ int& Build);
+ virtual DTAPI_RESULT GetDisplayName(wchar_t* pName);
+ virtual DTAPI_RESULT GetDisplayName(char* pName);
+ virtual DTAPI_RESULT GetFanSpeed(int Fan, int& Rpm);
+ virtual DTAPI_RESULT GetFanTemperature(int Fan, int& Temp);
+ virtual DTAPI_RESULT GetFirmwareVersion(int& FirmwareVersion);
+ virtual DTAPI_RESULT GetGenlockState(int& State, int& RefVidStd);
+ virtual DTAPI_RESULT GetGenlockState(int& State);
+ virtual DTAPI_RESULT GetIoConfig(DtIoConfig& IoCfg);
+ virtual DTAPI_RESULT GetIoConfig(int Port, int Group, int& Value);
+ virtual DTAPI_RESULT GetIoConfig(int Port, int Group, int& Value, int& SubValue);
+ virtual DTAPI_RESULT GetIoConfig(int Port, int Group, int& Value, int& SubValue,
+ __int64& ParXtra0);
+ virtual DTAPI_RESULT GetIoConfig(int Port, int Group, int& Value, int& SubValue,
+ __int64& ParXtra0, __int64& ParXtra1);
+ virtual DTAPI_RESULT GetNwSpeed(int Port, bool& Enable, int& Speed);
+ virtual DTAPI_RESULT GetRefClkCnt(int& RefClkCnt);
+ virtual DTAPI_RESULT GetRefClkCnt(int& RefClkCnt, int& RefClkFreqHz);
+ virtual DTAPI_RESULT GetRefClkFreq(int& RefClkFreqHz);
+ virtual DTAPI_RESULT GetStateFlags(int Port, int &StateFlags);
+ virtual DTAPI_RESULT GetUsbSpeed(int& UsbSpeed);
+ virtual DTAPI_RESULT GetVcxoState(bool& Enable, int& Lock, int& VcxoClkFreqHz);
+ virtual DTAPI_RESULT HwFuncScan(int NumEntries, int& NumEntriesResult,
+ DtHwFuncDesc* pHwFuncs);
+ virtual DTAPI_RESULT LedControl(int LedControl);
+ virtual DTAPI_RESULT RegisterCallback(pDtEventCallback Callback, void* pContext,
+ int EventTypes, void** pId = NULL);
+ virtual DTAPI_RESULT SetDisplayName(wchar_t* pName);
+ virtual DTAPI_RESULT SetDisplayName (char* pName);
+ virtual DTAPI_RESULT SetIoConfig(int Port, int Group, int Value, int SubValue = -1,
+ __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
+ virtual DTAPI_RESULT SetIoConfig(DtIoConfig* pIoConfigs, int Count);
+ virtual DTAPI_RESULT SetNwSpeed(int Port, bool Enable, int Speed);
+ virtual DTAPI_RESULT UnregisterCallback(void* pId);
+ virtual DTAPI_RESULT VpdDelete(const char* pTag);
+ virtual DTAPI_RESULT VpdDelete(const wchar_t* pTag);
+ virtual DTAPI_RESULT VpdRead(const char* pTag, char* pVpdItem);
+ virtual DTAPI_RESULT VpdRead(const wchar_t* pTag, wchar_t* pVpdItem);
+ virtual DTAPI_RESULT VpdRead(const char* pTag, char* pVpdItem, int& ItemSize);
+ virtual DTAPI_RESULT VpdRead(const wchar_t* pTag, char* pVpdItem, int& ItemSize);
+ virtual DTAPI_RESULT VpdWrite(const char* pTag, char* pVpdItem);
+ virtual DTAPI_RESULT VpdWrite(const wchar_t* pTag, wchar_t* pVpdItem);
+ virtual DTAPI_RESULT VpdWrite(const char* pTag, char* pVpdItem, int ItemSize);
+ virtual DTAPI_RESULT VpdWrite(const wchar_t* pTag, char* pVpdItem, int ItemSize);
+
+protected:
+ virtual void LoadDeviceData();
+private:
+ static void DtEventCallback(int Event, DtEventArgs* pArgs);
+
+ // Public attributes
+public:
+ DtDeviceDesc m_DvcDesc; // Device descriptor, initialized in attach
+ DtHwFuncDesc* m_pHwf; // Hardware functions, initialized in attach
+ 
+ // Implementation data
+private:
+ std::list<void*> m_EventSubscriberList;
+
+ // Friends
+ friend class DtInpChannel;
+ friend class DtOutpChannel;
+
+public: // TODOSD should be protected
+ IDevice* m_pDev;
+};
+
+// Attribute identifiers
+#define DTAPI_ATTR_LEVEL_MAX 1
+#define DTAPI_ATTR_LEVEL_RANGE 2
+#define DTAPI_ATTR_LEVEL_STEPSIZE 3
+#define DTAPI_ATTR_RFFREQ_ABSMAX 4
+#define DTAPI_ATTR_RFFREQ_ABSMIN 5
+#define DTAPI_ATTR_RFFREQ_MAX 6
+#define DTAPI_ATTR_RFFREQ_MIN 7
+#define DTAPI_ATTR_SAMPRHW_ABSMAX 8
+#define DTAPI_ATTR_SAMPRHW_ABSMIN 9
+#define DTAPI_ATTR_SAMPRHW_HARDLIM 10
+#define DTAPI_ATTR_SAMPRHW_MAX 11
+#define DTAPI_ATTR_SAMPRHW_MIN 12
+#define DTAPI_ATTR_SAMPRATE_ABSMAX 13
+#define DTAPI_ATTR_SAMPRATE_ABSMIN 14
+#define DTAPI_ATTR_SAMPRATE_MAX 15
+#define DTAPI_ATTR_SAMPRATE_MIN 16
+#define DTAPI_ATTR_NUM_FANS 17
+#define DTAPI_ATTR_PCIE_REQ_BW 18
+#define DTAPI_ATTR_PCIE_AVAIL_BW 19
+
+// Order in which devices should be listed by DtapiDeviceScan/DtapiHwFuncScan
+#define DTAPI_SCANORDER_ORIG 0 // Devices are returned in order determined by OS
+#define DTAPI_SCANORDER_SN 1 // Devices are sorted by serial number
+
+// String conversion - Device type number (e.g. "DTA-100", "DTA-102")
+#define DTAPI_DVC2STR_TYPE_NMB 0
+// String conversion - Device type number + location (e.g. "DTA-100 in slot 5");
+#define DTAPI_DVC2STR_TYPE_AND_LOC 1
+// String conversion - Device type number (e.g. "DTA-100", "DTA-102")
+#define DTAPI_HWF2STR_TYPE_NMB 0
+// String conversion - Device type number + port (e.g. "DTA-124 port 1")
+#define DTAPI_HWF2STR_TYPE_AND_PORT 1
+// String conversion - Device type number + location (e.g. "DTA-100 in slot 5");
+#define DTAPI_HWF2STR_TYPE_AND_LOC 2
+// String conversion - Interface type (e.g. "DVB-ASI" or "DVB-C")
+#define DTAPI_HWF2STR_ITF_TYPE 3
+// String conversion - Short version of interface type (e.g. "ASI" instead "DVB-ASI")
+#define DTAPI_HWF2STR_ITF_TYPE_SHORT 4
+
+// Current genlock state
+#define DTAPI_GENL_NO_REF 1
+#define DTAPI_GENL_LOCKING 2
+#define DTAPI_GENL_LOCKED 3
+
+// Constants for GetStateFlags() on port level
+#define DTAPI_STATE_FLAG_INSUFF_USB_BW 0x010000
+#define DTAPI_STATE_FLAG_SDI_NO_LOCK 0x020000
+#define DTAPI_STATE_FLAG_SDI_INVALID 0x040000
+// Constants for GetStateFlags() on device level
+#define DTAPI_STATE_FLAG_VPD_CORRUPT 0x000001
+#define DTAPI_STATE_FLAG_NO_SERIAL 0x000002
+#define DTAPI_STATE_FLAG_NO_USB3 0x000004
+#define DTAPI_STATE_FLAG_SLEEPING 0x000008
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDtaPlusDevice -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Class representing a DekTec DTA-plus Device
+//
+class DtDtaPlusDevice
+{
+ // Constructor, destructor
+public:
+ DtDtaPlusDevice();
+ virtual ~DtDtaPlusDevice();
+private:
+ // No implementation is provided for the copy constructor
+ DtDtaPlusDevice(const DtDtaPlusDevice&);
+
+ // Public access functions
+public:
+ bool IsAttached(void);
+
+ // Public member functions
+public:
+ DTAPI_RESULT AttachToDevice(const DtDtaPlusDeviceDesc &DvcDesc);
+ DTAPI_RESULT AttachToSerial(__int64 SerialNumber);
+ DTAPI_RESULT Detach();
+ DTAPI_RESULT GetDeviceStatus(int &Status); 
+ DTAPI_RESULT GetTempControlStatus(int &ControlStatus);
+ DTAPI_RESULT GetTemperature(int &Temperature);
+ DTAPI_RESULT GetSerialNumber(__int64 &SerialNumber);
+ DTAPI_RESULT SetRfOutLevel(int Level);
+ DTAPI_RESULT SetFreq(int Freq);
+
+private:
+ DtaPlusDevice* m_Dev;
+};
+
+// DTA-plus status codes
+#define DTAPI_DTAPLUS_STATUS_OFF 0 // DTA-Plus not ready for operation
+#define DTAPI_DTAPLUS_STATUS_ON 1 // DTA-Plus ready for operation
+#define DTAPI_DTAPLUS_STATUS_ATTN_FOLLOW_UP 2 // DTA-Plus attenuator ctrl following up
+#define DTAPI_DTAPLUS_STATUS_ATTN_FOLLOW_DOWN 3 //DTA-Plus attenuator ctrl following down
+#define DTAPI_DTAPLUS_STATUS_DAC_FOLLOW_UP 4 // DTA-Plus DAC control following up
+#define DTAPI_DTAPLUS_STATUS_DAC_FOLLOW_DOWN 5 // DTA-Plus DAC control following down
+#define DTAPI_DTAPLUS_STATUS_HOLD 6 // DTA-Plus has valid input signal
+#define DTAPI_DTAPLUS_STATUS_NO_SIGNAL 7 // DTA-Plus has no input signal
+#define DTAPI_DTAPLUS_STATUS_OVER_POWER 8 // DTA-Plus input signal is too high
+
+// DTA-plus temperature control states
+#define DTAPI_DTAPLUS_TEMP_CONTROL_OFF 0 // DTA-Plus temperature control is off
+#define DTAPI_DTAPLUS_TEMP_CONTROL_FAN_ON 1 // DTA-Plus fan is on
+#define DTAPI_DTAPLUS_TEMP_CONTROL_HEATER_ON 2 // DTA-Plus heater is on
+
+// Ethernet speed
+#define DTAPI_NWSPEED_AUTO 0 // Set
+#define DTAPI_NWSPEED_NOLIN 0 // Get
+#define DTAPI_NWSPEED_10MB_HALF 1
+#define DTAPI_NWSPEED_10MB_FULL 2
+#define DTAPI_NWSPEED_100MB_HALF 3
+#define DTAPI_NWSPEED_100MB_FULL 4
+#define DTAPI_NWSPEED_1GB_MASTER 5
+#define DTAPI_NWSPEED_1GB_SLAVE 6
+
+// Microcode upload states
+#define DTAPI_UCODE_NOT_LOADED 0
+#define DTAPI_UCODE_LOADING 1
+#define DTAPI_UCODE_LOADED 2
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtInpChannel -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class to represent an input channel
+//
+class DtInpChannel
+{
+public:
+ DtInpChannel();
+ virtual ~DtInpChannel();
+private:
+ // No implementation is provided for the copy constructor
+ DtInpChannel(const DtInpChannel&);
+
+public:
+ DtHwFuncDesc m_HwFuncDesc; // Hardware function descriptor
+
+ // Convenience functions
+public:
+ int Category(void) { return m_HwFuncDesc.m_DvcDesc.m_Category; }
+ int FirmwareVersion(void) { return m_HwFuncDesc.m_DvcDesc.m_FirmwareVersion; }
+ bool IsAttached(void) { return m_pInp != NULL; }
+ int TypeNumber(void) { return m_HwFuncDesc.m_DvcDesc.m_TypeNumber; }
+ bool HasCaps(const DtCaps Caps) const 
+ { 
+ return ((m_HwFuncDesc.m_Flags & Caps) == Caps); 
+ }
+
+public:
+ DTAPI_RESULT AttachToPort(DtDevice* pDtDvc, int Port,
+ bool Exclusive=true, bool ProbeOnly=false);
+ DTAPI_RESULT BlindScan(int NumEntries, int& NumEntriesResult, 
+ DtTransmitter* pScanResults, __int64 FreqHzSteps=10000000LL, 
+ __int64 StartFreqHz=950000000LL, __int64 EndFreqHz=2150000000LL);
+ DTAPI_RESULT ClearFifo();
+ DTAPI_RESULT ClearFlags(int Latched);
+ DTAPI_RESULT Detach(int DetachMode);
+ DTAPI_RESULT DetectIoStd(int& Value, int& SubValue);
+ DTAPI_RESULT Equalise(int EqualiserSetting);
+ DTAPI_RESULT GetConstellationPoints(int NumPoints, DtConstelPoint* pPoint);
+ DTAPI_RESULT GetDemodControl(int& ModType,
+ int& ParXtra0, int& ParXtra1, int& ParXtra2);
+ DTAPI_RESULT GetDemodControl(DtDemodPars* pDemodPars);
+ DTAPI_RESULT GetDescriptor(DtHwFuncDesc& HwFunDesc);
+ DTAPI_RESULT GetFifoLoad(int& FifoLoad);
+ DTAPI_RESULT GetFlags(int& Flags, int& Latched);
+ DTAPI_RESULT GetIoConfig(int Group, int& Value);
+ DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue);
+ DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue, __int64& ParXtra0);
+ DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue,
+ __int64& ParXtra0, __int64& ParXtra1);
+ DTAPI_RESULT GetIpPars(DtIpPars* pIpPars);
+ DTAPI_RESULT GetIpStat(DtIpStat* pIpStat);
+ DTAPI_RESULT GetMaxFifoSize(int& MaxFifoSize);
+ DTAPI_RESULT GetPars(int Count, DtPar* pPars); 
+ DTAPI_RESULT GetRxClkFreq(int& RxClkFreq);
+ DTAPI_RESULT GetRxControl(int& RxControl);
+ DTAPI_RESULT GetRxMode(int& RxMode);
+ DTAPI_RESULT GetStatistics(int Count, DtStatistic* pStatistics);
+ DTAPI_RESULT GetStatistic(int Type, int& Statistic);
+ DTAPI_RESULT GetStatistic(int Type, double& Statistic);
+ DTAPI_RESULT GetStatistic(int Type, bool& Statistic);
+ DTAPI_RESULT GetStatus(int& PacketSize, int& NumInv, int& ClkDet,
+ int& AsiLock, int& RateOk, int& AsiInv);
+ DTAPI_RESULT GetStreamSelection(DtDabEtiStreamSelPars& StreamSel);
+ DTAPI_RESULT GetStreamSelection(DtDabStreamSelPars& StreamSel);
+ DTAPI_RESULT GetStreamSelection(DtDvbC2StreamSelPars& StreamSel);
+ DTAPI_RESULT GetStreamSelection(DtDvbTStreamSelPars& StreamSel);
+ DTAPI_RESULT GetStreamSelection(DtDvbT2StreamSelPars& StreamSel);
+ DTAPI_RESULT GetStreamSelection(DtIsdbtStreamSelPars& StreamSel);
+ DTAPI_RESULT GetStreamSelection(DtT2MiStreamSelPars& StreamSel);
+ DTAPI_RESULT GetSupportedStatistics(int& Count, DtStatistic* pStatistics);
+ DTAPI_RESULT GetTargetId(int& Present, int& TargetId);
+ DTAPI_RESULT GetTsRateBps(int& TsRate);
+ DTAPI_RESULT GetTunerFrequency(__int64& FreqHz, int TunerId=-1);
+ DTAPI_RESULT GetViolCount(int& ViolCount);
+ DTAPI_RESULT I2CLock(int TimeOut);
+ DTAPI_RESULT I2CUnlock(void);
+ DTAPI_RESULT I2CRead(int DvcAddr, char* pBuffer, int NumBytesToRead);
+ DTAPI_RESULT I2CWrite(int DvcAddr, char* pBuffer, int NumBytesToWrite);
+ DTAPI_RESULT I2CWriteRead(int DvcAddrWrite, char* pBufferWrite, int NumBytesToWrite,
+ int DvcAddrRead, char* pBufferRead, int NumBytesToRead);
+ DTAPI_RESULT LedControl(int LedControl);
+ DTAPI_RESULT LnbEnable(bool Enable);
+ DTAPI_RESULT LnbEnableTone(bool Enable);
+ DTAPI_RESULT LnbSetVoltage(int Level);
+ DTAPI_RESULT LnbSendBurst(int BurstType);
+ DTAPI_RESULT LnbSendDiseqcMessage(const unsigned char* MsgOut, int NumBytesOut);
+ DTAPI_RESULT LnbSendDiseqcMessage(const unsigned char* MsgOut, int NumBytesOut, 
+ unsigned char* MsgIn, int& NumBytesIn);
+ DTAPI_RESULT PolarityControl(int Polarity);
+ DTAPI_RESULT Read(char* pBuffer, int NumBytesToRead);
+ DTAPI_RESULT Read(char* pBuffer, int NumBytesToRead, int TimeOut);
+ DTAPI_RESULT ReadFrame(unsigned int* pFrame, int& FrameSize, int TimeOut=-1);
+ DTAPI_RESULT RegisterDemodCallback(IDtDemodEvent* pIEvent, __int64 Events=-1);
+ DTAPI_RESULT Reset(int ResetMode);
+ DTAPI_RESULT SetAdcSampleRate(int SampleRate);
+ DTAPI_RESULT SetAntPower(int AntPower);
+ DTAPI_RESULT SetDemodControl(int ModType, int ParXtra0, int ParXtra1, int ParXtra2);
+ DTAPI_RESULT SetDemodControl(DtDemodPars *pDemodPars);
+ DTAPI_RESULT SetErrorStatsMode(int ModType, int Mode);
+ DTAPI_RESULT SetIoConfig(int Group, int Value, int SubValue = -1,
+ __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
+ DTAPI_RESULT SetIpPars(DtIpPars* pIpPars);
+ DTAPI_RESULT SetPars(int Count, DtPar* pPars); 
+ DTAPI_RESULT SetRxControl(int RxControl);
+ DTAPI_RESULT SetRxMode(int RxMode);
+ DTAPI_RESULT SetStreamSelection(DtDabEtiStreamSelPars& StreamSel);
+ DTAPI_RESULT SetStreamSelection(DtDabStreamSelPars& StreamSel);
+ DTAPI_RESULT SetStreamSelection(DtDvbC2StreamSelPars& StreamSel);
+ DTAPI_RESULT SetStreamSelection(DtDvbTStreamSelPars& StreamSel);
+ DTAPI_RESULT SetStreamSelection(DtDvbT2StreamSelPars& StreamSel);
+ DTAPI_RESULT SetStreamSelection(DtIsdbtStreamSelPars& StreamSel);
+ DTAPI_RESULT SetStreamSelection(DtT2MiStreamSelPars& StreamSel);
+ DTAPI_RESULT SetTuningMode(int Mode);
+ DTAPI_RESULT SetTunerFrequency(__int64 FreqHz, int TunerId=-1);
+ DTAPI_RESULT Tune(__int64 FreqHz, int ModType,
+ int ParXtra0, int ParXtra1, int ParXtra2);
+ DTAPI_RESULT Tune(__int64 FreqHz, DtDemodPars *pDemodPars);
+
+ // Encapsulated data
+private:
+ IXpMutex* m_pMTLock; // Multi-threading lock for Get/Read functions
+ void* m_pDetachLockCount;
+ int m_Port;
+ bool m_WantToDetach;
+
+public: // TODOSD should be protected
+ InpChannel* m_pInp; // Input channel implementation
+ 
+// Private helper functions
+private:
+ DTAPI_RESULT DetachLock(void);
+ DTAPI_RESULT DetachUnlock(void);
+ DTAPI_RESULT ReadAccessLock(void);
+ DTAPI_RESULT ReadAccessUnlock(void);
+ DTAPI_RESULT ReadWithTimeOut(char* pBuf, int NumBytesToRead, int TimeOut = -1);
+};
+
+// Tuner freq has changed
+#define DTAPI_EV_TUNE_FREQ_CHANGED 0x0000000000000001LL
+// Tuning parameters have changed
+#define DTAPI_EV_TUNE_PARS_CHANGED 0x0000000000000002LL
+
+#define DTAPI_ERRORSTATS_BER 0 // Bit error rate (default)
+#define DTAPI_ERRORSTATS_RS 1 // Reed-Solomon packet errors
+
+// Feature not supported
+#define DTAPI_NOT_SUPPORTED -1
+
+// ASI Polarity-Control Status
+#define DTAPI_ASIINV_NORMAL 0
+#define DTAPI_ASIINV_INVERT 1
+
+// ASI Input-Clock Lock
+#define DTAPI_ASI_NOLOCK 0
+#define DTAPI_ASI_INLOCK 1
+
+// SDI Input-Clock Lock
+#define DTAPI_GENLOCK_NOLOCK 0
+#define DTAPI_GENLOCK_INLOCK 1
+
+// Clock Detector
+#define DTAPI_CLKDET_FAIL 0
+#define DTAPI_CLKDET_OK 1
+
+// Input Rate Ok
+#define DTAPI_INPRATE_LOW 0
+#define DTAPI_INPRATE_OK 1
+
+// #Invalid bytes per packet
+#define DTAPI_NUMINV_NONE 0
+#define DTAPI_NUMINV_16 1
+#define DTAPI_NUMINV_OTHER 2
+
+// Packet Size
+#define DTAPI_PCKSIZE_INV 0
+#define DTAPI_PCKSIZE_188 2
+#define DTAPI_PCKSIZE_204 3
+
+// SDI Mode
+#define DTAPI_SDIMODE_INV 0
+#define DTAPI_SDIMODE_525 1
+#define DTAPI_SDIMODE_625 2
+
+// Receive Control
+#define DTAPI_RXCTRL_IDLE 0
+#define DTAPI_RXCTRL_RCV 1
+
+// Receive mode for Transport Streams - Modes
+#define DTAPI_RXMODE_TS 0x10
+#define DTAPI_RXMODE_TS_MODE_BITS 0x0F
+#define DTAPI_RXMODE_ST188 (DTAPI_RXMODE_TS | 0x01)
+#define DTAPI_RXMODE_ST204 (DTAPI_RXMODE_TS | 0x02)
+#define DTAPI_RXMODE_STMP2 (DTAPI_RXMODE_TS | 0x03)
+#define DTAPI_RXMODE_STRAW (DTAPI_RXMODE_TS | 0x04)
+#define DTAPI_RXMODE_STL3 (DTAPI_RXMODE_TS | 0x05)
+#define DTAPI_RXMODE_STL3FULL (DTAPI_RXMODE_TS | 0x06)
+#define DTAPI_RXMODE_IPRAW (DTAPI_RXMODE_TS | 0x07)
+#define DTAPI_RXMODE_RAWASI (DTAPI_RXMODE_TS | 0x08)
+#define DTAPI_RXMODE_STTRP (DTAPI_RXMODE_TS | 0x09)
+#define DTAPI_RXMODE_TS_MASK (DTAPI_RXMODE_TS | DTAPI_RXMODE_TS_MODE_BITS)
+
+// Receive mode for SDI - Modes
+#define DTAPI_RXMODE_SDI 0x1000
+#define DTAPI_RXMODE_SDI_MODE_BITS 0x0F00
+#define DTAPI_RXMODE_SDI_FULL (DTAPI_RXMODE_SDI | 0x100)
+#define DTAPI_RXMODE_SDI_ACTVID (DTAPI_RXMODE_SDI | 0x200)
+#define DTAPI_RXMODE_SDI_MASK (DTAPI_RXMODE_SDI | DTAPI_RXMODE_SDI_MODE_BITS)
+// Receive mode for SDI - Flags
+#define DTAPI_RXMODE_SDI_HUFFMAN 0x00002000
+#define DTAPI_RXMODE_SDI_10B 0x00004000
+#define DTAPI_RXMODE_SDI_16B 0x00008000
+#define DTAPI_RXMODE_SDI_10B_NBO 0x00010000
+
+// Receive mode for SDI and Transport Streams - Common flags
+#define DTAPI_RXMODE_TIMESTAMP32 0x01000000
+#define DTAPI_RXMODE_TIMESTAMP64 0x02000000
+
+// Demodulation status flags - FEC lock
+#define DTAPI_DEMOD_FECLOCK_FAIL 0
+#define DTAPI_DEMOD_FECLOCK_OK 1
+// Demodulation status flags - Receiver lock
+#define DTAPI_DEMOD_RCVLOCK_FAIL 0
+#define DTAPI_DEMOD_RCVLOCK_OK 1 
+
+// Channel bands
+#define DTAPI_BAND_BROADCAST_ONAIR 1
+#define DTAPI_BAND_FCC_CABLE 2
+#define DTAPI_BAND_IRC 3
+#define DTAPI_BAND_HRC 4
+
+// RF level bandwith
+#define DTAPI_RFLVL_CHANNEL 0
+#define DTAPI_RFLVL_NARROWBAND 1
+
+// ADC sampling rates
+#define DTAPI_ADCCLK_OFF 0 // Clock is off
+#define DTAPI_ADCCLK_20M647 20647059 // 20.647059 MHz clock
+#define DTAPI_ADCCLK_13M5 13500000 // 13.5 MHz clock
+#define DTAPI_ADCCLK_27M 27000000 // 27.0 MHz clock
+
+// LNB control values
+#define DTAPI_LNB_13V 0 // LNB power 13V
+#define DTAPI_LNB_18V 1 // LNB power 18V
+#define DTAPI_LNB_14V 2 // LNB power 14V
+#define DTAPI_LNB_19V 3 // LNB power 19V
+
+// LNB burst types
+#define DTAPI_LNB_BURST_A 0 // Burst A
+#define DTAPI_LNB_BURST_B 1 // Burst B
+
+// Tuner Parameters - Tuner standard
+#define DTAPI_TUNMOD_QAM 0x1
+#define DTAPI_TUNMOD_ATSC 0x2
+#define DTAPI_TUNMOD_ISDBT 0x3
+#define DTAPI_TUNMOD_DVBT 0x4
+#define DTAPI_TUNMOD_DMBT 0x5
+
+// Tuner Parameters - DTA-2131 specific - Value for automatic computation of parameters
+#define DTAPI_TUN31_AUTO -1 // According to tuner standard
+
+// Tuner Parameters - DTA-2131 specific - Low-pass filter cutoff frequency
+#define DTAPI_TUN31_LPF_1_5MHZ 0 // 1.5 MHz low-pass filter
+#define DTAPI_TUN31_LPF_6MHZ 1 // 6 MHz low-pass filter
+#define DTAPI_TUN31_LPF_7MHZ 2 // 7 MHz low-pass filter
+#define DTAPI_TUN31_LPF_8MHZ 3 // 8 MHz low-pass filter 
+#define DTAPI_TUN31_LPF_9MHZ 4 // 9 MHz low-pass filter 
+
+// Tuner Parameters - DTA-2131 specific - Low-pass filter offset 
+#define DTAPI_TUN31_LPF_0PCT 0 // 0% low-pass filter offset 
+#define DTAPI_TUN31_LPF_4PCT 1 // 4% low-pass filter offset 
+#define DTAPI_TUN31_LPF_8PCT 2 // 8% low-pass filter offset 
+#define DTAPI_TUN31_LPF_12PCT 3 // 12% low-pass filter offset
+
+// Tuner Parameters - DTA-2131 specific - IF hi-pass filter 
+#define DTAPI_TUN31_HPF_DIS 0 // Disabled IF hi-pass filter 
+#define DTAPI_TUN31_HPF_0_4MHZ 1 // 0.4 MHz IF hi-pass filter 
+#define DTAPI_TUN31_HPF_0_85MHZ 2 // 0.85 MHz IF hi-pass filter
+#define DTAPI_TUN31_HPF_1MHZ 3 // 1 MHz IF hi-pass filter
+#define DTAPI_TUN31_HPF_1_5MHZ 4 // 1.5 MHz IF hi-pass filter
+
+// Tuner Parameters - DTA-2131 specific - Notch settings
+#define DTAPI_TUN31_NOTCH_DIS 0 // Disable
+#define DTAPI_TUN31_NOTCH_ENA 1 // Enable
+
+// Tuner Parameters - DTA-2139 specific - Agc specific
+#define DTAPI_AGC1_FREE 0
+#define DTAPI_AGC1_FROZEN 1
+
+// Tuning mode - DTU-236A specific
+#define DTAPI_TUNING_NORMAL 0 // Standard tuning mode
+#define DTAPI_TUNING_INDEPENDENT 1 // Multiple tuners, tuned independently
+
+// Tuner ID - DTU-236A specific
+#define DTAPI_TUNERID_ALL -1 // ID for all tuners
+#define DTAPI_TUNERID_MAIN 0 // ID for main tuner
+#define DTAPI_TUNERID_MEASUREMENT 1 // ID for measurement tuner
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtOutpChannel -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class to represent a transport-stream or SDI output channel
+//
+class DtOutpChannel
+{
+public:
+ DtOutpChannel();
+ virtual ~DtOutpChannel();
+private:
+ // No implementation is provided for the copy constructor
+ DtOutpChannel(const DtOutpChannel&);
+
+public:
+ DtHwFuncDesc m_HwFuncDesc; // Hardware function descriptor
+
+ // Convenience functions
+public:
+ int Category(void) { return m_HwFuncDesc.m_DvcDesc.m_Category; }
+ int FirmwareVersion(void) { return m_HwFuncDesc.m_DvcDesc.m_FirmwareVersion; }
+ bool IsAttached(void) { return m_pOutp != NULL; }
+ int TypeNumber(void) { return m_HwFuncDesc.m_DvcDesc.m_TypeNumber; }
+ bool HasCaps(const DtCaps Caps) const 
+ { 
+ return ((m_HwFuncDesc.m_Flags & Caps) == Caps); 
+ }
+
+public:
+ virtual DTAPI_RESULT AttachToPort(DtDevice* pDtDvc, int Port, bool ProbeOnly=false);
+ virtual DTAPI_RESULT ClearFifo(void);
+ virtual DTAPI_RESULT ClearFlags(int Latched);
+ virtual DTAPI_RESULT Detach(int DetachMode);
+ virtual DTAPI_RESULT GetAttribute(int AttrId, int& AttrValue);
+ virtual DTAPI_RESULT GetAttribute(int AttrId, DtModPars& ModParVals, int& AttrValue);
+ virtual DTAPI_RESULT GetDescriptor(DtHwFuncDesc& HwFunDesc);
+ virtual DTAPI_RESULT GetExtClkFreq(int& ExtClkFreq);
+ virtual DTAPI_RESULT GetFailsafeAlive(bool& Alive);
+ virtual DTAPI_RESULT GetFailsafeConfig(bool& Enable, int& Timeout);
+ virtual DTAPI_RESULT GetFifoLoad(int& FifoLoad);
+ virtual DTAPI_RESULT GetFifoSize(int& FifoSize);
+ virtual DTAPI_RESULT GetFifoSizeMax(int& FifoSizeMax);
+ virtual DTAPI_RESULT GetFifoSizeTyp(int& FifoSizeTyp);
+ virtual DTAPI_RESULT GetFlags(int& Status, int& Latched);
+ virtual DTAPI_RESULT GetIoConfig(int Group, int& Value);
+ virtual DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue);
+ virtual DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue,
+ __int64& ParXtra0);
+ virtual DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue,
+ __int64& ParXtra0, __int64& ParXtra1);
+ virtual DTAPI_RESULT GetIpPars(DtIpPars* pIpPars);
+ virtual DTAPI_RESULT GetMaxFifoSize(int& MaxFifoSize);
+ virtual DTAPI_RESULT GetModControl(int& ModType, int& ParXtra0, int& ParXtra1,
+ int& ParXtra2, void*& pXtraPars);
+ virtual DTAPI_RESULT GetOutputLevel(int& LeveldBm);
+ virtual DTAPI_RESULT GetRfControl(__int64& RfFreq, int& LockStatus);
+ virtual DTAPI_RESULT GetSpiClk(int& SpiClk);
+ virtual DTAPI_RESULT GetTargetId(int& Present, int& TargetId);
+ virtual DTAPI_RESULT GetTsRateBps(int& TsRate);
+ virtual DTAPI_RESULT GetTxControl(int& TxControl);
+ virtual DTAPI_RESULT GetTxMode(int& TxMode, int& TxStuffMode);
+ virtual DTAPI_RESULT LedControl(int LedControl);
+ virtual DTAPI_RESULT Reset(int ResetMode);
+ virtual DTAPI_RESULT SetChannelModelling(bool CmEnable, DtCmPars& CmPars); 
+ virtual DTAPI_RESULT SetCustomRollOff(bool Enable, DtFilterPars& Filter); 
+ virtual DTAPI_RESULT SetFailsafeAlive();
+ virtual DTAPI_RESULT SetFailsafeConfig(bool Enable, int Timeout = 0);
+ virtual DTAPI_RESULT SetFifoSize(int FifoSize);
+ virtual DTAPI_RESULT SetFifoSizeMax(void);
+ virtual DTAPI_RESULT SetFifoSizeTyp(void);
+ virtual DTAPI_RESULT SetIoConfig(int Group, int Value, int SubValue = -1,
+ __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
+ virtual DTAPI_RESULT SetIpPars(DtIpPars* pIpPars);
+ virtual DTAPI_RESULT SetIsdbtCaptFile(void* IsdbtFile);
+ virtual DTAPI_RESULT SetModControl(DtCmmbPars&);
+ virtual DTAPI_RESULT SetModControl(DtDvbC2Pars&);
+ virtual DTAPI_RESULT SetModControl(DtDvbS2Pars&);
+ virtual DTAPI_RESULT SetModControl(DtDvbT2Pars&);
+ virtual DTAPI_RESULT SetModControl(DtIsdbsPars&);
+ virtual DTAPI_RESULT SetModControl(DtIsdbtPars&);
+ virtual DTAPI_RESULT SetModControl(DtIsdbTmmPars&);
+ virtual DTAPI_RESULT SetModControl(int ModType, int ParXtra0, int ParXtra1, 
+ int ParXtra2);
+ virtual DTAPI_RESULT SetModControl(unsigned char*);
+ virtual DTAPI_RESULT SetOutputLevel(int LeveldBm);
+ virtual DTAPI_RESULT SetPower(int Power);
+ virtual DTAPI_RESULT SetRfControl(__int64 RfFreq);
+ virtual DTAPI_RESULT SetRfMode(int RfMode);
+ virtual DTAPI_RESULT SetRfMode(int Sel, int Mode);
+ virtual DTAPI_RESULT SetSnr(int Mode, int Snr);
+ virtual DTAPI_RESULT SetSpiClk(int SpiClk);
+ virtual DTAPI_RESULT SetTsRateBps(int TsRate);
+ virtual DTAPI_RESULT SetTsRateRatio(int TsRate, int ClockRef);
+ virtual DTAPI_RESULT SetTxControl(int TxControl);
+ virtual DTAPI_RESULT SetTxMode(int TxMode, int StuffMode);
+ virtual DTAPI_RESULT SetTxPolarity(int TxPolarity);
+ virtual DTAPI_RESULT Write(char* pBuffer, int NumBytesToWrite);
+ // Undocumented
+ virtual DTAPI_RESULT GetModBufLoads(bool&, int&, int&, int&);
+
+public: // TODOSD should be protected
+ OutpChannel* m_pOutp; // Output channel implementation
+
+private:
+ void* m_pDetachLockCount;
+ bool m_WantToDetach;
+ DTAPI_RESULT DetachLock(void);
+ DTAPI_RESULT DetachUnlock(void);
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtMplpOutpChannel -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class DtMplpOutpChannel : public DtOutpChannel
+{
+public:
+ DtMplpOutpChannel();
+ virtual ~DtMplpOutpChannel();
+private:
+ // No implementation is provided for the copy constructor
+ DtMplpOutpChannel(const DtMplpOutpChannel&);
+
+public:
+ virtual bool IsAttached(void);
+
+public:
+ virtual DTAPI_RESULT AttachToPort(DtDevice* pDtDvc, int Port, bool ProbeOnly=false);
+ virtual DTAPI_RESULT ClearFifo(void);
+ virtual DTAPI_RESULT ClearFlags(int Latched);
+ virtual DTAPI_RESULT Detach(int DetachMode);
+ virtual DTAPI_RESULT GetAttribute(int AttrId, int& AttrValue);
+ virtual DTAPI_RESULT GetAttribute(int AttrId, DtModPars& ModParVals, int& AttrValue);
+ virtual DTAPI_RESULT GetDescriptor(DtHwFuncDesc& HwFunDesc);
+ virtual DTAPI_RESULT GetExtClkFreq(int& ExtClkFreq);
+ virtual DTAPI_RESULT GetFailsafeAlive(bool& Alive);
+ virtual DTAPI_RESULT GetFailsafeConfig(bool& Enable, int& Timeout);
+ virtual DTAPI_RESULT GetFifoLoad(int& FifoLoad);
+ virtual DTAPI_RESULT GetFifoSize(int& FifoSize);
+ virtual DTAPI_RESULT GetFifoSizeMax(int& FifoSizeMax);
+ virtual DTAPI_RESULT GetFifoSizeTyp(int& FifoSizeTyp);
+ virtual DTAPI_RESULT GetFlags(int& Status, int& Latched);
+ virtual DTAPI_RESULT GetIoConfig(int Group, int& Value);
+ virtual DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue);
+ virtual DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue,
+ __int64& ParXtra0);
+ virtual DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue, 
+ __int64& ParXtra0, __int64& ParXtra1);
+ virtual DTAPI_RESULT GetIpPars(DtIpPars* pIpPars);
+ virtual DTAPI_RESULT GetMaxFifoSize(int& MaxFifoSize);
+ virtual DTAPI_RESULT GetModControl(int& ModType, int& CodeRate,
+ int& ParXtra1, int& ParXtra2, void*& pXtraPars);
+ virtual DTAPI_RESULT GetOutputLevel(int& LeveldBm);
+ virtual DTAPI_RESULT GetRfControl(__int64& RfFreq, int& LockStatus);
+ virtual DTAPI_RESULT GetSpiClk(int& SpiClk);
+ virtual DTAPI_RESULT GetTargetId(int& Present, int& TargetId);
+ virtual DTAPI_RESULT GetTsRateBps(int& TsRate);
+ virtual DTAPI_RESULT GetTxControl(int& TxControl);
+ virtual DTAPI_RESULT GetTxMode(int& TxMode, int& TxStuffMode);
+ virtual DTAPI_RESULT LedControl(int LedControl);
+ virtual DTAPI_RESULT Reset(int ResetMode);
+ virtual DTAPI_RESULT SetChannelModelling(bool CmEnable, DtCmPars& CmPars); 
+ virtual DTAPI_RESULT SetCustomRollOff(bool Enable, DtFilterPars& Filter); 
+
+ virtual DTAPI_RESULT SetFailsafeConfig(bool Enable, int Timeout = 0);
+ virtual DTAPI_RESULT SetFailsafeAlive();
+ virtual DTAPI_RESULT SetFifoSize(int FifoSize);
+ virtual DTAPI_RESULT SetFifoSizeMax(void);
+ virtual DTAPI_RESULT SetFifoSizeTyp(void);
+ virtual DTAPI_RESULT SetIoConfig(int Group, int Value, int SubValue = -1,
+ __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
+ virtual DTAPI_RESULT SetIpPars(DtIpPars* pIpPars);
+ virtual DTAPI_RESULT SetIsdbtCaptFile(void* IsdbtFile);
+ virtual DTAPI_RESULT SetModControl(DtIsdbsPars&);
+ virtual DTAPI_RESULT SetModControl(DtIsdbtPars&);
+ virtual DTAPI_RESULT SetModControl(DtIsdbTmmPars&);
+ virtual DTAPI_RESULT SetModControl(DtCmmbPars&);
+ virtual DTAPI_RESULT SetModControl(DtDvbC2Pars&);
+ virtual DTAPI_RESULT SetModControl(DtDvbS2Pars&);
+ virtual DTAPI_RESULT SetModControl(DtDvbT2Pars&);
+ virtual DTAPI_RESULT SetModControl(int ModType, int ParXtra0, int ParXtra1, 
+ int ParXtra2);
+ virtual DTAPI_RESULT SetModControl(unsigned char*);
+ virtual DTAPI_RESULT SetOutputLevel(int LeveldBm);
+ virtual DTAPI_RESULT SetPower(int Power);
+ virtual DTAPI_RESULT SetRfControl(__int64 RfFreq);
+ virtual DTAPI_RESULT SetRfMode(int RfMode);
+ virtual DTAPI_RESULT SetRfMode(int Sel, int Mode);
+ virtual DTAPI_RESULT SetSnr(int Mode, int Snr);
+ virtual DTAPI_RESULT SetSpiClk(int SpiClk);
+ virtual DTAPI_RESULT SetTsRateBps(int TsRate);
+ virtual DTAPI_RESULT SetTsRateRatio(int TsRate, int ClockRef);
+ virtual DTAPI_RESULT SetTxControl(int TxControl);
+ virtual DTAPI_RESULT SetTxMode(int TxMode, int TxStuffMode);
+ virtual DTAPI_RESULT SetTxPolarity(int TxPolarity);
+ virtual DTAPI_RESULT Write(char* pBuffer, int NumBytesToWrite);
+ // Undocumented
+ virtual DTAPI_RESULT GetModBufLoads(bool&, int&, int&, int&);
+
+ // IMplpModulator interface implementation
+public:
+ virtual DTAPI_RESULT AttachVirtual(DtDevice* pDtDvc, 
+ bool (*pFunc)(void*, DtVirtualOutData*), void* pOpaque);
+ virtual DTAPI_RESULT GetMplpFifoFree(int FifoIdx, int& FifoFree);
+ virtual DTAPI_RESULT GetMplpFifoLoad(int FifoIdx, int& FifoLoad);
+ virtual DTAPI_RESULT GetMplpFifoSize(int FifoIdx, int& FifoSize);
+ virtual DTAPI_RESULT GetMplpModStatus(DtDvbC2ModStatus* pMplpModStat);
+ virtual DTAPI_RESULT GetMplpModStatus(DtDvbS2ModStatus* pMplpModStat);
+ virtual DTAPI_RESULT GetMplpModStatus(DtDvbT2ModStatus* pMplpModStat);
+ virtual DTAPI_RESULT GetMplpModStatus(DtDvbT2ModStatus* pMplpModStat1,
+ DtDvbT2ModStatus* pMplpModStat2);
+ virtual DTAPI_RESULT SetMplpChannelModelling(bool CmEnable, DtCmPars&, int Chan=0);
+ virtual DTAPI_RESULT WriteMplp(int FifoIdx, char* pBuffer, int NumBytesToWrite);
+ virtual DTAPI_RESULT WriteMplpPacket(int FifoIdx, char* pPacket, int PacketSize);
+
+private:
+ bool m_IsAttachedToVirtual;
+ MplpHelper* m_pMplpHelper;
+};
+
+// Detach mode flags
+#define DTAPI_INSTANT_DETACH 1
+#define DTAPI_WAIT_UNTIL_SENT 2
+
+// Equaliser settings 
+#define DTAPI_EQUALISER_OFF 0
+#define DTAPI_EQUALISER_ON 1
+
+// LED control
+#define DTAPI_LED_OFF 0
+#define DTAPI_LED_GREEN 1
+#define DTAPI_LED_RED 2
+#define DTAPI_LED_YELLOW 3
+#define DTAPI_LED_BLUE 4
+#define DTAPI_LED_HARDWARE 5
+
+// Noise modes
+#define DTAPI_NOISE_DISABLED 0 // No noise generation
+#define DTAPI_NOISE_WNG_HW 1 // White noise generator (hardware)
+
+// Polarity control
+#define DTAPI_POLARITY_AUTO 0
+#define DTAPI_POLARITY_NORMAL 2
+#define DTAPI_POLARITY_INVERT 3
+
+// Power mode
+#define DTAPI_POWER_OFF 0
+#define DTAPI_POWER_ON 1
+
+// Reset mode
+#define DTAPI_FIFO_RESET 0
+#define DTAPI_FULL_RESET 1
+
+// RF PLL lock status
+#define DTAPI_RFPLL_LOCK1 1 // RF PLL #1 is in lock
+#define DTAPI_RFPLL_LOCK2 2 // RF PLL #2 is in lock
+#define DTAPI_RFPLL_LOCK3 4 // RF PLL #3 is in lock
+
+// Status flags
+#define DTAPI_RX_FIFO_OVF 0x0002
+#define DTAPI_RX_SYNC_ERR 0x0004
+#define DTAPI_RX_RATE_OVF 0x0008
+#define DTAPI_RX_TARGET_ERR 0x0010
+#define DTAPI_RX_LINK_ERR 0x0040
+#define DTAPI_RX_DATA_ERR 0x0080
+#define DTAPI_RX_DRV_BUF_OVF 0x0100
+#define DTAPI_RX_SYNTAX_ERR 0x0200
+
+#define DTAPI_TX_FIFO_UFL 0x0002
+#define DTAPI_TX_SYNC_ERR 0x0004
+#define DTAPI_TX_READBACK_ERR 0x0008
+#define DTAPI_TX_TARGET_ERR 0x0010
+#define DTAPI_TX_MUX_OVF 0x0020
+#define DTAPI_TX_FIFO_OVF 0x0020
+#define DTAPI_TX_LINK_ERR 0x0040
+#define DTAPI_TX_DATA_ERR 0x0080
+#define DTAPI_TX_CPU_UFL 0x0100
+#define DTAPI_TX_DMA_UFL 0x0200
+
+// Target adapter present
+#define DTAPI_NO_CONNECTION 0
+#define DTAPI_DVB_SPI_SINK 1 // For output channels
+#define DTAPI_DVB_SPI_SOURCE 1 // For input channels
+#define DTAPI_TARGET_PRESENT 2
+#define DTAPI_TARGET_UNKNOWN 3
+
+// Transmit control
+#define DTAPI_TXCTRL_IDLE 1
+#define DTAPI_TXCTRL_HOLD 2
+#define DTAPI_TXCTRL_SEND 3
+
+// Transmit mode for Transport Streams - Modes
+#define DTAPI_TXMODE_TS 0x10
+#define DTAPI_TXMODE_TS_MODE_BITS 0x0F
+#define DTAPI_TXMODE_188 (DTAPI_TXMODE_TS | 0x01)
+#define DTAPI_TXMODE_192 (DTAPI_TXMODE_TS | 0x02)
+#define DTAPI_TXMODE_204 (DTAPI_TXMODE_TS | 0x03)
+#define DTAPI_TXMODE_ADD16 (DTAPI_TXMODE_TS | 0x04)
+#define DTAPI_TXMODE_MIN16 (DTAPI_TXMODE_TS | 0x05)
+#define DTAPI_TXMODE_IPRAW (DTAPI_TXMODE_TS | 0x06)
+#define DTAPI_TXMODE_RAW (DTAPI_TXMODE_TS | 0x07)
+#define DTAPI_TXMODE_RAWASI (DTAPI_TXMODE_TS | 0x08)
+#define DTAPI_TXMODE_TS_MASK (DTAPI_TXMODE_TS | DTAPI_TXMODE_TS_MODE_BITS)
+// Transmit mode for Transport Streams - DVB-ASI flags
+#define DTAPI_TXMODE_BURST 0x20
+#define DTAPI_TXMODE_TXONTIME 0x40
+
+// Transmit mode for SDI - Modes
+#define DTAPI_TXMODE_SDI 0x1000
+#define DTAPI_TXMODE_SDI_MODE_BITS 0x0F00
+#define DTAPI_TXMODE_SDI_FULL (DTAPI_TXMODE_SDI | 0x100)
+#define DTAPI_TXMODE_SDI_ACTVID (DTAPI_TXMODE_SDI | 0x200)
+#define DTAPI_TXMODE_SDI_MASK (DTAPI_TXMODE_SDI | DTAPI_TXMODE_SDI_MODE_BITS)
+// Transmit mode for SDI - Flags
+#define DTAPI_TXMODE_SDI_HUFFMAN 0x00002000
+#define DTAPI_TXMODE_SDI_10B 0x00004000
+#define DTAPI_TXMODE_SDI_16B 0x00008000
+#define DTAPI_TXMODE_SDI_10B_NBO 0x00010000
+
+// Stuff mode - TS : Null-packet stuffing on/off; SDI: Black-frame stuffing on/off
+#define DTAPI_TXSTUFF_MODE_OFF 0
+#define DTAPI_TXSTUFF_MODE_ON 1
+
+// Transmit polarity
+#define DTAPI_TXPOL_NORMAL 0
+#define DTAPI_TXPOL_INVERTED 1
+
+// Upconverter RF modes
+#define DTAPI_UPCONV_MODE 0 // Selects NORMAL/MUTE/CW/CWI/CWQ
+#define DTAPI_UPCONV_MODE_MSK 0xF // Mask for mode field
+#define DTAPI_UPCONV_NORMAL 0
+#define DTAPI_UPCONV_MUTE 1
+#define DTAPI_UPCONV_CW 2
+#define DTAPI_UPCONV_CWI 3
+#define DTAPI_UPCONV_CWQ 4
+#define DTAPI_UPCONV_SPECINV 0x100 // Can be OR-ed with other RF modes
+
+// USB speed modes
+#define DTAPI_USB_FULL_SPEED 0
+#define DTAPI_USB_HIGH_SPEED 1
+#define DTAPI_USB_SUPER_SPEED 2
+
+// PCIe standards
+#define DTAPI_PCIE_GEN_UNKNOWN 0 // PCIe Gen is unknown
+#define DTAPI_PCIE_GEN1 1 // PCIe Gen 1 (2.5Gbps per link)
+#define DTAPI_PCIE_GEN2 2 // PCIe Gen 2 (5.0Gbps per link)
+#define DTAPI_PCIE_GEN3 3 // PCIe Gen 3 (8.0Gbps per link)
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Modulation Parameters -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+
+// Modulation types
+#define DTAPI_MOD_DVBS_QPSK 0 // Native DVB-S on DTA-107
+#define DTAPI_MOD_DVBS_BPSK 1
+#define DTAPI_MOD_QAM4 3
+#define DTAPI_MOD_QAM16 4
+#define DTAPI_MOD_QAM32 5
+#define DTAPI_MOD_QAM64 6
+#define DTAPI_MOD_QAM128 7
+#define DTAPI_MOD_QAM256 8
+#define DTAPI_MOD_DVBT 9
+#define DTAPI_MOD_ATSC 10
+#define DTAPI_MOD_DVBT2 11
+#define DTAPI_MOD_ISDBT 12
+#define DTAPI_MOD_ISDBS 13
+#define DTAPI_MOD_IQDIRECT 15
+#define DTAPI_MOD_IQ_2131 16 // DTA-2131 specific (de)modulation
+#define DTAPI_MOD_DVBS2_QPSK 32
+#define DTAPI_MOD_DVBS2_8PSK 33
+#define DTAPI_MOD_DVBS2_16APSK 34
+#define DTAPI_MOD_DVBS2_32APSK 35
+#define DTAPI_MOD_DVBS2_L3 36 
+#define DTAPI_MOD_DVBS2 37
+#define DTAPI_MOD_DMBTH 48
+#define DTAPI_MOD_ADTBT 49
+#define DTAPI_MOD_CMMB 50
+#define DTAPI_MOD_T2MI 51
+#define DTAPI_MOD_DVBC2 52 
+#define DTAPI_MOD_DAB 53 
+#define DTAPI_MOD_QAM_AUTO 54 
+#define DTAPI_MOD_ATSC_MH 55
+#define DTAPI_MOD_ISDBTMM 56
+// Modulation types DVB-S2X specific
+#define DTAPI_MOD_S2X_QPSK_VLSNR 57 // DVB-S2X, QPSK, very low SNR
+#define DTAPI_MOD_S2X_BPSK_VLSNR 58 // DVB-S2X, BPSK, very low SNR
+#define DTAPI_MOD_S2X_BPSK_S_VLSNR 59 // DVB-S2X, BPSK-S, very low SNR
+#define DTAPI_MOD_S2X_8APSK_L 60 // DVB-S2X, 8APSK-L
+#define DTAPI_MOD_S2X_16APSK_L 61 // DVB-S2X, 16APSK-L
+#define DTAPI_MOD_S2X_32APSK_L 62 // DVB-S2X, 32APSK-L
+#define DTAPI_MOD_S2X_64APSK 63 // DVB-S2X, 64APSK
+#define DTAPI_MOD_S2X_64APSK_L 64 // DVB-S2X, 64APSK-L
+#define DTAPI_MOD_S2X_128APSK 65 // DVB-S2X, 128APSK
+#define DTAPI_MOD_S2X_256APSK 66 // DVB-S2X, 256APSK-L
+#define DTAPI_MOD_S2X_256APSK_L 67 // DVB-S2X, 256APSK
+#define DTAPI_MOD_DVBS2X_L3 68 // L3 modulation with S2X support
+#define DTAPI_MOD_TYPE_AUTO -1 // Auto detect modulation type
+#define DTAPI_MOD_TYPE_UNK -1 // Unknown modulation type
+
+// Modulation parameters - Common - ParXtra2
+#define DTAPI_MOD_SYMRATE_AUTO -1 // Auto detect symbol rate
+#define DTAPI_MOD_SYMRATE_UNK -1 // Symbol rate if unknown
+
+// Modulation parameters - ATSC - ParXtra0
+#define DTAPI_MOD_ATSC_VSB8 0x00000000 // 8-VSB, 10.762MBd, 19.392Mbps
+#define DTAPI_MOD_ATSC_VSB16 0x00000001 // 16-VSB, 10.762MBd, 38.785Mbps
+#define DTAPI_MOD_ATSC_VSB_AUTO 0x00000003 // Auto detect constellation
+#define DTAPI_MOD_ATSC_VSB_UNK 0x00000003 // Unknown constellation
+#define DTAPI_MOD_ATSC_VSB_MSK 0x00000003 // Constellation mask
+
+// Modulation parameters - DTMB - Bandwidth
+#define DTAPI_MOD_DTMB_5MHZ 0x00000001
+#define DTAPI_MOD_DTMB_6MHZ 0x00000002
+#define DTAPI_MOD_DTMB_7MHZ 0x00000003
+#define DTAPI_MOD_DTMB_8MHZ 0x00000004
+#define DTAPI_MOD_DTMB_BW_AUTO 0x0000000F // Auto detect
+#define DTAPI_MOD_DTMB_BW_UNK 0x0000000F // Unknown
+#define DTAPI_MOD_DTMB_BW_MSK 0x0000000F
+
+// Modulation parameters - DTMB - Code rate
+#define DTAPI_MOD_DTMB_0_4 0x00000100 // 0.4
+#define DTAPI_MOD_DTMB_0_6 0x00000200 // 0.6
+#define DTAPI_MOD_DTMB_0_8 0x00000300 // 0.8
+#define DTAPI_MOD_DTMB_RATE_AUTO 0x00000F00 // Auto detect
+#define DTAPI_MOD_DTMB_RATE_UNK 0x00000F00 // Unknown
+#define DTAPI_MOD_DTMB_RATE_MSK 0x00000F00 // Mask
+
+// Modulation parameters - DTMB - Constellation
+#define DTAPI_MOD_DTMB_QAM4NR 0x00001000 // 4-QAM-NR
+#define DTAPI_MOD_DTMB_QAM4 0x00002000 // 4-QAM
+#define DTAPI_MOD_DTMB_QAM16 0x00003000 // 16-QAM
+#define DTAPI_MOD_DTMB_QAM32 0x00004000 // 32-QAM
+#define DTAPI_MOD_DTMB_QAM64 0x00005000 // 64-QAM
+#define DTAPI_MOD_DTMB_CO_AUTO 0x0000F000 // Auto detect
+#define DTAPI_MOD_DTMB_CO_UNK 0x0000F000 // Unknown
+#define DTAPI_MOD_DTMB_CO_MSK 0x0000F000 // Mask
+
+// Modulation parameters - DTMB - Frame header mode
+#define DTAPI_MOD_DTMB_PN420 0x00010000 // PN420
+#define DTAPI_MOD_DTMB_PN595 0x00020000 // PN595
+#define DTAPI_MOD_DTMB_PN945 0x00030000 // PN945
+#define DTAPI_MOD_DTMB_PN_AUTO 0x000F0000 // Auto detect
+#define DTAPI_MOD_DTMB_PN_UNK 0x000F0000 // Unknown
+#define DTAPI_MOD_DTMB_PN_MSK 0x000F0000 // Mask
+
+// Modulation parameters - DTMB - Interleaver mode
+#define DTAPI_MOD_DTMB_IL_1 0x00100000 // Interleaver mode 1: B=54, M=240
+#define DTAPI_MOD_DTMB_IL_2 0x00200000 // Interleaver mode 2: B=54, M=720
+#define DTAPI_MOD_DTMB_IL_AUTO 0x00F00000 // Auto detect
+#define DTAPI_MOD_DTMB_IL_UNK 0x00F00000 // Unknown
+#define DTAPI_MOD_DTMB_IL_MSK 0x00F00000 // Mask
+
+// Modulation parameters - DTMB - pilots
+#define DTAPI_MOD_DTMB_NO_PILOTS 0x01000000 // No pilots
+#define DTAPI_MOD_DTMB_PILOTS 0x02000000 // Pilots, C=1 only
+#define DTAPI_MOD_DTMB_PIL_AUTO 0x0F000000 // Auto detect
+#define DTAPI_MOD_DTMB_PIL_UNK 0x0F000000 // Unknown
+#define DTAPI_MOD_DTMB_PIL_MSK 0x0F000000 // Mask
+
+// Modulation parameters - DTMB - Use frame numbering
+#define DTAPI_MOD_DTMB_NO_FRM_NO 0x10000000 // No frame numbering
+#define DTAPI_MOD_DTMB_USE_FRM_NO 0x20000000 // Use frame numbers
+#define DTAPI_MOD_DTMB_UFRM_AUTO 0xF0000000 // Auto detect
+#define DTAPI_MOD_DTMB_UFRM_UNK 0xF0000000 // Unknown
+#define DTAPI_MOD_DTMB_UFRM_MSK 0xF0000000 // Mask
+
+// Modulation parameters - DVB-S, DVB-S2
+#define DTAPI_MOD_1_2 0x0 // Code rate 1/2
+#define DTAPI_MOD_2_3 0x1 // Code rate 2/3
+#define DTAPI_MOD_3_4 0x2 // Code rate 3/4
+#define DTAPI_MOD_4_5 0x3 // Code rate 4/5
+#define DTAPI_MOD_5_6 0x4 // Code rate 5/6
+#define DTAPI_MOD_6_7 0x5 // Code rate 6/7
+#define DTAPI_MOD_7_8 0x6 // Code rate 7/8
+#define DTAPI_MOD_1_4 0x7 // Code rate 1/4
+#define DTAPI_MOD_1_3 0x8 // Code rate 1/3
+#define DTAPI_MOD_2_5 0x9 // Code rate 2/5
+#define DTAPI_MOD_3_5 0xA // Code rate 3/5
+#define DTAPI_MOD_8_9 0xB // Code rate 8/9
+#define DTAPI_MOD_9_10 0xC // Code rate 9/10
+#define DTAPI_MOD_CR_AUTO 0xF // Auto detect code rate
+#define DTAPI_MOD_CR_UNK 0xF // Unknown code rate
+//Coderates DVB-S2X specific
+#define DTAPI_MOD_1_5 0x10 // Code rate 1/5
+#define DTAPI_MOD_2_9 0x11 // Code rate 2/9
+#define DTAPI_MOD_11_45 0x12 // Code rate 11/45
+#define DTAPI_MOD_4_15 0x13 // Code rate 4/15
+#define DTAPI_MOD_13_45 0x14 // Code rate 13/45
+#define DTAPI_MOD_14_45 0x15 // Code rate 14/45
+#define DTAPI_MOD_9_20 0x16 // Code rate 9/20
+#define DTAPI_MOD_7_15 0x17 // Code rate 7/15
+#define DTAPI_MOD_8_15 0x18 // Code rate 8/15
+#define DTAPI_MOD_11_20 0x19 // Code rate 11/20
+#define DTAPI_MOD_5_9 0x1A // Code rate 5/9
+#define DTAPI_MOD_26_45 0x1B // Code rate 26/45
+#define DTAPI_MOD_28_45 0x1C // Code rate 28/45
+#define DTAPI_MOD_23_36 0x1D // Code rate 23/36
+#define DTAPI_MOD_29_45 0x1E // Code rate 29/45
+#define DTAPI_MOD_31_45 0x1F // Code rate 31/45
+#define DTAPI_MOD_25_36 0x20 // Code rate 25/36
+#define DTAPI_MOD_32_45 0x21 // Code rate 32/45
+#define DTAPI_MOD_13_18 0x22 // Code rate 13/18
+#define DTAPI_MOD_11_15 0x23 // Code rate 11/15
+#define DTAPI_MOD_7_9 0x24 // Code rate 7/9
+#define DTAPI_MOD_77_90 0x25 // Code rate 77/90
+
+// Modulation parameters - DVB-S, DVB-S2 - ParXtra1
+#define DTAPI_MOD_S_S2_SPECNONINV 0x00 // No spectrum inversion detected
+#define DTAPI_MOD_S_S2_SPECINV 0x10 // Spectrum inversion detected
+#define DTAPI_MOD_S_S2_SPECINV_AUTO 0x30 // Auto detect spectral inversion
+#define DTAPI_MOD_S_S2_SPECINV_UNK 0x30 // Spectral inversion is unknown
+#define DTAPI_MOD_S_S2_SPECINV_MSK 0x30 // Mask for spectrum inversion field
+
+// Modulation parameters - DVB-S2 - ParXtra1 - Pilots
+#define DTAPI_MOD_S2_NOPILOTS 0x00 // Pilots disabled
+#define DTAPI_MOD_S2_PILOTS 0x01 // Pilots enabled
+#define DTAPI_MOD_S2_PILOTS_AUTO 0x03 // Auto detect pilots
+#define DTAPI_MOD_S2_PILOTS_UNK 0x03 // State of pilots unknown
+#define DTAPI_MOD_S2_PILOTS_MSK 0x03 // Mask for pilots field
+
+// Modulation parameters - DVB-S2 - ParXtra1 - FEC frame length
+#define DTAPI_MOD_S2_LONGFRM 0x00 // Long FECFRAME
+#define DTAPI_MOD_S2_MEDIUMFRM 0x04 // Medium FECFRAME
+#define DTAPI_MOD_S2_SHORTFRM 0x08 // Short FECFRAME
+#define DTAPI_MOD_S2_FRM_AUTO 0x0C // Auto detect frame size
+#define DTAPI_MOD_S2_FRM_UNK 0x0C // Frame size unknown
+#define DTAPI_MOD_S2_FRM_MSK 0x0C // Mask for FECFRAME field
+
+// Modulation parameters - DVB-S2(X) - ParXtra1 - Constellation amplitude for 16-, 32-APSK
+#define DTAPI_MOD_S2_CONST_AUTO 0x00 // Default constellation amplitude
+#define DTAPI_MOD_S2_CONST_E_1 0x40 // E=1; Average symbol energy is constant
+#define DTAPI_MOD_S2_CONST_R_1 0x80 // R=1; Radius of outer ring is constant
+#define DTAPI_MOD_S2_CONST_MSK 0xC0 // Mask for constellation shape
+
+// Modulation parameters - DVB-T - Bandwidth
+#define DTAPI_MOD_DVBT_5MHZ 0x00000001
+#define DTAPI_MOD_DVBT_6MHZ 0x00000002
+#define DTAPI_MOD_DVBT_7MHZ 0x00000003
+#define DTAPI_MOD_DVBT_8MHZ 0x00000004
+#define DTAPI_MOD_DVBT_BW_UNK 0x0000000F // Unknown bandwidth
+#define DTAPI_MOD_DVBT_BW_MSK 0x0000000F
+
+// Modulation parameters - DVB-T - Constellation
+#define DTAPI_MOD_DVBT_QPSK 0x00000010
+#define DTAPI_MOD_DVBT_QAM16 0x00000020
+#define DTAPI_MOD_DVBT_QAM64 0x00000030
+#define DTAPI_MOD_DVBT_CO_AUTO 0x000000F0 // Auto detect constellation
+#define DTAPI_MOD_DVBT_CO_UNK 0x000000F0 // Unknown constellation
+#define DTAPI_MOD_DVBT_CO_MSK 0x000000F0
+
+// Modulation parameters - DVB-T - Guard interval
+#define DTAPI_MOD_DVBT_G_1_32 0x00000100
+#define DTAPI_MOD_DVBT_G_1_16 0x00000200
+#define DTAPI_MOD_DVBT_G_1_8 0x00000300
+#define DTAPI_MOD_DVBT_G_1_4 0x00000400
+#define DTAPI_MOD_DVBT_GU_AUTO 0x00000F00 // Auto detect guard interval
+#define DTAPI_MOD_DVBT_GU_UNK 0x00000F00 // Unknown guard interval
+#define DTAPI_MOD_DVBT_GU_MSK 0x00000F00
+
+// DVB-T TPS information - DVB-T Hierarchical layer
+#define DTAPI_MOD_DVBT_HARCHY_NONE 0x00000000
+#define DTAPI_MOD_DVBT_HARCHY_A1 0x01000000
+#define DTAPI_MOD_DVBT_HARCHY_A2 0x02000000
+#define DTAPI_MOD_DVBT_HARCHY_A4 0x03000000
+#define DTAPI_MOD_DVBT_HARCHY_MSK 0x0F000000
+// Modulation parameters - DVB-T - Interleaver mode
+#define DTAPI_MOD_DVBT_INDEPTH 0x00001000
+#define DTAPI_MOD_DVBT_NATIVE 0x00002000
+#define DTAPI_MOD_DVBT_IL_AUTO 0x0000F000 // Auto detect interleaver depth
+#define DTAPI_MOD_DVBT_IL_UNK 0x0000F000 // Unknown interleaver depth
+#define DTAPI_MOD_DVBT_IL_MSK 0x0000F000
+
+// Modulation parameters - DVB-T - FFT size
+#define DTAPI_MOD_DVBT_2K 0x00010000
+#define DTAPI_MOD_DVBT_4K 0x00020000
+#define DTAPI_MOD_DVBT_8K 0x00030000
+#define DTAPI_MOD_DVBT_MD_AUTO 0x000F0000 // Auto detect mode
+#define DTAPI_MOD_DVBT_MD_UNK 0x000F0000 // Unknown mode
+#define DTAPI_MOD_DVBT_MD_MSK 0x000F0000
+
+// Modulation parameters - DVB-T - s48
+#define DTAPI_MOD_DVBT_S48_OFF 0x00000000
+#define DTAPI_MOD_DVBT_S48 0x00100000
+#define DTAPI_MOD_DVBT_S48_MSK 0x00100000
+
+// Modulation parameters - DVB-T - s49
+#define DTAPI_MOD_DVBT_S49_OFF 0x00000000
+#define DTAPI_MOD_DVBT_S49 0x00200000
+#define DTAPI_MOD_DVBT_S49_MSK 0x00200000
+
+// Modulation parameters - DVB-T - s48s49
+#define DTAPI_MOD_DVBT_ENA4849 0x00000000
+#define DTAPI_MOD_DVBT_DIS4849 0x00400000
+#define DTAPI_MOD_DVBT_4849_MSK 0x00400000
+
+// Modulation parameters - IQ - ParXtra0
+#define DTAPI_MOD_INTERPOL_RAW 0 // Raw mode, no interpolation
+#define DTAPI_MOD_INTERPOL_OFDM 1 // Use OFDM interpolation
+#define DTAPI_MOD_INTERPOL_QAM 2 // Use QAM interpolation
+
+// Modulation parameters - IQ - ParXtra2 Packing
+#define DTAPI_MOD_IQPCK_AUTO 0x00000000 // Auto IQ-sample packin
+#define DTAPI_MOD_IQPCK_NONE 0x00000001 // No IQ-sample packing
+#define DTAPI_MOD_IQPCK_12B 0x00000002 // IQ-samples packed in 12-bit
+#define DTAPI_MOD_IQPCK_10B 0x00000003 // IQ-samples packed in 10-bit
+#define DTAPI_MOD_IQPCK_UNK 0x000000FF // Unknown (= use auto)
+#define DTAPI_MOD_IQPCK_MSK 0x000000FF
+
+// Modulation parameters - Roll-off factor - ParXtra1 (DVB-S2), ParXtra2 (IQ)
+#define DTAPI_MOD_ROLLOFF_AUTO 0x00000000 // Default roll-off factor
+#define DTAPI_MOD_ROLLOFF_NONE 0x00000100 // No roll-off
+#define DTAPI_MOD_ROLLOFF_5 0x00000200 // 5% roll-off for DVB-S2X
+#define DTAPI_MOD_ROLLOFF_10 0x00000300 // 10% roll-off for DVB-S2X
+#define DTAPI_MOD_ROLLOFF_15 0x00000400 // 15% roll-off for DVB-S2X
+#define DTAPI_MOD_ROLLOFF_20 0x00000500 // 20% roll-off for DVB-S2
+#define DTAPI_MOD_ROLLOFF_25 0x00000600 // 25% roll-off for DVB-S2
+#define DTAPI_MOD_ROLLOFF_35 0x00000700 // 35% roll-off for DVB-S/S2
+#define DTAPI_MOD_ROLLOFF_UNK 0x0000FF00 // Unknown (= use default)
+#define DTAPI_MOD_ROLLOFF_MSK 0x0000FF00
+
+// Modulation parameters - DVB-T2-MI - ParXtra0 used for T2-MI bitrate
+
+// Modulation parameters - DVB-T2-MI - ParXtra1
+#define DTAPI_MOD_T2MI_PID1_MSK 0x1FFF
+#define DTAPI_MOD_T2MI_PID1_SHFT 0
+#define DTAPI_MOD_T2MI_PID2_MSK 0x1FFF0000
+#define DTAPI_MOD_T2MI_PID2_SHFT 16
+#define DTAPI_MOD_T2MI_MULT_DIS 0x00000000 // Single Profile
+#define DTAPI_MOD_T2MI_MULT_ENA 0x20000000 // Multi Profile
+#define DTAPI_MOD_T2MI_MULT_MSK 0x20000000 // Multi Profile mask
+
+// Modulation parameters - QAM - ParXtra0 - J.83 Annex
+#define DTAPI_MOD_J83_MSK 0x000F
+#define DTAPI_MOD_J83_UNK 0x000F // Unknown annex
+#define DTAPI_MOD_J83_AUTO 0x000F // Auto detect annex
+#define DTAPI_MOD_J83_A 0x0002 // J.83 annex A (DVB-C)
+#define DTAPI_MOD_J83_B 0x0003 // J.83 annex B (\93American QAM\94)
+#define DTAPI_MOD_J83_C 0x0001 // J.83 annex C (\93Japanese QAM\94)
+
+// Modulation parameters - QAM - ParXtra1 - QAM-B interleaver mode
+#define DTAPI_MOD_QAMB_I128_J1D 0x1
+#define DTAPI_MOD_QAMB_I64_J2 0x3
+#define DTAPI_MOD_QAMB_I32_J4 0x5
+#define DTAPI_MOD_QAMB_I16_J8 0x7
+#define DTAPI_MOD_QAMB_I8_J16 0x9
+#define DTAPI_MOD_QAMB_I128_J1 0x0
+#define DTAPI_MOD_QAMB_I128_J2 0x2
+#define DTAPI_MOD_QAMB_I128_J3 0x4
+#define DTAPI_MOD_QAMB_I128_J4 0x6
+#define DTAPI_MOD_QAMB_I128_J5 0x8
+#define DTAPI_MOD_QAMB_I128_J6 0xA
+#define DTAPI_MOD_QAMB_I128_J7 0xC
+#define DTAPI_MOD_QAMB_I128_J8 0xE
+#define DTAPI_MOD_QAMB_IL_UNK 0xF // Unknown interleaver mode
+#define DTAPI_MOD_QAMB_IL_AUTO 0xF // Auto detect interleaver mode
+#define DTAPI_MOD_QAMB_IL_MSK 0xF
+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ SDI +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+
+// DtSdi - Table-of-content entry types
+#define DTAPI_SDI_TOC_ENTRY_UNKNOWN 0
+#define DTAPI_SDI_TOC_ENTRY_ACTVID 1
+#define DTAPI_SDI_TOC_ENTRY_HANC 2
+#define DTAPI_SDI_TOC_ENTRY_VANC 3
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtSdiTocEntry -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class DtSdiTocEntry
+{
+ friend class DtSdiUtility;
+
+public:
+ inline int AncDataBlockNum() const 
+ { 
+ if (AncType() != 1) return -1;
+ else return m_SdidOrDbn;
+ }
+ inline int AncDataId() const { return m_Did; }
+ inline int AncNumUserWords() const { return m_NumUserWords; }
+ inline int AncSecDataId() const
+ { 
+ if (AncType() != 2) return -1;
+ else return m_SdidOrDbn;
+ }
+ inline int AncType() const { return m_AncType; }
+
+ inline int Field() const { return m_Field; }
+ inline int Line() const { return m_Line; }
+ inline int NumSymbols() const { return m_NumSymbols; }
+ inline int StartOffset() const { return m_StartOffset; }
+ inline int TocType() const { return m_TocType; }
+
+ // Encapsulated data
+protected:
+ int m_TocType; // Type of TOC entry
+ int m_Line; // Line number where data is located
+ int m_Field; // Field in where data is located
+ int m_StartOffset; // Symbol offset relative to start of line, first data
+ int m_NumSymbols; // Number of symbols
+
+ // Following members are only valid if TOC type is DTAPI_SDI_TOC_ENTRY_HANC or 
+ // DTAPI_SDI_TOC_ENTRY_VANC
+ int m_AncType; // Ancillery data packet type (DTAPI_SDI_ANC_TYPE1 or
+ // DTAPI_SDI_ANC_TYPE2)
+ int m_Did; // Ancillary packet data ID
+ int m_SdidOrDbn; // Ancillary packet data block number (type 1 packet)
+ // or secondary data ID (type 2 packet)
+ int m_NumUserWords; // Number of ancillary data packet user words
+
+ // Constructor, destructor
+public:
+ DtSdiTocEntry() : m_TocType(DTAPI_SDI_TOC_ENTRY_UNKNOWN), m_Line(0), m_Field(0),
+ m_StartOffset(0), m_NumSymbols(0) {}
+ virtual ~DtSdiTocEntry() {};
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtSdi -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// The DtSdi class provides helper functions for processing SDI data
+// 
+class DtSdi
+{
+ friend class DtSdiUtility;
+
+public:
+ DtSdi();
+ virtual ~DtSdi();
+
+public:
+ DTAPI_RESULT ConvertFrame(unsigned int* pInFrame, int& InFrameSize,
+ int InFrameFormat, unsigned int* pOutFrame, int& OutFrameSize, int OutFrameFormat);
+ DTAPI_RESULT CreateBlackFrame(unsigned int* pFrame, int& FrameSize, int FrameFormat);
+ DTAPI_RESULT GetActiveVideo(const DtSdiTocEntry& TocEntry,
+ unsigned short* pVideo, int& NumSamples);
+ DTAPI_RESULT GetActiveVideo(unsigned short* pVideo, int& NumSamples,
+ int Field, int Stride=-1);
+ DTAPI_RESULT GetAncillaryData(const DtSdiTocEntry& TocEntry,
+ unsigned short* pData, int& NumSamples);
+ DTAPI_RESULT GetAudio(int AudioGroup, int& Channel,
+ unsigned short* pAudio, int& NumSamples);
+ DTAPI_RESULT GetTableOfContents(const DtSdiTocEntry** ppToc, int& NumTocEntries);
+ DTAPI_RESULT ParseFrame(const unsigned int* pFrame, int FrameSize, int FrameFormat,
+ int ParseFlags, const DtSdiTocEntry** ppToc, int& NumTocEntries); 
+
+protected:
+ DtSdiUtility* m_pSdiUtil; // Internal utility class
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtSdi constants -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+
+// Ancillary data packet types
+#define DTAPI_SDI_ANC_TYPE1 1 // Type 1 packet
+#define DTAPI_SDI_ANC_TYPE2 2 // Type 2 packet
+
+// Parse flags
+#define DTAPI_SDI_PARSE_ACTVID 0x0001 // Parse active video
+#define DTAPI_SDI_PARSE_HBLANK 0x0002 // Parse horizontal blanking
+#define DTAPI_SDI_PARSE_VBLANK 0x0004 // Parse vertical blanking
+
+#define DTAPI_SDI_PARSE_BLANK (DTAPI_SDI_PARSE_HBLANK | DTAPI_SDI_PARSE_VBLANK)
+#define DTAPI_SDI_PARSE_ALL (DTAPI_SDI_PARSE_ACTVID | DTAPI_SDI_PARSE_BLANK)
+
+// Field flags
+#define DTAPI_SDI_FIELD1 1
+#define DTAPI_SDI_FIELD2 2
+
+// Audio groups
+#define DTAPI_SDI_AUDIO_GROUP1 0x2FF
+#define DTAPI_SDI_AUDIO_GROUP2 0x1FD
+#define DTAPI_SDI_AUDIO_GROUP3 0x1FB
+#define DTAPI_SDI_AUDIO_GROUP4 0x2F9
+
+#define DTAPI_SDI_AUDIO_CHAN1 0x01
+#define DTAPI_SDI_AUDIO_CHAN2 0x02
+#define DTAPI_SDI_AUDIO_CHAN3 0x04
+#define DTAPI_SDI_AUDIO_CHAN4 0x08
+
+#define DTAPI_SDI_AUDIO_CH_PAIR1 (DTAPI_SDI_AUDIO_CHAN1 | DTAPI_SDI_AUDIO_CHAN2)
+#define DTAPI_SDI_AUDIO_CH_PAIR2 (DTAPI_SDI_AUDIO_CHAN3 | DTAPI_SDI_AUDIO_CHAN4)
+#define DTAPI_SDI_AUDIO_CH_MASK (DTAPI_SDI_AUDIO_CH_PAIR1 | DTAPI_SDI_AUDIO_CH_PAIR2)
+
+// Conversions format
+#define DTAPI_SDI_FULL 0x001
+#define DTAPI_SDI_ACTVID 0x002
+#define DTAPI_SDI_HUFFMAN 0x004
+#define DTAPI_SDI_625 0x008
+#define DTAPI_SDI_525 0x010
+#define DTAPI_SDI_8B 0x020
+#define DTAPI_SDI_10B 0x040
+#define DTAPI_SDI_16B 0x080
+#define DTAPI_SDI_10B_NBO 0x100 // 10-bit packed in network-byte-order
+
+#define DTAPI_SDI_BIT_MASK 0x1E0
+
+// Video standards
+#define DTAPI_VIDSTD_UNKNOWN -1
+#define DTAPI_VIDSTD_525I59_94 DTAPI_IOCONFIG_525I59_94
+#define DTAPI_VIDSTD_625I50 DTAPI_IOCONFIG_625I50
+#define DTAPI_VIDSTD_720P23_98 DTAPI_IOCONFIG_720P23_98
+#define DTAPI_VIDSTD_720P24 DTAPI_IOCONFIG_720P24
+#define DTAPI_VIDSTD_720P25 DTAPI_IOCONFIG_720P25
+#define DTAPI_VIDSTD_720P29_97 DTAPI_IOCONFIG_720P29_97
+#define DTAPI_VIDSTD_720P30 DTAPI_IOCONFIG_720P30
+#define DTAPI_VIDSTD_720P50 DTAPI_IOCONFIG_720P50
+#define DTAPI_VIDSTD_720P59_94 DTAPI_IOCONFIG_720P59_94
+#define DTAPI_VIDSTD_720P60 DTAPI_IOCONFIG_720P60
+#define DTAPI_VIDSTD_1080P23_98 DTAPI_IOCONFIG_1080P23_98
+#define DTAPI_VIDSTD_1080P24 DTAPI_IOCONFIG_1080P24
+#define DTAPI_VIDSTD_1080P25 DTAPI_IOCONFIG_1080P25
+#define DTAPI_VIDSTD_1080P30 DTAPI_IOCONFIG_1080P30
+#define DTAPI_VIDSTD_1080P29_97 DTAPI_IOCONFIG_1080P29_97
+#define DTAPI_VIDSTD_1080I50 DTAPI_IOCONFIG_1080I50
+#define DTAPI_VIDSTD_1080I59_94 DTAPI_IOCONFIG_1080I59_94
+#define DTAPI_VIDSTD_1080I60 DTAPI_IOCONFIG_1080I60
+#define DTAPI_VIDSTD_1080P50 DTAPI_IOCONFIG_1080P50
+#define DTAPI_VIDSTD_1080P59_94 DTAPI_IOCONFIG_1080P59_94
+#define DTAPI_VIDSTD_1080P60 DTAPI_IOCONFIG_1080P60
+
+// Audio standard
+#define DTAPI_SDI_AUDIO_SMPTE272A 1 // SMPTE-272 Level A, 48kHz, 20-bit audio
+
+// Audio formats
+#define DTAPI_SDI_AUDIO_PCM16 0
+#define DTAPI_SDI_AUDIO_PCM24 1
+#define DTAPI_SDI_AUDIO_PCM32 2
+
+// HANC/VANC/Video selection (can be OR-ed)
+//#define DTAPI_SDI_ACTVID 0x01
+#define DTAPI_SDI_HANC 0x02
+#define DTAPI_SDI_VANC 0x04
+#define DTAPI_SDI_ANC_MASK (DTAPI_SDI_HANC | DTAPI_SDI_VANC)
+ 
+// Chrominace/luminance stream selection (can be OR-ed)
+#define DTAPI_SDI_CHROM 0x01
+#define DTAPI_SDI_LUM 0x02
+#define DTAPI_SDI_STREAM_MASK (DTAPI_SDI_CHROM | DTAPI_SDI_LUM)
+
+// Anc-data operation mode
+#define DTAPI_ANC_MARK 0x0001
+#define DTAPI_ANC_DELETE 0x0002
+
+// Scalling factor
+#define DTAPI_SCALING_OFF 1
+#define DTAPI_SCALING_1_4 2
+#define DTAPI_SCALING_1_16 3
+
+// Symbol filter mode
+#define DTAPI_SYMFLT_ALL 0 // YCbCr sample (CbYCrY order)
+#define DTAPI_SYMFLT_LUM 1 // Luminance only (Y) 
+#define DTAPI_SYMFLT_CHROM 2 // Chrominance only (CbCr)
+#define DTAPI_SYMFLT_SWAP 3 // Swap order of lum and chrom (i.e. YCbYCr)
+#define DTAPI_SYMFLT_RGB 4 // Convert to/from RGB
+
+// Ancillary filter mode
+#define DTAPI_ANCFLT_OFF 0
+#define DTAPI_ANCFLT_HANC_ALL 1
+#define DTAPI_ANCFLT_HANC_MIN 2
+#define DTAPI_ANCFLT_VANC_ALL 3
+#define DTAPI_ANCFLT_VANC_MIN 4
+
+// Receive mode hints for USB3 devices
+#define DTAPI_RXMODE_FRAMEBUFFER 0x10000
+#define DTAPI_RXMODE_ANC (DTAPI_RXMODE_FRAMEBUFFER | 1)
+#define DTAPI_RXMODE_RAW (DTAPI_RXMODE_FRAMEBUFFER | 2)
+#define DTAPI_RXMODE_FULL (DTAPI_RXMODE_FRAMEBUFFER | 3)
+#define DTAPI_RXMODE_FULL8 (DTAPI_RXMODE_FRAMEBUFFER | 4)
+#define DTAPI_RXMODE_FULL8_SCALED4 (DTAPI_RXMODE_FRAMEBUFFER | 5)
+#define DTAPI_RXMODE_FULL8_SCALED16 (DTAPI_RXMODE_FRAMEBUFFER | 6)
+#define DTAPI_RXMODE_VIDEO (DTAPI_RXMODE_FRAMEBUFFER | 7)
+#define DTAPI_RXMODE_VIDEO8 (DTAPI_RXMODE_FRAMEBUFFER | 8)
+#define DTAPI_RXMODE_VIDEO8_SCALED4 (DTAPI_RXMODE_FRAMEBUFFER | 9)
+#define DTAPI_RXMODE_VIDEO8_SCALED16 (DTAPI_RXMODE_FRAMEBUFFER | 10)
+#define DTAPI_RXMODE_RAW8 (DTAPI_RXMODE_FRAMEBUFFER | 15)
+#define DTAPI_RXMODE_FRMBUF_MASK 0x0F
+
+//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ HD-SDI CLASSES +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- AncPacket -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class AncPacket
+{
+public:
+ AncPacket();
+ AncPacket(const AncPacket& s);
+ virtual ~AncPacket();
+
+public:
+ int m_Did; // Data identifier
+ int m_SdidOrDbn; // Secondary data identifier / Data block number
+ int m_Dc; // Data count
+ int m_Cs; // Check sum
+ unsigned short* m_pUdw; // User data words
+
+ // Operations
+public:
+ void Create(unsigned short* pUserWords, int NumWords);
+ void Create(int NumWords=256);
+ void Destroy();
+ int Type() const { return (m_Did & 0x80)==0 ? 2 : 1; }
+ int Size() const { return m_Size; }
+
+ void operator = (const AncPacket& s);
+
+private:
+ int m_Size; // Size of user data buffer (in # of words)
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameBufTrPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class DtFrameBufTrPars
+{
+public:
+ enum ParsType { PT_VIDEO, PT_ANC, PT_RAW };
+
+protected:
+ DtFrameBufTrPars(ParsType Type);
+public:
+ virtual ~DtFrameBufTrPars();
+
+ // Operations
+public:
+ DTAPI_RESULT SetCommon(__int64 Frame, unsigned char* pBuf, int BufSize, 
+ int DataFormat, int StartLine=1, int NumLines=-1);
+
+ ParsType GetType() const { return m_Type; } 
+
+public:
+ __int64 m_Frame; // Frame to transfer
+ unsigned char* m_pBuf; // Transfer buffer
+ int m_BufSize; // [in] size of buffer / [out] actual #bytes transferred
+ int m_StartLine; // [in] 1st line to transfer / [out] actual first line
+ int m_NumLines; // [in] #lines to transfer / [out] actual #lines
+ int m_DataFormat; // Format of data (8-, 10-, 16-bit) 
+
+private:
+ ParsType m_Type; // Parameter type
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameBufTrParsVideo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class DtFrameBufTrParsVideo : public DtFrameBufTrPars
+{
+public:
+ DtFrameBufTrParsVideo(int Field, int Scaling=DTAPI_SCALING_OFF, int Stride=-1,
+ int SymFlt=DTAPI_SYMFLT_ALL);
+ virtual ~DtFrameBufTrParsVideo();
+ 
+public:
+ int m_Field; // Field to transfer
+ int m_Scaling; // Scaling mode
+ int m_Stride; // -1 means no stride
+ int m_SymFlt; // Symbol filter mode
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameBufTrParsAnc -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+class DtFrameBufTrParsAnc : public DtFrameBufTrPars
+{
+public:
+ DtFrameBufTrParsAnc(int HancVanc, int AncFlt=DTAPI_ANCFLT_OFF);
+ virtual ~DtFrameBufTrParsAnc();
+
+public:
+ int m_HancVanc; // HANC or VANC
+ int m_AncFlt; // Anc filter mode
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameBufTrParsRaw -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+class DtFrameBufTrParsRaw : public DtFrameBufTrPars
+{
+public:
+ DtFrameBufTrParsRaw(int SymFlt=DTAPI_SYMFLT_ALL);
+ virtual ~DtFrameBufTrParsRaw();
+
+public:
+ int m_SymFlt; // Symbol filter mode
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameBuffer -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class to represent an frame buffer
+//
+class DtFrameBuffer
+{
+public:
+ DtFrameBuffer();
+ virtual ~DtFrameBuffer();
+private:
+ // No implementation is provided for the copy constructor
+ DtFrameBuffer(const DtFrameBuffer&);
+
+public:
+ virtual DTAPI_RESULT AncAddAudio(__int64 Frame, unsigned char* pBuf,
+ int& BufSize, int Format, int Channels, int AudioGroup);
+ virtual DTAPI_RESULT AncAddAudioStatusWord(__int64 Frame, unsigned char Status[24],
+ int Channels, int AudioGroup);
+ virtual DTAPI_RESULT AncAddPacket(__int64 Frame, AncPacket& AncPacket,
+ int Line, int HancVanc, int Stream);
+ virtual DTAPI_RESULT AncClear(__int64 Frame, int HancVanc, int Stream);
+ virtual DTAPI_RESULT AncCommit(__int64 Frame);
+ virtual DTAPI_RESULT AncDelAudio(__int64 Frame, int AudioGroup, int Mode);
+ virtual DTAPI_RESULT AncDelPacket(__int64 Frame, int DID, int SDID, int StartLine,
+ int NumLines, int HancVanc, int Stream, int Mode);
+ virtual DTAPI_RESULT AncGetAudio(__int64 Frame, unsigned char* pBuf, 
+ int& BufSize, int DataFormat, int& Channels, int AudioGroup);
+ virtual DTAPI_RESULT AncGetPacket(__int64 Frame, int DID, int SDID, 
+ AncPacket*, int& NumPackets, int HancVanc, int Stream);
+ virtual DTAPI_RESULT AncReadRaw(__int64 Frame, unsigned char* pBuf,
+ int& BufSize, int DataFormat, int StartLine,
+ int NumLines, int HancVanc, bool EnableAncFilter = false);
+ virtual DTAPI_RESULT AncReadRaw(DtFrameBufTrParsAnc& TP);
+ virtual DTAPI_RESULT AncWriteRaw(__int64 Frame, unsigned char* pBuf, 
+ int& BufSize, int Format, int StartLine, 
+ int NumLines, int HancVanc, bool EnableAncFilter = false);
+ virtual DTAPI_RESULT AncWriteRaw(DtFrameBufTrParsAnc& TP);
+ virtual DTAPI_RESULT AttachToInput(DtDevice*, int Port);
+ virtual DTAPI_RESULT AttachToOutput(DtDevice*, int Port, int Delay);
+ virtual DTAPI_RESULT ClearFlags(int Latched);
+ virtual DTAPI_RESULT Detach();
+ virtual DTAPI_RESULT DetectIoStd(int& Value, int& SubValue);
+ virtual DTAPI_RESULT GetBufferInfo(DtBufferInfo&);
+ virtual DTAPI_RESULT GetCurFrame(__int64& CurFrame);
+ virtual DTAPI_RESULT GetFlags(int& Flags, int& Latched);
+ virtual DTAPI_RESULT GetFrameInfo(__int64 Frame, DtFrameInfo&);
+ virtual DTAPI_RESULT GetStatistics(int Count, DtStatistic* pStatistics);
+ virtual DTAPI_RESULT GetStatistic(int Type, int& Statistic);
+ virtual DTAPI_RESULT ReadSdiLines(__int64 Frame, unsigned char* pBuf, 
+ int& BufSize, int DataFormat, int StartLine, int& NumLines);
+ virtual DTAPI_RESULT ReadSdiLines(DtFrameBufTrParsRaw& TP);
+ virtual DTAPI_RESULT ReadSdiLines(__int64 Frame, unsigned char* pBuf, 
+ int& BufSize, int DataFormat);
+ virtual DTAPI_RESULT ReadVideo(__int64 Frame, unsigned char* pBuf,
+ int& BufSize, int Field, int FullOrScaled,
+ int DataFormat, int StartLine, int& NumLines);
+ virtual DTAPI_RESULT ReadVideo(DtFrameBufTrParsVideo& TP);
+ virtual DTAPI_RESULT SetRxMode(int RxMode, __int64& FirstFrame);
+ virtual DTAPI_RESULT Start(bool Start=true);
+ virtual DTAPI_RESULT SetIoConfig(int Group, int Value, int SubValue = -1,
+ __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
+ virtual DTAPI_RESULT WaitFrame(__int64& LastFrame);
+ virtual DTAPI_RESULT WaitFrame(__int64& FirstFrame, __int64& LastFrame);
+ virtual DTAPI_RESULT WriteSdiLines(__int64 Frame, unsigned char* pBuf, 
+ int& BufSize, int DataFormat);
+ virtual DTAPI_RESULT WriteSdiLines(__int64 Frame, unsigned char* pBuf, 
+ int& BufSize, int DataFormat, int StartLine, int& NumLines);
+ virtual DTAPI_RESULT WriteSdiLines(DtFrameBufTrParsRaw& TP);
+ virtual DTAPI_RESULT WriteVideo(__int64 Frame, unsigned char* pBuf, int& BufSize,
+ int Field, int DataFormat, int StartLine, int& NumLines);
+ virtual DTAPI_RESULT WriteVideo(DtFrameBufTrParsVideo& TP);
+
+protected:
+ FrameBufImpl* m_pImpl; // Implementation class
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtSdiMatrix -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+class DtSdiMatrix
+{
+public:
+ DtSdiMatrix();
+ virtual ~DtSdiMatrix();
+private:
+ // No implementation is provided for the copy constructor
+ DtSdiMatrix(const DtSdiMatrix&);
+
+public:
+ virtual DTAPI_RESULT Attach(DtDevice* pDvc, int& MaxNumRows);
+ virtual DTAPI_RESULT Detach();
+ virtual DTAPI_RESULT GetMatrixInfo(DtMatrixInfo& Info);
+ virtual DtFrameBuffer& Row(int n);
+ virtual DTAPI_RESULT Start(bool Start=true);
+ virtual DTAPI_RESULT SetIoConfig(int Group, int Value, int SubValue = -1,
+ __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
+ virtual DTAPI_RESULT WaitFrame(__int64& LastFrame);
+ virtual DTAPI_RESULT WaitFrame(__int64& FirstFrame, __int64& LastFrame);
+ 
+private:
+ SdiMatrixImpl* m_pImpl; // Implementation class
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Global DTAPI Functions -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+
+DTAPI_RESULT DtapiCheckDeviceDriverVersion(void);
+DTAPI_RESULT DtapiCheckDeviceDriverVersion(int DeviceCategory);
+DTAPI_RESULT DtapiDeviceScan(int NumEntries, int& NumEntriesResult,
+ DtDeviceDesc* DvcDescArr, bool InclDteDvcs=false,
+ int ScanOrder=DTAPI_SCANORDER_ORIG);
+DTAPI_RESULT DtapiDtaPlusDeviceScan(int NumEntries, int& NumEntriesResult,
+ DtDtaPlusDeviceDesc* DvcDescArr);
+DTAPI_RESULT DtapiDtDeviceDesc2String(DtDeviceDesc* pDvcDesc, int StringType, 
+ char* pString, int StringLength);
+DTAPI_RESULT DtapiDtDeviceDesc2String(DtDeviceDesc* pDvcDesc, int StringType, 
+ wchar_t* pString, int StringLength);
+DTAPI_RESULT DtapiDtHwFuncDesc2String(DtHwFuncDesc* pHwFunc, int StringType, 
+ char* pString, int StringLength);
+DTAPI_RESULT DtapiDtHwFuncDesc2String(DtHwFuncDesc* pHwFunc, int StringType, 
+ wchar_t* pString, int StringLength);
+DTAPI_RESULT DtapiGetDeviceDriverVersion(int, int&, int&, int&, int&);
+DTAPI_RESULT DtapiGetDtapiServiceVersion(int&, int&, int&, int&);
+DTAPI_RESULT DtapiGetVersion(int& Maj, int& Min, int& BugFix, int& Build);
+DTAPI_RESULT DtapiHwFuncScan(int NumEntries, int& NumEntriesResult,
+ DtHwFuncDesc* pHwFuncs, bool InclDteDvcs=false,
+ int ScanOrder=DTAPI_SCANORDER_ORIG);
+DTAPI_RESULT DtapiPower2Voltage(int dBm, int& dBmV, bool Is50Ohm=false);
+const char* DtapiResult2Str(DTAPI_RESULT DtapiResult);
+DTAPI_RESULT DtapiVoltage2Power(int dBmV, int& dBm, bool Is50Ohm=false);
+
+// Callbacks
+DTAPI_RESULT DtapiRegisterCallback(pDtEventCallback Callback, void* pContext,
+ int EventTypes, void** pId = NULL);
+DTAPI_RESULT DtapiUnregisterCallback(void* pId);
+
+// IP address conversion
+DTAPI_RESULT DtapiInitDtIpParsFromIpString(DtIpPars& IpPars,
+ const char* pDstIp, const char* pSrcIp);
+DTAPI_RESULT DtapiInitDtIpParsFromIpString(DtIpPars& IpPars,
+ const wchar_t* pDstIp, const wchar_t* pSrcIp);
+DTAPI_RESULT DtapiIpAddr2ByteArray(const char* pIpStr, unsigned char* pIpByte,
+ int& Flags);
+DTAPI_RESULT DtapiIpAddr2ByteArray(const wchar_t* pIpStr, 
+ unsigned char* pIpByte, int& Flags);
+DTAPI_RESULT DtapiIpAddr2Str(char* pStr, int Len, unsigned char* pIpAddr);
+DTAPI_RESULT DtapiIpAddr2Str(wchar_t* pStr, int Len, unsigned char* pIpAddr);
+DTAPI_RESULT DtapiStr2IpAddr(unsigned char* pIpAddr, const char* pStr);
+DTAPI_RESULT DtapiStr2IpAddr(unsigned char* pIpAddr, const wchar_t* pStr);
+
+// Legacy
+#define DtapiInitDtTsIpParsFromIpString DtapiInitDtIpParsFromIpString
+
+// Modulator functions
+DTAPI_RESULT DtapiModPars2Bandwidth(int& ModBandwidth, int& TotalBandwidth,
+ int ModType, int ParXtra0, int ParXtra1, int ParXtra2,
+ void* pXtraPars, int SymRate);
+DTAPI_RESULT DtapiModPars2SymRate(int& SymRate, int ModType, int ParXtra0,
+ int ParXtra1, int ParXtra2, int TsRate);
+DTAPI_RESULT DtapiModPars2SymRate(int& SymRate, int ModType, int ParXtra0,
+ int ParXtra1, int ParXtra2, void* pXtraPars, int TsRate);
+DTAPI_RESULT DtapiModPars2TsRate(int& TsRate, int ModType, int ParXtra0,
+ int ParXtra1, int ParXtra2, int SymRate = -1);
+DTAPI_RESULT DtapiModPars2TsRate(int& TsRate, DtDvbC2Pars&, int PlpIdx = 0);
+DTAPI_RESULT DtapiModPars2TsRate(int& TsRate, DtDvbS2Pars&, int PlpIdx = 0);
+DTAPI_RESULT DtapiModPars2TsRate(int& TsRate, DtDvbT2Pars&, int PlpIdx = 0);
+DTAPI_RESULT DtapiModPars2TsRate(int& TsRate, DtIsdbTmmPars&, int TsIdx = 0);
+DTAPI_RESULT DtapiModPars2TsRate(int& TsRate, int ModType, int ParXtra0,
+ int ParXtra1, int ParXtra2, void* pXtraPars, int SymRate);
+
+// HD-SDI functions
+DTAPI_RESULT DtapiGetRequiredUsbBandwidth(int VidStd, int RxMode, long long& Bandwidth);
+DTAPI_RESULT DtapiGetVidStdInfo(int VidStd, DtVidStdInfo& Info);
+DTAPI_RESULT DtapiIoStd2VidStd(int Value, int SubValue, int& VidStd);
+DTAPI_RESULT DtapiVidStd2IoStd(int VidStd, int& Value, int& SubValue);
+const char* DtapiVidStd2Str(int VidStd);
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Return Codes -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// NOTE: ERROR CODES 0x1100-0x12FF ARE RESERVED FOR USE IN THE DTAPIplus
+//
+#define DTAPI_OK 0
+#define DTAPI_OK_FAILSAFE 1
+#define DTAPI_E 0x1000
+#define DTAPI_E_ATTACHED (DTAPI_E + 0)
+#define DTAPI_E_BUF_TOO_SMALL (DTAPI_E + 1)
+#define DTAPI_E_DEV_DRIVER (DTAPI_E + 2)
+#define DTAPI_E_EEPROM_FULL (DTAPI_E + 3)
+#define DTAPI_E_EEPROM_READ (DTAPI_E + 4)
+#define DTAPI_E_EEPROM_WRITE (DTAPI_E + 5)
+#define DTAPI_E_EEPROM_FORMAT (DTAPI_E + 6)
+#define DTAPI_E_FIFO_FULL (DTAPI_E + 7)
+#define DTAPI_E_IN_USE (DTAPI_E + 8)
+#define DTAPI_E_INVALID_BUF (DTAPI_E + 9)
+#define DTAPI_E_INVALID_FLAGS (DTAPI_E + 11)
+#define DTAPI_E_INVALID_MODE (DTAPI_E + 12)
+#define DTAPI_E_INVALID_RATE (DTAPI_E + 13)
+#define DTAPI_E_INVALID_SIZE (DTAPI_E + 14)
+#define DTAPI_E_KEYWORD (DTAPI_E + 15)
+#define DTAPI_E_NO_DEVICE (DTAPI_E + 16)
+#define DTAPI_E_NO_LOOPBACK (DTAPI_E + 17)
+#define DTAPI_E_NO_SUCH_DEVICE (DTAPI_E + 18)
+#define DTAPI_E_NO_SUCH_OUTPUT (DTAPI_E + 19)
+#define DTAPI_E_NO_DT_OUTPUT (DTAPI_E + 20)
+#define DTAPI_E_NO_TS_OUTPUT (DTAPI_E + 20)
+#define DTAPI_E_NOT_ATTACHED (DTAPI_E + 21)
+#define DTAPI_E_NOT_FOUND (DTAPI_E + 22)
+#define DTAPI_E_NOT_SUPPORTED (DTAPI_E + 23)
+#define DTAPI_E_DEVICE (DTAPI_E + 24)
+#define DTAPI_E_TOO_LONG (DTAPI_E + 25)
+#define DTAPI_E_UNDERFLOW (DTAPI_E + 26)
+#define DTAPI_E_NO_SUCH_INPUT (DTAPI_E + 27)
+#define DTAPI_E_NO_DT_INPUT (DTAPI_E + 28)
+#define DTAPI_E_NO_TS_INPUT (DTAPI_E + 28)
+#define DTAPI_E_DRIVER_INCOMP (DTAPI_E + 29)
+#define DTAPI_E_INTERNAL (DTAPI_E + 30)
+#define DTAPI_E_OUT_OF_MEM (DTAPI_E + 31)
+#define DTAPI_E_INVALID_J83ANNEX (DTAPI_E + 32)
+#define DTAPI_E_IDLE (DTAPI_E + 33)
+#define DTAPI_E_INSUF_LOAD (DTAPI_E + 34)
+#define DTAPI_E_INVALID_BANDWIDTH (DTAPI_E + 35)
+#define DTAPI_E_INVALID_CONSTEL (DTAPI_E + 36)
+#define DTAPI_E_INVALID_GUARD (DTAPI_E + 37)
+#define DTAPI_E_INVALID_INTERLVNG (DTAPI_E + 38)
+#define DTAPI_E_INVALID_TRANSMODE (DTAPI_E + 39)
+#define DTAPI_E_INVALID_TSTYPE (DTAPI_E + 40)
+#define DTAPI_E_NO_IPPARS (DTAPI_E + 41)
+#define DTAPI_E_NO_TSRATE (DTAPI_E + 42)
+#define DTAPI_E_NOT_IDLE (DTAPI_E + 43)
+#define DTAPI_E_INVALID_ARG (DTAPI_E + 44)
+#define DTAPI_E_NW_DRIVER (DTAPI_E + 45)
+#define DTAPI_E_DST_MAC_ADDR (DTAPI_E + 46)
+#define DTAPI_E_NO_SUCH_PORT (DTAPI_E + 47)
+#define DTAPI_E_WINSOCK (DTAPI_E + 48)
+#define DTAPI_E_MULTICASTJOIN (DTAPI_E + 49)
+#define DTAPI_E_EMBEDDED (DTAPI_E + 50)
+#define DTAPI_E_LOCKED (DTAPI_E + 51)
+#define DTAPI_E_NO_VALID_CALDATA (DTAPI_E + 52)
+#define DTAPI_E_NO_LINK (DTAPI_E + 53)
+#define DTAPI_E_INVALID_HEADER (DTAPI_E + 54)
+#define DTAPI_E_INVALID_PARS (DTAPI_E + 55)
+#define DTAPI_E_NOT_SDI_MODE (DTAPI_E + 56)
+#define DTAPI_E_INCOMP_FRAME (DTAPI_E + 57)
+#define DTAPI_E_UNSUP_CONV (DTAPI_E + 58)
+#define DTAPI_E_OUTBUF_TOO_SMALL (DTAPI_E + 59)
+#define DTAPI_E_CONFIG (DTAPI_E + 60)
+#define DTAPI_E_TIMEOUT (DTAPI_E + 61)
+#define DTAPI_E_INVALID_TIMEOUT (DTAPI_E + 62)
+#define DTAPI_E_INVALID_FHMODE (DTAPI_E + 63)
+#define DTAPI_E_INVALID_PILOTS (DTAPI_E + 64)
+#define DTAPI_E_INVALID_USEFRAMENO (DTAPI_E + 65)
+#define DTAPI_E_SYMRATE_REQD (DTAPI_E + 66)
+#define DTAPI_E_NO_SYMRATE (DTAPI_E + 67)
+#define DTAPI_E_INVALID_NUMSEGM (DTAPI_E + 68)
+#define DTAPI_E_INVALID_NUMTAPS (DTAPI_E + 69)
+#define DTAPI_E_COMMUNICATION (DTAPI_E + 70)
+#define DTAPI_E_BIND (DTAPI_E + 71)
+#define DTAPI_E_FRAME_INTERVAL (DTAPI_E + 72)
+#define DTAPI_E_INVALID_BWT_EXT (DTAPI_E + 73)
+#define DTAPI_E_INVALID_FFTMODE (DTAPI_E + 74)
+#define DTAPI_E_INVALID_NUMDTSYM (DTAPI_E + 75)
+#define DTAPI_E_INVALID_NUMT2FRM (DTAPI_E + 76)
+#define DTAPI_E_INVALID_SUBCH (DTAPI_E + 77)
+#define DTAPI_E_INVALID_TIME_IL (DTAPI_E + 78)
+#define DTAPI_E_NUM_PLP (DTAPI_E + 79)
+#define DTAPI_E_PLP_NUMBLOCKS (DTAPI_E + 80)
+#define DTAPI_E_NUMPLPS_MUSTBE_1 (DTAPI_E + 81)
+#define DTAPI_E_INBAND (DTAPI_E + 82)
+#define DTAPI_E_ISSY (DTAPI_E + 83)
+#define DTAPI_E_OTHER_PLP_IN_BAND (DTAPI_E + 84)
+#define DTAPI_E_CM_NUMPATHS (DTAPI_E + 85)
+#define DTAPI_E_PILOT_PATTERN (DTAPI_E + 86)
+#define DTAPI_E_SUBSLICES (DTAPI_E + 87)
+#define DTAPI_E_NO_GENREF (DTAPI_E + 88)
+#define DTAPI_E_TI_MEM_OVF (DTAPI_E + 89)
+#define DTAPI_E_FEF (DTAPI_E + 90)
+#define DTAPI_E_UNSUP_FORMAT (DTAPI_E + 91)
+#define DTAPI_E_OUT_OF_SYNC (DTAPI_E + 92)
+#define DTAPI_E_NO_FRAME (DTAPI_E + 93)
+#define DTAPI_E_NO_SUCH_DATA (DTAPI_E + 94)
+#define DTAPI_E_INVALID_TYPE (DTAPI_E + 95)
+#define DTAPI_E_INVALID_MODPARS (DTAPI_E + 96)
+#define DTAPI_E_BIAS_BAL_CELLS (DTAPI_E + 97)
+#define DTAPI_E_COMMON_PLP_COUNT (DTAPI_E + 98)
+#define DTAPI_E_PLP_ID (DTAPI_E + 99)
+#define DTAPI_E_BUFS (DTAPI_E + 100)
+#define DTAPI_E_FIXED_CELL_PARS (DTAPI_E + 101)
+#define DTAPI_E_CM_CHANNEL (DTAPI_E + 102)
+#define DTAPI_E_INVALID_FIFO_IDX (DTAPI_E + 103)
+#define DTAPI_E_INVALID_INP_TYPE (DTAPI_E + 104)
+#define DTAPI_E_INVALID_OUTP_TYPE (DTAPI_E + 105)
+#define DTAPI_E_INVALID_START_FREQ (DTAPI_E + 106)
+#define DTAPI_E_DSLICE_TUNE_POS (DTAPI_E + 107)
+#define DTAPI_E_DSLICE_OFFSETS (DTAPI_E + 108)
+#define DTAPI_E_DSLICE_OVERLAP (DTAPI_E + 109)
+#define DTAPI_E_NOTCH_OFFSETS (DTAPI_E + 110)
+#define DTAPI_E_PLP_BUNDLED (DTAPI_E + 111)
+#define DTAPI_E_BROADBAND_NOTCH (DTAPI_E + 112)
+#define DTAPI_E_L1_PART2_TOO_LONG (DTAPI_E + 113)
+#define DTAPI_E_DSLICE_T1_NDP (DTAPI_E + 114)
+#define DTAPI_E_DSLICE_T1_TSRATE (DTAPI_E + 115)
+#define DTAPI_E_CONNECT_TO_SERVICE (DTAPI_E + 116)
+#define DTAPI_E_INVALID_SYMRATE (DTAPI_E + 117)
+#define DTAPI_E_MODPARS_NOT_SET (DTAPI_E + 118)
+#define DTAPI_E_SERVICE_INCOMP (DTAPI_E + 119)
+#define DTAPI_E_INVALID_LEVEL (DTAPI_E + 120)
+#define DTAPI_E_MODTYPE_UNSUP (DTAPI_E + 121)
+#define DTAPI_E_I2C_LOCK_TIMEOUT (DTAPI_E + 122)
+#define DTAPI_E_INVALID_FREQ (DTAPI_E + 123)
+#define DTAPI_E_INVALID_TSRATESEL (DTAPI_E + 124)
+#define DTAPI_E_INVALID_SPICLKSEL (DTAPI_E + 125)
+#define DTAPI_E_INVALID_SPIMODE (DTAPI_E + 126)
+#define DTAPI_E_NOT_INITIALIZED (DTAPI_E + 127)
+#define DTAPI_E_NOT_LOCKED (DTAPI_E + 128)
+#define DTAPI_E_NO_PERMISSION (DTAPI_E + 129)
+#define DTAPI_E_CANCELLED (DTAPI_E + 130)
+#define DTAPI_E_OUT_OF_RESOURCES (DTAPI_E + 131)
+#define DTAPI_E_LISTEN (DTAPI_E + 132)
+#define DTAPI_E_INVALID_STREAMFMT (DTAPI_E + 133)
+#define DTAPI_E_EVENT_POWER (DTAPI_E + 134)
+#define DTAPI_E_EVENT_REMOVAL (DTAPI_E + 135)
+#define DTAPI_E_UNSUP_ROLLOFF (DTAPI_E + 136)
+#define DTAPI_E_T2_LITE (DTAPI_E + 137)
+#define DTAPI_E_COMP_OVERLAP (DTAPI_E + 138)
+#define DTAPI_E_MULTI_COMPS (DTAPI_E + 139)
+#define DTAPI_E_INVALID_ISI (DTAPI_E + 140)
+#define DTAPI_E_FIRMW_INCOMP (DTAPI_E + 141)
+#define DTAPI_E_INVALID_MODTYPE (DTAPI_E + 142)
+#define DTAPI_E_NO_VIDSTD (DTAPI_E + 143)
+#define DTAPI_E_INVALID_VIDSTD (DTAPI_E + 144)
+#define DTAPI_E_INVALID_AUDSTD (DTAPI_E + 145)
+#define DTAPI_E_INVALID_SCALING (DTAPI_E + 146)
+#define DTAPI_E_INVALID_ROW (DTAPI_E + 147)
+#define DTAPI_E_NOT_STARTED (DTAPI_E + 148)
+#define DTAPI_E_STARTED (DTAPI_E + 149)
+#define DTAPI_E_INVALID_LINE (DTAPI_E + 150)
+#define DTAPI_E_INVALID_STREAM (DTAPI_E + 151)
+#define DTAPI_E_INVALID_ANC (DTAPI_E + 152)
+#define DTAPI_E_INVALID_FRAME (DTAPI_E + 153)
+#define DTAPI_E_NOT_IMPLEMENTED (DTAPI_E + 154)
+#define DTAPI_E_INVALID_CHANNEL (DTAPI_E + 155)
+#define DTAPI_E_INVALID_GROUP (DTAPI_E + 156)
+#define DTAPI_E_INVALID_FORMAT (DTAPI_E + 157)
+#define DTAPI_E_INVALID_FIELD (DTAPI_E + 158)
+#define DTAPI_E_BUF_TOO_LARGE (DTAPI_E + 159)
+#define DTAPI_E_INVALID_DELAY (DTAPI_E + 160)
+#define DTAPI_E_EXCL_MANDATORY (DTAPI_E + 161)
+#define DTAPI_E_INVALID_ROLLOFF (DTAPI_E + 162)
+#define DTAPI_E_CM_UNSUP (DTAPI_E + 163)
+#define DTAPI_E_I2C (DTAPI_E + 164)
+#define DTAPI_E_STATE (DTAPI_E + 165)
+#define DTAPI_E_NO_LOCK (DTAPI_E + 166)
+#define DTAPI_E_RANGE (DTAPI_E + 167)
+#define DTAPI_E_INVALID_T2PROFILE (DTAPI_E + 168)
+#define DTAPI_E_DSLICE_ID (DTAPI_E + 169)
+#define DTAPI_E_EXCL_ACCESS_REQD (DTAPI_E + 170)
+#define DTAPI_E_CHAN_ALREADY_ADDED (DTAPI_E + 171)
+#define DTAPI_E_LAYER_ID (DTAPI_E + 172)
+#define DTAPI_E_INVALID_FECMODE (DTAPI_E + 173)
+#define DTAPI_E_INVALID_PORT (DTAPI_E + 174)
+#define DTAPI_E_INVALID_PROTOCOL (DTAPI_E + 175)
+#define DTAPI_E_INVALID_FEC_MATRIX (DTAPI_E + 176)
+#define DTAPI_E_INVALID_IP_ADDR (DTAPI_E + 177)
+#define DTAPI_E_INVALID_SRCIP_ADDR (DTAPI_E + 178)
+#define DTAPI_E_IPV6_NOT_SUPPORTED (DTAPI_E + 179)
+#define DTAPI_E_INVALID_DIFFSERV (DTAPI_E + 180)
+#define DTAPI_E_INVALID_FOR_ACM (DTAPI_E + 181)
+#define DTAPI_E_NWAP_DRIVER (DTAPI_E + 182)
+#define DTAPI_E_INIT_ERROR (DTAPI_E + 183)
+#define DTAPI_E_NOT_USB3 (DTAPI_E + 184)
+#define DTAPI_E_INSUF_BW (DTAPI_E + 185)
+#define DTAPI_E_NO_ANC_DATA (DTAPI_E + 186)
+#define DTAPI_E_MATRIX_HALTED (DTAPI_E + 187)
+#define DTAPI_E_VLAN_NOT_FOUND (DTAPI_E + 188)
+#define DTAPI_E_NO_ADAPTER_IP_ADDR (DTAPI_E + 189)
+#define DTAPI_E_INVALID_BTYPE (DTAPI_E + 190)
+#define DTAPI_E_INVALID_PARTIAL (DTAPI_E + 191)
+#define DTAPI_E_INVALID_NUMTS (DTAPI_E + 192)
+#define DTAPI_E_INVALID (DTAPI_E + 193)
+#define DTAPI_E_NO_RS422 (DTAPI_E + 194)
+#define DTAPI_E_FECFRAMESIZE (DTAPI_E + 195)
+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+//=+=+=+=+=+=+=+=+ DVB-C2, DVB-S2, DVB-T2, ISDB-Tmm Multi PLP Parameters +=+=+=+=+=+=+=+=+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtBigTsSplitPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class for specifying 'Big TS' splitting
+//
+struct DtBigTsSplitPars
+{
+ bool m_Enabled; // Enable 'Big TS' splitting
+ bool m_IsCommonPlp; // Is Common PLP or Layer
+ bool m_SplitSdtIn; // SDT already split (e.g. BBC TS-files)
+ std::vector<int> m_Pids; // Series of PIDs to include in the PLP
+
+ // The parameters below are not used in case of a common PLP
+ int m_OnwId; // Original Network ID of the Big-TS
+ int m_TsId; // Transport Stream ID of the Big-TS
+ int m_ServiceId; // ID of service to include in PLP
+ int m_PmtPid; // PID of the PMT-table
+ int m_NewTsId; // New Transport Stream ID
+ int m_SdtLoopDataLength; // SDT loop data length. 0..168
+ // Not used if m_SplitSdtIn == true
+ // The SDT-Actual loop data
+ unsigned char m_SdtLoopData[168];
+
+public:
+ // Methods
+ void Init(void);
+
+ // Operators
+ bool operator == (DtBigTsSplitPars& TsSplitPars);
+ bool operator != (DtBigTsSplitPars& TsSplitPars);
+ bool IsEqual(DtBigTsSplitPars& TsSplitPars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtPlpInpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class for specifying the PLP input
+//
+struct DtPlpInpPars
+{
+ // PLP input data types
+ enum InDataType 
+ {
+ TS188, // 188-byte TS packets 
+ TS204, // 204-byte TS packets
+ GSE // Generic Stream Encapsulation
+ };
+
+public:
+ int m_FifoIdx; // Fifo index used for the PLP
+ // If Big TS file splitting is used, PLPs in a group
+ // can share the input FIFO
+ InDataType m_DataType; // TS188 or TS204 byte packets
+ DtBigTsSplitPars m_BigTsSplit; // Big TS splitting (optional)
+
+public:
+ // Methods
+ void Init(int Idx = 0);
+
+ // Operators
+ bool operator == (DtPlpInpPars& PlpInPars);
+ bool operator != (DtPlpInpPars& PlpInPars);
+ bool IsEqual(DtPlpInpPars& PlpInPars);
+};
+
+// Test point data format
+#define DTAPI_TP_FORMAT_HEX 0
+#define DTAPI_TP_FORMAT_BIT 1
+#define DTAPI_TP_FORMAT_CFLOAT32 2
+#define DTAPI_TP_FORMAT_INT64 3
+
+// Complex floating point type
+struct DtComplexFloat
+{
+ float m_Re, m_Im; // Real, imaginary part
+};
+
+// Function to write test point data
+typedef void DtTpWriteDataFunc(void* pOpaque, int TpIndex, int StreamIndex,
+ const void* Buffer, int Length, int Format, float Mult, int IsNewFrame);
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtTestPointOutPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Class for enabling the test point data output specifying a callback function
+//
+struct DtTestPointOutPars
+{
+public:
+ bool m_Enabled; // Enable TP data output
+ void* m_pTpWriteDataOpaque; // Opaque data pointer passed to TpWriteData
+
+ // Callback function for writing test data
+ DtTpWriteDataFunc* m_pTpWriteDataFunc;
+
+public:
+ // Methods
+ void Init(void);
+
+ // Operators
+ bool operator == (DtTestPointOutPars& RbmPars);
+ bool operator != (DtTestPointOutPars& RbmPars);
+ bool IsEqual(DtTestPointOutPars& RbmPars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtVirtualOutData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+// 
+// Structure describing and containing the output data for a virtual output channel 
+// 
+struct DtVirtualOutData
+{
+ // Virtual output data types
+ enum OutDataType 
+ {
+ IQ_INT16, // 16-bit I/Q samples 
+ IQ_FLOAT32, // 32 bit float I/Q samples
+ T2MI_TS188, // 188 byte T2MI TS-packets
+ DVBS2_L3, // L3 format for DVB-S2
+ };
+ OutDataType m_DataType; // Output data type
+
+ // Output type dependent parameters
+ union {
+ // 16-bit int I/Q samples
+ struct {
+ // Array of buffers; Per output channel a buffer with samples
+ const unsigned char** m_pBuffer; 
+ int m_NumBuffers; // Number of buffers
+ int m_NumBytes; // Number of bytes
+ } IqSamplesInt16;
+
+ // 32-bit float I/Q samples
+ struct {
+ // Array of buffers. Per output channel a buffer with samples
+ const unsigned char** m_pBuffer;
+ int m_NumBuffers; // Number of buffers
+ int m_NumBytes; // Number of bytes
+ } IqSamplesFloat32;
+
+ // 188-byte T2MI TS packets
+ struct {
+ // Pointer to T2MI TS-packet(s)
+ const unsigned char* m_pBuffer;
+ int m_NumBytes; // Number of bytes
+ __int64 m_T2MiFrameNr; // T2MI super frame number counter
+ } T2MiTs188;
+
+ // L3 frames
+ struct {
+ // Pointer to L3 frame(s)
+ const unsigned char* m_pBuffer;
+ int m_NumBytes; // Number of bytes
+ } DvbS2L3;
+ 
+ } u;
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtVirtualOutPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class for specifying the output type and level for a virtual output.
+// These parameters are only relevant when outputting to a virtual output channel.
+//
+struct DtVirtualOutPars
+{
+ bool m_Enabled; // Enable virtual output parameters
+ DtVirtualOutData::OutDataType m_DataType;
+ // Type of output data 
+ double m_Gain; // The square root of the average power of
+ // the generated signal
+public:
+ void Init(void);
+ bool IsEqual(DtVirtualOutPars& VirtOutPars);
+ bool operator == (DtVirtualOutPars& VirtOutPars);
+ bool operator != (DtVirtualOutPars& VirtOutPars);
+};
+
+
+
+//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ DAB Parameters +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
+
+// DAB error protection modes
+#define DTAPI_DAB_UEP 0 // DAB unequal error protection
+#define DTAPI_DAB_EEP 1 // DAB equal error protection
+
+// DAB data extraction mode
+enum DtDabExtractionMode
+{
+ DAB_RAW, // Raw DAB stream, no extraction
+ DAB_EXTRACTION_AAC, // AAC/DAB+ stream extraction 
+ DAB_EXTRACTION_DMB // DMB stream extraction
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabEtiStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure for DAB Ensemble Transport Interface (ETI) selection
+//
+struct DtDabEtiStreamSelPars
+{
+ // No selection parameters yet
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Structure for DAB selection
+//
+struct DtDabStreamSelPars
+{
+ int m_BitrateKbps; // Bitrate in kbps
+ int m_ErrProtLevel; // Error protection level: 1..5 (UEP); 1..4 (EEP)
+ int m_ErrProtMode; // Error protection mode: DTAPI_DAB_UEP/EEP
+ int m_ErrProtOption; // Error protection option (EEP only): 0 or 1
+ int m_StartAddress; // Start address in DAB capacity units (64bits)
+
+ // DAB data extraction mode: DAB_RAW, DAB_EXTRACTION_AAC or DAB_EXTRACTION_DMB
+ DtDabExtractionMode m_ExtractionMode;
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabFicStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Selection parameters for a DAB Fast Information Channel (FIC)
+//
+struct DtDabFicStreamSelPars
+{
+ // Parameters below are passed in the WriteStreamFunc() callback function;
+ // the parameters are not used for selection
+ int m_CifIndex; // Index of the CIF in the DAB frame to which this
+ // FIB is associated
+ int m_FibIndex; // Index of this FIB in the group of FIBs that 
+ // are associated to the same CIF
+};
+
+// Forward declarations
+struct DtDabService;
+struct DtDabSubChannel;
+struct DtDabServiceComp;
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabEnsembleInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Information about a DAB ensemble
+//
+struct DtDabEnsembleInfo
+{
+ int m_CountryId; // Country identifier
+ int m_EnsembleReference; // Indentifier of this ensemble in national area
+ int m_ExtCountryCode; // Extended country code
+ int m_InterTableId; // International table identifier
+ std::wstring m_Label; // Label identifying this ensemble
+ int m_LocalTimeOffset; // Local time offset in half hours from UTC
+ int m_LtoUnique; // Covers one(=0) or several(=1) time zones
+ int m_TransmissionMode; // Transmission mode: 1..4
+
+ // Services contained in this ensemble
+ std::vector<DtDabService> m_Services;
+
+ // Subchannels in this ensemble. Key: subchannel identifier
+ std::map<int, DtDabSubChannel> m_SubChannels;
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabService -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Information about a single service. Every service must have one primary service
+// component and can have one or more non-primay service components
+//
+struct DtDabService
+{
+ int m_CondAccessId; // Conditional access identifier
+ int m_CountryId; // Country identifier
+ int m_ExtCountryCode; // Extended country code; -1 for program service
+ bool m_IsLocal; // True if local (partial) ensemble service area
+ std::wstring m_Label; // Label identifying this service 
+ int m_ServiceReference; // Identifier of the service
+
+ // Components in this service
+ std::vector<DtDabServiceComp> m_Components;
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabServiceComp -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Information about a single DAB service component
+//
+struct DtDabServiceComp
+{
+ int m_AudioServiceCompType; // Audio service component type; -1 if not applicable
+ int m_DataServiceCompType; // Data service component type; -1 if not applicable
+ int m_FidChannelId; // Fast information data channel identifier 0..63;
+ // -1 if not applicable
+ bool m_HasCondAccess; // True if access control applies
+ bool m_IsPrimary; // True if this is the primary component
+ std::wstring m_Label; // Label identifying this service component
+ int m_Language; // Service compoment language or -1
+ int m_SubChannelId; // Subchannel identifier: 0..63; -1 if not applicable
+ int m_ServiceCompId; // Service component identifier; -1 if not applicable
+ int m_TransportMechanismId; // Transport mechanism identifier
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabSubChannel -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// A DAB subchannel contains the data for a single audio or data stream. Every service
+// component refers to a subchannel, but multiple service components can refer to the
+// same subchannel. In that case more than one service can use the same audio stream.
+//
+struct DtDabSubChannel
+{
+ int m_BitrateKbps; // Bitrate in kbps
+ int m_ErrProtLevel; // Protection level UEP: 1..5; EEP: 1..4
+ int m_ErrProtMode; // Error protection mode: DTAPI_DAB_UEP/EEP
+ int m_ErrProtOption; // Option for EEP; -1 for UEP
+ int m_FecScheme; // FEC scheme; -1 if not applicable
+ int m_StartAddress; // Start address in capacity units (64bits)
+ int m_SubChannelId; // Subchannel identifier: 0..63
+ int m_SubChannelSize; // Size of subchannel in capacity units (64bits)
+ int m_UepTableIndex; // Index in UEP table; -1 if not applicable
+ int m_UepTableSwitch; // UEP table switch; -1 if not applicable
+};
+
+//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ DVB-C2 Parameters +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+
+// Maxima
+#define DTAPI_DVBC2_NUM_DSLICE_MAX 255 // Maximum number of data slices
+#define DTAPI_DVBC2_NUM_PLP_MAX 255 // Maximum number of PLPs
+#define DTAPI_DVBC2_NUM_NOTCH_MAX 16 // Maximum number of Notches
+
+// PLP IDs
+#define DTAPI_DVBC2_PLP_ID_NONE -1 // No PLP selected
+#define DTAPI_DVBC2_PLP_ID_AUTO -2 // Automatic PLP selection
+
+// Data slice IDs
+#define DTAPI_DVBC2_DSLICE_ID_AUTO -2 // Automatic data slice selection
+
+// m_Bandwidth
+#define DTAPI_DVBC2_6MHZ 6 // 6 MHz
+#define DTAPI_DVBC2_8MHZ 8 // 8 MHz
+
+// m_Guard - Guard interval
+#define DTAPI_DVBC2_GI_1_128 0 // 1/128
+#define DTAPI_DVBC2_GI_1_64 1 // 1/64
+
+// m_L1TiMode - L1 time interleaving mode
+#define DTAPI_DVBC2_L1TIMODE_NONE 0 // No time interleaving
+#define DTAPI_DVBC2_L1TIMODE_BEST 1 // Best fit
+#define DTAPI_DVBC2_L1TIMODE_4 2 // 4 OFDM symbols 
+#define DTAPI_DVBC2_L1TIMODE_8 3 // 8 OFDM symbols 
+
+// m_Type - PLP type
+#define DTAPI_DVBC2_PLP_TYPE_COMMON 0 // Common PLP
+#define DTAPI_DVBC2_PLP_TYPE_GROUPED 1 // Grouped Data PLP
+#define DTAPI_DVBC2_PLP_TYPE_NORMAL 2 // Normal Data PLP
+
+// m_FecType - PLP FEC type
+#define DTAPI_DVBC2_LDPC_16K 0 // 16K LDPC
+#define DTAPI_DVBC2_LDPC_64K 1 // 64K LDPC
+
+// m_CodeRate - PLP code rate
+#define DTAPI_DVBC2_COD_2_3 1 // 2/3
+#define DTAPI_DVBC2_COD_3_4 2 // 3/4
+#define DTAPI_DVBC2_COD_4_5 3 // 4/5
+#define DTAPI_DVBC2_COD_5_6 4 // 5/6
+#define DTAPI_DVBC2_COD_8_9 5 // 8/9 (For 16K FEC)
+#define DTAPI_DVBC2_COD_9_10 5 // 9/10 (For 64K FEC)
+
+// m_Modulation - PLP constellation
+#define DTAPI_DVBC2_QAM16 1 // 16-QAM
+#define DTAPI_DVBC2_QAM64 2 // 64-QAM
+#define DTAPI_DVBC2_QAM256 3 // 256-QAM
+#define DTAPI_DVBC2_QAM1024 4 // 1024-QAM
+#define DTAPI_DVBC2_QAM4096 5 // 4096-QAM
+#define DTAPI_DVBC2_QAM16384 6 // 16K-QAM non standard, but supported
+#define DTAPI_DVBC2_QAM65536 7 // 64K-QAM non standard, but supported
+
+// m_Issy - PLP ISSY
+#define DTAPI_DVBC2_ISSY_NONE 0 // No ISSY field is used
+#define DTAPI_DVBC2_ISSY_SHORT 1 // 2 byte ISSY field is used
+#define DTAPI_DVBC2_ISSY_LONG 2 // 3 byte ISSY field is used
+
+// m_TiDepth - Data slice time interleaving depth
+#define DTAPI_DVBC2_TIDEPTH_NONE 0 // No time interleaving
+#define DTAPI_DVBC2_TIDEPTH_4 1 // 4 OFDM symbols 
+#define DTAPI_DVBC2_TIDEPTH_8 2 // 8 OFDM symbols 
+#define DTAPI_DVBC2_TIDEPTH_16 3 // 16 OFDM symbols 
+
+// m_Type - Data slice type
+#define DTAPI_DVBC2_DSLICE_TYPE_1 0 // Type 1 (Single PLP and fixed mod/cod)
+#define DTAPI_DVBC2_DSLICE_TYPE_2 1 // Type 2 
+
+// m_FecHdrType - Data slice FEC frame header type
+#define DTAPI_DVBC2_FECHDR_TYPE_ROBUST 0 // Robust mode
+#define DTAPI_DVBC2_FECHDR_TYPE_HEM 1 // High efficiency mode
+
+// DVB-C2 Test points
+enum {
+ DTAPI_DVBC2_TP07, // FEC frame
+ DTAPI_DVBC2_TP08,
+ DTAPI_DVBC2_TP10,
+ DTAPI_DVBC2_TP13,
+ DTAPI_DVBC2_TP15, // Data slice
+ DTAPI_DVBC2_TP18, // OFDM output
+ DTAPI_DVBC2_TP20,
+ DTAPI_DVBC2_TP22, // FEC header
+ DTAPI_DVBC2_TP26,
+ DTAPI_DVBC2_TP27, // L1 header
+ DTAPI_DVBC2_TP31,
+ DTAPI_DVBC2_TP32, // L1 part2 data
+ DTAPI_DVBC2_TP33, // L1 part2 + padding & CRC
+ DTAPI_DVBC2_TP37,
+ DTAPI_DVBC2_TP40,
+ DTAPI_DVBC2_TP41,
+ DTAPI_DVBC2_TP42,
+ DTAPI_DVBC2_TP01,
+ DTAPI_DVBC2_TP_COUNT,
+};
+
+// DVB-C2 test points
+extern const int DTAPI_DVBC2_TESTPOINTS[DTAPI_DVBC2_TP_COUNT];
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2DSlicePars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class for specifying the data slice parameters
+//
+struct DtDvbC2DSlicePars
+{
+ int m_Id; // Data slice ID. 0..255
+ int m_TunePosition; // Tune position relative to the start frequency in 
+ // multiples of pilot carrier spacing.
+ // For guard interval 1/128: 0..8191 
+ // For guard interval 1/64: 0..16383 
+ int m_OffsetLeft; // Offset left in multiples of pilot carrier spacing.
+ // For guard interval 1/128: -128..127 
+ // For guard interval 1/64: -256..255 
+ int m_OffsetRight; // Offset right in multiples of pilot carrier spacing.
+ // For guard interval 1/128: -128..127 
+ // For guard interval 1/64: -256..255 
+ // If m_OffsetLeft = m_OffsetRight, the data slice is
+ // empty and no input streams are created for the PLPs
+ // of the data slice.
+ int m_TiDepth; // Time interleaving depth. See DTAPI_DVBC2_TIDEPTH_x
+ int m_Type; // Data slice type. See DTAPI_DVBC2_DSLICE_TYPE_x
+ int m_FecHdrType; // FEC header type. See DTAPI_DVBC2_FECHDR_TYPE_x 
+ bool m_ConstConfig; // Constant data slice configuration
+ bool m_LeftNotch; // Left notch present
+ 
+ // Data per PLP
+ std::vector<DtDvbC2PlpPars> m_Plps;
+
+public:
+ void Init(int Id=0);
+ bool IsEqual(DtDvbC2DSlicePars& DSlicePars);
+ bool operator == (DtDvbC2DSlicePars& DSlicePars);
+ bool operator != (DtDvbC2DSlicePars& DSlicePars);
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2L1UpdatePlpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// struct for L1 PLP parameter update support
+//
+struct DtDvbC2L1UpdatePlpPars 
+{
+ bool m_Enable; // Enable or disable the PLP.
+ // Only PLPs with m_NoData = true can be disabled.
+public:
+ void Init();
+ bool IsEqual(DtDvbC2L1UpdatePlpPars& PlpUpdatePars);
+ bool operator == (DtDvbC2L1UpdatePlpPars& PlpUpdatePars);
+ bool operator != (DtDvbC2L1UpdatePlpPars& PlpUpdatePars);
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2L1UpdateDSlicePars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// struct for L1 DSlice parameter update support
+//
+struct DtDvbC2L1UpdateDSlicePars
+{
+ bool m_Enable; // Enable or disable the DSlice.
+ // Only dummy data slices can be disabled. 
+ // A data slice is considered as dummy if either:
+ // - m_OffsetLeft == m_OffsetRight in its 
+ // global configuration; or
+ // - all its PLPs have m_NoData = true
+ // A dummy data slice is modulated with dummy data.
+
+ int m_OffsetLeft; // Data slice left offset - 0..2^(8+g)-1
+ int m_OffsetRight; // Data slice right offset - 0..2^(8+g)-1
+ // If the data slice is not dummy:
+ // - For type 1 , no size change is accepted.
+ // - For type 2 , size change is accepted 
+ // provided it is not zero (i.e. m_OffsetRight >
+ // m_OffsetLeft). It is up to the user to ensure that
+ // there is no bitrate overflow.
+ std::vector<DtDvbC2L1UpdatePlpPars> m_Plps; // L1 PLP updates
+
+public:
+ void Init();
+ bool IsEqual(DtDvbC2L1UpdateDSlicePars& DSliceUpdatePars);
+ bool operator == (DtDvbC2L1UpdateDSlicePars& DSliceUpdatePars);
+ bool operator != (DtDvbC2L1UpdateDSlicePars& DSliceUpdatePars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2L1UpdatePars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// L1 update support
+//
+struct DtDvbC2L1UpdatePars
+{
+ int m_NumFrames; // The following parameters are used during
+ // 'm_NumFrames' C2 frames
+ // L1 DSlice updates
+ std::vector<DtDvbC2L1UpdateDSlicePars> m_DSlices;
+
+public:
+ void Init();
+ bool IsEqual(DtDvbC2L1UpdatePars& L1UpdatePars);
+ bool operator == (DtDvbC2L1UpdatePars& L1UpdatePars);
+ bool operator != (DtDvbC2L1UpdatePars& L1UpdatePars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2ModStatus -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure for retrieving the DVB-C2 MPLP modulator status
+//
+struct DtDvbC2ModStatus
+{
+ int m_MplpModFlags; // Multi PLP modulator flags
+ __int64 m_DjbOverflows; // Count number of DJB overflows. If it happens,
+ // issy output delay must be decreased or "issy bufs"
+ // increased.
+ __int64 m_DjbUnderflows; // Count number of DJB underflows. If it happens,
+ // issy output delay must be increased.
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2NotchPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class for specifying the notch parameters
+//
+struct DtDvbC2NotchPars
+{
+ int m_Start; // Notch start in multiples of pilot carrier spacing.
+ // For guard interval 1/128: 0..8191 
+ // For guard interval 1/64: 0..16383 
+ int m_Width; // Notch width in multiples of pilot carrier spacing.
+ // For guard interval 1/128: 0..255 
+ // For guard interval 1/64: 0..511 
+public:
+ void Init(void);
+ bool IsEqual(DtDvbC2NotchPars& NotchPars);
+ bool operator == (DtDvbC2NotchPars& NotchPars);
+ bool operator != (DtDvbC2NotchPars& NotchPars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2PaprPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Class for specifying and enabling the PAPR reduction parameters
+//
+struct DtDvbC2PaprPars
+{
+ bool m_TrEnabled; // TR enabled
+ double m_TrVclip; // TR clipping threshold 1..4.32 (Volt)
+ int m_TrMaxIter; // TR maximum number of iterations. Must be >= 1.
+ // Note: PAPR TR processing time is proportional
+ // to this parameter
+public:
+ void Init(void);
+ bool IsEqual(DtDvbC2PaprPars& PaprPars);
+ bool operator == (DtDvbC2PaprPars& PaprPars);
+ bool operator != (DtDvbC2PaprPars& PaprPars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2ParamInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// DVB-C2 parameter info
+//
+struct DtDvbC2ParamInfo 
+{
+ int m_L1Part2Length; // #bits of the L1 part2 data (including CRC)
+ int m_NumL1Symbols; // Number of L1 symbols (LP)
+ int m_NumSymbols; // Total number of symbols per frame (LP + Ldata)
+ int m_PilotSpacing; // Distance between pilots (Dx)
+ int m_FftSize; // FFT size
+ int m_MinCarrierOffset; // Lowest used carrier offset (Koffset)
+ int m_CenterFrequency; // Center frequency in multiples of the carrier 
+ // spacing
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2PlpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Class for specifying the parameters of a PLP.
+// In case of bundled PLPs, only the mode adaptation parameters from the 
+// first PLP of the bundle are used.
+//
+struct DtDvbC2PlpPars
+{
+ bool m_Hem; // High Efficiency Mode
+ bool m_Npd; // Null Packet Deletion
+ int m_Issy; // Issy mode. See DTAPI_DVBC2_ISSY_x
+ int m_IssyBufs; // Issy BUFS
+ int m_IssyOutputDelay; // Delay (in T units) between the incoming data and
+ // the output TS in the receiver model. This value 
+ // determines the minimum and maximum dejitter buffer
+ // usage and is used to compute the ISSY BUFSTAT field
+ int m_TsRate; // If 0 the rate is computed from the PLP parameters,
+ // only possible in case of single PLP and no ISSY 
+ // is used
+ int m_Ccm; // ACM/CMM bit in the BBframe header 0 or 1
+ int m_Id; // PLP ID. 0..255
+ bool m_Bundled; // A bundled PLP can appear in several data slices. 
+ // All the PLP instances have the same PLP ID.
+ // Only a single input stream results from the 
+ // first PLP of the bundle.
+ int m_Type; // PLP Type. See DTAPI_DVBC2_PLP_TYPE_x
+ int m_GroupId; // Group ID. 0..255
+ int m_FecType; // FEC Type. 0=16K, 1=64K
+ int m_CodeRate; // PLP Code rate. See DTAPI_DVBC2_COD_x
+ int m_Modulation; // PLP Modulation. See DTAPI_DVBC2_x
+ int m_HdrCntr; // Header counter #FECFrames following the 
+ // FECFrame header. 0=1FF 1=2FF.
+ // Only used for DSlice type 2.
+
+ // ACM test mode. Only available for type 2 data slices. If number ACM headers != 0, 
+ // then the successive XFEC frames of this PLP use the modulation and coding 
+ // parameters taken from the m_AcmHeaders array. After the last value is used, it
+ // loops again to the start of the array.
+ // So DtDvbC2PlpPars.m_FecType, m_Modulation, m_CodeRate and m_HdrCntr are ignored.
+ std::vector<DtDvbC2XFecFrameHeader> m_AcmHeaders;
+
+ bool m_PsiSiReproc; // Indicates whether PSI/SI reprocessing is performed
+ int m_TsId; // Transport Stream ID (if m_PsiSiReproc=false)
+ int m_OnwId; // Original Network ID (if m_PsiSiReproc=false)
+ bool m_NoData; // No input data is provided for this PLP. 
+ // It is implicitely true for all PLPs in a data slice 
+ // with m_OffsetLeft = m_OffsetRight
+public:
+ void Init(int PlpId = 0);
+ bool IsEqual(DtDvbC2PlpPars& PlpPars);
+ bool operator == (DtDvbC2PlpPars& PlpPars);
+ bool operator != (DtDvbC2PlpPars& PlpPars);
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2XFecFrameHeader -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// DVBC2 FEC frame header for ACM test
+//
+struct DtDvbC2XFecFrameHeader
+{
+ int m_FecType; // PLP FEC Type. 0=16K, 1=64K
+ int m_Modulation; // PLP Modulation. See DTAPI_DVBC2_x
+ int m_CodeRate; // PLP Code rate. See DTAPI_DVBC2_COD_x
+ int m_HdrCntr; // Header counter #FEC frames following the 
+ // FEC frame header. 0=1FF, 1=2FF
+ int m_XFecFrameCount; // 1..256: Number of successive XFEC frames using 
+ // these parameters
+public:
+ void Init(void);
+ bool IsEqual(DtDvbC2XFecFrameHeader& FecHeader);
+ bool operator == (DtDvbC2XFecFrameHeader& FecHeader);
+ bool operator != (DtDvbC2XFecFrameHeader& FecHeader);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2Pars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Class for specifying the DVB-C2 modulation parameters
+//
+ struct DtDvbC2Pars
+{
+public:
+ // General C2 parameters
+ int m_Bandwidth; // Bandwidth. Defines the OFDM carrier spacing 
+ // F=8e6*bandwidth/7/4096 Hz. See DVBC2_BW_x
+ int m_NetworkId; // Network ID. 0..0xFFFF
+ int m_C2SystemId; // C2 System ID. 0..0xFFFF
+ int m_StartFrequency; // Start frequency in multiple of carrier spacing
+ // 0..2^24 - 1 and multiples of dx. 
+ // For guard interval 1/128 dx=24, otherwise dx=12
+ int m_C2Bandwidth; // Bandwidth of the generated signal in 
+ // multiples of pilot carrier spacing. 0..65535
+ int m_GuardInterval; // Guard interval See DVBC2_GI_x
+ bool m_ReservedTone; // Reserved tone. When there are reserved carriers
+ // (e.g. PAPR TR is enabled) it shall be set to true; 
+ // otherwise false
+ int m_L1TiMode; // L1 time interleaving mode. See DVBC2_L1TIMODE_x
+
+ // Data slices parameters
+ int m_NumDSlices; // Number of data slices
+ DtDvbC2DSlicePars m_DSlices[DTAPI_DVBC2_NUM_DSLICE_MAX];
+
+ // Notches
+ int m_NumNotches; // Number of notches
+ DtDvbC2NotchPars m_Notches[DTAPI_DVBC2_NUM_NOTCH_MAX];
+ 
+ // PLP input
+ int m_NumPlpInputs; // Number of PLPs
+ DtPlpInpPars m_PlpInputs[DTAPI_DVBC2_NUM_PLP_MAX]; // PLP inputs (Optional)
+
+ DtDvbC2PaprPars m_PaprPars; // PAPR Params (Optional)
+ DtVirtualOutPars m_VirtOutput; // Virtual Output parameters(Optional) 
+ DtTestPointOutPars m_TpOutput; // Test point data output parameters (Optional)
+ int m_OutpFreqOffset; // Output frequency offset from 'm_StartFrequency'
+ // in carriers of the generated spectrum. 
+ // Must be multiple of dx.
+ int m_OutpBandwidth; // Output bandwidth in carriers and a multiple of dx.
+ // 0 means default output bandwidth. 
+ // Note: for convenience, one more carrier is output
+ // if an edge carrier needs to be output.
+
+ std::vector<DtDvbC2L1UpdatePars> m_L1Updates; // L1 updates
+
+ // Undocumented
+ int m_L1P2ChangeCtr; // Undocumented. For internal use only
+ bool m_NotchTestEnable; // Undocumented. For internal use only
+ int m_TimeWindowLength; // Undocumented. For internal use only
+
+public:
+ DTAPI_RESULT CheckValidity(void);
+ DTAPI_RESULT GetParamInfo(DtDvbC2ParamInfo& C2Info);
+ void Init(void);
+ bool IsEqual(DtDvbC2Pars& C2Pars);
+ bool operator == (DtDvbC2Pars& C2Pars);
+ bool operator != (DtDvbC2Pars& C2Pars);
+};
+ 
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ DVB-C2 Demodulation +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+
+// DtDvbC2DemodL1Part2Plp::m_PayloadType - The PLP payload type
+#define DTAPI_DVBC2_PAYLOAD_GFPS 0 // Generic fixed-length packetized stream
+#define DTAPI_DVBC2_PAYLOAD_GCS 1 // Generic continuous stream
+#define DTAPI_DVBC2_PAYLOAD_GSE 2 // Generic stream encapsulation
+#define DTAPI_DVBC2_PAYLOAD_TS 3 // Transport Stream
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2DemodL1PlpSigDataPlp -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+ //
+// Struct for storing layer 1 PLP signalling information per PLP.
+// For type 1 data slices this struct contains the PLP-signalling information
+// from the layer 1 part 2 signalling.
+// For type 2 data slices this struct contains the PLP-signalling information
+// from the layer 1 part 1 (=FEC-frame header).
+//
+struct DtDvbC2DemodL1PlpSigDataPlp
+{
+ int m_Id; // PLP ID: 0..255
+ int m_FecType; // PLP FEC type: 0=LDPC 16K, 1=LDPC 64K
+ int m_Modulation; // PLP modulation, see DTAPI_DVBC2_x
+ int m_CodeRate; // PLP modulation, see DTAPI_DVBC2_x
+ int m_HdrCntr; // Header counter #FEC frames following the 
+ // FEC frame header. 0=1FF, 1=2FF. Only present for
+ // type 2 data slices
+
+ DtDvbC2DemodL1PlpSigDataPlp();
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2DemodL1PlpSigData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Struct for storing the DVB-C2 layer 1 PLP signalling data
+//
+struct DtDvbC2DemodL1PlpSigData
+{
+ int m_NumPlps; // Number of PLPs
+ std::vector<DtDvbC2DemodL1PlpSigDataPlp> m_Plps;
+
+ DtDvbC2DemodL1PlpSigData();
+ 
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2DemodL1Part2Plp -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Struct for storing Layer 1 part 2 information per PLP
+//
+struct DtDvbC2DemodL1Part2Plp
+{
+ int m_Id; // PLP ID: 0..255
+ int m_Bundled; // Bundled PLP
+ int m_Type; // PLP type, see DTAPI_DVBC2_PLP_TYPE_x
+ int m_PayloadType; // PLP payload type: 0..3
+ int m_GroupId; // Group ID: 0..255
+ // Start, FecType, Modulation and CodeRate parameters are not present for type 2 data 
+ // slices
+ int m_Start; // PLP start: Start of the first complete XFECframe
+ int m_FecType; // PLP FEC type: 0=LDPC 16K, 1=LDPC 64K
+ int m_Modulation; // PLP modulation, see DTAPI_DVBC2_x
+ int m_CodeRate; // PLP modulation, see DTAPI_DVBC2_x
+ int m_PsiSiReproc; // Indicates whether PSI/SI reprocessing is performed
+ int m_TsId; // Transport Stream ID (if m_PsiSiReproc=false)
+ int m_OnwId; // Original Network ID (if m_PsiSiReproc=false)
+ 
+ DtDvbC2DemodL1Part2Plp();
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+ 
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2DemodL1Part2DSlice -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Struct for storing Layer 1 part 2 information per data slice
+//
+struct DtDvbC2DemodL1Part2DSlice 
+{
+ int m_Id; // Data slice ID: 0..255
+ int m_TunePosition; // Tune position relative to the start frequency in 
+ // multiples of pilot carrier spacing.
+ // For guard interval 1/128: 0..8191 
+ // For guard interval 1/64: 0..16383 
+ int m_OffsetLeft; // Offset left in multiples of pilot carrier spacing.
+ // For guard interval 1/128: -128..127 
+ // For guard interval 1/64: -256..255 
+ int m_OffsetRight; // Offset right in multiples of pilot carrier spacing.
+ // For guard interval 1/128: -128..127 
+ // For guard interval 1/64: -256..255 
+ // If m_OffsetLeft = m_OffsetRight, the data slice is
+ // empty and no input streams are created for the PLPs
+ // of the data slice.
+ int m_TiDepth; // Time interleaving depth, see DTAPI_DVBC2_TIDEPTH_x
+ int m_Type; // Data slice type, see DTAPI_DVBC2_DSLICE_TYPE_x
+ int m_FecHdrType; // FEC header type, see DTAPI_DVBC2_FECHDR_TYPE_x 
+ int m_ConstConfig; // Constant data slice configuration flag
+ int m_LeftNotch; // Left notch present flag
+ // PLPs
+ int m_NumPlps; // Number of PLPs
+ std::vector<DtDvbC2DemodL1Part2Plp> m_Plps;
+
+ DtDvbC2DemodL1Part2DSlice();
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2DemodL1Part2Data -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Struct for storing the DVB-C2 layer 1 part 2data
+//
+struct DtDvbC2DemodL1Part2Data
+{
+ int m_NetworkId; // Network ID: 0..0xFFFF
+ int m_C2SystemId; // C2 System ID: 0..0xFFFF
+ int m_StartFrequency; // Start frequency in multiple of carrier spacing:
+ // 0..2^24 - 1
+ int m_C2Bandwidth; // Bandwidth of the generated signal in 
+ // multiples of pilot carrier spacing: 0..65535
+ int m_GuardInterval; // Guard interval. See DVBC2_GI_x
+ int m_C2FrameLength; // C2 frame length: #Data symbols per C2 frame
+ int m_L1P2ChangeCtr; // Value of the L1_PART2_CHANGE_COUNTER field
+ int m_ReservedTone; // Reserved tone
+
+ // Data slices
+ int m_NumDSlices; // Number of data slices
+ std::vector<DtDvbC2DemodL1Part2DSlice> m_DSlices;
+ 
+ // Notches
+ int m_NumNotches; // Number of notches
+ std::vector<DtDvbC2NotchPars> m_Notches;
+
+ DtDvbC2DemodL1Part2Data();
+ 
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbC2StreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure for DVB-C2 PLP-stream selection
+//
+struct DtDvbC2StreamSelPars
+{
+ int m_DSliceId; // ID of the data slice or DTAPI_DVBC2_DSLICE_ID_AUTO
+ int m_PlpId; // ID of the data PLP or DTAPI_DVBC2_PLP_ID_xxx
+ int m_CommonPlpId; // ID of the common PLP or DTAPI_DVBC2_PLP_ID_xxx
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ DVB-S2 Parameters +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+
+#define DTAPI_DVBS2_NUM_PLP_MAX 255 // Maximum number of PLPs
+
+// m_Issy - PLP ISSY
+#define DTAPI_DVBS2_ISSY_NONE 0 // No ISSY field is used
+#define DTAPI_DVBS2_ISSY_SHORT 1 // 2 byte ISSY field is used
+#define DTAPI_DVBS2_ISSY_LONG 2 // 3 byte ISSY field is used
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDvbS2ModStatus -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+struct DtDvbS2ModStatus
+{
+ int m_MplpModFlags; // Multi PLP modulator flags
+ __int64 m_DjbOverflows; // Count number of DJB overflows. If it happens,
+ // issy output delay must be decreased or "issy bufs"
+ // increased.
+ __int64 m_DjbUnderflows; // Count number of DJB underflows. If it happens,
+ // issy output delay must be increased.
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDvbS2FecFrameHeader -.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+struct DtDvbS2FecFrameHeader
+{
+ int m_Modulation; // PLP Modulation. See DTAPI_MOD_DVBS2_*
+ int m_CodeRate; // PLP Code rate. See DTAPI_MOD_x
+ int m_FecFrameSize; // Fec frame size. See DTAPI_MOD_S2_*FRM
+ bool m_HasPilots; // Enable pilots
+ int m_FecFrameCount; // Number of successive FEC frames using these
+ // parameters, 0 means infinite.
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDvbS2ModCod -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+struct DtDvbS2ModCod
+{
+ int m_ModType; // Modulation type, e.g. DTAPI_MOD_DVBS_QPSK
+ int m_CodeRate; // Code rate, e.g. DTAPI_MOD_1_2
+ // Constructor
+ DtDvbS2ModCod();
+ DtDvbS2ModCod(int ModType, int CodeRate);
+ bool operator < (const DtDvbS2ModCod& ModCod) const;
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDvbS2PlpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+struct DtDvbS2PlpPars
+{
+ bool m_Hem; // High Efficiency Mode
+ bool m_Npd; // Null Packet Deletion
+ int m_Issy; // Issy mode. See DTAPI_DVBS2_ISSY_x
+ int m_IssyBufs; // Issy BUFS
+ int m_IssyOutputDelay; // Delay (in T units) between the incoming data and
+ // the output TS in the receiver model. This value 
+ // determines the minimum and maximum dejitter buffer
+ // usage and is used to compute the ISSY BUFSTAT field
+ int m_TsRate; // Ts rate
+ int m_Ccm; // ACM/CMM bit in the BBframe header 0 or 1
+ int m_Id; // PLP ID. 0..255
+
+ // One or more fec frame headers. If there is only 1 the m_FecFrameCount member
+ // is ignored. Otherwise that specifies the number of frames to generate with those
+ // parameters. When that number of frames are generated, the next set of parameters
+ // is taken. After the last DtDvbS2FecFrameHeader the first one is used again.
+ std::vector<DtDvbS2FecFrameHeader> m_AcmHeaders;
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDvbS2Pars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+struct DtDvbS2Pars
+{
+ DtVirtualOutPars m_VirtOutput; // Virtual-output parameters (Optional) 
+ bool m_L3Output; // Set to true to enable L3 output
+ int m_SymRate; // Symbol rate
+ int m_RollOff; // Roll-off DTAPI_MOD_ROLLOFF_xxx
+ 
+ // Data per PLP
+ std::vector<DtDvbS2PlpPars> m_Plps;
+ // PLP input
+ int m_NumPlpInputs; // Number of PLPs
+ DtPlpInpPars m_PlpInputs[DTAPI_DVBS2_NUM_PLP_MAX]; // PLP inputs (Optional)
+
+ DtDvbS2Pars();
+ DTAPI_RESULT CheckValidity();
+};
+
+//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ DVB-T2 Parameters +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+
+// Maxima
+#define DTAPI_DVBT2_NUM_PLP_MAX 255 // Maximum number of PLPs
+#define DTAPI_DVBT2_NUM_RF_MAX 7 // Maximum number of RF output signals
+
+// PLP IDs
+#define DTAPI_DVBT2_PLP_ID_NONE -1 // No PLP selected
+#define DTAPI_DVBT2_PLP_ID_AUTO -2 // Automatic PLP selection
+
+// m_Issy
+#define DTAPI_DVBT2_ISSY_NONE 0 // No ISSY field is used
+#define DTAPI_DVBT2_ISSY_SHORT 1 // 2-byte ISSY field is used
+#define DTAPI_DVBT2_ISSY_LONG 2 // 3-byte ISSY field is used
+
+// m_Bandwidth
+#define DTAPI_DVBT2_1_7MHZ 0 // 1.7 MHz
+#define DTAPI_DVBT2_5MHZ 1 // 5 MHz
+#define DTAPI_DVBT2_6MHZ 2 // 6 MHz
+#define DTAPI_DVBT2_7MHZ 3 // 7 MHz
+#define DTAPI_DVBT2_8MHZ 4 // 8 MHz
+#define DTAPI_DVBT2_10MHZ 5 // 10 MHz
+#define DTAPI_DVBT2_BW_UNK -1 // Unknown bandwith
+#define DTAPI_DVBT2MI_BW_MSK 0xF // Mask for T2MI ParXtra2
+#define DTAPI_DVBT2MI_BW_UNK 0xF //Val in ParXtra2 if not set, map to 8MHz
+
+// m_FftMode
+// Warning: the codes are different from the corresponding L1 field
+#define DTAPI_DVBT2_FFT_1K 0 // 1K FFT
+#define DTAPI_DVBT2_FFT_2K 1 // 2K FFT
+#define DTAPI_DVBT2_FFT_4K 2 // 4K FFT
+#define DTAPI_DVBT2_FFT_8K 3 // 8K FFT
+#define DTAPI_DVBT2_FFT_16K 4 // 16K FFT
+#define DTAPI_DVBT2_FFT_32K 5 // 32K FFT
+#define DTAPI_DVBT2_FFT_UNK -1 // Unknown FFT mode
+
+// m_Miso
+#define DTAPI_DVBT2_MISO_OFF 0 // No MISO
+#define DTAPI_DVBT2_MISO_TX1 1 // TX1 only
+#define DTAPI_DVBT2_MISO_TX2 2 // TX2 only
+#define DTAPI_DVBT2_MISO_TX1TX2 3 // TX1+TX2 Legacy
+#define DTAPI_DVBT2_MISO_SUM 3 // TX1+TX2
+#define DTAPI_DVBT2_MISO_BOTH 4 // TX1 and TX2
+
+// m_Guard - Guard interval
+// Warning: the codes are different from the corresponding L1 field
+#define DTAPI_DVBT2_GI_1_128 0 // 1/128
+#define DTAPI_DVBT2_GI_1_32 1 // 1/32
+#define DTAPI_DVBT2_GI_1_16 2 // 1/16
+#define DTAPI_DVBT2_GI_19_256 3 // 19/256
+#define DTAPI_DVBT2_GI_1_8 4 // 1/8
+#define DTAPI_DVBT2_GI_19_128 5 // 19/128
+#define DTAPI_DVBT2_GI_1_4 6 // 1/4
+#define DTAPI_DVBT2_GI_UNK -1 // Unknown guard interval
+
+// m_Papr - PAPR - Peak to Average Power Reduction
+#define DTAPI_DVBT2_PAPR_NONE 0
+#define DTAPI_DVBT2_PAPR_ACE 1 // ACE - Active Constellation Extension
+#define DTAPI_DVBT2_PAPR_TR 2 // TR - PAPR using reserved carriers
+#define DTAPI_DVBT2_PAPR_ACE_TR 3 // ACE and TR
+
+// m_BwtExt - Bandwidth extension
+#define DTAPI_DVBT2_BWTEXT_OFF false // No bandwidth extension
+#define DTAPI_DVBT2_BWTEXT_ON true // Bandwidth extension on
+
+// m_PilotPattern
+// Warning: the codes are different from the corresponding L1 field
+#define DTAPI_DVBT2_PP_1 1 // PP1
+#define DTAPI_DVBT2_PP_2 2 // PP2
+#define DTAPI_DVBT2_PP_3 3 // PP3
+#define DTAPI_DVBT2_PP_4 4 // PP4
+#define DTAPI_DVBT2_PP_5 5 // PP5
+#define DTAPI_DVBT2_PP_6 6 // PP6
+#define DTAPI_DVBT2_PP_7 7 // PP7
+#define DTAPI_DVBT2_PP_8 8 // PP8
+
+// m_CodeRate - Code rate
+#define DTAPI_DVBT2_COD_1_2 0 // 1/2
+#define DTAPI_DVBT2_COD_3_5 1 // 3/5
+#define DTAPI_DVBT2_COD_2_3 2 // 2/3
+#define DTAPI_DVBT2_COD_3_4 3 // 3/4
+#define DTAPI_DVBT2_COD_4_5 4 // 4/5 not for T2 lite
+#define DTAPI_DVBT2_COD_5_6 5 // 5/6 not for T2 lite
+#define DTAPI_DVBT2_COD_1_3 6 // 1/3 only for T2 lite
+#define DTAPI_DVBT2_COD_2_5 7 // 2/5 only for T2 lite
+
+// m_FefSignal - Type of signal generated during the FEF period
+#define DTAPI_DVBT2_FEF_ZERO 0 // Use zero I/Q samples during FEF
+#define DTAPI_DVBT2_FEF_1K_OFDM 1 // 1K OFDM symbols with 852 active
+ // carriers containing BPSK symbols
+ // (same PRBS as the T2 dummy cells,
+ // not reset between symbols)
+#define DTAPI_DVBT2_FEF_1K_OFDM_384 2 // 1K OFDM symbols with 384 active
+ // carriers containing BPSK symbols
+
+// m_PlpConstel and m_L1Constel - Modulation constellation
+#define DTAPI_DVBT2_BPSK 0 // BPSK
+#define DTAPI_DVBT2_QPSK 1 // QPSK
+#define DTAPI_DVBT2_QAM16 2 // 16-QAM
+#define DTAPI_DVBT2_QAM64 3 // 64-QAM
+#define DTAPI_DVBT2_QAM256 4 // 256-QAM
+
+// m_Type - PLP type
+#define DTAPI_DVBT2_PLP_TYPE_COMM 0 // Common PLP
+#define DTAPI_DVBT2_PLP_TYPE_1 1 // PLP type 1
+#define DTAPI_DVBT2_PLP_TYPE_2 2 // PLP type 2
+
+// m_FecType - PLP FEC type
+#define DTAPI_DVBT2_LDPC_16K 0 // 16K LDPC
+#define DTAPI_DVBT2_LDPC_64K 1 // 64K LDPC
+
+// m_TimeIlType - Time interleaving type
+#define DTAPI_DVBT2_IL_ONETOONE 0 // Interleaving frame in one T2 frame
+#define DTAPI_DVBT2_IL_MULTI 1 // Interleaving frame in multiple frames
+
+// m_TimeStamping - Type of timestamps in T2MI
+#define DTAPI_DVBT2MI_TIMESTAMP_NULL 0 // No timestamping
+#define DTAPI_DVBT2MI_TIMESTAMP_REL 1 // Relative timestamps. Use m_Subseconds
+#define DTAPI_DVBT2MI_TIMESTAMP_ABS 2 // Absolute timestamps. Use m_T2miUtco,
+ // m_SecSince2000, m_Subseconds,
+
+// m_T2Version - DVB-T2 specification version
+#define DTAPI_DVBT2_VERSION_1_1_1 0 // DVB-T2 version 1.1.1
+#define DTAPI_DVBT2_VERSION_1_2_1 1 // DVB-T2 version 1.2.1
+#define DTAPI_DVBT2_VERSION_1_3_1 2 // DVB-T2 version 1.3.1
+
+// m_T2Profile - DVB-T2 profile
+#define DTAPI_DVBT2_PROFILE_BASE 0 
+#define DTAPI_DVBT2_PROFILE_LITE 1 // Requires DVB-T2 version 1.3.1
+
+// m_BiasBalancing
+#define DTAPI_DVBT2_BIAS_BAL_OFF 0 // No L1 bias compensation
+#define DTAPI_DVBT2_BIAS_BAL_ON 1 // Modify L1 reserved fields and L1 ext.
+ // field padding to compensate L1 bias
+// m_GseLabelType - DVB-T2 GSE Label size
+#define DTAPI_DVBT2_GSE_LABEL_6BYTE 0 // 6 Byte GSE label
+#define DTAPI_DVBT2_GSE_LABEL_3BYTE 1 // 3 Byte GSE label
+#define DTAPI_DVBT2_GSE_LABEL_NONE 2 // No GSE label
+
+#define DTAPI_TXSIG_FEF_LEN_MIN 162212 // Min. FEF length for FEF TX sgnalling
+
+// DVB-T2 test point enum
+enum {
+ DTAPI_DVBT2_TP00,
+ DTAPI_DVBT2_TP01,
+ DTAPI_DVBT2_TP03,
+ DTAPI_DVBT2_TP04,
+ DTAPI_DVBT2_TP06,
+ DTAPI_DVBT2_TP08,
+ DTAPI_DVBT2_TP09,
+ DTAPI_DVBT2_TP11,
+ DTAPI_DVBT2_TP12,
+ DTAPI_DVBT2_TP15,
+ DTAPI_DVBT2_TP16,
+ DTAPI_DVBT2_TP19, // Only usable if CFLOAT32 output format is selected
+ DTAPI_DVBT2_TP20,
+ DTAPI_DVBT2_TP21,
+ DTAPI_DVBT2_TP22,
+ DTAPI_DVBT2_TP23,
+ DTAPI_DVBT2_TP24,
+ DTAPI_DVBT2_TP25,
+ DTAPI_DVBT2_TP26,
+ DTAPI_DVBT2_TP27,
+ DTAPI_DVBT2_TP28,
+ DTAPI_DVBT2_TP29,
+ DTAPI_DVBT2_TP30,
+ DTAPI_DVBT2_TP32,
+ DTAPI_DVBT2_TP33, // T2MI output
+ DTAPI_DVBT2_TP34, // T2MI output
+
+ // Receiver Buffer Model
+ DTAPI_DVBT2_TP50, // TDI size 
+ DTAPI_DVBT2_TP51, // TDI write index, TDI read available
+ DTAPI_DVBT2_TP53, // DJB size 
+ DTAPI_DVBT2_TP_COUNT, // Number of test points
+};
+
+extern const int DTAPI_DVBT2_TESTPOINTS[DTAPI_DVBT2_TP_COUNT];
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2AuxPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Class for specifying the parameters of AUX streams
+//
+struct DtDvbT2AuxPars
+{
+ int m_NumDummyStreams; // Number of dummy AUX streams
+
+public:
+ void Init(void);
+ bool IsEqual(DtDvbT2AuxPars& AuxPars);
+ bool operator == (DtDvbT2AuxPars& AuxPars);
+ bool operator != (DtDvbT2AuxPars& AuxPars);
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2MiPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure for specifying the parametes for T2MI output streams
+//
+struct DtDvbT2MiPars
+{
+ bool m_Enabled; // Enable T2MI output. If enabled, a T2MI
+ // Transport Stream is generated and output
+ int m_Pid; // T2MI data PID
+ int m_StreamId; // stream ID for the first T2MI stream 
+ int m_Pid2; // Second T2MI data PID
+ int m_StreamId2; // stream ID for the second T2MI stream
+ int m_PcrPid; // PCR PID. If -1, no PCR is included otherwise
+ // PCRs are inserted on the specified PID
+ int m_PmtPid; // PMT PID. If -1, no PMT-table and no PAT-table
+ // are included otherwise a PMT-table is inserted 
+ // on the specified PID
+ int m_TsRate; // Rate in bps for the T2MI output
+ int m_TimeStamping; // T2MI timestamps: None, Absolute or Releative
+ // See DVBT2MI_TIMESTAMP_x
+ __int64 m_SecSince2000; // First T2MI output timestamp value. Next values
+ // are computed
+ int m_Subseconds; // The number of subseconds. See T2MI spec table 4 
+ int m_T2miUtco; // Offset in seconds between UTC and m_SecSince2000.
+ // As of February 2009 the value shall be 2 and 
+ // shall change as a result of each new leap second.
+ bool m_EncodeFef; // If true, outputs a FEF part composite packet 
+ // with the required subpart. Otherwise, only 
+ // outputs a FEF part NULL packet when FEF is
+ // enabled.
+ bool m_SyncWithExtClock; // Undocumented. For internal use only.
+public:
+ void Init(void);
+ bool IsEqual(DtDvbT2MiPars& T2MiPars);
+ bool operator == (DtDvbT2MiPars& T2MiPars);
+ bool operator != (DtDvbT2MiPars& T2MiPars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2ModStatus -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure for retrieving the MPLP modulator status
+//
+struct DtDvbT2ModStatus
+{
+ int m_MplpModFlags; // Multi PLP modulator flags
+ // General MPLP status info
+ __int64 m_PlpNumBlocksOverflows;
+ // Counts the FEC frames for which the requested
+ // number of PLP blocks is bigger than NumBlocks
+ // (the receiver will get an invalid stream)
+ __int64 m_BitrateOverflows; // Counts the frames in which too many bits were
+ // allocated (the receiver will get an invalid stream)
+ __int64 m_TtoErrorCount; // Number of times the generated TTO value was
+ // invalid (typically from a too small T_design)
+ 
+ // T2MI Specific status info
+ __int64 m_T2MiOutputRateOverFlows;
+ // Number of bit rate overflows(i.e. the T2MI output
+ // rate must be increased for reliable operation)
+ int m_T2MiOutputRate; // Current T2MI rate excluding null packets(in bps)
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2PaprPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Class for specifying and enabling the PAPR reduction parameters
+//
+struct DtDvbT2PaprPars
+{
+ bool m_AceEnabled; // ACE enabled
+ double m_AceVclip; // ACE clipping threshold 1..4.32 (Volt)
+ double m_AceGain; // ACE gain 0..31 (steps of 1)
+ double m_AceLimit; // ACE limit 0.7..1.4 (steps of 0.1) 
+ int m_AceInterpFactor; // ACE interpolation factor 1..4
+ // Note: PAPR ACE processing time is proportional
+ // to this parameter (1 recommended for realtime)
+ int m_AcePlpIndex; // PLP used for the PAPR ACE
+ bool m_TrEnabled; // TR enabled
+ bool m_TrP2Only; // PAPR TR is only applied on the P2 symbol
+ double m_TrVclip; // TR clipping threshold 1..4.32 (Volt)
+ int m_TrMaxIter; // TR maximum number of iterations. Must be >= 1
+ // Note: PAPR TR processing time is proportional
+ // to this parameter
+ int m_L1ExtLength; // L1 extension field length 0..65535
+ bool m_L1AceEnabled; // L1 ACE enabled
+ double m_L1AceCMax; // L1 ACE maximum constellation extension value
+ bool m_L1Scrambling; // L1 post scrabling (requires T2-version 1.3.1)
+
+ // Parameters below only apply if DVB-T2 V1.2.1 is selected
+ int m_NumBiasBalCells; // Dummy cells added to reduce the P2 PAPR
+ // 0..BiasBalancingCellsMax
+ int m_BiasBalancing; // Modify the L1 reserved fields and 
+ // L1 ext padding to compensate the L1 bias. 
+ // See DTAPI_DVBT2_BIAS_x
+ int m_TrAlgorithm; // Undocumented. Must be 1 (default)
+
+public:
+ void Init(void);
+ bool IsEqual(DtDvbT2PaprPars& PaprPars);
+ bool operator == (DtDvbT2PaprPars& PaprPars);
+ bool operator != (DtDvbT2PaprPars& PaprPars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2ParamInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// DVB-T2 parameter info
+//
+struct DtDvbT2ParamInfo 
+{
+ int m_TotalCellsPerFrame; // Total number of cells per frame
+ int m_L1CellsPerFrame; // Total #cells per frame used for L1 signaling
+ // Overhead: m_L1CellsPerFrame/m_TotalCellsPerFrame
+ int m_AuxCellsPerFrame; // Total number of auxiliary stream cells per frame 
+ // (currently only used for TX signalling if enabled)
+ int m_BiasBalCellsPerFrame; // Total number of L1 bias balancing cells per frame
+ int m_BiasBalCellsMax; // Maximum number of L1 bias balancing cells per P2
+ int m_DummyCellsPerFrame; // Total number of cells lost per frame. Dummy cells
+ // overhead: m_DummyCellsPerFrame/m_TotalCellsPerFrame
+ // It is computed in case no NDP is used for frame 0.
+ int m_SamplesPerFrame; // Total number of samples per frame
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2PlpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Class for specifying the parameters of a PLP
+//
+struct DtDvbT2PlpPars
+{
+ // Mode adaptation layer: TS input
+ bool m_Hem; // High Efficiency Mode: yes/no
+ bool m_Npd; // Null Packet Deletion: yes/no
+ int m_Issy; // ISSY mode. See DTAPI_DVBT2_ISSY_XXX
+ int m_IssyBufs; // ISSY BUFS
+ int m_IssyTDesign; // T-design value for TTO generation. 
+ // Use 0 to have the modulator choose the value.
+ // T-design is defined as the delay (in samples)
+ // between the start of the first T2 frame in 
+ // which the PLP is mapped (m_FirstFrameIdx) and
+ // the first output bit of the transport stream.
+ int m_CompensatingDelay; // Additional delay (in samples) before the TS 
+ // data is sent. Use -1 to have the modulator 
+ // choose the value
+ int m_TsRate; // If 0 the rate is computed from the PLP 
+ // parameters. Only possible if no NPD is used.
+ // Mode adaptation layer: GSE input
+ int m_GseLabelType; // GSE-label type. See DTAPI_DVBT2_GSE_LABEL_XXX
+
+ // DVB-T2 L1 parameters
+ int m_Id; // PLP ID: 0..255
+ int m_GroupId; // PLP group ID: 0..255
+ int m_Type; // PLP type: DTAPI_DVBT2_PLP_TYPE_XXX
+ int m_PayloadType; // PLP payload type: DTAPI_DVBT2_PAYLOAD_XXX
+ int m_CodeRate; // PLP code rate: DTAPI_DVBT2_COD_XXX
+ int m_Modulation; // PLP modulation: DTAPI_DVBT2_BPSK/...
+ bool m_Rotation; // Constellation rotation: yes/no
+ int m_FecType; // FEC Type. 0=16K, 1=64K; Must be 16K for T2 lite
+ int m_FrameInterval; // T2-frame interval for this PLP: 1..255
+ int m_FirstFrameIdx; // First frame index: 0..m_FrameInterval-1
+ int m_TimeIlLength; // Time interleaving length: 0..255
+ int m_TimeIlType; // Time interleaving type: DTAPI_DVBT2_IL_XXX
+ bool m_InBandAFlag; // In band A signaling information: yes/no
+ bool m_InBandBFlag; // In band B Signaling information: yes/no
+ // Only useful if DVB-T2 V1.2.1 is selected
+ int m_NumBlocks; // Maximum number of FEC blocks contained in
+ // one interleaving frame
+
+ // IDs of the other PLPs in the in-band signaling
+ int m_NumOtherPlpInBand; // Number of other PLPs in m_OtherPlpInBand
+ int m_OtherPlpInBand[DTAPI_DVBT2_NUM_PLP_MAX-1];
+
+ // The parameters below are only meaningful for type 1 PLPs in TFS case
+ bool m_FfFlag; // FF flag
+ int m_FirstRfIdx; // First TFS RF channel: 0..NumRf-1
+
+public:
+ void Init(int PlpId = 0);
+ bool IsEqual(DtDvbT2PlpPars& PlpPars);
+ bool operator == (DtDvbT2PlpPars& PlpPars);
+ bool operator != (DtDvbT2PlpPars& PlpPars);
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- RBM events -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// RBM events all are errors except plot
+//
+enum DtDvbT2RbmEventType 
+{
+ // Plot event (only generated if m_PlotEnabled is true)
+ DTAPI_DVBT2_RBM_EVENT_PLOT,
+ // Dejitter buffer underflow
+ DTAPI_DVBT2_RBM_EVENT_DJB_UNDERFLOW,
+ // BUFS=[m_Bufs] gives too small dejitter buffer
+ DTAPI_DVBT2_RBM_EVENT_BUFS_TOO_SMALL,
+ // TTO=[m_Tto] gives time in the past
+ DTAPI_DVBT2_RBM_EVENT_TTO_IN_THE_PAST,
+ // DJB overflow (should never happen except if the model is buggy) 
+ DTAPI_DVBT2_RBM_EVENT_DJB_OVERFLOW,
+ // BBFrame parser: CRC8 error in header (val=[m_Val]) 
+ DTAPI_DVBT2_RBM_EVENT_CRC8_ERROR_HEADER,
+ // BBFrame parser: DFL too large 
+ DTAPI_DVBT2_RBM_EVENT_DFL_TOO_LARGE,
+ // BBFrame parser: SYNCD too large (SYNCD=[m_SyncD] DFL=[m_Dfl]) 
+ DTAPI_DVBT2_RBM_EVENT_SYNCD_TOO_LARGE,
+ // BBFrame parser: invalid UPL 
+ DTAPI_DVBT2_RBM_EVENT_INVALID_UPL,
+ // BBFrame parser: invalid syncd (syncd=[m_SyncD] left=[m_Left]) 
+ DTAPI_DVBT2_RBM_EVENT_INVALID_SYNCD,
+ // TDI overflow: write pointer ([m_TdiWriteIndex]) ahead of 
+ // read pointer ([m_TdiReadIndex]) 
+ DTAPI_DVBT2_RBM_EVENT_TDI_OVERFLOW,
+ // TDI overflow: too many TI blocks queued 
+ DTAPI_DVBT2_RBM_EVENT_TOO_MANY_TI_BLOCKS,
+ // plp_start value gives overlap between PLP id=[m_PlpId1] and id=[m_PlpId2] 
+ DTAPI_DVBT2_RBM_EVENT_INVALID_PLP_START,
+ // Frequency/L1 deinterleaver overflow 
+ DTAPI_DVBT2_RBM_EVENT_FDI_OVERFLOW,
+ // Not enough ISCR data to estimate the TS rate 
+ DTAPI_DVBT2_RBM_EVENT_NO_TS_RATE,
+ // ISCR error (delta=[m_Delta]) 
+ DTAPI_DVBT2_RBM_EVENT_ISCR_ERROR,
+ // BUFS not constant (current=[m_CurBufs] new=[m_NewBufs]) 
+ DTAPI_DVBT2_RBM_EVENT_BUFS_NOT_CONSTANT,
+ // ISSYI field cannot change its value 
+ DTAPI_DVBT2_RBM_EVENT_ISSYI_NOT_CONSTANT,
+ // HEM field cannot change its value 
+ DTAPI_DVBT2_RBM_EVENT_HEM_NOT_CONSTANT,
+ // plp_num_blocks for this interleaving frame is too small (plp_num_blocks=%d) 
+ // At least 3 FEC block required in interleaving frame with HEM=1,
+ // at least 1 if HEM=0. 
+ DTAPI_DVBT2_RBM_EVENT_PLP_NUM_BLOCKS_TOO_SMALL,
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2RbmEvent -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// RBM event parameters
+//
+struct DtDvbT2RbmEvent
+{
+ int m_DataPlpId; // Data plp ID identifiying the stream
+ int m_DataPlpIndex; // Data plp index
+ double m_Time; // Time in T units
+ int m_IsCommonPlp; // 1 = common PLP, 0 = data PLP,
+ // -1 = the event does not refer to a particular PLP
+ DtDvbT2RbmEventType m_EventType;
+ // Additional parameters
+ union {
+ // DTAPI_DVBT2_RBM_EVENT_PLOT parameters
+ struct {
+ int m_TdiWriteIndex; // TDI write index
+ int m_TdiReadIndex; // TDI read index
+ int m_TdiReadAvailable;// Available cells in the TDI read buffer
+ int m_DjbSize; // Dejitter buffer size in bits
+ } Plot;
+
+ // DTAPI_DVBT2_RBM_EVENT_BUFS_TOO_SMALL parameters
+ struct {
+ int m_Bufs; // BUFS value
+ } BufsTooSmall;
+
+ // DTAPI_DVBT2_RBM_EVENT_TTO_IN_THE_PAST parameters
+ struct {
+ int m_Tto; // TTO value
+ } TtoInThePast;
+
+ // DTAPI_DVBT2_RBM_EVENT_DJB_OVERFLOW paraneters
+ struct {
+ int m_DjbSize; // Dejitter buffer size in bits
+ int m_DjbMaxSize;
+ } DjbOverflow;
+
+ // DTAPI_DVBT2_RBM_EVENT_CRC8_ERROR_HEADER parameters
+ struct {
+ int m_Val; // CRC8 value
+ } Crc8ErrorHeader;
+
+ // DTAPI_DVBT2_RBM_EVENT_DFL_TOO_LARGE parameters
+ struct {
+ int m_SyncD; // SYNCD
+ int m_Dfl; // DFL
+ } SyncDTooLarge;
+ 
+ // DTAPI_DVBT2_RBM_EVENT_INVALID_SYNCD parameters
+ struct {
+ int m_Syncd; // SYNCD
+ int m_Left; // Left
+ } InvalidSyncD;
+ 
+ // DTAPI_DVBT2_RBM_EVENT_TDI_OVERFLOW parameters
+ struct {
+ int m_TdiWriteIndex; // TDI write index
+ int m_TdiReadIndex; // TDI read index
+ } TdiOverflow;
+
+ // DTAPI_DVBT2_RBM_EVENT_INVALID_PLP_START parameters
+ struct {
+ int m_PlpId1; // IDs of overlapping PLPs
+ int m_PlpId2;
+ } InvalidPlpStart;
+
+ // DTAPI_DVBT2_RBM_EVENT_ISCR_ERROR parameters
+ struct {
+ int m_Delta; // Delta time in T units 
+ } IscrError;
+ 
+ // DTAPI_DVBT2_RBM_EVENT_BUFS_NOT_CONSTANT parameters
+ struct {
+ int m_CurBufs; // Different BUFS values
+ int m_newBufs;
+ } BufsNotConstant;
+ 
+ // DTAPI_DVBT2_RBM_EVENT_PLP_NUM_BLOCKS_TOO_SMALL parameters
+ struct {
+ int m_PlpNumBlocks; // Number of blocks
+ } PlpNumBlocksTooSmall;
+ } u;
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2RbmValidation -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class for enabling the RBM validation and specifying a callback function
+//
+struct DtDvbT2RbmValidation
+{
+public:
+ bool m_Enabled; // Enable RBM validation
+ bool m_PlotEnabled; // Enable RBM plotting events
+ int m_PlotPeriod; // Plot period
+ void* m_pCallbackOpaque; // RBM event callback function and environment
+ void (*m_pCallbackFunc)(void *pOpaque, const DtDvbT2RbmEvent* pRbmEvent);
+
+public:
+ void Init(void);
+ bool IsEqual(DtDvbT2RbmValidation& RbmPars);
+ bool operator == (DtDvbT2RbmValidation& RbmPars);
+ bool operator != (DtDvbT2RbmValidation& RbmPars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2TxSigPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class for specifying and enabling the Transmitter Signature
+//
+struct DtDvbT2TxSigPars
+{
+ // TX Signature through Auxiliary Streams
+ // The total number of possible TX IDs are M=3*(P+1)
+ // The number of cells used per transmitter is N=2^Q 
+ // The number of of T2 frames per TX SIG frame is L=R+1 
+ bool m_TxSigAuxEnabled; // Enabled
+ int m_TxSigAuxId; // Transmitter ID. 0..3071
+ int m_TxSigAuxP; // P 0..1023. The total number of possible 
+ // TX IDs is M=3*(P+1). Hence M <= 3072
+ int m_TxSigAuxQ; // Q 0..15. The number of cells used per 
+ // transmitter is N=2^Q
+ int m_TxSigAuxR; // R 0..255. The number of T2 frames
+ // per TX SIG frame is L=R+1
+
+ // TX Signature through FEF. 
+ // To use this FEF generation must be enabled and the FEF length 
+ // must be >= DTAPI_TXSIG_FEF_LEN_MIN
+ bool m_TxSigFefEnabled; // Enabled
+ int m_TxSigFefId1; // TX ID for 1st signature period. 0..7
+ int m_TxSigFefId2; // TX ID for 2nd signature period. 0..7
+
+public:
+ void Init(void);
+ bool IsEqual(DtDvbT2TxSigPars& TxSigPars);
+ bool operator == (DtDvbT2TxSigPars& TxSigPars);
+ bool operator != (DtDvbT2TxSigPars& TxSigPars);
+};
+
+// Compare modes
+#define DTAPI_DVBT2_COMPA_ALL 0
+#define DTAPI_DVBT2_COMPA_ESSENTIAL 1
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2ComponentPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class for specifying the DVB-T2 component modulation parameters
+//
+class DtDvbT2ComponentPars
+{
+public:
+ // General T2 parameters
+ int m_T2Version; // DVB-T2 spec. version. See DVBT2_VERSION_x
+ int m_T2Profile; // DVB-T2 profile. See DVBT2_PROFILE_x
+ bool m_T2BaseLite; // Indicates whether T2 lite is used in a base
+ // profile stream
+ int m_Bandwidth; // Bandwidth: DVBT2_BW_XXX
+ int m_FftMode; // FFT-mode: DVBT2_FFT_XXX
+ int m_Miso; // MISO. See DVBT2_MISO_x
+ int m_GuardInterval; // Guard interval. See DVBT2_GI_x
+ int m_Papr; // PAPR. See DVBT2_PAPR_x
+ bool m_BwtExt; // Bandwidth extention
+ int m_PilotPattern; // Pilot pattern. Pattern 1 .. 8.
+ int m_L1Modulation; // L1 modulation. See DVBT2_BPSK/... 
+ int m_CellId; // Cell ID. 0..0xFFFF.
+ int m_NetworkId; // Network ID. 0..0xFFFF.
+ int m_T2SystemId; // T2 System ID. 0..0xFFFF.
+ bool m_L1Repetition; // L1 repetition
+
+ // T2-Frame related parameters
+ int m_NumT2Frames; // #T2-frames per superframe. 1..255. 
+ int m_NumDataSyms; // #Data symbols
+ int m_NumSubslices; // #Subslices per T2-frame (for type2 PLPs)
+
+ // Component start time
+ int m_ComponentStartTime; // Offset in T unit at which the T2 component 
+ // begins to be modulated. (0 in the first component)
+ // FEF parameters
+ bool m_FefEnable; // FEF enable
+ int m_FefType; // FEF type. 0..15
+ int m_FefS1; // FEF S1. 2..7
+ int m_FefS2; // FEF S2. 1, 3, 5, 7, 9 ,11, 13 or 15
+ int m_FefSignal; // Selects the type of signal generated during 
+ // the FEF period (see DTAPI_DVBT2_FEF_x)
+ int m_FefLength; // FEF Length in number of samples.
+ int m_FefInterval; // FEF Interval. 
+ // Requires: (m_NumT2Frames % m_FefInterval) == 0
+ // RF channels for TFS
+ int m_NumRfChans; // Number of RF channels 1..7
+ int m_RfChanFreqs[DTAPI_DVBT2_NUM_RF_MAX];
+ // Channel frequencis
+ int m_StartRfIdx; // First used RF channel
+
+ // PLPs
+ int m_NumPlps; // Number of PLPs
+ DtDvbT2PlpPars m_Plps[DTAPI_DVBT2_NUM_PLP_MAX];
+ // PLP parameters
+ DtPlpInpPars m_PlpInputs[DTAPI_DVBT2_NUM_PLP_MAX]; 
+ // PLP inputs (Optional)
+ // Optional
+ DtDvbT2AuxPars m_Aux; // AUX Streams (Optional)
+ DtDvbT2PaprPars m_PaprPars; // PAPR Params (Optional)
+ DtDvbT2TxSigPars m_TxSignature;// TX-Signature (Optional)
+ DtDvbT2RbmValidation m_RbmValidation;
+ // RBM validation (Optional)
+ DtTestPointOutPars m_TpOutput; // Test point data output parameters (optional)
+
+ int m_L1ChangeCounter; // Undocumented. For internal use only.
+
+public:
+ virtual void Init(void);
+ virtual bool IsEqual(DtDvbT2ComponentPars&, int CompareMode=DTAPI_DVBT2_COMPA_ALL);
+ virtual bool operator == (DtDvbT2ComponentPars& T2Pars);
+ virtual bool operator != (DtDvbT2ComponentPars& T2Pars);
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2Pars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Class for specifying the DVB-T2 modulation parameters.
+//
+class DtDvbT2Pars : public DtDvbT2ComponentPars
+{
+public:
+ // Optional
+ DtVirtualOutPars m_VirtOutput; // Virtual-output parameters (Optional) 
+ DtDvbT2MiPars m_T2Mi; // T2MI output (Optional)
+ int m_NumFefComponents; // Number of other T2 stream transmitted in the 
+ // FEF part of the first component. The parameters 
+ // come from 'm_FefComponent'.
+
+ // FEF components. Currently maximum 1 other component
+ DtDvbT2ComponentPars m_FefComponent[1];
+
+public:
+ // Constructor
+ DtDvbT2Pars() { Init(); }
+
+ // Methods
+ virtual void Init(void);
+ virtual DTAPI_RESULT CheckValidity(void);
+ virtual DTAPI_RESULT ComputeTDesign();
+ virtual DTAPI_RESULT GetParamInfo(DtDvbT2ParamInfo& T2Info);
+ virtual DTAPI_RESULT GetParamInfo(DtDvbT2ParamInfo& T2Info1, 
+ DtDvbT2ParamInfo& T2Info2);
+ 
+ // Only usefull for single PLP
+ DTAPI_RESULT OptimisePlpNumBlocks(DtDvbT2ParamInfo&, int&);
+ DTAPI_RESULT OptimisePlpNumBlocks(DtDvbT2ParamInfo&, int&, int&);
+
+ // Helper function to determine T2MI ts rate.
+ static DTAPI_RESULT RetrieveT2miTsRateFromTs(char* pBuffer, int NumBytes,
+ int Bandwidth, int& TsRate);
+
+ // Operators
+ virtual bool operator == (DtDvbT2Pars& T2Pars);
+ virtual bool operator != (DtDvbT2Pars& T2Pars);
+ virtual bool IsEqual(DtDvbT2Pars& T2Pars, int CompareMode=DTAPI_DVBT2_COMPA_ALL);
+};
+
+//=+=+=+=+=+=+=+=+=+=+=+=+=+ DVB-T2 Demodulation layer 1 data +=+=+=+=+=+=+=+=+=+=+=+=+=+
+
+// DtDvbT2DemodL1PostPlp::m_PayloadType - The PLP payload type
+#define DTAPI_DVBT2_PAYLOAD_GFPS 0 // Generic Fixed-length Packetized Stream
+#define DTAPI_DVBT2_PAYLOAD_GCS 1 // Generic Continuous Stream
+#define DTAPI_DVBT2_PAYLOAD_GSE 2 // Generic Stream Encapsulation
+#define DTAPI_DVBT2_PAYLOAD_TS 3 // Transport Stream
+
+// DtDvbT2DemodL1Pre::m_Type - The current T2 super-frame stream type
+#define DTAPI_DVBT2_TYPE_TS 0 // Transport Stream (TS) only
+#define DTAPI_DVBT2_TYPE_GS 1 // Generic Stream (GS) only
+#define DTAPI_DVBT2_TYPE_TS_GS 2 // Mixed TS and GS
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2DemodAuxPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Struct for storing the Auxiliary stream information from Layer 1 Post 
+//
+struct DtDvbT2DemodAuxPars
+{
+ int m_AuxStreamType; // Auxiliary stream type
+ int m_AuxPrivateConf; // Auxiliary stream info
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2DemodL1PostPlp -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Struct for storing Layer 1 Post per PLP
+//
+struct DtDvbT2DemodL1PostPlp
+{
+ int m_Id; // PLP ID: 0..255
+ int m_Type; // PLP type, see DTAPI_DVBT2_PLP_TYPE_x
+ int m_PayloadType; // PLP payload type: 0..3
+ int m_FfFlag; // FF flag
+ int m_FirstRfIdx; // 0..NumRf-1
+ int m_FirstFrameIdx; // First frame in which PLP appears
+ int m_GroupId; // Group ID: 0..255
+ int m_CodeRate; // PLP code rate, see DTAPI_DVBT2_COD_x
+ int m_Modulation; // PLP modulation, see DTAPI_DVBT2_BPSK/...
+ int m_Rotation; // PLP rotation yes/no
+ int m_FecType; // PLP FEC type: 0=LDPC 16K, 1=LDPC 64K
+ int m_NumBlocks; // PLP_NUM_BLOCKS_MAX: Maximum number of FEC blocks
+ // contained in one interleaving frame
+ int m_FrameInterval; // The PLP appears every m_FrameInterval frames
+ int m_TimeIlLength; // Time interleaver length: 0..255
+ int m_TimeIlType; // Time interleaver type: 0 or 1
+ int m_InBandAFlag; // IN_BAND_A_FLAG is used yes/no
+ // V1.2.1 spec revision
+ int m_InBandBFlag; // IN_BAND_B_FLAG is used yes/no
+ int m_Reserved1; // Reserved field, may be used for bias balancing
+ int m_PlpMode; // PLP mode: 0..3
+ int m_Static; // Static flag: 0 or 1=Configuration changes only at
+ // super frame boundaries
+ int m_StaticPadding; // Static padding flag: 0 or 1=BBFRAME padding is not
+ // used
+ DtDvbT2DemodL1PostPlp();
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2DemodRfPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Struct for storing the TFS RF channels information from Layer 1 Post 
+//
+struct DtDvbT2DemodRfPars
+{
+ int m_RfIdx; // Index of the RF-frequency
+ int m_Frequency; // Centre frequency in Hz
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2DemodL1Data -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Struct for storing the DVB-T2 layer 1 data
+//
+struct DtDvbT2DemodL1Data
+{
+ // P1 Info
+ struct DtDvbT2DemodL1P1
+ {
+ bool m_Valid; // True if P1 was found
+ int m_FftMode; // FFT mode, see DVBT2_FFT_x
+ int m_Miso; // MISO used
+ int m_Fef; // FEF used
+ int m_T2Profile; // DVB-T2 profile. See DVBT2_PROFILE_x
+ } m_P1;
+
+ // L1-pre info
+ struct DtDvbT2DemodL1Pre
+ {
+ bool m_Valid; // True if L1 pre was correctly demodulated
+
+ int m_Type; // Stream type within the current T2 super-frame
+ int m_BwtExt; // Bandwidth extension
+ int m_S1; // S1 signalling. P1 S1. 
+ int m_S2; // S2 signalling. P1 S2.
+ int m_L1Repetition; // L1 repetition
+ int m_GuardInterval; // Guard interval, see DVBT2_GI_x
+ int m_Papr; // PAPR. see DVBT2_PAPR_x
+ int m_L1Modulation; // L1 modulation, see DVBT2_BPSK/...
+ int m_L1CodeRate; // L1 coderate, see DTAPI_DVBT2_COD_x
+ int m_L1FecType; // L1 FEC type: 0=LDPC 16K, 1=LDPC 64K
+ int m_L1PostSize; // Size of the L1-post in OFDM cells
+ int m_l1PostInfoSize; // L1-post info size = 
+ // L1-post configurable+dynamic+extension
+ int m_PilotPattern; // Pilot pattern: 1..8
+ int m_TxIdAvailability; // The Tx ID
+ int m_CellId; // Cell ID: 0..0xFFFF
+ int m_NetworkId; // Network ID: 0..0xFFFF
+ int m_T2SystemId; // T2 System ID: 0..0xFFFF
+ int m_NumT2Frames; // Number of T2-frames per superframe: 1..255
+ int m_NumDataSyms; // Number of data symbols
+ int m_RegenFlag; // Regeneration count indicator
+ int m_L1PostExt; // L1-post extensions enabled
+ int m_NumRfChans; // Number of RF channels: 1..7
+ int m_CurrentRfIdx; // Current RF index: 0..m_NumRfChans-1
+ int m_T2Version; // DVB-T2 spec version, see DVBT2_VERSION_x
+ int m_L1PostScrambling; // L1 Post scrambling
+ int m_T2BaseLite; // Indicates whether T2 lite is used in a base
+ // profile stream
+ } m_L1Pre;
+
+ // L1-post info
+ struct DtDvbT2DemodL1Post
+ {
+ bool m_Valid; // True if L1 post was correctly demodulated
+ int m_NumSubslices; // Number of subslices per T2-frame (for type2 PLPs)
+ int m_NumPlps; // Number of PLPs
+ int m_NumAux; // Number of auxiliary streams
+
+ // TFS RF-channels
+ std::vector<DtDvbT2DemodRfPars> m_RfChanFreqs; 
+
+ // FEF info is meaningful if m_P1.m_Fef = true
+ int m_FefType; // FEF type: 0..15
+ int m_FefLength; // FEF length in number of samples
+ int m_FefInterval; // FEF Interval
+
+ // PLPs
+ std::vector<DtDvbT2DemodL1PostPlp> m_Plps; 
+
+ // Auxiliary stream signalling information
+ std::vector<DtDvbT2DemodAuxPars> m_AuxPars; 
+
+ } m_L1Post;
+
+ DtDvbT2DemodL1Data();
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ ISDBT-TMM +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+
+#define DTAPI_ISDBT_NUM_TS_MAX 14 
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbTmmPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// ISDB-Tmm parameters including per-layer parameters
+//
+struct DtIsdbTmmPars
+{
+ int m_Bandwidth;
+ int m_SubChannel;
+ int m_NumTss;
+ DtVirtualOutPars m_VirtOutput; // Virtual Output parameters(Optional) 
+ DtIsdbtPars m_Tss[DTAPI_ISDBT_NUM_TS_MAX];
+ DtPlpInpPars m_TsInputs[DTAPI_ISDBT_NUM_TS_MAX];
+
+ // Member function
+ DtIsdbTmmPars() { Init(); }
+ DTAPI_RESULT CheckValidity();
+ int NumSegm();
+ void Init();
+ DTAPI_RESULT SetSegmentFormat(int TsIdx, int SegmFormat);
+
+ bool operator == (DtIsdbTmmPars& Rhs);
+ bool operator != (DtIsdbTmmPars& Rhs);
+};
+
+
+//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ Advanced Demodulator +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtStreamType -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Classifies the type of the stream
+//
+enum DtStreamType 
+{
+ STREAM_CONSTEL, // Constellation points
+ STREAM_DAB, // DAB stream
+ STREAM_DABETI, // DAB Ensemble Transport Interface (NI, G.703)
+ STREAM_DABFIC, // DAB Fast Information Channel
+ STREAM_DVBC2, // DVB-C2 stream (Transport Stream packets)
+ STREAM_DVBC2_BBFRAME, // DVB-C2 stream base-band frames
+ STREAM_DVBT, // DVB-T stream
+ STREAM_DVBT2, // DVB-T2 stream (Transport Stream packets)
+ STREAM_DVBT2_BBFRAME, // DVB-T2 stream base band frames
+ STREAM_DVBT2_GSE, // DVB-T2 stream GSE-packets
+ STREAM_IMPRESP, // Impulse response
+ STREAM_ISDBT, // ISDB-T stream
+ STREAM_MER, // MER
+ STREAM_SPECTRUM, // Spectrum
+ STREAM_T2MI, // DVB-T2 stream
+ STREAM_TF_ABS, // Transfer function absolute
+ STREAM_TF_PHASE, // Transfer function phase
+ STREAM_TF_GROUPDELAY // Transfer function group delay
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtConstelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// This structure specifies the parameters for a stream of constellation points
+//
+struct DtConstelPars
+{
+ int m_Period; // Minimum period between callbacks in ms
+ int m_ConstellationType; // 0: Constellation per PLP
+ // 1: Constellation per carrier (after equalization)
+ int m_Index; // Index of the PLP or carrier
+ int m_MaxNumPoints; // Maximum number of constellation points
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbTStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// This structure specifies the selection parameters for a DVB-T transport stream
+//
+struct DtDvbTStreamSelPars
+{
+ // No selection parameters yet
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbTTpsInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// DVB-T Transmission Parameter Signalling (TPS) information structure
+//
+struct DtDvbTTpsInfo
+{
+ int m_LengthIndicator; // TPS length indicator 
+ int m_Constellation; // Constellation (DTAPI_MOD_DVBT_xxx)
+ int m_HpCodeRate; // High Priority code rate (DTAPI_MOD_xxx)
+ int m_LpCodeRate; // Low Priority code rate(DTAPI_MOD_xxx)
+ int m_Guard; // Guard interval (DTAPI_MOD_DVBT_G_xx)
+ int m_Interleaving; // Interleaving (DTAPI_MOD_DVBT_xxx)
+ int m_Mode; // Transmission mode (DTAPI_MOD_DVBT_xK)
+ int m_Hierarchy; // Hierarchy (DTAPI_MOD_DVBT_HARCHY_xxx)
+ int m_CellId; // CellId or -1 when not present
+ int m_HpS48S49; // S48S49 of the odd frames (DTAPI_MOD_DVBT_Sxx)
+ int m_LpS48S49; // S48S49 of the even frames (DTAPI_MOD_DVBT_Sxx)
+ int m_OddS50_S53; // S50..S53 of the odd frames	
+ int m_EvenS50_S53; // S50..S53 of the even frames	
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2StreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// This structure specifies the selection parameters for a DVB-T2 DVB-T2 GSE and 
+// DVB-T2 BBFRAME stream
+//
+struct DtDvbT2StreamSelPars
+{
+ int m_PlpId; // ID of the data PLP or DTAPI_DVBT2_PLP_ID_xxx
+ int m_CommonPlpId; // ID of the common PLP or DTAPI_DVBT2_PLP_ID_xxx
+
+ // Serialisation
+ DTAPI_RESULT FromXml(const std::wstring& XmlString);
+ DTAPI_RESULT ToXml(std::wstring& XmlString);
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtImpRespPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// This structure specifies the parameters for an impulse-response stream
+//
+struct DtImpRespPars
+{
+ int m_Period; // Minimum period bewteen callbacks in ms
+ int m_Channel; // Channel used for MISO
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbtStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// This structure specifies the selection parameters for an ISDB-T stream
+//
+struct DtIsdbtStreamSelPars
+{
+ // No additional selection parameters
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtMeasurement -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Structure describing a set of measurement values. It used to pass measurements from 
+// the advanced demodulator to the user application through user-supplied 
+// DtWriteMeasFunc callback.
+//
+struct DtMeasurement
+{
+ DtStreamType m_MeasurementType;// Type of measurement values
+ __int64 m_TimeStamp; // Timestamp in number of samples
+ int m_NumValues; // Number of measurement values
+ DtComplexFloat* m_pMeasurement;// Measurement values
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtMerPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// This structure specifies the parameters for a MER stream.
+//
+struct DtMerPars
+{
+ int m_Period; // Minimum period between callbacks in ms
+};
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtSpectrumPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// This structure specifies the parameters for a spectrum stream.
+//
+struct DtSpectrumPars
+{
+ int m_Period; // Minimum time between callbacks in ms 
+ int m_FftLength; // FFT length, must be a power of two
+ int m_AverageLength; // Number of FFT blocks on wich the average is done
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtT2MiStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// This structure specifies the selection parameters for a T2-MI transport stream
+// containing a com-plete DVB-T2 stream.
+//
+struct DtT2MiStreamSelPars
+{
+ int m_T2MiOutPid; // T2-MI output PID
+ int m_T2MiTsRate; // Rate in bps for the T2MI output.
+ // If -1, output a variable bitrate T2MI stream 
+ // (set_output_rate is not called in this case).
+ // Otherwise, use m_T2MiTsRate to set the rate.
+ // Padding null packets are used to reach the target
+ // bitrate. The maximum T2-MI bitrate is 72Mbps.
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtTransFuncPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// This structure specifies the parameters for a transfer-function stream.
+//
+struct DtTransFuncPars
+{
+ int m_Period; // Minimum time between callbacks in ms
+ int m_Channel; // Channel used for MISO
+};
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+// Structure for streaming data selection
+//
+struct DtStreamSelPars
+{
+ intptr_t m_Id; // Unique stream identifier
+ DtStreamType m_StreamType; // Stream selection type
+
+ union {
+ // Selection parameters for demodulated streams
+ DtDvbC2StreamSelPars m_DvbC2;
+ DtDvbTStreamSelPars m_DvbT;
+ DtDvbT2StreamSelPars m_DvbT2;
+ DtIsdbtStreamSelPars m_Isdbt;
+ DtT2MiStreamSelPars m_T2Mi;
+ DtDabStreamSelPars m_Dab;
+ DtDabEtiStreamSelPars m_DabEti;
+ DtDabFicStreamSelPars m_DabFic;
+
+ // Parameters for streams of measurement values
+ DtConstelPars m_Constel;
+ DtImpRespPars m_ImpResp;
+ DtMerPars m_Mer;
+ DtSpectrumPars m_Spectrum;
+ DtTransFuncPars m_TransFunc;
+ } u;
+
+ bool operator == (DtStreamSelPars& Rhs);
+ bool operator != (DtStreamSelPars& Rhs);
+};
+
+// Software demodulator callback functions
+typedef void DtOutputRateChangedFunc(void *pOpaque, DtStreamSelPars&, int Bitrate);
+typedef void DtReadIqFunc(void* pOpaque, 
+ unsigned char* pIqBuf, int IqBufSize, int& IqLength);
+typedef void DtWriteMeasFunc(void *pOpaque, DtStreamSelPars&, DtMeasurement*);
+typedef void DtWriteStreamFunc(void* pOpaque, DtStreamSelPars& StreamSel, 
+ const unsigned char* pData, int Length);
+
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtAdvDemod -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+// Class representing an advanced demodulator. 
+// DtAdvDemod can be considered a specialized in-put channel.
+//
+class DtAdvDemod
+{
+public:
+ DtAdvDemod();
+ virtual ~DtAdvDemod();
+private:
+ // No implementation is provided for the copy constructor
+ DtAdvDemod(const DtAdvDemod&);
+
+public:
+ DtHwFuncDesc m_HwFuncDesc; // Hardware function descriptor
+
+ // Convenience functions
+public:
+ int Category(void) { return m_HwFuncDesc.m_DvcDesc.m_Category; }
+ int FirmwareVersion(void) { return m_HwFuncDesc.m_DvcDesc.m_FirmwareVersion; }
+ bool IsAttached(void) { return m_pAdvDemod != NULL; }
+ int TypeNumber(void) { return m_HwFuncDesc.m_DvcDesc.m_TypeNumber; }
+
+public:
+ DTAPI_RESULT AttachToPort(DtDevice* pDtDvc, int Port,
+ bool Exclusive=true, bool ProbeOnly=false);
+ DTAPI_RESULT AttachVirtual(DtDevice* pDtDvc,
+ DtReadIqFunc* pReadIqFunc, void* pOpaque);
+ DTAPI_RESULT ClearFlags(int Latched);
+ DTAPI_RESULT CloseStream(intptr_t Id);
+ DTAPI_RESULT Detach(int DetachMode);
+ DTAPI_RESULT GetDemodControl(DtDemodPars* pDemodPars);
+ DTAPI_RESULT GetDescriptor(DtHwFuncDesc& HwFunDesc);
+ DTAPI_RESULT GetFlags(int& Flags, int& Latched);
+ DTAPI_RESULT GetIoConfig(int Group, int& Value);
+ DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue);
+ DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue, __int64& ParXtra0);
+ DTAPI_RESULT GetIoConfig(int Group, int& Value, int& SubValue,
+ __int64& ParXtra0, __int64& ParXtra1);
+ DTAPI_RESULT GetPars(int Count, DtPar* pPars); 
+ DTAPI_RESULT GetRxControl(int& RxControl);
+ DTAPI_RESULT GetStatistics(int Count, DtStatistic* pStatistics);
+ DTAPI_RESULT GetStatistic(int Type, int& Statistic);
+ DTAPI_RESULT GetStatistic(int Type, double& Statistic);
+ DTAPI_RESULT GetStatistic(int Type, bool& Statistic);
+ DTAPI_RESULT GetStreamSelection(std::vector<DtStreamSelPars>& StreamSelList);
+ DTAPI_RESULT GetSupportedPars(int& NumPars, DtPar* pPars);
+ DTAPI_RESULT GetSupportedStatistics(int& Count, DtStatistic* pStatistics);
+ DTAPI_RESULT GetTsRateBps(intptr_t Id, int& TsRate);
+ DTAPI_RESULT GetTunerFrequency(__int64& FreqHz);
+ DTAPI_RESULT LedControl(int LedControl);
+ DTAPI_RESULT OpenStream(DtStreamSelPars StreamSel);
+ DTAPI_RESULT RegisterCallback(DtOutputRateChangedFunc* pCallback, void* pOpaque);
+ DTAPI_RESULT RegisterCallback(DtWriteStreamFunc* pCallback, void* pOpaque);
+ DTAPI_RESULT RegisterCallback(DtWriteMeasFunc* pCallback, void* pOpaque);
+ DTAPI_RESULT Reset(int ResetMode);
+ DTAPI_RESULT SetAntPower(int AntPower);
+ DTAPI_RESULT SetDemodControl(DtDemodPars *pDemodPars);
+ DTAPI_RESULT SetIoConfig(int Group, int Value, int SubValue,
+ __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
+ DTAPI_RESULT SetPars(int Count, DtPar* pPars); 
+ DTAPI_RESULT SetRxControl(int RxControl);
+ DTAPI_RESULT SetTunerFrequency(__int64 FreqHz);
+ DTAPI_RESULT Tune(__int64 FreqHz, int ModType,
+ int ParXtra0, int ParXtra1, int ParXtra2);
+ DTAPI_RESULT Tune(__int64 FreqHz, DtDemodPars *pDemodPars);
+
+protected: 
+ AdvDemod* m_pAdvDemod; // Advanced demodulation channel implementation
+ bool m_IsAttachedToVirtual; // Attached to virtual input port?
+
+ // Encapsulated data
+private:
+ IXpMutex* m_pMTLock; // Multi-threading lock for get/read functions
+ void* m_pDetachLockCount;
+ int m_Port;
+ bool m_WantToDetach;
+ 
+// Private helper functions
+private:
+ DTAPI_RESULT DetachLock(void);
+ DTAPI_RESULT DetachUnlock(void);
+ DTAPI_RESULT ReadAccessLock(void);
+ DTAPI_RESULT ReadAccessUnlock(void);
+};
+
+// Forward declaration for use in DtRs422Channel
+class Rs422Channel;
+
+//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtRs422Channel -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
+//
+class DtRs422Channel
+{
+public:
+ DtRs422Channel();
+ virtual ~DtRs422Channel();
+private:
+ // No implementation is provided for the copy constructor
+ DtRs422Channel(const DtRs422Channel&);
+
+public:
+ DTAPI_RESULT AttachToPort(DtDevice* pDtDvc, int Port,
+ bool Exclusive=true, bool ProbeOnly=false);
+ DTAPI_RESULT Detach();
+ DTAPI_RESULT Flush();
+ DTAPI_RESULT Read(char* pBuffer, int NumBytesToRead, int Timeout, int& NumBytesRead);
+ DTAPI_RESULT Write(char* pBuffer, int NumBytesToWrite, bool Blocking=true);
+
+protected:
+ Rs422Channel* m_pRs422Channel;
+ void* m_pDetachLockCount;
+ bool m_WantToDetach;
+
+// Private helper functions
+private:
+ DTAPI_RESULT DetachLock(void);
+ DTAPI_RESULT DetachUnlock(void);
+};
+
+} // namespace Dtapi
+
+#ifndef _NO_USING_NAMESPACE_DTAPI
+using namespace Dtapi;
+#endif
+
+#endif //#ifndef __DTAPI_H
+

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/ffmpeg_android/libavcodec/avcodec.h -> gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavcodec/avcodec.h Changed

@@ -22,33 +22,74 @@
 #define AVCODEC_AVCODEC_H
 
 /**
- * @file libavcodec/avcodec.h
- * external API header
+ * @file
+ * @ingroup libavc
+ * Libavcodec external API header
 */
 
 #include <errno.h>
+#include "libavutil/samplefmt.h"
+#include "libavutil/attributes.h"
 #include "libavutil/avutil.h"
+#include "libavutil/buffer.h"
+#include "libavutil/cpu.h"
+#include "libavutil/channel_layout.h"
+#include "libavutil/dict.h"
+#include "libavutil/frame.h"
+#include "libavutil/log.h"
+#include "libavutil/pixfmt.h"
+#include "libavutil/rational.h"
+
+#include "version.h"
+
+#if FF_API_FAST_MALLOC
+// to provide fast_*alloc
+#include "libavutil/mem.h"
+#endif
 
-#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 66
-#define LIBAVCODEC_VERSION_MICRO 0
-
-#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
- LIBAVCODEC_VERSION_MINOR, \
- LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_VERSION AV_VERSION(LIBAVCODEC_VERSION_MAJOR, \
- LIBAVCODEC_VERSION_MINOR, \
- LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
-
-#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-
-#define AV_NOPTS_VALUE INT64_C(0x8000000000000000)
-#define AV_TIME_BASE 1000000
-#define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE}
+/**
+ * @defgroup libavc Encoding/Decoding Library
+ * @{
+ *
+ * @defgroup lavc_decoding Decoding
+ * @{
+ * @}
+ *
+ * @defgroup lavc_encoding Encoding
+ * @{
+ * @}
+ *
+ * @defgroup lavc_codec Codecs
+ * @{
+ * @defgroup lavc_codec_native Native Codecs
+ * @{
+ * @}
+ * @defgroup lavc_codec_wrappers External library wrappers
+ * @{
+ * @}
+ * @defgroup lavc_codec_hwaccel Hardware Accelerators bridge
+ * @{
+ * @}
+ * @}
+ * @defgroup lavc_internal Internal
+ * @{
+ * @}
+ * @}
+ *
+ */
 
 /**
- * Identifies the syntax and semantics of the bitstream.
+ * @defgroup lavc_core Core functions/structures.
+ * @ingroup libavc
+ *
+ * Basic definitions, functions for querying libavcodec capabilities,
+ * allocating core structures, etc.
+ * @{
+ */
+
+
+/**
+ * Identify the syntax and semantics of the bitstream.
 * The principle is roughly:
 * Two decoders with the same ID can decode the same streams.
 * Two encoders with the same ID can encode compatible streams.
@@ -57,387 +98,536 @@
 *
 * If you add a codec ID to this list, add it so that
 * 1. no value of a existing codec ID changes (that would break ABI),
- * 2. it is as close as possible to similar codecs.
+ * 2. Give it a value which when taken as ASCII is recognized uniquely by a human as this specific codec.
+ * This ensures that 2 forks can independently add AVCodecIDs without producing conflicts.
+ *
+ * After adding new codec IDs, do not forget to add an entry to the codec
+ * descriptor list and bump libavcodec minor version.
 */
-enum CodecID {
- CODEC_ID_NONE,
+enum AVCodecID {
+ AV_CODEC_ID_NONE,
 
 /* video codecs */
- CODEC_ID_MPEG1VIDEO,
- CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
- CODEC_ID_MPEG2VIDEO_XVMC,
- CODEC_ID_H261,
- CODEC_ID_H263,
- CODEC_ID_RV10,
- CODEC_ID_RV20,
- CODEC_ID_MJPEG,
- CODEC_ID_MJPEGB,
- CODEC_ID_LJPEG,
- CODEC_ID_SP5X,
- CODEC_ID_JPEGLS,
- CODEC_ID_MPEG4,
- CODEC_ID_RAWVIDEO,
- CODEC_ID_MSMPEG4V1,
- CODEC_ID_MSMPEG4V2,
- CODEC_ID_MSMPEG4V3,
- CODEC_ID_WMV1,
- CODEC_ID_WMV2,
- CODEC_ID_H263P,
- CODEC_ID_H263I,
- CODEC_ID_FLV1,
- CODEC_ID_SVQ1,
- CODEC_ID_SVQ3,
- CODEC_ID_DVVIDEO,
- CODEC_ID_HUFFYUV,
- CODEC_ID_CYUV,
- CODEC_ID_H264,
- CODEC_ID_INDEO3,
- CODEC_ID_VP3,
- CODEC_ID_THEORA,
- CODEC_ID_ASV1,
- CODEC_ID_ASV2,
- CODEC_ID_FFV1,
- CODEC_ID_4XM,
- CODEC_ID_VCR1,
- CODEC_ID_CLJR,
- CODEC_ID_MDEC,
- CODEC_ID_ROQ,
- CODEC_ID_INTERPLAY_VIDEO,
- CODEC_ID_XAN_WC3,
- CODEC_ID_XAN_WC4,
- CODEC_ID_RPZA,
- CODEC_ID_CINEPAK,
- CODEC_ID_WS_VQA,
- CODEC_ID_MSRLE,
- CODEC_ID_MSVIDEO1,
- CODEC_ID_IDCIN,
- CODEC_ID_8BPS,
- CODEC_ID_SMC,
- CODEC_ID_FLIC,
- CODEC_ID_TRUEMOTION1,
- CODEC_ID_VMDVIDEO,
- CODEC_ID_MSZH,
- CODEC_ID_ZLIB,
- CODEC_ID_QTRLE,
- CODEC_ID_SNOW,
- CODEC_ID_TSCC,
- CODEC_ID_ULTI,
- CODEC_ID_QDRAW,
- CODEC_ID_VIXL,
- CODEC_ID_QPEG,
-#if LIBAVCODEC_VERSION_MAJOR < 53
- CODEC_ID_XVID,
-#endif
- CODEC_ID_PNG,
- CODEC_ID_PPM,
- CODEC_ID_PBM,
- CODEC_ID_PGM,
- CODEC_ID_PGMYUV,
- CODEC_ID_PAM,
- CODEC_ID_FFVHUFF,
- CODEC_ID_RV30,
- CODEC_ID_RV40,
- CODEC_ID_VC1,
- CODEC_ID_WMV3,
- CODEC_ID_LOCO,
- CODEC_ID_WNV1,
- CODEC_ID_AASC,
- CODEC_ID_INDEO2,
- CODEC_ID_FRAPS,
- CODEC_ID_TRUEMOTION2,
- CODEC_ID_BMP,
- CODEC_ID_CSCD,
- CODEC_ID_MMVIDEO,
- CODEC_ID_ZMBV,
- CODEC_ID_AVS,
- CODEC_ID_SMACKVIDEO,
- CODEC_ID_NUV,
- CODEC_ID_KMVC,
- CODEC_ID_FLASHSV,
- CODEC_ID_CAVS,
- CODEC_ID_JPEG2000,
- CODEC_ID_VMNC,
- CODEC_ID_VP5,
- CODEC_ID_VP6,
- CODEC_ID_VP6F,
- CODEC_ID_TARGA,
- CODEC_ID_DSICINVIDEO,
- CODEC_ID_TIERTEXSEQVIDEO,
- CODEC_ID_TIFF,
- CODEC_ID_GIF,
- CODEC_ID_FFH264,
- CODEC_ID_DXA,
- CODEC_ID_DNXHD,
- CODEC_ID_THP,
- CODEC_ID_SGI,
- CODEC_ID_C93,
- CODEC_ID_BETHSOFTVID,
- CODEC_ID_PTX,
- CODEC_ID_TXD,
- CODEC_ID_VP6A,
- CODEC_ID_AMV,
- CODEC_ID_VB,
- CODEC_ID_PCX,
- CODEC_ID_SUNRAST,
- CODEC_ID_INDEO4,
- CODEC_ID_INDEO5,
- CODEC_ID_MIMIC,
- CODEC_ID_RL2,
- CODEC_ID_8SVX_EXP,
- CODEC_ID_8SVX_FIB,
- CODEC_ID_ESCAPE124,
- CODEC_ID_DIRAC,
- CODEC_ID_BFI,
- CODEC_ID_CMV,
- CODEC_ID_MOTIONPIXELS,
- CODEC_ID_TGV,
- CODEC_ID_TGQ,
- CODEC_ID_TQI,
- CODEC_ID_AURA,
- CODEC_ID_AURA2,
- CODEC_ID_V210X,
- CODEC_ID_TMV,
- CODEC_ID_V210,
- CODEC_ID_DPX,
- CODEC_ID_MAD,
- CODEC_ID_FRWU,
- CODEC_ID_FLASHSV2,
- CODEC_ID_CDGRAPHICS,
- CODEC_ID_R210,
- CODEC_ID_ANM,
- CODEC_ID_BINKVIDEO,
- CODEC_ID_IFF_ILBM,
- CODEC_ID_IFF_BYTERUN1,
- CODEC_ID_KGV1,
- CODEC_ID_YOP,
+ AV_CODEC_ID_MPEG1VIDEO,
+ AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
+#if FF_API_XVMC
+ AV_CODEC_ID_MPEG2VIDEO_XVMC,
+#endif /* FF_API_XVMC */
+ AV_CODEC_ID_H261,
+ AV_CODEC_ID_H263,
+ AV_CODEC_ID_RV10,
+ AV_CODEC_ID_RV20,
+ AV_CODEC_ID_MJPEG,
+ AV_CODEC_ID_MJPEGB,
+ AV_CODEC_ID_LJPEG,
+ AV_CODEC_ID_SP5X,
+ AV_CODEC_ID_JPEGLS,
+ AV_CODEC_ID_MPEG4,
+ AV_CODEC_ID_RAWVIDEO,
+ AV_CODEC_ID_MSMPEG4V1,
+ AV_CODEC_ID_MSMPEG4V2,
+ AV_CODEC_ID_MSMPEG4V3,
+ AV_CODEC_ID_WMV1,
+ AV_CODEC_ID_WMV2,
+ AV_CODEC_ID_H263P,
+ AV_CODEC_ID_H263I,
+ AV_CODEC_ID_FLV1,
+ AV_CODEC_ID_SVQ1,
+ AV_CODEC_ID_SVQ3,
+ AV_CODEC_ID_DVVIDEO,
+ AV_CODEC_ID_HUFFYUV,
+ AV_CODEC_ID_CYUV,
+ AV_CODEC_ID_H264,
+ AV_CODEC_ID_INDEO3,
+ AV_CODEC_ID_VP3,
+ AV_CODEC_ID_THEORA,
+ AV_CODEC_ID_ASV1,
+ AV_CODEC_ID_ASV2,
+ AV_CODEC_ID_FFV1,
+ AV_CODEC_ID_4XM,
+ AV_CODEC_ID_VCR1,
+ AV_CODEC_ID_CLJR,
+ AV_CODEC_ID_MDEC,
+ AV_CODEC_ID_ROQ,
+ AV_CODEC_ID_INTERPLAY_VIDEO,
+ AV_CODEC_ID_XAN_WC3,
+ AV_CODEC_ID_XAN_WC4,
+ AV_CODEC_ID_RPZA,
+ AV_CODEC_ID_CINEPAK,
+ AV_CODEC_ID_WS_VQA,
+ AV_CODEC_ID_MSRLE,
+ AV_CODEC_ID_MSVIDEO1,
+ AV_CODEC_ID_IDCIN,
+ AV_CODEC_ID_8BPS,
+ AV_CODEC_ID_SMC,
+ AV_CODEC_ID_FLIC,
+ AV_CODEC_ID_TRUEMOTION1,
+ AV_CODEC_ID_VMDVIDEO,
+ AV_CODEC_ID_MSZH,
+ AV_CODEC_ID_ZLIB,
+ AV_CODEC_ID_QTRLE,
+ AV_CODEC_ID_TSCC,
+ AV_CODEC_ID_ULTI,
+ AV_CODEC_ID_QDRAW,
+ AV_CODEC_ID_VIXL,
+ AV_CODEC_ID_QPEG,
+ AV_CODEC_ID_PNG,
+ AV_CODEC_ID_PPM,
+ AV_CODEC_ID_PBM,
+ AV_CODEC_ID_PGM,
+ AV_CODEC_ID_PGMYUV,
+ AV_CODEC_ID_PAM,
+ AV_CODEC_ID_FFVHUFF,
+ AV_CODEC_ID_RV30,
+ AV_CODEC_ID_RV40,
+ AV_CODEC_ID_VC1,
+ AV_CODEC_ID_WMV3,
+ AV_CODEC_ID_LOCO,
+ AV_CODEC_ID_WNV1,
+ AV_CODEC_ID_AASC,
+ AV_CODEC_ID_INDEO2,
+ AV_CODEC_ID_FRAPS,
+ AV_CODEC_ID_TRUEMOTION2,
+ AV_CODEC_ID_BMP,
+ AV_CODEC_ID_CSCD,
+ AV_CODEC_ID_MMVIDEO,
+ AV_CODEC_ID_ZMBV,
+ AV_CODEC_ID_AVS,
+ AV_CODEC_ID_SMACKVIDEO,
+ AV_CODEC_ID_NUV,
+ AV_CODEC_ID_KMVC,
+ AV_CODEC_ID_FLASHSV,
+ AV_CODEC_ID_CAVS,
+ AV_CODEC_ID_JPEG2000,
+ AV_CODEC_ID_VMNC,
+ AV_CODEC_ID_VP5,
+ AV_CODEC_ID_VP6,
+ AV_CODEC_ID_VP6F,
+ AV_CODEC_ID_TARGA,
+ AV_CODEC_ID_DSICINVIDEO,
+ AV_CODEC_ID_TIERTEXSEQVIDEO,
+ AV_CODEC_ID_TIFF,
+ AV_CODEC_ID_GIF,
+ AV_CODEC_ID_DXA,
+ AV_CODEC_ID_DNXHD,
+ AV_CODEC_ID_THP,
+ AV_CODEC_ID_SGI,
+ AV_CODEC_ID_C93,
+ AV_CODEC_ID_BETHSOFTVID,
+ AV_CODEC_ID_PTX,
+ AV_CODEC_ID_TXD,
+ AV_CODEC_ID_VP6A,
+ AV_CODEC_ID_AMV,
+ AV_CODEC_ID_VB,
+ AV_CODEC_ID_PCX,
+ AV_CODEC_ID_SUNRAST,
+ AV_CODEC_ID_INDEO4,
+ AV_CODEC_ID_INDEO5,
+ AV_CODEC_ID_MIMIC,
+ AV_CODEC_ID_RL2,
+ AV_CODEC_ID_ESCAPE124,
+ AV_CODEC_ID_DIRAC,
+ AV_CODEC_ID_BFI,
+ AV_CODEC_ID_CMV,
+ AV_CODEC_ID_MOTIONPIXELS,
+ AV_CODEC_ID_TGV,
+ AV_CODEC_ID_TGQ,
+ AV_CODEC_ID_TQI,
+ AV_CODEC_ID_AURA,
+ AV_CODEC_ID_AURA2,
+ AV_CODEC_ID_V210X,
+ AV_CODEC_ID_TMV,
+ AV_CODEC_ID_V210,
+ AV_CODEC_ID_DPX,
+ AV_CODEC_ID_MAD,
+ AV_CODEC_ID_FRWU,
+ AV_CODEC_ID_FLASHSV2,
+ AV_CODEC_ID_CDGRAPHICS,
+ AV_CODEC_ID_R210,
+ AV_CODEC_ID_ANM,
+ AV_CODEC_ID_BINKVIDEO,
+ AV_CODEC_ID_IFF_ILBM,
+ AV_CODEC_ID_IFF_BYTERUN1,
+ AV_CODEC_ID_KGV1,
+ AV_CODEC_ID_YOP,
+ AV_CODEC_ID_VP8,
+ AV_CODEC_ID_PICTOR,
+ AV_CODEC_ID_ANSI,
+ AV_CODEC_ID_A64_MULTI,
+ AV_CODEC_ID_A64_MULTI5,
+ AV_CODEC_ID_R10K,
+ AV_CODEC_ID_MXPEG,
+ AV_CODEC_ID_LAGARITH,
+ AV_CODEC_ID_PRORES,
+ AV_CODEC_ID_JV,
+ AV_CODEC_ID_DFA,
+ AV_CODEC_ID_WMV3IMAGE,
+ AV_CODEC_ID_VC1IMAGE,
+ AV_CODEC_ID_UTVIDEO,
+ AV_CODEC_ID_BMV_VIDEO,
+ AV_CODEC_ID_VBLE,
+ AV_CODEC_ID_DXTORY,
+ AV_CODEC_ID_V410,
+ AV_CODEC_ID_XWD,
+ AV_CODEC_ID_CDXL,
+ AV_CODEC_ID_XBM,
+ AV_CODEC_ID_ZEROCODEC,
+ AV_CODEC_ID_MSS1,
+ AV_CODEC_ID_MSA1,
+ AV_CODEC_ID_TSCC2,
+ AV_CODEC_ID_MTS2,
+ AV_CODEC_ID_CLLC,
+ AV_CODEC_ID_MSS2,
+ AV_CODEC_ID_VP9,
+ AV_CODEC_ID_AIC,
+ AV_CODEC_ID_ESCAPE130_DEPRECATED,
+ AV_CODEC_ID_G2M_DEPRECATED,
+ AV_CODEC_ID_WEBP_DEPRECATED,
+ AV_CODEC_ID_HNM4_VIDEO,
+ AV_CODEC_ID_HEVC_DEPRECATED,
+ AV_CODEC_ID_FIC,
+ AV_CODEC_ID_ALIAS_PIX,
+ AV_CODEC_ID_BRENDER_PIX_DEPRECATED,
+ AV_CODEC_ID_PAF_VIDEO_DEPRECATED,
+ AV_CODEC_ID_EXR_DEPRECATED,
+ AV_CODEC_ID_VP7_DEPRECATED,
+ AV_CODEC_ID_SANM_DEPRECATED,
+ AV_CODEC_ID_SGIRLE_DEPRECATED,
+ AV_CODEC_ID_MVC1_DEPRECATED,
+ AV_CODEC_ID_MVC2_DEPRECATED,
+
+ AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'),
+ AV_CODEC_ID_Y41P = MKBETAG('Y','4','1','P'),
+ AV_CODEC_ID_ESCAPE130 = MKBETAG('E','1','3','0'),
+ AV_CODEC_ID_EXR = MKBETAG('0','E','X','R'),
+ AV_CODEC_ID_AVRP = MKBETAG('A','V','R','P'),
+
+ AV_CODEC_ID_012V = MKBETAG('0','1','2','V'),
+ AV_CODEC_ID_G2M = MKBETAG( 0 ,'G','2','M'),
+ AV_CODEC_ID_AVUI = MKBETAG('A','V','U','I'),
+ AV_CODEC_ID_AYUV = MKBETAG('A','Y','U','V'),
+ AV_CODEC_ID_TARGA_Y216 = MKBETAG('T','2','1','6'),
+ AV_CODEC_ID_V308 = MKBETAG('V','3','0','8'),
+ AV_CODEC_ID_V408 = MKBETAG('V','4','0','8'),
+ AV_CODEC_ID_YUV4 = MKBETAG('Y','U','V','4'),
+ AV_CODEC_ID_SANM = MKBETAG('S','A','N','M'),
+ AV_CODEC_ID_PAF_VIDEO = MKBETAG('P','A','F','V'),
+ AV_CODEC_ID_AVRN = MKBETAG('A','V','R','n'),
+ AV_CODEC_ID_CPIA = MKBETAG('C','P','I','A'),
+ AV_CODEC_ID_XFACE = MKBETAG('X','F','A','C'),
+ AV_CODEC_ID_SGIRLE = MKBETAG('S','G','I','R'),
+ AV_CODEC_ID_MVC1 = MKBETAG('M','V','C','1'),
+ AV_CODEC_ID_MVC2 = MKBETAG('M','V','C','2'),
+ AV_CODEC_ID_SNOW = MKBETAG('S','N','O','W'),
+ AV_CODEC_ID_WEBP = MKBETAG('W','E','B','P'),
+ AV_CODEC_ID_SMVJPEG = MKBETAG('S','M','V','J'),
+ AV_CODEC_ID_HEVC = MKBETAG('H','2','6','5'),
+#define AV_CODEC_ID_H265 AV_CODEC_ID_HEVC
+ AV_CODEC_ID_VP7 = MKBETAG('V','P','7','0'),
 
 /* various PCM "codecs" */
- CODEC_ID_PCM_S16LE= 0x10000,
- CODEC_ID_PCM_S16BE,
- CODEC_ID_PCM_U16LE,
- CODEC_ID_PCM_U16BE,
- CODEC_ID_PCM_S8,
- CODEC_ID_PCM_U8,
- CODEC_ID_PCM_MULAW,
- CODEC_ID_PCM_ALAW,
- CODEC_ID_PCM_S32LE,
- CODEC_ID_PCM_S32BE,
- CODEC_ID_PCM_U32LE,
- CODEC_ID_PCM_U32BE,
- CODEC_ID_PCM_S24LE,
- CODEC_ID_PCM_S24BE,
- CODEC_ID_PCM_U24LE,
- CODEC_ID_PCM_U24BE,
- CODEC_ID_PCM_S24DAUD,
- CODEC_ID_PCM_ZORK,
- CODEC_ID_PCM_S16LE_PLANAR,
- CODEC_ID_PCM_DVD,
- CODEC_ID_PCM_F32BE,
- CODEC_ID_PCM_F32LE,
- CODEC_ID_PCM_F64BE,
- CODEC_ID_PCM_F64LE,
- CODEC_ID_PCM_BLURAY,
+ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
+ AV_CODEC_ID_PCM_S16LE = 0x10000,
+ AV_CODEC_ID_PCM_S16BE,
+ AV_CODEC_ID_PCM_U16LE,
+ AV_CODEC_ID_PCM_U16BE,
+ AV_CODEC_ID_PCM_S8,
+ AV_CODEC_ID_PCM_U8,
+ AV_CODEC_ID_PCM_MULAW,
+ AV_CODEC_ID_PCM_ALAW,
+ AV_CODEC_ID_PCM_S32LE,
+ AV_CODEC_ID_PCM_S32BE,
+ AV_CODEC_ID_PCM_U32LE,
+ AV_CODEC_ID_PCM_U32BE,
+ AV_CODEC_ID_PCM_S24LE,
+ AV_CODEC_ID_PCM_S24BE,
+ AV_CODEC_ID_PCM_U24LE,
+ AV_CODEC_ID_PCM_U24BE,
+ AV_CODEC_ID_PCM_S24DAUD,
+ AV_CODEC_ID_PCM_ZORK,
+ AV_CODEC_ID_PCM_S16LE_PLANAR,
+ AV_CODEC_ID_PCM_DVD,
+ AV_CODEC_ID_PCM_F32BE,
+ AV_CODEC_ID_PCM_F32LE,
+ AV_CODEC_ID_PCM_F64BE,
+ AV_CODEC_ID_PCM_F64LE,
+ AV_CODEC_ID_PCM_BLURAY,
+ AV_CODEC_ID_PCM_LXF,
+ AV_CODEC_ID_S302M,
+ AV_CODEC_ID_PCM_S8_PLANAR,
+ AV_CODEC_ID_PCM_S24LE_PLANAR_DEPRECATED,
+ AV_CODEC_ID_PCM_S32LE_PLANAR_DEPRECATED,
+ AV_CODEC_ID_PCM_S24LE_PLANAR = MKBETAG(24,'P','S','P'),
+ AV_CODEC_ID_PCM_S32LE_PLANAR = MKBETAG(32,'P','S','P'),
+ AV_CODEC_ID_PCM_S16BE_PLANAR = MKBETAG('P','S','P',16),
 
 /* various ADPCM codecs */
- CODEC_ID_ADPCM_IMA_QT= 0x11000,
- CODEC_ID_ADPCM_IMA_WAV,
- CODEC_ID_ADPCM_IMA_DK3,
- CODEC_ID_ADPCM_IMA_DK4,
- CODEC_ID_ADPCM_IMA_WS,
- CODEC_ID_ADPCM_IMA_SMJPEG,
- CODEC_ID_ADPCM_MS,
- CODEC_ID_ADPCM_4XM,
- CODEC_ID_ADPCM_XA,
- CODEC_ID_ADPCM_ADX,
- CODEC_ID_ADPCM_EA,
- CODEC_ID_ADPCM_G726,
- CODEC_ID_ADPCM_CT,
- CODEC_ID_ADPCM_SWF,
- CODEC_ID_ADPCM_YAMAHA,
- CODEC_ID_ADPCM_SBPRO_4,
- CODEC_ID_ADPCM_SBPRO_3,
- CODEC_ID_ADPCM_SBPRO_2,
- CODEC_ID_ADPCM_THP,
- CODEC_ID_ADPCM_IMA_AMV,
- CODEC_ID_ADPCM_EA_R1,
- CODEC_ID_ADPCM_EA_R3,
- CODEC_ID_ADPCM_EA_R2,
- CODEC_ID_ADPCM_IMA_EA_SEAD,
- CODEC_ID_ADPCM_IMA_EA_EACS,
- CODEC_ID_ADPCM_EA_XAS,
- CODEC_ID_ADPCM_EA_MAXIS_XA,
- CODEC_ID_ADPCM_IMA_ISS,
+ AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
+ AV_CODEC_ID_ADPCM_IMA_WAV,
+ AV_CODEC_ID_ADPCM_IMA_DK3,
+ AV_CODEC_ID_ADPCM_IMA_DK4,
+ AV_CODEC_ID_ADPCM_IMA_WS,
+ AV_CODEC_ID_ADPCM_IMA_SMJPEG,
+ AV_CODEC_ID_ADPCM_MS,
+ AV_CODEC_ID_ADPCM_4XM,
+ AV_CODEC_ID_ADPCM_XA,
+ AV_CODEC_ID_ADPCM_ADX,
+ AV_CODEC_ID_ADPCM_EA,
+ AV_CODEC_ID_ADPCM_G726,
+ AV_CODEC_ID_ADPCM_CT,
+ AV_CODEC_ID_ADPCM_SWF,
+ AV_CODEC_ID_ADPCM_YAMAHA,
+ AV_CODEC_ID_ADPCM_SBPRO_4,
+ AV_CODEC_ID_ADPCM_SBPRO_3,
+ AV_CODEC_ID_ADPCM_SBPRO_2,
+ AV_CODEC_ID_ADPCM_THP,
+ AV_CODEC_ID_ADPCM_IMA_AMV,
+ AV_CODEC_ID_ADPCM_EA_R1,
+ AV_CODEC_ID_ADPCM_EA_R3,
+ AV_CODEC_ID_ADPCM_EA_R2,
+ AV_CODEC_ID_ADPCM_IMA_EA_SEAD,
+ AV_CODEC_ID_ADPCM_IMA_EA_EACS,
+ AV_CODEC_ID_ADPCM_EA_XAS,
+ AV_CODEC_ID_ADPCM_EA_MAXIS_XA,
+ AV_CODEC_ID_ADPCM_IMA_ISS,
+ AV_CODEC_ID_ADPCM_G722,
+ AV_CODEC_ID_ADPCM_IMA_APC,
+ AV_CODEC_ID_ADPCM_VIMA_DEPRECATED,
+ AV_CODEC_ID_ADPCM_VIMA = MKBETAG('V','I','M','A'),
+ AV_CODEC_ID_VIMA = MKBETAG('V','I','M','A'),
+ AV_CODEC_ID_ADPCM_AFC = MKBETAG('A','F','C',' '),
+ AV_CODEC_ID_ADPCM_IMA_OKI = MKBETAG('O','K','I',' '),
+ AV_CODEC_ID_ADPCM_DTK = MKBETAG('D','T','K',' '),
+ AV_CODEC_ID_ADPCM_IMA_RAD = MKBETAG('R','A','D',' '),
+ AV_CODEC_ID_ADPCM_G726LE = MKBETAG('6','2','7','G'),
 
 /* AMR */
- CODEC_ID_AMR_NB= 0x12000,
- CODEC_ID_AMR_WB,
+ AV_CODEC_ID_AMR_NB = 0x12000,
+ AV_CODEC_ID_AMR_WB,
 
 /* RealAudio codecs*/
- CODEC_ID_RA_144= 0x13000,
- CODEC_ID_RA_288,
+ AV_CODEC_ID_RA_144 = 0x13000,
+ AV_CODEC_ID_RA_288,
 
 /* various DPCM codecs */
- CODEC_ID_ROQ_DPCM= 0x14000,
- CODEC_ID_INTERPLAY_DPCM,
- CODEC_ID_XAN_DPCM,
- CODEC_ID_SOL_DPCM,
+ AV_CODEC_ID_ROQ_DPCM = 0x14000,
+ AV_CODEC_ID_INTERPLAY_DPCM,
+ AV_CODEC_ID_XAN_DPCM,
+ AV_CODEC_ID_SOL_DPCM,
 
 /* audio codecs */
- CODEC_ID_MP2= 0x15000,
- CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
- CODEC_ID_AAC,
- CODEC_ID_AC3,
- CODEC_ID_DTS,
- CODEC_ID_VORBIS,
- CODEC_ID_DVAUDIO,
- CODEC_ID_WMAV1,
- CODEC_ID_WMAV2,
- CODEC_ID_MACE3,
- CODEC_ID_MACE6,
- CODEC_ID_VMDAUDIO,
- CODEC_ID_SONIC,
- CODEC_ID_SONIC_LS,
- CODEC_ID_FLAC,
- CODEC_ID_MP3ADU,
- CODEC_ID_MP3ON4,
- CODEC_ID_SHORTEN,
- CODEC_ID_ALAC,
- CODEC_ID_WESTWOOD_SND1,
- CODEC_ID_GSM, ///< as in Berlin toast format
- CODEC_ID_QDM2,
- CODEC_ID_COOK,
- CODEC_ID_TRUESPEECH,
- CODEC_ID_TTA,
- CODEC_ID_SMACKAUDIO,
- CODEC_ID_QCELP,
- CODEC_ID_WAVPACK,
- CODEC_ID_DSICINAUDIO,
- CODEC_ID_IMC,
- CODEC_ID_MUSEPACK7,
- CODEC_ID_MLP,
- CODEC_ID_GSM_MS, /* as found in WAV */
- CODEC_ID_ATRAC3,
- CODEC_ID_VOXWARE,
- CODEC_ID_APE,
- CODEC_ID_NELLYMOSER,
- CODEC_ID_MUSEPACK8,
- CODEC_ID_SPEEX,
- CODEC_ID_WMAVOICE,
- CODEC_ID_WMAPRO,
- CODEC_ID_WMALOSSLESS,
- CODEC_ID_ATRAC3P,
- CODEC_ID_EAC3,
- CODEC_ID_SIPR,
- CODEC_ID_MP1,
- CODEC_ID_TWINVQ,
- CODEC_ID_TRUEHD,
- CODEC_ID_MP4ALS,
- CODEC_ID_ATRAC1,
- CODEC_ID_BINKAUDIO_RDFT,
- CODEC_ID_BINKAUDIO_DCT,
+ AV_CODEC_ID_MP2 = 0x15000,
+ AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
+ AV_CODEC_ID_AAC,
+ AV_CODEC_ID_AC3,
+ AV_CODEC_ID_DTS,
+ AV_CODEC_ID_VORBIS,
+ AV_CODEC_ID_DVAUDIO,
+ AV_CODEC_ID_WMAV1,
+ AV_CODEC_ID_WMAV2,
+ AV_CODEC_ID_MACE3,
+ AV_CODEC_ID_MACE6,
+ AV_CODEC_ID_VMDAUDIO,
+ AV_CODEC_ID_FLAC,
+ AV_CODEC_ID_MP3ADU,
+ AV_CODEC_ID_MP3ON4,
+ AV_CODEC_ID_SHORTEN,
+ AV_CODEC_ID_ALAC,
+ AV_CODEC_ID_WESTWOOD_SND1,
+ AV_CODEC_ID_GSM, ///< as in Berlin toast format
+ AV_CODEC_ID_QDM2,
+ AV_CODEC_ID_COOK,
+ AV_CODEC_ID_TRUESPEECH,
+ AV_CODEC_ID_TTA,
+ AV_CODEC_ID_SMACKAUDIO,
+ AV_CODEC_ID_QCELP,
+ AV_CODEC_ID_WAVPACK,
+ AV_CODEC_ID_DSICINAUDIO,
+ AV_CODEC_ID_IMC,
+ AV_CODEC_ID_MUSEPACK7,
+ AV_CODEC_ID_MLP,
+ AV_CODEC_ID_GSM_MS, /* as found in WAV */
+ AV_CODEC_ID_ATRAC3,
+#if FF_API_VOXWARE
+ AV_CODEC_ID_VOXWARE,
+#endif
+ AV_CODEC_ID_APE,
+ AV_CODEC_ID_NELLYMOSER,
+ AV_CODEC_ID_MUSEPACK8,
+ AV_CODEC_ID_SPEEX,
+ AV_CODEC_ID_WMAVOICE,
+ AV_CODEC_ID_WMAPRO,
+ AV_CODEC_ID_WMALOSSLESS,
+ AV_CODEC_ID_ATRAC3P,
+ AV_CODEC_ID_EAC3,
+ AV_CODEC_ID_SIPR,
+ AV_CODEC_ID_MP1,
+ AV_CODEC_ID_TWINVQ,
+ AV_CODEC_ID_TRUEHD,
+ AV_CODEC_ID_MP4ALS,
+ AV_CODEC_ID_ATRAC1,
+ AV_CODEC_ID_BINKAUDIO_RDFT,
+ AV_CODEC_ID_BINKAUDIO_DCT,
+ AV_CODEC_ID_AAC_LATM,
+ AV_CODEC_ID_QDMC,
+ AV_CODEC_ID_CELT,
+ AV_CODEC_ID_G723_1,
+ AV_CODEC_ID_G729,
+ AV_CODEC_ID_8SVX_EXP,
+ AV_CODEC_ID_8SVX_FIB,
+ AV_CODEC_ID_BMV_AUDIO,
+ AV_CODEC_ID_RALF,
+ AV_CODEC_ID_IAC,
+ AV_CODEC_ID_ILBC,
+ AV_CODEC_ID_OPUS_DEPRECATED,
+ AV_CODEC_ID_COMFORT_NOISE,
+ AV_CODEC_ID_TAK_DEPRECATED,
+ AV_CODEC_ID_METASOUND,
+ AV_CODEC_ID_PAF_AUDIO_DEPRECATED,
+ AV_CODEC_ID_ON2AVC,
+ AV_CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'),
+ AV_CODEC_ID_SONIC = MKBETAG('S','O','N','C'),
+ AV_CODEC_ID_SONIC_LS = MKBETAG('S','O','N','L'),
+ AV_CODEC_ID_PAF_AUDIO = MKBETAG('P','A','F','A'),
+ AV_CODEC_ID_OPUS = MKBETAG('O','P','U','S'),
+ AV_CODEC_ID_TAK = MKBETAG('t','B','a','K'),
+ AV_CODEC_ID_EVRC = MKBETAG('s','e','v','c'),
+ AV_CODEC_ID_SMV = MKBETAG('s','s','m','v'),
+ AV_CODEC_ID_DSD_LSBF = MKBETAG('D','S','D','L'),
+ AV_CODEC_ID_DSD_MSBF = MKBETAG('D','S','D','M'),
+ AV_CODEC_ID_DSD_LSBF_PLANAR = MKBETAG('D','S','D','1'),
+ AV_CODEC_ID_DSD_MSBF_PLANAR = MKBETAG('D','S','D','8'),
 
 /* subtitle codecs */
- CODEC_ID_DVD_SUBTITLE= 0x17000,
- CODEC_ID_DVB_SUBTITLE,
- CODEC_ID_TEXT, ///< raw UTF-8 text
- CODEC_ID_XSUB,
- CODEC_ID_SSA,
- CODEC_ID_MOV_TEXT,
- CODEC_ID_HDMV_PGS_SUBTITLE,
- CODEC_ID_DVB_TELETEXT,
+ AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs.
+ AV_CODEC_ID_DVD_SUBTITLE = 0x17000,
+ AV_CODEC_ID_DVB_SUBTITLE,
+ AV_CODEC_ID_TEXT, ///< raw UTF-8 text
+ AV_CODEC_ID_XSUB,
+ AV_CODEC_ID_SSA,
+ AV_CODEC_ID_MOV_TEXT,
+ AV_CODEC_ID_HDMV_PGS_SUBTITLE,
+ AV_CODEC_ID_DVB_TELETEXT,
+ AV_CODEC_ID_SRT,
+ AV_CODEC_ID_MICRODVD = MKBETAG('m','D','V','D'),
+ AV_CODEC_ID_EIA_608 = MKBETAG('c','6','0','8'),
+ AV_CODEC_ID_JACOSUB = MKBETAG('J','S','U','B'),
+ AV_CODEC_ID_SAMI = MKBETAG('S','A','M','I'),
+ AV_CODEC_ID_REALTEXT = MKBETAG('R','T','X','T'),
+ AV_CODEC_ID_SUBVIEWER1 = MKBETAG('S','b','V','1'),
+ AV_CODEC_ID_SUBVIEWER = MKBETAG('S','u','b','V'),
+ AV_CODEC_ID_SUBRIP = MKBETAG('S','R','i','p'),
+ AV_CODEC_ID_WEBVTT = MKBETAG('W','V','T','T'),
+ AV_CODEC_ID_MPL2 = MKBETAG('M','P','L','2'),
+ AV_CODEC_ID_VPLAYER = MKBETAG('V','P','l','r'),
+ AV_CODEC_ID_PJS = MKBETAG('P','h','J','S'),
+ AV_CODEC_ID_ASS = MKBETAG('A','S','S',' '), ///< ASS as defined in Matroska
 
 /* other specific kind of codecs (generally used for attachments) */
- CODEC_ID_TTF= 0x18000,
+ AV_CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs.
+ AV_CODEC_ID_TTF = 0x18000,
+ AV_CODEC_ID_BINTEXT = MKBETAG('B','T','X','T'),
+ AV_CODEC_ID_XBIN = MKBETAG('X','B','I','N'),
+ AV_CODEC_ID_IDF = MKBETAG( 0 ,'I','D','F'),
+ AV_CODEC_ID_OTF = MKBETAG( 0 ,'O','T','F'),
+ AV_CODEC_ID_SMPTE_KLV = MKBETAG('K','L','V','A'),
+ AV_CODEC_ID_DVD_NAV = MKBETAG('D','N','A','V'),
+ AV_CODEC_ID_TIMED_ID3 = MKBETAG('T','I','D','3'),
+ AV_CODEC_ID_BIN_DATA = MKBETAG('D','A','T','A'),
 
- CODEC_ID_PROBE= 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
 
- CODEC_ID_MPEG2TS= 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
- * stream (only used by libavformat) */
-};
+ AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
-#define CodecType AVMediaType
+ AV_CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
+ * stream (only used by libavformat) */
+ AV_CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
+ * stream (only used by libavformat) */
+ AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information.
 
-#define CODEC_TYPE_UNKNOWN AVMEDIA_TYPE_UNKNOWN
-#define CODEC_TYPE_VIDEO AVMEDIA_TYPE_VIDEO
-#define CODEC_TYPE_AUDIO AVMEDIA_TYPE_AUDIO
-#define CODEC_TYPE_DATA AVMEDIA_TYPE_DATA
-#define CODEC_TYPE_SUBTITLE AVMEDIA_TYPE_SUBTITLE
-#define CODEC_TYPE_ATTACHMENT AVMEDIA_TYPE_ATTACHMENT
-#define CODEC_TYPE_NB AVMEDIA_TYPE_NB
+#if FF_API_CODEC_ID
+#include "old_codec_ids.h"
 #endif
+};
 
 /**
- * all in native-endian format
- */
-enum SampleFormat {
- SAMPLE_FMT_NONE = -1,
- SAMPLE_FMT_U8, ///< unsigned 8 bits
- SAMPLE_FMT_S16, ///< signed 16 bits
- SAMPLE_FMT_S32, ///< signed 32 bits
- SAMPLE_FMT_FLT, ///< float
- SAMPLE_FMT_DBL, ///< double
- SAMPLE_FMT_NB ///< Number of sample formats. DO NOT USE if dynamically linking to libavcodec
-};
+ * This struct describes the properties of a single codec described by an
+ * AVCodecID.
+ * @see avcodec_get_descriptor()
+ */
+typedef struct AVCodecDescriptor {
+ enum AVCodecID id;
+ enum AVMediaType type;
+ /**
+ * Name of the codec described by this descriptor. It is non-empty and
+ * unique for each codec descriptor. It should contain alphanumeric
+ * characters and '_' only.
+ */
+ const char *name;
+ /**
+ * A more descriptive name for this codec. May be NULL.
+ */
+ const char *long_name;
+ /**
+ * Codec properties, a combination of AV_CODEC_PROP_* flags.
+ */
+ int props;
 
-/* Audio channel masks */
-#define CH_FRONT_LEFT 0x00000001
-#define CH_FRONT_RIGHT 0x00000002
-#define CH_FRONT_CENTER 0x00000004
-#define CH_LOW_FREQUENCY 0x00000008
-#define CH_BACK_LEFT 0x00000010
-#define CH_BACK_RIGHT 0x00000020
-#define CH_FRONT_LEFT_OF_CENTER 0x00000040
-#define CH_FRONT_RIGHT_OF_CENTER 0x00000080
-#define CH_BACK_CENTER 0x00000100
-#define CH_SIDE_LEFT 0x00000200
-#define CH_SIDE_RIGHT 0x00000400
-#define CH_TOP_CENTER 0x00000800
-#define CH_TOP_FRONT_LEFT 0x00001000
-#define CH_TOP_FRONT_CENTER 0x00002000
-#define CH_TOP_FRONT_RIGHT 0x00004000
-#define CH_TOP_BACK_LEFT 0x00008000
-#define CH_TOP_BACK_CENTER 0x00010000
-#define CH_TOP_BACK_RIGHT 0x00020000
-#define CH_STEREO_LEFT 0x20000000 ///< Stereo downmix.
-#define CH_STEREO_RIGHT 0x40000000 ///< See CH_STEREO_LEFT.
-
-/** Channel mask value used for AVCodecContext.request_channel_layout
- to indicate that the user requests the channel order of the decoder output
- to be the native codec channel order. */
-#define CH_LAYOUT_NATIVE 0x8000000000000000LL
-
-/* Audio channel convenience macros */
-#define CH_LAYOUT_MONO (CH_FRONT_CENTER)
-#define CH_LAYOUT_STEREO (CH_FRONT_LEFT|CH_FRONT_RIGHT)
-#define CH_LAYOUT_2_1 (CH_LAYOUT_STEREO|CH_BACK_CENTER)
-#define CH_LAYOUT_SURROUND (CH_LAYOUT_STEREO|CH_FRONT_CENTER)
-#define CH_LAYOUT_4POINT0 (CH_LAYOUT_SURROUND|CH_BACK_CENTER)
-#define CH_LAYOUT_2_2 (CH_LAYOUT_STEREO|CH_SIDE_LEFT|CH_SIDE_RIGHT)
-#define CH_LAYOUT_QUAD (CH_LAYOUT_STEREO|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_5POINT0 (CH_LAYOUT_SURROUND|CH_SIDE_LEFT|CH_SIDE_RIGHT)
-#define CH_LAYOUT_5POINT1 (CH_LAYOUT_5POINT0|CH_LOW_FREQUENCY)
-#define CH_LAYOUT_5POINT0_BACK (CH_LAYOUT_SURROUND|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_5POINT1_BACK (CH_LAYOUT_5POINT0_BACK|CH_LOW_FREQUENCY)
-#define CH_LAYOUT_7POINT0 (CH_LAYOUT_5POINT0|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_7POINT1 (CH_LAYOUT_5POINT1|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_7POINT1_WIDE (CH_LAYOUT_5POINT1_BACK|\
- CH_FRONT_LEFT_OF_CENTER|CH_FRONT_RIGHT_OF_CENTER)
-#define CH_LAYOUT_STEREO_DOWNMIX (CH_STEREO_LEFT|CH_STEREO_RIGHT)
+ /**
+ * MIME type(s) associated with the codec.
+ * May be NULL; if not, a NULL-terminated array of MIME types.
+ * The first item is always non-NULL and is the preferred MIME type.
+ */
+ const char *const *mime_types;
+} AVCodecDescriptor;
 
-/* in bytes */
-#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+/**
+ * Codec uses only intra compression.
+ * Video codecs only.
+ */
+#define AV_CODEC_PROP_INTRA_ONLY (1 << 0)
+/**
+ * Codec supports lossy compression. Audio and video codecs only.
+ * @note a codec may support both lossy and lossless
+ * compression modes
+ */
+#define AV_CODEC_PROP_LOSSY (1 << 1)
+/**
+ * Codec supports lossless compression. Audio and video codecs only.
+ */
+#define AV_CODEC_PROP_LOSSLESS (1 << 2)
+/**
+ * Codec supports frame reordering. That is, the coded order (the order in which
+ * the encoded packets are output by the encoders / stored / input to the
+ * decoders) may be different from the presentation order of the corresponding
+ * frames.
+ *
+ * For codecs that do not have this property set, PTS and DTS should always be
+ * equal.
+ */
+#define AV_CODEC_PROP_REORDER (1 << 3)
+/**
+ * Subtitle codec is bitmap based
+ * Decoded AVSubtitle data can be read from the AVSubtitleRect->pict field.
+ */
+#define AV_CODEC_PROP_BITMAP_SUB (1 << 16)
+/**
+ * Subtitle codec is text based.
+ * Decoded AVSubtitle data can be read from the AVSubtitleRect->ass field.
+ */
+#define AV_CODEC_PROP_TEXT_SUB (1 << 17)
 
 /**
+ * @ingroup lavc_decoding
 * Required number of additionally allocated bytes at the end of the input bitstream for decoding.
 * This is mainly needed because some optimized bitstream readers read
 * 32 or 64 bit at once and could read over the end. 
 * Note: If the first 23 bits of the additional bytes are not 0, then damaged
 * MPEG bitstreams could cause overread and segfault.
 */
-#define FF_INPUT_BUFFER_PADDING_SIZE 8
+#define FF_INPUT_BUFFER_PADDING_SIZE 32
 
 /**
+ * @ingroup lavc_encoding
 * minimum encoding buffer size
 * Used to avoid some checks during header writing.
 */
@@ -445,6 +635,7 @@
 
 
 /**
+ * @ingroup lavc_encoding
 * motion estimation type.
 */
 enum Motion_Est_ID {
@@ -456,74 +647,41 @@
 ME_X1, ///< reserved for experiments
 ME_HEX, ///< hexagon based search
 ME_UMH, ///< uneven multi-hexagon search
- ME_ITER, ///< iterative search
 ME_TESA, ///< transformed exhaustive search algorithm
+ ME_ITER=50, ///< iterative search
 };
 
+/**
+ * @ingroup lavc_decoding
+ */
 enum AVDiscard{
 /* We leave some space between them for extensions (drop some
 * keyframes for intra-only or drop just some bidir frames). */
- AVDISCARD_NONE =-16, ///< discard nothing
- AVDISCARD_DEFAULT= 0, ///< discard useless packets like 0 size packets in avi
- AVDISCARD_NONREF = 8, ///< discard all non reference
- AVDISCARD_BIDIR = 16, ///< discard all bidirectional frames
- AVDISCARD_NONKEY = 32, ///< discard all frames except keyframes
- AVDISCARD_ALL = 48, ///< discard all
+ AVDISCARD_NONE =-16, ///< discard nothing
+ AVDISCARD_DEFAULT = 0, ///< discard useless packets like 0 size packets in avi
+ AVDISCARD_NONREF = 8, ///< discard all non reference
+ AVDISCARD_BIDIR = 16, ///< discard all bidirectional frames
+ AVDISCARD_NONINTRA= 24, ///< discard all non intra frames
+ AVDISCARD_NONKEY = 32, ///< discard all frames except keyframes
+ AVDISCARD_ALL = 48, ///< discard all
 };
 
-enum AVColorPrimaries{
- AVCOL_PRI_BT709 =1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
- AVCOL_PRI_UNSPECIFIED=2,
- AVCOL_PRI_BT470M =4,
- AVCOL_PRI_BT470BG =5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
- AVCOL_PRI_SMPTE170M =6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
- AVCOL_PRI_SMPTE240M =7, ///< functionally identical to above
- AVCOL_PRI_FILM =8,
- AVCOL_PRI_NB , ///< Not part of ABI
-};
-
-enum AVColorTransferCharacteristic{
- AVCOL_TRC_BT709 =1, ///< also ITU-R BT1361
- AVCOL_TRC_UNSPECIFIED=2,
- AVCOL_TRC_GAMMA22 =4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
- AVCOL_TRC_GAMMA28 =5, ///< also ITU-R BT470BG
- AVCOL_TRC_NB , ///< Not part of ABI
-};
-
-enum AVColorSpace{
- AVCOL_SPC_RGB =0,
- AVCOL_SPC_BT709 =1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
- AVCOL_SPC_UNSPECIFIED=2,
- AVCOL_SPC_FCC =4,
- AVCOL_SPC_BT470BG =5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
- AVCOL_SPC_SMPTE170M =6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
- AVCOL_SPC_SMPTE240M =7,
- AVCOL_SPC_NB , ///< Not part of ABI
-};
-
-enum AVColorRange{
- AVCOL_RANGE_UNSPECIFIED=0,
- AVCOL_RANGE_MPEG =1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges
- AVCOL_RANGE_JPEG =2, ///< the normal 2^n-1 "JPEG" YUV ranges
- AVCOL_RANGE_NB , ///< Not part of ABI
+enum AVAudioServiceType {
+ AV_AUDIO_SERVICE_TYPE_MAIN = 0,
+ AV_AUDIO_SERVICE_TYPE_EFFECTS = 1,
+ AV_AUDIO_SERVICE_TYPE_VISUALLY_IMPAIRED = 2,
+ AV_AUDIO_SERVICE_TYPE_HEARING_IMPAIRED = 3,
+ AV_AUDIO_SERVICE_TYPE_DIALOGUE = 4,
+ AV_AUDIO_SERVICE_TYPE_COMMENTARY = 5,
+ AV_AUDIO_SERVICE_TYPE_EMERGENCY = 6,
+ AV_AUDIO_SERVICE_TYPE_VOICE_OVER = 7,
+ AV_AUDIO_SERVICE_TYPE_KARAOKE = 8,
+ AV_AUDIO_SERVICE_TYPE_NB , ///< Not part of ABI
 };
 
 /**
- * X X 3 4 X X are luma samples,
- * 1 2 1-6 are possible chroma positions
- * X X 5 6 X 0 is undefined/unknown position
- */
-enum AVChromaLocation{
- AVCHROMA_LOC_UNSPECIFIED=0,
- AVCHROMA_LOC_LEFT =1, ///< mpeg2/4, h264 default
- AVCHROMA_LOC_CENTER =2, ///< mpeg1, jpeg, h263
- AVCHROMA_LOC_TOPLEFT =3, ///< DV
- AVCHROMA_LOC_TOP =4,
- AVCHROMA_LOC_BOTTOMLEFT =5,
- AVCHROMA_LOC_BOTTOM =6,
- AVCHROMA_LOC_NB , ///< Not part of ABI
-};
-
+ * @ingroup lavc_encoding
+ */
 typedef struct RcOverride{
 int start_frame;
 int end_frame;
@@ -531,72 +689,85 @@
 float quality_factor;
 } RcOverride;
 
+#if FF_API_MAX_BFRAMES
+/**
+ * @deprecated there is no libavcodec-wide limit on the number of B-frames
+ */
 #define FF_MAX_B_FRAMES 16
+#endif
 
 /* encoding support
 These flags can be passed in AVCodecContext.flags before initialization.
 Note: Not everything is supported yet.
 */
 
+/**
+ * Allow decoders to produce frames with data planes that are not aligned
+ * to CPU requirements (e.g. due to cropping).
+ */
+#define CODEC_FLAG_UNALIGNED 0x0001
 #define CODEC_FLAG_QSCALE 0x0002 ///< Use fixed qscale.
 #define CODEC_FLAG_4MV 0x0004 ///< 4 MV per MB allowed / advanced prediction for H.263.
+#define CODEC_FLAG_OUTPUT_CORRUPT 0x0008 ///< Output even those frames that might be corrupted
 #define CODEC_FLAG_QPEL 0x0010 ///< Use qpel MC.
+#if FF_API_GMC
+/**
+ * @deprecated use the "gmc" private option of the libxvid encoder
+ */
 #define CODEC_FLAG_GMC 0x0020 ///< Use GMC.
-#define CODEC_FLAG_MV0 0x0040 ///< Always try a MB with MV=<0,0>.
-#define CODEC_FLAG_PART 0x0080 ///< Use data partitioning.
+#endif
+#if FF_API_MV0
+/**
+ * @deprecated use the flag "mv0" in the "mpv_flags" private option of the
+ * mpegvideo encoders
+ */
+#define CODEC_FLAG_MV0 0x0040
+#endif
+#if FF_API_INPUT_PRESERVED
 /**
- * The parent program guarantees that the input for B-frames containing
- * streams is not written to for at least s->max_b_frames+1 frames, if
- * this is not set the input will be copied.
+ * @deprecated passing reference-counted frames to the encoders replaces this
+ * flag
 */
 #define CODEC_FLAG_INPUT_PRESERVED 0x0100
+#endif
 #define CODEC_FLAG_PASS1 0x0200 ///< Use internal 2pass ratecontrol in first pass mode.
 #define CODEC_FLAG_PASS2 0x0400 ///< Use internal 2pass ratecontrol in second pass mode.
-#define CODEC_FLAG_EXTERN_HUFF 0x1000 ///< Use external Huffman table (for MJPEG).
 #define CODEC_FLAG_GRAY 0x2000 ///< Only decode/encode grayscale.
-#define CODEC_FLAG_EMU_EDGE 0x4000 ///< Don't draw edges.
+#if FF_API_EMU_EDGE
+/**
+ * @deprecated edges are not used/required anymore. I.e. this flag is now always
+ * set.
+ */
+#define CODEC_FLAG_EMU_EDGE 0x4000
+#endif
 #define CODEC_FLAG_PSNR 0x8000 ///< error[?] variables will be set during encoding.
 #define CODEC_FLAG_TRUNCATED 0x00010000 /** Input bitstream might be truncated at a random
 location instead of only at frame boundaries. */
-#define CODEC_FLAG_NORMALIZE_AQP 0x00020000 ///< Normalize adaptive quantization.
+#if FF_API_NORMALIZE_AQP
+/**
+ * @deprecated use the flag "naq" in the "mpv_flags" private option of the
+ * mpegvideo encoders
+ */
+#define CODEC_FLAG_NORMALIZE_AQP 0x00020000
+#endif
 #define CODEC_FLAG_INTERLACED_DCT 0x00040000 ///< Use interlaced DCT.
 #define CODEC_FLAG_LOW_DELAY 0x00080000 ///< Force low delay.
-#define CODEC_FLAG_ALT_SCAN 0x00100000 ///< Use alternate scan.
 #define CODEC_FLAG_GLOBAL_HEADER 0x00400000 ///< Place global headers in extradata instead of every keyframe.
 #define CODEC_FLAG_BITEXACT 0x00800000 ///< Use only bitexact stuff (except (I)DCT).
 /* Fx : Flag for h263+ extra options */
 #define CODEC_FLAG_AC_PRED 0x01000000 ///< H.263 advanced intra coding / MPEG-4 AC prediction
-#define CODEC_FLAG_H263P_UMV 0x02000000 ///< unlimited motion vector
-#define CODEC_FLAG_CBP_RD 0x04000000 ///< Use rate distortion optimization for cbp.
-#define CODEC_FLAG_QP_RD 0x08000000 ///< Use rate distortion optimization for qp selectioon.
-#define CODEC_FLAG_H263P_AIV 0x00000008 ///< H.263 alternative inter VLC
-#define CODEC_FLAG_OBMC 0x00000001 ///< OBMC
 #define CODEC_FLAG_LOOP_FILTER 0x00000800 ///< loop filter
-#define CODEC_FLAG_H263P_SLICE_STRUCT 0x10000000
 #define CODEC_FLAG_INTERLACED_ME 0x20000000 ///< interlaced motion estimation
-#define CODEC_FLAG_SVCD_SCAN_OFFSET 0x40000000 ///< Will reserve space for SVCD scan offset user data.
 #define CODEC_FLAG_CLOSED_GOP 0x80000000
 #define CODEC_FLAG2_FAST 0x00000001 ///< Allow non spec compliant speedup tricks.
-#define CODEC_FLAG2_STRICT_GOP 0x00000002 ///< Strictly enforce GOP size.
 #define CODEC_FLAG2_NO_OUTPUT 0x00000004 ///< Skip bitstream encoding.
 #define CODEC_FLAG2_LOCAL_HEADER 0x00000008 ///< Place global headers at every keyframe instead of in extradata.
-#define CODEC_FLAG2_BPYRAMID 0x00000010 ///< H.264 allow B-frames to be used as references.
-#define CODEC_FLAG2_WPRED 0x00000020 ///< H.264 weighted biprediction for B-frames
-#define CODEC_FLAG2_MIXED_REFS 0x00000040 ///< H.264 one reference per partition, as opposed to one reference per macroblock
-#define CODEC_FLAG2_8X8DCT 0x00000080 ///< H.264 high profile 8x8 transform
-#define CODEC_FLAG2_FASTPSKIP 0x00000100 ///< H.264 fast pskip
-#define CODEC_FLAG2_AUD 0x00000200 ///< H.264 access unit delimiters
-#define CODEC_FLAG2_BRDO 0x00000400 ///< B-frame rate-distortion optimization
-#define CODEC_FLAG2_INTRA_VLC 0x00000800 ///< Use MPEG-2 intra VLC table.
-#define CODEC_FLAG2_MEMC_ONLY 0x00001000 ///< Only do ME/MC (I frames -> ref, P frame -> ME+MC).
-#define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000 ///< timecode is in drop frame format.
-#define CODEC_FLAG2_SKIP_RD 0x00004000 ///< RD optimal MB level residual skipping
+#define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000 ///< timecode is in drop frame format. DEPRECATED!!!!
+#define CODEC_FLAG2_IGNORE_CROP 0x00010000 ///< Discard cropping information from SPS.
+
 #define CODEC_FLAG2_CHUNKS 0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
-#define CODEC_FLAG2_NON_LINEAR_QUANT 0x00010000 ///< Use MPEG-2 nonlinear quantizer.
-#define CODEC_FLAG2_BIT_RESERVOIR 0x00020000 ///< Use a bit reservoir when encoding if possible
-#define CODEC_FLAG2_MBTREE 0x00040000 ///< Use macroblock tree ratecontrol (x264 only)
-#define CODEC_FLAG2_PSY 0x00080000 ///< Use psycho visual optimizations.
-#define CODEC_FLAG2_SSIM 0x00100000 ///< Compute SSIM during encoding, error[] values are undefined.
+#define CODEC_FLAG2_SHOW_ALL 0x00400000 ///< Show all frames before the first keyframe
+#define CODEC_FLAG2_EXPORT_MVS 0x10000000 ///< Export motion vectors through frame side data
 
 /* Unsupported options :
 * Syntax Arithmetic coding (SAC)
@@ -612,14 +783,39 @@
 * assume the buffer was allocated by avcodec_default_get_buffer.
 */
 #define CODEC_CAP_DR1 0x0002
-/* If 'parse_only' field is true, then avcodec_parse_frame() can be used. */
-#define CODEC_CAP_PARSE_ONLY 0x0004
 #define CODEC_CAP_TRUNCATED 0x0008
-/* Codec can export data for HW decoding (XvMC). */
+#if FF_API_XVMC
+/* Codec can export data for HW decoding. This flag indicates that
+ * the codec would call get_format() with list that might contain HW accelerated
+ * pixel formats (XvMC, VDPAU, VAAPI, etc). The application can pick any of them
+ * including raw image format.
+ * The application can use the passed context to determine bitstream version,
+ * chroma format, resolution etc.
+ */
 #define CODEC_CAP_HWACCEL 0x0010
+#endif /* FF_API_XVMC */
 /**
- * Codec has a nonzero delay and needs to be fed with NULL at the end to get the delayed data.
- * If this is not set, the codec is guaranteed to never be fed with NULL data.
+ * Encoder or decoder requires flushing with NULL input at the end in order to
+ * give the complete and correct output.
+ *
+ * NOTE: If this flag is not set, the codec is guaranteed to never be fed with
+ * with NULL data. The user can still send NULL data to the public encode
+ * or decode function, but libavcodec will not pass it along to the codec
+ * unless this flag is set.
+ *
+ * Decoders:
+ * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL,
+ * avpkt->size=0 at the end to get the delayed data until the decoder no longer
+ * returns frames.
+ *
+ * Encoders:
+ * The encoder needs to be fed with NULL data at the end of encoding until the
+ * encoder no longer returns data.
+ *
+ * NOTE: For encoders implementing the AVCodec.encode2() function, setting this
+ * flag also means that the encoder must set the pts and duration for
+ * each output packet. If this flag is not set, the pts and duration will
+ * be determined by libavcodec from the input frame.
 */
 #define CODEC_CAP_DELAY 0x0020
 /**
@@ -627,10 +823,12 @@
 * This can be used to prevent truncation of the last audio samples.
 */
 #define CODEC_CAP_SMALL_LAST_FRAME 0x0040
+#if FF_API_CAP_VDPAU
 /**
 * Codec can export data for HW decoding (VDPAU).
 */
 #define CODEC_CAP_HWACCEL_VDPAU 0x0080
+#endif
 /**
 * Codec can output multiple frames per AVPacket
 * Normally demuxers return one frame at a time, demuxers which do not do
@@ -643,7 +841,51 @@
 * as a last resort.
 */
 #define CODEC_CAP_SUBFRAMES 0x0100
+/**
+ * Codec is experimental and is thus avoided in favor of non experimental
+ * encoders
+ */
+#define CODEC_CAP_EXPERIMENTAL 0x0200
+/**
+ * Codec should fill in channel configuration and samplerate instead of container
+ */
+#define CODEC_CAP_CHANNEL_CONF 0x0400
+#if FF_API_NEG_LINESIZES
+/**
+ * @deprecated no codecs use this capability
+ */
+#define CODEC_CAP_NEG_LINESIZES 0x0800
+#endif
+/**
+ * Codec supports frame-level multithreading.
+ */
+#define CODEC_CAP_FRAME_THREADS 0x1000
+/**
+ * Codec supports slice-based (or partition-based) multithreading.
+ */
+#define CODEC_CAP_SLICE_THREADS 0x2000
+/**
+ * Codec supports changed parameters at any point.
+ */
+#define CODEC_CAP_PARAM_CHANGE 0x4000
+/**
+ * Codec supports avctx->thread_count == 0 (auto).
+ */
+#define CODEC_CAP_AUTO_THREADS 0x8000
+/**
+ * Audio encoder supports receiving a different number of samples in each call.
+ */
+#define CODEC_CAP_VARIABLE_FRAME_SIZE 0x10000
+/**
+ * Codec is intra only.
+ */
+#define CODEC_CAP_INTRA_ONLY 0x40000000
+/**
+ * Codec is lossless.
+ */
+#define CODEC_CAP_LOSSLESS 0x80000000
 
+#if FF_API_MB_TYPE
 //The following defines may change, don't expect compatibility if you use them.
 #define MB_TYPE_INTRA4x4 0x0001
 #define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
@@ -667,6 +909,7 @@
 #define MB_TYPE_QUANT 0x00010000
 #define MB_TYPE_CBP 0x00020000
 //Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...)
+#endif
 
 /**
 * Pan Scan area.
@@ -697,260 +940,200 @@
 int16_t position[3][2];
 }AVPanScan;
 
-#define FF_COMMON_FRAME \
- /**\
- * pointer to the picture planes.\
- * This might be different from the first allocated byte\
- * - encoding: \
- * - decoding: \
- */\
- uint8_t *data[4];\
- int linesize[4];\
- /**\
- * pointer to the first allocated byte of the picture. Can be used in get_buffer/release_buffer.\
- * This isn't used by libavcodec unless the default get/release_buffer() is used.\
- * - encoding: \
- * - decoding: \
- */\
- uint8_t *base[4];\
- /**\
- * 1 -> keyframe, 0-> not\
- * - encoding: Set by libavcodec.\
- * - decoding: Set by libavcodec.\
- */\
- int key_frame;\
-\
- /**\
- * Picture type of the frame, see ?_TYPE below.\
- * - encoding: Set by libavcodec. for coded_picture (and set by user for input).\
- * - decoding: Set by libavcodec.\
- */\
- int pict_type;\
-\
- /**\
- * presentation timestamp in time_base units (time when frame should be shown to user)\
- * If AV_NOPTS_VALUE then frame_rate = 1/time_base will be assumed.\
- * - encoding: MUST be set by user.\
- * - decoding: Set by libavcodec.\
- */\
- int64_t pts;\
-\
- /**\
- * picture number in bitstream order\
- * - encoding: set by\
- * - decoding: Set by libavcodec.\
- */\
- int coded_picture_number;\
- /**\
- * picture number in display order\
- * - encoding: set by\
- * - decoding: Set by libavcodec.\
- */\
- int display_picture_number;\
-\
- /**\
- * quality (between 1 (good) and FF_LAMBDA_MAX (bad)) \
- * - encoding: Set by libavcodec. for coded_picture (and set by user for input).\
- * - decoding: Set by libavcodec.\
- */\
- int quality; \
-\
- /**\
- * buffer age (1->was last buffer and dint change, 2->..., ...).\
- * Set to INT_MAX if the buffer has not been used yet.\
- * - encoding: unused\
- * - decoding: MUST be set by get_buffer().\
- */\
- int age;\
-\
- /**\
- * is this picture used as reference\
- * The values for this are the same as the MpegEncContext.picture_structure\
- * variable, that is 1->top field, 2->bottom field, 3->frame/both fields.\
- * Set to 4 for delayed, non-reference frames.\
- * - encoding: unused\
- * - decoding: Set by libavcodec. (before get_buffer() call)).\
- */\
- int reference;\
-\
- /**\
- * QP table\
- * - encoding: unused\
- * - decoding: Set by libavcodec.\
- */\
- int8_t *qscale_table;\
- /**\
- * QP store stride\
- * - encoding: unused\
- * - decoding: Set by libavcodec.\
- */\
- int qstride;\
-\
- /**\
- * mbskip_table[mb]>=1 if MB didn't change\
- * stride= mb_width = (width+15)>>4\
- * - encoding: unused\
- * - decoding: Set by libavcodec.\
- */\
- uint8_t *mbskip_table;\
-\
- /**\
- * motion vector table\
- * @code\
- * example:\
- * int mv_sample_log2= 4 - motion_subsample_log2;\
- * int mb_width= (width+15)>>4;\
- * int mv_stride= (mb_width << mv_sample_log2) + 1;\
- * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];\
- * @endcode\
- * - encoding: Set by user.\
- * - decoding: Set by libavcodec.\
- */\
- int16_t (*motion_val[2])[2];\
-\
- /**\
- * macroblock type table\
- * mb_type_base + mb_width + 2\
- * - encoding: Set by user.\
- * - decoding: Set by libavcodec.\
- */\
- uint32_t *mb_type;\
-\
- /**\
- * log2 of the size of the block which a single vector in motion_val represents: \
- * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)\
- * - encoding: unused\
- * - decoding: Set by libavcodec.\
- */\
- uint8_t motion_subsample_log2;\
-\
- /**\
- * for some private data of the user\
- * - encoding: unused\
- * - decoding: Set by user.\
- */\
- void *opaque;\
-\
- /**\
- * error\
- * - encoding: Set by libavcodec. if flags&CODEC_FLAG_PSNR.\
- * - decoding: unused\
- */\
- uint64_t error[4];\
-\
- /**\
- * type of the buffer (to keep track of who has to deallocate data[*])\
- * - encoding: Set by the one who allocates it.\
- * - decoding: Set by the one who allocates it.\
- * Note: User allocated (direct rendering) & internal buffers cannot coexist currently.\
- */\
- int type;\
- \
- /**\
- * When decoding, this signals how much the picture must be delayed.\
- * extra_delay = repeat_pict / (2*fps)\
- * - encoding: unused\
- * - decoding: Set by libavcodec.\
- */\
- int repeat_pict;\
- \
- /**\
- * \
- */\
- int qscale_type;\
- \
- /**\
- * The content of the picture is interlaced.\
- * - encoding: Set by user.\
- * - decoding: Set by libavcodec. (default 0)\
- */\
- int interlaced_frame;\
- \
- /**\
- * If the content is interlaced, is top field displayed first.\
- * - encoding: Set by user.\
- * - decoding: Set by libavcodec.\
- */\
- int top_field_first;\
- \
- /**\
- * Pan scan.\
- * - encoding: Set by user.\
- * - decoding: Set by libavcodec.\
- */\
- AVPanScan *pan_scan;\
- \
- /**\
- * Tell user application that palette has changed from previous frame.\
- * - encoding: ??? (no palette-enabled encoder yet)\
- * - decoding: Set by libavcodec. (default 0).\
- */\
- int palette_has_changed;\
- \
- /**\
- * codec suggestion on buffer type if != 0\
- * - encoding: unused\
- * - decoding: Set by libavcodec. (before get_buffer() call)).\
- */\
- int buffer_hints;\
-\
- /**\
- * DCT coefficients\
- * - encoding: unused\
- * - decoding: Set by libavcodec.\
- */\
- short *dct_coeff;\
-\
- /**\
- * motion reference frame index\
- * the order in which these are stored can depend on the codec.\
- * - encoding: Set by user.\
- * - decoding: Set by libavcodec.\
- */\
- int8_t *ref_index[2];\
-\
- /**\
- * reordered opaque 64bit number (generally a PTS) from AVCodecContext.reordered_opaque\
- * output in AVFrame.reordered_opaque\
- * - encoding: unused\
- * - decoding: Read by user.\
- */\
- int64_t reordered_opaque;\
-\
- /**\
- * hardware accelerator private data (FFmpeg allocated)\
- * - encoding: unused\
- * - decoding: Set by libavcodec\
- */\
- void *hwaccel_picture_private;\
-
-
+#if FF_API_QSCALE_TYPE
 #define FF_QSCALE_TYPE_MPEG1 0
 #define FF_QSCALE_TYPE_MPEG2 1
 #define FF_QSCALE_TYPE_H264 2
 #define FF_QSCALE_TYPE_VP56 3
+#endif
 
+#if FF_API_GET_BUFFER
 #define FF_BUFFER_TYPE_INTERNAL 1
 #define FF_BUFFER_TYPE_USER 2 ///< direct rendering buffers (image is (de)allocated by user)
 #define FF_BUFFER_TYPE_SHARED 4 ///< Buffer from somewhere else; don't deallocate image (data/base), all other tables are not shared.
 #define FF_BUFFER_TYPE_COPY 8 ///< Just a (modified) copy of some other buffer, don't deallocate anything.
 
-
-#define FF_I_TYPE 1 ///< Intra
-#define FF_P_TYPE 2 ///< Predicted
-#define FF_B_TYPE 3 ///< Bi-dir predicted
-#define FF_S_TYPE 4 ///< S(GMC)-VOP MPEG4
-#define FF_SI_TYPE 5 ///< Switching Intra
-#define FF_SP_TYPE 6 ///< Switching Predicted
-#define FF_BI_TYPE 7
-
 #define FF_BUFFER_HINTS_VALID 0x01 // Buffer hints value is meaningful (if 0 ignore).
 #define FF_BUFFER_HINTS_READABLE 0x02 // Codec will read from buffer.
 #define FF_BUFFER_HINTS_PRESERVE 0x04 // User must not alter buffer content.
 #define FF_BUFFER_HINTS_REUSABLE 0x08 // Codec will reuse the buffer (update).
+#endif
+
+/**
+ * The decoder will keep a reference to the frame and may reuse it later.
+ */
+#define AV_GET_BUFFER_FLAG_REF (1 << 0)
+
+/**
+ * @defgroup lavc_packet AVPacket
+ *
+ * Types and functions for working with AVPacket.
+ * @{
+ */
+enum AVPacketSideDataType {
+ AV_PKT_DATA_PALETTE,
+ AV_PKT_DATA_NEW_EXTRADATA,
+
+ /**
+ * An AV_PKT_DATA_PARAM_CHANGE side data packet is laid out as follows:
+ * @code
+ * u32le param_flags
+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT)
+ * s32le channel_count
+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT)
+ * u64le channel_layout
+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE)
+ * s32le sample_rate
+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS)
+ * s32le width
+ * s32le height
+ * @endcode
+ */
+ AV_PKT_DATA_PARAM_CHANGE,
+
+ /**
+ * An AV_PKT_DATA_H263_MB_INFO side data packet contains a number of
+ * structures with info about macroblocks relevant to splitting the
+ * packet into smaller packets on macroblock edges (e.g. as for RFC 2190).
+ * That is, it does not necessarily contain info about all macroblocks,
+ * as long as the distance between macroblocks in the info is smaller
+ * than the target payload size.
+ * Each MB info structure is 12 bytes, and is laid out as follows:
+ * @code
+ * u32le bit offset from the start of the packet
+ * u8 current quantizer at the start of the macroblock
+ * u8 GOB number
+ * u16le macroblock address within the GOB
+ * u8 horizontal MV predictor
+ * u8 vertical MV predictor
+ * u8 horizontal MV predictor for block number 3
+ * u8 vertical MV predictor for block number 3
+ * @endcode
+ */
+ AV_PKT_DATA_H263_MB_INFO,
+
+ /**
+ * This side data should be associated with an audio stream and contains
+ * ReplayGain information in form of the AVReplayGain struct.
+ */
+ AV_PKT_DATA_REPLAYGAIN,
+
+ /**
+ * This side data contains a 3x3 transformation matrix describing an affine
+ * transformation that needs to be applied to the decoded video frames for
+ * correct presentation.
+ *
+ * See libavutil/display.h for a detailed description of the data.
+ */
+ AV_PKT_DATA_DISPLAYMATRIX,
+
+ /**
+ * This side data should be associated with a video stream and contains
+ * Stereoscopic 3D information in form of the AVStereo3D struct.
+ */
+ AV_PKT_DATA_STEREO3D,
+
+ /**
+ * Recommmends skipping the specified number of samples
+ * @code
+ * u32le number of samples to skip from start of this packet
+ * u32le number of samples to skip from end of this packet
+ * u8 reason for start skip
+ * u8 reason for end skip (0=padding silence, 1=convergence)
+ * @endcode
+ */
+ AV_PKT_DATA_SKIP_SAMPLES=70,
+
+ /**
+ * An AV_PKT_DATA_JP_DUALMONO side data packet indicates that
+ * the packet may contain "dual mono" audio specific to Japanese DTV
+ * and if it is true, recommends only the selected channel to be used.
+ * @code
+ * u8 selected channels (0=mail/left, 1=sub/right, 2=both)
+ * @endcode
+ */
+ AV_PKT_DATA_JP_DUALMONO,
+
+ /**
+ * A list of zero terminated key/value strings. There is no end marker for
+ * the list, so it is required to rely on the side data size to stop.
+ */
+ AV_PKT_DATA_STRINGS_METADATA,
 
+ /**
+ * Subtitle event position
+ * @code
+ * u32le x1
+ * u32le y1
+ * u32le x2
+ * u32le y2
+ * @endcode
+ */
+ AV_PKT_DATA_SUBTITLE_POSITION,
+
+ /**
+ * Data found in BlockAdditional element of matroska container. There is
+ * no end marker for the data, so it is required to rely on the side data
+ * size to recognize the end. 8 byte id (as found in BlockAddId) followed
+ * by data.
+ */
+ AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
+
+ /**
+ * The optional first identifier line of a WebVTT cue.
+ */
+ AV_PKT_DATA_WEBVTT_IDENTIFIER,
+
+ /**
+ * The optional settings (rendering instructions) that immediately
+ * follow the timestamp specifier of a WebVTT cue.
+ */
+ AV_PKT_DATA_WEBVTT_SETTINGS,
+
+ /**
+ * A list of zero terminated key/value strings. There is no end marker for
+ * the list, so it is required to rely on the side data size to stop. This
+ * side data includes updated metadata which appeared in the stream.
+ */
+ AV_PKT_DATA_METADATA_UPDATE,
+};
+
+typedef struct AVPacketSideData {
+ uint8_t *data;
+ int size;
+ enum AVPacketSideDataType type;
+} AVPacketSideData;
+
+/**
+ * This structure stores compressed data. It is typically exported by demuxers
+ * and then passed as input to decoders, or received as output from encoders and
+ * then passed to muxers.
+ *
+ * For video, it should typically contain one compressed frame. For audio it may
+ * contain several compressed frames.
+ *
+ * AVPacket is one of the few structs in FFmpeg, whose size is a part of public
+ * ABI. Thus it may be allocated on stack and no new fields can be added to it
+ * without libavcodec and libavformat major bump.
+ *
+ * The semantics of data ownership depends on the buf or destruct (deprecated)
+ * fields. If either is set, the packet data is dynamically allocated and is
+ * valid indefinitely until av_free_packet() is called (which in turn calls
+ * av_buffer_unref()/the destruct callback to free the data). If neither is set,
+ * the packet data is typically backed by some static buffer somewhere and is
+ * only valid for a limited time (e.g. until the next read call when demuxing).
+ *
+ * The side data is always allocated with av_malloc() and is freed in
+ * av_free_packet().
+ */
 typedef struct AVPacket {
 /**
+ * A reference to the reference-counted buffer where the packet data is
+ * stored.
+ * May be NULL, then the packet data is not reference-counted.
+ */
+ AVBufferRef *buf;
+ /**
 * Presentation timestamp in AVStream->time_base units; the time at which
 * the decompressed packet will be presented to the user.
 * Can be AV_NOPTS_VALUE if it is not stored in the file.
@@ -969,14 +1152,28 @@
 uint8_t *data;
 int size;
 int stream_index;
+ /**
+ * A combination of AV_PKT_FLAG values
+ */
 int flags;
 /**
+ * Additional packet data that can be provided by the container.
+ * Packet can contain several types of side information.
+ */
+ AVPacketSideData *side_data;
+ int side_data_elems;
+
+ /**
 * Duration of this packet in AVStream->time_base units, 0 if unknown.
 * Equals next_pts - this_pts in presentation order.
 */
 int duration;
+#if FF_API_DESTRUCT_PACKET
+ attribute_deprecated
 void (*destruct)(struct AVPacket *);
+ attribute_deprecated
 void *priv;
+#endif
 int64_t pos; ///< byte position in stream, -1 if unknown
 
 /**
@@ -987,6 +1184,8 @@
 * the very first frame or from this keyframe.
 * Is AV_NOPTS_VALUE if unknown.
 * This field is not the display duration of the current packet.
+ * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
+ * set.
 *
 * The purpose of this field is to allow seeking in streams that have no
 * keyframes in the conventional sense. It corresponds to the
@@ -996,37 +1195,98 @@
 */
 int64_t convergence_duration;
 } AVPacket;
-#define AV_PKT_FLAG_KEY 0x0001
-#if LIBAVCODEC_VERSION_MAJOR < 53
-#define PKT_FLAG_KEY AV_PKT_FLAG_KEY
-#endif
+#define AV_PKT_FLAG_KEY 0x0001 ///< The packet contains a keyframe
+#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
 
+enum AVSideDataParamChangeFlags {
+ AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT = 0x0001,
+ AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT = 0x0002,
+ AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE = 0x0004,
+ AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS = 0x0008,
+};
 /**
- * Audio Video Frame.
- * New fields can be added to the end of FF_COMMON_FRAME with minor version
- * bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump. No fields should be added into AVFrame before or after
- * FF_COMMON_FRAME!
- * sizeof(AVFrame) must not be used outside libav*.
- */
-typedef struct AVFrame {
- FF_COMMON_FRAME
-} AVFrame;
+ * @}
+ */
+
+struct AVCodecInternal;
+
+enum AVFieldOrder {
+ AV_FIELD_UNKNOWN,
+ AV_FIELD_PROGRESSIVE,
+ AV_FIELD_TT, //< Top coded_first, top displayed first
+ AV_FIELD_BB, //< Bottom coded first, bottom displayed first
+ AV_FIELD_TB, //< Top coded first, bottom displayed first
+ AV_FIELD_BT, //< Bottom coded first, top displayed first
+};
 
 /**
 * main external API structure.
 * New fields can be added to the end with minor version bumps.
 * Removal, reordering and changes to existing fields require a major
 * version bump.
+ * Please use AVOptions (av_opt* / av_set/get*()) to access these fields from user
+ * applications.
 * sizeof(AVCodecContext) must not be used outside libav*.
 */
 typedef struct AVCodecContext {
 /**
 * information on struct for av_log
- * - set by avcodec_alloc_context
+ * - set by avcodec_alloc_context3
 */
 const AVClass *av_class;
+ int log_level_offset;
+
+ enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
+ const struct AVCodec *codec;
+#if FF_API_CODEC_NAME
+ /**
+ * @deprecated this field is not used for anything in libavcodec
+ */
+ attribute_deprecated
+ char codec_name[32];
+#endif
+ enum AVCodecID codec_id; /* see AV_CODEC_ID_xxx */
+
+ /**
+ * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
+ * This is used to work around some encoder bugs.
+ * A demuxer should set this to what is stored in the field used to identify the codec.
+ * If there are multiple such fields in a container then the demuxer should choose the one
+ * which maximizes the information about the used codec.
+ * If the codec tag field in a container is larger than 32 bits then the demuxer should
+ * remap the longer ID to 32 bits with a table or other structure. Alternatively a new
+ * extra_codec_tag + size could be added but for this a clear advantage must be demonstrated
+ * first.
+ * - encoding: Set by user, if not then the default based on codec_id will be used.
+ * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
+ */
+ unsigned int codec_tag;
+
+ /**
+ * fourcc from the AVI stream header (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
+ * This is used to work around some encoder bugs.
+ * - encoding: unused
+ * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
+ */
+ unsigned int stream_codec_tag;
+
+ void *priv_data;
+
+ /**
+ * Private context used for internal data.
+ *
+ * Unlike priv_data, this is not codec-specific. It is used in general
+ * libavcodec functions.
+ */
+ struct AVCodecInternal *internal;
+
+ /**
+ * Private data of the user, can be used to carry app specific stuff.
+ * - encoding: Set by user.
+ * - decoding: Set by user.
+ */
+ void *opaque;
+
 /**
 * the average bitrate
 * - encoding: Set by user; unused for constant quantizer encoding.
@@ -1043,30 +1303,33 @@
 int bit_rate_tolerance;
 
 /**
- * CODEC_FLAG_*.
+ * Global quality for codecs which cannot change it per frame.
+ * This should be proportional to MPEG-1/2/4 qscale.
 * - encoding: Set by user.
- * - decoding: Set by user.
+ * - decoding: unused
 */
- int flags;
+ int global_quality;
 
 /**
- * Some codecs need additional format info. It is stored here.
- * If any muxer uses this then ALL demuxers/parsers AND encoders for the
- * specific codec MUST set it correctly otherwise stream copy breaks.
- * In general use of this field by muxers is not recommanded.
- * - encoding: Set by libavcodec.
- * - decoding: Set by libavcodec. (FIXME: Is this OK?)
+ * - encoding: Set by user.
+ * - decoding: unused
 */
- int sub_id;
+ int compression_level;
+#define FF_COMPRESSION_DEFAULT -1
 
 /**
- * Motion estimation algorithm used for video coding.
- * 1 (zero), 2 (full), 3 (log), 4 (phods), 5 (epzs), 6 (x1), 7 (hex),
- * 8 (umh), 9 (iter), 10 (tesa) [7, 8, 10 are x264 specific, 9 is snow specific]
- * - encoding: MUST be set by user.
- * - decoding: unused
+ * CODEC_FLAG_*.
+ * - encoding: Set by user.
+ * - decoding: Set by user.
 */
- int me_method;
+ int flags;
+
+ /**
+ * CODEC_FLAG2_*
+ * - encoding: Set by user.
+ * - decoding: Set by user.
+ */
+ int flags2;
 
 /**
 * some codecs need / can use extradata like Huffman tables.
@@ -1074,7 +1337,7 @@
 * rv10: additional flags
 * mpeg4: global headers (they can be in the bitstream or here)
 * The allocated memory should be FF_INPUT_BUFFER_PADDING_SIZE bytes larger
- * than extradata_size to avoid prolems if it is read with the bitstream reader.
+ * than extradata_size to avoid problems if it is read with the bitstream reader.
 * The bytewise contents of extradata must not depend on the architecture or CPU endianness.
 * - encoding: Set/allocated/freed by libavcodec.
 * - decoding: Set/allocated/freed by user.
@@ -1092,17 +1355,73 @@
 */
 AVRational time_base;
 
+ /**
+ * For some codecs, the time base is closer to the field rate than the frame rate.
+ * Most notably, H.264 and MPEG-2 specify time_base as half of frame duration
+ * if no telecine is used ...
+ *
+ * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it to 2.
+ */
+ int ticks_per_frame;
+
+ /**
+ * Codec delay.
+ *
+ * Encoding: Number of frames delay there will be from the encoder input to
+ * the decoder output. (we assume the decoder matches the spec)
+ * Decoding: Number of frames delay in addition to what a standard decoder
+ * as specified in the spec would produce.
+ *
+ * Video:
+ * Number of frames the decoded output will be delayed relative to the
+ * encoded input.
+ *
+ * Audio:
+ * For encoding, this is the number of "priming" samples added by the
+ * encoder to the beginning of the stream. The decoded output will be
+ * delayed by this many samples relative to the input to the encoder (or
+ * more, if the decoder adds its own padding).
+ * The timestamps on the output packets are adjusted by the encoder so
+ * that they always refer to the first sample of the data actually
+ * contained in the packet, including any added padding.
+ * E.g. if the timebase is 1/samplerate and the timestamp of the first
+ * input sample is 0, the timestamp of the first output packet will be
+ * -delay.
+ *
+ * For decoding, this is the number of samples the decoder needs to
+ * output before the decoder's output is valid. When seeking, you should
+ * start decoding this many samples prior to your desired seek point.
+ *
+ * - encoding: Set by libavcodec.
+ * - decoding: Set by libavcodec.
+ */
+ int delay;
+
+
 /* video only */
 /**
 * picture width / height.
 * - encoding: MUST be set by user.
- * - decoding: Set by libavcodec.
- * Note: For compatibility it is possible to set this instead of
- * coded_width/height before decoding.
+ * - decoding: May be set by the user before opening the decoder if known e.g.
+ * from the container. Some decoders will require the dimensions
+ * to be set by the caller. During decoding, the decoder may
+ * overwrite those values as required.
 */
 int width, height;
 
+ /**
+ * Bitstream width / height, may be different from width/height e.g. when
+ * the decoded frame is cropped before being output or lowres is enabled.
+ * - encoding: unused
+ * - decoding: May be set by the user before opening the decoder if known
+ * e.g. from the container. During decoding, the decoder may
+ * overwrite those values as required.
+ */
+ int coded_width, coded_height;
+
+#if FF_API_ASPECT_EXTENDED
 #define FF_ASPECT_EXTENDED 15
+#endif
 
 /**
 * the number of pictures in a group of pictures, or 0 for intra_only
@@ -1112,25 +1431,32 @@
 int gop_size;
 
 /**
- * Pixel format, see PIX_FMT_xxx.
+ * Pixel format, see AV_PIX_FMT_xxx.
+ * May be set by the demuxer if known from headers.
+ * May be overridden by the decoder if it knows better.
 * - encoding: Set by user.
- * - decoding: Set by libavcodec.
+ * - decoding: Set by user if known, overridden by libavcodec if known
 */
- enum PixelFormat pix_fmt;
+ enum AVPixelFormat pix_fmt;
 
 /**
- * Frame rate emulation. If not zero, the lower layer (i.e. format handler)
- * has to read frames at native frame rate.
- * - encoding: Set by user.
+ * Motion estimation algorithm used for video coding.
+ * 1 (zero), 2 (full), 3 (log), 4 (phods), 5 (epzs), 6 (x1), 7 (hex),
+ * 8 (umh), 9 (iter), 10 (tesa) [7, 8, 10 are x264 specific, 9 is snow specific]
+ * - encoding: MUST be set by user.
 * - decoding: unused
 */
- int rate_emu;
+ int me_method;
 
 /**
 * If non NULL, 'draw_horiz_band' is called by the libavcodec
 * decoder to draw a horizontal band. It improves cache usage. Not
 * all codecs can do that. You must check the codec capabilities
 * beforehand.
+ * When multithreading is used, it may be called from multiple threads
+ * at the same time; threads might draw different parts of the same AVFrame,
+ * or multiple AVFrames, and there is no guarantee that slices will be drawn
+ * in order.
 * The function is also used by hardware acceleration APIs.
 * It is called at least once during frame decoding to pass
 * the data needed for hardware render.
@@ -1146,62 +1472,19 @@
 * @param offset offset into the AVFrame.data from which the slice should be read
 */
 void (*draw_horiz_band)(struct AVCodecContext *s,
- const AVFrame *src, int offset[4],
+ const AVFrame *src, int offset[AV_NUM_DATA_POINTERS],
 int y, int type, int height);
 
- /* audio only */
- int sample_rate; ///< samples per second
- int channels; ///< number of audio channels
-
- /**
- * audio sample format
- * - encoding: Set by user.
- * - decoding: Set by libavcodec.
- */
- enum SampleFormat sample_fmt; ///< sample format
-
- /* The following data should not be initialized. */
- /**
- * Samples per packet, initialized when calling 'init'.
- */
- int frame_size;
- int frame_number; ///< audio or video frame number
-#if LIBAVCODEC_VERSION_MAJOR < 53
- int real_pict_num; ///< Returns the real picture number of previous encoded frame.
-#endif
-
 /**
- * Number of frames the decoded output will be delayed relative to
- * the encoded input.
- * - encoding: Set by libavcodec.
- * - decoding: unused
- */
- int delay;
-
- /* - encoding parameters */
- float qcompress; ///< amount of qscale change between easy & hard scenes (0.0-1.0)
- float qblur; ///< amount of qscale smoothing over time (0.0-1.0)
-
- /**
- * minimum quantizer
- * - encoding: Set by user.
- * - decoding: unused
- */
- int qmin;
-
- /**
- * maximum quantizer
- * - encoding: Set by user.
- * - decoding: unused
+ * callback to negotiate the pixelFormat
+ * @param fmt is the list of formats which are supported by the codec,
+ * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality.
+ * The first is always the native one.
+ * @return the chosen format
+ * - encoding: unused
+ * - decoding: Set by user, if not set the native format will be chosen.
 */
- int qmax;
-
- /**
- * maximum quantizer difference between frames
- * - encoding: Set by user.
- * - decoding: unused
- */
- int max_qdiff;
+ enum AVPixelFormat (*get_format)(struct AVCodecContext *s, const enum AVPixelFormat * fmt);
 
 /**
 * maximum number of B-frames between non-B-frames
@@ -1227,134 +1510,6 @@
 int b_frame_strategy;
 
 /**
- * hurry up amount
- * - encoding: unused
- * - decoding: Set by user. 1-> Skip B-frames, 2-> Skip IDCT/dequant too, 5-> Skip everything except header
- * @deprecated Deprecated in favor of skip_idct and skip_frame.
- */
- int hurry_up;
-
- struct AVCodec *codec;
-
- void *priv_data;
-
- int rtp_payload_size; /* The size of the RTP payload: the coder will */
- /* do its best to deliver a chunk with size */
- /* below rtp_payload_size, the chunk will start */
- /* with a start code on some codecs like H.263. */
- /* This doesn't take account of any particular */
- /* headers inside the transmitted RTP payload. */
-
-
- /* The RTP callback: This function is called */
- /* every time the encoder has a packet to send. */
- /* It depends on the encoder if the data starts */
- /* with a Start Code (it should). H.263 does. */
- /* mb_nb contains the number of macroblocks */
- /* encoded in the RTP payload. */
- void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb);
-
- /* statistics, used for 2-pass encoding */
- int mv_bits;
- int header_bits;
- int i_tex_bits;
- int p_tex_bits;
- int i_count;
- int p_count;
- int skip_count;
- int misc_bits;
-
- /**
- * number of bits used for the previously encoded frame
- * - encoding: Set by libavcodec.
- * - decoding: unused
- */
- int frame_bits;
-
- /**
- * Private data of the user, can be used to carry app specific stuff.
- * - encoding: Set by user.
- * - decoding: Set by user.
- */
- void *opaque;
-
- char codec_name[32];
- enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
- enum CodecID codec_id; /* see CODEC_ID_xxx */
-
- /**
- * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
- * This is used to work around some encoder bugs.
- * A demuxer should set this to what is stored in the field used to identify the codec.
- * If there are multiple such fields in a container then the demuxer should choose the one
- * which maximizes the information about the used codec.
- * If the codec tag field in a container is larger then 32 bits then the demuxer should
- * remap the longer ID to 32 bits with a table or other structure. Alternatively a new
- * extra_codec_tag + size could be added but for this a clear advantage must be demonstrated
- * first.
- * - encoding: Set by user, if not then the default based on codec_id will be used.
- * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
- */
- unsigned int codec_tag;
-
- /**
- * Work around bugs in encoders which sometimes cannot be detected automatically.
- * - encoding: Set by user
- * - decoding: Set by user
- */
- int workaround_bugs;
-#define FF_BUG_AUTODETECT 1 ///< autodetection
-#define FF_BUG_OLD_MSMPEG4 2
-#define FF_BUG_XVID_ILACE 4
-#define FF_BUG_UMP4 8
-#define FF_BUG_NO_PADDING 16
-#define FF_BUG_AMV 32
-#define FF_BUG_AC_VLC 0 ///< Will be removed, libavcodec can now handle these non-compliant files by default.
-#define FF_BUG_QPEL_CHROMA 64
-#define FF_BUG_STD_QPEL 128
-#define FF_BUG_QPEL_CHROMA2 256
-#define FF_BUG_DIRECT_BLOCKSIZE 512
-#define FF_BUG_EDGE 1024
-#define FF_BUG_HPEL_CHROMA 2048
-#define FF_BUG_DC_CLIP 4096
-#define FF_BUG_MS 8192 ///< Work around various bugs in Microsoft's broken decoders.
-#define FF_BUG_TRUNCATED 16384
-//#define FF_BUG_FAKE_SCALABILITY 16 //Autodetection should work 100%.
-
- /**
- * luma single coefficient elimination threshold
- * - encoding: Set by user.
- * - decoding: unused
- */
- int luma_elim_threshold;
-
- /**
- * chroma single coeff elimination threshold
- * - encoding: Set by user.
- * - decoding: unused
- */
- int chroma_elim_threshold;
-
- /**
- * strictly follow the standard (MPEG4, ...).
- * - encoding: Set by user.
- * - decoding: Set by user.
- * Setting this to STRICT or higher means the encoder and decoder will
- * generally do stupid things. While setting it to inofficial or lower
- * will mean the encoder might use things that are not supported by all
- * spec compliant decoders. Decoders make no difference between normal,
- * inofficial and experimental, that is they always try to decode things
- * when they can unless they are explicitly asked to behave stupid
- * (=strictly conform to the specs)
- */
- int strict_std_compliance;
-#define FF_COMPLIANCE_VERY_STRICT 2 ///< Strictly conform to a older more strict version of the spec or reference software.
-#define FF_COMPLIANCE_STRICT 1 ///< Strictly conform to all the things in the spec no matter what consequences.
-#define FF_COMPLIANCE_NORMAL 0
-#define FF_COMPLIANCE_INOFFICIAL -1 ///< Allow inofficial extensions.
-#define FF_COMPLIANCE_EXPERIMENTAL -2 ///< Allow nonstandardized experimental things.
-
- /**
 * qscale offset between IP and B-frames
 * - encoding: Set by user.
 * - decoding: unused
@@ -1362,40 +1517,6 @@
 float b_quant_offset;
 
 /**
- * Error recognization; higher values will detect more errors but may
- * misdetect some more or less valid parts as errors.
- * - encoding: unused
- * - decoding: Set by user.
- */
- int error_recognition;
-#define FF_ER_CAREFUL 1
-#define FF_ER_COMPLIANT 2
-#define FF_ER_AGGRESSIVE 3
-#define FF_ER_VERY_AGGRESSIVE 4
-
- /**
- * Called at the beginning of each frame to get a buffer for it.
- * If pic.reference is set then the frame will be read later by libavcodec.
- * avcodec_align_dimensions2() should be used to find the required width and
- * height, as they normally need to be rounded up to the next multiple of 16.
- * if CODEC_CAP_DR1 is not set then get_buffer() must call
- * avcodec_default_get_buffer() instead of providing buffers allocated by
- * some other means.
- * - encoding: unused
- * - decoding: Set by libavcodec., user can override.
- */
- int (*get_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
- /**
- * Called to release buffers which were allocated with get_buffer.
- * A released buffer can be reused in get_buffer().
- * pic.data[*] must be set to NULL.
- * - encoding: unused
- * - decoding: Set by libavcodec., user can override.
- */
- void (*release_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
- /**
 * Size of the frame reordering buffer in the decoder.
 * For MPEG-2 it is 1 IPB or 0 low delay IP.
 * - encoding: Set by libavcodec.
@@ -1404,16 +1525,6 @@
 int has_b_frames;
 
 /**
- * number of bytes per packet if constant and known or 0
- * Used by some WAV based audio codecs.
- */
- int block_align;
-
- int parse_only; /* - decoding only: If true, only parsing is done
- (function avcodec_parse_frame()). The frame
- data is returned. Only MPEG codecs support this now. */
-
- /**
 * 0-> h263 quant 1-> mpeg quant
 * - encoding: Set by user.
 * - decoding: unused
@@ -1421,69 +1532,6 @@
 int mpeg_quant;
 
 /**
- * pass1 encoding statistics output buffer
- * - encoding: Set by libavcodec.
- * - decoding: unused
- */
- char *stats_out;
-
- /**
- * pass2 encoding statistics input buffer
- * Concatenated stuff from stats_out of pass1 should be placed here.
- * - encoding: Allocated/set/freed by user.
- * - decoding: unused
- */
- char *stats_in;
-
- /**
- * ratecontrol qmin qmax limiting method
- * 0-> clipping, 1-> use a nice continous function to limit qscale wthin qmin/qmax.
- * - encoding: Set by user.
- * - decoding: unused
- */
- float rc_qsquish;
-
- float rc_qmod_amp;
- int rc_qmod_freq;
-
- /**
- * ratecontrol override, see RcOverride
- * - encoding: Allocated/set/freed by user.
- * - decoding: unused
- */
- RcOverride *rc_override;
- int rc_override_count;
-
- /**
- * rate control equation
- * - encoding: Set by user
- * - decoding: unused
- */
- const char *rc_eq;
-
- /**
- * maximum bitrate
- * - encoding: Set by user.
- * - decoding: unused
- */
- int rc_max_rate;
-
- /**
- * minimum bitrate
- * - encoding: Set by user.
- * - decoding: unused
- */
- int rc_min_rate;
-
- /**
- * decoder bitstream buffer size
- * - encoding: Set by user.
- * - decoding: unused
- */
- int rc_buffer_size;
- float rc_buffer_aggressivity;
-
- /**
 * qscale factor between P and I-frames
 * If > 0 then the last p frame quantizer will be used (q= lastp_q*factor+offset).
 * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
@@ -1500,27 +1548,6 @@
 float i_quant_offset;
 
 /**
- * initial complexity for pass1 ratecontrol
- * - encoding: Set by user.
- * - decoding: unused
- */
- float rc_initial_cplx;
-
- /**
- * DCT algorithm, see FF_DCT_* below
- * - encoding: Set by user.
- * - decoding: unused
- */
- int dct_algo;
-#define FF_DCT_AUTO 0
-#define FF_DCT_FASTINT 1
-#define FF_DCT_INT 2
-#define FF_DCT_MMX 3
-#define FF_DCT_MLIB 4
-#define FF_DCT_ALTIVEC 5
-#define FF_DCT_FAAN 6
-
- /**
 * luminance masking (0-> disabled)
 * - encoding: Set by user.
 * - decoding: unused
@@ -1556,94 +1583,12 @@
 float dark_masking;
 
 /**
- * IDCT algorithm, see FF_IDCT_* below.
- * - encoding: Set by user.
- * - decoding: Set by user.
- */
- int idct_algo;
-#define FF_IDCT_AUTO 0
-#define FF_IDCT_INT 1
-#define FF_IDCT_SIMPLE 2
-#define FF_IDCT_SIMPLEMMX 3
-#define FF_IDCT_LIBMPEG2MMX 4
-#define FF_IDCT_PS2 5
-#define FF_IDCT_MLIB 6
-#define FF_IDCT_ARM 7
-#define FF_IDCT_ALTIVEC 8
-#define FF_IDCT_SH4 9
-#define FF_IDCT_SIMPLEARM 10
-#define FF_IDCT_H264 11
-#define FF_IDCT_VP3 12
-#define FF_IDCT_IPP 13
-#define FF_IDCT_XVIDMMX 14
-#define FF_IDCT_CAVS 15
-#define FF_IDCT_SIMPLEARMV5TE 16
-#define FF_IDCT_SIMPLEARMV6 17
-#define FF_IDCT_SIMPLEVIS 18
-#define FF_IDCT_WMV2 19
-#define FF_IDCT_FAAN 20
-#define FF_IDCT_EA 21
-#define FF_IDCT_SIMPLENEON 22
-#define FF_IDCT_SIMPLEALPHA 23
-#define FF_IDCT_BINK 24
-
- /**
 * slice count
 * - encoding: Set by libavcodec.
 * - decoding: Set by user (or 0).
 */
 int slice_count;
 /**
- * slice offsets in the frame in bytes
- * - encoding: Set/allocated by libavcodec.
- * - decoding: Set/allocated by user (or NULL).
- */
- int *slice_offset;
-
- /**
- * error concealment flags
- * - encoding: unused
- * - decoding: Set by user.
- */
- int error_concealment;
-#define FF_EC_GUESS_MVS 1
-#define FF_EC_DEBLOCK 2
-
- /**
- * dsp_mask could be add used to disable unwanted CPU features
- * CPU features (i.e. MMX, SSE. ...)
- *
- * With the FORCE flag you may instead enable given CPU features.
- * (Dangerous: Usable in case of misdetection, improper usage however will
- * result into program crash.)
- */
- unsigned dsp_mask;
-#define FF_MM_FORCE 0x80000000 /* Force usage of selected flags (OR) */
- /* lower 16 bits - CPU features */
-#define FF_MM_MMX 0x0001 ///< standard MMX
-#define FF_MM_3DNOW 0x0004 ///< AMD 3DNOW
-#if LIBAVCODEC_VERSION_MAJOR < 53
-#define FF_MM_MMXEXT 0x0002 ///< SSE integer functions or AMD MMX ext
-#endif
-#define FF_MM_MMX2 0x0002 ///< SSE integer functions or AMD MMX ext
-#define FF_MM_SSE 0x0008 ///< SSE functions
-#define FF_MM_SSE2 0x0010 ///< PIV SSE2 functions
-#define FF_MM_3DNOWEXT 0x0020 ///< AMD 3DNowExt
-#define FF_MM_SSE3 0x0040 ///< Prescott SSE3 functions
-#define FF_MM_SSSE3 0x0080 ///< Conroe SSSE3 functions
-#define FF_MM_SSE4 0x0100 ///< Penryn SSE4.1 functions
-#define FF_MM_SSE42 0x0200 ///< Nehalem SSE4.2 functions
-#define FF_MM_IWMMXT 0x0100 ///< XScale IWMMXT
-#define FF_MM_ALTIVEC 0x0001 ///< standard AltiVec
-
- /**
- * bits per sample/pixel from the demuxer (needed for huffyuv).
- * - encoding: Set by libavcodec.
- * - decoding: Set by user.
- */
- int bits_per_coded_sample;
-
- /**
 * prediction method (needed for huffyuv)
 * - encoding: Set by user.
 * - decoding: unused
@@ -1654,6 +1599,13 @@
 #define FF_PRED_MEDIAN 2
 
 /**
+ * slice offsets in the frame in bytes
+ * - encoding: Set/allocated by libavcodec.
+ * - decoding: Set/allocated by user (or NULL).
+ */
+ int *slice_offset;
+
+ /**
 * sample aspect ratio (0 if unknown)
 * That is the width of a pixel divided by the height of the pixel.
 * Numerator and denominator must be relatively prime and smaller than 256 for some video standards.
@@ -1663,67 +1615,6 @@
 AVRational sample_aspect_ratio;
 
 /**
- * the picture in the bitstream
- * - encoding: Set by libavcodec.
- * - decoding: Set by libavcodec.
- */
- AVFrame *coded_frame;
-
- /**
- * debug
- * - encoding: Set by user.
- * - decoding: Set by user.
- */
- int debug;
-#define FF_DEBUG_PICT_INFO 1
-#define FF_DEBUG_RC 2
-#define FF_DEBUG_BITSTREAM 4
-#define FF_DEBUG_MB_TYPE 8
-#define FF_DEBUG_QP 16
-#define FF_DEBUG_MV 32
-#define FF_DEBUG_DCT_COEFF 0x00000040
-#define FF_DEBUG_SKIP 0x00000080
-#define FF_DEBUG_STARTCODE 0x00000100
-#define FF_DEBUG_PTS 0x00000200
-#define FF_DEBUG_ER 0x00000400
-#define FF_DEBUG_MMCO 0x00000800
-#define FF_DEBUG_BUGS 0x00001000
-#define FF_DEBUG_VIS_QP 0x00002000
-#define FF_DEBUG_VIS_MB_TYPE 0x00004000
-#define FF_DEBUG_BUFFERS 0x00008000
-
- /**
- * debug
- * - encoding: Set by user.
- * - decoding: Set by user.
- */
- int debug_mv;
-#define FF_DEBUG_VIS_MV_P_FOR 0x00000001 //visualize forward predicted MVs of P frames
-#define FF_DEBUG_VIS_MV_B_FOR 0x00000002 //visualize forward predicted MVs of B frames
-#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
-
- /**
- * error
- * - encoding: Set by libavcodec if flags&CODEC_FLAG_PSNR.
- * - decoding: unused
- */
- uint64_t error[4];
-
- /**
- * minimum MB quantizer
- * - encoding: unused
- * - decoding: unused
- */
- int mb_qmin;
-
- /**
- * maximum MB quantizer
- * - encoding: unused
- * - decoding: unused
- */
- int mb_qmax;
-
- /**
 * motion estimation comparison function
 * - encoding: Set by user.
 * - decoding: unused
@@ -1806,17 +1697,7 @@
 */
 int me_subpel_quality;
 
- /**
- * callback to negotiate the pixelFormat
- * @param fmt is the list of formats which are supported by the codec,
- * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality.
- * The first is always the native one.
- * @return the chosen format
- * - encoding: unused
- * - decoding: Set by user, if not set the native format will be chosen.
- */
- enum PixelFormat (*get_format)(struct AVCodecContext *s, const enum PixelFormat * fmt);
-
+#if FF_API_AFD
 /**
 * DTG active format information (additional aspect ratio
 * information only used in DVB MPEG-2 transport streams)
@@ -1824,8 +1705,9 @@
 *
 * - encoding: unused
 * - decoding: Set by decoder.
+ * @deprecated Deprecated in favor of AVSideData
 */
- int dtg_active_format;
+ attribute_deprecated int dtg_active_format;
 #define FF_DTG_AFD_SAME 8
 #define FF_DTG_AFD_4_3 9
 #define FF_DTG_AFD_16_9 10
@@ -1833,6 +1715,7 @@
 #define FF_DTG_AFD_4_3_SP_14_9 13
 #define FF_DTG_AFD_16_9_SP_14_9 14
 #define FF_DTG_AFD_SP_4_3 15
+#endif /* FF_API_AFD */
 
 /**
 * maximum motion estimation search range in subpel units
@@ -1859,67 +1742,6 @@
 int inter_quant_bias;
 
 /**
- * color table ID
- * - encoding: unused
- * - decoding: Which clrtable should be used for 8bit RGB images.
- * Tables have to be stored somewhere. FIXME
- */
- int color_table_id;
-
- /**
- * internal_buffer count
- * Don't touch, used by libavcodec default_get_buffer().
- */
- int internal_buffer_count;
-
- /**
- * internal_buffers
- * Don't touch, used by libavcodec default_get_buffer().
- */
- void *internal_buffer;
-
-#define FF_LAMBDA_SHIFT 7
-#define FF_LAMBDA_SCALE (1<<FF_LAMBDA_SHIFT)
-#define FF_QP2LAMBDA 118 ///< factor to convert from H.263 QP to lambda
-#define FF_LAMBDA_MAX (256*128-1)
-
-#define FF_QUALITY_SCALE FF_LAMBDA_SCALE //FIXME maybe remove
- /**
- * Global quality for codecs which cannot change it per frame.
- * This should be proportional to MPEG-1/2/4 qscale.
- * - encoding: Set by user.
- * - decoding: unused
- */
- int global_quality;
-
-#define FF_CODER_TYPE_VLC 0
-#define FF_CODER_TYPE_AC 1
-#define FF_CODER_TYPE_RAW 2
-#define FF_CODER_TYPE_RLE 3
-#define FF_CODER_TYPE_DEFLATE 4
- /**
- * coder type
- * - encoding: Set by user.
- * - decoding: unused
- */
- int coder_type;
-
- /**
- * context model
- * - encoding: Set by user.
- * - decoding: unused
- */
- int context_model;
-#if 0
- /**
- *
- * - encoding: unused
- * - decoding: Set by user.
- */
- uint8_t * (*realloc)(struct AVCodecContext *s, uint8_t *buf, int buf_size);
-#endif
-
- /**
 * slice flags
 * - encoding: unused
 * - decoding: Set by user.
@@ -1929,12 +1751,15 @@
 #define SLICE_FLAG_ALLOW_FIELD 0x0002 ///< allow draw_horiz_band() with field slices (MPEG2 field pics)
 #define SLICE_FLAG_ALLOW_PLANE 0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
 
+#if FF_API_XVMC
 /**
 * XVideo Motion Acceleration
 * - encoding: forbidden
 * - decoding: set by decoder
+ * @deprecated XvMC doesn't need it anymore.
 */
- int xvmc_acceleration;
+ attribute_deprecated int xvmc_acceleration;
+#endif /* FF_API_XVMC */
 
 /**
 * macroblock decision mode
@@ -1961,14 +1786,6 @@
 uint16_t *inter_matrix;
 
 /**
- * fourcc from the AVI stream header (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
- * This is used to work around some encoder bugs.
- * - encoding: unused
- * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
- */
- unsigned int stream_codec_tag;
-
- /**
 * scene change detection threshold
 * 0 is default, larger means fewer detected scene changes.
 * - encoding: Set by user.
@@ -1977,440 +1794,635 @@
 int scenechange_threshold;
 
 /**
- * minimum Lagrange multipler
+ * noise reduction strength
 * - encoding: Set by user.
 * - decoding: unused
 */
- int lmin;
+ int noise_reduction;
 
 /**
- * maximum Lagrange multipler
+ * Motion estimation threshold below which no motion estimation is
+ * performed, but instead the user specified motion vectors are used.
+ *
 * - encoding: Set by user.
 * - decoding: unused
 */
- int lmax;
+ int me_threshold;
 
 /**
- * palette control structure
- * - encoding: ??? (no palette-enabled encoder yet)
- * - decoding: Set by user.
+ * Macroblock threshold below which the user specified macroblock types will be used.
+ * - encoding: Set by user.
+ * - decoding: unused
 */
- struct AVPaletteControl *palctrl;
+ int mb_threshold;
 
 /**
- * noise reduction strength
+ * precision of the intra DC coefficient - 8
 * - encoding: Set by user.
 * - decoding: unused
 */
- int noise_reduction;
+ int intra_dc_precision;
 
 /**
- * Called at the beginning of a frame to get cr buffer for it.
- * Buffer type (size, hints) must be the same. libavcodec won't check it.
- * libavcodec will pass previous buffer in pic, function should return
- * same buffer or new buffer with old frame "painted" into it.
- * If pic.data[0] == NULL must behave like get_buffer().
- * if CODEC_CAP_DR1 is not set then reget_buffer() must call
- * avcodec_default_reget_buffer() instead of providing buffers allocated by
- * some other means.
+ * Number of macroblock rows at the top which are skipped.
 * - encoding: unused
- * - decoding: Set by libavcodec., user can override
+ * - decoding: Set by user.
 */
- int (*reget_buffer)(struct AVCodecContext *c, AVFrame *pic);
+ int skip_top;
 
 /**
- * Number of bits which should be loaded into the rc buffer before decoding starts.
- * - encoding: Set by user.
- * - decoding: unused
+ * Number of macroblock rows at the bottom which are skipped.
+ * - encoding: unused
+ * - decoding: Set by user.
 */
- int rc_initial_buffer_occupancy;
+ int skip_bottom;
 
 /**
- *
+ * Border processing masking, raises the quantizer for mbs on the borders
+ * of the picture.
 * - encoding: Set by user.
 * - decoding: unused
 */
- int inter_threshold;
+ float border_masking;
 
 /**
- * CODEC_FLAG2_*
+ * minimum MB lagrange multipler
 * - encoding: Set by user.
- * - decoding: Set by user.
+ * - decoding: unused
 */
- int flags2;
+ int mb_lmin;
 
 /**
- * Simulates errors in the bitstream to test error concealment.
+ * maximum MB lagrange multipler
 * - encoding: Set by user.
 * - decoding: unused
 */
- int error_rate;
+ int mb_lmax;
 
 /**
- * MP3 antialias algorithm, see FF_AA_* below.
- * - encoding: unused
- * - decoding: Set by user.
+ *
+ * - encoding: Set by user.
+ * - decoding: unused
 */
- int antialias_algo;
-#define FF_AA_AUTO 0
-#define FF_AA_FASTINT 1 //not implemented yet
-#define FF_AA_INT 2
-#define FF_AA_FLOAT 3
+ int me_penalty_compensation;
+
 /**
- * quantizer noise shaping
+ *
 * - encoding: Set by user.
 * - decoding: unused
 */
- int quantizer_noise_shaping;
+ int bidir_refine;
 
 /**
- * thread count
- * is used to decide how many independent tasks should be passed to execute()
+ *
 * - encoding: Set by user.
- * - decoding: Set by user.
+ * - decoding: unused
 */
- int thread_count;
+ int brd_scale;
 
 /**
- * The codec may call this to execute several independent things.
- * It will return only after finishing all tasks.
- * The user may replace this with some multithreaded implementation,
- * the default implementation will execute the parts serially.
- * @param count the number of things to execute
- * - encoding: Set by libavcodec, user can override.
- * - decoding: Set by libavcodec, user can override.
+ * minimum GOP size
+ * - encoding: Set by user.
+ * - decoding: unused
 */
- int (*execute)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg), void *arg2, int *ret, int count, int size);
+ int keyint_min;
 
 /**
- * thread opaque
- * Can be used by execute() to store some per AVCodecContext stuff.
- * - encoding: set by execute()
- * - decoding: set by execute()
+ * number of reference frames
+ * - encoding: Set by user.
+ * - decoding: Set by lavc.
 */
- void *thread_opaque;
+ int refs;
 
 /**
- * Motion estimation threshold below which no motion estimation is
- * performed, but instead the user specified motion vectors are used.
- *
+ * chroma qp offset from luma
 * - encoding: Set by user.
 * - decoding: unused
 */
- int me_threshold;
+ int chromaoffset;
 
+#if FF_API_UNUSED_MEMBERS
 /**
- * Macroblock threshold below which the user specified macroblock types will be used.
+ * Multiplied by qscale for each frame and added to scene_change_score.
 * - encoding: Set by user.
 * - decoding: unused
 */
- int mb_threshold;
+ attribute_deprecated int scenechange_factor;
+#endif
 
 /**
- * precision of the intra DC coefficient - 8
+ *
+ * Note: Value depends upon the compare function used for fullpel ME.
 * - encoding: Set by user.
 * - decoding: unused
 */
- int intra_dc_precision;
+ int mv0_threshold;
 
 /**
- * noise vs. sse weight for the nsse comparsion function
+ * Adjust sensitivity of b_frame_strategy 1.
 * - encoding: Set by user.
 * - decoding: unused
 */
- int nsse_weight;
+ int b_sensitivity;
 
 /**
- * Number of macroblock rows at the top which are skipped.
- * - encoding: unused
- * - decoding: Set by user.
+ * Chromaticity coordinates of the source primaries.
+ * - encoding: Set by user
+ * - decoding: Set by libavcodec
 */
- int skip_top;
+ enum AVColorPrimaries color_primaries;
 
 /**
- * Number of macroblock rows at the bottom which are skipped.
- * - encoding: unused
- * - decoding: Set by user.
+ * Color Transfer Characteristic.
+ * - encoding: Set by user
+ * - decoding: Set by libavcodec
 */
- int skip_bottom;
+ enum AVColorTransferCharacteristic color_trc;
 
 /**
- * profile
- * - encoding: Set by user.
- * - decoding: Set by libavcodec.
+ * YUV colorspace type.
+ * - encoding: Set by user
+ * - decoding: Set by libavcodec
 */
- int profile;
-#define FF_PROFILE_UNKNOWN -99
+ enum AVColorSpace colorspace;
 
-#define FF_PROFILE_AAC_MAIN 0
-#define FF_PROFILE_AAC_LOW 1
-#define FF_PROFILE_AAC_SSR 2
-#define FF_PROFILE_AAC_LTP 3
+ /**
+ * MPEG vs JPEG YUV range.
+ * - encoding: Set by user
+ * - decoding: Set by libavcodec
+ */
+ enum AVColorRange color_range;
+
+ /**
+ * This defines the location of chroma samples.
+ * - encoding: Set by user
+ * - decoding: Set by libavcodec
+ */
+ enum AVChromaLocation chroma_sample_location;
+
+ /**
+ * Number of slices.
+ * Indicates number of picture subdivisions. Used for parallelized
+ * decoding.
+ * - encoding: Set by user
+ * - decoding: unused
+ */
+ int slices;
 
-#define FF_PROFILE_H264_BASELINE 66
-#define FF_PROFILE_H264_MAIN 77
-#define FF_PROFILE_H264_EXTENDED 88
-#define FF_PROFILE_H264_HIGH 100
-#define FF_PROFILE_H264_HIGH_10 110
-#define FF_PROFILE_H264_HIGH_422 122
-#define FF_PROFILE_H264_HIGH_444 244
-#define FF_PROFILE_H264_CAVLC_444 44
+ /** Field order
+ * - encoding: set by libavcodec
+ * - decoding: Set by user.
+ */
+ enum AVFieldOrder field_order;
+
+ /* audio only */
+ int sample_rate; ///< samples per second
+ int channels; ///< number of audio channels
 
 /**
- * level
+ * audio sample format
 * - encoding: Set by user.
 * - decoding: Set by libavcodec.
 */
- int level;
-#define FF_LEVEL_UNKNOWN -99
+ enum AVSampleFormat sample_fmt; ///< sample format
 
+ /* The following data should not be initialized. */
 /**
- * low resolution decoding, 1-> 1/2 size, 2->1/4 size
- * - encoding: unused
- * - decoding: Set by user.
+ * Number of samples per channel in an audio frame.
+ *
+ * - encoding: set by libavcodec in avcodec_open2(). Each submitted frame
+ * except the last must contain exactly frame_size samples per channel.
+ * May be 0 when the codec has CODEC_CAP_VARIABLE_FRAME_SIZE set, then the
+ * frame size is not restricted.
+ * - decoding: may be set by some decoders to indicate constant frame size
 */
- int lowres;
+ int frame_size;
 
 /**
- * Bitstream width / height, may be different from width/height if lowres
- * or other things are used.
- * - encoding: unused
- * - decoding: Set by user before init if known. Codec should override / dynamically change if needed.
+ * Frame counter, set by libavcodec.
+ *
+ * - decoding: total number of frames returned from the decoder so far.
+ * - encoding: total number of frames passed to the encoder so far.
+ *
+ * @note the counter is not incremented if encoding/decoding resulted in
+ * an error.
 */
- int coded_width, coded_height;
+ int frame_number;
 
 /**
- * frame skip threshold
- * - encoding: Set by user.
- * - decoding: unused
+ * number of bytes per packet if constant and known or 0
+ * Used by some WAV based audio codecs.
 */
- int frame_skip_threshold;
+ int block_align;
 
 /**
- * frame skip factor
+ * Audio cutoff bandwidth (0 means "automatic")
 * - encoding: Set by user.
 * - decoding: unused
 */
- int frame_skip_factor;
+ int cutoff;
 
+#if FF_API_REQUEST_CHANNELS
 /**
- * frame skip exponent
- * - encoding: Set by user.
- * - decoding: unused
+ * Decoder should decode to this many channels if it can (0 for default)
+ * - encoding: unused
+ * - decoding: Set by user.
+ * @deprecated Deprecated in favor of request_channel_layout.
 */
- int frame_skip_exp;
+ attribute_deprecated int request_channels;
+#endif
 
 /**
- * frame skip comparison function
- * - encoding: Set by user.
- * - decoding: unused
+ * Audio channel layout.
+ * - encoding: set by user.
+ * - decoding: set by user, may be overwritten by libavcodec.
 */
- int frame_skip_cmp;
+ uint64_t channel_layout;
 
 /**
- * Border processing masking, raises the quantizer for mbs on the borders
- * of the picture.
- * - encoding: Set by user.
- * - decoding: unused
+ * Request decoder to use this channel layout if it can (0 for default)
+ * - encoding: unused
+ * - decoding: Set by user.
 */
- float border_masking;
+ uint64_t request_channel_layout;
 
 /**
- * minimum MB lagrange multipler
+ * Type of service that the audio stream conveys.
 * - encoding: Set by user.
- * - decoding: unused
+ * - decoding: Set by libavcodec.
 */
- int mb_lmin;
+ enum AVAudioServiceType audio_service_type;
 
 /**
- * maximum MB lagrange multipler
- * - encoding: Set by user.
- * - decoding: unused
+ * desired sample format
+ * - encoding: Not used.
+ * - decoding: Set by user.
+ * Decoder will decode to this format if it can.
 */
- int mb_lmax;
+ enum AVSampleFormat request_sample_fmt;
 
+#if FF_API_GET_BUFFER
 /**
+ * Called at the beginning of each frame to get a buffer for it.
 *
- * - encoding: Set by user.
- * - decoding: unused
+ * The function will set AVFrame.data[], AVFrame.linesize[].
+ * AVFrame.extended_data[] must also be set, but it should be the same as
+ * AVFrame.data[] except for planar audio with more channels than can fit
+ * in AVFrame.data[]. In that case, AVFrame.data[] shall still contain as
+ * many data pointers as it can hold.
+ *
+ * if CODEC_CAP_DR1 is not set then get_buffer() must call
+ * avcodec_default_get_buffer() instead of providing buffers allocated by
+ * some other means.
+ *
+ * AVFrame.data[] should be 32- or 16-byte-aligned unless the CPU doesn't
+ * need it. avcodec_default_get_buffer() aligns the output buffer properly,
+ * but if get_buffer() is overridden then alignment considerations should
+ * be taken into account.
+ *
+ * @see avcodec_default_get_buffer()
+ *
+ * Video:
+ *
+ * If pic.reference is set then the frame will be read later by libavcodec.
+ * avcodec_align_dimensions2() should be used to find the required width and
+ * height, as they normally need to be rounded up to the next multiple of 16.
+ *
+ * If frame multithreading is used and thread_safe_callbacks is set,
+ * it may be called from a different thread, but not from more than one at
+ * once. Does not need to be reentrant.
+ *
+ * @see release_buffer(), reget_buffer()
+ * @see avcodec_align_dimensions2()
+ *
+ * Audio:
+ *
+ * Decoders request a buffer of a particular size by setting
+ * AVFrame.nb_samples prior to calling get_buffer(). The decoder may,
+ * however, utilize only part of the buffer by setting AVFrame.nb_samples
+ * to a smaller value in the output frame.
+ *
+ * Decoders cannot use the buffer after returning from
+ * avcodec_decode_audio4(), so they will not call release_buffer(), as it
+ * is assumed to be released immediately upon return. In some rare cases,
+ * a decoder may need to call get_buffer() more than once in a single
+ * call to avcodec_decode_audio4(). In that case, when get_buffer() is
+ * called again after it has already been called once, the previously
+ * acquired buffer is assumed to be released at that time and may not be
+ * reused by the decoder.
+ *
+ * As a convenience, av_samples_get_buffer_size() and
+ * av_samples_fill_arrays() in libavutil may be used by custom get_buffer()
+ * functions to find the required data size and to fill data pointers and
+ * linesize. In AVFrame.linesize, only linesize[0] may be set for audio
+ * since all planes must be the same size.
+ *
+ * @see av_samples_get_buffer_size(), av_samples_fill_arrays()
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec, user can override.
+ *
+ * @deprecated use get_buffer2()
 */
- int me_penalty_compensation;
+ attribute_deprecated
+ int (*get_buffer)(struct AVCodecContext *c, AVFrame *pic);
 
 /**
+ * Called to release buffers which were allocated with get_buffer.
+ * A released buffer can be reused in get_buffer().
+ * pic.data[*] must be set to NULL.
+ * May be called from a different thread if frame multithreading is used,
+ * but not by more than one thread at once, so does not need to be reentrant.
+ * - encoding: unused
+ * - decoding: Set by libavcodec, user can override.
 *
+ * @deprecated custom freeing callbacks should be set from get_buffer2()
+ */
+ attribute_deprecated
+ void (*release_buffer)(struct AVCodecContext *c, AVFrame *pic);
+
+ /**
+ * Called at the beginning of a frame to get cr buffer for it.
+ * Buffer type (size, hints) must be the same. libavcodec won't check it.
+ * libavcodec will pass previous buffer in pic, function should return
+ * same buffer or new buffer with old frame "painted" into it.
+ * If pic.data[0] == NULL must behave like get_buffer().
+ * if CODEC_CAP_DR1 is not set then reget_buffer() must call
+ * avcodec_default_reget_buffer() instead of providing buffers allocated by
+ * some other means.
 * - encoding: unused
- * - decoding: Set by user.
+ * - decoding: Set by libavcodec, user can override.
 */
- enum AVDiscard skip_loop_filter;
+ attribute_deprecated
+ int (*reget_buffer)(struct AVCodecContext *c, AVFrame *pic);
+#endif
 
 /**
+ * This callback is called at the beginning of each frame to get data
+ * buffer(s) for it. There may be one contiguous buffer for all the data or
+ * there may be a buffer per each data plane or anything in between. What
+ * this means is, you may set however many entries in buf[] you feel necessary.
+ * Each buffer must be reference-counted using the AVBuffer API (see description
+ * of buf[] below).
+ *
+ * The following fields will be set in the frame before this callback is
+ * called:
+ * - format
+ * - width, height (video only)
+ * - sample_rate, channel_layout, nb_samples (audio only)
+ * Their values may differ from the corresponding values in
+ * AVCodecContext. This callback must use the frame values, not the codec
+ * context values, to calculate the required buffer size.
+ *
+ * This callback must fill the following fields in the frame:
+ * - data[]
+ * - linesize[]
+ * - extended_data:
+ * * if the data is planar audio with more than 8 channels, then this
+ * callback must allocate and fill extended_data to contain all pointers
+ * to all data planes. data[] must hold as many pointers as it can.
+ * extended_data must be allocated with av_malloc() and will be freed in
+ * av_frame_unref().
+ * * otherwise exended_data must point to data
+ * - buf[] must contain one or more pointers to AVBufferRef structures. Each of
+ * the frame's data and extended_data pointers must be contained in these. That
+ * is, one AVBufferRef for each allocated chunk of memory, not necessarily one
+ * AVBufferRef per data[] entry. See: av_buffer_create(), av_buffer_alloc(),
+ * and av_buffer_ref().
+ * - extended_buf and nb_extended_buf must be allocated with av_malloc() by
+ * this callback and filled with the extra buffers if there are more
+ * buffers than buf[] can hold. extended_buf will be freed in
+ * av_frame_unref().
+ *
+ * If CODEC_CAP_DR1 is not set then get_buffer2() must call
+ * avcodec_default_get_buffer2() instead of providing buffers allocated by
+ * some other means.
+ *
+ * Each data plane must be aligned to the maximum required by the target
+ * CPU.
+ *
+ * @see avcodec_default_get_buffer2()
+ *
+ * Video:
+ *
+ * If AV_GET_BUFFER_FLAG_REF is set in flags then the frame may be reused
+ * (read and/or written to if it is writable) later by libavcodec.
+ *
+ * avcodec_align_dimensions2() should be used to find the required width and
+ * height, as they normally need to be rounded up to the next multiple of 16.
+ *
+ * Some decoders do not support linesizes changing between frames.
+ *
+ * If frame multithreading is used and thread_safe_callbacks is set,
+ * this callback may be called from a different thread, but not from more
+ * than one at once. Does not need to be reentrant.
+ *
+ * @see avcodec_align_dimensions2()
+ *
+ * Audio:
+ *
+ * Decoders request a buffer of a particular size by setting
+ * AVFrame.nb_samples prior to calling get_buffer2(). The decoder may,
+ * however, utilize only part of the buffer by setting AVFrame.nb_samples
+ * to a smaller value in the output frame.
+ *
+ * As a convenience, av_samples_get_buffer_size() and
+ * av_samples_fill_arrays() in libavutil may be used by custom get_buffer2()
+ * functions to find the required data size and to fill data pointers and
+ * linesize. In AVFrame.linesize, only linesize[0] may be set for audio
+ * since all planes must be the same size.
+ *
+ * @see av_samples_get_buffer_size(), av_samples_fill_arrays()
 *
 * - encoding: unused
- * - decoding: Set by user.
+ * - decoding: Set by libavcodec, user can override.
 */
- enum AVDiscard skip_idct;
+ int (*get_buffer2)(struct AVCodecContext *s, AVFrame *frame, int flags);
 
 /**
+ * If non-zero, the decoded audio and video frames returned from
+ * avcodec_decode_video2() and avcodec_decode_audio4() are reference-counted
+ * and are valid indefinitely. The caller must free them with
+ * av_frame_unref() when they are not needed anymore.
+ * Otherwise, the decoded frames must not be freed by the caller and are
+ * only valid until the next decode call.
 *
 * - encoding: unused
- * - decoding: Set by user.
+ * - decoding: set by the caller before avcodec_open2().
 */
- enum AVDiscard skip_frame;
+ int refcounted_frames;
+
+ /* - encoding parameters */
+ float qcompress; ///< amount of qscale change between easy & hard scenes (0.0-1.0)
+ float qblur; ///< amount of qscale smoothing over time (0.0-1.0)
 
 /**
- *
+ * minimum quantizer
 * - encoding: Set by user.
 * - decoding: unused
 */
- int bidir_refine;
+ int qmin;
 
 /**
- *
+ * maximum quantizer
 * - encoding: Set by user.
 * - decoding: unused
 */
- int brd_scale;
+ int qmax;
 
 /**
- * constant rate factor - quality-based VBR - values ~correspond to qps
+ * maximum quantizer difference between frames
 * - encoding: Set by user.
 * - decoding: unused
 */
- float crf;
+ int max_qdiff;
 
 /**
- * constant quantization parameter rate control method
+ * ratecontrol qmin qmax limiting method
+ * 0-> clipping, 1-> use a nice continuous function to limit qscale within qmin/qmax.
 * - encoding: Set by user.
 * - decoding: unused
 */
- int cqp;
+ float rc_qsquish;
+
+ float rc_qmod_amp;
+ int rc_qmod_freq;
 
 /**
- * minimum GOP size
+ * decoder bitstream buffer size
 * - encoding: Set by user.
 * - decoding: unused
 */
- int keyint_min;
+ int rc_buffer_size;
 
 /**
- * number of reference frames
- * - encoding: Set by user.
- * - decoding: Set by lavc.
+ * ratecontrol override, see RcOverride
+ * - encoding: Allocated/set/freed by user.
+ * - decoding: unused
 */
- int refs;
+ int rc_override_count;
+ RcOverride *rc_override;
 
 /**
- * chroma qp offset from luma
- * - encoding: Set by user.
+ * rate control equation
+ * - encoding: Set by user
 * - decoding: unused
 */
- int chromaoffset;
+ const char *rc_eq;
 
 /**
- * Influences how often B-frames are used.
+ * maximum bitrate
 * - encoding: Set by user.
- * - decoding: unused
+ * - decoding: Set by libavcodec.
 */
- int bframebias;
+ int rc_max_rate;
 
 /**
- * trellis RD quantization
+ * minimum bitrate
 * - encoding: Set by user.
 * - decoding: unused
 */
- int trellis;
+ int rc_min_rate;
+
+ float rc_buffer_aggressivity;
 
 /**
- * Reduce fluctuations in qp (before curve compression).
+ * initial complexity for pass1 ratecontrol
 * - encoding: Set by user.
 * - decoding: unused
 */
- float complexityblur;
+ float rc_initial_cplx;
 
 /**
- * in-loop deblocking filter alphac0 parameter
- * alpha is in the range -6...6
+ * Ratecontrol attempt to use, at maximum, <value> of what can be used without an underflow.
 * - encoding: Set by user.
- * - decoding: unused
+ * - decoding: unused.
 */
- int deblockalpha;
+ float rc_max_available_vbv_use;
 
 /**
- * in-loop deblocking filter beta parameter
- * beta is in the range -6...6
+ * Ratecontrol attempt to use, at least, <value> times the amount needed to prevent a vbv overflow.
+ * - encoding: Set by user.
+ * - decoding: unused.
+ */
+ float rc_min_vbv_overflow_use;
+
+ /**
+ * Number of bits which should be loaded into the rc buffer before decoding starts.
 * - encoding: Set by user.
 * - decoding: unused
 */
- int deblockbeta;
+ int rc_initial_buffer_occupancy;
 
+#define FF_CODER_TYPE_VLC 0
+#define FF_CODER_TYPE_AC 1
+#define FF_CODER_TYPE_RAW 2
+#define FF_CODER_TYPE_RLE 3
+#if FF_API_UNUSED_MEMBERS
+#define FF_CODER_TYPE_DEFLATE 4
+#endif /* FF_API_UNUSED_MEMBERS */
 /**
- * macroblock subpartition sizes to consider - p8x8, p4x4, b8x8, i8x8, i4x4
+ * coder type
 * - encoding: Set by user.
 * - decoding: unused
 */
- int partitions;
-#define X264_PART_I4X4 0x001 /* Analyze i4x4 */
-#define X264_PART_I8X8 0x002 /* Analyze i8x8 (requires 8x8 transform) */
-#define X264_PART_P8X8 0x010 /* Analyze p16x8, p8x16 and p8x8 */
-#define X264_PART_P4X4 0x020 /* Analyze p8x4, p4x8, p4x4 */
-#define X264_PART_B8X8 0x100 /* Analyze b16x8, b8x16 and b8x8 */
+ int coder_type;
 
 /**
- * direct MV prediction mode - 0 (none), 1 (spatial), 2 (temporal), 3 (auto)
+ * context model
 * - encoding: Set by user.
 * - decoding: unused
 */
- int directpred;
+ int context_model;
 
 /**
- * Audio cutoff bandwidth (0 means "automatic")
+ * minimum Lagrange multiplier
 * - encoding: Set by user.
 * - decoding: unused
 */
- int cutoff;
+ int lmin;
 
 /**
- * Multiplied by qscale for each frame and added to scene_change_score.
+ * maximum Lagrange multiplier
 * - encoding: Set by user.
 * - decoding: unused
 */
- int scenechange_factor;
+ int lmax;
 
 /**
- *
- * Note: Value depends upon the compare function used for fullpel ME.
+ * frame skip threshold
 * - encoding: Set by user.
 * - decoding: unused
 */
- int mv0_threshold;
+ int frame_skip_threshold;
 
 /**
- * Adjusts sensitivity of b_frame_strategy 1.
+ * frame skip factor
 * - encoding: Set by user.
 * - decoding: unused
 */
- int b_sensitivity;
+ int frame_skip_factor;
 
 /**
+ * frame skip exponent
 * - encoding: Set by user.
 * - decoding: unused
 */
- int compression_level;
-#define FF_COMPRESSION_DEFAULT -1
+ int frame_skip_exp;
 
 /**
- * Sets whether to use LPC mode - used by FLAC encoder.
+ * frame skip comparison function
 * - encoding: Set by user.
 * - decoding: unused
 */
- int use_lpc;
+ int frame_skip_cmp;
 
 /**
- * LPC coefficient precision - used by FLAC encoder
+ * trellis RD quantization
 * - encoding: Set by user.
 * - decoding: unused
 */
- int lpc_coeff_precision;
+ int trellis;
 
 /**
 * - encoding: Set by user.
@@ -2425,92 +2437,193 @@
 int max_prediction_order;
 
 /**
- * search method for selecting prediction order
- * - encoding: Set by user.
- * - decoding: unused
+ * GOP timecode frame start number
+ * - encoding: Set by user, in non drop frame format
+ * - decoding: Set by libavcodec (timecode in the 25 bits format, -1 if unset)
 */
- int prediction_order_method;
+ int64_t timecode_frame_start;
+
+ /* The RTP callback: This function is called */
+ /* every time the encoder has a packet to send. */
+ /* It depends on the encoder if the data starts */
+ /* with a Start Code (it should). H.263 does. */
+ /* mb_nb contains the number of macroblocks */
+ /* encoded in the RTP payload. */
+ void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb);
+
+ int rtp_payload_size; /* The size of the RTP payload: the coder will */
+ /* do its best to deliver a chunk with size */
+ /* below rtp_payload_size, the chunk will start */
+ /* with a start code on some codecs like H.263. */
+ /* This doesn't take account of any particular */
+ /* headers inside the transmitted RTP payload. */
+
+ /* statistics, used for 2-pass encoding */
+ int mv_bits;
+ int header_bits;
+ int i_tex_bits;
+ int p_tex_bits;
+ int i_count;
+ int p_count;
+ int skip_count;
+ int misc_bits;
 
 /**
- * - encoding: Set by user.
+ * number of bits used for the previously encoded frame
+ * - encoding: Set by libavcodec.
 * - decoding: unused
 */
- int min_partition_order;
+ int frame_bits;
 
 /**
- * - encoding: Set by user.
+ * pass1 encoding statistics output buffer
+ * - encoding: Set by libavcodec.
 * - decoding: unused
 */
- int max_partition_order;
+ char *stats_out;
 
 /**
- * GOP timecode frame start number, in non drop frame format
- * - encoding: Set by user.
+ * pass2 encoding statistics input buffer
+ * Concatenated stuff from stats_out of pass1 should be placed here.
+ * - encoding: Allocated/set/freed by user.
 * - decoding: unused
 */
- int64_t timecode_frame_start;
+ char *stats_in;
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
 /**
- * Decoder should decode to this many channels if it can (0 for default)
- * - encoding: unused
- * - decoding: Set by user.
- * @deprecated Deprecated in favor of request_channel_layout.
+ * Work around bugs in encoders which sometimes cannot be detected automatically.
+ * - encoding: Set by user
+ * - decoding: Set by user
 */
- int request_channels;
+ int workaround_bugs;
+#define FF_BUG_AUTODETECT 1 ///< autodetection
+#if FF_API_OLD_MSMPEG4
+#define FF_BUG_OLD_MSMPEG4 2
 #endif
+#define FF_BUG_XVID_ILACE 4
+#define FF_BUG_UMP4 8
+#define FF_BUG_NO_PADDING 16
+#define FF_BUG_AMV 32
+#if FF_API_AC_VLC
+#define FF_BUG_AC_VLC 0 ///< Will be removed, libavcodec can now handle these non-compliant files by default.
+#endif
+#define FF_BUG_QPEL_CHROMA 64
+#define FF_BUG_STD_QPEL 128
+#define FF_BUG_QPEL_CHROMA2 256
+#define FF_BUG_DIRECT_BLOCKSIZE 512
+#define FF_BUG_EDGE 1024
+#define FF_BUG_HPEL_CHROMA 2048
+#define FF_BUG_DC_CLIP 4096
+#define FF_BUG_MS 8192 ///< Work around various bugs in Microsoft's broken decoders.
+#define FF_BUG_TRUNCATED 16384
 
 /**
- * Percentage of dynamic range compression to be applied by the decoder.
- * The default value is 1.0, corresponding to full compression.
- * - encoding: unused
+ * strictly follow the standard (MPEG4, ...).
+ * - encoding: Set by user.
 * - decoding: Set by user.
+ * Setting this to STRICT or higher means the encoder and decoder will
+ * generally do stupid things, whereas setting it to unofficial or lower
+ * will mean the encoder might produce output that is not supported by all
+ * spec-compliant decoders. Decoders don't differentiate between normal,
+ * unofficial and experimental (that is, they always try to decode things
+ * when they can) unless they are explicitly asked to behave stupidly
+ * (=strictly conform to the specs)
 */
- float drc_scale;
+ int strict_std_compliance;
+#define FF_COMPLIANCE_VERY_STRICT 2 ///< Strictly conform to an older more strict version of the spec or reference software.
+#define FF_COMPLIANCE_STRICT 1 ///< Strictly conform to all the things in the spec no matter what consequences.
+#define FF_COMPLIANCE_NORMAL 0
+#define FF_COMPLIANCE_UNOFFICIAL -1 ///< Allow unofficial extensions
+#define FF_COMPLIANCE_EXPERIMENTAL -2 ///< Allow nonstandardized experimental things.
 
 /**
- * opaque 64bit number (generally a PTS) that will be reordered and
- * output in AVFrame.reordered_opaque
+ * error concealment flags
 * - encoding: unused
 * - decoding: Set by user.
 */
- int64_t reordered_opaque;
+ int error_concealment;
+#define FF_EC_GUESS_MVS 1
+#define FF_EC_DEBLOCK 2
+#define FF_EC_FAVOR_INTER 256
 
 /**
- * Bits per sample/pixel of internal libavcodec pixel/sample format.
- * This field is applicable only when sample_fmt is SAMPLE_FMT_S32.
- * - encoding: set by user.
- * - decoding: set by libavcodec.
+ * debug
+ * - encoding: Set by user.
+ * - decoding: Set by user.
 */
- int bits_per_raw_sample;
+ int debug;
+#define FF_DEBUG_PICT_INFO 1
+#define FF_DEBUG_RC 2
+#define FF_DEBUG_BITSTREAM 4
+#define FF_DEBUG_MB_TYPE 8
+#define FF_DEBUG_QP 16
+#if FF_API_DEBUG_MV
+/**
+ * @deprecated this option does nothing
+ */
+#define FF_DEBUG_MV 32
+#endif
+#define FF_DEBUG_DCT_COEFF 0x00000040
+#define FF_DEBUG_SKIP 0x00000080
+#define FF_DEBUG_STARTCODE 0x00000100
+#if FF_API_UNUSED_MEMBERS
+#define FF_DEBUG_PTS 0x00000200
+#endif /* FF_API_UNUSED_MEMBERS */
+#define FF_DEBUG_ER 0x00000400
+#define FF_DEBUG_MMCO 0x00000800
+#define FF_DEBUG_BUGS 0x00001000
+#if FF_API_DEBUG_MV
+#define FF_DEBUG_VIS_QP 0x00002000 ///< only access through AVOptions from outside libavcodec
+#define FF_DEBUG_VIS_MB_TYPE 0x00004000 ///< only access through AVOptions from outside libavcodec
+#endif
+#define FF_DEBUG_BUFFERS 0x00008000
+#define FF_DEBUG_THREADS 0x00010000
+#define FF_DEBUG_NOMC 0x01000000
 
+#if FF_API_DEBUG_MV
 /**
- * Audio channel layout.
- * - encoding: set by user.
- * - decoding: set by libavcodec.
+ * debug
+ * Code outside libavcodec should access this field using AVOptions
+ * - encoding: Set by user.
+ * - decoding: Set by user.
 */
- int64_t channel_layout;
+ int debug_mv;
+#define FF_DEBUG_VIS_MV_P_FOR 0x00000001 //visualize forward predicted MVs of P frames
+#define FF_DEBUG_VIS_MV_B_FOR 0x00000002 //visualize forward predicted MVs of B frames
+#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
+#endif
 
 /**
- * Request decoder to use this channel layout if it can (0 for default)
+ * Error recognition; may misdetect some more or less valid parts as errors.
 * - encoding: unused
 * - decoding: Set by user.
 */
- int64_t request_channel_layout;
+ int err_recognition;
+
+/**
+ * Verify checksums embedded in the bitstream (could be of either encoded or
+ * decoded data, depending on the codec) and print an error message on mismatch.
+ * If AV_EF_EXPLODE is also set, a mismatching checksum will result in the
+ * decoder returning an error.
+ */
+#define AV_EF_CRCCHECK (1<<0)
+#define AV_EF_BITSTREAM (1<<1) ///< detect bitstream specification deviations
+#define AV_EF_BUFFER (1<<2) ///< detect improper bitstream length
+#define AV_EF_EXPLODE (1<<3) ///< abort decoding on minor error detection
+
+#define AV_EF_IGNORE_ERR (1<<15) ///< ignore errors and continue
+#define AV_EF_CAREFUL (1<<16) ///< consider things that violate the spec, are fast to calculate and have not been seen in the wild as errors
+#define AV_EF_COMPLIANT (1<<17) ///< consider all spec non compliances as errors
+#define AV_EF_AGGRESSIVE (1<<18) ///< consider things that a sane encoder should not do as an error
 
- /**
- * Ratecontrol attempt to use, at maximum, <value> of what can be used without an underflow.
- * - encoding: Set by user.
- * - decoding: unused.
- */
- float rc_max_available_vbv_use;
 
 /**
- * Ratecontrol attempt to use, at least, <value> times the amount needed to prevent a vbv overflow.
- * - encoding: Set by user.
- * - decoding: unused.
+ * opaque 64bit number (generally a PTS) that will be reordered and
+ * output in AVFrame.reordered_opaque
+ * - encoding: unused
+ * - decoding: Set by user.
 */
- float rc_min_vbv_overflow_use;
+ int64_t reordered_opaque;
 
 /**
 * Hardware accelerator in use
@@ -2520,15 +2633,6 @@
 struct AVHWAccel *hwaccel;
 
 /**
- * For some codecs, the time base is closer to the field rate than the frame rate.
- * Most notably, H.264 and MPEG-2 specify time_base as half of frame duration
- * if no telecine is used ...
- *
- * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it to 2.
- */
- int ticks_per_frame;
-
- /**
 * Hardware accelerator context.
 * For some hardware accelerators, a global context needs to be
 * provided by the user. In that case, this holds display-dependent
@@ -2541,39 +2645,141 @@
 void *hwaccel_context;
 
 /**
- * Chromaticity coordinates of the source primaries.
- * - encoding: Set by user
- * - decoding: Set by libavcodec
+ * error
+ * - encoding: Set by libavcodec if flags&CODEC_FLAG_PSNR.
+ * - decoding: unused
 */
- enum AVColorPrimaries color_primaries;
+ uint64_t error[AV_NUM_DATA_POINTERS];
 
 /**
- * Color Transfer Characteristic.
- * - encoding: Set by user
- * - decoding: Set by libavcodec
+ * DCT algorithm, see FF_DCT_* below
+ * - encoding: Set by user.
+ * - decoding: unused
 */
- enum AVColorTransferCharacteristic color_trc;
+ int dct_algo;
+#define FF_DCT_AUTO 0
+#define FF_DCT_FASTINT 1
+#if FF_API_UNUSED_MEMBERS
+#define FF_DCT_INT 2
+#endif /* FF_API_UNUSED_MEMBERS */
+#define FF_DCT_MMX 3
+#define FF_DCT_ALTIVEC 5
+#define FF_DCT_FAAN 6
 
 /**
- * YUV colorspace type.
- * - encoding: Set by user
- * - decoding: Set by libavcodec
+ * IDCT algorithm, see FF_IDCT_* below.
+ * - encoding: Set by user.
+ * - decoding: Set by user.
 */
- enum AVColorSpace colorspace;
+ int idct_algo;
+#define FF_IDCT_AUTO 0
+#define FF_IDCT_INT 1
+#define FF_IDCT_SIMPLE 2
+#define FF_IDCT_SIMPLEMMX 3
+#define FF_IDCT_ARM 7
+#define FF_IDCT_ALTIVEC 8
+#if FF_API_ARCH_SH4
+#define FF_IDCT_SH4 9
+#endif
+#define FF_IDCT_SIMPLEARM 10
+#if FF_API_UNUSED_MEMBERS
+#define FF_IDCT_IPP 13
+#endif /* FF_API_UNUSED_MEMBERS */
+#define FF_IDCT_XVID 14
+#if FF_API_IDCT_XVIDMMX
+#define FF_IDCT_XVIDMMX 14
+#endif /* FF_API_IDCT_XVIDMMX */
+#define FF_IDCT_SIMPLEARMV5TE 16
+#define FF_IDCT_SIMPLEARMV6 17
+#if FF_API_ARCH_SPARC
+#define FF_IDCT_SIMPLEVIS 18
+#endif
+#define FF_IDCT_FAAN 20
+#define FF_IDCT_SIMPLENEON 22
+#if FF_API_ARCH_ALPHA
+#define FF_IDCT_SIMPLEALPHA 23
+#endif
+#define FF_IDCT_SIMPLEAUTO 128
 
 /**
- * MPEG vs JPEG YUV range.
- * - encoding: Set by user
- * - decoding: Set by libavcodec
+ * bits per sample/pixel from the demuxer (needed for huffyuv).
+ * - encoding: Set by libavcodec.
+ * - decoding: Set by user.
 */
- enum AVColorRange color_range;
+ int bits_per_coded_sample;
 
 /**
- * This defines the location of chroma samples.
- * - encoding: Set by user
- * - decoding: Set by libavcodec
+ * Bits per sample/pixel of internal libavcodec pixel/sample format.
+ * - encoding: set by user.
+ * - decoding: set by libavcodec.
 */
- enum AVChromaLocation chroma_sample_location;
+ int bits_per_raw_sample;
+
+#if FF_API_LOWRES
+ /**
+ * low resolution decoding, 1-> 1/2 size, 2->1/4 size
+ * - encoding: unused
+ * - decoding: Set by user.
+ * Code outside libavcodec should access this field using:
+ * av_codec_{get,set}_lowres(avctx)
+ */
+ int lowres;
+#endif
+
+ /**
+ * the picture in the bitstream
+ * - encoding: Set by libavcodec.
+ * - decoding: unused
+ */
+ AVFrame *coded_frame;
+
+ /**
+ * thread count
+ * is used to decide how many independent tasks should be passed to execute()
+ * - encoding: Set by user.
+ * - decoding: Set by user.
+ */
+ int thread_count;
+
+ /**
+ * Which multithreading methods to use.
+ * Use of FF_THREAD_FRAME will increase decoding delay by one frame per thread,
+ * so clients which cannot provide future frames should not use it.
+ *
+ * - encoding: Set by user, otherwise the default is used.
+ * - decoding: Set by user, otherwise the default is used.
+ */
+ int thread_type;
+#define FF_THREAD_FRAME 1 ///< Decode more than one frame at once
+#define FF_THREAD_SLICE 2 ///< Decode more than one part of a single frame at once
+
+ /**
+ * Which multithreading methods are in use by the codec.
+ * - encoding: Set by libavcodec.
+ * - decoding: Set by libavcodec.
+ */
+ int active_thread_type;
+
+ /**
+ * Set by the client if its custom get_buffer() callback can be called
+ * synchronously from another thread, which allows faster multithreaded decoding.
+ * draw_horiz_band() will be called from other threads regardless of this setting.
+ * Ignored if the default get_buffer() is used.
+ * - encoding: Set by user.
+ * - decoding: Set by user.
+ */
+ int thread_safe_callbacks;
+
+ /**
+ * The codec may call this to execute several independent things.
+ * It will return only after finishing all tasks.
+ * The user may replace this with some multithreaded implementation,
+ * the default implementation will execute the parts serially.
+ * @param count the number of things to execute
+ * - encoding: Set by libavcodec, user can override.
+ * - decoding: Set by libavcodec, user can override.
+ */
+ int (*execute)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg), void *arg2, int *ret, int count, int size);
 
 /**
 * The codec may call this to execute several independent things.
@@ -2595,59 +2801,313 @@
 */
 int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
 
+#if FF_API_THREAD_OPAQUE
 /**
- * explicit P-frame weighted prediction analysis method
- * 0: off
- * 1: fast blind weighting (one reference duplicate with -1 offset)
- * 2: smart weighting (full fade detection analysis)
+ * @deprecated this field should not be used from outside of lavc
+ */
+ attribute_deprecated
+ void *thread_opaque;
+#endif
+
+ /**
+ * noise vs. sse weight for the nsse comparison function
 * - encoding: Set by user.
 * - decoding: unused
 */
- int weighted_p_pred;
+ int nsse_weight;
 
 /**
- * AQ mode
- * 0: Disabled
- * 1: Variance AQ (complexity mask)
- * 2: Auto-variance AQ (experimental)
- * - encoding: Set by user
- * - decoding: unused
+ * profile
+ * - encoding: Set by user.
+ * - decoding: Set by libavcodec.
 */
- int aq_mode;
+ int profile;
+#define FF_PROFILE_UNKNOWN -99
+#define FF_PROFILE_RESERVED -100
+
+#define FF_PROFILE_AAC_MAIN 0
+#define FF_PROFILE_AAC_LOW 1
+#define FF_PROFILE_AAC_SSR 2
+#define FF_PROFILE_AAC_LTP 3
+#define FF_PROFILE_AAC_HE 4
+#define FF_PROFILE_AAC_HE_V2 28
+#define FF_PROFILE_AAC_LD 22
+#define FF_PROFILE_AAC_ELD 38
+#define FF_PROFILE_MPEG2_AAC_LOW 128
+#define FF_PROFILE_MPEG2_AAC_HE 131
+
+#define FF_PROFILE_DTS 20
+#define FF_PROFILE_DTS_ES 30
+#define FF_PROFILE_DTS_96_24 40
+#define FF_PROFILE_DTS_HD_HRA 50
+#define FF_PROFILE_DTS_HD_MA 60
+
+#define FF_PROFILE_MPEG2_422 0
+#define FF_PROFILE_MPEG2_HIGH 1
+#define FF_PROFILE_MPEG2_SS 2
+#define FF_PROFILE_MPEG2_SNR_SCALABLE 3
+#define FF_PROFILE_MPEG2_MAIN 4
+#define FF_PROFILE_MPEG2_SIMPLE 5
+
+#define FF_PROFILE_H264_CONSTRAINED (1<<9) // 8+1; constraint_set1_flag
+#define FF_PROFILE_H264_INTRA (1<<11) // 8+3; constraint_set3_flag
+
+#define FF_PROFILE_H264_BASELINE 66
+#define FF_PROFILE_H264_CONSTRAINED_BASELINE (66|FF_PROFILE_H264_CONSTRAINED)
+#define FF_PROFILE_H264_MAIN 77
+#define FF_PROFILE_H264_EXTENDED 88
+#define FF_PROFILE_H264_HIGH 100
+#define FF_PROFILE_H264_HIGH_10 110
+#define FF_PROFILE_H264_HIGH_10_INTRA (110|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_HIGH_422 122
+#define FF_PROFILE_H264_HIGH_422_INTRA (122|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_HIGH_444 144
+#define FF_PROFILE_H264_HIGH_444_PREDICTIVE 244
+#define FF_PROFILE_H264_HIGH_444_INTRA (244|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_CAVLC_444 44
+
+#define FF_PROFILE_VC1_SIMPLE 0
+#define FF_PROFILE_VC1_MAIN 1
+#define FF_PROFILE_VC1_COMPLEX 2
+#define FF_PROFILE_VC1_ADVANCED 3
+
+#define FF_PROFILE_MPEG4_SIMPLE 0
+#define FF_PROFILE_MPEG4_SIMPLE_SCALABLE 1
+#define FF_PROFILE_MPEG4_CORE 2
+#define FF_PROFILE_MPEG4_MAIN 3
+#define FF_PROFILE_MPEG4_N_BIT 4
+#define FF_PROFILE_MPEG4_SCALABLE_TEXTURE 5
+#define FF_PROFILE_MPEG4_SIMPLE_FACE_ANIMATION 6
+#define FF_PROFILE_MPEG4_BASIC_ANIMATED_TEXTURE 7
+#define FF_PROFILE_MPEG4_HYBRID 8
+#define FF_PROFILE_MPEG4_ADVANCED_REAL_TIME 9
+#define FF_PROFILE_MPEG4_CORE_SCALABLE 10
+#define FF_PROFILE_MPEG4_ADVANCED_CODING 11
+#define FF_PROFILE_MPEG4_ADVANCED_CORE 12
+#define FF_PROFILE_MPEG4_ADVANCED_SCALABLE_TEXTURE 13
+#define FF_PROFILE_MPEG4_SIMPLE_STUDIO 14
+#define FF_PROFILE_MPEG4_ADVANCED_SIMPLE 15
+
+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0 0
+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1 1
+#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION 2
+#define FF_PROFILE_JPEG2000_DCINEMA_2K 3
+#define FF_PROFILE_JPEG2000_DCINEMA_4K 4
+
+
+#define FF_PROFILE_HEVC_MAIN 1
+#define FF_PROFILE_HEVC_MAIN_10 2
+#define FF_PROFILE_HEVC_MAIN_STILL_PICTURE 3
+#define FF_PROFILE_HEVC_REXT 4
 
 /**
- * AQ strength
- * Reduces blocking and blurring in flat and textured areas.
- * - encoding: Set by user
- * - decoding: unused
+ * level
+ * - encoding: Set by user.
+ * - decoding: Set by libavcodec.
 */
- float aq_strength;
+ int level;
+#define FF_LEVEL_UNKNOWN -99
 
 /**
- * PSY RD
- * Strength of psychovisual optimization
- * - encoding: Set by user
- * - decoding: unused
+ * Skip loop filtering for selected frames.
+ * - encoding: unused
+ * - decoding: Set by user.
 */
- float psy_rd;
+ enum AVDiscard skip_loop_filter;
 
 /**
- * PSY trellis
- * Strength of psychovisual optimization
- * - encoding: Set by user
- * - decoding: unused
+ * Skip IDCT/dequantization for selected frames.
+ * - encoding: unused
+ * - decoding: Set by user.
+ */
+ enum AVDiscard skip_idct;
+
+ /**
+ * Skip decoding for selected frames.
+ * - encoding: unused
+ * - decoding: Set by user.
 */
- float psy_trellis;
+ enum AVDiscard skip_frame;
 
 /**
- * RC lookahead
- * Number of frames for frametype and ratecontrol lookahead
- * - encoding: Set by user
+ * Header containing style information for text subtitles.
+ * For SUBTITLE_ASS subtitle type, it should contain the whole ASS
+ * [Script Info] and [V4+ Styles] section, plus the [Events] line and
+ * the Format line following. It shouldn't include any Dialogue line.
+ * - encoding: Set/allocated/freed by user (before avcodec_open2())
+ * - decoding: Set/allocated/freed by libavcodec (by avcodec_open2())
+ */
+ uint8_t *subtitle_header;
+ int subtitle_header_size;
+
+#if FF_API_ERROR_RATE
+ /**
+ * @deprecated use the 'error_rate' private AVOption of the mpegvideo
+ * encoders
+ */
+ attribute_deprecated
+ int error_rate;
+#endif
+
+#if FF_API_CODEC_PKT
+ /**
+ * @deprecated this field is not supposed to be accessed from outside lavc
+ */
+ attribute_deprecated
+ AVPacket *pkt;
+#endif
+
+ /**
+ * VBV delay coded in the last frame (in periods of a 27 MHz clock).
+ * Used for compliant TS muxing.
+ * - encoding: Set by libavcodec.
+ * - decoding: unused.
+ */
+ uint64_t vbv_delay;
+
+ /**
+ * Encoding only. Allow encoders to output packets that do not contain any
+ * encoded data, only side data.
+ *
+ * Some encoders need to output such packets, e.g. to update some stream
+ * parameters at the end of encoding.
+ *
+ * All callers are strongly recommended to set this option to 1 and update
+ * their code to deal with such packets, since this behaviour may become
+ * always enabled in the future (then this option will be deprecated and
+ * later removed). To avoid ABI issues when this happens, the callers should
+ * use AVOptions to set this field.
+ */
+ int side_data_only_packets;
+
+ /**
+ * Timebase in which pkt_dts/pts and AVPacket.dts/pts are.
+ * Code outside libavcodec should access this field using:
+ * av_codec_{get,set}_pkt_timebase(avctx)
+ * - encoding unused.
+ * - decoding set by user.
+ */
+ AVRational pkt_timebase;
+
+ /**
+ * AVCodecDescriptor
+ * Code outside libavcodec should access this field using:
+ * av_codec_{get,set}_codec_descriptor(avctx)
+ * - encoding: unused.
+ * - decoding: set by libavcodec.
+ */
+ const AVCodecDescriptor *codec_descriptor;
+
+#if !FF_API_LOWRES
+ /**
+ * low resolution decoding, 1-> 1/2 size, 2->1/4 size
+ * - encoding: unused
+ * - decoding: Set by user.
+ * Code outside libavcodec should access this field using:
+ * av_codec_{get,set}_lowres(avctx)
+ */
+ int lowres;
+#endif
+
+ /**
+ * Current statistics for PTS correction.
+ * - decoding: maintained and used by libavcodec, not intended to be used by user apps
+ * - encoding: unused
+ */
+ int64_t pts_correction_num_faulty_pts; /// Number of incorrect PTS values so far
+ int64_t pts_correction_num_faulty_dts; /// Number of incorrect DTS values so far
+ int64_t pts_correction_last_pts; /// PTS of the last frame
+ int64_t pts_correction_last_dts; /// DTS of the last frame
+
+ /**
+ * Character encoding of the input subtitles file.
+ * - decoding: set by user
+ * - encoding: unused
+ */
+ char *sub_charenc;
+
+ /**
+ * Subtitles character encoding mode. Formats or codecs might be adjusting
+ * this setting (if they are doing the conversion themselves for instance).
+ * - decoding: set by libavcodec
+ * - encoding: unused
+ */
+ int sub_charenc_mode;
+#define FF_SUB_CHARENC_MODE_DO_NOTHING -1 ///< do nothing (demuxer outputs a stream supposed to be already in UTF-8, or the codec is bitmap for instance)
+#define FF_SUB_CHARENC_MODE_AUTOMATIC 0 ///< libavcodec will select the mode itself
+#define FF_SUB_CHARENC_MODE_PRE_DECODER 1 ///< the AVPacket data needs to be recoded to UTF-8 before being fed to the decoder, requires iconv
+
+ /**
+ * Skip processing alpha if supported by codec.
+ * Note that if the format uses pre-multiplied alpha (common with VP6,
+ * and recommended due to better video quality/compression)
+ * the image will look as if alpha-blended onto a black background.
+ * However for formats that do not use pre-multiplied alpha
+ * there might be serious artefacts (though e.g. libswscale currently
+ * assumes pre-multiplied alpha anyway).
+ * Code outside libavcodec should access this field using AVOptions
+ *
+ * - decoding: set by user
+ * - encoding: unused
+ */
+ int skip_alpha;
+
+ /**
+ * Number of samples to skip after a discontinuity
 * - decoding: unused
+ * - encoding: set by libavcodec
 */
- int rc_lookahead;
+ int seek_preroll;
+
+#if !FF_API_DEBUG_MV
+ /**
+ * debug motion vectors
+ * Code outside libavcodec should access this field using AVOptions
+ * - encoding: Set by user.
+ * - decoding: Set by user.
+ */
+ int debug_mv;
+#define FF_DEBUG_VIS_MV_P_FOR 0x00000001 //visualize forward predicted MVs of P frames
+#define FF_DEBUG_VIS_MV_B_FOR 0x00000002 //visualize forward predicted MVs of B frames
+#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
+#endif
+
+ /**
+ * custom intra quantization matrix
+ * Code outside libavcodec should access this field using av_codec_g/set_chroma_intra_matrix()
+ * - encoding: Set by user, can be NULL.
+ * - decoding: unused.
+ */
+ uint16_t *chroma_intra_matrix;
 } AVCodecContext;
 
+AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx);
+void av_codec_set_pkt_timebase (AVCodecContext *avctx, AVRational val);
+
+const AVCodecDescriptor *av_codec_get_codec_descriptor(const AVCodecContext *avctx);
+void av_codec_set_codec_descriptor(AVCodecContext *avctx, const AVCodecDescriptor *desc);
+
+int av_codec_get_lowres(const AVCodecContext *avctx);
+void av_codec_set_lowres(AVCodecContext *avctx, int val);
+
+int av_codec_get_seek_preroll(const AVCodecContext *avctx);
+void av_codec_set_seek_preroll(AVCodecContext *avctx, int val);
+
+uint16_t *av_codec_get_chroma_intra_matrix(const AVCodecContext *avctx);
+void av_codec_set_chroma_intra_matrix(AVCodecContext *avctx, uint16_t *val);
+
+/**
+ * AVProfile.
+ */
+typedef struct AVProfile {
+ int profile;
+ const char *name; ///< short name for the profile
+} AVProfile;
+
+typedef struct AVCodecDefault AVCodecDefault;
+
+struct AVSubtitle;
+
 /**
 * AVCodec.
 */
@@ -2659,36 +3119,96 @@
 * This is the primary way to find a codec from the user perspective.
 */
 const char *name;
+ /**
+ * Descriptive name for the codec, meant to be more human readable than name.
+ * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
+ */
+ const char *long_name;
 enum AVMediaType type;
- enum CodecID id;
- int priv_data_size;
- int (*init)(AVCodecContext *);
- int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data);
- int (*close)(AVCodecContext *);
- int (*decode)(AVCodecContext *, void *outdata, int *outdata_size, AVPacket *avpkt);
+ enum AVCodecID id;
 /**
 * Codec capabilities.
 * see CODEC_CAP_*
 */
 int capabilities;
+ const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
+ const enum AVPixelFormat *pix_fmts; ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1
+ const int *supported_samplerates; ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
+ const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
+ const uint64_t *channel_layouts; ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
+#if FF_API_LOWRES
+ uint8_t max_lowres; ///< maximum value for lowres supported by the decoder, no direct access, use av_codec_get_max_lowres()
+#endif
+ const AVClass *priv_class; ///< AVClass for the private context
+ const AVProfile *profiles; ///< array of recognized profiles, or NULL if unknown, array is terminated by {FF_PROFILE_UNKNOWN}
+
+ /*****************************************************************
+ * No fields below this line are part of the public API. They
+ * may not be used outside of libavcodec and can be changed and
+ * removed at will.
+ * New public fields should be added right above.
+ *****************************************************************
+ */
+ int priv_data_size;
 struct AVCodec *next;
 /**
+ * @name Frame-level threading support functions
+ * @{
+ */
+ /**
+ * If defined, called on thread contexts when they are created.
+ * If the codec allocates writable tables in init(), re-allocate them here.
+ * priv_data will be set to a copy of the original.
+ */
+ int (*init_thread_copy)(AVCodecContext *);
+ /**
+ * Copy necessary context variables from a previous thread context to the current one.
+ * If not defined, the next thread will start automatically; otherwise, the codec
+ * must call ff_thread_finish_setup().
+ *
+ * dst and src will (rarely) point to the same context, in which case memcpy should be skipped.
+ */
+ int (*update_thread_context)(AVCodecContext *dst, const AVCodecContext *src);
+ /** @} */
+
+ /**
+ * Private codec-specific defaults.
+ */
+ const AVCodecDefault *defaults;
+
+ /**
+ * Initialize codec static data, called from avcodec_register().
+ */
+ void (*init_static_data)(struct AVCodec *codec);
+
+ int (*init)(AVCodecContext *);
+ int (*encode_sub)(AVCodecContext *, uint8_t *buf, int buf_size,
+ const struct AVSubtitle *sub);
+ /**
+ * Encode data to an AVPacket.
+ *
+ * @param avctx codec context
+ * @param avpkt output AVPacket (may contain a user-provided buffer)
+ * @param[in] frame AVFrame containing the raw data to be encoded
+ * @param[out] got_packet_ptr encoder sets to 0 or 1 to indicate that a
+ * non-empty packet was returned in avpkt.
+ * @return 0 on success, negative error code on failure
+ */
+ int (*encode2)(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame,
+ int *got_packet_ptr);
+ int (*decode)(AVCodecContext *, void *outdata, int *outdata_size, AVPacket *avpkt);
+ int (*close)(AVCodecContext *);
+ /**
 * Flush buffers.
 * Will be called when seeking
 */
 void (*flush)(AVCodecContext *);
- const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
- const enum PixelFormat *pix_fmts; ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1
- /**
- * Descriptive name for the codec, meant to be more human readable than name.
- * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
- */
- const char *long_name;
- const int *supported_samplerates; ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
- const enum SampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
- const int64_t *channel_layouts; ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
 } AVCodec;
 
+int av_codec_get_max_lowres(const AVCodec *codec);
+
+struct MpegEncContext;
+
 /**
 * AVHWAccel.
 */
@@ -2710,16 +3230,16 @@
 /**
 * Codec implemented by the hardware accelerator.
 *
- * See CODEC_ID_xxx
+ * See AV_CODEC_ID_xxx
 */
- enum CodecID id;
+ enum AVCodecID id;
 
 /**
 * Supported pixel format.
 *
 * Only hardware accelerated formats are supported here.
 */
- enum PixelFormat pix_fmt;
+ enum AVPixelFormat pix_fmt;
 
 /**
 * Hardware accelerated codec capabilities.
@@ -2727,9 +3247,21 @@
 */
 int capabilities;
 
+ /*****************************************************************
+ * No fields below this line are part of the public API. They
+ * may not be used outside of libavcodec and can be changed and
+ * removed at will.
+ * New public fields should be added right above.
+ *****************************************************************
+ */
 struct AVHWAccel *next;
 
 /**
+ * Allocate a custom buffer
+ */
+ int (*alloc_frame)(AVCodecContext *avctx, AVFrame *frame);
+
+ /**
 * Called at the beginning of each frame or field picture.
 *
 * Meaningful frame information (codec specific) is guaranteed to
@@ -2750,6 +3282,7 @@
 *
 * Meaningful slice information (codec specific) is guaranteed to
 * be parsed at this point. This function is mandatory.
+ * The only exception is XvMC, that works on MB level.
 *
 * @param avctx the codec context
 * @param buf the slice data buffer base
@@ -2770,49 +3303,70 @@
 int (*end_frame)(AVCodecContext *avctx);
 
 /**
- * Size of HW accelerator private data.
+ * Size of per-frame hardware accelerator private data.
 *
 * Private data is allocated with av_mallocz() before
 * AVCodecContext.get_buffer() and deallocated after
 * AVCodecContext.release_buffer().
 */
+ int frame_priv_data_size;
+
+ /**
+ * Called for every Macroblock in a slice.
+ *
+ * XvMC uses it to replace the ff_mpv_decode_mb().
+ * Instead of decoding to raw picture, MB parameters are
+ * stored in an array provided by the video driver.
+ *
+ * @param s the mpeg context
+ */
+ void (*decode_mb)(struct MpegEncContext *s);
+
+ /**
+ * Initialize the hwaccel private data.
+ *
+ * This will be called from ff_get_format(), after hwaccel and
+ * hwaccel_context are set and the hwaccel private data in AVCodecInternal
+ * is allocated.
+ */
+ int (*init)(AVCodecContext *avctx);
+
+ /**
+ * Uninitialize the hwaccel private data.
+ *
+ * This will be called from get_format() or avcodec_close(), after hwaccel
+ * and hwaccel_context are already uninitialized.
+ */
+ int (*uninit)(AVCodecContext *avctx);
+
+ /**
+ * Size of the private data to allocate in
+ * AVCodecInternal.hwaccel_priv_data.
+ */
 int priv_data_size;
 } AVHWAccel;
 
 /**
- * four components are given, that's all.
- * the last component is alpha
+ * @defgroup lavc_picture AVPicture
+ *
+ * Functions for working with AVPicture
+ * @{
+ */
+
+/**
+ * Picture data structure.
+ *
+ * Up to four components can be stored into it, the last component is
+ * alpha.
 */
 typedef struct AVPicture {
- uint8_t *data[4];
- int linesize[4]; ///< number of bytes per line
+ uint8_t *data[AV_NUM_DATA_POINTERS]; ///< pointers to the image data planes
+ int linesize[AV_NUM_DATA_POINTERS]; ///< number of bytes per line
 } AVPicture;
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
 /**
- * AVPaletteControl
- * This structure defines a method for communicating palette changes
- * between and demuxer and a decoder.
- *
- * @deprecated Use AVPacket to send palette changes instead.
- * This is totally broken.
- */
-#define AVPALETTE_SIZE 1024
-#define AVPALETTE_COUNT 256
-typedef struct AVPaletteControl {
-
- /* Demuxer sets this to 1 to indicate the palette has changed;
- * decoder resets to 0. */
- int palette_changed;
-
- /* 4-byte ARGB palette entries, stored in native byte order; note that
- * the individual palette components should be on a 8-bit scale; if
- * the palette data comes from an IBM VGA native format, the component
- * data is probably 6 bits in size and needs to be scaled. */
- unsigned int palette[AVPALETTE_COUNT];
-
-} AVPaletteControl attribute_deprecated;
-#endif
+ * @}
+ */
 
 enum AVSubtitleType {
 SUBTITLE_NONE,
@@ -2832,6 +3386,8 @@
 SUBTITLE_ASS,
 };
 
+#define AV_SUBTITLE_FLAG_FORCED 0x00000001
+
 typedef struct AVSubtitleRect {
 int x; ///< top left corner of pict, undefined when pict is not set
 int y; ///< top left corner of pict, undefined when pict is not set
@@ -2850,10 +3406,12 @@
 
 /**
 * 0 terminated ASS/SSA compatible event line.
- * The pressentation of this is unaffected by the other values in this
+ * The presentation of this is unaffected by the other values in this
 * struct.
 */
 char *ass;
+
+ int flags;
 } AVSubtitleRect;
 
 typedef struct AVSubtitle {
@@ -2865,521 +3423,535 @@
 int64_t pts; ///< Same as packet pts, in AV_TIME_BASE
 } AVSubtitle;
 
-/* packet functions */
+/**
+ * If c is NULL, returns the first registered codec,
+ * if c is non-NULL, returns the next registered codec after c,
+ * or NULL if c is the last one.
+ */
+AVCodec *av_codec_next(const AVCodec *c);
 
 /**
- * @deprecated use NULL instead
+ * Return the LIBAVCODEC_VERSION_INT constant.
 */
-attribute_deprecated void av_destruct_packet_nofree(AVPacket *pkt);
+unsigned avcodec_version(void);
 
 /**
- * Default packet destructor.
+ * Return the libavcodec build-time configuration.
 */
-void av_destruct_packet(AVPacket *pkt);
+const char *avcodec_configuration(void);
 
 /**
- * Initialize optional fields of a packet with default values.
+ * Return the libavcodec license.
+ */
+const char *avcodec_license(void);
+
+/**
+ * Register the codec codec and initialize libavcodec.
 *
- * @param pkt packet
+ * @warning either this function or avcodec_register_all() must be called
+ * before any other libavcodec functions.
+ *
+ * @see avcodec_register_all()
 */
-void av_init_packet(AVPacket *pkt);
+void avcodec_register(AVCodec *codec);
 
 /**
- * Allocate the payload of a packet and initialize its fields with
- * default values.
+ * Register all the codecs, parsers and bitstream filters which were enabled at
+ * configuration time. If you do not call this function you can select exactly
+ * which formats you want to support, by using the individual registration
+ * functions.
 *
- * @param pkt packet
- * @param size wanted payload size
- * @return 0 if OK, AVERROR_xxx otherwise
+ * @see avcodec_register
+ * @see av_register_codec_parser
+ * @see av_register_bitstream_filter
 */
-int av_new_packet(AVPacket *pkt, int size);
+void avcodec_register_all(void);
 
 /**
- * Reduce packet size, correctly zeroing padding
+ * Allocate an AVCodecContext and set its fields to default values. The
+ * resulting struct should be freed with avcodec_free_context().
 *
- * @param pkt packet
- * @param size new size
+ * @param codec if non-NULL, allocate private data and initialize defaults
+ * for the given codec. It is illegal to then call avcodec_open2()
+ * with a different codec.
+ * If NULL, then the codec-specific defaults won't be initialized,
+ * which may result in suboptimal default settings (this is
+ * important mainly for encoders, e.g. libx264).
+ *
+ * @return An AVCodecContext filled with default values or NULL on failure.
+ * @see avcodec_get_context_defaults
 */
-void av_shrink_packet(AVPacket *pkt, int size);
+AVCodecContext *avcodec_alloc_context3(const AVCodec *codec);
 
 /**
- * @warning This is a hack - the packet memory allocation stuff is broken. The
- * packet is allocated if it was not really allocated.
+ * Free the codec context and everything associated with it and write NULL to
+ * the provided pointer.
 */
-int av_dup_packet(AVPacket *pkt);
+void avcodec_free_context(AVCodecContext **avctx);
 
 /**
- * Free a packet.
+ * Set the fields of the given AVCodecContext to default values corresponding
+ * to the given codec (defaults may be codec-dependent).
 *
- * @param pkt packet to free
+ * Do not call this function if a non-NULL codec has been passed
+ * to avcodec_alloc_context3() that allocated this AVCodecContext.
+ * If codec is non-NULL, it is illegal to call avcodec_open2() with a
+ * different codec on this AVCodecContext.
 */
-void av_free_packet(AVPacket *pkt);
-
-/* resample.c */
-
-struct ReSampleContext;
-struct AVResampleContext;
+int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec);
 
-typedef struct ReSampleContext ReSampleContext;
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
 /**
- * @deprecated Use av_audio_resample_init() instead.
+ * Get the AVClass for AVCodecContext. It can be used in combination with
+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
+ *
+ * @see av_opt_find().
 */
-attribute_deprecated ReSampleContext *audio_resample_init(int output_channels, int input_channels,
- int output_rate, int input_rate);
-#endif
+const AVClass *avcodec_get_class(void);
+
 /**
- * Initializes audio resampling context
+ * Get the AVClass for AVFrame. It can be used in combination with
+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
 *
- * @param output_channels number of output channels
- * @param input_channels number of input channels
- * @param output_rate output sample rate
- * @param input_rate input sample rate
- * @param sample_fmt_out requested output sample format
- * @param sample_fmt_in input sample format
- * @param filter_length length of each FIR filter in the filterbank relative to the cutoff freq
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear If 1 then the used FIR filter will be linearly interpolated
- between the 2 closest, if 0 the closest will be used
- * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
- * @return allocated ReSampleContext, NULL if error occured
+ * @see av_opt_find().
 */
-ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
- int output_rate, int input_rate,
- enum SampleFormat sample_fmt_out,
- enum SampleFormat sample_fmt_in,
- int filter_length, int log2_phase_count,
- int linear, double cutoff);
+const AVClass *avcodec_get_frame_class(void);
 
-int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples);
-void audio_resample_close(ReSampleContext *s);
+/**
+ * Get the AVClass for AVSubtitleRect. It can be used in combination with
+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
+ *
+ * @see av_opt_find().
+ */
+const AVClass *avcodec_get_subtitle_rect_class(void);
 
+/**
+ * Copy the settings of the source AVCodecContext into the destination
+ * AVCodecContext. The resulting destination codec context will be
+ * unopened, i.e. you are required to call avcodec_open2() before you
+ * can use this AVCodecContext to decode/encode video/audio data.
+ *
+ * @param dest target codec context, should be initialized with
+ * avcodec_alloc_context3(NULL), but otherwise uninitialized
+ * @param src source codec context
+ * @return AVERROR() on error (e.g. memory allocation error), 0 on success
+ */
+int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
 
+#if FF_API_AVFRAME_LAVC
 /**
- * Initializes an audio resampler.
- * Note, if either rate is not an integer then simply scale both rates up so they are.
- * @param filter_length length of each FIR filter in the filterbank relative to the cutoff freq
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear If 1 then the used FIR filter will be linearly interpolated
- between the 2 closest, if 0 the closest will be used
- * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
+ * @deprecated use av_frame_alloc()
 */
-struct AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_length, int log2_phase_count, int linear, double cutoff);
+attribute_deprecated
+AVFrame *avcodec_alloc_frame(void);
 
 /**
- * resamples.
- * @param src an array of unconsumed samples
- * @param consumed the number of samples of src which have been consumed are returned here
- * @param src_size the number of unconsumed samples available
- * @param dst_size the amount of space in samples available in dst
- * @param update_ctx If this is 0 then the context will not be modified, that way several channels can be resampled with the same context.
- * @return the number of samples written in dst or -1 if an error occurred
+ * Set the fields of the given AVFrame to default values.
+ *
+ * @param frame The AVFrame of which the fields should be set to default values.
+ *
+ * @deprecated use av_frame_unref()
 */
-int av_resample(struct AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx);
+attribute_deprecated
+void avcodec_get_frame_defaults(AVFrame *frame);
 
+/**
+ * Free the frame and any dynamically allocated objects in it,
+ * e.g. extended_data.
+ *
+ * @param frame frame to be freed. The pointer will be set to NULL.
+ *
+ * @warning this function does NOT free the data buffers themselves
+ * (it does not know how, since they might have been allocated with
+ * a custom get_buffer()).
+ *
+ * @deprecated use av_frame_free()
+ */
+attribute_deprecated
+void avcodec_free_frame(AVFrame **frame);
+#endif
 
 /**
- * Compensates samplerate/timestamp drift. The compensation is done by changing
- * the resampler parameters, so no audible clicks or similar distortions occur
- * @param compensation_distance distance in output samples over which the compensation should be performed
- * @param sample_delta number of output samples which should be output less
+ * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
+ * function the context has to be allocated with avcodec_alloc_context3().
 *
- * example: av_resample_compensate(c, 10, 500)
- * here instead of 510 samples only 500 samples would be output
+ * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
+ * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
+ * retrieving a codec.
 *
- * note, due to rounding the actual compensation might be slightly different,
- * especially if the compensation_distance is large and the in_rate used during init is small
+ * @warning This function is not thread safe!
+ *
+ * @code
+ * avcodec_register_all();
+ * av_dict_set(&opts, "b", "2.5M", 0);
+ * codec = avcodec_find_decoder(AV_CODEC_ID_H264);
+ * if (!codec)
+ * exit(1);
+ *
+ * context = avcodec_alloc_context3(codec);
+ *
+ * if (avcodec_open2(context, codec, opts) < 0)
+ * exit(1);
+ * @endcode
+ *
+ * @param avctx The context to initialize.
+ * @param codec The codec to open this context for. If a non-NULL codec has been
+ * previously passed to avcodec_alloc_context3() or
+ * avcodec_get_context_defaults3() for this context, then this
+ * parameter MUST be either NULL or equal to the previously passed
+ * codec.
+ * @param options A dictionary filled with AVCodecContext and codec-private options.
+ * On return this object will be filled with options that were not found.
+ *
+ * @return zero on success, a negative value on error
+ * @see avcodec_alloc_context3(), avcodec_find_decoder(), avcodec_find_encoder(),
+ * av_dict_set(), av_opt_find().
 */
-void av_resample_compensate(struct AVResampleContext *c, int sample_delta, int compensation_distance);
-void av_resample_close(struct AVResampleContext *c);
+int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options);
 
 /**
- * Allocate memory for a picture. Call avpicture_free to free it.
+ * Close a given AVCodecContext and free all the data associated with it
+ * (but not the AVCodecContext itself).
 *
- * @param picture the picture to be filled in
- * @param pix_fmt the format of the picture
- * @param width the width of the picture
- * @param height the height of the picture
- * @return zero if successful, a negative value if not
+ * Calling this function on an AVCodecContext that hasn't been opened will free
+ * the codec-specific data allocated in avcodec_alloc_context3() /
+ * avcodec_get_context_defaults3() with a non-NULL codec. Subsequent calls will
+ * do nothing.
 */
-int avpicture_alloc(AVPicture *picture, enum PixelFormat pix_fmt, int width, int height);
+int avcodec_close(AVCodecContext *avctx);
 
 /**
- * Free a picture previously allocated by avpicture_alloc().
+ * Free all allocated data in the given subtitle struct.
 *
- * @param picture the AVPicture to be freed
+ * @param sub AVSubtitle to free.
 */
-void avpicture_free(AVPicture *picture);
+void avsubtitle_free(AVSubtitle *sub);
 
 /**
- * Fill in the AVPicture fields.
- * The fields of the given AVPicture are filled in by using the 'ptr' address
- * which points to the image data buffer. Depending on the specified picture
- * format, one or multiple image data pointers and line sizes will be set.
- * If a planar format is specified, several pointers will be set pointing to
- * the different picture planes and the line sizes of the different planes
- * will be stored in the lines_sizes array.
- * Call with ptr == NULL to get the required size for the ptr buffer.
- *
- * @param picture AVPicture whose fields are to be filled in
- * @param ptr Buffer which will contain or contains the actual image data
- * @param pix_fmt The format in which the picture data is stored.
- * @param width the width of the image in pixels
- * @param height the height of the image in pixels
- * @return size of the image data in bytes
- */
-int avpicture_fill(AVPicture *picture, uint8_t *ptr,
- enum PixelFormat pix_fmt, int width, int height);
-int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width, int height,
- unsigned char *dest, int dest_size);
+ * @}
+ */
 
 /**
- * Calculate the size in bytes that a picture of the given width and height
- * would occupy if stored in the given picture format.
- * Note that this returns the size of a compact representation as generated
- * by avpicture_layout, which can be smaller than the size required for e.g.
- * avpicture_fill.
- *
- * @param pix_fmt the given picture format
- * @param width the width of the image
- * @param height the height of the image
- * @return Image data size in bytes or -1 on error (e.g. too large dimensions).
- */
-int avpicture_get_size(enum PixelFormat pix_fmt, int width, int height);
-void avcodec_get_chroma_sub_sample(enum PixelFormat pix_fmt, int *h_shift, int *v_shift);
-const char *avcodec_get_pix_fmt_name(enum PixelFormat pix_fmt);
-void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
+ * @addtogroup lavc_packet
+ * @{
+ */
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
+#if FF_API_DESTRUCT_PACKET
 /**
- * Returns the pixel format corresponding to the name name.
- *
- * If there is no pixel format with name name, then looks for a
- * pixel format with the name corresponding to the native endian
- * format of name.
- * For example in a little-endian system, first looks for "gray16",
- * then for "gray16le".
- *
- * Finally if no pixel format has been found, returns PIX_FMT_NONE.
- *
- * @deprecated Deprecated in favor of av_get_pix_fmt().
+ * Default packet destructor.
+ * @deprecated use the AVBuffer API instead
 */
-attribute_deprecated enum PixelFormat avcodec_get_pix_fmt(const char* name);
+attribute_deprecated
+void av_destruct_packet(AVPacket *pkt);
 #endif
 
 /**
- * Returns a value representing the fourCC code associated to the
- * pixel format pix_fmt, or 0 if no associated fourCC code can be
- * found.
+ * Initialize optional fields of a packet with default values.
+ *
+ * Note, this does not touch the data and size members, which have to be
+ * initialized separately.
+ *
+ * @param pkt packet
 */
-unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat pix_fmt);
+void av_init_packet(AVPacket *pkt);
 
-#define FF_LOSS_RESOLUTION 0x0001 /**< loss due to resolution change */
-#define FF_LOSS_DEPTH 0x0002 /**< loss due to color depth change */
-#define FF_LOSS_COLORSPACE 0x0004 /**< loss due to color space conversion */
-#define FF_LOSS_ALPHA 0x0008 /**< loss of alpha bits */
-#define FF_LOSS_COLORQUANT 0x0010 /**< loss due to color quantization */
-#define FF_LOSS_CHROMA 0x0020 /**< loss of chroma (e.g. RGB to gray conversion) */
-
-/**
- * Computes what kind of losses will occur when converting from one specific
- * pixel format to another.
- * When converting from one pixel format to another, information loss may occur.
- * For example, when converting from RGB24 to GRAY, the color information will
- * be lost. Similarly, other losses occur when converting from some formats to
- * other formats. These losses can involve loss of chroma, but also loss of
- * resolution, loss of color depth, loss due to the color space conversion, loss
- * of the alpha bits or loss due to color quantization.
- * avcodec_get_fix_fmt_loss() informs you about the various types of losses
- * which will occur when converting from one pixel format to another.
+/**
+ * Allocate the payload of a packet and initialize its fields with
+ * default values.
 *
- * @param[in] dst_pix_fmt destination pixel format
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @return Combination of flags informing you what kind of losses will occur.
+ * @param pkt packet
+ * @param size wanted payload size
+ * @return 0 if OK, AVERROR_xxx otherwise
 */
-int avcodec_get_pix_fmt_loss(enum PixelFormat dst_pix_fmt, enum PixelFormat src_pix_fmt,
- int has_alpha);
+int av_new_packet(AVPacket *pkt, int size);
 
 /**
- * Finds the best pixel format to convert to given a certain source pixel
- * format. When converting from one pixel format to another, information loss
- * may occur. For example, when converting from RGB24 to GRAY, the color
- * information will be lost. Similarly, other losses occur when converting from
- * some formats to other formats. avcodec_find_best_pix_fmt() searches which of
- * the given pixel formats should be used to suffer the least amount of loss.
- * The pixel formats from which it chooses one, are determined by the
- * pix_fmt_mask parameter.
- *
- * @code
- * src_pix_fmt = PIX_FMT_YUV420P;
- * pix_fmt_mask = (1 << PIX_FMT_YUV422P) || (1 << PIX_FMT_RGB24);
- * dst_pix_fmt = avcodec_find_best_pix_fmt(pix_fmt_mask, src_pix_fmt, alpha, &loss);
- * @endcode
+ * Reduce packet size, correctly zeroing padding
 *
- * @param[in] pix_fmt_mask bitmask determining which pixel format to choose from
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
- * @return The best pixel format to convert to or -1 if none was found.
+ * @param pkt packet
+ * @param size new size
 */
-enum PixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum PixelFormat src_pix_fmt,
- int has_alpha, int *loss_ptr);
-
+void av_shrink_packet(AVPacket *pkt, int size);
 
 /**
- * Print in buf the string corresponding to the pixel format with
- * number pix_fmt, or an header if pix_fmt is negative.
+ * Increase packet size, correctly zeroing padding
 *
- * @param[in] buf the buffer where to write the string
- * @param[in] buf_size the size of buf
- * @param[in] pix_fmt the number of the pixel format to print the corresponding info string, or
- * a negative value to print the corresponding header.
- * Meaningful values for obtaining a pixel format info vary from 0 to PIX_FMT_NB -1.
+ * @param pkt packet
+ * @param grow_by number of bytes by which to increase the size of the packet
 */
-void avcodec_pix_fmt_string (char *buf, int buf_size, enum PixelFormat pix_fmt);
-
-#define FF_ALPHA_TRANSP 0x0001 /* image has some totally transparent pixels */
-#define FF_ALPHA_SEMI_TRANSP 0x0002 /* image has some transparent pixels */
+int av_grow_packet(AVPacket *pkt, int grow_by);
 
 /**
- * Tell if an image really has transparent alpha values.
- * @return ored mask of FF_ALPHA_xxx constants
+ * Initialize a reference-counted packet from av_malloc()ed data.
+ *
+ * @param pkt packet to be initialized. This function will set the data, size,
+ * buf and destruct fields, all others are left untouched.
+ * @param data Data allocated by av_malloc() to be used as packet data. If this
+ * function returns successfully, the data is owned by the underlying AVBuffer.
+ * The caller may not access the data through other means.
+ * @param size size of data in bytes, without the padding. I.e. the full buffer
+ * size is assumed to be size + FF_INPUT_BUFFER_PADDING_SIZE.
+ *
+ * @return 0 on success, a negative AVERROR on error
 */
-int img_get_alpha_info(const AVPicture *src,
- enum PixelFormat pix_fmt, int width, int height);
-
-/* deinterlace a picture */
-/* deinterlace - if not supported return -1 */
-int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
- enum PixelFormat pix_fmt, int width, int height);
-
-/* external high level API */
+int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size);
 
 /**
- * If c is NULL, returns the first registered codec,
- * if c is non-NULL, returns the next registered codec after c,
- * or NULL if c is the last one.
+ * @warning This is a hack - the packet memory allocation stuff is broken. The
+ * packet is allocated if it was not really allocated.
 */
-AVCodec *av_codec_next(AVCodec *c);
+int av_dup_packet(AVPacket *pkt);
 
 /**
- * Returns the LIBAVCODEC_VERSION_INT constant.
+ * Copy packet, including contents
+ *
+ * @return 0 on success, negative AVERROR on fail
 */
-unsigned avcodec_version(void);
+int av_copy_packet(AVPacket *dst, const AVPacket *src);
 
 /**
- * Returns the libavcodec build-time configuration.
+ * Copy packet side data
+ *
+ * @return 0 on success, negative AVERROR on fail
 */
-const char *avcodec_configuration(void);
+int av_copy_packet_side_data(AVPacket *dst, const AVPacket *src);
 
 /**
- * Returns the libavcodec license.
+ * Free a packet.
+ *
+ * @param pkt packet to free
 */
-const char *avcodec_license(void);
+void av_free_packet(AVPacket *pkt);
 
 /**
- * Initializes libavcodec.
+ * Allocate new information of a packet.
 *
- * @warning This function must be called before any other libavcodec
- * function.
+ * @param pkt packet
+ * @param type side information type
+ * @param size side information size
+ * @return pointer to fresh allocated data or NULL otherwise
 */
-void avcodec_init(void);
+uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+ int size);
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
 /**
- * @deprecated Deprecated in favor of avcodec_register().
+ * Shrink the already allocated side data buffer
+ *
+ * @param pkt packet
+ * @param type side information type
+ * @param size new side information size
+ * @return 0 on success, < 0 on failure
 */
-attribute_deprecated void register_avcodec(AVCodec *codec);
-#endif
+int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+ int size);
 
 /**
- * Register the codec codec and initialize libavcodec.
+ * Get side information from packet.
 *
- * @see avcodec_init()
+ * @param pkt packet
+ * @param type desired side information type
+ * @param size pointer for side information size to store (optional)
+ * @return pointer to data if present or NULL otherwise
 */
-void avcodec_register(AVCodec *codec);
+uint8_t* av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+ int *size);
+
+int av_packet_merge_side_data(AVPacket *pkt);
+
+int av_packet_split_side_data(AVPacket *pkt);
 
 /**
- * Finds a registered encoder with a matching codec ID.
+ * Pack a dictionary for use in side_data.
 *
- * @param id CodecID of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
+ * @param dict The dictionary to pack.
+ * @param size pointer to store the size of the returned data
+ * @return pointer to data if successful, NULL otherwise
+ */
+uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size);
+/**
+ * Unpack a dictionary from side_data.
+ *
+ * @param data data from side_data
+ * @param size size of the data
+ * @param dict the metadata storage dictionary
+ * @return 0 on success, < 0 on failure
 */
-AVCodec *avcodec_find_encoder(enum CodecID id);
+int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **dict);
+
 
 /**
- * Finds a registered encoder with the specified name.
+ * Convenience function to free all the side data stored.
+ * All the other fields stay untouched.
 *
- * @param name name of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
+ * @param pkt packet
 */
-AVCodec *avcodec_find_encoder_by_name(const char *name);
+void av_packet_free_side_data(AVPacket *pkt);
 
 /**
- * Finds a registered decoder with a matching codec ID.
+ * Setup a new reference to the data described by a given packet
 *
- * @param id CodecID of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
+ * If src is reference-counted, setup dst as a new reference to the
+ * buffer in src. Otherwise allocate a new buffer in dst and copy the
+ * data from src into it.
+ *
+ * All the other fields are copied from src.
+ *
+ * @see av_packet_unref
+ *
+ * @param dst Destination packet
+ * @param src Source packet
+ *
+ * @return 0 on success, a negative AVERROR on error.
 */
-AVCodec *avcodec_find_decoder(enum CodecID id);
+int av_packet_ref(AVPacket *dst, const AVPacket *src);
 
 /**
- * Finds a registered decoder with the specified name.
+ * Wipe the packet.
 *
- * @param name name of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
+ * Unreference the buffer referenced by the packet and reset the
+ * remaining packet fields to their default values.
+ *
+ * @param pkt The packet to be unreferenced.
 */
-AVCodec *avcodec_find_decoder_by_name(const char *name);
-void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode);
+void av_packet_unref(AVPacket *pkt);
 
 /**
- * Sets the fields of the given AVCodecContext to default values.
+ * Move every field in src to dst and reset src.
+ *
+ * @see av_packet_unref
 *
- * @param s The AVCodecContext of which the fields should be set to default values.
+ * @param src Source packet, will be reset
+ * @param dst Destination packet
 */
-void avcodec_get_context_defaults(AVCodecContext *s);
+void av_packet_move_ref(AVPacket *dst, AVPacket *src);
 
-/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
- * we WILL change its arguments and name a few times! */
-void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType);
+/**
+ * Copy only "properties" fields from src to dst.
+ *
+ * Properties for the purpose of this function are all the fields
+ * beside those related to the packet data (buf, data, size)
+ *
+ * @param dst Destination packet
+ * @param src Source packet
+ *
+ * @return 0 on success AVERROR on failure.
+ *
+ */
+int av_packet_copy_props(AVPacket *dst, const AVPacket *src);
 
 /**
- * Allocates an AVCodecContext and sets its fields to default values. The
- * resulting struct can be deallocated by simply calling av_free().
+ * Convert valid timing fields (timestamps / durations) in a packet from one
+ * timebase to another. Timestamps with unknown values (AV_NOPTS_VALUE) will be
+ * ignored.
 *
- * @return An AVCodecContext filled with default values or NULL on failure.
- * @see avcodec_get_context_defaults
+ * @param pkt packet on which the conversion will be performed
+ * @param tb_src source timebase, in which the timing fields in pkt are
+ * expressed
+ * @param tb_dst destination timebase, to which the timing fields will be
+ * converted
 */
-AVCodecContext *avcodec_alloc_context(void);
+void av_packet_rescale_ts(AVPacket *pkt, AVRational tb_src, AVRational tb_dst);
 
-/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
- * we WILL change its arguments and name a few times! */
-AVCodecContext *avcodec_alloc_context2(enum AVMediaType);
+/**
+ * @}
+ */
 
 /**
- * Copy the settings of the source AVCodecContext into the destination
- * AVCodecContext. The resulting destination codec context will be
- * unopened, i.e. you are required to call avcodec_open() before you
- * can use this AVCodecContext to decode/encode video/audio data.
- *
- * @param dest target codec context, should be initialized with
- * avcodec_alloc_context(), but otherwise uninitialized
- * @param src source codec context
- * @return AVERROR() on error (e.g. memory allocation error), 0 on success
+ * @addtogroup lavc_decoding
+ * @{
 */
-int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
 
 /**
- * Sets the fields of the given AVFrame to default values.
+ * Find a registered decoder with a matching codec ID.
 *
- * @param pic The AVFrame of which the fields should be set to default values.
+ * @param id AVCodecID of the requested decoder
+ * @return A decoder if one was found, NULL otherwise.
 */
-void avcodec_get_frame_defaults(AVFrame *pic);
+AVCodec *avcodec_find_decoder(enum AVCodecID id);
 
 /**
- * Allocates an AVFrame and sets its fields to default values. The resulting
- * struct can be deallocated by simply calling av_free().
+ * Find a registered decoder with the specified name.
 *
- * @return An AVFrame filled with default values or NULL on failure.
- * @see avcodec_get_frame_defaults
+ * @param name name of the requested decoder
+ * @return A decoder if one was found, NULL otherwise.
 */
-AVFrame *avcodec_alloc_frame(void);
+AVCodec *avcodec_find_decoder_by_name(const char *name);
 
-int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic);
-void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
-int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic);
+#if FF_API_GET_BUFFER
+attribute_deprecated int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic);
+attribute_deprecated void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
+attribute_deprecated int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic);
+#endif
+
+/**
+ * The default callback for AVCodecContext.get_buffer2(). It is made public so
+ * it can be called by custom get_buffer2() implementations for decoders without
+ * CODEC_CAP_DR1 set.
+ */
+int avcodec_default_get_buffer2(AVCodecContext *s, AVFrame *frame, int flags);
 
+#if FF_API_EMU_EDGE
 /**
- * Returns the amount of padding in pixels which the get_buffer callback must
+ * Return the amount of padding in pixels which the get_buffer callback must
 * provide around the edge of the image for codecs which do not have the
 * CODEC_FLAG_EMU_EDGE flag.
 *
 * @return Required padding in pixels.
+ *
+ * @deprecated CODEC_FLAG_EMU_EDGE is deprecated, so this function is no longer
+ * needed
 */
+attribute_deprecated
 unsigned avcodec_get_edge_width(void);
+#endif
+
 /**
- * Modifies width and height values so that they will result in a memory
+ * Modify width and height values so that they will result in a memory
 * buffer that is acceptable for the codec if you do not use any horizontal
 * padding.
+ *
+ * May only be used if a codec with CODEC_CAP_DR1 has been opened.
 */
 void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
+
 /**
- * Modifies width and height values so that they will result in a memory
+ * Modify width and height values so that they will result in a memory
 * buffer that is acceptable for the codec if you also ensure that all
 * line sizes are a multiple of the respective linesize_align[i].
+ *
+ * May only be used if a codec with CODEC_CAP_DR1 has been opened.
 */
 void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
- int linesize_align[4]);
+ int linesize_align[AV_NUM_DATA_POINTERS]);
 
 /**
- * Checks if the given dimension of a picture is valid, meaning that all
- * bytes of the picture can be addressed with a signed int.
+ * Converts AVChromaLocation to swscale x/y chroma position.
 *
- * @param[in] w Width of the picture.
- * @param[in] h Height of the picture.
- * @return Zero if valid, a negative value if invalid.
+ * The positions represent the chroma (0,0) position in a coordinates system
+ * with luma (0,0) representing the origin and luma(1,1) representing 256,256
+ *
+ * @param xpos horizontal chroma sample position
+ * @param ypos vertical chroma sample position
 */
-int avcodec_check_dimensions(void *av_log_ctx, unsigned int w, unsigned int h);
-enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt);
-
-int avcodec_thread_init(AVCodecContext *s, int thread_count);
-void avcodec_thread_free(AVCodecContext *s);
-int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);
-int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count);
-//FIXME func typedef
+int avcodec_enum_to_chroma_pos(int *xpos, int *ypos, enum AVChromaLocation pos);
 
 /**
- * Initializes the AVCodecContext to use the given AVCodec. Prior to using this
- * function the context has to be allocated.
- *
- * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
- * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
- * retrieving a codec.
- *
- * @warning This function is not thread safe!
+ * Converts swscale x/y chroma position to AVChromaLocation.
 *
- * @code
- * avcodec_register_all();
- * codec = avcodec_find_decoder(CODEC_ID_H264);
- * if (!codec)
- * exit(1);
- *
- * context = avcodec_alloc_context();
+ * The positions represent the chroma (0,0) position in a coordinates system
+ * with luma (0,0) representing the origin and luma(1,1) representing 256,256
 *
- * if (avcodec_open(context, codec) < 0)
- * exit(1);
- * @endcode
- *
- * @param avctx The context which will be set up to use the given codec.
- * @param codec The codec to use within the context.
- * @return zero on success, a negative value on error
- * @see avcodec_alloc_context, avcodec_find_decoder, avcodec_find_encoder
+ * @param xpos horizontal chroma sample position
+ * @param ypos vertical chroma sample position
 */
-int avcodec_open(AVCodecContext *avctx, AVCodec *codec);
+enum AVChromaLocation avcodec_chroma_pos_to_enum(int xpos, int ypos);
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
+#if FF_API_OLD_DECODE_AUDIO
 /**
- * Decodes an audio frame from buf into samples.
- * Wrapper function which calls avcodec_decode_audio3.
+ * Wrapper function which calls avcodec_decode_audio4.
 *
- * @deprecated Use avcodec_decode_audio3 instead.
- * @param avctx the codec context
- * @param[out] samples the output buffer
- * @param[in,out] frame_size_ptr the output buffer size in bytes
- * @param[in] buf the input buffer
- * @param[in] buf_size the input buffer size in bytes
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame could be decompressed.
- */
-attribute_deprecated int avcodec_decode_audio2(AVCodecContext *avctx, int16_t *samples,
- int *frame_size_ptr,
- const uint8_t *buf, int buf_size);
-#endif
-
-/**
- * Decodes the audio frame of size avpkt->size from avpkt->data into samples.
+ * @deprecated Use avcodec_decode_audio4 instead.
+ *
+ * Decode the audio frame of size avpkt->size from avpkt->data into samples.
 * Some decoders may support multiple frames in a single AVPacket, such
 * decoders would then just decode the first frame. In this case,
 * avcodec_decode_audio3 has to be called again with an AVPacket that contains
@@ -3398,6 +3970,11 @@
 * @warning The end of the input buffer avpkt->data should be set to 0 to ensure that
 * no overreading happens for damaged MPEG streams.
 *
+ * @warning You must not provide a custom get_buffer() when using
+ * avcodec_decode_audio3(). Doing so will override it with
+ * avcodec_default_get_buffer. Use avcodec_decode_audio4() instead,
+ * which does allow the application to provide a custom get_buffer().
+ *
 * @note You might have to align the input buffer avpkt->data and output buffer
 * samples. The alignment requirements depend on the CPU: On some CPUs it isn't
 * necessary at all, on others it won't work at all if not aligned and on others
@@ -3407,8 +3984,14 @@
 * samples should be 16 byte aligned unless the CPU doesn't need it
 * (AltiVec and SSE do).
 *
+ * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
+ * between input and output, these need to be fed with avpkt->data=NULL,
+ * avpkt->size=0 at the end to return the remaining frames.
+ *
 * @param avctx the codec context
 * @param[out] samples the output buffer, sample type in avctx->sample_fmt
+ * If the sample format is planar, each channel plane will
+ * be the same size, with no padding between channels.
 * @param[in,out] frame_size_ptr the output buffer size in bytes
 * @param[in] avpkt The input AVPacket containing the input buffer.
 * You can create such packet with av_init_packet() and by then setting
@@ -3417,31 +4000,64 @@
 * @return On error a negative value is returned, otherwise the number of bytes
 * used or zero if no frame data was decompressed (used) from the input AVPacket.
 */
-int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples,
+attribute_deprecated int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples,
 int *frame_size_ptr,
 AVPacket *avpkt);
+#endif
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
 /**
- * Decodes a video frame from buf into picture.
- * Wrapper function which calls avcodec_decode_video2.
+ * Decode the audio frame of size avpkt->size from avpkt->data into frame.
 *
- * @deprecated Use avcodec_decode_video2 instead.
- * @param avctx the codec context
- * @param[out] picture The AVFrame in which the decoded video frame will be stored.
- * @param[in] buf the input buffer
- * @param[in] buf_size the size of the input buffer in bytes
- * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero.
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame could be decompressed.
+ * Some decoders may support multiple frames in a single AVPacket. Such
+ * decoders would then just decode the first frame and the return value would be
+ * less than the packet size. In this case, avcodec_decode_audio4 has to be
+ * called again with an AVPacket containing the remaining data in order to
+ * decode the second frame, etc... Even if no frames are returned, the packet
+ * needs to be fed to the decoder with remaining data until it is completely
+ * consumed or an error occurs.
+ *
+ * Some decoders (those marked with CODEC_CAP_DELAY) have a delay between input
+ * and output. This means that for some packets they will not immediately
+ * produce decoded output and need to be flushed at the end of decoding to get
+ * all the decoded data. Flushing is done by calling this function with packets
+ * with avpkt->data set to NULL and avpkt->size set to 0 until it stops
+ * returning samples. It is safe to flush even those decoders that are not
+ * marked with CODEC_CAP_DELAY, then no samples will be returned.
+ *
+ * @warning The input buffer, avpkt->data must be FF_INPUT_BUFFER_PADDING_SIZE
+ * larger than the actual read bytes because some optimized bitstream
+ * readers read 32 or 64 bits at once and could read over the end.
+ *
+ * @param avctx the codec context
+ * @param[out] frame The AVFrame in which to store decoded audio samples.
+ * The decoder will allocate a buffer for the decoded frame by
+ * calling the AVCodecContext.get_buffer2() callback.
+ * When AVCodecContext.refcounted_frames is set to 1, the frame is
+ * reference counted and the returned reference belongs to the
+ * caller. The caller must release the frame using av_frame_unref()
+ * when the frame is no longer needed. The caller may safely write
+ * to the frame if av_frame_is_writable() returns 1.
+ * When AVCodecContext.refcounted_frames is set to 0, the returned
+ * reference belongs to the decoder and is valid only until the
+ * next call to this function or until closing or flushing the
+ * decoder. The caller may not write to it.
+ * @param[out] got_frame_ptr Zero if no frame could be decoded, otherwise it is
+ * non-zero. Note that this field being set to zero
+ * does not mean that an error has occurred. For
+ * decoders with CODEC_CAP_DELAY set, no given decode
+ * call is guaranteed to produce a frame.
+ * @param[in] avpkt The input AVPacket containing the input buffer.
+ * At least avpkt->data and avpkt->size should be set. Some
+ * decoders might also require additional fields to be set.
+ * @return A negative error code is returned if an error occurred during
+ * decoding, otherwise the number of bytes consumed from the input
+ * AVPacket is returned.
 */
-attribute_deprecated int avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture,
- int *got_picture_ptr,
- const uint8_t *buf, int buf_size);
-#endif
+int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame,
+ int *got_frame_ptr, const AVPacket *avpkt);
 
 /**
- * Decodes the video frame of size avpkt->size from avpkt->data into picture.
+ * Decode the video frame of size avpkt->size from avpkt->data into picture.
 * Some decoders may support multiple frames in a single AVPacket, such
 * decoders would then just decode the first frame.
 *
@@ -3452,19 +4068,26 @@
 * @warning The end of the input buffer buf should be set to 0 to ensure that
 * no overreading happens for damaged MPEG streams.
 *
- * @note You might have to align the input buffer avpkt->data.
- * The alignment requirements depend on the CPU: on some CPUs it isn't
- * necessary at all, on others it won't work at all if not aligned and on others
- * it will work but it will have an impact on performance.
- *
- * In practice, avpkt->data should have 4 byte alignment at minimum.
- *
- * @note Some codecs have a delay between input and output, these need to be
- * fed with avpkt->data=NULL, avpkt->size=0 at the end to return the remaining frames.
+ * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
+ * between input and output, these need to be fed with avpkt->data=NULL,
+ * avpkt->size=0 at the end to return the remaining frames.
 *
 * @param avctx the codec context
 * @param[out] picture The AVFrame in which the decoded video frame will be stored.
- * @param[in] avpkt The input AVpacket containing the input buffer.
+ * Use av_frame_alloc() to get an AVFrame. The codec will
+ * allocate memory for the actual bitmap by calling the
+ * AVCodecContext.get_buffer2() callback.
+ * When AVCodecContext.refcounted_frames is set to 1, the frame is
+ * reference counted and the returned reference belongs to the
+ * caller. The caller must release the frame using av_frame_unref()
+ * when the frame is no longer needed. The caller may safely write
+ * to the frame if av_frame_is_writable() returns 1.
+ * When AVCodecContext.refcounted_frames is set to 0, the returned
+ * reference belongs to the decoder and is valid only until the
+ * next call to this function or until closing or flushing the
+ * decoder. The caller may not write to it.
+ *
+ * @param[in] avpkt The input AVPacket containing the input buffer.
 * You can create such packet with av_init_packet() and by then setting
 * data and size, some decoders might in addition need other fields like
 * flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least
@@ -3475,122 +4098,48 @@
 */
 int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
 int *got_picture_ptr,
- AVPacket *avpkt);
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-/* Decode a subtitle message. Return -1 if error, otherwise return the
- * number of bytes used. If no subtitle could be decompressed,
- * got_sub_ptr is zero. Otherwise, the subtitle is stored in *sub. */
-attribute_deprecated int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub,
- int *got_sub_ptr,
- const uint8_t *buf, int buf_size);
-#endif
+ const AVPacket *avpkt);
 
 /**
- * Decodes a subtitle message.
- * Returns a negative value on error, otherwise returns the number of bytes used.
+ * Decode a subtitle message.
+ * Return a negative value on error, otherwise return the number of bytes used.
 * If no subtitle could be decompressed, got_sub_ptr is zero.
 * Otherwise, the subtitle is stored in *sub.
+ * Note that CODEC_CAP_DR1 is not available for subtitle codecs. This is for
+ * simplicity, because the performance difference is expect to be negligible
+ * and reusing a get_buffer written for video codecs would probably perform badly
+ * due to a potentially very different allocation pattern.
+ *
+ * Some decoders (those marked with CODEC_CAP_DELAY) have a delay between input
+ * and output. This means that for some packets they will not immediately
+ * produce decoded output and need to be flushed at the end of decoding to get
+ * all the decoded data. Flushing is done by calling this function with packets
+ * with avpkt->data set to NULL and avpkt->size set to 0 until it stops
+ * returning subtitles. It is safe to flush even those decoders that are not
+ * marked with CODEC_CAP_DELAY, then no subtitles will be returned.
 *
 * @param avctx the codec context
- * @param[out] sub The AVSubtitle in which the decoded subtitle will be stored.
+ * @param[out] sub The Preallocated AVSubtitle in which the decoded subtitle will be stored,
+ * must be freed with avsubtitle_free if *got_sub_ptr is set.
 * @param[in,out] got_sub_ptr Zero if no subtitle could be decompressed, otherwise, it is nonzero.
 * @param[in] avpkt The input AVPacket containing the input buffer.
 */
 int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
 int *got_sub_ptr,
 AVPacket *avpkt);
-int avcodec_parse_frame(AVCodecContext *avctx, uint8_t **pdata,
- int *data_size_ptr,
- uint8_t *buf, int buf_size);
 
 /**
- * Encodes an audio frame from samples into buf.
- *
- * @note The output buffer should be at least FF_MIN_BUFFER_SIZE bytes large.
- * However, for PCM audio the user will know how much space is needed
- * because it depends on the value passed in buf_size as described
- * below. In that case a lower value can be used.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer
- * @param[in] buf_size the output buffer size
- * @param[in] samples the input buffer containing the samples
- * The number of samples read from this buffer is frame_size*channels,
- * both of which are defined in avctx.
- * For PCM audio the number of samples read from samples is equal to
- * buf_size * input_sample_size / output_sample_size.
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used to encode the data read from the input buffer.
+ * @defgroup lavc_parsing Frame parsing
+ * @{
 */
-int avcodec_encode_audio(AVCodecContext *avctx, uint8_t *buf, int buf_size,
- const short *samples);
 
-/**
- * Encodes a video frame from pict into buf.
- * The input picture should be
- * stored using a specific format, namely avctx.pix_fmt.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer for the bitstream of encoded frame
- * @param[in] buf_size the size of the output buffer in bytes
- * @param[in] pict the input picture to encode
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used from the output buffer.
- */
-int avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
- const AVFrame *pict);
-int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
- const AVSubtitle *sub);
-
-int avcodec_close(AVCodecContext *avctx);
-
-/**
- * Register all the codecs, parsers and bitstream filters which were enabled at
- * configuration time. If you do not call this function you can select exactly
- * which formats you want to support, by using the individual registration
- * functions.
- *
- * @see avcodec_register
- * @see av_register_codec_parser
- * @see av_register_bitstream_filter
- */
-void avcodec_register_all(void);
-
-/**
- * Flush buffers, should be called when seeking or when switching to a different stream.
- */
-void avcodec_flush_buffers(AVCodecContext *avctx);
-
-void avcodec_default_free_buffers(AVCodecContext *s);
-
-/* misc useful functions */
-
-/**
- * Returns a single letter to describe the given picture type pict_type.
- *
- * @param[in] pict_type the picture type
- * @return A single character representing the picture type.
- */
-char av_get_pict_type_char(int pict_type);
-
-/**
- * Returns codec bits per sample.
- *
- * @param[in] codec_id the codec
- * @return Number of bits per sample or zero if unknown for the given codec.
- */
-int av_get_bits_per_sample(enum CodecID codec_id);
-
-/**
- * Returns sample format bits per sample.
- *
- * @param[in] sample_fmt the sample format
- * @return Number of bits per sample or zero if unknown for the given sample format.
- */
-int av_get_bits_per_sample_format(enum SampleFormat sample_fmt);
+enum AVPictureStructure {
+ AV_PICTURE_STRUCTURE_UNKNOWN, //< unknown
+ AV_PICTURE_STRUCTURE_TOP_FIELD, //< coded as top field
+ AV_PICTURE_STRUCTURE_BOTTOM_FIELD, //< coded as bottom field
+ AV_PICTURE_STRUCTURE_FRAME, //< coded as frame
+};
 
-/* frame parsing */
 typedef struct AVCodecParserContext {
 void *priv_data;
 struct AVCodecParser *parser;
@@ -3626,14 +4175,18 @@
 
 int flags;
 #define PARSER_FLAG_COMPLETE_FRAMES 0x0001
+#define PARSER_FLAG_ONCE 0x0002
+/// Set if the parser has a valid file offset
+#define PARSER_FLAG_FETCHED_OFFSET 0x0004
+#define PARSER_FLAG_USE_CODEC_TS 0x1000
 
 int64_t offset; ///< byte offset from starting packet start
 int64_t cur_frame_end[AV_PARSER_PTS_NB];
 
- /*!
+ /**
 * Set by parser to 1 for key frames and 0 for non-key frames.
 * It is initialized to -1, so if the parser doesn't set this flag,
- * old-style fallback using FF_I_TYPE picture type as key frames
+ * old-style fallback using AV_PICTURE_TYPE_I picture type as key frames
 * will be used.
 */
 int key_frame;
@@ -3646,6 +4199,8 @@
 * the very first frame or from this keyframe.
 * Is AV_NOPTS_VALUE if unknown.
 * This field is not the display duration of the current frame.
+ * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
+ * set.
 *
 * The purpose of this field is to allow seeking in streams that have no
 * keyframes in the conventional sense. It corresponds to the
@@ -3712,6 +4267,33 @@
 * Previous frame byte position.
 */
 int64_t last_pos;
+
+ /**
+ * Duration of the current frame.
+ * For audio, this is in units of 1 / AVCodecContext.sample_rate.
+ * For all other types, this is in units of AVCodecContext.time_base.
+ */
+ int duration;
+
+ enum AVFieldOrder field_order;
+
+ /**
+ * Indicate whether a picture is coded as a frame, top field or bottom field.
+ *
+ * For example, H.264 field_pic_flag equal to 0 corresponds to
+ * AV_PICTURE_STRUCTURE_FRAME. An H.264 picture with field_pic_flag
+ * equal to 1 and bottom_field_flag equal to 0 corresponds to
+ * AV_PICTURE_STRUCTURE_TOP_FIELD.
+ */
+ enum AVPictureStructure picture_structure;
+
+ /**
+ * Picture number incremented in presentation or output order.
+ * This field may be reinitialized at the first picture of a new sequence.
+ *
+ * For example, this corresponds to H.264 PicOrderCnt.
+ */
+ int output_picture_number;
 } AVCodecParserContext;
 
 typedef struct AVCodecParser {
@@ -3727,20 +4309,11 @@
 struct AVCodecParser *next;
 } AVCodecParser;
 
-AVCodecParser *av_parser_next(AVCodecParser *c);
+AVCodecParser *av_parser_next(const AVCodecParser *c);
 
 void av_register_codec_parser(AVCodecParser *parser);
 AVCodecParserContext *av_parser_init(int codec_id);
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
-attribute_deprecated
-int av_parser_parse(AVCodecParserContext *s,
- AVCodecContext *avctx,
- uint8_t **poutbuf, int *poutbuf_size,
- const uint8_t *buf, int buf_size,
- int64_t pts, int64_t dts);
-#endif
-
 /**
 * Parse a packet.
 *
@@ -3776,12 +4349,598 @@
 int64_t pts, int64_t dts,
 int64_t pos);
 
+/**
+ * @return 0 if the output buffer is a subset of the input, 1 if it is allocated and must be freed
+ * @deprecated use AVBitStreamFilter
+ */
 int av_parser_change(AVCodecParserContext *s,
 AVCodecContext *avctx,
 uint8_t **poutbuf, int *poutbuf_size,
 const uint8_t *buf, int buf_size, int keyframe);
 void av_parser_close(AVCodecParserContext *s);
 
+/**
+ * @}
+ * @}
+ */
+
+/**
+ * @addtogroup lavc_encoding
+ * @{
+ */
+
+/**
+ * Find a registered encoder with a matching codec ID.
+ *
+ * @param id AVCodecID of the requested encoder
+ * @return An encoder if one was found, NULL otherwise.
+ */
+AVCodec *avcodec_find_encoder(enum AVCodecID id);
+
+/**
+ * Find a registered encoder with the specified name.
+ *
+ * @param name name of the requested encoder
+ * @return An encoder if one was found, NULL otherwise.
+ */
+AVCodec *avcodec_find_encoder_by_name(const char *name);
+
+#if FF_API_OLD_ENCODE_AUDIO
+/**
+ * Encode an audio frame from samples into buf.
+ *
+ * @deprecated Use avcodec_encode_audio2 instead.
+ *
+ * @note The output buffer should be at least FF_MIN_BUFFER_SIZE bytes large.
+ * However, for codecs with avctx->frame_size equal to 0 (e.g. PCM) the user
+ * will know how much space is needed because it depends on the value passed
+ * in buf_size as described below. In that case a lower value can be used.
+ *
+ * @param avctx the codec context
+ * @param[out] buf the output buffer
+ * @param[in] buf_size the output buffer size
+ * @param[in] samples the input buffer containing the samples
+ * The number of samples read from this buffer is frame_size*channels,
+ * both of which are defined in avctx.
+ * For codecs which have avctx->frame_size equal to 0 (e.g. PCM) the number of
+ * samples read from samples is equal to:
+ * buf_size * 8 / (avctx->channels * av_get_bits_per_sample(avctx->codec_id))
+ * This also implies that av_get_bits_per_sample() must not return 0 for these
+ * codecs.
+ * @return On error a negative value is returned, on success zero or the number
+ * of bytes used to encode the data read from the input buffer.
+ */
+int attribute_deprecated avcodec_encode_audio(AVCodecContext *avctx,
+ uint8_t *buf, int buf_size,
+ const short *samples);
+#endif
+
+/**
+ * Encode a frame of audio.
+ *
+ * Takes input samples from frame and writes the next output packet, if
+ * available, to avpkt. The output packet does not necessarily contain data for
+ * the most recent frame, as encoders can delay, split, and combine input frames
+ * internally as needed.
+ *
+ * @param avctx codec context
+ * @param avpkt output AVPacket.
+ * The user can supply an output buffer by setting
+ * avpkt->data and avpkt->size prior to calling the
+ * function, but if the size of the user-provided data is not
+ * large enough, encoding will fail. If avpkt->data and
+ * avpkt->size are set, avpkt->destruct must also be set. All
+ * other AVPacket fields will be reset by the encoder using
+ * av_init_packet(). If avpkt->data is NULL, the encoder will
+ * allocate it. The encoder will set avpkt->size to the size
+ * of the output packet.
+ *
+ * If this function fails or produces no output, avpkt will be
+ * freed using av_free_packet() (i.e. avpkt->destruct will be
+ * called to free the user supplied buffer).
+ * @param[in] frame AVFrame containing the raw audio data to be encoded.
+ * May be NULL when flushing an encoder that has the
+ * CODEC_CAP_DELAY capability set.
+ * If CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame
+ * can have any number of samples.
+ * If it is not set, frame->nb_samples must be equal to
+ * avctx->frame_size for all frames except the last.
+ * The final frame may be smaller than avctx->frame_size.
+ * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
+ * output packet is non-empty, and to 0 if it is
+ * empty. If the function returns an error, the
+ * packet can be assumed to be invalid, and the
+ * value of got_packet_ptr is undefined and should
+ * not be used.
+ * @return 0 on success, negative error code on failure
+ */
+int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
+ const AVFrame *frame, int *got_packet_ptr);
+
+#if FF_API_OLD_ENCODE_VIDEO
+/**
+ * @deprecated use avcodec_encode_video2() instead.
+ *
+ * Encode a video frame from pict into buf.
+ * The input picture should be
+ * stored using a specific format, namely avctx.pix_fmt.
+ *
+ * @param avctx the codec context
+ * @param[out] buf the output buffer for the bitstream of encoded frame
+ * @param[in] buf_size the size of the output buffer in bytes
+ * @param[in] pict the input picture to encode
+ * @return On error a negative value is returned, on success zero or the number
+ * of bytes used from the output buffer.
+ */
+attribute_deprecated
+int avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
+ const AVFrame *pict);
+#endif
+
+/**
+ * Encode a frame of video.
+ *
+ * Takes input raw video data from frame and writes the next output packet, if
+ * available, to avpkt. The output packet does not necessarily contain data for
+ * the most recent frame, as encoders can delay and reorder input frames
+ * internally as needed.
+ *
+ * @param avctx codec context
+ * @param avpkt output AVPacket.
+ * The user can supply an output buffer by setting
+ * avpkt->data and avpkt->size prior to calling the
+ * function, but if the size of the user-provided data is not
+ * large enough, encoding will fail. All other AVPacket fields
+ * will be reset by the encoder using av_init_packet(). If
+ * avpkt->data is NULL, the encoder will allocate it.
+ * The encoder will set avpkt->size to the size of the
+ * output packet. The returned data (if any) belongs to the
+ * caller, he is responsible for freeing it.
+ *
+ * If this function fails or produces no output, avpkt will be
+ * freed using av_free_packet() (i.e. avpkt->destruct will be
+ * called to free the user supplied buffer).
+ * @param[in] frame AVFrame containing the raw video data to be encoded.
+ * May be NULL when flushing an encoder that has the
+ * CODEC_CAP_DELAY capability set.
+ * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
+ * output packet is non-empty, and to 0 if it is
+ * empty. If the function returns an error, the
+ * packet can be assumed to be invalid, and the
+ * value of got_packet_ptr is undefined and should
+ * not be used.
+ * @return 0 on success, negative error code on failure
+ */
+int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
+ const AVFrame *frame, int *got_packet_ptr);
+
+int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
+ const AVSubtitle *sub);
+
+
+/**
+ * @}
+ */
+
+#if FF_API_AVCODEC_RESAMPLE
+/**
+ * @defgroup lavc_resample Audio resampling
+ * @ingroup libavc
+ * @deprecated use libswresample instead
+ *
+ * @{
+ */
+struct ReSampleContext;
+struct AVResampleContext;
+
+typedef struct ReSampleContext ReSampleContext;
+
+/**
+ * Initialize audio resampling context.
+ *
+ * @param output_channels number of output channels
+ * @param input_channels number of input channels
+ * @param output_rate output sample rate
+ * @param input_rate input sample rate
+ * @param sample_fmt_out requested output sample format
+ * @param sample_fmt_in input sample format
+ * @param filter_length length of each FIR filter in the filterbank relative to the cutoff frequency
+ * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
+ * @param linear if 1 then the used FIR filter will be linearly interpolated
+ between the 2 closest, if 0 the closest will be used
+ * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
+ * @return allocated ReSampleContext, NULL if error occurred
+ */
+attribute_deprecated
+ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
+ int output_rate, int input_rate,
+ enum AVSampleFormat sample_fmt_out,
+ enum AVSampleFormat sample_fmt_in,
+ int filter_length, int log2_phase_count,
+ int linear, double cutoff);
+
+attribute_deprecated
+int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples);
+
+/**
+ * Free resample context.
+ *
+ * @param s a non-NULL pointer to a resample context previously
+ * created with av_audio_resample_init()
+ */
+attribute_deprecated
+void audio_resample_close(ReSampleContext *s);
+
+
+/**
+ * Initialize an audio resampler.
+ * Note, if either rate is not an integer then simply scale both rates up so they are.
+ * @param filter_length length of each FIR filter in the filterbank relative to the cutoff freq
+ * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
+ * @param linear If 1 then the used FIR filter will be linearly interpolated
+ between the 2 closest, if 0 the closest will be used
+ * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
+ */
+attribute_deprecated
+struct AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_length, int log2_phase_count, int linear, double cutoff);
+
+/**
+ * Resample an array of samples using a previously configured context.
+ * @param src an array of unconsumed samples
+ * @param consumed the number of samples of src which have been consumed are returned here
+ * @param src_size the number of unconsumed samples available
+ * @param dst_size the amount of space in samples available in dst
+ * @param update_ctx If this is 0 then the context will not be modified, that way several channels can be resampled with the same context.
+ * @return the number of samples written in dst or -1 if an error occurred
+ */
+attribute_deprecated
+int av_resample(struct AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx);
+
+
+/**
+ * Compensate samplerate/timestamp drift. The compensation is done by changing
+ * the resampler parameters, so no audible clicks or similar distortions occur
+ * @param compensation_distance distance in output samples over which the compensation should be performed
+ * @param sample_delta number of output samples which should be output less
+ *
+ * example: av_resample_compensate(c, 10, 500)
+ * here instead of 510 samples only 500 samples would be output
+ *
+ * note, due to rounding the actual compensation might be slightly different,
+ * especially if the compensation_distance is large and the in_rate used during init is small
+ */
+attribute_deprecated
+void av_resample_compensate(struct AVResampleContext *c, int sample_delta, int compensation_distance);
+attribute_deprecated
+void av_resample_close(struct AVResampleContext *c);
+
+/**
+ * @}
+ */
+#endif
+
+/**
+ * @addtogroup lavc_picture
+ * @{
+ */
+
+/**
+ * Allocate memory for the pixels of a picture and setup the AVPicture
+ * fields for it.
+ *
+ * Call avpicture_free() to free it.
+ *
+ * @param picture the picture structure to be filled in
+ * @param pix_fmt the pixel format of the picture
+ * @param width the width of the picture
+ * @param height the height of the picture
+ * @return zero if successful, a negative error code otherwise
+ *
+ * @see av_image_alloc(), avpicture_fill()
+ */
+int avpicture_alloc(AVPicture *picture, enum AVPixelFormat pix_fmt, int width, int height);
+
+/**
+ * Free a picture previously allocated by avpicture_alloc().
+ * The data buffer used by the AVPicture is freed, but the AVPicture structure
+ * itself is not.
+ *
+ * @param picture the AVPicture to be freed
+ */
+void avpicture_free(AVPicture *picture);
+
+/**
+ * Setup the picture fields based on the specified image parameters
+ * and the provided image data buffer.
+ *
+ * The picture fields are filled in by using the image data buffer
+ * pointed to by ptr.
+ *
+ * If ptr is NULL, the function will fill only the picture linesize
+ * array and return the required size for the image buffer.
+ *
+ * To allocate an image buffer and fill the picture data in one call,
+ * use avpicture_alloc().
+ *
+ * @param picture the picture to be filled in
+ * @param ptr buffer where the image data is stored, or NULL
+ * @param pix_fmt the pixel format of the image
+ * @param width the width of the image in pixels
+ * @param height the height of the image in pixels
+ * @return the size in bytes required for src, a negative error code
+ * in case of failure
+ *
+ * @see av_image_fill_arrays()
+ */
+int avpicture_fill(AVPicture *picture, const uint8_t *ptr,
+ enum AVPixelFormat pix_fmt, int width, int height);
+
+/**
+ * Copy pixel data from an AVPicture into a buffer.
+ *
+ * avpicture_get_size() can be used to compute the required size for
+ * the buffer to fill.
+ *
+ * @param src source picture with filled data
+ * @param pix_fmt picture pixel format
+ * @param width picture width
+ * @param height picture height
+ * @param dest destination buffer
+ * @param dest_size destination buffer size in bytes
+ * @return the number of bytes written to dest, or a negative value
+ * (error code) on error, for example if the destination buffer is not
+ * big enough
+ *
+ * @see av_image_copy_to_buffer()
+ */
+int avpicture_layout(const AVPicture *src, enum AVPixelFormat pix_fmt,
+ int width, int height,
+ unsigned char *dest, int dest_size);
+
+/**
+ * Calculate the size in bytes that a picture of the given width and height
+ * would occupy if stored in the given picture format.
+ *
+ * @param pix_fmt picture pixel format
+ * @param width picture width
+ * @param height picture height
+ * @return the computed picture buffer size or a negative error code
+ * in case of error
+ *
+ * @see av_image_get_buffer_size().
+ */
+int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height);
+
+#if FF_API_DEINTERLACE
+/**
+ * deinterlace - if not supported return -1
+ *
+ * @deprecated - use yadif (in libavfilter) instead
+ */
+attribute_deprecated
+int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
+ enum AVPixelFormat pix_fmt, int width, int height);
+#endif
+/**
+ * Copy image src to dst. Wraps av_image_copy().
+ */
+void av_picture_copy(AVPicture *dst, const AVPicture *src,
+ enum AVPixelFormat pix_fmt, int width, int height);
+
+/**
+ * Crop image top and left side.
+ */
+int av_picture_crop(AVPicture *dst, const AVPicture *src,
+ enum AVPixelFormat pix_fmt, int top_band, int left_band);
+
+/**
+ * Pad image.
+ */
+int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, enum AVPixelFormat pix_fmt,
+ int padtop, int padbottom, int padleft, int padright, int *color);
+
+/**
+ * @}
+ */
+
+/**
+ * @defgroup lavc_misc Utility functions
+ * @ingroup libavc
+ *
+ * Miscellaneous utility functions related to both encoding and decoding
+ * (or neither).
+ * @{
+ */
+
+/**
+ * @defgroup lavc_misc_pixfmt Pixel formats
+ *
+ * Functions for working with pixel formats.
+ * @{
+ */
+
+/**
+ * Utility function to access log2_chroma_w log2_chroma_h from
+ * the pixel format AVPixFmtDescriptor.
+ *
+ * This function asserts that pix_fmt is valid. See av_pix_fmt_get_chroma_sub_sample
+ * for one that returns a failure code and continues in case of invalid
+ * pix_fmts.
+ *
+ * @param[in] pix_fmt the pixel format
+ * @param[out] h_shift store log2_chroma_w
+ * @param[out] v_shift store log2_chroma_h
+ *
+ * @see av_pix_fmt_get_chroma_sub_sample
+ */
+
+void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift);
+
+/**
+ * Return a value representing the fourCC code associated to the
+ * pixel format pix_fmt, or 0 if no associated fourCC code can be
+ * found.
+ */
+unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat pix_fmt);
+
+/**
+ * @deprecated see av_get_pix_fmt_loss()
+ */
+int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt,
+ int has_alpha);
+
+/**
+ * Find the best pixel format to convert to given a certain source pixel
+ * format. When converting from one pixel format to another, information loss
+ * may occur. For example, when converting from RGB24 to GRAY, the color
+ * information will be lost. Similarly, other losses occur when converting from
+ * some formats to other formats. avcodec_find_best_pix_fmt_of_2() searches which of
+ * the given pixel formats should be used to suffer the least amount of loss.
+ * The pixel formats from which it chooses one, are determined by the
+ * pix_fmt_list parameter.
+ *
+ *
+ * @param[in] pix_fmt_list AV_PIX_FMT_NONE terminated array of pixel formats to choose from
+ * @param[in] src_pix_fmt source pixel format
+ * @param[in] has_alpha Whether the source pixel format alpha channel is used.
+ * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
+ * @return The best pixel format to convert to or -1 if none was found.
+ */
+enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *pix_fmt_list,
+ enum AVPixelFormat src_pix_fmt,
+ int has_alpha, int *loss_ptr);
+
+/**
+ * @deprecated see av_find_best_pix_fmt_of_2()
+ */
+enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2,
+ enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr);
+
+attribute_deprecated
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
+enum AVPixelFormat avcodec_find_best_pix_fmt2(const enum AVPixelFormat *pix_fmt_list,
+ enum AVPixelFormat src_pix_fmt,
+ int has_alpha, int *loss_ptr);
+#else
+enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2,
+ enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr);
+#endif
+
+
+enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat * fmt);
+
+/**
+ * @}
+ */
+
+#if FF_API_SET_DIMENSIONS
+/**
+ * @deprecated this function is not supposed to be used from outside of lavc
+ */
+attribute_deprecated
+void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
+#endif
+
+/**
+ * Put a string representing the codec tag codec_tag in buf.
+ *
+ * @param buf buffer to place codec tag in
+ * @param buf_size size in bytes of buf
+ * @param codec_tag codec tag to assign
+ * @return the length of the string that would have been generated if
+ * enough space had been available, excluding the trailing null
+ */
+size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag);
+
+void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode);
+
+/**
+ * Return a name for the specified profile, if available.
+ *
+ * @param codec the codec that is searched for the given profile
+ * @param profile the profile value for which a name is requested
+ * @return A name for the profile if found, NULL otherwise.
+ */
+const char *av_get_profile_name(const AVCodec *codec, int profile);
+
+int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);
+int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count);
+//FIXME func typedef
+
+/**
+ * Fill AVFrame audio data and linesize pointers.
+ *
+ * The buffer buf must be a preallocated buffer with a size big enough
+ * to contain the specified samples amount. The filled AVFrame data
+ * pointers will point to this buffer.
+ *
+ * AVFrame extended_data channel pointers are allocated if necessary for
+ * planar audio.
+ *
+ * @param frame the AVFrame
+ * frame->nb_samples must be set prior to calling the
+ * function. This function fills in frame->data,
+ * frame->extended_data, frame->linesize[0].
+ * @param nb_channels channel count
+ * @param sample_fmt sample format
+ * @param buf buffer to use for frame data
+ * @param buf_size size of buffer
+ * @param align plane size sample alignment (0 = default)
+ * @return >=0 on success, negative error code on failure
+ * @todo return the size in bytes required to store the samples in
+ * case of success, at the next libavutil bump
+ */
+int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels,
+ enum AVSampleFormat sample_fmt, const uint8_t *buf,
+ int buf_size, int align);
+
+/**
+ * Reset the internal decoder state / flush internal buffers. Should be called
+ * e.g. when seeking or when switching to a different stream.
+ *
+ * @note when refcounted frames are not used (i.e. avctx->refcounted_frames is 0),
+ * this invalidates the frames previously returned from the decoder. When
+ * refcounted frames are used, the decoder just releases any references it might
+ * keep internally, but the caller's reference remains valid.
+ */
+void avcodec_flush_buffers(AVCodecContext *avctx);
+
+/**
+ * Return codec bits per sample.
+ *
+ * @param[in] codec_id the codec
+ * @return Number of bits per sample or zero if unknown for the given codec.
+ */
+int av_get_bits_per_sample(enum AVCodecID codec_id);
+
+/**
+ * Return the PCM codec associated with a sample format.
+ * @param be endianness, 0 for little, 1 for big,
+ * -1 (or anything else) for native
+ * @return AV_CODEC_ID_PCM_* or AV_CODEC_ID_NONE
+ */
+enum AVCodecID av_get_pcm_codec(enum AVSampleFormat fmt, int be);
+
+/**
+ * Return codec bits per sample.
+ * Only return non-zero if the bits per sample is exactly correct, not an
+ * approximation.
+ *
+ * @param[in] codec_id the codec
+ * @return Number of bits per sample or zero if unknown for the given codec.
+ */
+int av_get_exact_bits_per_sample(enum AVCodecID codec_id);
+
+/**
+ * Return audio frame duration.
+ *
+ * @param avctx codec context
+ * @param frame_bytes size of the frame, or 0 if unknown
+ * @return frame duration, in samples, if known. 0 if not able to
+ * determine.
+ */
+int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes);
+
 
 typedef struct AVBitStreamFilterContext {
 void *priv_data;
@@ -3802,60 +4961,99 @@
 struct AVBitStreamFilter *next;
 } AVBitStreamFilter;
 
+/**
+ * Register a bitstream filter.
+ *
+ * The filter will be accessible to the application code through
+ * av_bitstream_filter_next() or can be directly initialized with
+ * av_bitstream_filter_init().
+ *
+ * @see avcodec_register_all()
+ */
 void av_register_bitstream_filter(AVBitStreamFilter *bsf);
+
+/**
+ * Create and initialize a bitstream filter context given a bitstream
+ * filter name.
+ *
+ * The returned context must be freed with av_bitstream_filter_close().
+ *
+ * @param name the name of the bitstream filter
+ * @return a bitstream filter context if a matching filter was found
+ * and successfully initialized, NULL otherwise
+ */
 AVBitStreamFilterContext *av_bitstream_filter_init(const char *name);
+
+/**
+ * Filter bitstream.
+ *
+ * This function filters the buffer buf with size buf_size, and places the
+ * filtered buffer in the buffer pointed to by poutbuf.
+ *
+ * The output buffer must be freed by the caller.
+ *
+ * @param bsfc bitstream filter context created by av_bitstream_filter_init()
+ * @param avctx AVCodecContext accessed by the filter, may be NULL.
+ * If specified, this must point to the encoder context of the
+ * output stream the packet is sent to.
+ * @param args arguments which specify the filter configuration, may be NULL
+ * @param poutbuf pointer which is updated to point to the filtered buffer
+ * @param poutbuf_size pointer which is updated to the filtered buffer size in bytes
+ * @param buf buffer containing the data to filter
+ * @param buf_size size in bytes of buf
+ * @param keyframe set to non-zero if the buffer to filter corresponds to a key-frame packet data
+ * @return >= 0 in case of success, or a negative error code in case of failure
+ *
+ * If the return value is positive, an output buffer is allocated and
+ * is available in *poutbuf, and is distinct from the input buffer.
+ *
+ * If the return value is 0, the output buffer is not allocated and
+ * should be considered identical to the input buffer, or in case
+ * *poutbuf was set it points to the input buffer (not necessarily to
+ * its starting address).
+ */
 int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
 AVCodecContext *avctx, const char *args,
 uint8_t **poutbuf, int *poutbuf_size,
 const uint8_t *buf, int buf_size, int keyframe);
-void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
-
-AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f);
-
-/* memory */
 
 /**
- * Reallocates the given block if it is not large enough, otherwise it
- * does nothing.
+ * Release bitstream filter context.
 *
- * @see av_realloc
+ * @param bsf the bitstream filter context created with
+ * av_bitstream_filter_init(), can be NULL
 */
-void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size);
+void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
 
 /**
- * Allocates a buffer, reusing the given one if large enough.
+ * If f is NULL, return the first registered bitstream filter,
+ * if f is non-NULL, return the next registered bitstream filter
+ * after f, or NULL if f is the last one.
 *
- * Contrary to av_fast_realloc the current buffer contents might not be
- * preserved and on error the old buffer is freed, thus no special
- * handling to avoid memleaks is necessary.
- *
- * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer
- * @param size size of the buffer *ptr points to
- * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
- * *size 0 if an error occurred.
+ * This function can be used to iterate over all registered bitstream
+ * filters.
 */
-void av_fast_malloc(void *ptr, unsigned int *size, unsigned int min_size);
+AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f);
 
-/**
- * Copy image 'src' to 'dst'.
- */
-void av_picture_copy(AVPicture *dst, const AVPicture *src,
- enum PixelFormat pix_fmt, int width, int height);
+/* memory */
 
 /**
- * Crop image top and left side.
+ * Same behaviour av_fast_malloc but the buffer has additional
+ * FF_INPUT_BUFFER_PADDING_SIZE at the end which will always be 0.
+ *
+ * In addition the whole buffer will initially and after resizes
+ * be 0-initialized so that no uninitialized data will ever appear.
 */
-int av_picture_crop(AVPicture *dst, const AVPicture *src,
- enum PixelFormat pix_fmt, int top_band, int left_band);
+void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size);
 
 /**
- * Pad image.
+ * Same behaviour av_fast_padded_malloc except that buffer will always
+ * be 0-initialized after call.
 */
-int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, enum PixelFormat pix_fmt,
- int padtop, int padbottom, int padleft, int padright, int *color);
+void av_fast_padded_mallocz(void *ptr, unsigned int *size, size_t min_size);
 
 /**
- * Encodes extradata length to a buffer. Used by xiph codecs.
+ * Encode extradata length to a buffer. Used by xiph codecs.
 *
 * @param s buffer to write to; must be at least (v/255+1) bytes long
 * @param v size of extradata in bytes
@@ -3863,32 +5061,9 @@
 */
 unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
 
+#if FF_API_MISSING_SAMPLE
 /**
- * Parses str and put in width_ptr and height_ptr the detected values.
- *
- * @return 0 in case of a successful parsing, a negative value otherwise
- * @param[in] str the string to parse: it has to be a string in the format
- * <width>x<height> or a valid video frame size abbreviation.
- * @param[in,out] width_ptr pointer to the variable which will contain the detected
- * frame width value
- * @param[in,out] height_ptr pointer to the variable which will contain the detected
- * frame height value
- */
-int av_parse_video_frame_size(int *width_ptr, int *height_ptr, const char *str);
-
-/**
- * Parses str and put in frame_rate the detected values.
- *
- * @return 0 in case of a successful parsing, a negative value otherwise
- * @param[in] str the string to parse: it has to be a string in the format
- * <frame_rate_num>/<frame_rate_den>, a float number or a valid video rate abbreviation
- * @param[in,out] frame_rate pointer to the AVRational which will contain the detected
- * frame rate
- */
-int av_parse_video_frame_rate(AVRational *frame_rate, const char *str);
-
-/**
- * Logs a generic warning message about a missing feature. This function is
+ * Log a generic warning message about a missing feature. This function is
 * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.)
 * only, and would normally not be used by applications.
 * @param[in] avc a pointer to an arbitrary struct of which the first field is
@@ -3898,21 +5073,26 @@
 * If want_sample is non-zero, additional verbage will be added to the log
 * message which tells the user how to report samples to the development
 * mailing list.
+ * @deprecated Use avpriv_report_missing_feature() instead.
 */
+attribute_deprecated
 void av_log_missing_feature(void *avc, const char *feature, int want_sample);
 
 /**
- * Logs a generic warning message asking for a sample. This function is
+ * Log a generic warning message asking for a sample. This function is
 * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.)
 * only, and would normally not be used by applications.
 * @param[in] avc a pointer to an arbitrary struct of which the first field is
 * a pointer to an AVClass struct
 * @param[in] msg string containing an optional message, or NULL if no message
+ * @deprecated Use avpriv_request_sample() instead.
 */
-void av_log_ask_for_sample(void *avc, const char *msg);
+attribute_deprecated
+void av_log_ask_for_sample(void *avc, const char *msg, ...) av_printf_format(2, 3);
+#endif /* FF_API_MISSING_SAMPLE */
 
 /**
- * Registers the hardware accelerator hwaccel.
+ * Register the hardware accelerator hwaccel.
 */
 void av_register_hwaccel(AVHWAccel *hwaccel);
 
@@ -3921,7 +5101,7 @@
 * if hwaccel is non-NULL, returns the next registered hardware accelerator
 * after hwaccel, or NULL if hwaccel is the last one.
 */
-AVHWAccel *av_hwaccel_next(AVHWAccel *hwaccel);
+AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel);
 
 
 /**
@@ -3949,4 +5129,55 @@
 */
 int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op));
 
+/**
+ * Get the type of the given codec.
+ */
+enum AVMediaType avcodec_get_type(enum AVCodecID codec_id);
+
+/**
+ * Get the name of a codec.
+ * @return a static string identifying the codec; never NULL
+ */
+const char *avcodec_get_name(enum AVCodecID id);
+
+/**
+ * @return a positive value if s is open (i.e. avcodec_open2() was called on it
+ * with no corresponding avcodec_close()), 0 otherwise.
+ */
+int avcodec_is_open(AVCodecContext *s);
+
+/**
+ * @return a non-zero number if codec is an encoder, zero otherwise
+ */
+int av_codec_is_encoder(const AVCodec *codec);
+
+/**
+ * @return a non-zero number if codec is a decoder, zero otherwise
+ */
+int av_codec_is_decoder(const AVCodec *codec);
+
+/**
+ * @return descriptor for given codec ID or NULL if no descriptor exists.
+ */
+const AVCodecDescriptor *avcodec_descriptor_get(enum AVCodecID id);
+
+/**
+ * Iterate over all codec descriptors known to libavcodec.
+ *
+ * @param prev previous descriptor. NULL to get the first descriptor.
+ *
+ * @return next descriptor or NULL after the last descriptor
+ */
+const AVCodecDescriptor *avcodec_descriptor_next(const AVCodecDescriptor *prev);
+
+/**
+ * @return codec descriptor with the given name or NULL if no such descriptor
+ * exists.
+ */
+const AVCodecDescriptor *avcodec_descriptor_get_by_name(const char *name);
+
+/**
+ * @}
+ */
+
 #endif /* AVCODEC_AVCODEC_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavcodec/avfft.h Added

@@ -0,0 +1,236 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_AVFFT_H
+#define AVCODEC_AVFFT_H
+
+/**
+ * @file
+ * @ingroup lavc_fft
+ * FFT functions
+ */
+
+/**
+ * @defgroup lavc_fft FFT functions
+ * @ingroup lavc_misc
+ *
+ * @{
+ */
+
+typedef float FFTSample;
+
+typedef struct FFTComplex {
+ FFTSample re, im;
+} FFTComplex;
+
+typedef struct FFTContext FFTContext;
+
+/**
+ * Set up a complex FFT.
+ * @param nbits log2 of the length of the input array
+ * @param inverse if 0 perform the forward transform, if 1 perform the inverse
+ */
+FFTContext *av_fft_init(int nbits, int inverse);
+
+/**
+ * Do the permutation needed BEFORE calling ff_fft_calc().
+ */
+void av_fft_permute(FFTContext *s, FFTComplex *z);
+
+/**
+ * Do a complex FFT with the parameters defined in av_fft_init(). The
+ * input data must be permuted before. No 1.0/sqrt(n) normalization is done.
+ */
+void av_fft_calc(FFTContext *s, FFTComplex *z);
+
+void av_fft_end(FFTContext *s);
+
+FFTContext *av_mdct_init(int nbits, int inverse, double scale);
+void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
+void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input);
+void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
+void av_mdct_end(FFTContext *s);
+
+/* Real Discrete Fourier Transform */
+
+enum RDFTransformType {
+ DFT_R2C,
+ IDFT_C2R,
+ IDFT_R2C,
+ DFT_C2R,
+};
+
+typedef struct RDFTContext RDFTContext;
+
+/**
+ * Set up a real FFT.
+ * @param nbits log2 of the length of the input array
+ * @param trans the type of transform
+ */
+RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans);
+void av_rdft_calc(RDFTContext *s, FFTSample *data);
+void av_rdft_end(RDFTContext *s);
+
+/* Discrete Cosine Transform */
+
+typedef struct DCTContext DCTContext;
+
+enum DCTTransformType {
+ DCT_II = 0,
+ DCT_III,
+ DCT_I,
+ DST_I,
+};
+
+/**
+ * Set up DCT.
+ *
+ * @param nbits size of the input array:
+ * (1 << nbits) for DCT-II, DCT-III and DST-I
+ * (1 << nbits) + 1 for DCT-I
+ * @param type the type of transform
+ *
+ * @note the first element of the input of DST-I is ignored
+ */
+DCTContext *av_dct_init(int nbits, enum DCTTransformType type);
+void av_dct_calc(DCTContext *s, FFTSample *data);
+void av_dct_end (DCTContext *s);
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_AVFFT_H */
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_AVFFT_H
+#define AVCODEC_AVFFT_H
+
+/**
+ * @file
+ * @ingroup lavc_fft
+ * FFT functions
+ */
+
+/**
+ * @defgroup lavc_fft FFT functions
+ * @ingroup lavc_misc
+ *
+ * @{
+ */
+
+typedef float FFTSample;
+
+typedef struct FFTComplex {
+ FFTSample re, im;
+} FFTComplex;
+
+typedef struct FFTContext FFTContext;
+
+/**
+ * Set up a complex FFT.
+ * @param nbits log2 of the length of the input array
+ * @param inverse if 0 perform the forward transform, if 1 perform the inverse
+ */
+FFTContext *av_fft_init(int nbits, int inverse);
+
+/**
+ * Do the permutation needed BEFORE calling ff_fft_calc().
+ */
+void av_fft_permute(FFTContext *s, FFTComplex *z);
+
+/**
+ * Do a complex FFT with the parameters defined in av_fft_init(). The
+ * input data must be permuted before. No 1.0/sqrt(n) normalization is done.
+ */
+void av_fft_calc(FFTContext *s, FFTComplex *z);
+
+void av_fft_end(FFTContext *s);
+
+FFTContext *av_mdct_init(int nbits, int inverse, double scale);
+void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
+void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input);
+void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input);
+void av_mdct_end(FFTContext *s);
+
+/* Real Discrete Fourier Transform */
+
+enum RDFTransformType {
+ DFT_R2C,
+ IDFT_C2R,
+ IDFT_R2C,
+ DFT_C2R,
+};
+
+typedef struct RDFTContext RDFTContext;
+
+/**
+ * Set up a real FFT.
+ * @param nbits log2 of the length of the input array
+ * @param trans the type of transform
+ */
+RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans);
+void av_rdft_calc(RDFTContext *s, FFTSample *data);
+void av_rdft_end(RDFTContext *s);
+
+/* Discrete Cosine Transform */
+
+typedef struct DCTContext DCTContext;
+
+enum DCTTransformType {
+ DCT_II = 0,
+ DCT_III,
+ DCT_I,
+ DST_I,
+};
+
+/**
+ * Set up DCT.
+ *
+ * @param nbits size of the input array:
+ * (1 << nbits) for DCT-II, DCT-III and DST-I
+ * (1 << nbits) + 1 for DCT-I
+ * @param type the type of transform
+ *
+ * @note the first element of the input of DST-I is ignored
+ */
+DCTContext *av_dct_init(int nbits, enum DCTTransformType type);
+void av_dct_calc(DCTContext *s, FFTSample *data);
+void av_dct_end (DCTContext *s);
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_AVFFT_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavcodec/dv_profile.h Added

@@ -0,0 +1,160 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_DV_PROFILE_H
+#define AVCODEC_DV_PROFILE_H
+
+#include <stdint.h>
+
+#include "libavutil/pixfmt.h"
+#include "libavutil/rational.h"
+#include "avcodec.h"
+
+/* minimum number of bytes to read from a DV stream in order to
+ * determine the profile */
+#define DV_PROFILE_BYTES (6 * 80) /* 6 DIF blocks */
+
+
+/*
+ * AVDVProfile is used to express the differences between various
+ * DV flavors. For now it's primarily used for differentiating
+ * 525/60 and 625/50, but the plans are to use it for various
+ * DV specs as well (e.g. SMPTE314M vs. IEC 61834).
+ */
+typedef struct AVDVProfile {
+ int dsf; /* value of the dsf in the DV header */
+ int video_stype; /* stype for VAUX source pack */
+ int frame_size; /* total size of one frame in bytes */
+ int difseg_size; /* number of DIF segments per DIF channel */
+ int n_difchan; /* number of DIF channels per frame */
+ AVRational time_base; /* 1/framerate */
+ int ltc_divisor; /* FPS from the LTS standpoint */
+ int height; /* picture height in pixels */
+ int width; /* picture width in pixels */
+ AVRational sar[2]; /* sample aspect ratios for 4:3 and 16:9 */
+ enum AVPixelFormat pix_fmt; /* picture pixel format */
+ int bpm; /* blocks per macroblock */
+ const uint8_t *block_sizes; /* AC block sizes, in bits */
+ int audio_stride; /* size of audio_shuffle table */
+ int audio_min_samples[3]; /* min amount of audio samples */
+ /* for 48kHz, 44.1kHz and 32kHz */
+ int audio_samples_dist[5]; /* how many samples are supposed to be */
+ /* in each frame in a 5 frames window */
+ const uint8_t (*audio_shuffle)[9]; /* PCM shuffling table */
+} AVDVProfile;
+
+const AVDVProfile* avpriv_dv_frame_profile2(AVCodecContext* codec, const AVDVProfile *sys,
+ const uint8_t* frame, unsigned buf_size);
+
+/**
+ * Get a DV profile for the provided compressed frame.
+ *
+ * @param sys the profile used for the previous frame, may be NULL
+ * @param frame the compressed data buffer
+ * @param buf_size size of the buffer in bytes
+ * @return the DV profile for the supplied data or NULL on failure
+ */
+const AVDVProfile *av_dv_frame_profile(const AVDVProfile *sys,
+ const uint8_t *frame, unsigned buf_size);
+
+/**
+ * Get a DV profile for the provided stream parameters.
+ */
+const AVDVProfile *av_dv_codec_profile(int width, int height, enum AVPixelFormat pix_fmt);
+
+#endif /* AVCODEC_DV_PROFILE_H */
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_DV_PROFILE_H
+#define AVCODEC_DV_PROFILE_H
+
+#include <stdint.h>
+
+#include "libavutil/pixfmt.h"
+#include "libavutil/rational.h"
+#include "avcodec.h"
+
+/* minimum number of bytes to read from a DV stream in order to
+ * determine the profile */
+#define DV_PROFILE_BYTES (6 * 80) /* 6 DIF blocks */
+
+
+/*
+ * AVDVProfile is used to express the differences between various
+ * DV flavors. For now it's primarily used for differentiating
+ * 525/60 and 625/50, but the plans are to use it for various
+ * DV specs as well (e.g. SMPTE314M vs. IEC 61834).
+ */
+typedef struct AVDVProfile {
+ int dsf; /* value of the dsf in the DV header */
+ int video_stype; /* stype for VAUX source pack */
+ int frame_size; /* total size of one frame in bytes */
+ int difseg_size; /* number of DIF segments per DIF channel */
+ int n_difchan; /* number of DIF channels per frame */
+ AVRational time_base; /* 1/framerate */
+ int ltc_divisor; /* FPS from the LTS standpoint */
+ int height; /* picture height in pixels */
+ int width; /* picture width in pixels */
+ AVRational sar[2]; /* sample aspect ratios for 4:3 and 16:9 */
+ enum AVPixelFormat pix_fmt; /* picture pixel format */
+ int bpm; /* blocks per macroblock */
+ const uint8_t *block_sizes; /* AC block sizes, in bits */
+ int audio_stride; /* size of audio_shuffle table */
+ int audio_min_samples[3]; /* min amount of audio samples */
+ /* for 48kHz, 44.1kHz and 32kHz */
+ int audio_samples_dist[5]; /* how many samples are supposed to be */
+ /* in each frame in a 5 frames window */
+ const uint8_t (*audio_shuffle)[9]; /* PCM shuffling table */
+} AVDVProfile;
+
+const AVDVProfile* avpriv_dv_frame_profile2(AVCodecContext* codec, const AVDVProfile *sys,
+ const uint8_t* frame, unsigned buf_size);
+
+/**
+ * Get a DV profile for the provided compressed frame.
+ *
+ * @param sys the profile used for the previous frame, may be NULL
+ * @param frame the compressed data buffer
+ * @param buf_size size of the buffer in bytes
+ * @return the DV profile for the supplied data or NULL on failure
+ */
+const AVDVProfile *av_dv_frame_profile(const AVDVProfile *sys,
+ const uint8_t *frame, unsigned buf_size);
+
+/**
+ * Get a DV profile for the provided stream parameters.
+ */
+const AVDVProfile *av_dv_codec_profile(int width, int height, enum AVPixelFormat pix_fmt);
+
+#endif /* AVCODEC_DV_PROFILE_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavcodec/dxva2.h Added

@@ -0,0 +1,186 @@
+/*
+ * DXVA2 HW acceleration
+ *
+ * copyright (c) 2009 Laurent Aimar
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_DXVA_H
+#define AVCODEC_DXVA_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_dxva2
+ * Public libavcodec DXVA2 header.
+ */
+
+#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0600
+#endif
+
+#include <stdint.h>
+#include <d3d9.h>
+#include <dxva2api.h>
+
+/**
+ * @defgroup lavc_codec_hwaccel_dxva2 DXVA2
+ * @ingroup lavc_codec_hwaccel
+ *
+ * @{
+ */
+
+#define FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG 1 ///< Work around for DXVA2 and old UVD/UVD+ ATI video cards
+#define FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO 2 ///< Work around for DXVA2 and old Intel GPUs with ClearVideo interface
+
+/**
+ * This structure is used to provides the necessary configurations and data
+ * to the DXVA2 FFmpeg HWAccel implementation.
+ *
+ * The application must make it available as AVCodecContext.hwaccel_context.
+ */
+struct dxva_context {
+ /**
+ * DXVA2 decoder object
+ */
+ IDirectXVideoDecoder *decoder;
+
+ /**
+ * DXVA2 configuration used to create the decoder
+ */
+ const DXVA2_ConfigPictureDecode *cfg;
+
+ /**
+ * The number of surface in the surface array
+ */
+ unsigned surface_count;
+
+ /**
+ * The array of Direct3D surfaces used to create the decoder
+ */
+ LPDIRECT3DSURFACE9 *surface;
+
+ /**
+ * A bit field configuring the workarounds needed for using the decoder
+ */
+ uint64_t workaround;
+
+ /**
+ * Private to the FFmpeg AVHWAccel implementation
+ */
+ unsigned report_id;
+};
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_DXVA_H */
+/*
+ * DXVA2 HW acceleration
+ *
+ * copyright (c) 2009 Laurent Aimar
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_DXVA_H
+#define AVCODEC_DXVA_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_dxva2
+ * Public libavcodec DXVA2 header.
+ */
+
+#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0600
+#endif
+
+#include <stdint.h>
+#include <d3d9.h>
+#include <dxva2api.h>
+
+/**
+ * @defgroup lavc_codec_hwaccel_dxva2 DXVA2
+ * @ingroup lavc_codec_hwaccel
+ *
+ * @{
+ */
+
+#define FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG 1 ///< Work around for DXVA2 and old UVD/UVD+ ATI video cards
+#define FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO 2 ///< Work around for DXVA2 and old Intel GPUs with ClearVideo interface
+
+/**
+ * This structure is used to provides the necessary configurations and data
+ * to the DXVA2 FFmpeg HWAccel implementation.
+ *
+ * The application must make it available as AVCodecContext.hwaccel_context.
+ */
+struct dxva_context {
+ /**
+ * DXVA2 decoder object
+ */
+ IDirectXVideoDecoder *decoder;
+
+ /**
+ * DXVA2 configuration used to create the decoder
+ */
+ const DXVA2_ConfigPictureDecode *cfg;
+
+ /**
+ * The number of surface in the surface array
+ */
+ unsigned surface_count;
+
+ /**
+ * The array of Direct3D surfaces used to create the decoder
+ */
+ LPDIRECT3DSURFACE9 *surface;
+
+ /**
+ * A bit field configuring the workarounds needed for using the decoder
+ */
+ uint64_t workaround;
+
+ /**
+ * Private to the FFmpeg AVHWAccel implementation
+ */
+ unsigned report_id;
+};
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_DXVA_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavcodec/old_codec_ids.h Added

@@ -0,0 +1,794 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_OLD_CODEC_IDS_H
+#define AVCODEC_OLD_CODEC_IDS_H
+
+/*
+ * This header exists to prevent new codec IDs from being accidentally added to
+ * the deprecated list.
+ * Do not include it directly. It will be removed on next major bump
+ *
+ * Do not add new items to this list. Use the AVCodecID enum instead.
+ */
+
+ CODEC_ID_NONE = AV_CODEC_ID_NONE,
+
+ /* video codecs */
+ CODEC_ID_MPEG1VIDEO,
+ CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
+#if FF_API_XVMC
+ CODEC_ID_MPEG2VIDEO_XVMC,
+#endif
+ CODEC_ID_H261,
+ CODEC_ID_H263,
+ CODEC_ID_RV10,
+ CODEC_ID_RV20,
+ CODEC_ID_MJPEG,
+ CODEC_ID_MJPEGB,
+ CODEC_ID_LJPEG,
+ CODEC_ID_SP5X,
+ CODEC_ID_JPEGLS,
+ CODEC_ID_MPEG4,
+ CODEC_ID_RAWVIDEO,
+ CODEC_ID_MSMPEG4V1,
+ CODEC_ID_MSMPEG4V2,
+ CODEC_ID_MSMPEG4V3,
+ CODEC_ID_WMV1,
+ CODEC_ID_WMV2,
+ CODEC_ID_H263P,
+ CODEC_ID_H263I,
+ CODEC_ID_FLV1,
+ CODEC_ID_SVQ1,
+ CODEC_ID_SVQ3,
+ CODEC_ID_DVVIDEO,
+ CODEC_ID_HUFFYUV,
+ CODEC_ID_CYUV,
+ CODEC_ID_H264,
+ CODEC_ID_INDEO3,
+ CODEC_ID_VP3,
+ CODEC_ID_THEORA,
+ CODEC_ID_ASV1,
+ CODEC_ID_ASV2,
+ CODEC_ID_FFV1,
+ CODEC_ID_4XM,
+ CODEC_ID_VCR1,
+ CODEC_ID_CLJR,
+ CODEC_ID_MDEC,
+ CODEC_ID_ROQ,
+ CODEC_ID_INTERPLAY_VIDEO,
+ CODEC_ID_XAN_WC3,
+ CODEC_ID_XAN_WC4,
+ CODEC_ID_RPZA,
+ CODEC_ID_CINEPAK,
+ CODEC_ID_WS_VQA,
+ CODEC_ID_MSRLE,
+ CODEC_ID_MSVIDEO1,
+ CODEC_ID_IDCIN,
+ CODEC_ID_8BPS,
+ CODEC_ID_SMC,
+ CODEC_ID_FLIC,
+ CODEC_ID_TRUEMOTION1,
+ CODEC_ID_VMDVIDEO,
+ CODEC_ID_MSZH,
+ CODEC_ID_ZLIB,
+ CODEC_ID_QTRLE,
+ CODEC_ID_TSCC,
+ CODEC_ID_ULTI,
+ CODEC_ID_QDRAW,
+ CODEC_ID_VIXL,
+ CODEC_ID_QPEG,
+ CODEC_ID_PNG,
+ CODEC_ID_PPM,
+ CODEC_ID_PBM,
+ CODEC_ID_PGM,
+ CODEC_ID_PGMYUV,
+ CODEC_ID_PAM,
+ CODEC_ID_FFVHUFF,
+ CODEC_ID_RV30,
+ CODEC_ID_RV40,
+ CODEC_ID_VC1,
+ CODEC_ID_WMV3,
+ CODEC_ID_LOCO,
+ CODEC_ID_WNV1,
+ CODEC_ID_AASC,
+ CODEC_ID_INDEO2,
+ CODEC_ID_FRAPS,
+ CODEC_ID_TRUEMOTION2,
+ CODEC_ID_BMP,
+ CODEC_ID_CSCD,
+ CODEC_ID_MMVIDEO,
+ CODEC_ID_ZMBV,
+ CODEC_ID_AVS,
+ CODEC_ID_SMACKVIDEO,
+ CODEC_ID_NUV,
+ CODEC_ID_KMVC,
+ CODEC_ID_FLASHSV,
+ CODEC_ID_CAVS,
+ CODEC_ID_JPEG2000,
+ CODEC_ID_VMNC,
+ CODEC_ID_VP5,
+ CODEC_ID_VP6,
+ CODEC_ID_VP6F,
+ CODEC_ID_TARGA,
+ CODEC_ID_DSICINVIDEO,
+ CODEC_ID_TIERTEXSEQVIDEO,
+ CODEC_ID_TIFF,
+ CODEC_ID_GIF,
+ CODEC_ID_DXA,
+ CODEC_ID_DNXHD,
+ CODEC_ID_THP,
+ CODEC_ID_SGI,
+ CODEC_ID_C93,
+ CODEC_ID_BETHSOFTVID,
+ CODEC_ID_PTX,
+ CODEC_ID_TXD,
+ CODEC_ID_VP6A,
+ CODEC_ID_AMV,
+ CODEC_ID_VB,
+ CODEC_ID_PCX,
+ CODEC_ID_SUNRAST,
+ CODEC_ID_INDEO4,
+ CODEC_ID_INDEO5,
+ CODEC_ID_MIMIC,
+ CODEC_ID_RL2,
+ CODEC_ID_ESCAPE124,
+ CODEC_ID_DIRAC,
+ CODEC_ID_BFI,
+ CODEC_ID_CMV,
+ CODEC_ID_MOTIONPIXELS,
+ CODEC_ID_TGV,
+ CODEC_ID_TGQ,
+ CODEC_ID_TQI,
+ CODEC_ID_AURA,
+ CODEC_ID_AURA2,
+ CODEC_ID_V210X,
+ CODEC_ID_TMV,
+ CODEC_ID_V210,
+ CODEC_ID_DPX,
+ CODEC_ID_MAD,
+ CODEC_ID_FRWU,
+ CODEC_ID_FLASHSV2,
+ CODEC_ID_CDGRAPHICS,
+ CODEC_ID_R210,
+ CODEC_ID_ANM,
+ CODEC_ID_BINKVIDEO,
+ CODEC_ID_IFF_ILBM,
+ CODEC_ID_IFF_BYTERUN1,
+ CODEC_ID_KGV1,
+ CODEC_ID_YOP,
+ CODEC_ID_VP8,
+ CODEC_ID_PICTOR,
+ CODEC_ID_ANSI,
+ CODEC_ID_A64_MULTI,
+ CODEC_ID_A64_MULTI5,
+ CODEC_ID_R10K,
+ CODEC_ID_MXPEG,
+ CODEC_ID_LAGARITH,
+ CODEC_ID_PRORES,
+ CODEC_ID_JV,
+ CODEC_ID_DFA,
+ CODEC_ID_WMV3IMAGE,
+ CODEC_ID_VC1IMAGE,
+ CODEC_ID_UTVIDEO,
+ CODEC_ID_BMV_VIDEO,
+ CODEC_ID_VBLE,
+ CODEC_ID_DXTORY,
+ CODEC_ID_V410,
+ CODEC_ID_XWD,
+ CODEC_ID_CDXL,
+ CODEC_ID_XBM,
+ CODEC_ID_ZEROCODEC,
+ CODEC_ID_MSS1,
+ CODEC_ID_MSA1,
+ CODEC_ID_TSCC2,
+ CODEC_ID_MTS2,
+ CODEC_ID_CLLC,
+ CODEC_ID_Y41P = MKBETAG('Y','4','1','P'),
+ CODEC_ID_ESCAPE130 = MKBETAG('E','1','3','0'),
+ CODEC_ID_EXR = MKBETAG('0','E','X','R'),
+ CODEC_ID_AVRP = MKBETAG('A','V','R','P'),
+
+ CODEC_ID_G2M = MKBETAG( 0 ,'G','2','M'),
+ CODEC_ID_AVUI = MKBETAG('A','V','U','I'),
+ CODEC_ID_AYUV = MKBETAG('A','Y','U','V'),
+ CODEC_ID_V308 = MKBETAG('V','3','0','8'),
+ CODEC_ID_V408 = MKBETAG('V','4','0','8'),
+ CODEC_ID_YUV4 = MKBETAG('Y','U','V','4'),
+ CODEC_ID_SANM = MKBETAG('S','A','N','M'),
+ CODEC_ID_PAF_VIDEO = MKBETAG('P','A','F','V'),
+ CODEC_ID_SNOW = AV_CODEC_ID_SNOW,
+
+ /* various PCM "codecs" */
+ CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
+ CODEC_ID_PCM_S16LE = 0x10000,
+ CODEC_ID_PCM_S16BE,
+ CODEC_ID_PCM_U16LE,
+ CODEC_ID_PCM_U16BE,
+ CODEC_ID_PCM_S8,
+ CODEC_ID_PCM_U8,
+ CODEC_ID_PCM_MULAW,
+ CODEC_ID_PCM_ALAW,
+ CODEC_ID_PCM_S32LE,
+ CODEC_ID_PCM_S32BE,
+ CODEC_ID_PCM_U32LE,
+ CODEC_ID_PCM_U32BE,
+ CODEC_ID_PCM_S24LE,
+ CODEC_ID_PCM_S24BE,
+ CODEC_ID_PCM_U24LE,
+ CODEC_ID_PCM_U24BE,
+ CODEC_ID_PCM_S24DAUD,
+ CODEC_ID_PCM_ZORK,
+ CODEC_ID_PCM_S16LE_PLANAR,
+ CODEC_ID_PCM_DVD,
+ CODEC_ID_PCM_F32BE,
+ CODEC_ID_PCM_F32LE,
+ CODEC_ID_PCM_F64BE,
+ CODEC_ID_PCM_F64LE,
+ CODEC_ID_PCM_BLURAY,
+ CODEC_ID_PCM_LXF,
+ CODEC_ID_S302M,
+ CODEC_ID_PCM_S8_PLANAR,
+
+ /* various ADPCM codecs */
+ CODEC_ID_ADPCM_IMA_QT = 0x11000,
+ CODEC_ID_ADPCM_IMA_WAV,
+ CODEC_ID_ADPCM_IMA_DK3,
+ CODEC_ID_ADPCM_IMA_DK4,
+ CODEC_ID_ADPCM_IMA_WS,
+ CODEC_ID_ADPCM_IMA_SMJPEG,
+ CODEC_ID_ADPCM_MS,
+ CODEC_ID_ADPCM_4XM,
+ CODEC_ID_ADPCM_XA,
+ CODEC_ID_ADPCM_ADX,
+ CODEC_ID_ADPCM_EA,
+ CODEC_ID_ADPCM_G726,
+ CODEC_ID_ADPCM_CT,
+ CODEC_ID_ADPCM_SWF,
+ CODEC_ID_ADPCM_YAMAHA,
+ CODEC_ID_ADPCM_SBPRO_4,
+ CODEC_ID_ADPCM_SBPRO_3,
+ CODEC_ID_ADPCM_SBPRO_2,
+ CODEC_ID_ADPCM_THP,
+ CODEC_ID_ADPCM_IMA_AMV,
+ CODEC_ID_ADPCM_EA_R1,
+ CODEC_ID_ADPCM_EA_R3,
+ CODEC_ID_ADPCM_EA_R2,
+ CODEC_ID_ADPCM_IMA_EA_SEAD,
+ CODEC_ID_ADPCM_IMA_EA_EACS,
+ CODEC_ID_ADPCM_EA_XAS,
+ CODEC_ID_ADPCM_EA_MAXIS_XA,
+ CODEC_ID_ADPCM_IMA_ISS,
+ CODEC_ID_ADPCM_G722,
+ CODEC_ID_ADPCM_IMA_APC,
+ CODEC_ID_VIMA = MKBETAG('V','I','M','A'),
+
+ /* AMR */
+ CODEC_ID_AMR_NB = 0x12000,
+ CODEC_ID_AMR_WB,
+
+ /* RealAudio codecs*/
+ CODEC_ID_RA_144 = 0x13000,
+ CODEC_ID_RA_288,
+
+ /* various DPCM codecs */
+ CODEC_ID_ROQ_DPCM = 0x14000,
+ CODEC_ID_INTERPLAY_DPCM,
+ CODEC_ID_XAN_DPCM,
+ CODEC_ID_SOL_DPCM,
+
+ /* audio codecs */
+ CODEC_ID_MP2 = 0x15000,
+ CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
+ CODEC_ID_AAC,
+ CODEC_ID_AC3,
+ CODEC_ID_DTS,
+ CODEC_ID_VORBIS,
+ CODEC_ID_DVAUDIO,
+ CODEC_ID_WMAV1,
+ CODEC_ID_WMAV2,
+ CODEC_ID_MACE3,
+ CODEC_ID_MACE6,
+ CODEC_ID_VMDAUDIO,
+ CODEC_ID_FLAC,
+ CODEC_ID_MP3ADU,
+ CODEC_ID_MP3ON4,
+ CODEC_ID_SHORTEN,
+ CODEC_ID_ALAC,
+ CODEC_ID_WESTWOOD_SND1,
+ CODEC_ID_GSM, ///< as in Berlin toast format
+ CODEC_ID_QDM2,
+ CODEC_ID_COOK,
+ CODEC_ID_TRUESPEECH,
+ CODEC_ID_TTA,
+ CODEC_ID_SMACKAUDIO,
+ CODEC_ID_QCELP,
+ CODEC_ID_WAVPACK,
+ CODEC_ID_DSICINAUDIO,
+ CODEC_ID_IMC,
+ CODEC_ID_MUSEPACK7,
+ CODEC_ID_MLP,
+ CODEC_ID_GSM_MS, /* as found in WAV */
+ CODEC_ID_ATRAC3,
+ CODEC_ID_VOXWARE,
+ CODEC_ID_APE,
+ CODEC_ID_NELLYMOSER,
+ CODEC_ID_MUSEPACK8,
+ CODEC_ID_SPEEX,
+ CODEC_ID_WMAVOICE,
+ CODEC_ID_WMAPRO,
+ CODEC_ID_WMALOSSLESS,
+ CODEC_ID_ATRAC3P,
+ CODEC_ID_EAC3,
+ CODEC_ID_SIPR,
+ CODEC_ID_MP1,
+ CODEC_ID_TWINVQ,
+ CODEC_ID_TRUEHD,
+ CODEC_ID_MP4ALS,
+ CODEC_ID_ATRAC1,
+ CODEC_ID_BINKAUDIO_RDFT,
+ CODEC_ID_BINKAUDIO_DCT,
+ CODEC_ID_AAC_LATM,
+ CODEC_ID_QDMC,
+ CODEC_ID_CELT,
+ CODEC_ID_G723_1,
+ CODEC_ID_G729,
+ CODEC_ID_8SVX_EXP,
+ CODEC_ID_8SVX_FIB,
+ CODEC_ID_BMV_AUDIO,
+ CODEC_ID_RALF,
+ CODEC_ID_IAC,
+ CODEC_ID_ILBC,
+ CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'),
+ CODEC_ID_SONIC = MKBETAG('S','O','N','C'),
+ CODEC_ID_SONIC_LS = MKBETAG('S','O','N','L'),
+ CODEC_ID_PAF_AUDIO = MKBETAG('P','A','F','A'),
+ CODEC_ID_OPUS = MKBETAG('O','P','U','S'),
+
+ /* subtitle codecs */
+ CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs.
+ CODEC_ID_DVD_SUBTITLE = 0x17000,
+ CODEC_ID_DVB_SUBTITLE,
+ CODEC_ID_TEXT, ///< raw UTF-8 text
+ CODEC_ID_XSUB,
+ CODEC_ID_SSA,
+ CODEC_ID_MOV_TEXT,
+ CODEC_ID_HDMV_PGS_SUBTITLE,
+ CODEC_ID_DVB_TELETEXT,
+ CODEC_ID_SRT,
+ CODEC_ID_MICRODVD = MKBETAG('m','D','V','D'),
+ CODEC_ID_EIA_608 = MKBETAG('c','6','0','8'),
+ CODEC_ID_JACOSUB = MKBETAG('J','S','U','B'),
+ CODEC_ID_SAMI = MKBETAG('S','A','M','I'),
+ CODEC_ID_REALTEXT = MKBETAG('R','T','X','T'),
+ CODEC_ID_SUBVIEWER = MKBETAG('S','u','b','V'),
+
+ /* other specific kind of codecs (generally used for attachments) */
+ CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs.
+ CODEC_ID_TTF = 0x18000,
+ CODEC_ID_BINTEXT = MKBETAG('B','T','X','T'),
+ CODEC_ID_XBIN = MKBETAG('X','B','I','N'),
+ CODEC_ID_IDF = MKBETAG( 0 ,'I','D','F'),
+ CODEC_ID_OTF = MKBETAG( 0 ,'O','T','F'),
+
+ CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
+
+ CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
+ * stream (only used by libavformat) */
+ CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
+ * stream (only used by libavformat) */
+ CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information.
+
+#endif /* AVCODEC_OLD_CODEC_IDS_H */
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_OLD_CODEC_IDS_H
+#define AVCODEC_OLD_CODEC_IDS_H
+
+/*
+ * This header exists to prevent new codec IDs from being accidentally added to
+ * the deprecated list.
+ * Do not include it directly. It will be removed on next major bump
+ *
+ * Do not add new items to this list. Use the AVCodecID enum instead.
+ */
+
+ CODEC_ID_NONE = AV_CODEC_ID_NONE,
+
+ /* video codecs */
+ CODEC_ID_MPEG1VIDEO,
+ CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
+#if FF_API_XVMC
+ CODEC_ID_MPEG2VIDEO_XVMC,
+#endif
+ CODEC_ID_H261,
+ CODEC_ID_H263,
+ CODEC_ID_RV10,
+ CODEC_ID_RV20,
+ CODEC_ID_MJPEG,
+ CODEC_ID_MJPEGB,
+ CODEC_ID_LJPEG,
+ CODEC_ID_SP5X,
+ CODEC_ID_JPEGLS,
+ CODEC_ID_MPEG4,
+ CODEC_ID_RAWVIDEO,
+ CODEC_ID_MSMPEG4V1,
+ CODEC_ID_MSMPEG4V2,
+ CODEC_ID_MSMPEG4V3,
+ CODEC_ID_WMV1,
+ CODEC_ID_WMV2,
+ CODEC_ID_H263P,
+ CODEC_ID_H263I,
+ CODEC_ID_FLV1,
+ CODEC_ID_SVQ1,
+ CODEC_ID_SVQ3,
+ CODEC_ID_DVVIDEO,
+ CODEC_ID_HUFFYUV,
+ CODEC_ID_CYUV,
+ CODEC_ID_H264,
+ CODEC_ID_INDEO3,
+ CODEC_ID_VP3,
+ CODEC_ID_THEORA,
+ CODEC_ID_ASV1,
+ CODEC_ID_ASV2,
+ CODEC_ID_FFV1,
+ CODEC_ID_4XM,
+ CODEC_ID_VCR1,
+ CODEC_ID_CLJR,
+ CODEC_ID_MDEC,
+ CODEC_ID_ROQ,
+ CODEC_ID_INTERPLAY_VIDEO,
+ CODEC_ID_XAN_WC3,
+ CODEC_ID_XAN_WC4,
+ CODEC_ID_RPZA,
+ CODEC_ID_CINEPAK,
+ CODEC_ID_WS_VQA,
+ CODEC_ID_MSRLE,
+ CODEC_ID_MSVIDEO1,
+ CODEC_ID_IDCIN,
+ CODEC_ID_8BPS,
+ CODEC_ID_SMC,
+ CODEC_ID_FLIC,
+ CODEC_ID_TRUEMOTION1,
+ CODEC_ID_VMDVIDEO,
+ CODEC_ID_MSZH,
+ CODEC_ID_ZLIB,
+ CODEC_ID_QTRLE,
+ CODEC_ID_TSCC,
+ CODEC_ID_ULTI,
+ CODEC_ID_QDRAW,
+ CODEC_ID_VIXL,
+ CODEC_ID_QPEG,
+ CODEC_ID_PNG,
+ CODEC_ID_PPM,
+ CODEC_ID_PBM,
+ CODEC_ID_PGM,
+ CODEC_ID_PGMYUV,
+ CODEC_ID_PAM,
+ CODEC_ID_FFVHUFF,
+ CODEC_ID_RV30,
+ CODEC_ID_RV40,
+ CODEC_ID_VC1,
+ CODEC_ID_WMV3,
+ CODEC_ID_LOCO,
+ CODEC_ID_WNV1,
+ CODEC_ID_AASC,
+ CODEC_ID_INDEO2,
+ CODEC_ID_FRAPS,
+ CODEC_ID_TRUEMOTION2,
+ CODEC_ID_BMP,
+ CODEC_ID_CSCD,
+ CODEC_ID_MMVIDEO,
+ CODEC_ID_ZMBV,
+ CODEC_ID_AVS,
+ CODEC_ID_SMACKVIDEO,
+ CODEC_ID_NUV,
+ CODEC_ID_KMVC,
+ CODEC_ID_FLASHSV,
+ CODEC_ID_CAVS,
+ CODEC_ID_JPEG2000,
+ CODEC_ID_VMNC,
+ CODEC_ID_VP5,
+ CODEC_ID_VP6,
+ CODEC_ID_VP6F,
+ CODEC_ID_TARGA,
+ CODEC_ID_DSICINVIDEO,
+ CODEC_ID_TIERTEXSEQVIDEO,
+ CODEC_ID_TIFF,
+ CODEC_ID_GIF,
+ CODEC_ID_DXA,
+ CODEC_ID_DNXHD,
+ CODEC_ID_THP,
+ CODEC_ID_SGI,
+ CODEC_ID_C93,
+ CODEC_ID_BETHSOFTVID,
+ CODEC_ID_PTX,
+ CODEC_ID_TXD,
+ CODEC_ID_VP6A,
+ CODEC_ID_AMV,
+ CODEC_ID_VB,
+ CODEC_ID_PCX,
+ CODEC_ID_SUNRAST,
+ CODEC_ID_INDEO4,
+ CODEC_ID_INDEO5,
+ CODEC_ID_MIMIC,
+ CODEC_ID_RL2,
+ CODEC_ID_ESCAPE124,
+ CODEC_ID_DIRAC,
+ CODEC_ID_BFI,
+ CODEC_ID_CMV,
+ CODEC_ID_MOTIONPIXELS,
+ CODEC_ID_TGV,
+ CODEC_ID_TGQ,
+ CODEC_ID_TQI,
+ CODEC_ID_AURA,
+ CODEC_ID_AURA2,
+ CODEC_ID_V210X,
+ CODEC_ID_TMV,
+ CODEC_ID_V210,
+ CODEC_ID_DPX,
+ CODEC_ID_MAD,
+ CODEC_ID_FRWU,
+ CODEC_ID_FLASHSV2,
+ CODEC_ID_CDGRAPHICS,
+ CODEC_ID_R210,
+ CODEC_ID_ANM,
+ CODEC_ID_BINKVIDEO,
+ CODEC_ID_IFF_ILBM,
+ CODEC_ID_IFF_BYTERUN1,
+ CODEC_ID_KGV1,
+ CODEC_ID_YOP,
+ CODEC_ID_VP8,
+ CODEC_ID_PICTOR,
+ CODEC_ID_ANSI,
+ CODEC_ID_A64_MULTI,
+ CODEC_ID_A64_MULTI5,
+ CODEC_ID_R10K,
+ CODEC_ID_MXPEG,
+ CODEC_ID_LAGARITH,
+ CODEC_ID_PRORES,
+ CODEC_ID_JV,
+ CODEC_ID_DFA,
+ CODEC_ID_WMV3IMAGE,
+ CODEC_ID_VC1IMAGE,
+ CODEC_ID_UTVIDEO,
+ CODEC_ID_BMV_VIDEO,
+ CODEC_ID_VBLE,
+ CODEC_ID_DXTORY,
+ CODEC_ID_V410,
+ CODEC_ID_XWD,
+ CODEC_ID_CDXL,
+ CODEC_ID_XBM,
+ CODEC_ID_ZEROCODEC,
+ CODEC_ID_MSS1,
+ CODEC_ID_MSA1,
+ CODEC_ID_TSCC2,
+ CODEC_ID_MTS2,
+ CODEC_ID_CLLC,
+ CODEC_ID_Y41P = MKBETAG('Y','4','1','P'),
+ CODEC_ID_ESCAPE130 = MKBETAG('E','1','3','0'),
+ CODEC_ID_EXR = MKBETAG('0','E','X','R'),
+ CODEC_ID_AVRP = MKBETAG('A','V','R','P'),
+
+ CODEC_ID_G2M = MKBETAG( 0 ,'G','2','M'),
+ CODEC_ID_AVUI = MKBETAG('A','V','U','I'),
+ CODEC_ID_AYUV = MKBETAG('A','Y','U','V'),
+ CODEC_ID_V308 = MKBETAG('V','3','0','8'),
+ CODEC_ID_V408 = MKBETAG('V','4','0','8'),
+ CODEC_ID_YUV4 = MKBETAG('Y','U','V','4'),
+ CODEC_ID_SANM = MKBETAG('S','A','N','M'),
+ CODEC_ID_PAF_VIDEO = MKBETAG('P','A','F','V'),
+ CODEC_ID_SNOW = AV_CODEC_ID_SNOW,
+
+ /* various PCM "codecs" */
+ CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
+ CODEC_ID_PCM_S16LE = 0x10000,
+ CODEC_ID_PCM_S16BE,
+ CODEC_ID_PCM_U16LE,
+ CODEC_ID_PCM_U16BE,
+ CODEC_ID_PCM_S8,
+ CODEC_ID_PCM_U8,
+ CODEC_ID_PCM_MULAW,
+ CODEC_ID_PCM_ALAW,
+ CODEC_ID_PCM_S32LE,
+ CODEC_ID_PCM_S32BE,
+ CODEC_ID_PCM_U32LE,
+ CODEC_ID_PCM_U32BE,
+ CODEC_ID_PCM_S24LE,
+ CODEC_ID_PCM_S24BE,
+ CODEC_ID_PCM_U24LE,
+ CODEC_ID_PCM_U24BE,
+ CODEC_ID_PCM_S24DAUD,
+ CODEC_ID_PCM_ZORK,
+ CODEC_ID_PCM_S16LE_PLANAR,
+ CODEC_ID_PCM_DVD,
+ CODEC_ID_PCM_F32BE,
+ CODEC_ID_PCM_F32LE,
+ CODEC_ID_PCM_F64BE,
+ CODEC_ID_PCM_F64LE,
+ CODEC_ID_PCM_BLURAY,
+ CODEC_ID_PCM_LXF,
+ CODEC_ID_S302M,
+ CODEC_ID_PCM_S8_PLANAR,
+
+ /* various ADPCM codecs */
+ CODEC_ID_ADPCM_IMA_QT = 0x11000,
+ CODEC_ID_ADPCM_IMA_WAV,
+ CODEC_ID_ADPCM_IMA_DK3,
+ CODEC_ID_ADPCM_IMA_DK4,
+ CODEC_ID_ADPCM_IMA_WS,
+ CODEC_ID_ADPCM_IMA_SMJPEG,
+ CODEC_ID_ADPCM_MS,
+ CODEC_ID_ADPCM_4XM,
+ CODEC_ID_ADPCM_XA,
+ CODEC_ID_ADPCM_ADX,
+ CODEC_ID_ADPCM_EA,
+ CODEC_ID_ADPCM_G726,
+ CODEC_ID_ADPCM_CT,
+ CODEC_ID_ADPCM_SWF,
+ CODEC_ID_ADPCM_YAMAHA,
+ CODEC_ID_ADPCM_SBPRO_4,
+ CODEC_ID_ADPCM_SBPRO_3,
+ CODEC_ID_ADPCM_SBPRO_2,
+ CODEC_ID_ADPCM_THP,
+ CODEC_ID_ADPCM_IMA_AMV,
+ CODEC_ID_ADPCM_EA_R1,
+ CODEC_ID_ADPCM_EA_R3,
+ CODEC_ID_ADPCM_EA_R2,
+ CODEC_ID_ADPCM_IMA_EA_SEAD,
+ CODEC_ID_ADPCM_IMA_EA_EACS,
+ CODEC_ID_ADPCM_EA_XAS,
+ CODEC_ID_ADPCM_EA_MAXIS_XA,
+ CODEC_ID_ADPCM_IMA_ISS,
+ CODEC_ID_ADPCM_G722,
+ CODEC_ID_ADPCM_IMA_APC,
+ CODEC_ID_VIMA = MKBETAG('V','I','M','A'),
+
+ /* AMR */
+ CODEC_ID_AMR_NB = 0x12000,
+ CODEC_ID_AMR_WB,
+
+ /* RealAudio codecs*/
+ CODEC_ID_RA_144 = 0x13000,
+ CODEC_ID_RA_288,
+
+ /* various DPCM codecs */
+ CODEC_ID_ROQ_DPCM = 0x14000,
+ CODEC_ID_INTERPLAY_DPCM,
+ CODEC_ID_XAN_DPCM,
+ CODEC_ID_SOL_DPCM,
+
+ /* audio codecs */
+ CODEC_ID_MP2 = 0x15000,
+ CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
+ CODEC_ID_AAC,
+ CODEC_ID_AC3,
+ CODEC_ID_DTS,
+ CODEC_ID_VORBIS,
+ CODEC_ID_DVAUDIO,
+ CODEC_ID_WMAV1,
+ CODEC_ID_WMAV2,
+ CODEC_ID_MACE3,
+ CODEC_ID_MACE6,
+ CODEC_ID_VMDAUDIO,
+ CODEC_ID_FLAC,
+ CODEC_ID_MP3ADU,
+ CODEC_ID_MP3ON4,
+ CODEC_ID_SHORTEN,
+ CODEC_ID_ALAC,
+ CODEC_ID_WESTWOOD_SND1,
+ CODEC_ID_GSM, ///< as in Berlin toast format
+ CODEC_ID_QDM2,
+ CODEC_ID_COOK,
+ CODEC_ID_TRUESPEECH,
+ CODEC_ID_TTA,
+ CODEC_ID_SMACKAUDIO,
+ CODEC_ID_QCELP,
+ CODEC_ID_WAVPACK,
+ CODEC_ID_DSICINAUDIO,
+ CODEC_ID_IMC,
+ CODEC_ID_MUSEPACK7,
+ CODEC_ID_MLP,
+ CODEC_ID_GSM_MS, /* as found in WAV */
+ CODEC_ID_ATRAC3,
+ CODEC_ID_VOXWARE,
+ CODEC_ID_APE,
+ CODEC_ID_NELLYMOSER,
+ CODEC_ID_MUSEPACK8,
+ CODEC_ID_SPEEX,
+ CODEC_ID_WMAVOICE,
+ CODEC_ID_WMAPRO,
+ CODEC_ID_WMALOSSLESS,
+ CODEC_ID_ATRAC3P,
+ CODEC_ID_EAC3,
+ CODEC_ID_SIPR,
+ CODEC_ID_MP1,
+ CODEC_ID_TWINVQ,
+ CODEC_ID_TRUEHD,
+ CODEC_ID_MP4ALS,
+ CODEC_ID_ATRAC1,
+ CODEC_ID_BINKAUDIO_RDFT,
+ CODEC_ID_BINKAUDIO_DCT,
+ CODEC_ID_AAC_LATM,
+ CODEC_ID_QDMC,
+ CODEC_ID_CELT,
+ CODEC_ID_G723_1,
+ CODEC_ID_G729,
+ CODEC_ID_8SVX_EXP,
+ CODEC_ID_8SVX_FIB,
+ CODEC_ID_BMV_AUDIO,
+ CODEC_ID_RALF,
+ CODEC_ID_IAC,
+ CODEC_ID_ILBC,
+ CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'),
+ CODEC_ID_SONIC = MKBETAG('S','O','N','C'),
+ CODEC_ID_SONIC_LS = MKBETAG('S','O','N','L'),
+ CODEC_ID_PAF_AUDIO = MKBETAG('P','A','F','A'),
+ CODEC_ID_OPUS = MKBETAG('O','P','U','S'),
+
+ /* subtitle codecs */
+ CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs.
+ CODEC_ID_DVD_SUBTITLE = 0x17000,
+ CODEC_ID_DVB_SUBTITLE,
+ CODEC_ID_TEXT, ///< raw UTF-8 text
+ CODEC_ID_XSUB,
+ CODEC_ID_SSA,
+ CODEC_ID_MOV_TEXT,
+ CODEC_ID_HDMV_PGS_SUBTITLE,
+ CODEC_ID_DVB_TELETEXT,
+ CODEC_ID_SRT,
+ CODEC_ID_MICRODVD = MKBETAG('m','D','V','D'),
+ CODEC_ID_EIA_608 = MKBETAG('c','6','0','8'),
+ CODEC_ID_JACOSUB = MKBETAG('J','S','U','B'),
+ CODEC_ID_SAMI = MKBETAG('S','A','M','I'),
+ CODEC_ID_REALTEXT = MKBETAG('R','T','X','T'),
+ CODEC_ID_SUBVIEWER = MKBETAG('S','u','b','V'),
+
+ /* other specific kind of codecs (generally used for attachments) */
+ CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs.
+ CODEC_ID_TTF = 0x18000,
+ CODEC_ID_BINTEXT = MKBETAG('B','T','X','T'),
+ CODEC_ID_XBIN = MKBETAG('X','B','I','N'),
+ CODEC_ID_IDF = MKBETAG( 0 ,'I','D','F'),
+ CODEC_ID_OTF = MKBETAG( 0 ,'O','T','F'),
+
+ CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
+
+ CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
+ * stream (only used by libavformat) */
+ CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
+ * stream (only used by libavformat) */
+ CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information.
+
+#endif /* AVCODEC_OLD_CODEC_IDS_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavcodec/vaapi.h Added

@@ -0,0 +1,346 @@
+/*
+ * Video Acceleration API (shared data between FFmpeg and the video player)
+ * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1
+ *
+ * Copyright (C) 2008-2009 Splitted-Desktop Systems
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VAAPI_H
+#define AVCODEC_VAAPI_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_vaapi
+ * Public libavcodec VA API header.
+ */
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavc_codec_hwaccel_vaapi VA API Decoding
+ * @ingroup lavc_codec_hwaccel
+ * @{
+ */
+
+/**
+ * This structure is used to share data between the FFmpeg library and
+ * the client video application.
+ * This shall be zero-allocated and available as
+ * AVCodecContext.hwaccel_context. All user members can be set once
+ * during initialization or through each AVCodecContext.get_buffer()
+ * function call. In any case, they must be valid prior to calling
+ * decoding functions.
+ */
+struct vaapi_context {
+ /**
+ * Window system dependent data
+ *
+ * - encoding: unused
+ * - decoding: Set by user
+ */
+ void *display;
+
+ /**
+ * Configuration ID
+ *
+ * - encoding: unused
+ * - decoding: Set by user
+ */
+ uint32_t config_id;
+
+ /**
+ * Context ID (video decode pipeline)
+ *
+ * - encoding: unused
+ * - decoding: Set by user
+ */
+ uint32_t context_id;
+
+ /**
+ * VAPictureParameterBuffer ID
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ uint32_t pic_param_buf_id;
+
+ /**
+ * VAIQMatrixBuffer ID
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ uint32_t iq_matrix_buf_id;
+
+ /**
+ * VABitPlaneBuffer ID (for VC-1 decoding)
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ uint32_t bitplane_buf_id;
+
+ /**
+ * Slice parameter/data buffer IDs
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ uint32_t *slice_buf_ids;
+
+ /**
+ * Number of effective slice buffer IDs to send to the HW
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ unsigned int n_slice_buf_ids;
+
+ /**
+ * Size of pre-allocated slice_buf_ids
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ unsigned int slice_buf_ids_alloc;
+
+ /**
+ * Pointer to VASliceParameterBuffers
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ void *slice_params;
+
+ /**
+ * Size of a VASliceParameterBuffer element
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ unsigned int slice_param_size;
+
+ /**
+ * Size of pre-allocated slice_params
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ unsigned int slice_params_alloc;
+
+ /**
+ * Number of slices currently filled in
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ unsigned int slice_count;
+
+ /**
+ * Pointer to slice data buffer base
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ const uint8_t *slice_data;
+
+ /**
+ * Current size of slice data
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ uint32_t slice_data_size;
+};
+
+/* @} */
+
+#endif /* AVCODEC_VAAPI_H */
+/*
+ * Video Acceleration API (shared data between FFmpeg and the video player)
+ * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1
+ *
+ * Copyright (C) 2008-2009 Splitted-Desktop Systems
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VAAPI_H
+#define AVCODEC_VAAPI_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_vaapi
+ * Public libavcodec VA API header.
+ */
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavc_codec_hwaccel_vaapi VA API Decoding
+ * @ingroup lavc_codec_hwaccel
+ * @{
+ */
+
+/**
+ * This structure is used to share data between the FFmpeg library and
+ * the client video application.
+ * This shall be zero-allocated and available as
+ * AVCodecContext.hwaccel_context. All user members can be set once
+ * during initialization or through each AVCodecContext.get_buffer()
+ * function call. In any case, they must be valid prior to calling
+ * decoding functions.
+ */
+struct vaapi_context {
+ /**
+ * Window system dependent data
+ *
+ * - encoding: unused
+ * - decoding: Set by user
+ */
+ void *display;
+
+ /**
+ * Configuration ID
+ *
+ * - encoding: unused
+ * - decoding: Set by user
+ */
+ uint32_t config_id;
+
+ /**
+ * Context ID (video decode pipeline)
+ *
+ * - encoding: unused
+ * - decoding: Set by user
+ */
+ uint32_t context_id;
+
+ /**
+ * VAPictureParameterBuffer ID
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ uint32_t pic_param_buf_id;
+
+ /**
+ * VAIQMatrixBuffer ID
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ uint32_t iq_matrix_buf_id;
+
+ /**
+ * VABitPlaneBuffer ID (for VC-1 decoding)
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ uint32_t bitplane_buf_id;
+
+ /**
+ * Slice parameter/data buffer IDs
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ uint32_t *slice_buf_ids;
+
+ /**
+ * Number of effective slice buffer IDs to send to the HW
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ unsigned int n_slice_buf_ids;
+
+ /**
+ * Size of pre-allocated slice_buf_ids
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ unsigned int slice_buf_ids_alloc;
+
+ /**
+ * Pointer to VASliceParameterBuffers
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ void *slice_params;
+
+ /**
+ * Size of a VASliceParameterBuffer element
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ unsigned int slice_param_size;
+
+ /**
+ * Size of pre-allocated slice_params
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ unsigned int slice_params_alloc;
+
+ /**
+ * Number of slices currently filled in
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ unsigned int slice_count;
+
+ /**
+ * Pointer to slice data buffer base
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ const uint8_t *slice_data;
+
+ /**
+ * Current size of slice data
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ uint32_t slice_data_size;
+};
+
+/* @} */
+
+#endif /* AVCODEC_VAAPI_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavcodec/vda.h Added

@@ -0,0 +1,426 @@
+/*
+ * VDA HW acceleration
+ *
+ * copyright (c) 2011 Sebastien Zwickert
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VDA_H
+#define AVCODEC_VDA_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_vda
+ * Public libavcodec VDA header.
+ */
+
+#include "libavcodec/avcodec.h"
+
+#include <stdint.h>
+
+// emmintrin.h is unable to compile with -std=c99 -Werror=missing-prototypes
+// http://openradar.appspot.com/8026390
+#undef __GNUC_STDC_INLINE__
+
+#define Picture QuickdrawPicture
+#include <VideoDecodeAcceleration/VDADecoder.h>
+#undef Picture
+
+#include "libavcodec/version.h"
+
+// extra flags not defined in VDADecoder.h
+enum {
+ kVDADecodeInfo_Asynchronous = 1UL << 0,
+ kVDADecodeInfo_FrameDropped = 1UL << 1
+};
+
+/**
+ * @defgroup lavc_codec_hwaccel_vda VDA
+ * @ingroup lavc_codec_hwaccel
+ *
+ * @{
+ */
+
+/**
+ * This structure is used to provide the necessary configurations and data
+ * to the VDA FFmpeg HWAccel implementation.
+ *
+ * The application must make it available as AVCodecContext.hwaccel_context.
+ */
+struct vda_context {
+ /**
+ * VDA decoder object.
+ *
+ * - encoding: unused
+ * - decoding: Set/Unset by libavcodec.
+ */
+ VDADecoder decoder;
+
+ /**
+ * The Core Video pixel buffer that contains the current image data.
+ *
+ * encoding: unused
+ * decoding: Set by libavcodec. Unset by user.
+ */
+ CVPixelBufferRef cv_buffer;
+
+ /**
+ * Use the hardware decoder in synchronous mode.
+ *
+ * encoding: unused
+ * decoding: Set by user.
+ */
+ int use_sync_decoding;
+
+ /**
+ * The frame width.
+ *
+ * - encoding: unused
+ * - decoding: Set/Unset by user.
+ */
+ int width;
+
+ /**
+ * The frame height.
+ *
+ * - encoding: unused
+ * - decoding: Set/Unset by user.
+ */
+ int height;
+
+ /**
+ * The frame format.
+ *
+ * - encoding: unused
+ * - decoding: Set/Unset by user.
+ */
+ int format;
+
+ /**
+ * The pixel format for output image buffers.
+ *
+ * - encoding: unused
+ * - decoding: Set/Unset by user.
+ */
+ OSType cv_pix_fmt_type;
+
+ /**
+ * unused
+ */
+ uint8_t *priv_bitstream;
+
+ /**
+ * unused
+ */
+ int priv_bitstream_size;
+
+ /**
+ * unused
+ */
+ int priv_allocated_size;
+
+ /**
+ * Use av_buffer to manage buffer.
+ * When the flag is set, the CVPixelBuffers returned by the decoder will
+ * be released automatically, so you have to retain them if necessary.
+ * Not setting this flag may cause memory leak.
+ *
+ * encoding: unused
+ * decoding: Set by user.
+ */
+ int use_ref_buffer;
+};
+
+/** Create the video decoder. */
+int ff_vda_create_decoder(struct vda_context *vda_ctx,
+ uint8_t *extradata,
+ int extradata_size);
+
+/** Destroy the video decoder. */
+int ff_vda_destroy_decoder(struct vda_context *vda_ctx);
+
+/**
+ * This struct holds all the information that needs to be passed
+ * between the caller and libavcodec for initializing VDA decoding.
+ * Its size is not a part of the public ABI, it must be allocated with
+ * av_vda_alloc_context() and freed with av_free().
+ */
+typedef struct AVVDAContext {
+ /**
+ * VDA decoder object. Created and freed by the caller.
+ */
+ VDADecoder decoder;
+
+ /**
+ * The output callback that must be passed to VDADecoderCreate.
+ * Set by av_vda_alloc_context().
+ */
+ VDADecoderOutputCallback output_callback;
+} AVVDAContext;
+
+/**
+ * Allocate and initialize a VDA context.
+ *
+ * This function should be called from the get_format() callback when the caller
+ * selects the AV_PIX_FMT_VDA format. The caller must then create the decoder
+ * object (using the output callback provided by libavcodec) that will be used
+ * for VDA-accelerated decoding.
+ *
+ * When decoding with VDA is finished, the caller must destroy the decoder
+ * object and free the VDA context using av_free().
+ *
+ * @return the newly allocated context or NULL on failure
+ */
+AVVDAContext *av_vda_alloc_context(void);
+
+/**
+ * This is a convenience function that creates and sets up the VDA context using
+ * an internal implementation.
+ *
+ * @param avctx the corresponding codec context
+ *
+ * @return >= 0 on success, a negative AVERROR code on failure
+ */
+int av_vda_default_init(AVCodecContext *avctx);
+
+/**
+ * This function must be called to free the VDA context initialized with
+ * av_vda_default_init().
+ *
+ * @param avctx the corresponding codec context
+ */
+void av_vda_default_free(AVCodecContext *avctx);
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_VDA_H */
+/*
+ * VDA HW acceleration
+ *
+ * copyright (c) 2011 Sebastien Zwickert
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VDA_H
+#define AVCODEC_VDA_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_vda
+ * Public libavcodec VDA header.
+ */
+
+#include "libavcodec/avcodec.h"
+
+#include <stdint.h>
+
+// emmintrin.h is unable to compile with -std=c99 -Werror=missing-prototypes
+// http://openradar.appspot.com/8026390
+#undef __GNUC_STDC_INLINE__
+
+#define Picture QuickdrawPicture
+#include <VideoDecodeAcceleration/VDADecoder.h>
+#undef Picture
+
+#include "libavcodec/version.h"
+
+// extra flags not defined in VDADecoder.h
+enum {
+ kVDADecodeInfo_Asynchronous = 1UL << 0,
+ kVDADecodeInfo_FrameDropped = 1UL << 1
+};
+
+/**
+ * @defgroup lavc_codec_hwaccel_vda VDA
+ * @ingroup lavc_codec_hwaccel
+ *
+ * @{
+ */
+
+/**
+ * This structure is used to provide the necessary configurations and data
+ * to the VDA FFmpeg HWAccel implementation.
+ *
+ * The application must make it available as AVCodecContext.hwaccel_context.
+ */
+struct vda_context {
+ /**
+ * VDA decoder object.
+ *
+ * - encoding: unused
+ * - decoding: Set/Unset by libavcodec.
+ */
+ VDADecoder decoder;
+
+ /**
+ * The Core Video pixel buffer that contains the current image data.
+ *
+ * encoding: unused
+ * decoding: Set by libavcodec. Unset by user.
+ */
+ CVPixelBufferRef cv_buffer;
+
+ /**
+ * Use the hardware decoder in synchronous mode.
+ *
+ * encoding: unused
+ * decoding: Set by user.
+ */
+ int use_sync_decoding;
+
+ /**
+ * The frame width.
+ *
+ * - encoding: unused
+ * - decoding: Set/Unset by user.
+ */
+ int width;
+
+ /**
+ * The frame height.
+ *
+ * - encoding: unused
+ * - decoding: Set/Unset by user.
+ */
+ int height;
+
+ /**
+ * The frame format.
+ *
+ * - encoding: unused
+ * - decoding: Set/Unset by user.
+ */
+ int format;
+
+ /**
+ * The pixel format for output image buffers.
+ *
+ * - encoding: unused
+ * - decoding: Set/Unset by user.
+ */
+ OSType cv_pix_fmt_type;
+
+ /**
+ * unused
+ */
+ uint8_t *priv_bitstream;
+
+ /**
+ * unused
+ */
+ int priv_bitstream_size;
+
+ /**
+ * unused
+ */
+ int priv_allocated_size;
+
+ /**
+ * Use av_buffer to manage buffer.
+ * When the flag is set, the CVPixelBuffers returned by the decoder will
+ * be released automatically, so you have to retain them if necessary.
+ * Not setting this flag may cause memory leak.
+ *
+ * encoding: unused
+ * decoding: Set by user.
+ */
+ int use_ref_buffer;
+};
+
+/** Create the video decoder. */
+int ff_vda_create_decoder(struct vda_context *vda_ctx,
+ uint8_t *extradata,
+ int extradata_size);
+
+/** Destroy the video decoder. */
+int ff_vda_destroy_decoder(struct vda_context *vda_ctx);
+
+/**
+ * This struct holds all the information that needs to be passed
+ * between the caller and libavcodec for initializing VDA decoding.
+ * Its size is not a part of the public ABI, it must be allocated with
+ * av_vda_alloc_context() and freed with av_free().
+ */
+typedef struct AVVDAContext {
+ /**
+ * VDA decoder object. Created and freed by the caller.
+ */
+ VDADecoder decoder;
+
+ /**
+ * The output callback that must be passed to VDADecoderCreate.
+ * Set by av_vda_alloc_context().
+ */
+ VDADecoderOutputCallback output_callback;
+} AVVDAContext;
+
+/**
+ * Allocate and initialize a VDA context.
+ *
+ * This function should be called from the get_format() callback when the caller
+ * selects the AV_PIX_FMT_VDA format. The caller must then create the decoder
+ * object (using the output callback provided by libavcodec) that will be used
+ * for VDA-accelerated decoding.
+ *
+ * When decoding with VDA is finished, the caller must destroy the decoder
+ * object and free the VDA context using av_free().
+ *
+ * @return the newly allocated context or NULL on failure
+ */
+AVVDAContext *av_vda_alloc_context(void);
+
+/**
+ * This is a convenience function that creates and sets up the VDA context using
+ * an internal implementation.
+ *
+ * @param avctx the corresponding codec context
+ *
+ * @return >= 0 on success, a negative AVERROR code on failure
+ */
+int av_vda_default_init(AVCodecContext *avctx);
+
+/**
+ * This function must be called to free the VDA context initialized with
+ * av_vda_default_init().
+ *
+ * @param avctx the corresponding codec context
+ */
+void av_vda_default_free(AVCodecContext *avctx);
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_VDA_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavcodec/vdpau.h Added

@@ -0,0 +1,430 @@
+/*
+ * The Video Decode and Presentation API for UNIX (VDPAU) is used for
+ * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1.
+ *
+ * Copyright (C) 2008 NVIDIA
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VDPAU_H
+#define AVCODEC_VDPAU_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_vdpau
+ * Public libavcodec VDPAU header.
+ */
+
+
+/**
+ * @defgroup lavc_codec_hwaccel_vdpau VDPAU Decoder and Renderer
+ * @ingroup lavc_codec_hwaccel
+ *
+ * VDPAU hardware acceleration has two modules
+ * - VDPAU decoding
+ * - VDPAU presentation
+ *
+ * The VDPAU decoding module parses all headers using FFmpeg
+ * parsing mechanisms and uses VDPAU for the actual decoding.
+ *
+ * As per the current implementation, the actual decoding
+ * and rendering (API calls) are done as part of the VDPAU
+ * presentation (vo_vdpau.c) module.
+ *
+ * @{
+ */
+
+#include <vdpau/vdpau.h>
+#include <vdpau/vdpau_x11.h>
+#include "libavutil/avconfig.h"
+#include "libavutil/attributes.h"
+
+#include "avcodec.h"
+#include "version.h"
+
+#if FF_API_BUFS_VDPAU
+union AVVDPAUPictureInfo {
+ VdpPictureInfoH264 h264;
+ VdpPictureInfoMPEG1Or2 mpeg;
+ VdpPictureInfoVC1 vc1;
+ VdpPictureInfoMPEG4Part2 mpeg4;
+};
+#endif
+
+struct AVCodecContext;
+struct AVFrame;
+
+typedef int (*AVVDPAU_Render2)(struct AVCodecContext *, struct AVFrame *,
+ const VdpPictureInfo *, uint32_t,
+ const VdpBitstreamBuffer *);
+
+/**
+ * This structure is used to share data between the libavcodec library and
+ * the client video application.
+ * The user shall allocate the structure via the av_alloc_vdpau_hwaccel
+ * function and make it available as
+ * AVCodecContext.hwaccel_context. Members can be set by the user once
+ * during initialization or through each AVCodecContext.get_buffer()
+ * function call. In any case, they must be valid prior to calling
+ * decoding functions.
+ *
+ * The size of this structure is not a part of the public ABI and must not
+ * be used outside of libavcodec. Use av_vdpau_alloc_context() to allocate an
+ * AVVDPAUContext.
+ */
+typedef struct AVVDPAUContext {
+ /**
+ * VDPAU decoder handle
+ *
+ * Set by user.
+ */
+ VdpDecoder decoder;
+
+ /**
+ * VDPAU decoder render callback
+ *
+ * Set by the user.
+ */
+ VdpDecoderRender *render;
+
+#if FF_API_BUFS_VDPAU
+ /**
+ * VDPAU picture information
+ *
+ * Set by libavcodec.
+ */
+ attribute_deprecated
+ union AVVDPAUPictureInfo info;
+
+ /**
+ * Allocated size of the bitstream_buffers table.
+ *
+ * Set by libavcodec.
+ */
+ attribute_deprecated
+ int bitstream_buffers_allocated;
+
+ /**
+ * Useful bitstream buffers in the bitstream buffers table.
+ *
+ * Set by libavcodec.
+ */
+ attribute_deprecated
+ int bitstream_buffers_used;
+
+ /**
+ * Table of bitstream buffers.
+ * The user is responsible for freeing this buffer using av_freep().
+ *
+ * Set by libavcodec.
+ */
+ attribute_deprecated
+ VdpBitstreamBuffer *bitstream_buffers;
+#endif
+ AVVDPAU_Render2 render2;
+} AVVDPAUContext;
+
+/**
+ * @brief allocation function for AVVDPAUContext
+ *
+ * Allows extending the struct without breaking API/ABI
+ */
+AVVDPAUContext *av_alloc_vdpaucontext(void);
+
+AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext *);
+void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, AVVDPAU_Render2);
+
+/**
+ * Allocate an AVVDPAUContext.
+ *
+ * @return Newly-allocated AVVDPAUContext or NULL on failure.
+ */
+AVVDPAUContext *av_vdpau_alloc_context(void);
+
+/**
+ * Get a decoder profile that should be used for initializing a VDPAU decoder.
+ * Should be called from the AVCodecContext.get_format() callback.
+ *
+ * @param avctx the codec context being used for decoding the stream
+ * @param profile a pointer into which the result will be written on success.
+ * The contents of profile are undefined if this function returns
+ * an error.
+ *
+ * @return 0 on success (non-negative), a negative AVERROR on failure.
+ */
+int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile);
+
+#if FF_API_CAP_VDPAU
+/** @brief The videoSurface is used for rendering. */
+#define FF_VDPAU_STATE_USED_FOR_RENDER 1
+
+/**
+ * @brief The videoSurface is needed for reference/prediction.
+ * The codec manipulates this.
+ */
+#define FF_VDPAU_STATE_USED_FOR_REFERENCE 2
+
+/**
+ * @brief This structure is used as a callback between the FFmpeg
+ * decoder (vd_) and presentation (vo_) module.
+ * This is used for defining a video frame containing surface,
+ * picture parameter, bitstream information etc which are passed
+ * between the FFmpeg decoder and its clients.
+ */
+struct vdpau_render_state {
+ VdpVideoSurface surface; ///< Used as rendered surface, never changed.
+
+ int state; ///< Holds FF_VDPAU_STATE_* values.
+
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
+ /** picture parameter information for all supported codecs */
+ union AVVDPAUPictureInfo info;
+#endif
+
+ /** Describe size/location of the compressed video data.
+ Set to 0 when freeing bitstream_buffers. */
+ int bitstream_buffers_allocated;
+ int bitstream_buffers_used;
+ /** The user is responsible for freeing this buffer using av_freep(). */
+ VdpBitstreamBuffer *bitstream_buffers;
+
+#if !AV_HAVE_INCOMPATIBLE_LIBAV_ABI
+ /** picture parameter information for all supported codecs */
+ union AVVDPAUPictureInfo info;
+#endif
+};
+#endif
+
+/* @}*/
+
+#endif /* AVCODEC_VDPAU_H */
+/*
+ * The Video Decode and Presentation API for UNIX (VDPAU) is used for
+ * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1.
+ *
+ * Copyright (C) 2008 NVIDIA
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VDPAU_H
+#define AVCODEC_VDPAU_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_vdpau
+ * Public libavcodec VDPAU header.
+ */
+
+
+/**
+ * @defgroup lavc_codec_hwaccel_vdpau VDPAU Decoder and Renderer
+ * @ingroup lavc_codec_hwaccel
+ *
+ * VDPAU hardware acceleration has two modules
+ * - VDPAU decoding
+ * - VDPAU presentation
+ *
+ * The VDPAU decoding module parses all headers using FFmpeg
+ * parsing mechanisms and uses VDPAU for the actual decoding.
+ *
+ * As per the current implementation, the actual decoding
+ * and rendering (API calls) are done as part of the VDPAU
+ * presentation (vo_vdpau.c) module.
+ *
+ * @{
+ */
+
+#include <vdpau/vdpau.h>
+#include <vdpau/vdpau_x11.h>
+#include "libavutil/avconfig.h"
+#include "libavutil/attributes.h"
+
+#include "avcodec.h"
+#include "version.h"
+
+#if FF_API_BUFS_VDPAU
+union AVVDPAUPictureInfo {
+ VdpPictureInfoH264 h264;
+ VdpPictureInfoMPEG1Or2 mpeg;
+ VdpPictureInfoVC1 vc1;
+ VdpPictureInfoMPEG4Part2 mpeg4;
+};
+#endif
+
+struct AVCodecContext;
+struct AVFrame;
+
+typedef int (*AVVDPAU_Render2)(struct AVCodecContext *, struct AVFrame *,
+ const VdpPictureInfo *, uint32_t,
+ const VdpBitstreamBuffer *);
+
+/**
+ * This structure is used to share data between the libavcodec library and
+ * the client video application.
+ * The user shall allocate the structure via the av_alloc_vdpau_hwaccel
+ * function and make it available as
+ * AVCodecContext.hwaccel_context. Members can be set by the user once
+ * during initialization or through each AVCodecContext.get_buffer()
+ * function call. In any case, they must be valid prior to calling
+ * decoding functions.
+ *
+ * The size of this structure is not a part of the public ABI and must not
+ * be used outside of libavcodec. Use av_vdpau_alloc_context() to allocate an
+ * AVVDPAUContext.
+ */
+typedef struct AVVDPAUContext {
+ /**
+ * VDPAU decoder handle
+ *
+ * Set by user.
+ */
+ VdpDecoder decoder;
+
+ /**
+ * VDPAU decoder render callback
+ *
+ * Set by the user.
+ */
+ VdpDecoderRender *render;
+
+#if FF_API_BUFS_VDPAU
+ /**
+ * VDPAU picture information
+ *
+ * Set by libavcodec.
+ */
+ attribute_deprecated
+ union AVVDPAUPictureInfo info;
+
+ /**
+ * Allocated size of the bitstream_buffers table.
+ *
+ * Set by libavcodec.
+ */
+ attribute_deprecated
+ int bitstream_buffers_allocated;
+
+ /**
+ * Useful bitstream buffers in the bitstream buffers table.
+ *
+ * Set by libavcodec.
+ */
+ attribute_deprecated
+ int bitstream_buffers_used;
+
+ /**
+ * Table of bitstream buffers.
+ * The user is responsible for freeing this buffer using av_freep().
+ *
+ * Set by libavcodec.
+ */
+ attribute_deprecated
+ VdpBitstreamBuffer *bitstream_buffers;
+#endif
+ AVVDPAU_Render2 render2;
+} AVVDPAUContext;
+
+/**
+ * @brief allocation function for AVVDPAUContext
+ *
+ * Allows extending the struct without breaking API/ABI
+ */
+AVVDPAUContext *av_alloc_vdpaucontext(void);
+
+AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext *);
+void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, AVVDPAU_Render2);
+
+/**
+ * Allocate an AVVDPAUContext.
+ *
+ * @return Newly-allocated AVVDPAUContext or NULL on failure.
+ */
+AVVDPAUContext *av_vdpau_alloc_context(void);
+
+/**
+ * Get a decoder profile that should be used for initializing a VDPAU decoder.
+ * Should be called from the AVCodecContext.get_format() callback.
+ *
+ * @param avctx the codec context being used for decoding the stream
+ * @param profile a pointer into which the result will be written on success.
+ * The contents of profile are undefined if this function returns
+ * an error.
+ *
+ * @return 0 on success (non-negative), a negative AVERROR on failure.
+ */
+int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile);
+
+#if FF_API_CAP_VDPAU
+/** @brief The videoSurface is used for rendering. */
+#define FF_VDPAU_STATE_USED_FOR_RENDER 1
+
+/**
+ * @brief The videoSurface is needed for reference/prediction.
+ * The codec manipulates this.
+ */
+#define FF_VDPAU_STATE_USED_FOR_REFERENCE 2
+
+/**
+ * @brief This structure is used as a callback between the FFmpeg
+ * decoder (vd_) and presentation (vo_) module.
+ * This is used for defining a video frame containing surface,
+ * picture parameter, bitstream information etc which are passed
+ * between the FFmpeg decoder and its clients.
+ */
+struct vdpau_render_state {
+ VdpVideoSurface surface; ///< Used as rendered surface, never changed.
+
+ int state; ///< Holds FF_VDPAU_STATE_* values.
+
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
+ /** picture parameter information for all supported codecs */
+ union AVVDPAUPictureInfo info;
+#endif
+
+ /** Describe size/location of the compressed video data.
+ Set to 0 when freeing bitstream_buffers. */
+ int bitstream_buffers_allocated;
+ int bitstream_buffers_used;
+ /** The user is responsible for freeing this buffer using av_freep(). */
+ VdpBitstreamBuffer *bitstream_buffers;
+
+#if !AV_HAVE_INCOMPATIBLE_LIBAV_ABI
+ /** picture parameter information for all supported codecs */
+ union AVVDPAUPictureInfo info;
+#endif
+};
+#endif
+
+/* @}*/
+
+#endif /* AVCODEC_VDPAU_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavcodec/version.h Added

@@ -0,0 +1,364 @@
+/*
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VERSION_H
+#define AVCODEC_VERSION_H
+
+/**
+ * @file
+ * @ingroup libavc
+ * Libavcodec version macros.
+ */
+
+#include "libavutil/version.h"
+
+#define LIBAVCODEC_VERSION_MAJOR 56
+#define LIBAVCODEC_VERSION_MINOR 1
+#define LIBAVCODEC_VERSION_MICRO 100
+
+#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
+ LIBAVCODEC_VERSION_MINOR, \
+ LIBAVCODEC_VERSION_MICRO)
+#define LIBAVCODEC_VERSION AV_VERSION(LIBAVCODEC_VERSION_MAJOR, \
+ LIBAVCODEC_VERSION_MINOR, \
+ LIBAVCODEC_VERSION_MICRO)
+#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
+
+#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
+
+/**
+ * FF_API_* defines may be placed below to indicate public API that will be
+ * dropped at a future version bump. The defines themselves are not part of
+ * the public API and may change, break or disappear at any time.
+ */
+
+#ifndef FF_API_REQUEST_CHANNELS
+#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_OLD_DECODE_AUDIO
+#define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_OLD_ENCODE_AUDIO
+#define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_OLD_ENCODE_VIDEO
+#define FF_API_OLD_ENCODE_VIDEO (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_CODEC_ID
+#define FF_API_CODEC_ID (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_AUDIO_CONVERT
+#define FF_API_AUDIO_CONVERT (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_AVCODEC_RESAMPLE
+#define FF_API_AVCODEC_RESAMPLE FF_API_AUDIO_CONVERT
+#endif
+#ifndef FF_API_DEINTERLACE
+#define FF_API_DEINTERLACE (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_DESTRUCT_PACKET
+#define FF_API_DESTRUCT_PACKET (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_GET_BUFFER
+#define FF_API_GET_BUFFER (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_MISSING_SAMPLE
+#define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_LOWRES
+#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_CAP_VDPAU
+#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_BUFS_VDPAU
+#define FF_API_BUFS_VDPAU (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_VOXWARE
+#define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_SET_DIMENSIONS
+#define FF_API_SET_DIMENSIONS (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_DEBUG_MV
+#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_AC_VLC
+#define FF_API_AC_VLC (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_OLD_MSMPEG4
+#define FF_API_OLD_MSMPEG4 (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_ASPECT_EXTENDED
+#define FF_API_ASPECT_EXTENDED (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_THREAD_OPAQUE
+#define FF_API_THREAD_OPAQUE (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_CODEC_PKT
+#define FF_API_CODEC_PKT (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_ARCH_ALPHA
+#define FF_API_ARCH_ALPHA (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_XVMC
+#define FF_API_XVMC (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_ERROR_RATE
+#define FF_API_ERROR_RATE (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_QSCALE_TYPE
+#define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_MB_TYPE
+#define FF_API_MB_TYPE (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_MAX_BFRAMES
+#define FF_API_MAX_BFRAMES (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_FAST_MALLOC
+#define FF_API_FAST_MALLOC (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_NEG_LINESIZES
+#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_EMU_EDGE
+#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_DSPUTIL
+#define FF_API_DSPUTIL (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_ARCH_SH4
+#define FF_API_ARCH_SH4 (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_ARCH_SPARC
+#define FF_API_ARCH_SPARC (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_UNUSED_MEMBERS
+#define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_IDCT_XVIDMMX
+#define FF_API_IDCT_XVIDMMX (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_INPUT_PRESERVED
+#define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_NORMALIZE_AQP
+#define FF_API_NORMALIZE_AQP (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_GMC
+#define FF_API_GMC (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_MV0
+#define FF_API_MV0 (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_CODEC_NAME
+#define FF_API_CODEC_NAME (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_AFD
+#define FF_API_AFD (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_VISMV
+/* XXX: don't forget to drop the -vismv documentation */
+#define FF_API_VISMV (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+
+#endif /* AVCODEC_VERSION_H */
+/*
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VERSION_H
+#define AVCODEC_VERSION_H
+
+/**
+ * @file
+ * @ingroup libavc
+ * Libavcodec version macros.
+ */
+
+#include "libavutil/version.h"
+
+#define LIBAVCODEC_VERSION_MAJOR 56
+#define LIBAVCODEC_VERSION_MINOR 1
+#define LIBAVCODEC_VERSION_MICRO 100
+
+#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
+ LIBAVCODEC_VERSION_MINOR, \
+ LIBAVCODEC_VERSION_MICRO)
+#define LIBAVCODEC_VERSION AV_VERSION(LIBAVCODEC_VERSION_MAJOR, \
+ LIBAVCODEC_VERSION_MINOR, \
+ LIBAVCODEC_VERSION_MICRO)
+#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
+
+#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
+
+/**
+ * FF_API_* defines may be placed below to indicate public API that will be
+ * dropped at a future version bump. The defines themselves are not part of
+ * the public API and may change, break or disappear at any time.
+ */
+
+#ifndef FF_API_REQUEST_CHANNELS
+#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_OLD_DECODE_AUDIO
+#define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_OLD_ENCODE_AUDIO
+#define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_OLD_ENCODE_VIDEO
+#define FF_API_OLD_ENCODE_VIDEO (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_CODEC_ID
+#define FF_API_CODEC_ID (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_AUDIO_CONVERT
+#define FF_API_AUDIO_CONVERT (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_AVCODEC_RESAMPLE
+#define FF_API_AVCODEC_RESAMPLE FF_API_AUDIO_CONVERT
+#endif
+#ifndef FF_API_DEINTERLACE
+#define FF_API_DEINTERLACE (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_DESTRUCT_PACKET
+#define FF_API_DESTRUCT_PACKET (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_GET_BUFFER
+#define FF_API_GET_BUFFER (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_MISSING_SAMPLE
+#define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_LOWRES
+#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_CAP_VDPAU
+#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_BUFS_VDPAU
+#define FF_API_BUFS_VDPAU (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_VOXWARE
+#define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_SET_DIMENSIONS
+#define FF_API_SET_DIMENSIONS (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_DEBUG_MV
+#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_AC_VLC
+#define FF_API_AC_VLC (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_OLD_MSMPEG4
+#define FF_API_OLD_MSMPEG4 (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_ASPECT_EXTENDED
+#define FF_API_ASPECT_EXTENDED (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_THREAD_OPAQUE
+#define FF_API_THREAD_OPAQUE (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_CODEC_PKT
+#define FF_API_CODEC_PKT (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_ARCH_ALPHA
+#define FF_API_ARCH_ALPHA (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_XVMC
+#define FF_API_XVMC (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_ERROR_RATE
+#define FF_API_ERROR_RATE (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_QSCALE_TYPE
+#define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_MB_TYPE
+#define FF_API_MB_TYPE (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_MAX_BFRAMES
+#define FF_API_MAX_BFRAMES (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_FAST_MALLOC
+#define FF_API_FAST_MALLOC (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_NEG_LINESIZES
+#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_EMU_EDGE
+#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_DSPUTIL
+#define FF_API_DSPUTIL (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_ARCH_SH4
+#define FF_API_ARCH_SH4 (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_ARCH_SPARC
+#define FF_API_ARCH_SPARC (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_UNUSED_MEMBERS
+#define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_IDCT_XVIDMMX
+#define FF_API_IDCT_XVIDMMX (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_INPUT_PRESERVED
+#define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_NORMALIZE_AQP
+#define FF_API_NORMALIZE_AQP (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_GMC
+#define FF_API_GMC (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_MV0
+#define FF_API_MV0 (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_CODEC_NAME
+#define FF_API_CODEC_NAME (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_AFD
+#define FF_API_AFD (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_VISMV
+/* XXX: don't forget to drop the -vismv documentation */
+#define FF_API_VISMV (LIBAVCODEC_VERSION_MAJOR < 57)
+#endif
+
+#endif /* AVCODEC_VERSION_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavcodec/xvmc.h Added

@@ -0,0 +1,340 @@
+/*
+ * Copyright (C) 2003 Ivan Kalvachev
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_XVMC_H
+#define AVCODEC_XVMC_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_xvmc
+ * Public libavcodec XvMC header.
+ */
+
+#include <X11/extensions/XvMC.h>
+
+#include "libavutil/attributes.h"
+#include "version.h"
+#include "avcodec.h"
+
+/**
+ * @defgroup lavc_codec_hwaccel_xvmc XvMC
+ * @ingroup lavc_codec_hwaccel
+ *
+ * @{
+ */
+
+#define AV_XVMC_ID 0x1DC711C0 /**< special value to ensure that regular pixel routines haven't corrupted the struct
+ the number is 1337 speak for the letters IDCT MCo (motion compensation) */
+
+attribute_deprecated struct xvmc_pix_fmt {
+ /** The field contains the special constant value AV_XVMC_ID.
+ It is used as a test that the application correctly uses the API,
+ and that there is no corruption caused by pixel routines.
+ - application - set during initialization
+ - libavcodec - unchanged
+ */
+ int xvmc_id;
+
+ /** Pointer to the block array allocated by XvMCCreateBlocks().
+ The array has to be freed by XvMCDestroyBlocks().
+ Each group of 64 values represents one data block of differential
+ pixel information (in MoCo mode) or coefficients for IDCT.
+ - application - set the pointer during initialization
+ - libavcodec - fills coefficients/pixel data into the array
+ */
+ short* data_blocks;
+
+ /** Pointer to the macroblock description array allocated by
+ XvMCCreateMacroBlocks() and freed by XvMCDestroyMacroBlocks().
+ - application - set the pointer during initialization
+ - libavcodec - fills description data into the array
+ */
+ XvMCMacroBlock* mv_blocks;
+
+ /** Number of macroblock descriptions that can be stored in the mv_blocks
+ array.
+ - application - set during initialization
+ - libavcodec - unchanged
+ */
+ int allocated_mv_blocks;
+
+ /** Number of blocks that can be stored at once in the data_blocks array.
+ - application - set during initialization
+ - libavcodec - unchanged
+ */
+ int allocated_data_blocks;
+
+ /** Indicate that the hardware would interpret data_blocks as IDCT
+ coefficients and perform IDCT on them.
+ - application - set during initialization
+ - libavcodec - unchanged
+ */
+ int idct;
+
+ /** In MoCo mode it indicates that intra macroblocks are assumed to be in
+ unsigned format; same as the XVMC_INTRA_UNSIGNED flag.
+ - application - set during initialization
+ - libavcodec - unchanged
+ */
+ int unsigned_intra;
+
+ /** Pointer to the surface allocated by XvMCCreateSurface().
+ It has to be freed by XvMCDestroySurface() on application exit.
+ It identifies the frame and its state on the video hardware.
+ - application - set during initialization
+ - libavcodec - unchanged
+ */
+ XvMCSurface* p_surface;
+
+/** Set by the decoder before calling ff_draw_horiz_band(),
+ needed by the XvMCRenderSurface function. */
+//@{
+ /** Pointer to the surface used as past reference
+ - application - unchanged
+ - libavcodec - set
+ */
+ XvMCSurface* p_past_surface;
+
+ /** Pointer to the surface used as future reference
+ - application - unchanged
+ - libavcodec - set
+ */
+ XvMCSurface* p_future_surface;
+
+ /** top/bottom field or frame
+ - application - unchanged
+ - libavcodec - set
+ */
+ unsigned int picture_structure;
+
+ /** XVMC_SECOND_FIELD - 1st or 2nd field in the sequence
+ - application - unchanged
+ - libavcodec - set
+ */
+ unsigned int flags;
+//}@
+
+ /** Number of macroblock descriptions in the mv_blocks array
+ that have already been passed to the hardware.
+ - application - zeroes it on get_buffer().
+ A successful ff_draw_horiz_band() may increment it
+ with filled_mb_block_num or zero both.
+ - libavcodec - unchanged
+ */
+ int start_mv_blocks_num;
+
+ /** Number of new macroblock descriptions in the mv_blocks array (after
+ start_mv_blocks_num) that are filled by libavcodec and have to be
+ passed to the hardware.
+ - application - zeroes it on get_buffer() or after successful
+ ff_draw_horiz_band().
+ - libavcodec - increment with one of each stored MB
+ */
+ int filled_mv_blocks_num;
+
+ /** Number of the next free data block; one data block consists of
+ 64 short values in the data_blocks array.
+ All blocks before this one have already been claimed by placing their
+ position into the corresponding block description structure field,
+ that are part of the mv_blocks array.
+ - application - zeroes it on get_buffer().
+ A successful ff_draw_horiz_band() may zero it together
+ with start_mb_blocks_num.
+ - libavcodec - each decoded macroblock increases it by the number
+ of coded blocks it contains.
+ */
+ int next_free_data_block_num;
+};
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_XVMC_H */
+/*
+ * Copyright (C) 2003 Ivan Kalvachev
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_XVMC_H
+#define AVCODEC_XVMC_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_xvmc
+ * Public libavcodec XvMC header.
+ */
+
+#include <X11/extensions/XvMC.h>
+
+#include "libavutil/attributes.h"
+#include "version.h"
+#include "avcodec.h"
+
+/**
+ * @defgroup lavc_codec_hwaccel_xvmc XvMC
+ * @ingroup lavc_codec_hwaccel
+ *
+ * @{
+ */
+
+#define AV_XVMC_ID 0x1DC711C0 /**< special value to ensure that regular pixel routines haven't corrupted the struct
+ the number is 1337 speak for the letters IDCT MCo (motion compensation) */
+
+attribute_deprecated struct xvmc_pix_fmt {
+ /** The field contains the special constant value AV_XVMC_ID.
+ It is used as a test that the application correctly uses the API,
+ and that there is no corruption caused by pixel routines.
+ - application - set during initialization
+ - libavcodec - unchanged
+ */
+ int xvmc_id;
+
+ /** Pointer to the block array allocated by XvMCCreateBlocks().
+ The array has to be freed by XvMCDestroyBlocks().
+ Each group of 64 values represents one data block of differential
+ pixel information (in MoCo mode) or coefficients for IDCT.
+ - application - set the pointer during initialization
+ - libavcodec - fills coefficients/pixel data into the array
+ */
+ short* data_blocks;
+
+ /** Pointer to the macroblock description array allocated by
+ XvMCCreateMacroBlocks() and freed by XvMCDestroyMacroBlocks().
+ - application - set the pointer during initialization
+ - libavcodec - fills description data into the array
+ */
+ XvMCMacroBlock* mv_blocks;
+
+ /** Number of macroblock descriptions that can be stored in the mv_blocks
+ array.
+ - application - set during initialization
+ - libavcodec - unchanged
+ */
+ int allocated_mv_blocks;
+
+ /** Number of blocks that can be stored at once in the data_blocks array.
+ - application - set during initialization
+ - libavcodec - unchanged
+ */
+ int allocated_data_blocks;
+
+ /** Indicate that the hardware would interpret data_blocks as IDCT
+ coefficients and perform IDCT on them.
+ - application - set during initialization
+ - libavcodec - unchanged
+ */
+ int idct;
+
+ /** In MoCo mode it indicates that intra macroblocks are assumed to be in
+ unsigned format; same as the XVMC_INTRA_UNSIGNED flag.
+ - application - set during initialization
+ - libavcodec - unchanged
+ */
+ int unsigned_intra;
+
+ /** Pointer to the surface allocated by XvMCCreateSurface().
+ It has to be freed by XvMCDestroySurface() on application exit.
+ It identifies the frame and its state on the video hardware.
+ - application - set during initialization
+ - libavcodec - unchanged
+ */
+ XvMCSurface* p_surface;
+
+/** Set by the decoder before calling ff_draw_horiz_band(),
+ needed by the XvMCRenderSurface function. */
+//@{
+ /** Pointer to the surface used as past reference
+ - application - unchanged
+ - libavcodec - set
+ */
+ XvMCSurface* p_past_surface;
+
+ /** Pointer to the surface used as future reference
+ - application - unchanged
+ - libavcodec - set
+ */
+ XvMCSurface* p_future_surface;
+
+ /** top/bottom field or frame
+ - application - unchanged
+ - libavcodec - set
+ */
+ unsigned int picture_structure;
+
+ /** XVMC_SECOND_FIELD - 1st or 2nd field in the sequence
+ - application - unchanged
+ - libavcodec - set
+ */
+ unsigned int flags;
+//}@
+
+ /** Number of macroblock descriptions in the mv_blocks array
+ that have already been passed to the hardware.
+ - application - zeroes it on get_buffer().
+ A successful ff_draw_horiz_band() may increment it
+ with filled_mb_block_num or zero both.
+ - libavcodec - unchanged
+ */
+ int start_mv_blocks_num;
+
+ /** Number of new macroblock descriptions in the mv_blocks array (after
+ start_mv_blocks_num) that are filled by libavcodec and have to be
+ passed to the hardware.
+ - application - zeroes it on get_buffer() or after successful
+ ff_draw_horiz_band().
+ - libavcodec - increment with one of each stored MB
+ */
+ int filled_mv_blocks_num;
+
+ /** Number of the next free data block; one data block consists of
+ 64 short values in the data_blocks array.
+ All blocks before this one have already been claimed by placing their
+ position into the corresponding block description structure field,
+ that are part of the mv_blocks array.
+ - application - zeroes it on get_buffer().
+ A successful ff_draw_horiz_band() may zero it together
+ with start_mb_blocks_num.
+ - libavcodec - each decoded macroblock increases it by the number
+ of coded blocks it contains.
+ */
+ int next_free_data_block_num;
+};
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_XVMC_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/ffmpeg_android/libavformat/avformat.h -> gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavformat/avformat.h Changed

@@ -21,172 +21,359 @@
 #ifndef AVFORMAT_AVFORMAT_H
 #define AVFORMAT_AVFORMAT_H
 
-#define LIBAVFORMAT_VERSION_MAJOR 52
-#define LIBAVFORMAT_VERSION_MINOR 61
-#define LIBAVFORMAT_VERSION_MICRO 0
-
-#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
- LIBAVFORMAT_VERSION_MINOR, \
- LIBAVFORMAT_VERSION_MICRO)
-#define LIBAVFORMAT_VERSION AV_VERSION(LIBAVFORMAT_VERSION_MAJOR, \
- LIBAVFORMAT_VERSION_MINOR, \
- LIBAVFORMAT_VERSION_MICRO)
-#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT
-
-#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
-
-/**
- * I return the LIBAVFORMAT_VERSION_INT constant. You got
- * a fucking problem with that, douchebag?
- */
-unsigned avformat_version(void);
-
-/**
- * Returns the libavformat build-time configuration.
- */
-const char *avformat_configuration(void);
-
 /**
- * Returns the libavformat license.
+ * @file
+ * @ingroup libavf
+ * Main libavformat public API header
+ */
+
+/**
+ * @defgroup libavf I/O and Muxing/Demuxing Library
+ * @{
+ *
+ * Libavformat (lavf) is a library for dealing with various media container
+ * formats. Its main two purposes are demuxing - i.e. splitting a media file
+ * into component streams, and the reverse process of muxing - writing supplied
+ * data in a specified container format. It also has an @ref lavf_io
+ * "I/O module" which supports a number of protocols for accessing the data (e.g.
+ * file, tcp, http and others). Before using lavf, you need to call
+ * av_register_all() to register all compiled muxers, demuxers and protocols.
+ * Unless you are absolutely sure you won't use libavformat's network
+ * capabilities, you should also call avformat_network_init().
+ *
+ * A supported input format is described by an AVInputFormat struct, conversely
+ * an output format is described by AVOutputFormat. You can iterate over all
+ * registered input/output formats using the av_iformat_next() /
+ * av_oformat_next() functions. The protocols layer is not part of the public
+ * API, so you can only get the names of supported protocols with the
+ * avio_enum_protocols() function.
+ *
+ * Main lavf structure used for both muxing and demuxing is AVFormatContext,
+ * which exports all information about the file being read or written. As with
+ * most Libavformat structures, its size is not part of public ABI, so it cannot be
+ * allocated on stack or directly with av_malloc(). To create an
+ * AVFormatContext, use avformat_alloc_context() (some functions, like
+ * avformat_open_input() might do that for you).
+ *
+ * Most importantly an AVFormatContext contains:
+ * @li the @ref AVFormatContext.iformat "input" or @ref AVFormatContext.oformat
+ * "output" format. It is either autodetected or set by user for input;
+ * always set by user for output.
+ * @li an @ref AVFormatContext.streams "array" of AVStreams, which describe all
+ * elementary streams stored in the file. AVStreams are typically referred to
+ * using their index in this array.
+ * @li an @ref AVFormatContext.pb "I/O context". It is either opened by lavf or
+ * set by user for input, always set by user for output (unless you are dealing
+ * with an AVFMT_NOFILE format).
+ *
+ * @section lavf_options Passing options to (de)muxers
+ * Lavf allows to configure muxers and demuxers using the @ref avoptions
+ * mechanism. Generic (format-independent) libavformat options are provided by
+ * AVFormatContext, they can be examined from a user program by calling
+ * av_opt_next() / av_opt_find() on an allocated AVFormatContext (or its AVClass
+ * from avformat_get_class()). Private (format-specific) options are provided by
+ * AVFormatContext.priv_data if and only if AVInputFormat.priv_class /
+ * AVOutputFormat.priv_class of the corresponding format struct is non-NULL.
+ * Further options may be provided by the @ref AVFormatContext.pb "I/O context",
+ * if its AVClass is non-NULL, and the protocols layer. See the discussion on
+ * nesting in @ref avoptions documentation to learn how to access those.
+ *
+ * @defgroup lavf_decoding Demuxing
+ * @{
+ * Demuxers read a media file and split it into chunks of data (@em packets). A
+ * @ref AVPacket "packet" contains one or more encoded frames which belongs to a
+ * single elementary stream. In the lavf API this process is represented by the
+ * avformat_open_input() function for opening a file, av_read_frame() for
+ * reading a single packet and finally avformat_close_input(), which does the
+ * cleanup.
+ *
+ * @section lavf_decoding_open Opening a media file
+ * The minimum information required to open a file is its URL or filename, which
+ * is passed to avformat_open_input(), as in the following code:
+ * @code
+ * const char *url = "in.mp3";
+ * AVFormatContext *s = NULL;
+ * int ret = avformat_open_input(&s, url, NULL, NULL);
+ * if (ret < 0)
+ * abort();
+ * @endcode
+ * The above code attempts to allocate an AVFormatContext, open the
+ * specified file (autodetecting the format) and read the header, exporting the
+ * information stored there into s. Some formats do not have a header or do not
+ * store enough information there, so it is recommended that you call the
+ * avformat_find_stream_info() function which tries to read and decode a few
+ * frames to find missing information.
+ *
+ * In some cases you might want to preallocate an AVFormatContext yourself with
+ * avformat_alloc_context() and do some tweaking on it before passing it to
+ * avformat_open_input(). One such case is when you want to use custom functions
+ * for reading input data instead of lavf internal I/O layer.
+ * To do that, create your own AVIOContext with avio_alloc_context(), passing
+ * your reading callbacks to it. Then set the @em pb field of your
+ * AVFormatContext to newly created AVIOContext.
+ *
+ * Since the format of the opened file is in general not known until after
+ * avformat_open_input() has returned, it is not possible to set demuxer private
+ * options on a preallocated context. Instead, the options should be passed to
+ * avformat_open_input() wrapped in an AVDictionary:
+ * @code
+ * AVDictionary *options = NULL;
+ * av_dict_set(&options, "video_size", "640x480", 0);
+ * av_dict_set(&options, "pixel_format", "rgb24", 0);
+ *
+ * if (avformat_open_input(&s, url, NULL, &options) < 0)
+ * abort();
+ * av_dict_free(&options);
+ * @endcode
+ * This code passes the private options 'video_size' and 'pixel_format' to the
+ * demuxer. They would be necessary for e.g. the rawvideo demuxer, since it
+ * cannot know how to interpret raw video data otherwise. If the format turns
+ * out to be something different than raw video, those options will not be
+ * recognized by the demuxer and therefore will not be applied. Such unrecognized
+ * options are then returned in the options dictionary (recognized options are
+ * consumed). The calling program can handle such unrecognized options as it
+ * wishes, e.g.
+ * @code
+ * AVDictionaryEntry *e;
+ * if (e = av_dict_get(options, "", NULL, AV_DICT_IGNORE_SUFFIX)) {
+ * fprintf(stderr, "Option %s not recognized by the demuxer.\n", e->key);
+ * abort();
+ * }
+ * @endcode
+ *
+ * After you have finished reading the file, you must close it with
+ * avformat_close_input(). It will free everything associated with the file.
+ *
+ * @section lavf_decoding_read Reading from an opened file
+ * Reading data from an opened AVFormatContext is done by repeatedly calling
+ * av_read_frame() on it. Each call, if successful, will return an AVPacket
+ * containing encoded data for one AVStream, identified by
+ * AVPacket.stream_index. This packet may be passed straight into the libavcodec
+ * decoding functions avcodec_decode_video2(), avcodec_decode_audio4() or
+ * avcodec_decode_subtitle2() if the caller wishes to decode the data.
+ *
+ * AVPacket.pts, AVPacket.dts and AVPacket.duration timing information will be
+ * set if known. They may also be unset (i.e. AV_NOPTS_VALUE for
+ * pts/dts, 0 for duration) if the stream does not provide them. The timing
+ * information will be in AVStream.time_base units, i.e. it has to be
+ * multiplied by the timebase to convert them to seconds.
+ *
+ * If AVPacket.buf is set on the returned packet, then the packet is
+ * allocated dynamically and the user may keep it indefinitely.
+ * Otherwise, if AVPacket.buf is NULL, the packet data is backed by a
+ * static storage somewhere inside the demuxer and the packet is only valid
+ * until the next av_read_frame() call or closing the file. If the caller
+ * requires a longer lifetime, av_dup_packet() will make an av_malloc()ed copy
+ * of it.
+ * In both cases, the packet must be freed with av_free_packet() when it is no
+ * longer needed.
+ *
+ * @section lavf_decoding_seek Seeking
+ * @}
+ *
+ * @defgroup lavf_encoding Muxing
+ * @{
+ * Muxers take encoded data in the form of @ref AVPacket "AVPackets" and write
+ * it into files or other output bytestreams in the specified container format.
+ *
+ * The main API functions for muxing are avformat_write_header() for writing the
+ * file header, av_write_frame() / av_interleaved_write_frame() for writing the
+ * packets and av_write_trailer() for finalizing the file.
+ *
+ * At the beginning of the muxing process, the caller must first call
+ * avformat_alloc_context() to create a muxing context. The caller then sets up
+ * the muxer by filling the various fields in this context:
+ *
+ * - The @ref AVFormatContext.oformat "oformat" field must be set to select the
+ * muxer that will be used.
+ * - Unless the format is of the AVFMT_NOFILE type, the @ref AVFormatContext.pb
+ * "pb" field must be set to an opened IO context, either returned from
+ * avio_open2() or a custom one.
+ * - Unless the format is of the AVFMT_NOSTREAMS type, at least one stream must
+ * be created with the avformat_new_stream() function. The caller should fill
+ * the @ref AVStream.codec "stream codec context" information, such as the
+ * codec @ref AVCodecContext.codec_type "type", @ref AVCodecContext.codec_id
+ * "id" and other parameters (e.g. width / height, the pixel or sample format,
+ * etc.) as known. The @ref AVStream.time_base "stream timebase" should
+ * be set to the timebase that the caller desires to use for this stream (note
+ * that the timebase actually used by the muxer can be different, as will be
+ * described later).
+ * - The caller may fill in additional information, such as @ref
+ * AVFormatContext.metadata "global" or @ref AVStream.metadata "per-stream"
+ * metadata, @ref AVFormatContext.chapters "chapters", @ref
+ * AVFormatContext.programs "programs", etc. as described in the
+ * AVFormatContext documentation. Whether such information will actually be
+ * stored in the output depends on what the container format and the muxer
+ * support.
+ *
+ * When the muxing context is fully set up, the caller must call
+ * avformat_write_header() to initialize the muxer internals and write the file
+ * header. Whether anything actually is written to the IO context at this step
+ * depends on the muxer, but this function must always be called. Any muxer
+ * private options must be passed in the options parameter to this function.
+ *
+ * The data is then sent to the muxer by repeatedly calling av_write_frame() or
+ * av_interleaved_write_frame() (consult those functions' documentation for
+ * discussion on the difference between them; only one of them may be used with
+ * a single muxing context, they should not be mixed). Do note that the timing
+ * information on the packets sent to the muxer must be in the corresponding
+ * AVStream's timebase. That timebase is set by the muxer (in the
+ * avformat_write_header() step) and may be different from the timebase
+ * requested by the caller.
+ *
+ * Once all the data has been written, the caller must call av_write_trailer()
+ * to flush any buffered packets and finalize the output file, then close the IO
+ * context (if any) and finally free the muxing context with
+ * avformat_free_context().
+ * @}
+ *
+ * @defgroup lavf_io I/O Read/Write
+ * @{
+ * @}
+ *
+ * @defgroup lavf_codec Demuxers
+ * @{
+ * @defgroup lavf_codec_native Native Demuxers
+ * @{
+ * @}
+ * @defgroup lavf_codec_wrappers External library wrappers
+ * @{
+ * @}
+ * @}
+ * @defgroup lavf_protos I/O Protocols
+ * @{
+ * @}
+ * @defgroup lavf_internal Internal
+ * @{
+ * @}
+ * @}
+ *
 */
-const char *avformat_license(void);
 
 #include <time.h>
 #include <stdio.h> /* FILE */
 #include "libavcodec/avcodec.h"
+#include "libavutil/dict.h"
+#include "libavutil/log.h"
 
 #include "avio.h"
+#include "libavformat/version.h"
 
 struct AVFormatContext;
 
+struct AVDeviceInfoList;
+struct AVDeviceCapabilitiesQuery;
 
-/*
- * Public Metadata API.
+/**
+ * @defgroup metadata_api Public Metadata API
+ * @{
+ * @ingroup libavf
 * The metadata API allows libavformat to export metadata tags to a client
- * application using a sequence of key/value pairs. Like all strings in FFmpeg,
- * metadata must be stored as UTF-8 encoded Unicode. Note that metadata
+ * application when demuxing. Conversely it allows a client application to
+ * set metadata when muxing.
+ *
+ * Metadata is exported or set as pairs of key/value strings in the 'metadata'
+ * fields of the AVFormatContext, AVStream, AVChapter and AVProgram structs
+ * using the @ref lavu_dict "AVDictionary" API. Like all strings in FFmpeg,
+ * metadata is assumed to be UTF-8 encoded Unicode. Note that metadata
 * exported by demuxers isn't checked to be valid UTF-8 in most cases.
+ *
 * Important concepts to keep in mind:
- * 1. Keys are unique; there can never be 2 tags with the same key. This is
+ * - Keys are unique; there can never be 2 tags with the same key. This is
 * also meant semantically, i.e., a demuxer should not knowingly produce
 * several keys that are literally different but semantically identical.
 * E.g., key=Author5, key=Author6. In this example, all authors must be
 * placed in the same tag.
- * 2. Metadata is flat, not hierarchical; there are no subtags. If you
+ * - Metadata is flat, not hierarchical; there are no subtags. If you
 * want to store, e.g., the email address of the child of producer Alice
 * and actor Bob, that could have key=alice_and_bobs_childs_email_address.
- * 3. Several modifiers can be applied to the tag name. This is done by
+ * - Several modifiers can be applied to the tag name. This is done by
 * appending a dash character ('-') and the modifier name in the order
 * they appear in the list below -- e.g. foo-eng-sort, not foo-sort-eng.
- * a) language -- a tag whose value is localized for a particular language
+ * - language -- a tag whose value is localized for a particular language
 * is appended with the ISO 639-2/B 3-letter language code.
 * For example: Author-ger=Michael, Author-eng=Mike
 * The original/default language is in the unqualified "Author" tag.
 * A demuxer should set a default if it sets any translated tag.
- * b) sorting -- a modified version of a tag that should be used for
+ * - sorting -- a modified version of a tag that should be used for
 * sorting will have '-sort' appended. E.g. artist="The Beatles",
 * artist-sort="Beatles, The".
+ * - Some protocols and demuxers support metadata updates. After a successful
+ * call to av_read_packet(), AVFormatContext.event_flags or AVStream.event_flags
+ * will be updated to indicate if metadata changed. In order to detect metadata
+ * changes on a stream, you need to loop through all streams in the AVFormatContext
+ * and check their individual event_flags.
+ *
+ * - Demuxers attempt to export metadata in a generic format, however tags
+ * with no generic equivalents are left as they are stored in the container.
+ * Follows a list of generic tag names:
+ *
+ @verbatim
+ album -- name of the set this work belongs to
+ album_artist -- main creator of the set/album, if different from artist.
+ e.g. "Various Artists" for compilation albums.
+ artist -- main creator of the work
+ comment -- any additional description of the file.
+ composer -- who composed the work, if different from artist.
+ copyright -- name of copyright holder.
+ creation_time-- date when the file was created, preferably in ISO 8601.
+ date -- date when the work was created, preferably in ISO 8601.
+ disc -- number of a subset, e.g. disc in a multi-disc collection.
+ encoder -- name/settings of the software/hardware that produced the file.
+ encoded_by -- person/group who created the file.
+ filename -- original name of the file.
+ genre -- <self-evident>.
+ language -- main language in which the work is performed, preferably
+ in ISO 639-2 format. Multiple languages can be specified by
+ separating them with commas.
+ performer -- artist who performed the work, if different from artist.
+ E.g for "Also sprach Zarathustra", artist would be "Richard
+ Strauss" and performer "London Philharmonic Orchestra".
+ publisher -- name of the label/publisher.
+ service_name -- name of the service in broadcasting (channel name).
+ service_provider -- name of the service provider in broadcasting.
+ title -- name of the work.
+ track -- number of this work in the set, can be in form current/total.
+ variant_bitrate -- the total bitrate of the bitrate variant that the current stream is part of
+ @endverbatim
 *
- * 4. Tag names are normally exported exactly as stored in the container to
- * allow lossless remuxing to the same format. For container-independent
- * handling of metadata, av_metadata_conv() can convert it to ffmpeg generic
- * format. Follows a list of generic tag names:
- *
- * album -- name of the set this work belongs to
- * album_artist -- main creator of the set/album, if different from artist.
- * e.g. "Various Artists" for compilation albums.
- * artist -- main creator of the work
- * comment -- any additional description of the file.
- * composer -- who composed the work, if different from artist.
- * copyright -- name of copyright holder.
- * date -- date when the work was created, preferably in ISO 8601.
- * disc -- number of a subset, e.g. disc in a multi-disc collection.
- * encoder -- name/settings of the software/hardware that produced the file.
- * encoded_by -- person/group who created the file.
- * filename -- original name of the file.
- * genre -- <self-evident>.
- * language -- main language in which the work is performed, preferably
- * in ISO 639-2 format.
- * performer -- artist who performed the work, if different from artist.
- * E.g for "Also sprach Zarathustra", artist would be "Richard
- * Strauss" and performer "London Philharmonic Orchestra".
- * publisher -- name of the label/publisher.
- * title -- name of the work.
- * track -- number of this work in the set, can be in form current/total.
- */
-
-#define AV_METADATA_MATCH_CASE 1
-#define AV_METADATA_IGNORE_SUFFIX 2
-#define AV_METADATA_DONT_STRDUP_KEY 4
-#define AV_METADATA_DONT_STRDUP_VAL 8
-#define AV_METADATA_DONT_OVERWRITE 16 ///< Don't overwrite existing tags.
-
-typedef struct {
- char *key;
- char *value;
-}AVMetadataTag;
-
-typedef struct AVMetadata AVMetadata;
-typedef struct AVMetadataConv AVMetadataConv;
-
-/**
- * Gets a metadata element with matching key.
- * @param prev Set to the previous matching element to find the next.
- * If set to NULL the first matching element is returned.
- * @param flags Allows case as well as suffix-insensitive comparisons.
- * @return Found tag or NULL, changing key or value leads to undefined behavior.
- */
-AVMetadataTag *
-av_metadata_get(AVMetadata *m, const char *key, const AVMetadataTag *prev, int flags);
-
-#if LIBAVFORMAT_VERSION_MAJOR == 52
-/**
- * Sets the given tag in m, overwriting an existing tag.
- * @param key tag key to add to m (will be av_strduped)
- * @param value tag value to add to m (will be av_strduped)
- * @return >= 0 on success otherwise an error code <0
- */
-int av_metadata_set(AVMetadata **pm, const char *key, const char *value);
-#endif
-
-/**
- * Sets the given tag in m, overwriting an existing tag.
- * @param key tag key to add to m (will be av_strduped depending on flags)
- * @param value tag value to add to m (will be av_strduped depending on flags)
- * @return >= 0 on success otherwise an error code <0
- */
-int av_metadata_set2(AVMetadata **pm, const char *key, const char *value, int flags);
-
-/**
- * Converts all the metadata sets from ctx according to the source and
- * destination conversion tables. If one of the tables is NULL, then
- * tags are converted to/from ffmpeg generic tag names.
- * @param d_conv destination tags format conversion table
- * @param s_conv source tags format conversion table
- */
-void av_metadata_conv(struct AVFormatContext *ctx,const AVMetadataConv *d_conv,
- const AVMetadataConv *s_conv);
-
-/**
- * Frees all the memory allocated for an AVMetadata struct.
+ * Look in the examples section for an application example how to use the Metadata API.
+ *
+ * @}
 */
-void av_metadata_free(AVMetadata **m);
-
 
 /* packet functions */
 
 
 /**
- * Allocates and reads the payload of a packet and initializes its
+ * Allocate and read the payload of a packet and initialize its
 * fields with default values.
 *
+ * @param s associated IO context
 * @param pkt packet
 * @param size desired payload size
 * @return >0 (read size) if OK, AVERROR_xxx otherwise
 */
-int av_get_packet(ByteIOContext *s, AVPacket *pkt, int size);
+int av_get_packet(AVIOContext *s, AVPacket *pkt, int size);
 
 
+/**
+ * Read data and append it to the current content of the AVPacket.
+ * If pkt->size is 0 this is identical to av_get_packet.
+ * Note that this uses av_grow_packet and thus involves a realloc
+ * which is inefficient. Thus this function should only be used
+ * when there is no reasonable way to know (an upper bound of)
+ * the final size.
+ *
+ * @param s associated IO context
+ * @param pkt packet
+ * @param size amount of data to read
+ * @return >0 (read size) if OK, AVERROR_xxx otherwise, previous data
+ * will not be lost even if an error occurs.
+ */
+int av_append_packet(AVIOContext *s, AVPacket *pkt, int size);
+
+#if FF_API_LAVF_FRAC
 /*************************************************/
 /* fractional numbers for exact pts handling */
 
@@ -197,45 +384,33 @@
 typedef struct AVFrac {
 int64_t val, num, den;
 } AVFrac;
+#endif
 
 /*************************************************/
 /* input/output formats */
 
 struct AVCodecTag;
 
-/** This structure contains the data a format has to probe a file. */
+/**
+ * This structure contains the data a format has to probe a file.
+ */
 typedef struct AVProbeData {
 const char *filename;
 unsigned char *buf; /**< Buffer must have AVPROBE_PADDING_SIZE of extra allocated bytes filled with zero. */
 int buf_size; /**< Size of buf except extra allocated bytes */
+ uint8_t *mime_type; /**< mime_type, when known. */
 } AVProbeData;
 
-#define AVPROBE_SCORE_MAX 100 ///< maximum score, half of that is used for file-extension-based detection
-#define AVPROBE_PADDING_SIZE 32 ///< extra allocated bytes at the end of the probe buffer
+#define AVPROBE_SCORE_RETRY (AVPROBE_SCORE_MAX/4)
+#define AVPROBE_SCORE_STREAM_RETRY (AVPROBE_SCORE_MAX/4-1)
 
-typedef struct AVFormatParameters {
- AVRational time_base;
- int sample_rate;
- int channels;
- int width;
- int height;
- enum PixelFormat pix_fmt;
- int channel; /**< Used to select DV channel. */
- const char *standard; /**< TV standard, NTSC, PAL, SECAM */
- unsigned int mpeg2ts_raw:1; /**< Force raw MPEG-2 transport stream output, if possible. */
- unsigned int mpeg2ts_compute_pcr:1; /**< Compute exact PCR for each transport
- stream packet (only meaningful if
- mpeg2ts_raw is TRUE). */
- unsigned int initial_pause:1; /**< Do not begin to play the stream
- immediately (RTSP only). */
- unsigned int prealloced_context:1;
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
- enum CodecID video_codec_id;
- enum CodecID audio_codec_id;
-#endif
-} AVFormatParameters;
+#define AVPROBE_SCORE_EXTENSION 50 ///< score for file extension
+#define AVPROBE_SCORE_MIME 75 ///< score for file mime type
+#define AVPROBE_SCORE_MAX 100 ///< maximum score
+
+#define AVPROBE_PADDING_SIZE 32 ///< extra allocated bytes at the end of the probe buffer
 
-//! Demuxer will use url_fopen, no opened file should be provided by the caller.
+/// Demuxer will use avio_open, no opened file should be provided by the caller.
 #define AVFMT_NOFILE 0x0001
 #define AVFMT_NEEDNUMBER 0x0002 /**< Needs '%d' in filename. */
 #define AVFMT_SHOW_IDS 0x0008 /**< Show format stream IDs numbers. */
@@ -244,10 +419,37 @@
 #define AVFMT_GLOBALHEADER 0x0040 /**< Format wants global header. */
 #define AVFMT_NOTIMESTAMPS 0x0080 /**< Format does not need / have any timestamps. */
 #define AVFMT_GENERIC_INDEX 0x0100 /**< Use generic index building code. */
-#define AVFMT_TS_DISCONT 0x0200 /**< Format allows timestamp discontinuities. */
+#define AVFMT_TS_DISCONT 0x0200 /**< Format allows timestamp discontinuities. Note, muxers always require valid (monotone) timestamps */
 #define AVFMT_VARIABLE_FPS 0x0400 /**< Format allows variable fps. */
 #define AVFMT_NODIMENSIONS 0x0800 /**< Format does not need width/height */
+#define AVFMT_NOSTREAMS 0x1000 /**< Format does not require any streams */
+#define AVFMT_NOBINSEARCH 0x2000 /**< Format does not allow to fall back on binary search via read_timestamp */
+#define AVFMT_NOGENSEARCH 0x4000 /**< Format does not allow to fall back on generic search */
+#define AVFMT_NO_BYTE_SEEK 0x8000 /**< Format does not allow seeking by bytes */
+#define AVFMT_ALLOW_FLUSH 0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */
+#if LIBAVFORMAT_VERSION_MAJOR <= 54
+#define AVFMT_TS_NONSTRICT 0x8020000 //we try to be compatible to the ABIs of ffmpeg and major forks
+#else
+#define AVFMT_TS_NONSTRICT 0x20000
+#endif
+ /**< Format does not require strictly
+ increasing timestamps, but they must
+ still be monotonic */
+#define AVFMT_TS_NEGATIVE 0x40000 /**< Format allows muxing negative
+ timestamps. If not set the timestamp
+ will be shifted in av_write_frame and
+ av_interleaved_write_frame so they
+ start from 0.
+ The user or muxer can override this through
+ AVFormatContext.avoid_negative_ts
+ */
+
+#define AVFMT_SEEK_TO_PTS 0x4000000 /**< Seeking is based on PTS */
 
+/**
+ * @addtogroup lavf_encoding
+ * @{
+ */
 typedef struct AVOutputFormat {
 const char *name;
 /**
@@ -258,69 +460,195 @@
 const char *long_name;
 const char *mime_type;
 const char *extensions; /**< comma-separated filename extensions */
- /** size of private data so that it can be allocated in the wrapper */
- int priv_data_size;
 /* output support */
- enum CodecID audio_codec; /**< default audio codec */
- enum CodecID video_codec; /**< default video codec */
- int (*write_header)(struct AVFormatContext *);
- int (*write_packet)(struct AVFormatContext *, AVPacket *pkt);
- int (*write_trailer)(struct AVFormatContext *);
- /** can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_GLOBALHEADER */
+ enum AVCodecID audio_codec; /**< default audio codec */
+ enum AVCodecID video_codec; /**< default video codec */
+ enum AVCodecID subtitle_codec; /**< default subtitle codec */
+ /**
+ * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_RAWPICTURE,
+ * AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS,
+ * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH,
+ * AVFMT_TS_NONSTRICT
+ */
 int flags;
- /** Currently only used to set pixel format if not YUV420P. */
- int (*set_parameters)(struct AVFormatContext *, AVFormatParameters *);
- int (*interleave_packet)(struct AVFormatContext *, AVPacket *out,
- AVPacket *in, int flush);
 
 /**
 * List of supported codec_id-codec_tag pairs, ordered by "better
- * choice first". The arrays are all terminated by CODEC_ID_NONE.
+ * choice first". The arrays are all terminated by AV_CODEC_ID_NONE.
 */
 const struct AVCodecTag * const *codec_tag;
 
- enum CodecID subtitle_codec; /**< default subtitle codec */
 
- const AVMetadataConv *metadata_conv;
+ const AVClass *priv_class; ///< AVClass for the private context
 
- /* private fields */
+ /*****************************************************************
+ * No fields below this line are part of the public API. They
+ * may not be used outside of libavformat and can be changed and
+ * removed at will.
+ * New public fields should be added right above.
+ *****************************************************************
+ */
 struct AVOutputFormat *next;
+ /**
+ * size of private data so that it can be allocated in the wrapper
+ */
+ int priv_data_size;
+
+ int (*write_header)(struct AVFormatContext *);
+ /**
+ * Write a packet. If AVFMT_ALLOW_FLUSH is set in flags,
+ * pkt can be NULL in order to flush data buffered in the muxer.
+ * When flushing, return 0 if there still is more data to flush,
+ * or 1 if everything was flushed and there is no more buffered
+ * data.
+ */
+ int (*write_packet)(struct AVFormatContext *, AVPacket *pkt);
+ int (*write_trailer)(struct AVFormatContext *);
+ /**
+ * Currently only used to set pixel format if not YUV420P.
+ */
+ int (*interleave_packet)(struct AVFormatContext *, AVPacket *out,
+ AVPacket *in, int flush);
+ /**
+ * Test if the given codec can be stored in this container.
+ *
+ * @return 1 if the codec is supported, 0 if it is not.
+ * A negative number if unknown.
+ * MKTAG('A', 'P', 'I', 'C') if the codec is only supported as AV_DISPOSITION_ATTACHED_PIC
+ */
+ int (*query_codec)(enum AVCodecID id, int std_compliance);
+
+ void (*get_output_timestamp)(struct AVFormatContext *s, int stream,
+ int64_t *dts, int64_t *wall);
+ /**
+ * Allows sending messages from application to device.
+ */
+ int (*control_message)(struct AVFormatContext *s, int type,
+ void *data, size_t data_size);
+
+ /**
+ * Write an uncoded AVFrame.
+ *
+ * See av_write_uncoded_frame() for details.
+ *
+ * The library will free *frame afterwards, but the muxer can prevent it
+ * by setting the pointer to NULL.
+ */
+ int (*write_uncoded_frame)(struct AVFormatContext *, int stream_index,
+ AVFrame **frame, unsigned flags);
+ /**
+ * Returns device list with it properties.
+ * @see avdevice_list_devices() for more details.
+ */
+ int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list);
+ /**
+ * Initialize device capabilities submodule.
+ * @see avdevice_capabilities_create() for more details.
+ */
+ int (*create_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps);
+ /**
+ * Free device capabilities submodule.
+ * @see avdevice_capabilities_free() for more details.
+ */
+ int (*free_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps);
 } AVOutputFormat;
+/**
+ * @}
+ */
 
+/**
+ * @addtogroup lavf_decoding
+ * @{
+ */
 typedef struct AVInputFormat {
+ /**
+ * A comma separated list of short names for the format. New names
+ * may be appended with a minor bump.
+ */
 const char *name;
+
 /**
 * Descriptive name for the format, meant to be more human-readable
 * than name. You should use the NULL_IF_CONFIG_SMALL() macro
 * to define it.
 */
 const char *long_name;
- /** Size of private data so that it can be allocated in the wrapper. */
+
+ /**
+ * Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_SHOW_IDS,
+ * AVFMT_GENERIC_INDEX, AVFMT_TS_DISCONT, AVFMT_NOBINSEARCH,
+ * AVFMT_NOGENSEARCH, AVFMT_NO_BYTE_SEEK, AVFMT_SEEK_TO_PTS.
+ */
+ int flags;
+
+ /**
+ * If extensions are defined, then no probe is done. You should
+ * usually not use extension format guessing because it is not
+ * reliable enough
+ */
+ const char *extensions;
+
+ const struct AVCodecTag * const *codec_tag;
+
+ const AVClass *priv_class; ///< AVClass for the private context
+
+ /**
+ * Comma-separated list of mime types.
+ * It is used check for matching mime types while probing.
+ * @see av_probe_input_format2
+ */
+ const char *mime_type;
+
+ /*****************************************************************
+ * No fields below this line are part of the public API. They
+ * may not be used outside of libavformat and can be changed and
+ * removed at will.
+ * New public fields should be added right above.
+ *****************************************************************
+ */
+ struct AVInputFormat *next;
+
+ /**
+ * Raw demuxers store their codec ID here.
+ */
+ int raw_codec_id;
+
+ /**
+ * Size of private data so that it can be allocated in the wrapper.
+ */
 int priv_data_size;
+
 /**
 * Tell if a given file has a chance of being parsed as this format.
 * The buffer provided is guaranteed to be AVPROBE_PADDING_SIZE bytes
 * big so you do not have to check for that unless you need more.
 */
 int (*read_probe)(AVProbeData *);
- /** Read the format header and initialize the AVFormatContext
- structure. Return 0 if OK. 'ap' if non-NULL contains
- additional parameters. Only used in raw format right
- now. 'av_new_stream' should be called to create new streams. */
- int (*read_header)(struct AVFormatContext *,
- AVFormatParameters *ap);
- /** Read one packet and put it in 'pkt'. pts and flags are also
- set. 'av_new_stream' can be called only if the flag
- AVFMTCTX_NOHEADER is used.
- @return 0 on success, < 0 on error.
- When returning an error, pkt must not have been allocated
- or must be freed before returning */
+
+ /**
+ * Read the format header and initialize the AVFormatContext
+ * structure. Return 0 if OK. Only used in raw format right
+ * now. 'avformat_new_stream' should be called to create new streams.
+ */
+ int (*read_header)(struct AVFormatContext *);
+
+ /**
+ * Read one packet and put it in 'pkt'. pts and flags are also
+ * set. 'avformat_new_stream' can be called only if the flag
+ * AVFMTCTX_NOHEADER is used and only in the calling thread (not in a
+ * background thread).
+ * @return 0 on success, < 0 on error.
+ * When returning an error, pkt must not have been allocated
+ * or must be freed before returning
+ */
 int (*read_packet)(struct AVFormatContext *, AVPacket *pkt);
- /** Close the stream. The AVFormatContext and AVStreams are not
- freed by this function */
+
+ /**
+ * Close the stream. The AVFormatContext and AVStreams are not
+ * freed by this function
+ */
 int (*read_close)(struct AVFormatContext *);
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
 /**
 * Seek to a given timestamp relative to the frames in
 * stream component stream_index.
@@ -331,56 +659,75 @@
 */
 int (*read_seek)(struct AVFormatContext *,
 int stream_index, int64_t timestamp, int flags);
-#endif
+
 /**
- * Gets the next timestamp in stream[stream_index].time_base units.
+ * Get the next timestamp in stream[stream_index].time_base units.
 * @return the timestamp or AV_NOPTS_VALUE if an error occurred
 */
 int64_t (*read_timestamp)(struct AVFormatContext *s, int stream_index,
 int64_t *pos, int64_t pos_limit);
- /** Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER. */
- int flags;
- /** If extensions are defined, then no probe is done. You should
- usually not use extension format guessing because it is not
- reliable enough */
- const char *extensions;
- /** General purpose read-only value that the format can use. */
- int value;
 
- /** Starts/resumes playing - only meaningful if using a network-based format
- (RTSP). */
+ /**
+ * Start/resume playing - only meaningful if using a network-based format
+ * (RTSP).
+ */
 int (*read_play)(struct AVFormatContext *);
 
- /** Pauses playing - only meaningful if using a network-based format
- (RTSP). */
+ /**
+ * Pause playing - only meaningful if using a network-based format
+ * (RTSP).
+ */
 int (*read_pause)(struct AVFormatContext *);
 
- const struct AVCodecTag * const *codec_tag;
-
 /**
- * Seeks to timestamp ts.
+ * Seek to timestamp ts.
 * Seeking will be done so that the point from which all active streams
 * can be presented successfully will be closest to ts and within min/max_ts.
 * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
 */
 int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
 
- const AVMetadataConv *metadata_conv;
+ /**
+ * Returns device list with it properties.
+ * @see avdevice_list_devices() for more details.
+ */
+ int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list);
+
+ /**
+ * Initialize device capabilities submodule.
+ * @see avdevice_capabilities_create() for more details.
+ */
+ int (*create_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps);
 
- /* private fields */
- struct AVInputFormat *next;
+ /**
+ * Free device capabilities submodule.
+ * @see avdevice_capabilities_free() for more details.
+ */
+ int (*free_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps);
 } AVInputFormat;
+/**
+ * @}
+ */
 
 enum AVStreamParseType {
 AVSTREAM_PARSE_NONE,
 AVSTREAM_PARSE_FULL, /**< full parsing and repack */
 AVSTREAM_PARSE_HEADERS, /**< Only parse headers, do not repack. */
 AVSTREAM_PARSE_TIMESTAMPS, /**< full parsing and interpolation of timestamps for frames not starting on a packet boundary */
+ AVSTREAM_PARSE_FULL_ONCE, /**< full parsing and repack of the first frame only, only implemented for H.264 currently */
+ AVSTREAM_PARSE_FULL_RAW=MKTAG(0,'R','A','W'), /**< full parsing and repack with timestamp and position generation by parser for raw
+ this assumes that each packet in the file contains no demuxer level headers and
+ just codec level data, otherwise position generation would fail */
 };
 
 typedef struct AVIndexEntry {
 int64_t pos;
- int64_t timestamp;
+ int64_t timestamp; /**<
+ * Timestamp in AVStream.time_base units, preferably the time from which on correctly decoded frames are available
+ * when seeking to this entry. That means preferable PTS on keyframe based formats.
+ * But demuxers can choose to store a different timestamp, if it is more convenient for the implementation or nothing better
+ * is known
+ */
 #define AVINDEX_KEYFRAME 0x0001
 int flags:2;
 int size:30; //Yeah, trying to keep the size of this small to reduce memory requirements (it is 24 vs. 32 bytes due to possible 8-byte alignment).
@@ -395,6 +742,37 @@
 #define AV_DISPOSITION_KARAOKE 0x0020
 
 /**
+ * Track should be used during playback by default.
+ * Useful for subtitle track that should be displayed
+ * even when user did not explicitly ask for subtitles.
+ */
+#define AV_DISPOSITION_FORCED 0x0040
+#define AV_DISPOSITION_HEARING_IMPAIRED 0x0080 /**< stream for hearing impaired audiences */
+#define AV_DISPOSITION_VISUAL_IMPAIRED 0x0100 /**< stream for visual impaired audiences */
+#define AV_DISPOSITION_CLEAN_EFFECTS 0x0200 /**< stream without voice */
+/**
+ * The stream is stored in the file as an attached picture/"cover art" (e.g.
+ * APIC frame in ID3v2). The single packet associated with it will be returned
+ * among the first few packets read from the file unless seeking takes place.
+ * It can also be accessed at any time in AVStream.attached_pic.
+ */
+#define AV_DISPOSITION_ATTACHED_PIC 0x0400
+
+/**
+ * To specify text track kind (different from subtitles default).
+ */
+#define AV_DISPOSITION_CAPTIONS 0x10000
+#define AV_DISPOSITION_DESCRIPTIONS 0x20000
+#define AV_DISPOSITION_METADATA 0x40000
+
+/**
+ * Options for behavior on timestamp wrap detection.
+ */
+#define AV_PTS_WRAP_IGNORE 0 ///< ignore the wrap
+#define AV_PTS_WRAP_ADD_OFFSET 1 ///< add the format specific offset on wrap detection
+#define AV_PTS_WRAP_SUB_OFFSET -1 ///< subtract the format specific offset on wrap detection
+
+/**
 * Stream structure.
 * New fields can be added to the end with minor version bumps.
 * Removal, reordering and changes to existing fields require a major
@@ -403,40 +781,50 @@
 */
 typedef struct AVStream {
 int index; /**< stream index in AVFormatContext */
- int id; /**< format-specific stream ID */
- AVCodecContext *codec; /**< codec context */
 /**
- * Real base framerate of the stream.
- * This is the lowest framerate with which all timestamps can be
- * represented accurately (it is the least common multiple of all
- * framerates in the stream). Note, this value is just a guess!
- * For example, if the time base is 1/90000 and all frames have either
- * approximately 3600 or 1800 timer ticks, then r_frame_rate will be 50/1.
+ * Format-specific stream ID.
+ * decoding: set by libavformat
+ * encoding: set by the user, replaced by libavformat if left unset
 */
- AVRational r_frame_rate;
+ int id;
+ /**
+ * Codec context associated with this stream. Allocated and freed by
+ * libavformat.
+ *
+ * - decoding: The demuxer exports codec information stored in the headers
+ * here.
+ * - encoding: The user sets codec information, the muxer writes it to the
+ * output. Mandatory fields as specified in AVCodecContext
+ * documentation must be set even if this AVCodecContext is
+ * not actually used for encoding.
+ */
+ AVCodecContext *codec;
 void *priv_data;
 
- /* internal data used in av_find_stream_info() */
- int64_t first_dts;
- /** encoding: pts generation when outputting stream */
+#if FF_API_LAVF_FRAC
+ /**
+ * @deprecated this field is unused
+ */
+ attribute_deprecated
 struct AVFrac pts;
+#endif
 
 /**
 * This is the fundamental unit of time (in seconds) in terms
- * of which frame timestamps are represented. For fixed-fps content,
- * time base should be 1/framerate and timestamp increments should be 1.
+ * of which frame timestamps are represented.
+ *
+ * decoding: set by libavformat
+ * encoding: May be set by the caller before avformat_write_header() to
+ * provide a hint to the muxer about the desired timebase. In
+ * avformat_write_header(), the muxer will overwrite this field
+ * with the timebase that will actually be used for the timestamps
+ * written into the file (which may or may not be related to the
+ * user-provided one, depending on the format).
 */
 AVRational time_base;
- int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
- /* ffmpeg.c private use */
- int stream_copy; /**< If set, just copy stream. */
- enum AVDiscard discard; ///< Selects which packets can be discarded at will and do not need to be demuxed.
- //FIXME move stuff to a flags field?
- /** Quality, as it has been removed from AVCodecContext and put in AVVideoFrame.
- * MN: dunno if that is the right place for it */
- float quality;
+
 /**
- * Decoding: pts of the first frame of the stream, in stream time base.
+ * Decoding: pts of the first frame of the stream in presentation order, in stream time base.
 * Only set this if you are absolutely 100% sure that the value you set
 * it to really is the pts of the first frame.
 * This may be undefined (AV_NOPTS_VALUE).
@@ -444,6 +832,7 @@
 * demuxer must NOT set this.
 */
 int64_t start_time;
+
 /**
 * Decoding: duration of the stream, in stream time base.
 * If a source file does not specify a duration, but does specify
@@ -451,36 +840,11 @@
 */
 int64_t duration;
 
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
- char language[4]; /** ISO 639-2/B 3-letter language code (empty string if undefined) */
-#endif
-
- /* av_read_frame() support */
- enum AVStreamParseType need_parsing;
- struct AVCodecParserContext *parser;
-
- int64_t cur_dts;
- int last_IP_duration;
- int64_t last_IP_pts;
- /* av_seek_frame() support */
- AVIndexEntry *index_entries; /**< Only used if the format does not
- support seeking natively. */
- int nb_index_entries;
- unsigned int index_entries_allocated_size;
-
 int64_t nb_frames; ///< number of frames in this stream if known or 0
 
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
- int64_t unused[4+1];
-
- char *filename; /**< source filename of the stream */
-#endif
-
 int disposition; /**< AV_DISPOSITION_* bit field */
 
- AVProbeData probe_data;
-#define MAX_REORDER_DELAY 16
- int64_t pts_buffer[MAX_REORDER_DELAY+1];
+ enum AVDiscard discard; ///< Selects which packets can be discarded at will and do not need to be demuxed.
 
 /**
 * sample aspect ratio (0 if unknown)
@@ -489,12 +853,99 @@
 */
 AVRational sample_aspect_ratio;
 
- AVMetadata *metadata;
+ AVDictionary *metadata;
 
- /* av_read_frame() support */
- const uint8_t *cur_ptr;
- int cur_len;
- AVPacket cur_pkt;
+ /**
+ * Average framerate
+ *
+ * - demuxing: May be set by libavformat when creating the stream or in
+ * avformat_find_stream_info().
+ * - muxing: May be set by the caller before avformat_write_header().
+ */
+ AVRational avg_frame_rate;
+
+ /**
+ * For streams with AV_DISPOSITION_ATTACHED_PIC disposition, this packet
+ * will contain the attached picture.
+ *
+ * decoding: set by libavformat, must not be modified by the caller.
+ * encoding: unused
+ */
+ AVPacket attached_pic;
+
+ /**
+ * An array of side data that applies to the whole stream (i.e. the
+ * container does not allow it to change between packets).
+ *
+ * There may be no overlap between the side data in this array and side data
+ * in the packets. I.e. a given side data is either exported by the muxer
+ * (demuxing) / set by the caller (muxing) in this array, then it never
+ * appears in the packets, or the side data is exported / sent through
+ * the packets (always in the first packet where the value becomes known or
+ * changes), then it does not appear in this array.
+ *
+ * - demuxing: Set by libavformat when the stream is created.
+ * - muxing: May be set by the caller before avformat_write_header().
+ *
+ * Freed by libavformat in avformat_free_context().
+ *
+ * @see av_format_inject_global_side_data()
+ */
+ AVPacketSideData *side_data;
+ /**
+ * The number of elements in the AVStream.side_data array.
+ */
+ int nb_side_data;
+
+ /**
+ * Flags for the user to detect events happening on the stream. Flags must
+ * be cleared by the user once the event has been handled.
+ * A combination of AVSTREAM_EVENT_FLAG_*.
+ */
+ int event_flags;
+#define AVSTREAM_EVENT_FLAG_METADATA_UPDATED 0x0001 ///< The call resulted in updated metadata.
+
+ /*****************************************************************
+ * All fields below this line are not part of the public API. They
+ * may not be used outside of libavformat and can be changed and
+ * removed at will.
+ * New public fields should be added right above.
+ *****************************************************************
+ */
+
+ /**
+ * Stream information used internally by av_find_stream_info()
+ */
+#define MAX_STD_TIMEBASES (60*12+6)
+ struct {
+ int64_t last_dts;
+ int64_t duration_gcd;
+ int duration_count;
+ int64_t rfps_duration_sum;
+ double (*duration_error)[2][MAX_STD_TIMEBASES];
+ int64_t codec_info_duration;
+ int64_t codec_info_duration_fields;
+
+ /**
+ * 0 -> decoder has not been searched for yet.
+ * >0 -> decoder found
+ * <0 -> decoder with codec_id == -found_decoder has not been found
+ */
+ int found_decoder;
+
+ int64_t last_duration;
+
+ /**
+ * Those are used for average framerate estimation.
+ */
+ int64_t fps_first_dts;
+ int fps_first_dts_idx;
+ int64_t fps_last_dts;
+ int fps_last_dts_idx;
+
+ } *info;
+
+ int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
 
 // Timestamp generation support:
 /**
@@ -504,32 +955,146 @@
 * a DTS is received from the underlying container. Otherwise set to
 * AV_NOPTS_VALUE by default.
 */
- int64_t reference_dts;
+ int64_t first_dts;
+ int64_t cur_dts;
+ int64_t last_IP_pts;
+ int last_IP_duration;
 
 /**
 * Number of packets to buffer for codec probing
- * NOT PART OF PUBLIC API
 */
 #define MAX_PROBE_PACKETS 2500
 int probe_packets;
 
 /**
+ * Number of frames that have been demuxed during av_find_stream_info()
+ */
+ int codec_info_nb_frames;
+
+ /* av_read_frame() support */
+ enum AVStreamParseType need_parsing;
+ struct AVCodecParserContext *parser;
+
+ /**
 * last packet in packet_buffer for this stream when muxing.
- * used internally, NOT PART OF PUBLIC API, dont read or write from outside of libav*
 */
 struct AVPacketList *last_in_packet_buffer;
+ AVProbeData probe_data;
+#define MAX_REORDER_DELAY 16
+ int64_t pts_buffer[MAX_REORDER_DELAY+1];
+
+ AVIndexEntry *index_entries; /**< Only used if the format does not
+ support seeking natively. */
+ int nb_index_entries;
+ unsigned int index_entries_allocated_size;
 
 /**
- * Average framerate
+ * Real base framerate of the stream.
+ * This is the lowest framerate with which all timestamps can be
+ * represented accurately (it is the least common multiple of all
+ * framerates in the stream). Note, this value is just a guess!
+ * For example, if the time base is 1/90000 and all frames have either
+ * approximately 3600 or 1800 timer ticks, then r_frame_rate will be 50/1.
+ *
+ * Code outside avformat should access this field using:
+ * av_stream_get/set_r_frame_rate(stream)
 */
- AVRational avg_frame_rate;
+ AVRational r_frame_rate;
 
 /**
- * Number of frames that have been demuxed during av_find_stream_info()
+ * Stream Identifier
+ * This is the MPEG-TS stream identifier +1
+ * 0 means unknown
 */
- int codec_info_nb_frames;
+ int stream_identifier;
+
+ int64_t interleaver_chunk_size;
+ int64_t interleaver_chunk_duration;
+
+ /**
+ * stream probing state
+ * -1 -> probing finished
+ * 0 -> no probing requested
+ * rest -> perform probing with request_probe being the minimum score to accept.
+ * NOT PART OF PUBLIC API
+ */
+ int request_probe;
+ /**
+ * Indicates that everything up to the next keyframe
+ * should be discarded.
+ */
+ int skip_to_keyframe;
+
+ /**
+ * Number of samples to skip at the start of the frame decoded from the next packet.
+ */
+ int skip_samples;
+
+ /**
+ * Number of internally decoded frames, used internally in libavformat, do not access
+ * its lifetime differs from info which is why it is not in that structure.
+ */
+ int nb_decoded_frames;
+
+ /**
+ * Timestamp offset added to timestamps before muxing
+ * NOT PART OF PUBLIC API
+ */
+ int64_t mux_ts_offset;
+
+ /**
+ * Internal data to check for wrapping of the time stamp
+ */
+ int64_t pts_wrap_reference;
+
+ /**
+ * Options for behavior, when a wrap is detected.
+ *
+ * Defined by AV_PTS_WRAP_ values.
+ *
+ * If correction is enabled, there are two possibilities:
+ * If the first time stamp is near the wrap point, the wrap offset
+ * will be subtracted, which will create negative time stamps.
+ * Otherwise the offset will be added.
+ */
+ int pts_wrap_behavior;
+
+ /**
+ * Internal data to prevent doing update_initial_durations() twice
+ */
+ int update_initial_durations_done;
+
+ /**
+ * Internal data to generate dts from pts
+ */
+ int64_t pts_reorder_error[MAX_REORDER_DELAY+1];
+ uint8_t pts_reorder_error_count[MAX_REORDER_DELAY+1];
+
+ /**
+ * Internal data to analyze DTS and detect faulty mpeg streams
+ */
+ int64_t last_dts_for_order_check;
+ uint8_t dts_ordered;
+ uint8_t dts_misordered;
+
+ /**
+ * Internal data to inject global side data
+ */
+ int inject_global_side_data;
+
 } AVStream;
 
+AVRational av_stream_get_r_frame_rate(const AVStream *s);
+void av_stream_set_r_frame_rate(AVStream *s, AVRational r);
+struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
+
+/**
+ * Returns the pts of the last muxed packet + its duration
+ *
+ * the retuned value is undefined when used with a demuxer.
+ */
+int64_t av_stream_get_end_pts(const AVStream *st);
+
 #define AV_PROGRAM_RUNNING 1
 
 /**
@@ -540,15 +1105,28 @@
 */
 typedef struct AVProgram {
 int id;
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
- char *provider_name; ///< network name for DVB streams
- char *name; ///< service name for DVB streams
-#endif
 int flags;
 enum AVDiscard discard; ///< selects which program to discard and which to feed to the caller
 unsigned int *stream_index;
 unsigned int nb_stream_indexes;
- AVMetadata *metadata;
+ AVDictionary *metadata;
+
+ int program_num;
+ int pmt_pid;
+ int pcr_pid;
+
+ /*****************************************************************
+ * All fields below this line are not part of the public API. They
+ * may not be used outside of libavformat and can be changed and
+ * removed at will.
+ * New public fields should be added right above.
+ *****************************************************************
+ */
+ int64_t start_time;
+ int64_t end_time;
+
+ int64_t pts_wrap_reference; ///< reference dts for wrap detection
+ int pts_wrap_behavior; ///< behavior on wrap detection
 } AVProgram;
 
 #define AVFMTCTX_NOHEADER 0x0001 /**< signal that no header is present
@@ -558,93 +1136,148 @@
 int id; ///< unique ID to identify the chapter
 AVRational time_base; ///< time base in which the start/end timestamps are specified
 int64_t start, end; ///< chapter start/end time in time_base units
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
- char *title; ///< chapter title
-#endif
- AVMetadata *metadata;
+ AVDictionary *metadata;
 } AVChapter;
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-#define MAX_STREAMS 20
-#else
-#define MAX_STREAMS 100
-#endif
+
+/**
+ * Callback used by devices to communicate with application.
+ */
+typedef int (*av_format_control_message)(struct AVFormatContext *s, int type,
+ void *data, size_t data_size);
+
+
+/**
+ * The duration of a video can be estimated through various ways, and this enum can be used
+ * to know how the duration was estimated.
+ */
+enum AVDurationEstimationMethod {
+ AVFMT_DURATION_FROM_PTS, ///< Duration accurately estimated from PTSes
+ AVFMT_DURATION_FROM_STREAM, ///< Duration estimated from a stream with a known duration
+ AVFMT_DURATION_FROM_BITRATE ///< Duration estimated from bitrate (less accurate)
+};
+
+typedef struct AVFormatInternal AVFormatInternal;
 
 /**
 * Format I/O context.
 * New fields can be added to the end with minor version bumps.
 * Removal, reordering and changes to existing fields require a major
 * version bump.
- * sizeof(AVFormatContext) must not be used outside libav*.
+ * sizeof(AVFormatContext) must not be used outside libav*, use
+ * avformat_alloc_context() to create an AVFormatContext.
 */
 typedef struct AVFormatContext {
- const AVClass *av_class; /**< Set by avformat_alloc_context. */
- /* Can only be iformat or oformat, not both at the same time. */
+ /**
+ * A class for logging and @ref avoptions. Set by avformat_alloc_context().
+ * Exports (de)muxer private options if they exist.
+ */
+ const AVClass *av_class;
+
+ /**
+ * The input container format.
+ *
+ * Demuxing only, set by avformat_open_input().
+ */
 struct AVInputFormat *iformat;
+
+ /**
+ * The output container format.
+ *
+ * Muxing only, must be set by the caller before avformat_write_header().
+ */
 struct AVOutputFormat *oformat;
+
+ /**
+ * Format private data. This is an AVOptions-enabled struct
+ * if and only if iformat/oformat.priv_class is not NULL.
+ *
+ * - muxing: set by avformat_write_header()
+ * - demuxing: set by avformat_open_input()
+ */
 void *priv_data;
- ByteIOContext *pb;
- unsigned int nb_streams;
- AVStream *streams[MAX_STREAMS];
- char filename[1024]; /**< input or output filename */
+
+ /**
+ * I/O context.
+ *
+ * - demuxing: either set by the user before avformat_open_input() (then
+ * the user must close it manually) or set by avformat_open_input().
+ * - muxing: set by the user before avformat_write_header(). The caller must
+ * take care of closing / freeing the IO context.
+ *
+ * Do NOT set this field if AVFMT_NOFILE flag is set in
+ * iformat/oformat.flags. In such a case, the (de)muxer will handle
+ * I/O in some other way and this field will be NULL.
+ */
+ AVIOContext *pb;
+
 /* stream info */
- int64_t timestamp;
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
- char title[512];
- char author[512];
- char copyright[512];
- char comment[512];
- char album[512];
- int year; /**< ID3 year, 0 if none */
- int track; /**< track number, 0 if none */
- char genre[32]; /**< ID3 genre */
-#endif
+ /**
+ * Flags signalling stream properties. A combination of AVFMTCTX_*.
+ * Set by libavformat.
+ */
+ int ctx_flags;
 
- int ctx_flags; /**< Format-specific flags, see AVFMTCTX_xx */
- /* private data for pts handling (do not modify directly). */
- /** This buffer is only needed when packets were already buffered but
- not decoded, for example to get the codec parameters in MPEG
- streams. */
- struct AVPacketList *packet_buffer;
+ /**
+ * Number of elements in AVFormatContext.streams.
+ *
+ * Set by avformat_new_stream(), must not be modified by any other code.
+ */
+ unsigned int nb_streams;
+ /**
+ * A list of all streams in the file. New streams are created with
+ * avformat_new_stream().
+ *
+ * - demuxing: streams are created by libavformat in avformat_open_input().
+ * If AVFMTCTX_NOHEADER is set in ctx_flags, then new streams may also
+ * appear in av_read_frame().
+ * - muxing: streams are created by the user before avformat_write_header().
+ *
+ * Freed by libavformat in avformat_free_context().
+ */
+ AVStream **streams;
 
- /** Decoding: position of the first frame of the component, in
- AV_TIME_BASE fractional seconds. NEVER set this value directly:
- It is deduced from the AVStream values. */
+ /**
+ * input or output filename
+ *
+ * - demuxing: set by avformat_open_input()
+ * - muxing: may be set by the caller before avformat_write_header()
+ */
+ char filename[1024];
+
+ /**
+ * Position of the first frame of the component, in
+ * AV_TIME_BASE fractional seconds. NEVER set this value directly:
+ * It is deduced from the AVStream values.
+ *
+ * Demuxing only, set by libavformat.
+ */
 int64_t start_time;
- /** Decoding: duration of the stream, in AV_TIME_BASE fractional
- seconds. Only set this value if you know none of the individual stream
- durations and also dont set any of them. This is deduced from the
- AVStream values if not set. */
- int64_t duration;
- /** decoding: total file size, 0 if unknown */
- int64_t file_size;
- /** Decoding: total stream bitrate in bit/s, 0 if not
- available. Never set it directly if the file_size and the
- duration are known as FFmpeg can compute it automatically. */
- int bit_rate;
 
- /* av_read_frame() support */
- AVStream *cur_st;
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
- const uint8_t *cur_ptr_deprecated;
- int cur_len_deprecated;
- AVPacket cur_pkt_deprecated;
-#endif
+ /**
+ * Duration of the stream, in AV_TIME_BASE fractional
+ * seconds. Only set this value if you know none of the individual stream
+ * durations and also do not set any of them. This is deduced from the
+ * AVStream values if not set.
+ *
+ * Demuxing only, set by libavformat.
+ */
+ int64_t duration;
 
- /* av_seek_frame() support */
- int64_t data_offset; /** offset of the first packet */
- int index_built;
+ /**
+ * Total stream bitrate in bit/s, 0 if not
+ * available. Never set it directly if the file_size and the
+ * duration are known as FFmpeg can compute it automatically.
+ */
+ int bit_rate;
 
- int mux_rate;
 unsigned int packet_size;
- int preload;
 int max_delay;
 
-#define AVFMT_NOOUTPUTLOOP -1
-#define AVFMT_INFINITEOUTPUTLOOP 0
- /** number of times to loop output in formats that support it */
- int loop_output;
-
+ /**
+ * Flags modifying the (de)muxer behaviour. A combination of AVFMT_FLAG_*.
+ * Set by the user before avformat_open_input() / avformat_write_header().
+ */
 int flags;
 #define AVFMT_FLAG_GENPTS 0x0001 ///< Generate missing pts even if it requires parsing future frames.
 #define AVFMT_FLAG_IGNIDX 0x0002 ///< Ignore index.
@@ -652,15 +1285,31 @@
 #define AVFMT_FLAG_IGNDTS 0x0008 ///< Ignore DTS on frames that contain both DTS & PTS
 #define AVFMT_FLAG_NOFILLIN 0x0010 ///< Do not infer any values from other values, just return what is stored in the container
 #define AVFMT_FLAG_NOPARSE 0x0020 ///< Do not use AVParsers, you also must set AVFMT_FLAG_NOFILLIN as the fillin code works on frames and no parsing -> no frames. Also seeking to frames can not work if parsing to find frame boundaries has been disabled
+#define AVFMT_FLAG_NOBUFFER 0x0040 ///< Do not buffer frames when possible
+#define AVFMT_FLAG_CUSTOM_IO 0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it.
+#define AVFMT_FLAG_DISCARD_CORRUPT 0x0100 ///< Discard frames marked corrupted
+#define AVFMT_FLAG_FLUSH_PACKETS 0x0200 ///< Flush the AVIOContext every packet.
+/**
+ * When muxing, try to avoid writing any random/volatile data to the output.
+ * This includes any random IDs, real-time timestamps/dates, muxer version, etc.
+ *
+ * This flag is mainly intended for testing.
+ */
+#define AVFMT_FLAG_BITEXACT 0x0400
+#define AVFMT_FLAG_MP4A_LATM 0x8000 ///< Enable RTP MP4A-LATM payload
+#define AVFMT_FLAG_SORT_DTS 0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down)
+#define AVFMT_FLAG_PRIV_OPT 0x20000 ///< Enable use of private options by delaying codec open (this could be made default once all code is converted)
+#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Don't merge side data but keep it separate.
 
- int loop_input;
- /** decoding: size of data to probe; encoding: unused. */
+ /**
+ * @deprecated deprecated in favor of probesize2
+ */
 unsigned int probesize;
 
 /**
- * Maximum time (in AV_TIME_BASE units) during which the input should
- * be analyzed in av_find_stream_info().
+ * @deprecated deprecated in favor of max_analyze_duration2
 */
+ attribute_deprecated
 int max_analyze_duration;
 
 const uint8_t *key;
@@ -673,17 +1322,19 @@
 * Forced video codec_id.
 * Demuxing: Set by user.
 */
- enum CodecID video_codec_id;
+ enum AVCodecID video_codec_id;
+
 /**
 * Forced audio codec_id.
 * Demuxing: Set by user.
 */
- enum CodecID audio_codec_id;
+ enum AVCodecID audio_codec_id;
+
 /**
 * Forced subtitle codec_id.
 * Demuxing: Set by user.
 */
- enum CodecID subtitle_codec_id;
+ enum AVCodecID subtitle_codec_id;
 
 /**
 * Maximum amount of memory in bytes to use for the index of each stream.
@@ -692,8 +1343,8 @@
 * accurate seeking (depends on demuxer).
 * Demuxers for which a full in-memory index is mandatory will ignore
 * this.
- * muxing : unused
- * demuxing: set by user
+ * - muxing: unused
+ * - demuxing: set by user
 */
 unsigned int max_index_size;
 
@@ -703,16 +1354,241 @@
 */
 unsigned int max_picture_buffer;
 
+ /**
+ * Number of chapters in AVChapter array.
+ * When muxing, chapters are normally written in the file header,
+ * so nb_chapters should normally be initialized before write_header
+ * is called. Some muxers (e.g. mov and mkv) can also write chapters
+ * in the trailer. To write chapters in the trailer, nb_chapters
+ * must be zero when write_header is called and non-zero when
+ * write_trailer is called.
+ * - muxing: set by user
+ * - demuxing: set by libavformat
+ */
 unsigned int nb_chapters;
 AVChapter **chapters;
 
 /**
+ * Metadata that applies to the whole file.
+ *
+ * - demuxing: set by libavformat in avformat_open_input()
+ * - muxing: may be set by the caller before avformat_write_header()
+ *
+ * Freed by libavformat in avformat_free_context().
+ */
+ AVDictionary *metadata;
+
+ /**
+ * Start time of the stream in real world time, in microseconds
+ * since the Unix epoch (00:00 1st January 1970). That is, pts=0 in the
+ * stream was captured at this real world time.
+ * - muxing: Set by the caller before avformat_write_header(). If set to
+ * either 0 or AV_NOPTS_VALUE, then the current wall-time will
+ * be used.
+ * - demuxing: Set by libavformat. AV_NOPTS_VALUE if unknown. Note that
+ * the value may become known after some number of frames
+ * have been received.
+ */
+ int64_t start_time_realtime;
+
+ /**
+ * The number of frames used for determining the framerate in
+ * avformat_find_stream_info().
+ * Demuxing only, set by the caller before avformat_find_stream_info().
+ */
+ int fps_probe_size;
+
+ /**
+ * Error recognition; higher values will detect more errors but may
+ * misdetect some more or less valid parts as errors.
+ * Demuxing only, set by the caller before avformat_open_input().
+ */
+ int error_recognition;
+
+ /**
+ * Custom interrupt callbacks for the I/O layer.
+ *
+ * demuxing: set by the user before avformat_open_input().
+ * muxing: set by the user before avformat_write_header()
+ * (mainly useful for AVFMT_NOFILE formats). The callback
+ * should also be passed to avio_open2() if it's used to
+ * open the file.
+ */
+ AVIOInterruptCB interrupt_callback;
+
+ /**
 * Flags to enable debugging.
 */
 int debug;
 #define FF_FDEBUG_TS 0x0001
 
 /**
+ * Maximum buffering duration for interleaving.
+ *
+ * To ensure all the streams are interleaved correctly,
+ * av_interleaved_write_frame() will wait until it has at least one packet
+ * for each stream before actually writing any packets to the output file.
+ * When some streams are "sparse" (i.e. there are large gaps between
+ * successive packets), this can result in excessive buffering.
+ *
+ * This field specifies the maximum difference between the timestamps of the
+ * first and the last packet in the muxing queue, above which libavformat
+ * will output a packet regardless of whether it has queued a packet for all
+ * the streams.
+ *
+ * Muxing only, set by the caller before avformat_write_header().
+ */
+ int64_t max_interleave_delta;
+
+ /**
+ * Allow non-standard and experimental extension
+ * @see AVCodecContext.strict_std_compliance
+ */
+ int strict_std_compliance;
+
+ /**
+ * Flags for the user to detect events happening on the file. Flags must
+ * be cleared by the user once the event has been handled.
+ * A combination of AVFMT_EVENT_FLAG_*.
+ */
+ int event_flags;
+#define AVFMT_EVENT_FLAG_METADATA_UPDATED 0x0001 ///< The call resulted in updated metadata.
+
+ /**
+ * Maximum number of packets to read while waiting for the first timestamp.
+ * Decoding only.
+ */
+ int max_ts_probe;
+
+
+ /**
+ * Transport stream id.
+ * This will be moved into demuxer private options. Thus no API/ABI compatibility
+ */
+ int ts_id;
+
+ /**
+ * Audio preload in microseconds.
+ * Note, not all formats support this and unpredictable things may happen if it is used when not supported.
+ * - encoding: Set by user via AVOptions (NO direct access)
+ * - decoding: unused
+ */
+ int audio_preload;
+
+ /**
+ * Max chunk time in microseconds.
+ * Note, not all formats support this and unpredictable things may happen if it is used when not supported.
+ * - encoding: Set by user via AVOptions (NO direct access)
+ * - decoding: unused
+ */
+ int max_chunk_duration;
+
+ /**
+ * Max chunk size in bytes
+ * Note, not all formats support this and unpredictable things may happen if it is used when not supported.
+ * - encoding: Set by user via AVOptions (NO direct access)
+ * - decoding: unused
+ */
+ int max_chunk_size;
+
+ /**
+ * forces the use of wallclock timestamps as pts/dts of packets
+ * This has undefined results in the presence of B frames.
+ * - encoding: unused
+ * - decoding: Set by user via AVOptions (NO direct access)
+ */
+ int use_wallclock_as_timestamps;
+
+ /**
+ * Avoid negative timestamps during muxing.
+ * 0 -> allow negative timestamps
+ * 1 -> avoid negative timestamps
+ * -1 -> choose automatically (default)
+ * Note, this only works when interleave_packet_per_dts is in use.
+ * - encoding: Set by user via AVOptions (NO direct access)
+ * - decoding: unused
+ */
+ int avoid_negative_ts;
+
+ /**
+ * avio flags, used to force AVIO_FLAG_DIRECT.
+ * - encoding: unused
+ * - decoding: Set by user via AVOptions (NO direct access)
+ */
+ int avio_flags;
+
+ /**
+ * The duration field can be estimated through various ways, and this field can be used
+ * to know how the duration was estimated.
+ * - encoding: unused
+ * - decoding: Read by user via AVOptions (NO direct access)
+ */
+ enum AVDurationEstimationMethod duration_estimation_method;
+
+ /**
+ * Skip initial bytes when opening stream
+ * - encoding: unused
+ * - decoding: Set by user via AVOptions (NO direct access)
+ */
+ int64_t skip_initial_bytes;
+
+ /**
+ * Correct single timestamp overflows
+ * - encoding: unused
+ * - decoding: Set by user via AVOptions (NO direct access)
+ */
+ unsigned int correct_ts_overflow;
+
+ /**
+ * Force seeking to any (also non key) frames.
+ * - encoding: unused
+ * - decoding: Set by user via AVOptions (NO direct access)
+ */
+ int seek2any;
+
+ /**
+ * Flush the I/O context after each packet.
+ * - encoding: Set by user via AVOptions (NO direct access)
+ * - decoding: unused
+ */
+ int flush_packets;
+
+ /**
+ * format probing score.
+ * The maximal score is AVPROBE_SCORE_MAX, its set when the demuxer probes
+ * the format.
+ * - encoding: unused
+ * - decoding: set by avformat, read by user via av_format_get_probe_score() (NO direct access)
+ */
+ int probe_score;
+
+ /**
+ * number of bytes to read maximally to identify format.
+ * - encoding: unused
+ * - decoding: set by user through AVOPtions (NO direct access)
+ */
+ int format_probesize;
+
+ /*****************************************************************
+ * All fields below this line are not part of the public API. They
+ * may not be used outside of libavformat and can be changed and
+ * removed at will.
+ * New public fields should be added right above.
+ *****************************************************************
+ */
+
+ /**
+ * This buffer is only needed when packets were already buffered but
+ * not decoded, for example to get the codec parameters in MPEG
+ * streams.
+ */
+ struct AVPacketList *packet_buffer;
+ struct AVPacketList *packet_buffer_end;
+
+ /* av_seek_frame() support */
+ int64_t data_offset; /**< offset of the first packet */
+
+ /**
 * Raw packets from the demuxer, prior to parsing and decoding.
 * This buffer is used for buffering packets until the codec can
 * be identified, as parsing cannot be done without knowing the
@@ -720,213 +1596,394 @@
 */
 struct AVPacketList *raw_packet_buffer;
 struct AVPacketList *raw_packet_buffer_end;
-
- struct AVPacketList *packet_buffer_end;
-
- AVMetadata *metadata;
-
+ /**
+ * Packets split by the parser get queued here.
+ */
+ struct AVPacketList *parse_queue;
+ struct AVPacketList *parse_queue_end;
 /**
 * Remaining size available for raw_packet_buffer, in bytes.
- * NOT PART OF PUBLIC API
 */
 #define RAW_PACKET_BUFFER_SIZE 2500000
 int raw_packet_buffer_remaining_size;
 
 /**
- * Start time of the stream in real world time, in microseconds
- * since the unix epoch (00:00 1st January 1970). That is, pts=0
- * in the stream was captured at this real world time.
- * - encoding: Set by user.
- * - decoding: Unused.
+ * Offset to remap timestamps to be non-negative.
+ * Expressed in timebase units.
+ * @see AVStream.mux_ts_offset
 */
- int64_t start_time_realtime;
+ int64_t offset;
+
+ /**
+ * Timebase for the timestamp offset.
+ */
+ AVRational offset_timebase;
+
+ /**
+ * An opaque field for libavformat internal usage.
+ * Must not be accessed in any way by callers.
+ */
+ AVFormatInternal *internal;
+
+ /**
+ * IO repositioned flag.
+ * This is set by avformat when the underlaying IO context read pointer
+ * is repositioned, for example when doing byte based seeking.
+ * Demuxers can use the flag to detect such changes.
+ */
+ int io_repositioned;
+
+ /**
+ * Forced video codec.
+ * This allows forcing a specific decoder, even when there are multiple with
+ * the same codec_id.
+ * Demuxing: Set by user via av_format_set_video_codec (NO direct access).
+ */
+ AVCodec *video_codec;
+
+ /**
+ * Forced audio codec.
+ * This allows forcing a specific decoder, even when there are multiple with
+ * the same codec_id.
+ * Demuxing: Set by user via av_format_set_audio_codec (NO direct access).
+ */
+ AVCodec *audio_codec;
+
+ /**
+ * Forced subtitle codec.
+ * This allows forcing a specific decoder, even when there are multiple with
+ * the same codec_id.
+ * Demuxing: Set by user via av_format_set_subtitle_codec (NO direct access).
+ */
+ AVCodec *subtitle_codec;
+
+ /**
+ * Number of bytes to be written as padding in a metadata header.
+ * Demuxing: Unused.
+ * Muxing: Set by user via av_format_set_metadata_header_padding.
+ */
+ int metadata_header_padding;
+
+ /**
+ * User data.
+ * This is a place for some private data of the user.
+ * Mostly usable with control_message_cb or any future callbacks in device's context.
+ */
+ void *opaque;
+
+ /**
+ * Callback used by devices to communicate with application.
+ */
+ av_format_control_message control_message_cb;
+
+ /**
+ * Output timestamp offset, in microseconds.
+ * Muxing: set by user via AVOptions (NO direct access)
+ */
+ int64_t output_ts_offset;
+
+ /**
+ * Maximum duration (in AV_TIME_BASE units) of the data read
+ * from input in avformat_find_stream_info().
+ * Demuxing only, set by the caller before avformat_find_stream_info()
+ * via AVOptions (NO direct access).
+ * Can be set to 0 to let avformat choose using a heuristic.
+ */
+ int64_t max_analyze_duration2;
+
+ /**
+ * Maximum size of the data read from input for determining
+ * the input container format.
+ * Demuxing only, set by the caller before avformat_open_input()
+ * via AVOptions (NO direct access).
+ */
+ int64_t probesize2;
 } AVFormatContext;
 
+int av_format_get_probe_score(const AVFormatContext *s);
+AVCodec * av_format_get_video_codec(const AVFormatContext *s);
+void av_format_set_video_codec(AVFormatContext *s, AVCodec *c);
+AVCodec * av_format_get_audio_codec(const AVFormatContext *s);
+void av_format_set_audio_codec(AVFormatContext *s, AVCodec *c);
+AVCodec * av_format_get_subtitle_codec(const AVFormatContext *s);
+void av_format_set_subtitle_codec(AVFormatContext *s, AVCodec *c);
+int av_format_get_metadata_header_padding(const AVFormatContext *s);
+void av_format_set_metadata_header_padding(AVFormatContext *s, int c);
+void * av_format_get_opaque(const AVFormatContext *s);
+void av_format_set_opaque(AVFormatContext *s, void *opaque);
+av_format_control_message av_format_get_control_message_cb(const AVFormatContext *s);
+void av_format_set_control_message_cb(AVFormatContext *s, av_format_control_message callback);
+
+/**
+ * This function will cause global side data to be injected in the next packet
+ * of each stream as well as after any subsequent seek.
+ */
+void av_format_inject_global_side_data(AVFormatContext *s);
+
+/**
+ * Returns the method used to set ctx->duration.
+ *
+ * @return AVFMT_DURATION_FROM_PTS, AVFMT_DURATION_FROM_STREAM, or AVFMT_DURATION_FROM_BITRATE.
+ */
+enum AVDurationEstimationMethod av_fmt_ctx_get_duration_estimation_method(const AVFormatContext* ctx);
+
 typedef struct AVPacketList {
 AVPacket pkt;
 struct AVPacketList *next;
 } AVPacketList;
 
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-extern AVInputFormat *first_iformat;
-extern AVOutputFormat *first_oformat;
-#endif
 
 /**
- * If f is NULL, returns the first registered input format,
- * if f is non-NULL, returns the next registered input format after f
- * or NULL if f is the last one.
+ * @defgroup lavf_core Core functions
+ * @ingroup libavf
+ *
+ * Functions for querying libavformat capabilities, allocating core structures,
+ * etc.
+ * @{
 */
-AVInputFormat *av_iformat_next(AVInputFormat *f);
 
 /**
- * If f is NULL, returns the first registered output format,
- * if f is non-NULL, returns the next registered output format after f
- * or NULL if f is the last one.
+ * Return the LIBAVFORMAT_VERSION_INT constant.
 */
-AVOutputFormat *av_oformat_next(AVOutputFormat *f);
+unsigned avformat_version(void);
 
-enum CodecID av_guess_image2_codec(const char *filename);
+/**
+ * Return the libavformat build-time configuration.
+ */
+const char *avformat_configuration(void);
 
-/* XXX: Use automatic init with either ELF sections or C file parser */
-/* modules. */
+/**
+ * Return the libavformat license.
+ */
+const char *avformat_license(void);
+
+/**
+ * Initialize libavformat and register all the muxers, demuxers and
+ * protocols. If you do not call this function, then you can select
+ * exactly which formats you want to support.
+ *
+ * @see av_register_input_format()
+ * @see av_register_output_format()
+ */
+void av_register_all(void);
 
-/* utils.c */
 void av_register_input_format(AVInputFormat *format);
 void av_register_output_format(AVOutputFormat *format);
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-attribute_deprecated AVOutputFormat *guess_stream_format(const char *short_name,
- const char *filename,
- const char *mime_type);
 
 /**
- * @deprecated Use av_guess_format() instead.
+ * Do global initialization of network components. This is optional,
+ * but recommended, since it avoids the overhead of implicitly
+ * doing the setup for each session.
+ *
+ * Calling this function will become mandatory if using network
+ * protocols at some major version bump.
 */
-attribute_deprecated AVOutputFormat *guess_format(const char *short_name,
- const char *filename,
- const char *mime_type);
-#endif
+int avformat_network_init(void);
 
 /**
- * Returns the output format in the list of registered output formats
- * which best matches the provided parameters, or returns NULL if
- * there is no match.
- *
- * @param short_name if non-NULL checks if short_name matches with the
- * names of the registered formats
- * @param filename if non-NULL checks if filename terminates with the
- * extensions of the registered formats
- * @param mime_type if non-NULL checks if mime_type matches with the
- * MIME type of the registered formats
+ * Undo the initialization done by avformat_network_init.
 */
-AVOutputFormat *av_guess_format(const char *short_name,
- const char *filename,
- const char *mime_type);
+int avformat_network_deinit(void);
 
 /**
- * Guesses the codec ID based upon muxer and filename.
+ * If f is NULL, returns the first registered input format,
+ * if f is non-NULL, returns the next registered input format after f
+ * or NULL if f is the last one.
 */
-enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
- const char *filename, const char *mime_type,
- enum AVMediaType type);
+AVInputFormat *av_iformat_next(const AVInputFormat *f);
 
 /**
- * Sends a nice hexadecimal dump of a buffer to the specified file stream.
- *
- * @param f The file stream pointer where the dump should be sent to.
- * @param buf buffer
- * @param size buffer size
+ * If f is NULL, returns the first registered output format,
+ * if f is non-NULL, returns the next registered output format after f
+ * or NULL if f is the last one.
+ */
+AVOutputFormat *av_oformat_next(const AVOutputFormat *f);
+
+/**
+ * Allocate an AVFormatContext.
+ * avformat_free_context() can be used to free the context and everything
+ * allocated by the framework within it.
+ */
+AVFormatContext *avformat_alloc_context(void);
+
+/**
+ * Free an AVFormatContext and all its streams.
+ * @param s context to free
+ */
+void avformat_free_context(AVFormatContext *s);
+
+/**
+ * Get the AVClass for AVFormatContext. It can be used in combination with
+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
 *
- * @see av_hex_dump_log, av_pkt_dump, av_pkt_dump_log
+ * @see av_opt_find().
 */
-void av_hex_dump(FILE *f, uint8_t *buf, int size);
+const AVClass *avformat_get_class(void);
 
 /**
- * Sends a nice hexadecimal dump of a buffer to the log.
+ * Add a new stream to a media file.
 *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param buf buffer
- * @param size buffer size
+ * When demuxing, it is called by the demuxer in read_header(). If the
+ * flag AVFMTCTX_NOHEADER is set in s.ctx_flags, then it may also
+ * be called in read_packet().
+ *
+ * When muxing, should be called by the user before avformat_write_header().
+ *
+ * User is required to call avcodec_close() and avformat_free_context() to
+ * clean up the allocation by avformat_new_stream().
+ *
+ * @param s media file handle
+ * @param c If non-NULL, the AVCodecContext corresponding to the new stream
+ * will be initialized to use this codec. This is needed for e.g. codec-specific
+ * defaults to be set, so codec should be provided if it is known.
 *
- * @see av_hex_dump, av_pkt_dump, av_pkt_dump_log
+ * @return newly created stream or NULL on error.
 */
-void av_hex_dump_log(void *avcl, int level, uint8_t *buf, int size);
+AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c);
 
 /**
- * Sends a nice dump of a packet to the specified file stream.
+ * Get side information from stream.
 *
- * @param f The file stream pointer where the dump should be sent to.
- * @param pkt packet to dump
- * @param dump_payload True if the payload must be displayed, too.
+ * @param stream stream
+ * @param type desired side information type
+ * @param size pointer for side information size to store (optional)
+ * @return pointer to data if present or NULL otherwise
 */
-void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload);
+uint8_t *av_stream_get_side_data(AVStream *stream,
+ enum AVPacketSideDataType type, int *size);
+
+AVProgram *av_new_program(AVFormatContext *s, int id);
 
 /**
- * Sends a nice dump of a packet to the log.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param pkt packet to dump
- * @param dump_payload True if the payload must be displayed, too.
+ * @}
 */
-void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, int dump_payload);
 
+
+#if FF_API_ALLOC_OUTPUT_CONTEXT
 /**
- * Initializes libavformat and registers all the muxers, demuxers and
- * protocols. If you do not call this function, then you can select
- * exactly which formats you want to support.
- *
- * @see av_register_input_format()
- * @see av_register_output_format()
- * @see av_register_protocol()
+ * @deprecated deprecated in favor of avformat_alloc_output_context2()
 */
-void av_register_all(void);
+attribute_deprecated
+AVFormatContext *avformat_alloc_output_context(const char *format,
+ AVOutputFormat *oformat,
+ const char *filename);
+#endif
 
-/** codec tag <-> codec id */
-enum CodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag);
-unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum CodecID id);
+/**
+ * Allocate an AVFormatContext for an output format.
+ * avformat_free_context() can be used to free the context and
+ * everything allocated by the framework within it.
+ *
+ * @param *ctx is set to the created format context, or to NULL in
+ * case of failure
+ * @param oformat format to use for allocating the context, if NULL
+ * format_name and filename are used instead
+ * @param format_name the name of output format to use for allocating the
+ * context, if NULL filename is used instead
+ * @param filename the name of the filename to use for allocating the
+ * context, may be NULL
+ * @return >= 0 in case of success, a negative AVERROR code in case of
+ * failure
+ */
+int avformat_alloc_output_context2(AVFormatContext **ctx, AVOutputFormat *oformat,
+ const char *format_name, const char *filename);
 
-/* media file input */
+/**
+ * @addtogroup lavf_decoding
+ * @{
+ */
 
 /**
- * Finds AVInputFormat based on the short name of the input format.
+ * Find AVInputFormat based on the short name of the input format.
 */
 AVInputFormat *av_find_input_format(const char *short_name);
 
 /**
- * Guesses the file format.
+ * Guess the file format.
 *
+ * @param pd data to be probed
 * @param is_opened Whether the file is already opened; determines whether
 * demuxers with or without AVFMT_NOFILE are probed.
 */
 AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);
 
 /**
- * Allocates all the structures needed to read an input stream.
- * This does not open the needed codecs for decoding the stream[s].
+ * Guess the file format.
+ *
+ * @param pd data to be probed
+ * @param is_opened Whether the file is already opened; determines whether
+ * demuxers with or without AVFMT_NOFILE are probed.
+ * @param score_max A probe score larger that this is required to accept a
+ * detection, the variable is set to the actual detection
+ * score afterwards.
+ * If the score is <= AVPROBE_SCORE_MAX / 4 it is recommended
+ * to retry with a larger probe buffer.
 */
-int av_open_input_stream(AVFormatContext **ic_ptr,
- ByteIOContext *pb, const char *filename,
- AVInputFormat *fmt, AVFormatParameters *ap);
+AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max);
 
 /**
- * Opens a media file as input. The codecs are not opened. Only the file
- * header (if present) is read.
+ * Guess the file format.
 *
- * @param ic_ptr The opened media file handle is put here.
- * @param filename filename to open
- * @param fmt If non-NULL, force the file format to use.
- * @param buf_size optional buffer size (zero if default is OK)
- * @param ap Additional parameters needed when opening the file
- * (NULL if default).
- * @return 0 if OK, AVERROR_xxx otherwise
+ * @param is_opened Whether the file is already opened; determines whether
+ * demuxers with or without AVFMT_NOFILE are probed.
+ * @param score_ret The score of the best detection.
 */
-int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
- AVInputFormat *fmt,
- int buf_size,
- AVFormatParameters *ap);
+AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score_ret);
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
 /**
- * @deprecated Use avformat_alloc_context() instead.
+ * Probe a bytestream to determine the input format. Each time a probe returns
+ * with a score that is too low, the probe buffer size is increased and another
+ * attempt is made. When the maximum probe size is reached, the input format
+ * with the highest score is returned.
+ *
+ * @param pb the bytestream to probe
+ * @param fmt the input format is put here
+ * @param filename the filename of the stream
+ * @param logctx the log context
+ * @param offset the offset within the bytestream to probe from
+ * @param max_probe_size the maximum probe buffer size (zero for default)
+ * @return the score in case of success, a negative value corresponding to an
+ * the maximal score is AVPROBE_SCORE_MAX
+ * AVERROR code otherwise
 */
-attribute_deprecated AVFormatContext *av_alloc_format_context(void);
-#endif
+int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt,
+ const char *filename, void *logctx,
+ unsigned int offset, unsigned int max_probe_size);
 
 /**
- * Allocates an AVFormatContext.
- * Can be freed with av_free() but do not forget to free everything you
- * explicitly allocated as well!
+ * Like av_probe_input_buffer2() but returns 0 on success
 */
-AVFormatContext *avformat_alloc_context(void);
+int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
+ const char *filename, void *logctx,
+ unsigned int offset, unsigned int max_probe_size);
 
 /**
- * Reads packets of a media file to get stream information. This
+ * Open an input stream and read the header. The codecs are not opened.
+ * The stream must be closed with avformat_close_input().
+ *
+ * @param ps Pointer to user-supplied AVFormatContext (allocated by avformat_alloc_context).
+ * May be a pointer to NULL, in which case an AVFormatContext is allocated by this
+ * function and written into ps.
+ * Note that a user-supplied AVFormatContext will be freed on failure.
+ * @param filename Name of the stream to open.
+ * @param fmt If non-NULL, this parameter forces a specific input format.
+ * Otherwise the format is autodetected.
+ * @param options A dictionary filled with AVFormatContext and demuxer-private options.
+ * On return this parameter will be destroyed and replaced with a dict containing
+ * options that were not found. May be NULL.
+ *
+ * @return 0 on success, a negative AVERROR on failure.
+ *
+ * @note If you want to use custom IO, preallocate the format context and set its pb field.
+ */
+int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputFormat *fmt, AVDictionary **options);
+
+attribute_deprecated
+int av_demuxer_open(AVFormatContext *ic);
+
+#if FF_API_FORMAT_PARAMETERS
+/**
+ * Read packets of a media file to get stream information. This
 * is useful for file formats with no headers such as MPEG. This
 * function also computes the real framerate in case of MPEG-2 repeat
 * frame mode.
@@ -937,11 +1994,85 @@
 * @return >=0 if OK, AVERROR_xxx on error
 * @todo Let the user decide somehow what information is needed so that
 * we do not waste time getting stuff the user does not need.
+ *
+ * @deprecated use avformat_find_stream_info.
 */
+attribute_deprecated
 int av_find_stream_info(AVFormatContext *ic);
+#endif
 
 /**
- * Reads a transport packet from a media file.
+ * Read packets of a media file to get stream information. This
+ * is useful for file formats with no headers such as MPEG. This
+ * function also computes the real framerate in case of MPEG-2 repeat
+ * frame mode.
+ * The logical file position is not changed by this function;
+ * examined packets may be buffered for later processing.
+ *
+ * @param ic media file handle
+ * @param options If non-NULL, an ic.nb_streams long array of pointers to
+ * dictionaries, where i-th member contains options for
+ * codec corresponding to i-th stream.
+ * On return each dictionary will be filled with options that were not found.
+ * @return >=0 if OK, AVERROR_xxx on error
+ *
+ * @note this function isn't guaranteed to open all the codecs, so
+ * options being non-empty at return is a perfectly normal behavior.
+ *
+ * @todo Let the user decide somehow what information is needed so that
+ * we do not waste time getting stuff the user does not need.
+ */
+int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options);
+
+/**
+ * Find the programs which belong to a given stream.
+ *
+ * @param ic media file handle
+ * @param last the last found program, the search will start after this
+ * program, or from the beginning if it is NULL
+ * @param s stream index
+ * @return the next program which belongs to s, NULL if no program is found or
+ * the last program is not among the programs of ic.
+ */
+AVProgram *av_find_program_from_stream(AVFormatContext *ic, AVProgram *last, int s);
+
+/**
+ * Find the "best" stream in the file.
+ * The best stream is determined according to various heuristics as the most
+ * likely to be what the user expects.
+ * If the decoder parameter is non-NULL, av_find_best_stream will find the
+ * default decoder for the stream's codec; streams for which no decoder can
+ * be found are ignored.
+ *
+ * @param ic media file handle
+ * @param type stream type: video, audio, subtitles, etc.
+ * @param wanted_stream_nb user-requested stream number,
+ * or -1 for automatic selection
+ * @param related_stream try to find a stream related (eg. in the same
+ * program) to this one, or -1 if none
+ * @param decoder_ret if non-NULL, returns the decoder for the
+ * selected stream
+ * @param flags flags; none are currently defined
+ * @return the non-negative stream number in case of success,
+ * AVERROR_STREAM_NOT_FOUND if no stream with the requested type
+ * could be found,
+ * AVERROR_DECODER_NOT_FOUND if streams were found but no decoder
+ * @note If av_find_best_stream returns successfully and decoder_ret is not
+ * NULL, then *decoder_ret is guaranteed to be set to a valid AVCodec.
+ */
+int av_find_best_stream(AVFormatContext *ic,
+ enum AVMediaType type,
+ int wanted_stream_nb,
+ int related_stream,
+ AVCodec **decoder_ret,
+ int flags);
+
+#if FF_API_READ_PACKET
+/**
+ * @deprecated use AVFMT_FLAG_NOFILLIN | AVFMT_FLAG_NOPARSE to read raw
+ * unprocessed packets
+ *
+ * Read a transport packet from a media file.
 *
 * This function is obsolete and should never be used.
 * Use av_read_frame() instead.
@@ -950,18 +2081,25 @@
 * @param pkt is filled
 * @return 0 if OK, AVERROR_xxx on error
 */
+attribute_deprecated
 int av_read_packet(AVFormatContext *s, AVPacket *pkt);
+#endif
 
 /**
- * Returns the next frame of a stream.
- *
- * The returned packet is valid
- * until the next av_read_frame() or until av_close_input_file() and
- * must be freed with av_free_packet. For video, the packet contains
- * exactly one frame. For audio, it contains an integer number of
- * frames if each frame has a known fixed size (e.g. PCM or ADPCM
- * data). If the audio frames have a variable size (e.g. MPEG audio),
- * then it contains one frame.
+ * Return the next frame of a stream.
+ * This function returns what is stored in the file, and does not validate
+ * that what is there are valid frames for the decoder. It will split what is
+ * stored in the file into frames and return one for each call. It will not
+ * omit invalid data between valid frames so as to give the decoder the maximum
+ * information possible for decoding.
+ *
+ * If pkt->buf is NULL, then the packet is valid until the next
+ * av_read_frame() or until avformat_close_input(). Otherwise the packet
+ * is valid indefinitely. In both cases the packet must be freed with
+ * av_free_packet when it is no longer needed. For video, the packet contains
+ * exactly one frame. For audio, it contains an integer number of frames if each
+ * frame has a known fixed size (e.g. PCM or ADPCM data). If the audio frames
+ * have a variable size (e.g. MPEG audio), then it contains one frame.
 *
 * pkt->pts, pkt->dts and pkt->duration are always set to correct
 * values in AVStream.time_base units (and guessed if the format cannot
@@ -974,8 +2112,10 @@
 int av_read_frame(AVFormatContext *s, AVPacket *pkt);
 
 /**
- * Seeks to the keyframe at timestamp.
+ * Seek to the keyframe at timestamp.
 * 'timestamp' in 'stream_index'.
+ *
+ * @param s media file handle
 * @param stream_index If stream_index is (-1), a default
 * stream is selected, and timestamp is automatically converted
 * from AV_TIME_BASE units to the stream specific time_base.
@@ -988,7 +2128,7 @@
 int flags);
 
 /**
- * Seeks to timestamp ts.
+ * Seek to timestamp ts.
 * Seeking will be done so that the point from which all active streams
 * can be presented successfully will be closest to ts and within min/max_ts.
 * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
@@ -1001,7 +2141,9 @@
 * or if stream_index is -1, in AV_TIME_BASE units.
 * If flags contain AVSEEK_FLAG_ANY, then non-keyframes are treated as
 * keyframes (this may not be supported by all demuxers).
+ * If flags contain AVSEEK_FLAG_BACKWARD, it is ignored.
 *
+ * @param s media file handle
 * @param stream_index index of the stream which is used as time base reference
 * @param min_ts smallest acceptable timestamp
 * @param ts target timestamp
@@ -1009,40 +2151,48 @@
 * @param flags flags
 * @return >=0 on success, error code otherwise
 *
- * @NOTE This is part of the new seek API which is still under construction.
+ * @note This is part of the new seek API which is still under construction.
 * Thus do not use this yet. It may change at any time, do not expect
 * ABI compatibility yet!
 */
 int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
 
 /**
- * Starts playing a network-based stream (e.g. RTSP stream) at the
+ * Start playing a network-based stream (e.g. RTSP stream) at the
 * current position.
 */
 int av_read_play(AVFormatContext *s);
 
 /**
- * Pauses a network-based stream (e.g. RTSP stream).
+ * Pause a network-based stream (e.g. RTSP stream).
 *
 * Use av_read_play() to resume it.
 */
 int av_read_pause(AVFormatContext *s);
 
+#if FF_API_CLOSE_INPUT_FILE
 /**
- * Frees a AVFormatContext allocated by av_open_input_stream.
- * @param s context to free
- */
-void av_close_input_stream(AVFormatContext *s);
-
-/**
- * Closes a media file (but not its codecs).
+ * @deprecated use avformat_close_input()
+ * Close a media file (but not its codecs).
 *
 * @param s media file handle
 */
+attribute_deprecated
 void av_close_input_file(AVFormatContext *s);
+#endif
+
+/**
+ * Close an opened input AVFormatContext. Free it and all its contents
+ * and set *s to NULL.
+ */
+void avformat_close_input(AVFormatContext **s);
+/**
+ * @}
+ */
 
+#if FF_API_NEW_STREAM
 /**
- * Adds a new stream to a media file.
+ * Add a new stream to a media file.
 *
 * Can only be called in the read_header() function. If the flag
 * AVFMTCTX_NOHEADER is in the format context, then new streams
@@ -1051,247 +2201,368 @@
 * @param s media file handle
 * @param id file-format-dependent stream ID
 */
+attribute_deprecated
 AVStream *av_new_stream(AVFormatContext *s, int id);
-AVProgram *av_new_program(AVFormatContext *s, int id);
-
-/**
- * Adds a new chapter.
- * This function is NOT part of the public API
- * and should ONLY be used by demuxers.
- *
- * @param s media file handle
- * @param id unique ID for this chapter
- * @param start chapter start time in time_base units
- * @param end chapter end time in time_base units
- * @param title chapter title
- *
- * @return AVChapter or NULL on error
- */
-AVChapter *ff_new_chapter(AVFormatContext *s, int id, AVRational time_base,
- int64_t start, int64_t end, const char *title);
+#endif
 
+#if FF_API_SET_PTS_INFO
 /**
- * Sets the pts for a given stream.
- *
- * @param s stream
- * @param pts_wrap_bits number of bits effectively used by the pts
- * (used for wrap control, 33 is the value for MPEG)
- * @param pts_num numerator to convert to seconds (MPEG: 1)
- * @param pts_den denominator to convert to seconds (MPEG: 90000)
+ * @deprecated this function is not supposed to be called outside of lavf
 */
+attribute_deprecated
 void av_set_pts_info(AVStream *s, int pts_wrap_bits,
 unsigned int pts_num, unsigned int pts_den);
+#endif
 
 #define AVSEEK_FLAG_BACKWARD 1 ///< seek backward
 #define AVSEEK_FLAG_BYTE 2 ///< seeking based on position in bytes
 #define AVSEEK_FLAG_ANY 4 ///< seek to any frame, even non-keyframes
 #define AVSEEK_FLAG_FRAME 8 ///< seeking based on frame number
 
-int av_find_default_stream_index(AVFormatContext *s);
-
 /**
- * Gets the index for a specific timestamp.
- * @param flags if AVSEEK_FLAG_BACKWARD then the returned index will correspond
- * to the timestamp which is <= the requested one, if backward
- * is 0, then it will be >=
- * if AVSEEK_FLAG_ANY seek to any frame, only keyframes otherwise
- * @return < 0 if no such timestamp could be found
+ * @addtogroup lavf_encoding
+ * @{
 */
-int av_index_search_timestamp(AVStream *st, int64_t timestamp, int flags);
-
 /**
- * Ensures the index uses less memory than the maximum specified in
- * AVFormatContext.max_index_size by discarding entries if it grows
- * too large.
- * This function is not part of the public API and should only be called
- * by demuxers.
+ * Allocate the stream private data and write the stream header to
+ * an output media file.
+ *
+ * @param s Media file handle, must be allocated with avformat_alloc_context().
+ * Its oformat field must be set to the desired output format;
+ * Its pb field must be set to an already opened AVIOContext.
+ * @param options An AVDictionary filled with AVFormatContext and muxer-private options.
+ * On return this parameter will be destroyed and replaced with a dict containing
+ * options that were not found. May be NULL.
+ *
+ * @return 0 on success, negative AVERROR on failure.
+ *
+ * @see av_opt_find, av_dict_set, avio_open, av_oformat_next.
 */
-void ff_reduce_index(AVFormatContext *s, int stream_index);
+int avformat_write_header(AVFormatContext *s, AVDictionary **options);
 
 /**
- * Adds an index entry into a sorted list. Updates the entry if the list
- * already contains it.
+ * Write a packet to an output media file.
 *
- * @param timestamp timestamp in the time base of the given stream
+ * This function passes the packet directly to the muxer, without any buffering
+ * or reordering. The caller is responsible for correctly interleaving the
+ * packets if the format requires it. Callers that want libavformat to handle
+ * the interleaving should call av_interleaved_write_frame() instead of this
+ * function.
+ *
+ * @param s media file handle
+ * @param pkt The packet containing the data to be written. Note that unlike
+ * av_interleaved_write_frame(), this function does not take
+ * ownership of the packet passed to it (though some muxers may make
+ * an internal reference to the input packet).
+ * 
+ * This parameter can be NULL (at any time, not just at the end), in
+ * order to immediately flush data buffered within the muxer, for
+ * muxers that buffer up data internally before writing it to the
+ * output.
+ * 
+ * Packet's @ref AVPacket.stream_index "stream_index" field must be
+ * set to the index of the corresponding stream in @ref
+ * AVFormatContext.streams "s->streams". It is very strongly
+ * recommended that timing information (@ref AVPacket.pts "pts", @ref
+ * AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to
+ * correct values.
+ * @return < 0 on error, = 0 if OK, 1 if flushed and there is no more data to flush
+ *
+ * @see av_interleaved_write_frame()
 */
-int av_add_index_entry(AVStream *st, int64_t pos, int64_t timestamp,
- int size, int distance, int flags);
+int av_write_frame(AVFormatContext *s, AVPacket *pkt);
 
 /**
- * Does a binary search using av_index_search_timestamp() and
- * AVCodec.read_timestamp().
- * This is not supposed to be called directly by a user application,
- * but by demuxers.
- * @param target_ts target timestamp in the time base of the given stream
- * @param stream_index stream number
+ * Write a packet to an output media file ensuring correct interleaving.
+ *
+ * This function will buffer the packets internally as needed to make sure the
+ * packets in the output file are properly interleaved in the order of
+ * increasing dts. Callers doing their own interleaving should call
+ * av_write_frame() instead of this function.
+ *
+ * @param s media file handle
+ * @param pkt The packet containing the data to be written.
+ * 
+ * If the packet is reference-counted, this function will take
+ * ownership of this reference and unreference it later when it sees
+ * fit.
+ * The caller must not access the data through this reference after
+ * this function returns. If the packet is not reference-counted,
+ * libavformat will make a copy.
+ * 
+ * This parameter can be NULL (at any time, not just at the end), to
+ * flush the interleaving queues.
+ * 
+ * Packet's @ref AVPacket.stream_index "stream_index" field must be
+ * set to the index of the corresponding stream in @ref
+ * AVFormatContext.streams "s->streams". It is very strongly
+ * recommended that timing information (@ref AVPacket.pts "pts", @ref
+ * AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to
+ * correct values.
+ *
+ * @return 0 on success, a negative AVERROR on error. Libavformat will always
+ * take care of freeing the packet, even if this function fails.
+ *
+ * @see av_write_frame(), AVFormatContext.max_interleave_delta
 */
-int av_seek_frame_binary(AVFormatContext *s, int stream_index,
- int64_t target_ts, int flags);
+int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
 
 /**
- * Updates cur_dts of all streams based on the given timestamp and AVStream.
+ * Write a uncoded frame to an output media file.
+ *
+ * The frame must be correctly interleaved according to the container
+ * specification; if not, then av_interleaved_write_frame() must be used.
 *
- * Stream ref_st unchanged, others set cur_dts in their native time base.
- * Only needed for timestamp wrapping or if (dts not set and pts!=dts).
- * @param timestamp new dts expressed in time_base of param ref_st
- * @param ref_st reference stream giving time_base of param timestamp
+ * See av_interleaved_write_frame() for details.
 */
-void av_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp);
+int av_write_uncoded_frame(AVFormatContext *s, int stream_index,
+ AVFrame *frame);
 
 /**
- * Does a binary search using read_timestamp().
- * This is not supposed to be called directly by a user application,
- * but by demuxers.
- * @param target_ts target timestamp in the time base of the given stream
- * @param stream_index stream number
+ * Write a uncoded frame to an output media file.
+ *
+ * If the muxer supports it, this function allows to write an AVFrame
+ * structure directly, without encoding it into a packet.
+ * It is mostly useful for devices and similar special muxers that use raw
+ * video or PCM data and will not serialize it into a byte stream.
+ *
+ * To test whether it is possible to use it with a given muxer and stream,
+ * use av_write_uncoded_frame_query().
+ *
+ * The caller gives up ownership of the frame and must not access it
+ * afterwards.
+ *
+ * @return >=0 for success, a negative code on error
 */
-int64_t av_gen_search(AVFormatContext *s, int stream_index,
- int64_t target_ts, int64_t pos_min,
- int64_t pos_max, int64_t pos_limit,
- int64_t ts_min, int64_t ts_max,
- int flags, int64_t *ts_ret,
- int64_t (*read_timestamp)(struct AVFormatContext *, int , int64_t *, int64_t ));
+int av_interleaved_write_uncoded_frame(AVFormatContext *s, int stream_index,
+ AVFrame *frame);
 
-/** media file output */
-int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap);
+/**
+ * Test whether a muxer supports uncoded frame.
+ *
+ * @return >=0 if an uncoded frame can be written to that muxer and stream,
+ * <0 if not
+ */
+int av_write_uncoded_frame_query(AVFormatContext *s, int stream_index);
 
 /**
- * Allocates the stream private data and writes the stream header to an
- * output media file.
+ * Write the stream trailer to an output media file and free the
+ * file private data.
+ *
+ * May only be called after a successful call to avformat_write_header.
 *
 * @param s media file handle
 * @return 0 if OK, AVERROR_xxx on error
 */
-int av_write_header(AVFormatContext *s);
+int av_write_trailer(AVFormatContext *s);
 
 /**
- * Writes a packet to an output media file.
+ * Return the output format in the list of registered output formats
+ * which best matches the provided parameters, or return NULL if
+ * there is no match.
 *
- * The packet shall contain one audio or video frame.
- * The packet must be correctly interleaved according to the container
- * specification, if not then av_interleaved_write_frame must be used.
+ * @param short_name if non-NULL checks if short_name matches with the
+ * names of the registered formats
+ * @param filename if non-NULL checks if filename terminates with the
+ * extensions of the registered formats
+ * @param mime_type if non-NULL checks if mime_type matches with the
+ * MIME type of the registered formats
+ */
+AVOutputFormat *av_guess_format(const char *short_name,
+ const char *filename,
+ const char *mime_type);
+
+/**
+ * Guess the codec ID based upon muxer and filename.
+ */
+enum AVCodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
+ const char *filename, const char *mime_type,
+ enum AVMediaType type);
+
+/**
+ * Get timing information for the data currently output.
+ * The exact meaning of "currently output" depends on the format.
+ * It is mostly relevant for devices that have an internal buffer and/or
+ * work in real time.
+ * @param s media file handle
+ * @param stream stream in the media file
+ * @param[out] dts DTS of the last packet output for the stream, in stream
+ * time_base units
+ * @param[out] wall absolute time when that packet whas output,
+ * in microsecond
+ * @return 0 if OK, AVERROR(ENOSYS) if the format does not support it
+ * Note: some formats or devices may not allow to measure dts and wall
+ * atomically.
+ */
+int av_get_output_timestamp(struct AVFormatContext *s, int stream,
+ int64_t *dts, int64_t *wall);
+
+
+/**
+ * @}
+ */
+
+
+/**
+ * @defgroup lavf_misc Utility functions
+ * @ingroup libavf
+ * @{
 *
- * @param s media file handle
- * @param pkt The packet, which contains the stream_index, buf/buf_size,
- dts/pts, ...
- * @return < 0 on error, = 0 if OK, 1 if end of stream wanted
+ * Miscellaneous utility functions related to both muxing and demuxing
+ * (or neither).
 */
-int av_write_frame(AVFormatContext *s, AVPacket *pkt);
 
 /**
- * Writes a packet to an output media file ensuring correct interleaving.
+ * Send a nice hexadecimal dump of a buffer to the specified file stream.
 *
- * The packet must contain one audio or video frame.
- * If the packets are already correctly interleaved, the application should
- * call av_write_frame() instead as it is slightly faster. It is also important
- * to keep in mind that completely non-interleaved input will need huge amounts
- * of memory to interleave with this, so it is preferable to interleave at the
- * demuxer level.
+ * @param f The file stream pointer where the dump should be sent to.
+ * @param buf buffer
+ * @param size buffer size
 *
- * @param s media file handle
- * @param pkt The packet, which contains the stream_index, buf/buf_size,
- dts/pts, ...
- * @return < 0 on error, = 0 if OK, 1 if end of stream wanted
+ * @see av_hex_dump_log, av_pkt_dump2, av_pkt_dump_log2
 */
-int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
+void av_hex_dump(FILE *f, const uint8_t *buf, int size);
 
 /**
- * Interleaves a packet per dts in an output media file.
+ * Send a nice hexadecimal dump of a buffer to the log.
 *
- * Packets with pkt->destruct == av_destruct_packet will be freed inside this
- * function, so they cannot be used after it. Note that calling av_free_packet()
- * on them is still safe.
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ * pointer to an AVClass struct.
+ * @param level The importance level of the message, lower values signifying
+ * higher importance.
+ * @param buf buffer
+ * @param size buffer size
 *
- * @param s media file handle
- * @param out the interleaved packet will be output here
- * @param in the input packet
- * @param flush 1 if no further packets are available as input and all
- * remaining packets should be output
- * @return 1 if a packet was output, 0 if no packet could be output,
- * < 0 if an error occurred
+ * @see av_hex_dump, av_pkt_dump2, av_pkt_dump_log2
 */
-int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
- AVPacket *pkt, int flush);
+void av_hex_dump_log(void *avcl, int level, const uint8_t *buf, int size);
 
 /**
- * Writes the stream trailer to an output media file and frees the
- * file private data.
+ * Send a nice dump of a packet to the specified file stream.
 *
- * May only be called after a successful call to av_write_header.
- *
- * @param s media file handle
- * @return 0 if OK, AVERROR_xxx on error
+ * @param f The file stream pointer where the dump should be sent to.
+ * @param pkt packet to dump
+ * @param dump_payload True if the payload must be displayed, too.
+ * @param st AVStream that the packet belongs to
 */
-int av_write_trailer(AVFormatContext *s);
+void av_pkt_dump2(FILE *f, const AVPacket *pkt, int dump_payload, const AVStream *st);
 
-void dump_format(AVFormatContext *ic,
- int index,
- const char *url,
- int is_output);
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
 /**
- * Parses width and height out of string str.
- * @deprecated Use av_parse_video_frame_size instead.
+ * Send a nice dump of a packet to the log.
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ * pointer to an AVClass struct.
+ * @param level The importance level of the message, lower values signifying
+ * higher importance.
+ * @param pkt packet to dump
+ * @param dump_payload True if the payload must be displayed, too.
+ * @param st AVStream that the packet belongs to
 */
-attribute_deprecated int parse_image_size(int *width_ptr, int *height_ptr,
- const char *str);
+void av_pkt_dump_log2(void *avcl, int level, const AVPacket *pkt, int dump_payload,
+ const AVStream *st);
 
 /**
- * Converts framerate from a string to a fraction.
- * @deprecated Use av_parse_video_frame_rate instead.
+ * Get the AVCodecID for the given codec tag tag.
+ * If no codec id is found returns AV_CODEC_ID_NONE.
+ *
+ * @param tags list of supported codec_id-codec_tag pairs, as stored
+ * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
+ * @param tag codec tag to match to a codec ID
 */
-attribute_deprecated int parse_frame_rate(int *frame_rate, int *frame_rate_base,
- const char *arg);
-#endif
+enum AVCodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag);
 
 /**
- * Parses datestr and returns a corresponding number of microseconds.
- * @param datestr String representing a date or a duration.
- * - If a date the syntax is:
- * @code
- * [{YYYY-MM-DD|YYYYMMDD}]{T| }{HH[:MM[:SS[.m...]]][Z]|HH[MM[SS[.m...]]][Z]}
- * @endcode
- * Time is local time unless Z is appended, in which case it is
- * interpreted as UTC.
- * If the year-month-day part is not specified it takes the current
- * year-month-day.
- * Returns the number of microseconds since 1st of January, 1970 up to
- * the time of the parsed date or INT64_MIN if datestr cannot be
- * successfully parsed.
- * - If a duration the syntax is:
- * @code
- * [-]HH[:MM[:SS[.m...]]]
- * [-]S+[.m...]
- * @endcode
- * Returns the number of microseconds contained in a time interval
- * with the specified duration or INT64_MIN if datestr cannot be
- * successfully parsed.
- * @param duration Flag which tells how to interpret datestr, if
- * not zero datestr is interpreted as a duration, otherwise as a
- * date.
+ * Get the codec tag for the given codec id id.
+ * If no codec tag is found returns 0.
+ *
+ * @param tags list of supported codec_id-codec_tag pairs, as stored
+ * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
+ * @param id codec ID to match to a codec tag
 */
-int64_t parse_date(const char *datestr, int duration);
+unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum AVCodecID id);
 
-/** Gets the current time in microseconds. */
-int64_t av_gettime(void);
+/**
+ * Get the codec tag for the given codec id.
+ *
+ * @param tags list of supported codec_id - codec_tag pairs, as stored
+ * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
+ * @param id codec id that should be searched for in the list
+ * @param tag A pointer to the found tag
+ * @return 0 if id was not found in tags, > 0 if it was found
+ */
+int av_codec_get_tag2(const struct AVCodecTag * const *tags, enum AVCodecID id,
+ unsigned int *tag);
 
-/* ffm-specific for ffserver */
-#define FFM_PACKET_SIZE 4096
-int64_t ffm_read_write_index(int fd);
-int ffm_write_write_index(int fd, int64_t pos);
-void ffm_set_write_index(AVFormatContext *s, int64_t pos, int64_t file_size);
+int av_find_default_stream_index(AVFormatContext *s);
 
 /**
- * Attempts to find a specific tag in a URL.
+ * Get the index for a specific timestamp.
 *
- * syntax: '?tag1=val1&tag2=val2...'. Little URL decoding is done.
- * Return 1 if found.
+ * @param st stream that the timestamp belongs to
+ * @param timestamp timestamp to retrieve the index for
+ * @param flags if AVSEEK_FLAG_BACKWARD then the returned index will correspond
+ * to the timestamp which is <= the requested one, if backward
+ * is 0, then it will be >=
+ * if AVSEEK_FLAG_ANY seek to any frame, only keyframes otherwise
+ * @return < 0 if no such timestamp could be found
 */
-int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
+int av_index_search_timestamp(AVStream *st, int64_t timestamp, int flags);
 
 /**
- * Returns in 'buf' the path with '%d' replaced by a number.
+ * Add an index entry into a sorted list. Update the entry if the list
+ * already contains it.
+ *
+ * @param timestamp timestamp in the time base of the given stream
+ */
+int av_add_index_entry(AVStream *st, int64_t pos, int64_t timestamp,
+ int size, int distance, int flags);
+
+
+/**
+ * Split a URL string into components.
+ *
+ * The pointers to buffers for storing individual components may be null,
+ * in order to ignore that component. Buffers for components not found are
+ * set to empty strings. If the port is not found, it is set to a negative
+ * value.
+ *
+ * @param proto the buffer for the protocol
+ * @param proto_size the size of the proto buffer
+ * @param authorization the buffer for the authorization
+ * @param authorization_size the size of the authorization buffer
+ * @param hostname the buffer for the host name
+ * @param hostname_size the size of the hostname buffer
+ * @param port_ptr a pointer to store the port number in
+ * @param path the buffer for the path
+ * @param path_size the size of the path buffer
+ * @param url the URL to split
+ */
+void av_url_split(char *proto, int proto_size,
+ char *authorization, int authorization_size,
+ char *hostname, int hostname_size,
+ int *port_ptr,
+ char *path, int path_size,
+ const char *url);
+
+
+/**
+ * Print detailed information about the input or output format, such as
+ * duration, bitrate, streams, container, programs, metadata, side data,
+ * codec and time base.
+ *
+ * @param ic the context to analyze
+ * @param index index of the stream to dump information about
+ * @param url the URL to print, such as source or destination file
+ * @param is_output Select whether the specified context is an input(0) or output(1)
+ */
+void av_dump_format(AVFormatContext *ic,
+ int index,
+ const char *url,
+ int is_output);
+
+/**
+ * Return in 'buf' the path with '%d' replaced by a number.
 *
 * Also handles the '%0nd' format where 'n' is the total number
 * of digits and '%%'.
@@ -1306,7 +2577,7 @@
 const char *path, int number);
 
 /**
- * Checks whether filename actually is a numbered sequence generator.
+ * Check whether filename actually is a numbered sequence generator.
 *
 * @param filename possible numbered sequence string
 * @return 1 if a valid numbered sequence string, 0 otherwise
@@ -1314,7 +2585,10 @@
 int av_filename_number_test(const char *filename);
 
 /**
- * Generates an SDP for an RTP session.
+ * Generate an SDP for an RTP session.
+ *
+ * Note, this overwrites the id values of AVStreams in the muxer contexts
+ * for getting unique dynamic payload types.
 *
 * @param ac array of AVFormatContexts describing the RTP streams. If the
 * array is composed by only one context, such context can contain
@@ -1322,19 +2596,118 @@
 * all the contexts in the array (an AVCodecContext per RTP stream)
 * must contain only one AVStream.
 * @param n_files number of AVCodecContexts contained in ac
- * @param buff buffer where the SDP will be stored (must be allocated by
- * the caller)
+ * @param buf buffer where the SDP will be stored (must be allocated by
+ * the caller)
 * @param size the size of the buffer
 * @return 0 if OK, AVERROR_xxx on error
 */
-int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size);
+int av_sdp_create(AVFormatContext *ac[], int n_files, char *buf, int size);
 
 /**
- * Returns a positive value if the given filename has one of the given
+ * Return a positive value if the given filename has one of the given
 * extensions, 0 otherwise.
 *
+ * @param filename file name to check against the given extensions
 * @param extensions a comma-separated list of filename extensions
 */
 int av_match_ext(const char *filename, const char *extensions);
 
+/**
+ * Test if the given container can store a codec.
+ *
+ * @param ofmt container to check for compatibility
+ * @param codec_id codec to potentially store in container
+ * @param std_compliance standards compliance level, one of FF_COMPLIANCE_*
+ *
+ * @return 1 if codec with ID codec_id can be stored in ofmt, 0 if it cannot.
+ * A negative number if this information is not available.
+ */
+int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id,
+ int std_compliance);
+
+/**
+ * @defgroup riff_fourcc RIFF FourCCs
+ * @{
+ * Get the tables mapping RIFF FourCCs to libavcodec AVCodecIDs. The tables are
+ * meant to be passed to av_codec_get_id()/av_codec_get_tag() as in the
+ * following code:
+ * @code
+ * uint32_t tag = MKTAG('H', '2', '6', '4');
+ * const struct AVCodecTag *table[] = { avformat_get_riff_video_tags(), 0 };
+ * enum AVCodecID id = av_codec_get_id(table, tag);
+ * @endcode
+ */
+/**
+ * @return the table mapping RIFF FourCCs for video to libavcodec AVCodecID.
+ */
+const struct AVCodecTag *avformat_get_riff_video_tags(void);
+/**
+ * @return the table mapping RIFF FourCCs for audio to AVCodecID.
+ */
+const struct AVCodecTag *avformat_get_riff_audio_tags(void);
+/**
+ * @return the table mapping MOV FourCCs for video to libavcodec AVCodecID.
+ */
+const struct AVCodecTag *avformat_get_mov_video_tags(void);
+/**
+ * @return the table mapping MOV FourCCs for audio to AVCodecID.
+ */
+const struct AVCodecTag *avformat_get_mov_audio_tags(void);
+
+/**
+ * @}
+ */
+
+/**
+ * Guess the sample aspect ratio of a frame, based on both the stream and the
+ * frame aspect ratio.
+ *
+ * Since the frame aspect ratio is set by the codec but the stream aspect ratio
+ * is set by the demuxer, these two may not be equal. This function tries to
+ * return the value that you should use if you would like to display the frame.
+ *
+ * Basic logic is to use the stream aspect ratio if it is set to something sane
+ * otherwise use the frame aspect ratio. This way a container setting, which is
+ * usually easy to modify can override the coded value in the frames.
+ *
+ * @param format the format context which the stream is part of
+ * @param stream the stream which the frame is part of
+ * @param frame the frame with the aspect ratio to be determined
+ * @return the guessed (valid) sample_aspect_ratio, 0/1 if no idea
+ */
+AVRational av_guess_sample_aspect_ratio(AVFormatContext *format, AVStream *stream, AVFrame *frame);
+
+/**
+ * Guess the frame rate, based on both the container and codec information.
+ *
+ * @param ctx the format context which the stream is part of
+ * @param stream the stream which the frame is part of
+ * @param frame the frame for which the frame rate should be determined, may be NULL
+ * @return the guessed (valid) frame rate, 0/1 if no idea
+ */
+AVRational av_guess_frame_rate(AVFormatContext *ctx, AVStream *stream, AVFrame *frame);
+
+/**
+ * Check if the stream st contained in s is matched by the stream specifier
+ * spec.
+ *
+ * See the "stream specifiers" chapter in the documentation for the syntax
+ * of spec.
+ *
+ * @return >0 if st is matched by spec;
+ * 0 if st is not matched by spec;
+ * AVERROR code if spec is invalid
+ *
+ * @note A stream specifier can match several streams in the format.
+ */
+int avformat_match_stream_specifier(AVFormatContext *s, AVStream *st,
+ const char *spec);
+
+int avformat_queue_attached_pictures(AVFormatContext *s);
+
+
+/**
+ * @}
+ */
+
 #endif /* AVFORMAT_AVFORMAT_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/ffmpeg_android/libavformat/avio.h -> gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavformat/avio.h Changed

@@ -21,189 +21,214 @@
 #define AVFORMAT_AVIO_H
 
 /**
- * @file libavformat/avio.h
- * unbuffered I/O operations
- *
- * @warning This file has to be considered an internal but installed
- * header, so it should not be directly included in your projects.
+ * @file
+ * @ingroup lavf_io
+ * Buffered I/O operations
 */
 
 #include <stdint.h>
 
 #include "libavutil/common.h"
+#include "libavutil/dict.h"
+#include "libavutil/log.h"
 
-/* unbuffered I/O */
+#include "libavformat/version.h"
 
-/**
- * URL Context.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(URLContext) must not be used outside libav*.
- */
-typedef struct URLContext {
-#if LIBAVFORMAT_VERSION_MAJOR >= 53
- const AVClass *av_class; ///< information for av_log(). Set by url_open().
-#endif
- struct URLProtocol *prot;
- int flags;
- int is_streamed; /**< true if streamed (no seek possible), default = false */
- int max_packet_size; /**< if non zero, the stream is packetized with this max packet size */
- void *priv_data;
- char *filename; /**< specified URL */
-} URLContext;
-
-typedef struct URLPollEntry {
- URLContext *handle;
- int events;
- int revents;
-} URLPollEntry;
-
-#define URL_RDONLY 0
-#define URL_WRONLY 1
-#define URL_RDWR 2
 
-typedef int URLInterruptCB(void);
-
-/**
- * Creates an URLContext for accessing to the resource indicated by
- * url, and opens it using the URLProtocol up.
- *
- * @param puc pointer to the location where, in case of success, the
- * function puts the pointer to the created URLContext
- * @param flags flags which control how the resource indicated by url
- * is to be opened
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
- */
-int url_open_protocol (URLContext **puc, struct URLProtocol *up,
- const char *url, int flags);
+#define AVIO_SEEKABLE_NORMAL 0x0001 /**< Seeking works like for a local file */
 
 /**
- * Creates an URLContext for accessing to the resource indicated by
- * url, and opens it.
+ * Callback for checking whether to abort blocking functions.
+ * AVERROR_EXIT is returned in this case by the interrupted
+ * function. During blocking operations, callback is called with
+ * opaque as parameter. If the callback returns 1, the
+ * blocking operation will be aborted.
 *
- * @param puc pointer to the location where, in case of success, the
- * function puts the pointer to the created URLContext
- * @param flags flags which control how the resource indicated by url
- * is to be opened
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
+ * No members can be added to this struct without a major bump, if
+ * new elements have been added after this struct in AVFormatContext
+ * or AVIOContext.
 */
-int url_open(URLContext **h, const char *url, int flags);
+typedef struct AVIOInterruptCB {
+ int (*callback)(void*);
+ void *opaque;
+} AVIOInterruptCB;
 
 /**
- * Reads up to size bytes from the resource accessed by h, and stores
- * the read bytes in buf.
+ * Bytestream IO Context.
+ * New fields can be added to the end with minor version bumps.
+ * Removal, reordering and changes to existing fields require a major
+ * version bump.
+ * sizeof(AVIOContext) must not be used outside libav*.
 *
- * @return The number of bytes actually read, or a negative value
- * corresponding to an AVERROR code in case of error. A value of zero
- * indicates that it is not possible to read more from the accessed
- * resource (except if the value of the size argument is also zero).
- */
-int url_read(URLContext *h, unsigned char *buf, int size);
+ * @note None of the function pointers in AVIOContext should be called
+ * directly, they should only be set by the client application
+ * when implementing custom I/O. Normally these are set to the
+ * function pointers specified in avio_alloc_context()
+ */
+typedef struct AVIOContext {
+ /**
+ * A class for private options.
+ *
+ * If this AVIOContext is created by avio_open2(), av_class is set and
+ * passes the options down to protocols.
+ *
+ * If this AVIOContext is manually allocated, then av_class may be set by
+ * the caller.
+ *
+ * warning -- this field can be NULL, be sure to not pass this AVIOContext
+ * to any av_opt_* functions in that case.
+ */
+ const AVClass *av_class;
+ unsigned char *buffer; /**< Start of the buffer. */
+ int buffer_size; /**< Maximum buffer size */
+ unsigned char *buf_ptr; /**< Current position in the buffer */
+ unsigned char *buf_end; /**< End of the data, may be less than
+ buffer+buffer_size if the read function returned
+ less data than requested, e.g. for streams where
+ no more data has been received yet. */
+ void *opaque; /**< A private pointer, passed to the read/write/seek/...
+ functions. */
+ int (*read_packet)(void *opaque, uint8_t *buf, int buf_size);
+ int (*write_packet)(void *opaque, uint8_t *buf, int buf_size);
+ int64_t (*seek)(void *opaque, int64_t offset, int whence);
+ int64_t pos; /**< position in the file of the current buffer */
+ int must_flush; /**< true if the next seek should flush */
+ int eof_reached; /**< true if eof reached */
+ int write_flag; /**< true if open for writing */
+ int max_packet_size;
+ unsigned long checksum;
+ unsigned char *checksum_ptr;
+ unsigned long (*update_checksum)(unsigned long checksum, const uint8_t *buf, unsigned int size);
+ int error; /**< contains the error code or 0 if no error happened */
+ /**
+ * Pause or resume playback for network streaming protocols - e.g. MMS.
+ */
+ int (*read_pause)(void *opaque, int pause);
+ /**
+ * Seek to a given timestamp in stream with the specified stream_index.
+ * Needed for some network streaming protocols which don't support seeking
+ * to byte position.
+ */
+ int64_t (*read_seek)(void *opaque, int stream_index,
+ int64_t timestamp, int flags);
+ /**
+ * A combination of AVIO_SEEKABLE_ flags or 0 when the stream is not seekable.
+ */
+ int seekable;
+
+ /**
+ * max filesize, used to limit allocations
+ * This field is internal to libavformat and access from outside is not allowed.
+ */
+ int64_t maxsize;
+
+ /**
+ * avio_read and avio_write should if possible be satisfied directly
+ * instead of going through a buffer, and avio_seek will always
+ * call the underlying seek function directly.
+ */
+ int direct;
+
+ /**
+ * Bytes read statistic
+ * This field is internal to libavformat and access from outside is not allowed.
+ */
+ int64_t bytes_read;
+
+ /**
+ * seek statistic
+ * This field is internal to libavformat and access from outside is not allowed.
+ */
+ int seek_count;
+
+ /**
+ * writeout statistic
+ * This field is internal to libavformat and access from outside is not allowed.
+ */
+ int writeout_count;
+
+ /**
+ * Original buffer size
+ * used internally after probing and ensure seekback to reset the buffer size
+ * This field is internal to libavformat and access from outside is not allowed.
+ */
+ int orig_buffer_size;
+} AVIOContext;
 
-/**
- * Read as many bytes as possible (up to size), calling the
- * read function multiple times if necessary.
- * Will also retry if the read function returns AVERROR(EAGAIN).
- * This makes special short-read handling in applications
- * unnecessary, if the return value is < size then it is
- * certain there was either an error or the end of file was reached.
- */
-int url_read_complete(URLContext *h, unsigned char *buf, int size);
-int url_write(URLContext *h, unsigned char *buf, int size);
+/* unbuffered I/O */
 
 /**
- * Changes the position that will be used by the next read/write
- * operation on the resource accessed by h.
+ * Return the name of the protocol that will handle the passed URL.
 *
- * @param pos specifies the new position to set
- * @param whence specifies how pos should be interpreted, it must be
- * one of SEEK_SET (seek from the beginning), SEEK_CUR (seek from the
- * current position), SEEK_END (seek from the end), or AVSEEK_SIZE
- * (return the filesize of the requested resource, pos is ignored).
- * @return a negative value corresponding to an AVERROR code in case
- * of failure, or the resulting file position, measured in bytes from
- * the beginning of the file. You can use this feature together with
- * SEEK_CUR to read the current file position.
- */
-int64_t url_seek(URLContext *h, int64_t pos, int whence);
-
-/**
- * Closes the resource accessed by the URLContext h, and frees the
- * memory used by it.
+ * NULL is returned if no protocol could be found for the given URL.
 *
- * @return a negative value if an error condition occurred, 0
- * otherwise
- */
-int url_close(URLContext *h);
-
-/**
- * Returns a non-zero value if the resource indicated by url
- * exists, 0 otherwise.
+ * @return Name of the protocol or NULL.
 */
-int url_exist(const char *url);
-
-int64_t url_filesize(URLContext *h);
+const char *avio_find_protocol_name(const char *url);
 
 /**
- * Return the file descriptor associated with this URL. For RTP, this
- * will return only the RTP file descriptor, not the RTCP file descriptor.
- * To get both, use rtp_get_file_handles().
+ * Return AVIO_FLAG_* access flags corresponding to the access permissions
+ * of the resource in url, or a negative value corresponding to an
+ * AVERROR code in case of failure. The returned access flags are
+ * masked by the value in flags.
 *
- * @return the file descriptor associated with this URL, or <0 on error.
+ * @note This function is intrinsically unsafe, in the sense that the
+ * checked resource may change its existence or permission status from
+ * one call to another. Thus you should not trust the returned value,
+ * unless you are sure that no other processes are accessing the
+ * checked resource.
 */
-int url_get_file_handle(URLContext *h);
+int avio_check(const char *url, int flags);
 
 /**
- * Return the maximum packet size associated to packetized file
- * handle. If the file is not packetized (stream like HTTP or file on
- * disk), then 0 is returned.
+ * Allocate and initialize an AVIOContext for buffered I/O. It must be later
+ * freed with av_free().
 *
- * @param h file handle
- * @return maximum packet size in bytes
- */
-int url_get_max_packet_size(URLContext *h);
-void url_get_filename(URLContext *h, char *buf, int buf_size);
-
-/**
- * The callback is called in blocking functions to test regulary if
- * asynchronous interruption is needed. AVERROR(EINTR) is returned
- * in this case by the interrupted function. 'NULL' means no interrupt
- * callback is given.
+ * @param buffer Memory block for input/output operations via AVIOContext.
+ * The buffer must be allocated with av_malloc() and friends.
+ * @param buffer_size The buffer size is very important for performance.
+ * For protocols with fixed blocksize it should be set to this blocksize.
+ * For others a typical size is a cache page, e.g. 4kb.
+ * @param write_flag Set to 1 if the buffer should be writable, 0 otherwise.
+ * @param opaque An opaque pointer to user-specific data.
+ * @param read_packet A function for refilling the buffer, may be NULL.
+ * @param write_packet A function for writing the buffer contents, may be NULL.
+ * The function may not change the input buffers content.
+ * @param seek A function for seeking to specified byte position, may be NULL.
+ *
+ * @return Allocated AVIOContext or NULL on failure.
 */
-void url_set_interrupt_cb(URLInterruptCB *interrupt_cb);
+AVIOContext *avio_alloc_context(
+ unsigned char *buffer,
+ int buffer_size,
+ int write_flag,
+ void *opaque,
+ int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
+ int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
+ int64_t (*seek)(void *opaque, int64_t offset, int whence));
 
-/* not implemented */
-int url_poll(URLPollEntry *poll_table, int n, int timeout);
+void avio_w8(AVIOContext *s, int b);
+void avio_write(AVIOContext *s, const unsigned char *buf, int size);
+void avio_wl64(AVIOContext *s, uint64_t val);
+void avio_wb64(AVIOContext *s, uint64_t val);
+void avio_wl32(AVIOContext *s, unsigned int val);
+void avio_wb32(AVIOContext *s, unsigned int val);
+void avio_wl24(AVIOContext *s, unsigned int val);
+void avio_wb24(AVIOContext *s, unsigned int val);
+void avio_wl16(AVIOContext *s, unsigned int val);
+void avio_wb16(AVIOContext *s, unsigned int val);
 
 /**
- * Pause and resume playing - only meaningful if using a network streaming
- * protocol (e.g. MMS).
- * @param pause 1 for pause, 0 for resume
+ * Write a NULL-terminated string.
+ * @return number of bytes written.
 */
-int av_url_read_pause(URLContext *h, int pause);
+int avio_put_str(AVIOContext *s, const char *str);
 
 /**
- * Seek to a given timestamp relative to some component stream.
- * Only meaningful if using a network streaming protocol (e.g. MMS.).
- * @param stream_index The stream index that the timestamp is relative to.
- * If stream_index is (-1) the timestamp should be in AV_TIME_BASE
- * units from the beginning of the presentation.
- * If a stream_index >= 0 is used and the protocol does not support
- * seeking based on component streams, the call will fail with ENOTSUP.
- * @param timestamp timestamp in AVStream.time_base units
- * or if there is no stream specified then in AV_TIME_BASE units.
- * @param flags Optional combination of AVSEEK_FLAG_BACKWARD, AVSEEK_FLAG_BYTE
- * and AVSEEK_FLAG_ANY. The protocol may silently ignore
- * AVSEEK_FLAG_BACKWARD and AVSEEK_FLAG_ANY, but AVSEEK_FLAG_BYTE will
- * fail with ENOTSUP if used and not supported.
- * @return >= 0 on success
- * @see AVInputFormat::read_seek
+ * Convert an UTF-8 string to UTF-16LE and write it.
+ * @return number of bytes written.
 */
-int64_t av_url_read_seek(URLContext *h, int stream_index,
- int64_t timestamp, int flags);
+int avio_put_str16le(AVIOContext *s, const char *str);
 
 /**
 * Passing this as the "whence" parameter to a seek function causes it to
@@ -214,312 +239,283 @@
 
 /**
 * Oring this flag as into the "whence" parameter to a seek function causes it to
- * seek by any means (like reopening and linear reading) or other normally unreasonble
- * means that can be extreemly slow.
+ * seek by any means (like reopening and linear reading) or other normally unreasonable
+ * means that can be extremely slow.
 * This may be ignored by the seek code.
 */
 #define AVSEEK_FORCE 0x20000
 
-typedef struct URLProtocol {
- const char *name;
- int (*url_open)(URLContext *h, const char *url, int flags);
- int (*url_read)(URLContext *h, unsigned char *buf, int size);
- int (*url_write)(URLContext *h, unsigned char *buf, int size);
- int64_t (*url_seek)(URLContext *h, int64_t pos, int whence);
- int (*url_close)(URLContext *h);
- struct URLProtocol *next;
- int (*url_read_pause)(URLContext *h, int pause);
- int64_t (*url_read_seek)(URLContext *h, int stream_index,
- int64_t timestamp, int flags);
- int (*url_get_file_handle)(URLContext *h);
-} URLProtocol;
-
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-extern URLProtocol *first_protocol;
-#endif
-
-extern URLInterruptCB *url_interrupt_cb;
-
 /**
- * If protocol is NULL, returns the first registered protocol,
- * if protocol is non-NULL, returns the next registered protocol after protocol,
- * or NULL if protocol is the last one.
+ * fseek() equivalent for AVIOContext.
+ * @return new position or AVERROR.
 */
-URLProtocol *av_protocol_next(URLProtocol *p);
+int64_t avio_seek(AVIOContext *s, int64_t offset, int whence);
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
 /**
- * @deprecated Use av_register_protocol() instead.
+ * Skip given number of bytes forward
+ * @return new position or AVERROR.
 */
-attribute_deprecated int register_protocol(URLProtocol *protocol);
-#endif
+int64_t avio_skip(AVIOContext *s, int64_t offset);
 
 /**
- * Registers the URLProtocol protocol.
+ * ftell() equivalent for AVIOContext.
+ * @return position or AVERROR.
 */
-int av_register_protocol(URLProtocol *protocol);
+static av_always_inline int64_t avio_tell(AVIOContext *s)
+{
+ return avio_seek(s, 0, SEEK_CUR);
+}
 
 /**
- * Bytestream IO Context.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(ByteIOContext) must not be used outside libav*.
+ * Get the filesize.
+ * @return filesize or AVERROR
 */
-typedef struct {
- unsigned char *buffer;
- int buffer_size;
- unsigned char *buf_ptr, *buf_end;
- void *opaque;
- int (*read_packet)(void *opaque, uint8_t *buf, int buf_size);
- int (*write_packet)(void *opaque, uint8_t *buf, int buf_size);
- int64_t (*seek)(void *opaque, int64_t offset, int whence);
- int64_t pos; /**< position in the file of the current buffer */
- int must_flush; /**< true if the next seek should flush */
- int eof_reached; /**< true if eof reached */
- int write_flag; /**< true if open for writing */
- int is_streamed;
- int max_packet_size;
- unsigned long checksum;
- unsigned char *checksum_ptr;
- unsigned long (*update_checksum)(unsigned long checksum, const uint8_t *buf, unsigned int size);
- int error; ///< contains the error code or 0 if no error happened
- int (*read_pause)(void *opaque, int pause);
- int64_t (*read_seek)(void *opaque, int stream_index,
- int64_t timestamp, int flags);
-} ByteIOContext;
+int64_t avio_size(AVIOContext *s);
 
-int init_put_byte(ByteIOContext *s,
- unsigned char *buffer,
- int buffer_size,
- int write_flag,
- void *opaque,
- int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
- int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
- int64_t (*seek)(void *opaque, int64_t offset, int whence));
-ByteIOContext *av_alloc_put_byte(
- unsigned char *buffer,
- int buffer_size,
- int write_flag,
- void *opaque,
- int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
- int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
- int64_t (*seek)(void *opaque, int64_t offset, int whence));
-
-void put_byte(ByteIOContext *s, int b);
-void put_buffer(ByteIOContext *s, const unsigned char *buf, int size);
-void put_le64(ByteIOContext *s, uint64_t val);
-void put_be64(ByteIOContext *s, uint64_t val);
-void put_le32(ByteIOContext *s, unsigned int val);
-void put_be32(ByteIOContext *s, unsigned int val);
-void put_le24(ByteIOContext *s, unsigned int val);
-void put_be24(ByteIOContext *s, unsigned int val);
-void put_le16(ByteIOContext *s, unsigned int val);
-void put_be16(ByteIOContext *s, unsigned int val);
-void put_tag(ByteIOContext *s, const char *tag);
+/**
+ * feof() equivalent for AVIOContext.
+ * @return non zero if and only if end of file
+ */
+int avio_feof(AVIOContext *s);
+#if FF_API_URL_FEOF
+/**
+ * @deprecated use avio_feof()
+ */
+attribute_deprecated
+int url_feof(AVIOContext *s);
+#endif
 
-void put_strz(ByteIOContext *s, const char *buf);
+/** @warning currently size is limited */
+int avio_printf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3);
 
 /**
- * fseek() equivalent for ByteIOContext.
- * @return new position or AVERROR.
+ * Force flushing of buffered data to the output s.
+ *
+ * Force the buffered data to be immediately written to the output,
+ * without to wait to fill the internal buffer.
 */
-int64_t url_fseek(ByteIOContext *s, int64_t offset, int whence);
+void avio_flush(AVIOContext *s);
 
 /**
- * Skip given number of bytes forward.
- * @param offset number of bytes
+ * Read size bytes from AVIOContext into buf.
+ * @return number of bytes read or AVERROR
 */
-void url_fskip(ByteIOContext *s, int64_t offset);
+int avio_read(AVIOContext *s, unsigned char *buf, int size);
 
 /**
- * ftell() equivalent for ByteIOContext.
- * @return position or AVERROR.
+ * @name Functions for reading from AVIOContext
+ * @{
+ *
+ * @note return 0 if EOF, so you cannot use it if EOF handling is
+ * necessary
 */
-int64_t url_ftell(ByteIOContext *s);
-
+int avio_r8 (AVIOContext *s);
+unsigned int avio_rl16(AVIOContext *s);
+unsigned int avio_rl24(AVIOContext *s);
+unsigned int avio_rl32(AVIOContext *s);
+uint64_t avio_rl64(AVIOContext *s);
+unsigned int avio_rb16(AVIOContext *s);
+unsigned int avio_rb24(AVIOContext *s);
+unsigned int avio_rb32(AVIOContext *s);
+uint64_t avio_rb64(AVIOContext *s);
 /**
- * Gets the filesize.
- * @return filesize or AVERROR
+ * @}
 */
-int64_t url_fsize(ByteIOContext *s);
 
 /**
- * feof() equivalent for ByteIOContext.
- * @return non zero if and only if end of file
+ * Read a string from pb into buf. The reading will terminate when either
+ * a NULL character was encountered, maxlen bytes have been read, or nothing
+ * more can be read from pb. The result is guaranteed to be NULL-terminated, it
+ * will be truncated if buf is too small.
+ * Note that the string is not interpreted or validated in any way, it
+ * might get truncated in the middle of a sequence for multi-byte encodings.
+ *
+ * @return number of bytes read (is always <= maxlen).
+ * If reading ends on EOF or error, the return value will be one more than
+ * bytes actually read.
 */
-int url_feof(ByteIOContext *s);
-
-int url_ferror(ByteIOContext *s);
-
-int av_url_read_fpause(ByteIOContext *h, int pause);
-int64_t av_url_read_fseek(ByteIOContext *h, int stream_index,
- int64_t timestamp, int flags);
+int avio_get_str(AVIOContext *pb, int maxlen, char *buf, int buflen);
 
-#define URL_EOF (-1)
-/** @note return URL_EOF (-1) if EOF */
-int url_fgetc(ByteIOContext *s);
-
-/** @warning currently size is limited */
-#ifdef __GNUC__
-int url_fprintf(ByteIOContext *s, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
-#else
-int url_fprintf(ByteIOContext *s, const char *fmt, ...);
-#endif
-
-/** @note unlike fgets, the EOL character is not returned and a whole
- line is parsed. return NULL if first char read was EOF */
-char *url_fgets(ByteIOContext *s, char *buf, int buf_size);
-
-void put_flush_packet(ByteIOContext *s);
+/**
+ * Read a UTF-16 string from pb and convert it to UTF-8.
+ * The reading will terminate when either a null or invalid character was
+ * encountered or maxlen bytes have been read.
+ * @return number of bytes read (is always <= maxlen)
+ */
+int avio_get_str16le(AVIOContext *pb, int maxlen, char *buf, int buflen);
+int avio_get_str16be(AVIOContext *pb, int maxlen, char *buf, int buflen);
 
 
 /**
- * Reads size bytes from ByteIOContext into buf.
- * @return number of bytes read or AVERROR
+ * @name URL open modes
+ * The flags argument to avio_open must be one of the following
+ * constants, optionally ORed with other flags.
+ * @{
 */
-int get_buffer(ByteIOContext *s, unsigned char *buf, int size);
-
+#define AVIO_FLAG_READ 1 /**< read-only */
+#define AVIO_FLAG_WRITE 2 /**< write-only */
+#define AVIO_FLAG_READ_WRITE (AVIO_FLAG_READ|AVIO_FLAG_WRITE) /**< read-write pseudo flag */
 /**
- * Reads size bytes from ByteIOContext into buf.
- * This reads at most 1 packet. If that is not enough fewer bytes will be
- * returned.
- * @return number of bytes read or AVERROR
+ * @}
 */
-int get_partial_buffer(ByteIOContext *s, unsigned char *buf, int size);
-
-/** @note return 0 if EOF, so you cannot use it if EOF handling is
- necessary */
-int get_byte(ByteIOContext *s);
-unsigned int get_le24(ByteIOContext *s);
-unsigned int get_le32(ByteIOContext *s);
-uint64_t get_le64(ByteIOContext *s);
-unsigned int get_le16(ByteIOContext *s);
-
-char *get_strz(ByteIOContext *s, char *buf, int maxlen);
-unsigned int get_be16(ByteIOContext *s);
-unsigned int get_be24(ByteIOContext *s);
-unsigned int get_be32(ByteIOContext *s);
-uint64_t get_be64(ByteIOContext *s);
-
-uint64_t ff_get_v(ByteIOContext *bc);
-
-static inline int url_is_streamed(ByteIOContext *s)
-{
- return s->is_streamed;
-}
 
 /**
- * Creates and initializes a ByteIOContext for accessing the
- * resource referenced by the URLContext h.
- * @note When the URLContext h has been opened in read+write mode, the
- * ByteIOContext can be used only for writing.
- *
- * @param s Used to return the pointer to the created ByteIOContext.
- * In case of failure the pointed to value is set to NULL.
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
+ * Use non-blocking mode.
+ * If this flag is set, operations on the context will return
+ * AVERROR(EAGAIN) if they can not be performed immediately.
+ * If this flag is not set, operations on the context will never return
+ * AVERROR(EAGAIN).
+ * Note that this flag does not affect the opening/connecting of the
+ * context. Connecting a protocol will always block if necessary (e.g. on
+ * network protocols) but never hang (e.g. on busy devices).
+ * Warning: non-blocking protocols is work-in-progress; this flag may be
+ * silently ignored.
 */
-int url_fdopen(ByteIOContext **s, URLContext *h);
+#define AVIO_FLAG_NONBLOCK 8
 
-/** @warning must be called before any I/O */
-int url_setbufsize(ByteIOContext *s, int buf_size);
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-/** Reset the buffer for reading or writing.
- * @note Will drop any data currently in the buffer without transmitting it.
- * @param flags URL_RDONLY to set up the buffer for reading, or URL_WRONLY
- * to set up the buffer for writing. */
-int url_resetbuf(ByteIOContext *s, int flags);
-#endif
+/**
+ * Use direct mode.
+ * avio_read and avio_write should if possible be satisfied directly
+ * instead of going through a buffer, and avio_seek will always
+ * call the underlying seek function directly.
+ */
+#define AVIO_FLAG_DIRECT 0x8000
 
 /**
- * Rewinds the ByteIOContext using the specified buffer containing the first buf_size bytes of the file.
- * Used after probing to avoid seeking.
- * Joins buf and s->buffer, taking any overlap into consideration.
- * @note s->buffer must overlap with buf or they can't be joined and the function fails
- * @note This function is NOT part of the public API
+ * Create and initialize a AVIOContext for accessing the
+ * resource indicated by url.
+ * @note When the resource indicated by url has been opened in
+ * read+write mode, the AVIOContext can be used only for writing.
 *
- * @param s The read-only ByteIOContext to rewind
- * @param buf The probe buffer containing the first buf_size bytes of the file
- * @param buf_size The size of buf
- * @return 0 in case of success, a negative value corresponding to an
+ * @param s Used to return the pointer to the created AVIOContext.
+ * In case of failure the pointed to value is set to NULL.
+ * @param url resource to access
+ * @param flags flags which control how the resource indicated by url
+ * is to be opened
+ * @return >= 0 in case of success, a negative value corresponding to an
 * AVERROR code in case of failure
 */
-int ff_rewind_with_probe_data(ByteIOContext *s, unsigned char *buf, int buf_size);
+int avio_open(AVIOContext **s, const char *url, int flags);
 
 /**
- * Creates and initializes a ByteIOContext for accessing the
+ * Create and initialize a AVIOContext for accessing the
 * resource indicated by url.
 * @note When the resource indicated by url has been opened in
- * read+write mode, the ByteIOContext can be used only for writing.
+ * read+write mode, the AVIOContext can be used only for writing.
 *
- * @param s Used to return the pointer to the created ByteIOContext.
+ * @param s Used to return the pointer to the created AVIOContext.
 * In case of failure the pointed to value is set to NULL.
+ * @param url resource to access
 * @param flags flags which control how the resource indicated by url
 * is to be opened
- * @return 0 in case of success, a negative value corresponding to an
+ * @param int_cb an interrupt callback to be used at the protocols level
+ * @param options A dictionary filled with protocol-private options. On return
+ * this parameter will be destroyed and replaced with a dict containing options
+ * that were not found. May be NULL.
+ * @return >= 0 in case of success, a negative value corresponding to an
 * AVERROR code in case of failure
 */
-int url_fopen(ByteIOContext **s, const char *url, int flags);
-
-int url_fclose(ByteIOContext *s);
-URLContext *url_fileno(ByteIOContext *s);
+int avio_open2(AVIOContext **s, const char *url, int flags,
+ const AVIOInterruptCB *int_cb, AVDictionary **options);
 
 /**
- * Return the maximum packet size associated to packetized buffered file
- * handle. If the file is not packetized (stream like http or file on
- * disk), then 0 is returned.
+ * Close the resource accessed by the AVIOContext s and free it.
+ * This function can only be used if s was opened by avio_open().
 *
- * @param s buffered file handle
- * @return maximum packet size in bytes
+ * The internal buffer is automatically flushed before closing the
+ * resource.
+ *
+ * @return 0 on success, an AVERROR < 0 on error.
+ * @see avio_closep
 */
-int url_fget_max_packet_size(ByteIOContext *s);
-
-int url_open_buf(ByteIOContext **s, uint8_t *buf, int buf_size, int flags);
-
-/** return the written or read size */
-int url_close_buf(ByteIOContext *s);
+int avio_close(AVIOContext *s);
 
 /**
- * Open a write only memory stream.
+ * Close the resource accessed by the AVIOContext *s, free it
+ * and set the pointer pointing to it to NULL.
+ * This function can only be used if s was opened by avio_open().
 *
- * @param s new IO context
- * @return zero if no error.
+ * The internal buffer is automatically flushed before closing the
+ * resource.
+ *
+ * @return 0 on success, an AVERROR < 0 on error.
+ * @see avio_close
 */
-int url_open_dyn_buf(ByteIOContext **s);
+int avio_closep(AVIOContext **s);
+
 
 /**
- * Open a write only packetized memory stream with a maximum packet
- * size of 'max_packet_size'. The stream is stored in a memory buffer
- * with a big endian 4 byte header giving the packet size in bytes.
+ * Open a write only memory stream.
 *
 * @param s new IO context
- * @param max_packet_size maximum packet size (must be > 0)
 * @return zero if no error.
 */
-int url_open_dyn_packet_buf(ByteIOContext **s, int max_packet_size);
+int avio_open_dyn_buf(AVIOContext **s);
 
 /**
 * Return the written size and a pointer to the buffer. The buffer
- * must be freed with av_free().
+ * must be freed with av_free().
+ * Padding of FF_INPUT_BUFFER_PADDING_SIZE is added to the buffer.
+ *
 * @param s IO context
 * @param pbuffer pointer to a byte buffer
 * @return the length of the byte buffer
 */
-int url_close_dyn_buf(ByteIOContext *s, uint8_t **pbuffer);
+int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer);
 
-unsigned long ff_crc04C11DB7_update(unsigned long checksum, const uint8_t *buf,
- unsigned int len);
-unsigned long get_checksum(ByteIOContext *s);
-void init_checksum(ByteIOContext *s,
- unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len),
- unsigned long checksum);
+/**
+ * Iterate through names of available protocols.
+ *
+ * @param opaque A private pointer representing current protocol.
+ * It must be a pointer to NULL on first iteration and will
+ * be updated by successive calls to avio_enum_protocols.
+ * @param output If set to 1, iterate over output protocols,
+ * otherwise over input protocols.
+ *
+ * @return A static string containing the name of current protocol or NULL
+ */
+const char *avio_enum_protocols(void **opaque, int output);
 
-/* udp.c */
-int udp_set_remote_url(URLContext *h, const char *uri);
-int udp_get_local_port(URLContext *h);
-#if (LIBAVFORMAT_VERSION_MAJOR <= 52)
-int udp_get_file_handle(URLContext *h);
-#endif
+/**
+ * Pause and resume playing - only meaningful if using a network streaming
+ * protocol (e.g. MMS).
+ *
+ * @param h IO context from which to call the read_pause function pointer
+ * @param pause 1 for pause, 0 for resume
+ */
+int avio_pause(AVIOContext *h, int pause);
+
+/**
+ * Seek to a given timestamp relative to some component stream.
+ * Only meaningful if using a network streaming protocol (e.g. MMS.).
+ *
+ * @param h IO context from which to call the seek function pointers
+ * @param stream_index The stream index that the timestamp is relative to.
+ * If stream_index is (-1) the timestamp should be in AV_TIME_BASE
+ * units from the beginning of the presentation.
+ * If a stream_index >= 0 is used and the protocol does not support
+ * seeking based on component streams, the call will fail.
+ * @param timestamp timestamp in AVStream.time_base units
+ * or if there is no stream specified then in AV_TIME_BASE units.
+ * @param flags Optional combination of AVSEEK_FLAG_BACKWARD, AVSEEK_FLAG_BYTE
+ * and AVSEEK_FLAG_ANY. The protocol may silently ignore
+ * AVSEEK_FLAG_BACKWARD and AVSEEK_FLAG_ANY, but AVSEEK_FLAG_BYTE will
+ * fail if used and not supported.
+ * @return >= 0 on success
+ * @see AVInputFormat::read_seek
+ */
+int64_t avio_seek_time(AVIOContext *h, int stream_index,
+ int64_t timestamp, int flags);
+
+/* Avoid a warning. The header can not be included because it breaks c++. */
+struct AVBPrint;
+
+/**
+ * Read contents of h into print buffer, up to max_size bytes, or up to EOF.
+ *
+ * @return 0 for success (max_size bytes read or EOF reached), negative error
+ * code otherwise
+ */
+int avio_read_to_bprint(AVIOContext *h, struct AVBPrint *pb, size_t max_size);
 
 #endif /* AVFORMAT_AVIO_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavformat/version.h Added

@@ -0,0 +1,170 @@
+/*
+ * Version macros.
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFORMAT_VERSION_H
+#define AVFORMAT_VERSION_H
+
+/**
+ * @file
+ * @ingroup libavf
+ * Libavformat version macros
+ */
+
+#include "libavutil/version.h"
+
+#define LIBAVFORMAT_VERSION_MAJOR 56
+#define LIBAVFORMAT_VERSION_MINOR 4
+#define LIBAVFORMAT_VERSION_MICRO 101
+
+#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
+ LIBAVFORMAT_VERSION_MINOR, \
+ LIBAVFORMAT_VERSION_MICRO)
+#define LIBAVFORMAT_VERSION AV_VERSION(LIBAVFORMAT_VERSION_MAJOR, \
+ LIBAVFORMAT_VERSION_MINOR, \
+ LIBAVFORMAT_VERSION_MICRO)
+#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT
+
+#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
+
+/**
+ * FF_API_* defines may be placed below to indicate public API that will be
+ * dropped at a future version bump. The defines themselves are not part of
+ * the public API and may change, break or disappear at any time.
+ */
+#ifndef FF_API_LAVF_BITEXACT
+#define FF_API_LAVF_BITEXACT (LIBAVFORMAT_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_LAVF_FRAC
+#define FF_API_LAVF_FRAC (LIBAVFORMAT_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_LAVF_CODEC_TB
+#define FF_API_LAVF_CODEC_TB (LIBAVFORMAT_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_URL_FEOF
+#define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 57)
+#endif
+
+#ifndef FF_API_ALLOC_OUTPUT_CONTEXT
+#define FF_API_ALLOC_OUTPUT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_FORMAT_PARAMETERS
+#define FF_API_FORMAT_PARAMETERS (LIBAVFORMAT_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_NEW_STREAM
+#define FF_API_NEW_STREAM (LIBAVFORMAT_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_SET_PTS_INFO
+#define FF_API_SET_PTS_INFO (LIBAVFORMAT_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_CLOSE_INPUT_FILE
+#define FF_API_CLOSE_INPUT_FILE (LIBAVFORMAT_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_READ_PACKET
+#define FF_API_READ_PACKET (LIBAVFORMAT_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_R_FRAME_RATE
+#define FF_API_R_FRAME_RATE 1
+#endif
+#endif /* AVFORMAT_VERSION_H */
+/*
+ * Version macros.
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFORMAT_VERSION_H
+#define AVFORMAT_VERSION_H
+
+/**
+ * @file
+ * @ingroup libavf
+ * Libavformat version macros
+ */
+
+#include "libavutil/version.h"
+
+#define LIBAVFORMAT_VERSION_MAJOR 56
+#define LIBAVFORMAT_VERSION_MINOR 4
+#define LIBAVFORMAT_VERSION_MICRO 101
+
+#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
+ LIBAVFORMAT_VERSION_MINOR, \
+ LIBAVFORMAT_VERSION_MICRO)
+#define LIBAVFORMAT_VERSION AV_VERSION(LIBAVFORMAT_VERSION_MAJOR, \
+ LIBAVFORMAT_VERSION_MINOR, \
+ LIBAVFORMAT_VERSION_MICRO)
+#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT
+
+#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
+
+/**
+ * FF_API_* defines may be placed below to indicate public API that will be
+ * dropped at a future version bump. The defines themselves are not part of
+ * the public API and may change, break or disappear at any time.
+ */
+#ifndef FF_API_LAVF_BITEXACT
+#define FF_API_LAVF_BITEXACT (LIBAVFORMAT_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_LAVF_FRAC
+#define FF_API_LAVF_FRAC (LIBAVFORMAT_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_LAVF_CODEC_TB
+#define FF_API_LAVF_CODEC_TB (LIBAVFORMAT_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_URL_FEOF
+#define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 57)
+#endif
+
+#ifndef FF_API_ALLOC_OUTPUT_CONTEXT
+#define FF_API_ALLOC_OUTPUT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_FORMAT_PARAMETERS
+#define FF_API_FORMAT_PARAMETERS (LIBAVFORMAT_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_NEW_STREAM
+#define FF_API_NEW_STREAM (LIBAVFORMAT_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_SET_PTS_INFO
+#define FF_API_SET_PTS_INFO (LIBAVFORMAT_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_CLOSE_INPUT_FILE
+#define FF_API_CLOSE_INPUT_FILE (LIBAVFORMAT_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_READ_PACKET
+#define FF_API_READ_PACKET (LIBAVFORMAT_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_R_FRAME_RATE
+#define FF_API_R_FRAME_RATE 1
+#endif
+#endif /* AVFORMAT_VERSION_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/adler32.h Added

@@ -0,0 +1,110 @@
+/*
+ * copyright (c) 2006 Mans Rullgard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_ADLER32_H
+#define AVUTIL_ADLER32_H
+
+#include <stdint.h>
+#include "attributes.h"
+
+/**
+ * @file
+ * Public header for libavutil Adler32 hasher
+ *
+ * @defgroup lavu_adler32 Adler32
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+/**
+ * Calculate the Adler32 checksum of a buffer.
+ *
+ * Passing the return value to a subsequent av_adler32_update() call
+ * allows the checksum of multiple buffers to be calculated as though
+ * they were concatenated.
+ *
+ * @param adler initial checksum value
+ * @param buf pointer to input buffer
+ * @param len size of input buffer
+ * @return updated checksum
+ */
+unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf,
+ unsigned int len) av_pure;
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_ADLER32_H */
+/*
+ * copyright (c) 2006 Mans Rullgard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_ADLER32_H
+#define AVUTIL_ADLER32_H
+
+#include <stdint.h>
+#include "attributes.h"
+
+/**
+ * @file
+ * Public header for libavutil Adler32 hasher
+ *
+ * @defgroup lavu_adler32 Adler32
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+/**
+ * Calculate the Adler32 checksum of a buffer.
+ *
+ * Passing the return value to a subsequent av_adler32_update() call
+ * allows the checksum of multiple buffers to be calculated as though
+ * they were concatenated.
+ *
+ * @param adler initial checksum value
+ * @param buf pointer to input buffer
+ * @param len size of input buffer
+ * @return updated checksum
+ */
+unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf,
+ unsigned int len) av_pure;
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_ADLER32_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/aes.h Added

@@ -0,0 +1,130 @@
+/*
+ * copyright (c) 2007 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_AES_H
+#define AVUTIL_AES_H
+
+#include <stdint.h>
+
+#include "attributes.h"
+#include "version.h"
+
+/**
+ * @defgroup lavu_aes AES
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+extern const int av_aes_size;
+
+struct AVAES;
+
+/**
+ * Allocate an AVAES context.
+ */
+struct AVAES *av_aes_alloc(void);
+
+/**
+ * Initialize an AVAES context.
+ * @param key_bits 128, 192 or 256
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ * @param count number of 16 byte blocks
+ * @param dst destination array, can be equal to src
+ * @param src source array, can be equal to dst
+ * @param iv initialization vector for CBC mode, if NULL then ECB will be used
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_aes_crypt(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_AES_H */
+/*
+ * copyright (c) 2007 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_AES_H
+#define AVUTIL_AES_H
+
+#include <stdint.h>
+
+#include "attributes.h"
+#include "version.h"
+
+/**
+ * @defgroup lavu_aes AES
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+extern const int av_aes_size;
+
+struct AVAES;
+
+/**
+ * Allocate an AVAES context.
+ */
+struct AVAES *av_aes_alloc(void);
+
+/**
+ * Initialize an AVAES context.
+ * @param key_bits 128, 192 or 256
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ * @param count number of 16 byte blocks
+ * @param dst destination array, can be equal to src
+ * @param src source array, can be equal to dst
+ * @param iv initialization vector for CBC mode, if NULL then ECB will be used
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_aes_crypt(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_AES_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/ffmpeg_android/libavutil/attributes.h -> gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/attributes.h Changed

@@ -19,7 +19,7 @@
  */
 
 /**
- * @file libavutil/attributes.h
+ * @file
  * Macro definitions for various function/variable attributes
  */
 
@@ -35,79 +35,126 @@
 #ifndef av_always_inline
 #if AV_GCC_VERSION_AT_LEAST(3,1)
 #    define av_always_inline __attribute__((always_inline)) inline
+#elif defined(_MSC_VER)
+#    define av_always_inline __forceinline
 #else
 #    define av_always_inline inline
 #endif
 #endif
 
-#ifndef av_noinline
+#ifndef av_extern_inline
+#if defined(__ICL) && __ICL >= 1210 || defined(__GNUC_STDC_INLINE__)
+#    define av_extern_inline extern inline
+#else
+#    define av_extern_inline inline
+#endif
+#endif
+
 #if AV_GCC_VERSION_AT_LEAST(3,1)
 #    define av_noinline __attribute__((noinline))
+#elif defined(_MSC_VER)
+#    define av_noinline __declspec(noinline)
 #else
 #    define av_noinline
 #endif
-#endif
 
-#ifndef av_pure
 #if AV_GCC_VERSION_AT_LEAST(3,1)
 #    define av_pure __attribute__((pure))
 #else
 #    define av_pure
 #endif
-#endif
 
-#ifndef av_const
 #if AV_GCC_VERSION_AT_LEAST(2,6)
 #    define av_const __attribute__((const))
 #else
 #    define av_const
 #endif
-#endif
 
-#ifndef av_cold
-#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3)
+#if AV_GCC_VERSION_AT_LEAST(4,3)
 #    define av_cold __attribute__((cold))
 #else
 #    define av_cold
 #endif
-#endif
 
-#ifndef av_flatten
-#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,1)
+#if AV_GCC_VERSION_AT_LEAST(4,1) && !defined(__llvm__)
 #    define av_flatten __attribute__((flatten))
 #else
 #    define av_flatten
 #endif
-#endif
 
-#ifndef attribute_deprecated
 #if AV_GCC_VERSION_AT_LEAST(3,1)
 #    define attribute_deprecated __attribute__((deprecated))
+#elif defined(_MSC_VER)
+#    define attribute_deprecated __declspec(deprecated)
 #else
 #    define attribute_deprecated
 #endif
+
+/**
+ * Disable warnings about deprecated features
+ * This is useful for sections of code kept for backward compatibility and
+ * scheduled for removal.
+ */
+#ifndef AV_NOWARN_DEPRECATED
+#if AV_GCC_VERSION_AT_LEAST(4,6)
+#    define AV_NOWARN_DEPRECATED(code) \
+        _Pragma("GCC diagnostic push") \
+        _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \
+        code \
+        _Pragma("GCC diagnostic pop")
+#elif defined(_MSC_VER)
+#    define AV_NOWARN_DEPRECATED(code) \
+        __pragma(warning(push)) \
+        __pragma(warning(disable : 4996)) \
+        code; \
+        __pragma(warning(pop))
+#else
+#    define AV_NOWARN_DEPRECATED(code) code
+#endif
 #endif
 
-#ifndef av_unused
+
 #if defined(__GNUC__)
 #    define av_unused __attribute__((unused))
 #else
 #    define av_unused
 #endif
+
+/**
+ * Mark a variable as used and prevent the compiler from optimizing it
+ * away.  This is useful for variables accessed only from inline
+ * assembler without the compiler being aware.
+ */
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define av_used __attribute__((used))
+#else
+#    define av_used
 #endif
 
-#ifndef av_uninit
-#if defined(__GNUC__) && !defined(__ICC)
+#if AV_GCC_VERSION_AT_LEAST(3,3)
+#   define av_alias __attribute__((may_alias))
+#else
+#   define av_alias
+#endif
+
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(__clang__)
 #    define av_uninit(x) x=x
 #else
 #    define av_uninit(x) x
 #endif
-#endif
 
 #ifdef __GNUC__
 #    define av_builtin_constant_p __builtin_constant_p
+#    define av_printf_format(fmtpos, attrpos) __attribute__((__format__(__printf__, fmtpos, attrpos)))
 #else
 #    define av_builtin_constant_p(x) 0
+#    define av_printf_format(fmtpos, attrpos)
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(2,5)
+#    define av_noreturn __attribute__((noreturn))
+#else
+#    define av_noreturn
 #endif
 
 #endif /* AVUTIL_ATTRIBUTES_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/audio_fifo.h Added

@@ -0,0 +1,306 @@
+/*
+ * Audio FIFO
+ * Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Audio FIFO Buffer
+ */
+
+#ifndef AVUTIL_AUDIO_FIFO_H
+#define AVUTIL_AUDIO_FIFO_H
+
+#include "avutil.h"
+#include "fifo.h"
+#include "samplefmt.h"
+
+/**
+ * @addtogroup lavu_audio
+ * @{
+ *
+ * @defgroup lavu_audiofifo Audio FIFO Buffer
+ * @{
+ */
+
+/**
+ * Context for an Audio FIFO Buffer.
+ *
+ * - Operates at the sample level rather than the byte level.
+ * - Supports multiple channels with either planar or packed sample format.
+ * - Automatic reallocation when writing to a full buffer.
+ */
+typedef struct AVAudioFifo AVAudioFifo;
+
+/**
+ * Free an AVAudioFifo.
+ *
+ * @param af AVAudioFifo to free
+ */
+void av_audio_fifo_free(AVAudioFifo *af);
+
+/**
+ * Allocate an AVAudioFifo.
+ *
+ * @param sample_fmt sample format
+ * @param channels number of channels
+ * @param nb_samples initial allocation size, in samples
+ * @return newly allocated AVAudioFifo, or NULL on error
+ */
+AVAudioFifo *av_audio_fifo_alloc(enum AVSampleFormat sample_fmt, int channels,
+ int nb_samples);
+
+/**
+ * Reallocate an AVAudioFifo.
+ *
+ * @param af AVAudioFifo to reallocate
+ * @param nb_samples new allocation size, in samples
+ * @return 0 if OK, or negative AVERROR code on failure
+ */
+int av_audio_fifo_realloc(AVAudioFifo *af, int nb_samples);
+
+/**
+ * Write data to an AVAudioFifo.
+ *
+ * The AVAudioFifo will be reallocated automatically if the available space
+ * is less than nb_samples.
+ *
+ * @see enum AVSampleFormat
+ * The documentation for AVSampleFormat describes the data layout.
+ *
+ * @param af AVAudioFifo to write to
+ * @param data audio data plane pointers
+ * @param nb_samples number of samples to write
+ * @return number of samples actually written, or negative AVERROR
+ * code on failure. If successful, the number of samples
+ * actually written will always be nb_samples.
+ */
+int av_audio_fifo_write(AVAudioFifo *af, void **data, int nb_samples);
+
+/**
+ * Read data from an AVAudioFifo.
+ *
+ * @see enum AVSampleFormat
+ * The documentation for AVSampleFormat describes the data layout.
+ *
+ * @param af AVAudioFifo to read from
+ * @param data audio data plane pointers
+ * @param nb_samples number of samples to read
+ * @return number of samples actually read, or negative AVERROR code
+ * on failure. The number of samples actually read will not
+ * be greater than nb_samples, and will only be less than
+ * nb_samples if av_audio_fifo_size is less than nb_samples.
+ */
+int av_audio_fifo_read(AVAudioFifo *af, void **data, int nb_samples);
+
+/**
+ * Drain data from an AVAudioFifo.
+ *
+ * Removes the data without reading it.
+ *
+ * @param af AVAudioFifo to drain
+ * @param nb_samples number of samples to drain
+ * @return 0 if OK, or negative AVERROR code on failure
+ */
+int av_audio_fifo_drain(AVAudioFifo *af, int nb_samples);
+
+/**
+ * Reset the AVAudioFifo buffer.
+ *
+ * This empties all data in the buffer.
+ *
+ * @param af AVAudioFifo to reset
+ */
+void av_audio_fifo_reset(AVAudioFifo *af);
+
+/**
+ * Get the current number of samples in the AVAudioFifo available for reading.
+ *
+ * @param af the AVAudioFifo to query
+ * @return number of samples available for reading
+ */
+int av_audio_fifo_size(AVAudioFifo *af);
+
+/**
+ * Get the current number of samples in the AVAudioFifo available for writing.
+ *
+ * @param af the AVAudioFifo to query
+ * @return number of samples available for writing
+ */
+int av_audio_fifo_space(AVAudioFifo *af);
+
+/**
+ * @}
+ * @}
+ */
+
+#endif /* AVUTIL_AUDIO_FIFO_H */
+/*
+ * Audio FIFO
+ * Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Audio FIFO Buffer
+ */
+
+#ifndef AVUTIL_AUDIO_FIFO_H
+#define AVUTIL_AUDIO_FIFO_H
+
+#include "avutil.h"
+#include "fifo.h"
+#include "samplefmt.h"
+
+/**
+ * @addtogroup lavu_audio
+ * @{
+ *
+ * @defgroup lavu_audiofifo Audio FIFO Buffer
+ * @{
+ */
+
+/**
+ * Context for an Audio FIFO Buffer.
+ *
+ * - Operates at the sample level rather than the byte level.
+ * - Supports multiple channels with either planar or packed sample format.
+ * - Automatic reallocation when writing to a full buffer.
+ */
+typedef struct AVAudioFifo AVAudioFifo;
+
+/**
+ * Free an AVAudioFifo.
+ *
+ * @param af AVAudioFifo to free
+ */
+void av_audio_fifo_free(AVAudioFifo *af);
+
+/**
+ * Allocate an AVAudioFifo.
+ *
+ * @param sample_fmt sample format
+ * @param channels number of channels
+ * @param nb_samples initial allocation size, in samples
+ * @return newly allocated AVAudioFifo, or NULL on error
+ */
+AVAudioFifo *av_audio_fifo_alloc(enum AVSampleFormat sample_fmt, int channels,
+ int nb_samples);
+
+/**
+ * Reallocate an AVAudioFifo.
+ *
+ * @param af AVAudioFifo to reallocate
+ * @param nb_samples new allocation size, in samples
+ * @return 0 if OK, or negative AVERROR code on failure
+ */
+int av_audio_fifo_realloc(AVAudioFifo *af, int nb_samples);
+
+/**
+ * Write data to an AVAudioFifo.
+ *
+ * The AVAudioFifo will be reallocated automatically if the available space
+ * is less than nb_samples.
+ *
+ * @see enum AVSampleFormat
+ * The documentation for AVSampleFormat describes the data layout.
+ *
+ * @param af AVAudioFifo to write to
+ * @param data audio data plane pointers
+ * @param nb_samples number of samples to write
+ * @return number of samples actually written, or negative AVERROR
+ * code on failure. If successful, the number of samples
+ * actually written will always be nb_samples.
+ */
+int av_audio_fifo_write(AVAudioFifo *af, void **data, int nb_samples);
+
+/**
+ * Read data from an AVAudioFifo.
+ *
+ * @see enum AVSampleFormat
+ * The documentation for AVSampleFormat describes the data layout.
+ *
+ * @param af AVAudioFifo to read from
+ * @param data audio data plane pointers
+ * @param nb_samples number of samples to read
+ * @return number of samples actually read, or negative AVERROR code
+ * on failure. The number of samples actually read will not
+ * be greater than nb_samples, and will only be less than
+ * nb_samples if av_audio_fifo_size is less than nb_samples.
+ */
+int av_audio_fifo_read(AVAudioFifo *af, void **data, int nb_samples);
+
+/**
+ * Drain data from an AVAudioFifo.
+ *
+ * Removes the data without reading it.
+ *
+ * @param af AVAudioFifo to drain
+ * @param nb_samples number of samples to drain
+ * @return 0 if OK, or negative AVERROR code on failure
+ */
+int av_audio_fifo_drain(AVAudioFifo *af, int nb_samples);
+
+/**
+ * Reset the AVAudioFifo buffer.
+ *
+ * This empties all data in the buffer.
+ *
+ * @param af AVAudioFifo to reset
+ */
+void av_audio_fifo_reset(AVAudioFifo *af);
+
+/**
+ * Get the current number of samples in the AVAudioFifo available for reading.
+ *
+ * @param af the AVAudioFifo to query
+ * @return number of samples available for reading
+ */
+int av_audio_fifo_size(AVAudioFifo *af);
+
+/**
+ * Get the current number of samples in the AVAudioFifo available for writing.
+ *
+ * @param af the AVAudioFifo to query
+ * @return number of samples available for writing
+ */
+int av_audio_fifo_space(AVAudioFifo *af);
+
+/**
+ * @}
+ * @}
+ */
+
+#endif /* AVUTIL_AUDIO_FIFO_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/audioconvert.h Added

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/avassert.h Added

@@ -0,0 +1,132 @@
+/*
+ * copyright (c) 2010 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * simple assert() macros that are a bit more flexible than ISO C assert().
+ * @author Michael Niedermayer <michaelni@gmx.at>
+ */
+
+#ifndef AVUTIL_AVASSERT_H
+#define AVUTIL_AVASSERT_H
+
+#include <stdlib.h>
+#include "avutil.h"
+#include "log.h"
+
+/**
+ * assert() equivalent, that is always enabled.
+ */
+#define av_assert0(cond) do { \
+ if (!(cond)) { \
+ av_log(NULL, AV_LOG_PANIC, "Assertion %s failed at %s:%d\n", \
+ AV_STRINGIFY(cond), __FILE__, __LINE__); \
+ abort(); \
+ } \
+} while (0)
+
+
+/**
+ * assert() equivalent, that does not lie in speed critical code.
+ * These asserts() thus can be enabled without fearing speedloss.
+ */
+#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0
+#define av_assert1(cond) av_assert0(cond)
+#else
+#define av_assert1(cond) ((void)0)
+#endif
+
+
+/**
+ * assert() equivalent, that does lie in speed critical code.
+ */
+#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1
+#define av_assert2(cond) av_assert0(cond)
+#else
+#define av_assert2(cond) ((void)0)
+#endif
+
+#endif /* AVUTIL_AVASSERT_H */
+/*
+ * copyright (c) 2010 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * simple assert() macros that are a bit more flexible than ISO C assert().
+ * @author Michael Niedermayer <michaelni@gmx.at>
+ */
+
+#ifndef AVUTIL_AVASSERT_H
+#define AVUTIL_AVASSERT_H
+
+#include <stdlib.h>
+#include "avutil.h"
+#include "log.h"
+
+/**
+ * assert() equivalent, that is always enabled.
+ */
+#define av_assert0(cond) do { \
+ if (!(cond)) { \
+ av_log(NULL, AV_LOG_PANIC, "Assertion %s failed at %s:%d\n", \
+ AV_STRINGIFY(cond), __FILE__, __LINE__); \
+ abort(); \
+ } \
+} while (0)
+
+
+/**
+ * assert() equivalent, that does not lie in speed critical code.
+ * These asserts() thus can be enabled without fearing speedloss.
+ */
+#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0
+#define av_assert1(cond) av_assert0(cond)
+#else
+#define av_assert1(cond) ((void)0)
+#endif
+
+
+/**
+ * assert() equivalent, that does lie in speed critical code.
+ */
+#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1
+#define av_assert2(cond) av_assert0(cond)
+#else
+#define av_assert2(cond) ((void)0)
+#endif
+
+#endif /* AVUTIL_AVASSERT_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/ffmpeg_android/libavutil/avconfig.h -> gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/avconfig.h Changed

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/avstring.h Added

@@ -0,0 +1,728 @@
+/*
+ * Copyright (c) 2007 Mans Rullgard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_AVSTRING_H
+#define AVUTIL_AVSTRING_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include "attributes.h"
+
+/**
+ * @addtogroup lavu_string
+ * @{
+ */
+
+/**
+ * Return non-zero if pfx is a prefix of str. If it is, *ptr is set to
+ * the address of the first character in str after the prefix.
+ *
+ * @param str input string
+ * @param pfx prefix to test
+ * @param ptr updated if the prefix is matched inside str
+ * @return non-zero if the prefix matches, zero otherwise
+ */
+int av_strstart(const char *str, const char *pfx, const char **ptr);
+
+/**
+ * Return non-zero if pfx is a prefix of str independent of case. If
+ * it is, *ptr is set to the address of the first character in str
+ * after the prefix.
+ *
+ * @param str input string
+ * @param pfx prefix to test
+ * @param ptr updated if the prefix is matched inside str
+ * @return non-zero if the prefix matches, zero otherwise
+ */
+int av_stristart(const char *str, const char *pfx, const char **ptr);
+
+/**
+ * Locate the first case-independent occurrence in the string haystack
+ * of the string needle. A zero-length string needle is considered to
+ * match at the start of haystack.
+ *
+ * This function is a case-insensitive version of the standard strstr().
+ *
+ * @param haystack string to search in
+ * @param needle string to search for
+ * @return pointer to the located match within haystack
+ * or a null pointer if no match
+ */
+char *av_stristr(const char *haystack, const char *needle);
+
+/**
+ * Locate the first occurrence of the string needle in the string haystack
+ * where not more than hay_length characters are searched. A zero-length
+ * string needle is considered to match at the start of haystack.
+ *
+ * This function is a length-limited version of the standard strstr().
+ *
+ * @param haystack string to search in
+ * @param needle string to search for
+ * @param hay_length length of string to search in
+ * @return pointer to the located match within haystack
+ * or a null pointer if no match
+ */
+char *av_strnstr(const char *haystack, const char *needle, size_t hay_length);
+
+/**
+ * Copy the string src to dst, but no more than size - 1 bytes, and
+ * null-terminate dst.
+ *
+ * This function is the same as BSD strlcpy().
+ *
+ * @param dst destination buffer
+ * @param src source string
+ * @param size size of destination buffer
+ * @return the length of src
+ *
+ * @warning since the return value is the length of src, src absolutely
+ * _must_ be a properly 0-terminated string, otherwise this will read beyond
+ * the end of the buffer and possibly crash.
+ */
+size_t av_strlcpy(char *dst, const char *src, size_t size);
+
+/**
+ * Append the string src to the string dst, but to a total length of
+ * no more than size - 1 bytes, and null-terminate dst.
+ *
+ * This function is similar to BSD strlcat(), but differs when
+ * size <= strlen(dst).
+ *
+ * @param dst destination buffer
+ * @param src source string
+ * @param size size of destination buffer
+ * @return the total length of src and dst
+ *
+ * @warning since the return value use the length of src and dst, these
+ * absolutely _must_ be a properly 0-terminated strings, otherwise this
+ * will read beyond the end of the buffer and possibly crash.
+ */
+size_t av_strlcat(char *dst, const char *src, size_t size);
+
+/**
+ * Append output to a string, according to a format. Never write out of
+ * the destination buffer, and always put a terminating 0 within
+ * the buffer.
+ * @param dst destination buffer (string to which the output is
+ * appended)
+ * @param size total size of the destination buffer
+ * @param fmt printf-compatible format string, specifying how the
+ * following parameters are used
+ * @return the length of the string that would have been generated
+ * if enough space had been available
+ */
+size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...) av_printf_format(3, 4);
+
+/**
+ * Get the count of continuous non zero chars starting from the beginning.
+ *
+ * @param len maximum number of characters to check in the string, that
+ * is the maximum value which is returned by the function
+ */
+static inline size_t av_strnlen(const char *s, size_t len)
+{
+ size_t i;
+ for (i = 0; i < len && s[i]; i++)
+ ;
+ return i;
+}
+
+/**
+ * Print arguments following specified format into a large enough auto
+ * allocated buffer. It is similar to GNU asprintf().
+ * @param fmt printf-compatible format string, specifying how the
+ * following parameters are used.
+ * @return the allocated string
+ * @note You have to free the string yourself with av_free().
+ */
+char *av_asprintf(const char *fmt, ...) av_printf_format(1, 2);
+
+/**
+ * Convert a number to a av_malloced string.
+ */
+char *av_d2str(double d);
+
+/**
+ * Unescape the given string until a non escaped terminating char,
+ * and return the token corresponding to the unescaped string.
+ *
+ * The normal \ and ' escaping is supported. Leading and trailing
+ * whitespaces are removed, unless they are escaped with '\' or are
+ * enclosed between ''.
+ *
+ * @param buf the buffer to parse, buf will be updated to point to the
+ * terminating char
+ * @param term a 0-terminated list of terminating chars
+ * @return the malloced unescaped string, which must be av_freed by
+ * the user, NULL in case of allocation failure
+ */
+char *av_get_token(const char **buf, const char *term);
+
+/**
+ * Split the string into several tokens which can be accessed by
+ * successive calls to av_strtok().
+ *
+ * A token is defined as a sequence of characters not belonging to the
+ * set specified in delim.
+ *
+ * On the first call to av_strtok(), s should point to the string to
+ * parse, and the value of saveptr is ignored. In subsequent calls, s
+ * should be NULL, and saveptr should be unchanged since the previous
+ * call.
+ *
+ * This function is similar to strtok_r() defined in POSIX.1.
+ *
+ * @param s the string to parse, may be NULL
+ * @param delim 0-terminated list of token delimiters, must be non-NULL
+ * @param saveptr user-provided pointer which points to stored
+ * information necessary for av_strtok() to continue scanning the same
+ * string. saveptr is updated to point to the next character after the
+ * first delimiter found, or to NULL if the string was terminated
+ * @return the found token, or NULL when no token is found
+ */
+char *av_strtok(char *s, const char *delim, char **saveptr);
+
+/**
+ * Locale-independent conversion of ASCII isdigit.
+ */
+int av_isdigit(int c);
+
+/**
+ * Locale-independent conversion of ASCII isgraph.
+ */
+int av_isgraph(int c);
+
+/**
+ * Locale-independent conversion of ASCII isspace.
+ */
+int av_isspace(int c);
+
+/**
+ * Locale-independent conversion of ASCII characters to uppercase.
+ */
+static inline int av_toupper(int c)
+{
+ if (c >= 'a' && c <= 'z')
+ c ^= 0x20;
+ return c;
+}
+
+/**
+ * Locale-independent conversion of ASCII characters to lowercase.
+ */
+static inline int av_tolower(int c)
+{
+ if (c >= 'A' && c <= 'Z')
+ c ^= 0x20;
+ return c;
+}
+
+/**
+ * Locale-independent conversion of ASCII isxdigit.
+ */
+int av_isxdigit(int c);
+
+/**
+ * Locale-independent case-insensitive compare.
+ * @note This means only ASCII-range characters are case-insensitive
+ */
+int av_strcasecmp(const char *a, const char *b);
+
+/**
+ * Locale-independent case-insensitive compare.
+ * @note This means only ASCII-range characters are case-insensitive
+ */
+int av_strncasecmp(const char *a, const char *b, size_t n);
+
+
+/**
+ * Thread safe basename.
+ * @param path the path, on DOS both \ and / are considered separators.
+ * @return pointer to the basename substring.
+ */
+const char *av_basename(const char *path);
+
+/**
+ * Thread safe dirname.
+ * @param path the path, on DOS both \ and / are considered separators.
+ * @return the path with the separator replaced by the string terminator or ".".
+ * @note the function may change the input string.
+ */
+const char *av_dirname(char *path);
+
+/**
+ * Match instances of a name in a comma-separated list of names.
+ * @param name Name to look for.
+ * @param names List of names.
+ * @return 1 on match, 0 otherwise.
+ */
+int av_match_name(const char *name, const char *names);
+
+enum AVEscapeMode {
+ AV_ESCAPE_MODE_AUTO, ///< Use auto-selected escaping mode.
+ AV_ESCAPE_MODE_BACKSLASH, ///< Use backslash escaping.
+ AV_ESCAPE_MODE_QUOTE, ///< Use single-quote escaping.
+};
+
+/**
+ * Consider spaces special and escape them even in the middle of the
+ * string.
+ *
+ * This is equivalent to adding the whitespace characters to the special
+ * characters lists, except it is guaranteed to use the exact same list
+ * of whitespace characters as the rest of libavutil.
+ */
+#define AV_ESCAPE_FLAG_WHITESPACE 0x01
+
+/**
+ * Escape only specified special characters.
+ * Without this flag, escape also any characters that may be considered
+ * special by av_get_token(), such as the single quote.
+ */
+#define AV_ESCAPE_FLAG_STRICT 0x02
+
+/**
+ * Escape string in src, and put the escaped string in an allocated
+ * string in *dst, which must be freed with av_free().
+ *
+ * @param dst pointer where an allocated string is put
+ * @param src string to escape, must be non-NULL
+ * @param special_chars string containing the special characters which
+ * need to be escaped, can be NULL
+ * @param mode escape mode to employ, see AV_ESCAPE_MODE_* macros.
+ * Any unknown value for mode will be considered equivalent to
+ * AV_ESCAPE_MODE_BACKSLASH, but this behaviour can change without
+ * notice.
+ * @param flags flags which control how to escape, see AV_ESCAPE_FLAG_ macros
+ * @return the length of the allocated string, or a negative error code in case of error
+ * @see av_bprint_escape()
+ */
+int av_escape(char **dst, const char *src, const char *special_chars,
+ enum AVEscapeMode mode, int flags);
+
+#define AV_UTF8_FLAG_ACCEPT_INVALID_BIG_CODES 1 ///< accept codepoints over 0x10FFFF
+#define AV_UTF8_FLAG_ACCEPT_NON_CHARACTERS 2 ///< accept non-characters - 0xFFFE and 0xFFFF
+#define AV_UTF8_FLAG_ACCEPT_SURROGATES 4 ///< accept UTF-16 surrogates codes
+#define AV_UTF8_FLAG_EXCLUDE_XML_INVALID_CONTROL_CODES 8 ///< exclude control codes not accepted by XML
+
+#define AV_UTF8_FLAG_ACCEPT_ALL \
+ AV_UTF8_FLAG_ACCEPT_INVALID_BIG_CODES|AV_UTF8_FLAG_ACCEPT_NON_CHARACTERS|AV_UTF8_FLAG_ACCEPT_SURROGATES
+
+/**
+ * Read and decode a single UTF-8 code point (character) from the
+ * buffer in *buf, and update *buf to point to the next byte to
+ * decode.
+ *
+ * In case of an invalid byte sequence, the pointer will be updated to
+ * the next byte after the invalid sequence and the function will
+ * return an error code.
+ *
+ * Depending on the specified flags, the function will also fail in
+ * case the decoded code point does not belong to a valid range.
+ *
+ * @note For speed-relevant code a carefully implemented use of
+ * GET_UTF8() may be preferred.
+ *
+ * @param codep pointer used to return the parsed code in case of success.
+ * The value in *codep is set even in case the range check fails.
+ * @param bufp pointer to the address the first byte of the sequence
+ * to decode, updated by the function to point to the
+ * byte next after the decoded sequence
+ * @param buf_end pointer to the end of the buffer, points to the next
+ * byte past the last in the buffer. This is used to
+ * avoid buffer overreads (in case of an unfinished
+ * UTF-8 sequence towards the end of the buffer).
+ * @param flags a collection of AV_UTF8_FLAG_* flags
+ * @return >= 0 in case a sequence was successfully read, a negative
+ * value in case of invalid sequence
+ */
+int av_utf8_decode(int32_t *codep, const uint8_t **bufp, const uint8_t *buf_end,
+ unsigned int flags);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_AVSTRING_H */
+/*
+ * Copyright (c) 2007 Mans Rullgard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_AVSTRING_H
+#define AVUTIL_AVSTRING_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include "attributes.h"
+
+/**
+ * @addtogroup lavu_string
+ * @{
+ */
+
+/**
+ * Return non-zero if pfx is a prefix of str. If it is, *ptr is set to
+ * the address of the first character in str after the prefix.
+ *
+ * @param str input string
+ * @param pfx prefix to test
+ * @param ptr updated if the prefix is matched inside str
+ * @return non-zero if the prefix matches, zero otherwise
+ */
+int av_strstart(const char *str, const char *pfx, const char **ptr);
+
+/**
+ * Return non-zero if pfx is a prefix of str independent of case. If
+ * it is, *ptr is set to the address of the first character in str
+ * after the prefix.
+ *
+ * @param str input string
+ * @param pfx prefix to test
+ * @param ptr updated if the prefix is matched inside str
+ * @return non-zero if the prefix matches, zero otherwise
+ */
+int av_stristart(const char *str, const char *pfx, const char **ptr);
+
+/**
+ * Locate the first case-independent occurrence in the string haystack
+ * of the string needle. A zero-length string needle is considered to
+ * match at the start of haystack.
+ *
+ * This function is a case-insensitive version of the standard strstr().
+ *
+ * @param haystack string to search in
+ * @param needle string to search for
+ * @return pointer to the located match within haystack
+ * or a null pointer if no match
+ */
+char *av_stristr(const char *haystack, const char *needle);
+
+/**
+ * Locate the first occurrence of the string needle in the string haystack
+ * where not more than hay_length characters are searched. A zero-length
+ * string needle is considered to match at the start of haystack.
+ *
+ * This function is a length-limited version of the standard strstr().
+ *
+ * @param haystack string to search in
+ * @param needle string to search for
+ * @param hay_length length of string to search in
+ * @return pointer to the located match within haystack
+ * or a null pointer if no match
+ */
+char *av_strnstr(const char *haystack, const char *needle, size_t hay_length);
+
+/**
+ * Copy the string src to dst, but no more than size - 1 bytes, and
+ * null-terminate dst.
+ *
+ * This function is the same as BSD strlcpy().
+ *
+ * @param dst destination buffer
+ * @param src source string
+ * @param size size of destination buffer
+ * @return the length of src
+ *
+ * @warning since the return value is the length of src, src absolutely
+ * _must_ be a properly 0-terminated string, otherwise this will read beyond
+ * the end of the buffer and possibly crash.
+ */
+size_t av_strlcpy(char *dst, const char *src, size_t size);
+
+/**
+ * Append the string src to the string dst, but to a total length of
+ * no more than size - 1 bytes, and null-terminate dst.
+ *
+ * This function is similar to BSD strlcat(), but differs when
+ * size <= strlen(dst).
+ *
+ * @param dst destination buffer
+ * @param src source string
+ * @param size size of destination buffer
+ * @return the total length of src and dst
+ *
+ * @warning since the return value use the length of src and dst, these
+ * absolutely _must_ be a properly 0-terminated strings, otherwise this
+ * will read beyond the end of the buffer and possibly crash.
+ */
+size_t av_strlcat(char *dst, const char *src, size_t size);
+
+/**
+ * Append output to a string, according to a format. Never write out of
+ * the destination buffer, and always put a terminating 0 within
+ * the buffer.
+ * @param dst destination buffer (string to which the output is
+ * appended)
+ * @param size total size of the destination buffer
+ * @param fmt printf-compatible format string, specifying how the
+ * following parameters are used
+ * @return the length of the string that would have been generated
+ * if enough space had been available
+ */
+size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...) av_printf_format(3, 4);
+
+/**
+ * Get the count of continuous non zero chars starting from the beginning.
+ *
+ * @param len maximum number of characters to check in the string, that
+ * is the maximum value which is returned by the function
+ */
+static inline size_t av_strnlen(const char *s, size_t len)
+{
+ size_t i;
+ for (i = 0; i < len && s[i]; i++)
+ ;
+ return i;
+}
+
+/**
+ * Print arguments following specified format into a large enough auto
+ * allocated buffer. It is similar to GNU asprintf().
+ * @param fmt printf-compatible format string, specifying how the
+ * following parameters are used.
+ * @return the allocated string
+ * @note You have to free the string yourself with av_free().
+ */
+char *av_asprintf(const char *fmt, ...) av_printf_format(1, 2);
+
+/**
+ * Convert a number to a av_malloced string.
+ */
+char *av_d2str(double d);
+
+/**
+ * Unescape the given string until a non escaped terminating char,
+ * and return the token corresponding to the unescaped string.
+ *
+ * The normal \ and ' escaping is supported. Leading and trailing
+ * whitespaces are removed, unless they are escaped with '\' or are
+ * enclosed between ''.
+ *
+ * @param buf the buffer to parse, buf will be updated to point to the
+ * terminating char
+ * @param term a 0-terminated list of terminating chars
+ * @return the malloced unescaped string, which must be av_freed by
+ * the user, NULL in case of allocation failure
+ */
+char *av_get_token(const char **buf, const char *term);
+
+/**
+ * Split the string into several tokens which can be accessed by
+ * successive calls to av_strtok().
+ *
+ * A token is defined as a sequence of characters not belonging to the
+ * set specified in delim.
+ *
+ * On the first call to av_strtok(), s should point to the string to
+ * parse, and the value of saveptr is ignored. In subsequent calls, s
+ * should be NULL, and saveptr should be unchanged since the previous
+ * call.
+ *
+ * This function is similar to strtok_r() defined in POSIX.1.
+ *
+ * @param s the string to parse, may be NULL
+ * @param delim 0-terminated list of token delimiters, must be non-NULL
+ * @param saveptr user-provided pointer which points to stored
+ * information necessary for av_strtok() to continue scanning the same
+ * string. saveptr is updated to point to the next character after the
+ * first delimiter found, or to NULL if the string was terminated
+ * @return the found token, or NULL when no token is found
+ */
+char *av_strtok(char *s, const char *delim, char **saveptr);
+
+/**
+ * Locale-independent conversion of ASCII isdigit.
+ */
+int av_isdigit(int c);
+
+/**
+ * Locale-independent conversion of ASCII isgraph.
+ */
+int av_isgraph(int c);
+
+/**
+ * Locale-independent conversion of ASCII isspace.
+ */
+int av_isspace(int c);
+
+/**
+ * Locale-independent conversion of ASCII characters to uppercase.
+ */
+static inline int av_toupper(int c)
+{
+ if (c >= 'a' && c <= 'z')
+ c ^= 0x20;
+ return c;
+}
+
+/**
+ * Locale-independent conversion of ASCII characters to lowercase.
+ */
+static inline int av_tolower(int c)
+{
+ if (c >= 'A' && c <= 'Z')
+ c ^= 0x20;
+ return c;
+}
+
+/**
+ * Locale-independent conversion of ASCII isxdigit.
+ */
+int av_isxdigit(int c);
+
+/**
+ * Locale-independent case-insensitive compare.
+ * @note This means only ASCII-range characters are case-insensitive
+ */
+int av_strcasecmp(const char *a, const char *b);
+
+/**
+ * Locale-independent case-insensitive compare.
+ * @note This means only ASCII-range characters are case-insensitive
+ */
+int av_strncasecmp(const char *a, const char *b, size_t n);
+
+
+/**
+ * Thread safe basename.
+ * @param path the path, on DOS both \ and / are considered separators.
+ * @return pointer to the basename substring.
+ */
+const char *av_basename(const char *path);
+
+/**
+ * Thread safe dirname.
+ * @param path the path, on DOS both \ and / are considered separators.
+ * @return the path with the separator replaced by the string terminator or ".".
+ * @note the function may change the input string.
+ */
+const char *av_dirname(char *path);
+
+/**
+ * Match instances of a name in a comma-separated list of names.
+ * @param name Name to look for.
+ * @param names List of names.
+ * @return 1 on match, 0 otherwise.
+ */
+int av_match_name(const char *name, const char *names);
+
+enum AVEscapeMode {
+ AV_ESCAPE_MODE_AUTO, ///< Use auto-selected escaping mode.
+ AV_ESCAPE_MODE_BACKSLASH, ///< Use backslash escaping.
+ AV_ESCAPE_MODE_QUOTE, ///< Use single-quote escaping.
+};
+
+/**
+ * Consider spaces special and escape them even in the middle of the
+ * string.
+ *
+ * This is equivalent to adding the whitespace characters to the special
+ * characters lists, except it is guaranteed to use the exact same list
+ * of whitespace characters as the rest of libavutil.
+ */
+#define AV_ESCAPE_FLAG_WHITESPACE 0x01
+
+/**
+ * Escape only specified special characters.
+ * Without this flag, escape also any characters that may be considered
+ * special by av_get_token(), such as the single quote.
+ */
+#define AV_ESCAPE_FLAG_STRICT 0x02
+
+/**
+ * Escape string in src, and put the escaped string in an allocated
+ * string in *dst, which must be freed with av_free().
+ *
+ * @param dst pointer where an allocated string is put
+ * @param src string to escape, must be non-NULL
+ * @param special_chars string containing the special characters which
+ * need to be escaped, can be NULL
+ * @param mode escape mode to employ, see AV_ESCAPE_MODE_* macros.
+ * Any unknown value for mode will be considered equivalent to
+ * AV_ESCAPE_MODE_BACKSLASH, but this behaviour can change without
+ * notice.
+ * @param flags flags which control how to escape, see AV_ESCAPE_FLAG_ macros
+ * @return the length of the allocated string, or a negative error code in case of error
+ * @see av_bprint_escape()
+ */
+int av_escape(char **dst, const char *src, const char *special_chars,
+ enum AVEscapeMode mode, int flags);
+
+#define AV_UTF8_FLAG_ACCEPT_INVALID_BIG_CODES 1 ///< accept codepoints over 0x10FFFF
+#define AV_UTF8_FLAG_ACCEPT_NON_CHARACTERS 2 ///< accept non-characters - 0xFFFE and 0xFFFF
+#define AV_UTF8_FLAG_ACCEPT_SURROGATES 4 ///< accept UTF-16 surrogates codes
+#define AV_UTF8_FLAG_EXCLUDE_XML_INVALID_CONTROL_CODES 8 ///< exclude control codes not accepted by XML
+
+#define AV_UTF8_FLAG_ACCEPT_ALL \
+ AV_UTF8_FLAG_ACCEPT_INVALID_BIG_CODES|AV_UTF8_FLAG_ACCEPT_NON_CHARACTERS|AV_UTF8_FLAG_ACCEPT_SURROGATES
+
+/**
+ * Read and decode a single UTF-8 code point (character) from the
+ * buffer in *buf, and update *buf to point to the next byte to
+ * decode.
+ *
+ * In case of an invalid byte sequence, the pointer will be updated to
+ * the next byte after the invalid sequence and the function will
+ * return an error code.
+ *
+ * Depending on the specified flags, the function will also fail in
+ * case the decoded code point does not belong to a valid range.
+ *
+ * @note For speed-relevant code a carefully implemented use of
+ * GET_UTF8() may be preferred.
+ *
+ * @param codep pointer used to return the parsed code in case of success.
+ * The value in *codep is set even in case the range check fails.
+ * @param bufp pointer to the address the first byte of the sequence
+ * to decode, updated by the function to point to the
+ * byte next after the decoded sequence
+ * @param buf_end pointer to the end of the buffer, points to the next
+ * byte past the last in the buffer. This is used to
+ * avoid buffer overreads (in case of an unfinished
+ * UTF-8 sequence towards the end of the buffer).
+ * @param flags a collection of AV_UTF8_FLAG_* flags
+ * @return >= 0 in case a sequence was successfully read, a negative
+ * value in case of invalid sequence
+ */
+int av_utf8_decode(int32_t *codep, const uint8_t **bufp, const uint8_t *buf_end,
+ unsigned int flags);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_AVSTRING_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/ffmpeg_android/libavutil/avutil.h -> gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/avutil.h Changed

@@ -22,68 +22,323 @@
 #define AVUTIL_AVUTIL_H
 
 /**
- * @file libavutil/avutil.h
+ * @file
 * external API header
 */
 
+/**
+ * @mainpage
+ *
+ * @section ffmpeg_intro Introduction
+ *
+ * This document describes the usage of the different libraries
+ * provided by FFmpeg.
+ *
+ * @li @ref libavc "libavcodec" encoding/decoding library
+ * @li @ref lavfi "libavfilter" graph-based frame editing library
+ * @li @ref libavf "libavformat" I/O and muxing/demuxing library
+ * @li @ref lavd "libavdevice" special devices muxing/demuxing library
+ * @li @ref lavu "libavutil" common utility library
+ * @li @ref lswr "libswresample" audio resampling, format conversion and mixing
+ * @li @ref lpp "libpostproc" post processing library
+ * @li @ref libsws "libswscale" color conversion and scaling library
+ *
+ * @section ffmpeg_versioning Versioning and compatibility
+ *
+ * Each of the FFmpeg libraries contains a version.h header, which defines a
+ * major, minor and micro version number with the
+ * LIBRARYNAME_VERSION_{MAJOR,MINOR,MICRO} macros. The major version
+ * number is incremented with backward incompatible changes - e.g. removing
+ * parts of the public API, reordering public struct members, etc. The minor
+ * version number is incremented for backward compatible API changes or major
+ * new features - e.g. adding a new public function or a new decoder. The micro
+ * version number is incremented for smaller changes that a calling program
+ * might still want to check for - e.g. changing behavior in a previously
+ * unspecified situation.
+ *
+ * FFmpeg guarantees backward API and ABI compatibility for each library as long
+ * as its major version number is unchanged. This means that no public symbols
+ * will be removed or renamed. Types and names of the public struct members and
+ * values of public macros and enums will remain the same (unless they were
+ * explicitly declared as not part of the public API). Documented behavior will
+ * not change.
+ *
+ * In other words, any correct program that works with a given FFmpeg snapshot
+ * should work just as well without any changes with any later snapshot with the
+ * same major versions. This applies to both rebuilding the program against new
+ * FFmpeg versions or to replacing the dynamic FFmpeg libraries that a program
+ * links against.
+ *
+ * However, new public symbols may be added and new members may be appended to
+ * public structs whose size is not part of public ABI (most public structs in
+ * FFmpeg). New macros and enum values may be added. Behavior in undocumented
+ * situations may change slightly (and be documented). All those are accompanied
+ * by an entry in doc/APIchanges and incrementing either the minor or micro
+ * version number.
+ */
 
-#define AV_STRINGIFY(s) AV_TOSTRING(s)
-#define AV_TOSTRING(s) #s
-
-#define AV_GLUE(a, b) a ## b
-#define AV_JOIN(a, b) AV_GLUE(a, b)
-
-#define AV_PRAGMA(s) _Pragma(#s)
-
-#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
-#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
-#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
-
-#define LIBAVUTIL_VERSION_MAJOR 50
-#define LIBAVUTIL_VERSION_MINOR 14
-#define LIBAVUTIL_VERSION_MICRO 0
+/**
+ * @defgroup lavu Common utility functions
+ *
+ * @brief
+ * libavutil contains the code shared across all the other FFmpeg
+ * libraries
+ *
+ * @note In order to use the functions provided by avutil you must include
+ * the specific header.
+ *
+ * @{
+ *
+ * @defgroup lavu_crypto Crypto and Hashing
+ *
+ * @{
+ * @}
+ *
+ * @defgroup lavu_math Maths
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_string String Manipulation
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_mem Memory Management
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_data Data Structures
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_audio Audio related
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_error Error Codes
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_log Logging Facility
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_misc Other
+ *
+ * @{
+ *
+ * @defgroup lavu_internal Internal
+ *
+ * Not exported functions, for internal usage only
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup preproc_misc Preprocessor String Macros
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup version_utils Library Version Macros
+ *
+ * @{
+ *
+ * @}
+ */
 
-#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
- LIBAVUTIL_VERSION_MINOR, \
- LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_VERSION AV_VERSION(LIBAVUTIL_VERSION_MAJOR, \
- LIBAVUTIL_VERSION_MINOR, \
- LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT
 
-#define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
+/**
+ * @addtogroup lavu_ver
+ * @{
+ */
 
 /**
- * Returns the LIBAVUTIL_VERSION_INT constant.
+ * Return the LIBAVUTIL_VERSION_INT constant.
 */
 unsigned avutil_version(void);
 
 /**
- * Returns the libavutil build-time configuration.
+ * Return the libavutil build-time configuration.
 */
 const char *avutil_configuration(void);
 
 /**
- * Returns the libavutil license.
+ * Return the libavutil license.
 */
 const char *avutil_license(void);
 
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup lavu_media Media Type
+ * @brief Media Type
+ */
+
 enum AVMediaType {
- AVMEDIA_TYPE_UNKNOWN = -1,
+ AVMEDIA_TYPE_UNKNOWN = -1, ///< Usually treated as AVMEDIA_TYPE_DATA
 AVMEDIA_TYPE_VIDEO,
 AVMEDIA_TYPE_AUDIO,
- AVMEDIA_TYPE_DATA,
+ AVMEDIA_TYPE_DATA, ///< Opaque data information usually continuous
 AVMEDIA_TYPE_SUBTITLE,
- AVMEDIA_TYPE_ATTACHMENT,
+ AVMEDIA_TYPE_ATTACHMENT, ///< Opaque data information usually sparse
 AVMEDIA_TYPE_NB
 };
 
+/**
+ * Return a string describing the media_type enum, NULL if media_type
+ * is unknown.
+ */
+const char *av_get_media_type_string(enum AVMediaType media_type);
+
+/**
+ * @defgroup lavu_const Constants
+ * @{
+ *
+ * @defgroup lavu_enc Encoding specific
+ *
+ * @note those definition should move to avcodec
+ * @{
+ */
+
+#define FF_LAMBDA_SHIFT 7
+#define FF_LAMBDA_SCALE (1<<FF_LAMBDA_SHIFT)
+#define FF_QP2LAMBDA 118 ///< factor to convert from H.263 QP to lambda
+#define FF_LAMBDA_MAX (256*128-1)
+
+#define FF_QUALITY_SCALE FF_LAMBDA_SCALE //FIXME maybe remove
+
+/**
+ * @}
+ * @defgroup lavu_time Timestamp specific
+ *
+ * FFmpeg internal timebase and timestamp definitions
+ *
+ * @{
+ */
+
+/**
+ * @brief Undefined timestamp value
+ *
+ * Usually reported by demuxer that work on containers that do not provide
+ * either pts or dts.
+ */
+
+#define AV_NOPTS_VALUE ((int64_t)UINT64_C(0x8000000000000000))
+
+/**
+ * Internal time base represented as integer
+ */
+
+#define AV_TIME_BASE 1000000
+
+/**
+ * Internal time base represented as fractional value
+ */
+
+#define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE}
+
+/**
+ * @}
+ * @}
+ * @defgroup lavu_picture Image related
+ *
+ * AVPicture types, pixel formats and basic image planes manipulation.
+ *
+ * @{
+ */
+
+enum AVPictureType {
+ AV_PICTURE_TYPE_NONE = 0, ///< Undefined
+ AV_PICTURE_TYPE_I, ///< Intra
+ AV_PICTURE_TYPE_P, ///< Predicted
+ AV_PICTURE_TYPE_B, ///< Bi-dir predicted
+ AV_PICTURE_TYPE_S, ///< S(GMC)-VOP MPEG4
+ AV_PICTURE_TYPE_SI, ///< Switching Intra
+ AV_PICTURE_TYPE_SP, ///< Switching Predicted
+ AV_PICTURE_TYPE_BI, ///< BI type
+};
+
+/**
+ * Return a single letter to describe the given picture type
+ * pict_type.
+ *
+ * @param[in] pict_type the picture type @return a single character
+ * representing the picture type, '?' if pict_type is unknown
+ */
+char av_get_picture_type_char(enum AVPictureType pict_type);
+
+/**
+ * @}
+ */
+
 #include "common.h"
 #include "error.h"
-#include "mathematics.h"
 #include "rational.h"
-#include "intfloat_readwrite.h"
+#include "version.h"
+#include "macros.h"
+#include "mathematics.h"
 #include "log.h"
 #include "pixfmt.h"
 
+/**
+ * Return x default pointer in case p is NULL.
+ */
+static inline void *av_x_if_null(const void *p, const void *x)
+{
+ return (void *)(intptr_t)(p ? p : x);
+}
+
+/**
+ * Compute the length of an integer list.
+ *
+ * @param elsize size in bytes of each list element (only 1, 2, 4 or 8)
+ * @param term list terminator (usually 0 or -1)
+ * @param list pointer to the list
+ * @return length of the list, in elements, not counting the terminator
+ */
+unsigned av_int_list_length_for_size(unsigned elsize,
+ const void *list, uint64_t term) av_pure;
+
+/**
+ * Compute the length of an integer list.
+ *
+ * @param term list terminator (usually 0 or -1)
+ * @param list pointer to the list
+ * @return length of the list, in elements, not counting the terminator
+ */
+#define av_int_list_length(list, term) \
+ av_int_list_length_for_size(sizeof(*(list)), list, term)
+
+/**
+ * Open a file using a UTF-8 filename.
+ * The API of this function matches POSIX fopen(), errors are returned through
+ * errno.
+ */
+FILE *av_fopen_utf8(const char *path, const char *mode);
+
+/**
+ * Return the fractional representation of the internal time base.
+ */
+AVRational av_get_time_base_q(void);
+
+/**
+ * @}
+ * @}
+ */
+
 #endif /* AVUTIL_AVUTIL_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/base64.h Added

@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2006 Ryan Martell. (rdm4@martellventures.com)
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_BASE64_H
+#define AVUTIL_BASE64_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_base64 Base64
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+
+/**
+ * Decode a base64-encoded string.
+ *
+ * @param out buffer for decoded data
+ * @param in null-terminated input string
+ * @param out_size size in bytes of the out buffer, must be at
+ * least 3/4 of the length of in
+ * @return number of bytes written, or a negative value in case of
+ * invalid input
+ */
+int av_base64_decode(uint8_t *out, const char *in, int out_size);
+
+/**
+ * Encode data to base64 and null-terminate.
+ *
+ * @param out buffer for encoded data
+ * @param out_size size in bytes of the out buffer (including the
+ * null terminator), must be at least AV_BASE64_SIZE(in_size)
+ * @param in input buffer containing the data to encode
+ * @param in_size size in bytes of the in buffer
+ * @return out or NULL in case of error
+ */
+char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size);
+
+/**
+ * Calculate the output size needed to base64-encode x bytes to a
+ * null-terminated string.
+ */
+#define AV_BASE64_SIZE(x) (((x)+2) / 3 * 4 + 1)
+
+ /**
+ * @}
+ */
+
+#endif /* AVUTIL_BASE64_H */
+/*
+ * Copyright (c) 2006 Ryan Martell. (rdm4@martellventures.com)
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_BASE64_H
+#define AVUTIL_BASE64_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_base64 Base64
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+
+/**
+ * Decode a base64-encoded string.
+ *
+ * @param out buffer for decoded data
+ * @param in null-terminated input string
+ * @param out_size size in bytes of the out buffer, must be at
+ * least 3/4 of the length of in
+ * @return number of bytes written, or a negative value in case of
+ * invalid input
+ */
+int av_base64_decode(uint8_t *out, const char *in, int out_size);
+
+/**
+ * Encode data to base64 and null-terminate.
+ *
+ * @param out buffer for encoded data
+ * @param out_size size in bytes of the out buffer (including the
+ * null terminator), must be at least AV_BASE64_SIZE(in_size)
+ * @param in input buffer containing the data to encode
+ * @param in_size size in bytes of the in buffer
+ * @return out or NULL in case of error
+ */
+char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size);
+
+/**
+ * Calculate the output size needed to base64-encode x bytes to a
+ * null-terminated string.
+ */
+#define AV_BASE64_SIZE(x) (((x)+2) / 3 * 4 + 1)
+
+ /**
+ * @}
+ */
+
+#endif /* AVUTIL_BASE64_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/blowfish.h Added

@@ -0,0 +1,154 @@
+/*
+ * Blowfish algorithm
+ * Copyright (c) 2012 Samuel Pitoiset
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_BLOWFISH_H
+#define AVUTIL_BLOWFISH_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_blowfish Blowfish
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+#define AV_BF_ROUNDS 16
+
+typedef struct AVBlowfish {
+ uint32_t p[AV_BF_ROUNDS + 2];
+ uint32_t s[4][256];
+} AVBlowfish;
+
+/**
+ * Initialize an AVBlowfish context.
+ *
+ * @param ctx an AVBlowfish context
+ * @param key a key
+ * @param key_len length of the key
+ */
+void av_blowfish_init(struct AVBlowfish *ctx, const uint8_t *key, int key_len);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ *
+ * @param ctx an AVBlowfish context
+ * @param xl left four bytes halves of input to be encrypted
+ * @param xr right four bytes halves of input to be encrypted
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_blowfish_crypt_ecb(struct AVBlowfish *ctx, uint32_t *xl, uint32_t *xr,
+ int decrypt);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ *
+ * @param ctx an AVBlowfish context
+ * @param dst destination array, can be equal to src
+ * @param src source array, can be equal to dst
+ * @param count number of 8 byte blocks
+ * @param iv initialization vector for CBC mode, if NULL ECB will be used
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_blowfish_crypt(struct AVBlowfish *ctx, uint8_t *dst, const uint8_t *src,
+ int count, uint8_t *iv, int decrypt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_BLOWFISH_H */
+/*
+ * Blowfish algorithm
+ * Copyright (c) 2012 Samuel Pitoiset
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_BLOWFISH_H
+#define AVUTIL_BLOWFISH_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_blowfish Blowfish
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+#define AV_BF_ROUNDS 16
+
+typedef struct AVBlowfish {
+ uint32_t p[AV_BF_ROUNDS + 2];
+ uint32_t s[4][256];
+} AVBlowfish;
+
+/**
+ * Initialize an AVBlowfish context.
+ *
+ * @param ctx an AVBlowfish context
+ * @param key a key
+ * @param key_len length of the key
+ */
+void av_blowfish_init(struct AVBlowfish *ctx, const uint8_t *key, int key_len);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ *
+ * @param ctx an AVBlowfish context
+ * @param xl left four bytes halves of input to be encrypted
+ * @param xr right four bytes halves of input to be encrypted
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_blowfish_crypt_ecb(struct AVBlowfish *ctx, uint32_t *xl, uint32_t *xr,
+ int decrypt);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ *
+ * @param ctx an AVBlowfish context
+ * @param dst destination array, can be equal to src
+ * @param src source array, can be equal to dst
+ * @param count number of 8 byte blocks
+ * @param iv initialization vector for CBC mode, if NULL ECB will be used
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_blowfish_crypt(struct AVBlowfish *ctx, uint8_t *dst, const uint8_t *src,
+ int count, uint8_t *iv, int decrypt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_BLOWFISH_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/bprint.h Added

@@ -0,0 +1,432 @@
+/*
+ * Copyright (c) 2012 Nicolas George
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_BPRINT_H
+#define AVUTIL_BPRINT_H
+
+#include <stdarg.h>
+
+#include "attributes.h"
+#include "avstring.h"
+
+/**
+ * Define a structure with extra padding to a fixed size
+ * This helps ensuring binary compatibility with future versions.
+ */
+#define FF_PAD_STRUCTURE(size, ...) \
+ __VA_ARGS__ \
+ char reserved_padding[size - sizeof(struct { __VA_ARGS__ })];
+
+/**
+ * Buffer to print data progressively
+ *
+ * The string buffer grows as necessary and is always 0-terminated.
+ * The content of the string is never accessed, and thus is
+ * encoding-agnostic and can even hold binary data.
+ *
+ * Small buffers are kept in the structure itself, and thus require no
+ * memory allocation at all (unless the contents of the buffer is needed
+ * after the structure goes out of scope). This is almost as lightweight as
+ * declaring a local "char buf[512]".
+ *
+ * The length of the string can go beyond the allocated size: the buffer is
+ * then truncated, but the functions still keep account of the actual total
+ * length.
+ *
+ * In other words, buf->len can be greater than buf->size and records the
+ * total length of what would have been to the buffer if there had been
+ * enough memory.
+ *
+ * Append operations do not need to be tested for failure: if a memory
+ * allocation fails, data stop being appended to the buffer, but the length
+ * is still updated. This situation can be tested with
+ * av_bprint_is_complete().
+ *
+ * The size_max field determines several possible behaviours:
+ *
+ * size_max = -1 (= UINT_MAX) or any large value will let the buffer be
+ * reallocated as necessary, with an amortized linear cost.
+ *
+ * size_max = 0 prevents writing anything to the buffer: only the total
+ * length is computed. The write operations can then possibly be repeated in
+ * a buffer with exactly the necessary size
+ * (using size_init = size_max = len + 1).
+ *
+ * size_max = 1 is automatically replaced by the exact size available in the
+ * structure itself, thus ensuring no dynamic memory allocation. The
+ * internal buffer is large enough to hold a reasonable paragraph of text,
+ * such as the current paragraph.
+ */
+typedef struct AVBPrint {
+ FF_PAD_STRUCTURE(1024,
+ char *str; /**< string so far */
+ unsigned len; /**< length so far */
+ unsigned size; /**< allocated memory */
+ unsigned size_max; /**< maximum allocated memory */
+ char reserved_internal_buffer[1];
+ )
+} AVBPrint;
+
+/**
+ * Convenience macros for special values for av_bprint_init() size_max
+ * parameter.
+ */
+#define AV_BPRINT_SIZE_UNLIMITED ((unsigned)-1)
+#define AV_BPRINT_SIZE_AUTOMATIC 1
+#define AV_BPRINT_SIZE_COUNT_ONLY 0
+
+/**
+ * Init a print buffer.
+ *
+ * @param buf buffer to init
+ * @param size_init initial size (including the final 0)
+ * @param size_max maximum size;
+ * 0 means do not write anything, just count the length;
+ * 1 is replaced by the maximum value for automatic storage;
+ * any large value means that the internal buffer will be
+ * reallocated as needed up to that limit; -1 is converted to
+ * UINT_MAX, the largest limit possible.
+ * Check also AV_BPRINT_SIZE_* macros.
+ */
+void av_bprint_init(AVBPrint *buf, unsigned size_init, unsigned size_max);
+
+/**
+ * Init a print buffer using a pre-existing buffer.
+ *
+ * The buffer will not be reallocated.
+ *
+ * @param buf buffer structure to init
+ * @param buffer byte buffer to use for the string data
+ * @param size size of buffer
+ */
+void av_bprint_init_for_buffer(AVBPrint *buf, char *buffer, unsigned size);
+
+/**
+ * Append a formatted string to a print buffer.
+ */
+void av_bprintf(AVBPrint *buf, const char *fmt, ...) av_printf_format(2, 3);
+
+/**
+ * Append a formatted string to a print buffer.
+ */
+void av_vbprintf(AVBPrint *buf, const char *fmt, va_list vl_arg);
+
+/**
+ * Append char c n times to a print buffer.
+ */
+void av_bprint_chars(AVBPrint *buf, char c, unsigned n);
+
+/**
+ * Append data to a print buffer.
+ *
+ * param buf bprint buffer to use
+ * param data pointer to data
+ * param size size of data
+ */
+void av_bprint_append_data(AVBPrint *buf, const char *data, unsigned size);
+
+struct tm;
+/**
+ * Append a formatted date and time to a print buffer.
+ *
+ * param buf bprint buffer to use
+ * param fmt date and time format string, see strftime()
+ * param tm broken-down time structure to translate
+ *
+ * @note due to poor design of the standard strftime function, it may
+ * produce poor results if the format string expands to a very long text and
+ * the bprint buffer is near the limit stated by the size_max option.
+ */
+void av_bprint_strftime(AVBPrint *buf, const char *fmt, const struct tm *tm);
+
+/**
+ * Allocate bytes in the buffer for external use.
+ *
+ * @param[in] buf buffer structure
+ * @param[in] size required size
+ * @param[out] mem pointer to the memory area
+ * @param[out] actual_size size of the memory area after allocation;
+ * can be larger or smaller than size
+ */
+void av_bprint_get_buffer(AVBPrint *buf, unsigned size,
+ unsigned char **mem, unsigned *actual_size);
+
+/**
+ * Reset the string to "" but keep internal allocated data.
+ */
+void av_bprint_clear(AVBPrint *buf);
+
+/**
+ * Test if the print buffer is complete (not truncated).
+ *
+ * It may have been truncated due to a memory allocation failure
+ * or the size_max limit (compare size and size_max if necessary).
+ */
+static inline int av_bprint_is_complete(AVBPrint *buf)
+{
+ return buf->len < buf->size;
+}
+
+/**
+ * Finalize a print buffer.
+ *
+ * The print buffer can no longer be used afterwards,
+ * but the len and size fields are still valid.
+ *
+ * @arg[out] ret_str if not NULL, used to return a permanent copy of the
+ * buffer contents, or NULL if memory allocation fails;
+ * if NULL, the buffer is discarded and freed
+ * @return 0 for success or error code (probably AVERROR(ENOMEM))
+ */
+int av_bprint_finalize(AVBPrint *buf, char **ret_str);
+
+/**
+ * Escape the content in src and append it to dstbuf.
+ *
+ * @param dstbuf already inited destination bprint buffer
+ * @param src string containing the text to escape
+ * @param special_chars string containing the special characters which
+ * need to be escaped, can be NULL
+ * @param mode escape mode to employ, see AV_ESCAPE_MODE_* macros.
+ * Any unknown value for mode will be considered equivalent to
+ * AV_ESCAPE_MODE_BACKSLASH, but this behaviour can change without
+ * notice.
+ * @param flags flags which control how to escape, see AV_ESCAPE_FLAG_* macros
+ */
+void av_bprint_escape(AVBPrint *dstbuf, const char *src, const char *special_chars,
+ enum AVEscapeMode mode, int flags);
+
+#endif /* AVUTIL_BPRINT_H */
+/*
+ * Copyright (c) 2012 Nicolas George
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_BPRINT_H
+#define AVUTIL_BPRINT_H
+
+#include <stdarg.h>
+
+#include "attributes.h"
+#include "avstring.h"
+
+/**
+ * Define a structure with extra padding to a fixed size
+ * This helps ensuring binary compatibility with future versions.
+ */
+#define FF_PAD_STRUCTURE(size, ...) \
+ __VA_ARGS__ \
+ char reserved_padding[size - sizeof(struct { __VA_ARGS__ })];
+
+/**
+ * Buffer to print data progressively
+ *
+ * The string buffer grows as necessary and is always 0-terminated.
+ * The content of the string is never accessed, and thus is
+ * encoding-agnostic and can even hold binary data.
+ *
+ * Small buffers are kept in the structure itself, and thus require no
+ * memory allocation at all (unless the contents of the buffer is needed
+ * after the structure goes out of scope). This is almost as lightweight as
+ * declaring a local "char buf[512]".
+ *
+ * The length of the string can go beyond the allocated size: the buffer is
+ * then truncated, but the functions still keep account of the actual total
+ * length.
+ *
+ * In other words, buf->len can be greater than buf->size and records the
+ * total length of what would have been to the buffer if there had been
+ * enough memory.
+ *
+ * Append operations do not need to be tested for failure: if a memory
+ * allocation fails, data stop being appended to the buffer, but the length
+ * is still updated. This situation can be tested with
+ * av_bprint_is_complete().
+ *
+ * The size_max field determines several possible behaviours:
+ *
+ * size_max = -1 (= UINT_MAX) or any large value will let the buffer be
+ * reallocated as necessary, with an amortized linear cost.
+ *
+ * size_max = 0 prevents writing anything to the buffer: only the total
+ * length is computed. The write operations can then possibly be repeated in
+ * a buffer with exactly the necessary size
+ * (using size_init = size_max = len + 1).
+ *
+ * size_max = 1 is automatically replaced by the exact size available in the
+ * structure itself, thus ensuring no dynamic memory allocation. The
+ * internal buffer is large enough to hold a reasonable paragraph of text,
+ * such as the current paragraph.
+ */
+typedef struct AVBPrint {
+ FF_PAD_STRUCTURE(1024,
+ char *str; /**< string so far */
+ unsigned len; /**< length so far */
+ unsigned size; /**< allocated memory */
+ unsigned size_max; /**< maximum allocated memory */
+ char reserved_internal_buffer[1];
+ )
+} AVBPrint;
+
+/**
+ * Convenience macros for special values for av_bprint_init() size_max
+ * parameter.
+ */
+#define AV_BPRINT_SIZE_UNLIMITED ((unsigned)-1)
+#define AV_BPRINT_SIZE_AUTOMATIC 1
+#define AV_BPRINT_SIZE_COUNT_ONLY 0
+
+/**
+ * Init a print buffer.
+ *
+ * @param buf buffer to init
+ * @param size_init initial size (including the final 0)
+ * @param size_max maximum size;
+ * 0 means do not write anything, just count the length;
+ * 1 is replaced by the maximum value for automatic storage;
+ * any large value means that the internal buffer will be
+ * reallocated as needed up to that limit; -1 is converted to
+ * UINT_MAX, the largest limit possible.
+ * Check also AV_BPRINT_SIZE_* macros.
+ */
+void av_bprint_init(AVBPrint *buf, unsigned size_init, unsigned size_max);
+
+/**
+ * Init a print buffer using a pre-existing buffer.
+ *
+ * The buffer will not be reallocated.
+ *
+ * @param buf buffer structure to init
+ * @param buffer byte buffer to use for the string data
+ * @param size size of buffer
+ */
+void av_bprint_init_for_buffer(AVBPrint *buf, char *buffer, unsigned size);
+
+/**
+ * Append a formatted string to a print buffer.
+ */
+void av_bprintf(AVBPrint *buf, const char *fmt, ...) av_printf_format(2, 3);
+
+/**
+ * Append a formatted string to a print buffer.
+ */
+void av_vbprintf(AVBPrint *buf, const char *fmt, va_list vl_arg);
+
+/**
+ * Append char c n times to a print buffer.
+ */
+void av_bprint_chars(AVBPrint *buf, char c, unsigned n);
+
+/**
+ * Append data to a print buffer.
+ *
+ * param buf bprint buffer to use
+ * param data pointer to data
+ * param size size of data
+ */
+void av_bprint_append_data(AVBPrint *buf, const char *data, unsigned size);
+
+struct tm;
+/**
+ * Append a formatted date and time to a print buffer.
+ *
+ * param buf bprint buffer to use
+ * param fmt date and time format string, see strftime()
+ * param tm broken-down time structure to translate
+ *
+ * @note due to poor design of the standard strftime function, it may
+ * produce poor results if the format string expands to a very long text and
+ * the bprint buffer is near the limit stated by the size_max option.
+ */
+void av_bprint_strftime(AVBPrint *buf, const char *fmt, const struct tm *tm);
+
+/**
+ * Allocate bytes in the buffer for external use.
+ *
+ * @param[in] buf buffer structure
+ * @param[in] size required size
+ * @param[out] mem pointer to the memory area
+ * @param[out] actual_size size of the memory area after allocation;
+ * can be larger or smaller than size
+ */
+void av_bprint_get_buffer(AVBPrint *buf, unsigned size,
+ unsigned char **mem, unsigned *actual_size);
+
+/**
+ * Reset the string to "" but keep internal allocated data.
+ */
+void av_bprint_clear(AVBPrint *buf);
+
+/**
+ * Test if the print buffer is complete (not truncated).
+ *
+ * It may have been truncated due to a memory allocation failure
+ * or the size_max limit (compare size and size_max if necessary).
+ */
+static inline int av_bprint_is_complete(AVBPrint *buf)
+{
+ return buf->len < buf->size;
+}
+
+/**
+ * Finalize a print buffer.
+ *
+ * The print buffer can no longer be used afterwards,
+ * but the len and size fields are still valid.
+ *
+ * @arg[out] ret_str if not NULL, used to return a permanent copy of the
+ * buffer contents, or NULL if memory allocation fails;
+ * if NULL, the buffer is discarded and freed
+ * @return 0 for success or error code (probably AVERROR(ENOMEM))
+ */
+int av_bprint_finalize(AVBPrint *buf, char **ret_str);
+
+/**
+ * Escape the content in src and append it to dstbuf.
+ *
+ * @param dstbuf already inited destination bprint buffer
+ * @param src string containing the text to escape
+ * @param special_chars string containing the special characters which
+ * need to be escaped, can be NULL
+ * @param mode escape mode to employ, see AV_ESCAPE_MODE_* macros.
+ * Any unknown value for mode will be considered equivalent to
+ * AV_ESCAPE_MODE_BACKSLASH, but this behaviour can change without
+ * notice.
+ * @param flags flags which control how to escape, see AV_ESCAPE_FLAG_* macros
+ */
+void av_bprint_escape(AVBPrint *dstbuf, const char *src, const char *special_chars,
+ enum AVEscapeMode mode, int flags);
+
+#endif /* AVUTIL_BPRINT_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/bswap.h Added

@@ -0,0 +1,218 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * byte swapping routines
+ */
+
+#ifndef AVUTIL_BSWAP_H
+#define AVUTIL_BSWAP_H
+
+#include <stdint.h>
+#include "libavutil/avconfig.h"
+#include "attributes.h"
+
+#ifdef HAVE_AV_CONFIG_H
+
+#include "config.h"
+
+#if ARCH_AARCH64
+# include "aarch64/bswap.h"
+#elif ARCH_ARM
+# include "arm/bswap.h"
+#elif ARCH_AVR32
+# include "avr32/bswap.h"
+#elif ARCH_SH4
+# include "sh4/bswap.h"
+#elif ARCH_X86
+# include "x86/bswap.h"
+#endif
+
+#endif /* HAVE_AV_CONFIG_H */
+
+#define AV_BSWAP16C(x) (((x) << 8 & 0xff00) | ((x) >> 8 & 0x00ff))
+#define AV_BSWAP32C(x) (AV_BSWAP16C(x) << 16 | AV_BSWAP16C((x) >> 16))
+#define AV_BSWAP64C(x) (AV_BSWAP32C(x) << 32 | AV_BSWAP32C((x) >> 32))
+
+#define AV_BSWAPC(s, x) AV_BSWAP##s##C(x)
+
+#ifndef av_bswap16
+static av_always_inline av_const uint16_t av_bswap16(uint16_t x)
+{
+ x= (x>>8) | (x<<8);
+ return x;
+}
+#endif
+
+#ifndef av_bswap32
+static av_always_inline av_const uint32_t av_bswap32(uint32_t x)
+{
+ return AV_BSWAP32C(x);
+}
+#endif
+
+#ifndef av_bswap64
+static inline uint64_t av_const av_bswap64(uint64_t x)
+{
+ return (uint64_t)av_bswap32(x) << 32 | av_bswap32(x >> 32);
+}
+#endif
+
+// be2ne ... big-endian to native-endian
+// le2ne ... little-endian to native-endian
+
+#if AV_HAVE_BIGENDIAN
+#define av_be2ne16(x) (x)
+#define av_be2ne32(x) (x)
+#define av_be2ne64(x) (x)
+#define av_le2ne16(x) av_bswap16(x)
+#define av_le2ne32(x) av_bswap32(x)
+#define av_le2ne64(x) av_bswap64(x)
+#define AV_BE2NEC(s, x) (x)
+#define AV_LE2NEC(s, x) AV_BSWAPC(s, x)
+#else
+#define av_be2ne16(x) av_bswap16(x)
+#define av_be2ne32(x) av_bswap32(x)
+#define av_be2ne64(x) av_bswap64(x)
+#define av_le2ne16(x) (x)
+#define av_le2ne32(x) (x)
+#define av_le2ne64(x) (x)
+#define AV_BE2NEC(s, x) AV_BSWAPC(s, x)
+#define AV_LE2NEC(s, x) (x)
+#endif
+
+#define AV_BE2NE16C(x) AV_BE2NEC(16, x)
+#define AV_BE2NE32C(x) AV_BE2NEC(32, x)
+#define AV_BE2NE64C(x) AV_BE2NEC(64, x)
+#define AV_LE2NE16C(x) AV_LE2NEC(16, x)
+#define AV_LE2NE32C(x) AV_LE2NEC(32, x)
+#define AV_LE2NE64C(x) AV_LE2NEC(64, x)
+
+#endif /* AVUTIL_BSWAP_H */
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * byte swapping routines
+ */
+
+#ifndef AVUTIL_BSWAP_H
+#define AVUTIL_BSWAP_H
+
+#include <stdint.h>
+#include "libavutil/avconfig.h"
+#include "attributes.h"
+
+#ifdef HAVE_AV_CONFIG_H
+
+#include "config.h"
+
+#if ARCH_AARCH64
+# include "aarch64/bswap.h"
+#elif ARCH_ARM
+# include "arm/bswap.h"
+#elif ARCH_AVR32
+# include "avr32/bswap.h"
+#elif ARCH_SH4
+# include "sh4/bswap.h"
+#elif ARCH_X86
+# include "x86/bswap.h"
+#endif
+
+#endif /* HAVE_AV_CONFIG_H */
+
+#define AV_BSWAP16C(x) (((x) << 8 & 0xff00) | ((x) >> 8 & 0x00ff))
+#define AV_BSWAP32C(x) (AV_BSWAP16C(x) << 16 | AV_BSWAP16C((x) >> 16))
+#define AV_BSWAP64C(x) (AV_BSWAP32C(x) << 32 | AV_BSWAP32C((x) >> 32))
+
+#define AV_BSWAPC(s, x) AV_BSWAP##s##C(x)
+
+#ifndef av_bswap16
+static av_always_inline av_const uint16_t av_bswap16(uint16_t x)
+{
+ x= (x>>8) | (x<<8);
+ return x;
+}
+#endif
+
+#ifndef av_bswap32
+static av_always_inline av_const uint32_t av_bswap32(uint32_t x)
+{
+ return AV_BSWAP32C(x);
+}
+#endif
+
+#ifndef av_bswap64
+static inline uint64_t av_const av_bswap64(uint64_t x)
+{
+ return (uint64_t)av_bswap32(x) << 32 | av_bswap32(x >> 32);
+}
+#endif
+
+// be2ne ... big-endian to native-endian
+// le2ne ... little-endian to native-endian
+
+#if AV_HAVE_BIGENDIAN
+#define av_be2ne16(x) (x)
+#define av_be2ne32(x) (x)
+#define av_be2ne64(x) (x)
+#define av_le2ne16(x) av_bswap16(x)
+#define av_le2ne32(x) av_bswap32(x)
+#define av_le2ne64(x) av_bswap64(x)
+#define AV_BE2NEC(s, x) (x)
+#define AV_LE2NEC(s, x) AV_BSWAPC(s, x)
+#else
+#define av_be2ne16(x) av_bswap16(x)
+#define av_be2ne32(x) av_bswap32(x)
+#define av_be2ne64(x) av_bswap64(x)
+#define av_le2ne16(x) (x)
+#define av_le2ne32(x) (x)
+#define av_le2ne64(x) (x)
+#define AV_BE2NEC(s, x) AV_BSWAPC(s, x)
+#define AV_LE2NEC(s, x) (x)
+#endif
+
+#define AV_BE2NE16C(x) AV_BE2NEC(16, x)
+#define AV_BE2NE32C(x) AV_BE2NEC(32, x)
+#define AV_BE2NE64C(x) AV_BE2NEC(64, x)
+#define AV_LE2NE16C(x) AV_LE2NEC(16, x)
+#define AV_LE2NE32C(x) AV_LE2NEC(32, x)
+#define AV_LE2NE64C(x) AV_LE2NEC(64, x)
+
+#endif /* AVUTIL_BSWAP_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/buffer.h Added

@@ -0,0 +1,548 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * @ingroup lavu_buffer
+ * refcounted data buffer API
+ */
+
+#ifndef AVUTIL_BUFFER_H
+#define AVUTIL_BUFFER_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_buffer AVBuffer
+ * @ingroup lavu_data
+ *
+ * @{
+ * AVBuffer is an API for reference-counted data buffers.
+ *
+ * There are two core objects in this API -- AVBuffer and AVBufferRef. AVBuffer
+ * represents the data buffer itself; it is opaque and not meant to be accessed
+ * by the caller directly, but only through AVBufferRef. However, the caller may
+ * e.g. compare two AVBuffer pointers to check whether two different references
+ * are describing the same data buffer. AVBufferRef represents a single
+ * reference to an AVBuffer and it is the object that may be manipulated by the
+ * caller directly.
+ *
+ * There are two functions provided for creating a new AVBuffer with a single
+ * reference -- av_buffer_alloc() to just allocate a new buffer, and
+ * av_buffer_create() to wrap an existing array in an AVBuffer. From an existing
+ * reference, additional references may be created with av_buffer_ref().
+ * Use av_buffer_unref() to free a reference (this will automatically free the
+ * data once all the references are freed).
+ *
+ * The convention throughout this API and the rest of FFmpeg is such that the
+ * buffer is considered writable if there exists only one reference to it (and
+ * it has not been marked as read-only). The av_buffer_is_writable() function is
+ * provided to check whether this is true and av_buffer_make_writable() will
+ * automatically create a new writable buffer when necessary.
+ * Of course nothing prevents the calling code from violating this convention,
+ * however that is safe only when all the existing references are under its
+ * control.
+ *
+ * @note Referencing and unreferencing the buffers is thread-safe and thus
+ * may be done from multiple threads simultaneously without any need for
+ * additional locking.
+ *
+ * @note Two different references to the same buffer can point to different
+ * parts of the buffer (i.e. their AVBufferRef.data will not be equal).
+ */
+
+/**
+ * A reference counted buffer type. It is opaque and is meant to be used through
+ * references (AVBufferRef).
+ */
+typedef struct AVBuffer AVBuffer;
+
+/**
+ * A reference to a data buffer.
+ *
+ * The size of this struct is not a part of the public ABI and it is not meant
+ * to be allocated directly.
+ */
+typedef struct AVBufferRef {
+ AVBuffer *buffer;
+
+ /**
+ * The data buffer. It is considered writable if and only if
+ * this is the only reference to the buffer, in which case
+ * av_buffer_is_writable() returns 1.
+ */
+ uint8_t *data;
+ /**
+ * Size of data in bytes.
+ */
+ int size;
+} AVBufferRef;
+
+/**
+ * Allocate an AVBuffer of the given size using av_malloc().
+ *
+ * @return an AVBufferRef of given size or NULL when out of memory
+ */
+AVBufferRef *av_buffer_alloc(int size);
+
+/**
+ * Same as av_buffer_alloc(), except the returned buffer will be initialized
+ * to zero.
+ */
+AVBufferRef *av_buffer_allocz(int size);
+
+/**
+ * Always treat the buffer as read-only, even when it has only one
+ * reference.
+ */
+#define AV_BUFFER_FLAG_READONLY (1 << 0)
+
+/**
+ * Create an AVBuffer from an existing array.
+ *
+ * If this function is successful, data is owned by the AVBuffer. The caller may
+ * only access data through the returned AVBufferRef and references derived from
+ * it.
+ * If this function fails, data is left untouched.
+ * @param data data array
+ * @param size size of data in bytes
+ * @param free a callback for freeing this buffer's data
+ * @param opaque parameter to be got for processing or passed to free
+ * @param flags a combination of AV_BUFFER_FLAG_*
+ *
+ * @return an AVBufferRef referring to data on success, NULL on failure.
+ */
+AVBufferRef *av_buffer_create(uint8_t *data, int size,
+ void (*free)(void *opaque, uint8_t *data),
+ void *opaque, int flags);
+
+/**
+ * Default free callback, which calls av_free() on the buffer data.
+ * This function is meant to be passed to av_buffer_create(), not called
+ * directly.
+ */
+void av_buffer_default_free(void *opaque, uint8_t *data);
+
+/**
+ * Create a new reference to an AVBuffer.
+ *
+ * @return a new AVBufferRef referring to the same AVBuffer as buf or NULL on
+ * failure.
+ */
+AVBufferRef *av_buffer_ref(AVBufferRef *buf);
+
+/**
+ * Free a given reference and automatically free the buffer if there are no more
+ * references to it.
+ *
+ * @param buf the reference to be freed. The pointer is set to NULL on return.
+ */
+void av_buffer_unref(AVBufferRef **buf);
+
+/**
+ * @return 1 if the caller may write to the data referred to by buf (which is
+ * true if and only if buf is the only reference to the underlying AVBuffer).
+ * Return 0 otherwise.
+ * A positive answer is valid until av_buffer_ref() is called on buf.
+ */
+int av_buffer_is_writable(const AVBufferRef *buf);
+
+/**
+ * @return the opaque parameter set by av_buffer_create.
+ */
+void *av_buffer_get_opaque(const AVBufferRef *buf);
+
+int av_buffer_get_ref_count(const AVBufferRef *buf);
+
+/**
+ * Create a writable reference from a given buffer reference, avoiding data copy
+ * if possible.
+ *
+ * @param buf buffer reference to make writable. On success, buf is either left
+ * untouched, or it is unreferenced and a new writable AVBufferRef is
+ * written in its place. On failure, buf is left untouched.
+ * @return 0 on success, a negative AVERROR on failure.
+ */
+int av_buffer_make_writable(AVBufferRef **buf);
+
+/**
+ * Reallocate a given buffer.
+ *
+ * @param buf a buffer reference to reallocate. On success, buf will be
+ * unreferenced and a new reference with the required size will be
+ * written in its place. On failure buf will be left untouched. *buf
+ * may be NULL, then a new buffer is allocated.
+ * @param size required new buffer size.
+ * @return 0 on success, a negative AVERROR on failure.
+ *
+ * @note the buffer is actually reallocated with av_realloc() only if it was
+ * initially allocated through av_buffer_realloc(NULL) and there is only one
+ * reference to it (i.e. the one passed to this function). In all other cases
+ * a new buffer is allocated and the data is copied.
+ */
+int av_buffer_realloc(AVBufferRef **buf, int size);
+
+/**
+ * @}
+ */
+
+/**
+ * @defgroup lavu_bufferpool AVBufferPool
+ * @ingroup lavu_data
+ *
+ * @{
+ * AVBufferPool is an API for a lock-free thread-safe pool of AVBuffers.
+ *
+ * Frequently allocating and freeing large buffers may be slow. AVBufferPool is
+ * meant to solve this in cases when the caller needs a set of buffers of the
+ * same size (the most obvious use case being buffers for raw video or audio
+ * frames).
+ *
+ * At the beginning, the user must call av_buffer_pool_init() to create the
+ * buffer pool. Then whenever a buffer is needed, call av_buffer_pool_get() to
+ * get a reference to a new buffer, similar to av_buffer_alloc(). This new
+ * reference works in all aspects the same way as the one created by
+ * av_buffer_alloc(). However, when the last reference to this buffer is
+ * unreferenced, it is returned to the pool instead of being freed and will be
+ * reused for subsequent av_buffer_pool_get() calls.
+ *
+ * When the caller is done with the pool and no longer needs to allocate any new
+ * buffers, av_buffer_pool_uninit() must be called to mark the pool as freeable.
+ * Once all the buffers are released, it will automatically be freed.
+ *
+ * Allocating and releasing buffers with this API is thread-safe as long as
+ * either the default alloc callback is used, or the user-supplied one is
+ * thread-safe.
+ */
+
+/**
+ * The buffer pool. This structure is opaque and not meant to be accessed
+ * directly. It is allocated with av_buffer_pool_init() and freed with
+ * av_buffer_pool_uninit().
+ */
+typedef struct AVBufferPool AVBufferPool;
+
+/**
+ * Allocate and initialize a buffer pool.
+ *
+ * @param size size of each buffer in this pool
+ * @param alloc a function that will be used to allocate new buffers when the
+ * pool is empty. May be NULL, then the default allocator will be used
+ * (av_buffer_alloc()).
+ * @return newly created buffer pool on success, NULL on error.
+ */
+AVBufferPool *av_buffer_pool_init(int size, AVBufferRef* (*alloc)(int size));
+
+/**
+ * Mark the pool as being available for freeing. It will actually be freed only
+ * once all the allocated buffers associated with the pool are released. Thus it
+ * is safe to call this function while some of the allocated buffers are still
+ * in use.
+ *
+ * @param pool pointer to the pool to be freed. It will be set to NULL.
+ * @see av_buffer_pool_can_uninit()
+ */
+void av_buffer_pool_uninit(AVBufferPool **pool);
+
+/**
+ * Allocate a new AVBuffer, reusing an old buffer from the pool when available.
+ * This function may be called simultaneously from multiple threads.
+ *
+ * @return a reference to the new buffer on success, NULL on error.
+ */
+AVBufferRef *av_buffer_pool_get(AVBufferPool *pool);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_BUFFER_H */
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * @ingroup lavu_buffer
+ * refcounted data buffer API
+ */
+
+#ifndef AVUTIL_BUFFER_H
+#define AVUTIL_BUFFER_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_buffer AVBuffer
+ * @ingroup lavu_data
+ *
+ * @{
+ * AVBuffer is an API for reference-counted data buffers.
+ *
+ * There are two core objects in this API -- AVBuffer and AVBufferRef. AVBuffer
+ * represents the data buffer itself; it is opaque and not meant to be accessed
+ * by the caller directly, but only through AVBufferRef. However, the caller may
+ * e.g. compare two AVBuffer pointers to check whether two different references
+ * are describing the same data buffer. AVBufferRef represents a single
+ * reference to an AVBuffer and it is the object that may be manipulated by the
+ * caller directly.
+ *
+ * There are two functions provided for creating a new AVBuffer with a single
+ * reference -- av_buffer_alloc() to just allocate a new buffer, and
+ * av_buffer_create() to wrap an existing array in an AVBuffer. From an existing
+ * reference, additional references may be created with av_buffer_ref().
+ * Use av_buffer_unref() to free a reference (this will automatically free the
+ * data once all the references are freed).
+ *
+ * The convention throughout this API and the rest of FFmpeg is such that the
+ * buffer is considered writable if there exists only one reference to it (and
+ * it has not been marked as read-only). The av_buffer_is_writable() function is
+ * provided to check whether this is true and av_buffer_make_writable() will
+ * automatically create a new writable buffer when necessary.
+ * Of course nothing prevents the calling code from violating this convention,
+ * however that is safe only when all the existing references are under its
+ * control.
+ *
+ * @note Referencing and unreferencing the buffers is thread-safe and thus
+ * may be done from multiple threads simultaneously without any need for
+ * additional locking.
+ *
+ * @note Two different references to the same buffer can point to different
+ * parts of the buffer (i.e. their AVBufferRef.data will not be equal).
+ */
+
+/**
+ * A reference counted buffer type. It is opaque and is meant to be used through
+ * references (AVBufferRef).
+ */
+typedef struct AVBuffer AVBuffer;
+
+/**
+ * A reference to a data buffer.
+ *
+ * The size of this struct is not a part of the public ABI and it is not meant
+ * to be allocated directly.
+ */
+typedef struct AVBufferRef {
+ AVBuffer *buffer;
+
+ /**
+ * The data buffer. It is considered writable if and only if
+ * this is the only reference to the buffer, in which case
+ * av_buffer_is_writable() returns 1.
+ */
+ uint8_t *data;
+ /**
+ * Size of data in bytes.
+ */
+ int size;
+} AVBufferRef;
+
+/**
+ * Allocate an AVBuffer of the given size using av_malloc().
+ *
+ * @return an AVBufferRef of given size or NULL when out of memory
+ */
+AVBufferRef *av_buffer_alloc(int size);
+
+/**
+ * Same as av_buffer_alloc(), except the returned buffer will be initialized
+ * to zero.
+ */
+AVBufferRef *av_buffer_allocz(int size);
+
+/**
+ * Always treat the buffer as read-only, even when it has only one
+ * reference.
+ */
+#define AV_BUFFER_FLAG_READONLY (1 << 0)
+
+/**
+ * Create an AVBuffer from an existing array.
+ *
+ * If this function is successful, data is owned by the AVBuffer. The caller may
+ * only access data through the returned AVBufferRef and references derived from
+ * it.
+ * If this function fails, data is left untouched.
+ * @param data data array
+ * @param size size of data in bytes
+ * @param free a callback for freeing this buffer's data
+ * @param opaque parameter to be got for processing or passed to free
+ * @param flags a combination of AV_BUFFER_FLAG_*
+ *
+ * @return an AVBufferRef referring to data on success, NULL on failure.
+ */
+AVBufferRef *av_buffer_create(uint8_t *data, int size,
+ void (*free)(void *opaque, uint8_t *data),
+ void *opaque, int flags);
+
+/**
+ * Default free callback, which calls av_free() on the buffer data.
+ * This function is meant to be passed to av_buffer_create(), not called
+ * directly.
+ */
+void av_buffer_default_free(void *opaque, uint8_t *data);
+
+/**
+ * Create a new reference to an AVBuffer.
+ *
+ * @return a new AVBufferRef referring to the same AVBuffer as buf or NULL on
+ * failure.
+ */
+AVBufferRef *av_buffer_ref(AVBufferRef *buf);
+
+/**
+ * Free a given reference and automatically free the buffer if there are no more
+ * references to it.
+ *
+ * @param buf the reference to be freed. The pointer is set to NULL on return.
+ */
+void av_buffer_unref(AVBufferRef **buf);
+
+/**
+ * @return 1 if the caller may write to the data referred to by buf (which is
+ * true if and only if buf is the only reference to the underlying AVBuffer).
+ * Return 0 otherwise.
+ * A positive answer is valid until av_buffer_ref() is called on buf.
+ */
+int av_buffer_is_writable(const AVBufferRef *buf);
+
+/**
+ * @return the opaque parameter set by av_buffer_create.
+ */
+void *av_buffer_get_opaque(const AVBufferRef *buf);
+
+int av_buffer_get_ref_count(const AVBufferRef *buf);
+
+/**
+ * Create a writable reference from a given buffer reference, avoiding data copy
+ * if possible.
+ *
+ * @param buf buffer reference to make writable. On success, buf is either left
+ * untouched, or it is unreferenced and a new writable AVBufferRef is
+ * written in its place. On failure, buf is left untouched.
+ * @return 0 on success, a negative AVERROR on failure.
+ */
+int av_buffer_make_writable(AVBufferRef **buf);
+
+/**
+ * Reallocate a given buffer.
+ *
+ * @param buf a buffer reference to reallocate. On success, buf will be
+ * unreferenced and a new reference with the required size will be
+ * written in its place. On failure buf will be left untouched. *buf
+ * may be NULL, then a new buffer is allocated.
+ * @param size required new buffer size.
+ * @return 0 on success, a negative AVERROR on failure.
+ *
+ * @note the buffer is actually reallocated with av_realloc() only if it was
+ * initially allocated through av_buffer_realloc(NULL) and there is only one
+ * reference to it (i.e. the one passed to this function). In all other cases
+ * a new buffer is allocated and the data is copied.
+ */
+int av_buffer_realloc(AVBufferRef **buf, int size);
+
+/**
+ * @}
+ */
+
+/**
+ * @defgroup lavu_bufferpool AVBufferPool
+ * @ingroup lavu_data
+ *
+ * @{
+ * AVBufferPool is an API for a lock-free thread-safe pool of AVBuffers.
+ *
+ * Frequently allocating and freeing large buffers may be slow. AVBufferPool is
+ * meant to solve this in cases when the caller needs a set of buffers of the
+ * same size (the most obvious use case being buffers for raw video or audio
+ * frames).
+ *
+ * At the beginning, the user must call av_buffer_pool_init() to create the
+ * buffer pool. Then whenever a buffer is needed, call av_buffer_pool_get() to
+ * get a reference to a new buffer, similar to av_buffer_alloc(). This new
+ * reference works in all aspects the same way as the one created by
+ * av_buffer_alloc(). However, when the last reference to this buffer is
+ * unreferenced, it is returned to the pool instead of being freed and will be
+ * reused for subsequent av_buffer_pool_get() calls.
+ *
+ * When the caller is done with the pool and no longer needs to allocate any new
+ * buffers, av_buffer_pool_uninit() must be called to mark the pool as freeable.
+ * Once all the buffers are released, it will automatically be freed.
+ *
+ * Allocating and releasing buffers with this API is thread-safe as long as
+ * either the default alloc callback is used, or the user-supplied one is
+ * thread-safe.
+ */
+
+/**
+ * The buffer pool. This structure is opaque and not meant to be accessed
+ * directly. It is allocated with av_buffer_pool_init() and freed with
+ * av_buffer_pool_uninit().
+ */
+typedef struct AVBufferPool AVBufferPool;
+
+/**
+ * Allocate and initialize a buffer pool.
+ *
+ * @param size size of each buffer in this pool
+ * @param alloc a function that will be used to allocate new buffers when the
+ * pool is empty. May be NULL, then the default allocator will be used
+ * (av_buffer_alloc()).
+ * @return newly created buffer pool on success, NULL on error.
+ */
+AVBufferPool *av_buffer_pool_init(int size, AVBufferRef* (*alloc)(int size));
+
+/**
+ * Mark the pool as being available for freeing. It will actually be freed only
+ * once all the allocated buffers associated with the pool are released. Thus it
+ * is safe to call this function while some of the allocated buffers are still
+ * in use.
+ *
+ * @param pool pointer to the pool to be freed. It will be set to NULL.
+ * @see av_buffer_pool_can_uninit()
+ */
+void av_buffer_pool_uninit(AVBufferPool **pool);
+
+/**
+ * Allocate a new AVBuffer, reusing an old buffer from the pool when available.
+ * This function may be called simultaneously from multiple threads.
+ *
+ * @return a reference to the new buffer on success, NULL on error.
+ */
+AVBufferRef *av_buffer_pool_get(AVBufferPool *pool);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_BUFFER_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/channel_layout.h Added

@@ -0,0 +1,444 @@
+/*
+ * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (c) 2008 Peter Ross
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_CHANNEL_LAYOUT_H
+#define AVUTIL_CHANNEL_LAYOUT_H
+
+#include <stdint.h>
+
+/**
+ * @file
+ * audio channel layout utility functions
+ */
+
+/**
+ * @addtogroup lavu_audio
+ * @{
+ */
+
+/**
+ * @defgroup channel_masks Audio channel masks
+ *
+ * A channel layout is a 64-bits integer with a bit set for every channel.
+ * The number of bits set must be equal to the number of channels.
+ * The value 0 means that the channel layout is not known.
+ * @note this data structure is not powerful enough to handle channels
+ * combinations that have the same channel multiple times, such as
+ * dual-mono.
+ *
+ * @{
+ */
+#define AV_CH_FRONT_LEFT 0x00000001
+#define AV_CH_FRONT_RIGHT 0x00000002
+#define AV_CH_FRONT_CENTER 0x00000004
+#define AV_CH_LOW_FREQUENCY 0x00000008
+#define AV_CH_BACK_LEFT 0x00000010
+#define AV_CH_BACK_RIGHT 0x00000020
+#define AV_CH_FRONT_LEFT_OF_CENTER 0x00000040
+#define AV_CH_FRONT_RIGHT_OF_CENTER 0x00000080
+#define AV_CH_BACK_CENTER 0x00000100
+#define AV_CH_SIDE_LEFT 0x00000200
+#define AV_CH_SIDE_RIGHT 0x00000400
+#define AV_CH_TOP_CENTER 0x00000800
+#define AV_CH_TOP_FRONT_LEFT 0x00001000
+#define AV_CH_TOP_FRONT_CENTER 0x00002000
+#define AV_CH_TOP_FRONT_RIGHT 0x00004000
+#define AV_CH_TOP_BACK_LEFT 0x00008000
+#define AV_CH_TOP_BACK_CENTER 0x00010000
+#define AV_CH_TOP_BACK_RIGHT 0x00020000
+#define AV_CH_STEREO_LEFT 0x20000000 ///< Stereo downmix.
+#define AV_CH_STEREO_RIGHT 0x40000000 ///< See AV_CH_STEREO_LEFT.
+#define AV_CH_WIDE_LEFT 0x0000000080000000ULL
+#define AV_CH_WIDE_RIGHT 0x0000000100000000ULL
+#define AV_CH_SURROUND_DIRECT_LEFT 0x0000000200000000ULL
+#define AV_CH_SURROUND_DIRECT_RIGHT 0x0000000400000000ULL
+#define AV_CH_LOW_FREQUENCY_2 0x0000000800000000ULL
+
+/** Channel mask value used for AVCodecContext.request_channel_layout
+ to indicate that the user requests the channel order of the decoder output
+ to be the native codec channel order. */
+#define AV_CH_LAYOUT_NATIVE 0x8000000000000000ULL
+
+/**
+ * @}
+ * @defgroup channel_mask_c Audio channel layouts
+ * @{
+ * */
+#define AV_CH_LAYOUT_MONO (AV_CH_FRONT_CENTER)
+#define AV_CH_LAYOUT_STEREO (AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT)
+#define AV_CH_LAYOUT_2POINT1 (AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_2_1 (AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_SURROUND (AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER)
+#define AV_CH_LAYOUT_3POINT1 (AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_4POINT0 (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_4POINT1 (AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_2_2 (AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
+#define AV_CH_LAYOUT_QUAD (AV_CH_LAYOUT_STEREO|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_5POINT0 (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
+#define AV_CH_LAYOUT_5POINT1 (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_5POINT0_BACK (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_5POINT1_BACK (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_6POINT0 (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT0_FRONT (AV_CH_LAYOUT_2_2|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_HEXAGONAL (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT1 (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT1_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT1_FRONT (AV_CH_LAYOUT_6POINT0_FRONT|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_7POINT0 (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_7POINT0_FRONT (AV_CH_LAYOUT_5POINT0|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_7POINT1 (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_7POINT1_WIDE (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_7POINT1_WIDE_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_OCTAGONAL (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_STEREO_DOWNMIX (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT)
+
+enum AVMatrixEncoding {
+ AV_MATRIX_ENCODING_NONE,
+ AV_MATRIX_ENCODING_DOLBY,
+ AV_MATRIX_ENCODING_DPLII,
+ AV_MATRIX_ENCODING_DPLIIX,
+ AV_MATRIX_ENCODING_DPLIIZ,
+ AV_MATRIX_ENCODING_DOLBYEX,
+ AV_MATRIX_ENCODING_DOLBYHEADPHONE,
+ AV_MATRIX_ENCODING_NB
+};
+
+/**
+ * Return a channel layout id that matches name, or 0 if no match is found.
+ *
+ * name can be one or several of the following notations,
+ * separated by '+' or '|':
+ * - the name of an usual channel layout (mono, stereo, 4.0, quad, 5.0,
+ * 5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix);
+ * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC,
+ * SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR);
+ * - a number of channels, in decimal, optionally followed by 'c', yielding
+ * the default channel layout for that number of channels (@see
+ * av_get_default_channel_layout);
+ * - a channel layout mask, in hexadecimal starting with "0x" (see the
+ * AV_CH_* macros).
+ *
+ * @warning Starting from the next major bump the trailing character
+ * 'c' to specify a number of channels will be required, while a
+ * channel layout mask could also be specified as a decimal number
+ * (if and only if not followed by "c").
+ *
+ * Example: "stereo+FC" = "2c+FC" = "2c+1c" = "0x7"
+ */
+uint64_t av_get_channel_layout(const char *name);
+
+/**
+ * Return a description of a channel layout.
+ * If nb_channels is <= 0, it is guessed from the channel_layout.
+ *
+ * @param buf put here the string containing the channel layout
+ * @param buf_size size in bytes of the buffer
+ */
+void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, uint64_t channel_layout);
+
+struct AVBPrint;
+/**
+ * Append a description of a channel layout to a bprint buffer.
+ */
+void av_bprint_channel_layout(struct AVBPrint *bp, int nb_channels, uint64_t channel_layout);
+
+/**
+ * Return the number of channels in the channel layout.
+ */
+int av_get_channel_layout_nb_channels(uint64_t channel_layout);
+
+/**
+ * Return default channel layout for a given number of channels.
+ */
+int64_t av_get_default_channel_layout(int nb_channels);
+
+/**
+ * Get the index of a channel in channel_layout.
+ *
+ * @param channel a channel layout describing exactly one channel which must be
+ * present in channel_layout.
+ *
+ * @return index of channel in channel_layout on success, a negative AVERROR
+ * on error.
+ */
+int av_get_channel_layout_channel_index(uint64_t channel_layout,
+ uint64_t channel);
+
+/**
+ * Get the channel with the given index in channel_layout.
+ */
+uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index);
+
+/**
+ * Get the name of a given channel.
+ *
+ * @return channel name on success, NULL on error.
+ */
+const char *av_get_channel_name(uint64_t channel);
+
+/**
+ * Get the description of a given channel.
+ *
+ * @param channel a channel layout with a single channel
+ * @return channel description on success, NULL on error
+ */
+const char *av_get_channel_description(uint64_t channel);
+
+/**
+ * Get the value and name of a standard channel layout.
+ *
+ * @param[in] index index in an internal list, starting at 0
+ * @param[out] layout channel layout mask
+ * @param[out] name name of the layout
+ * @return 0 if the layout exists,
+ * <0 if index is beyond the limits
+ */
+int av_get_standard_channel_layout(unsigned index, uint64_t *layout,
+ const char **name);
+
+/**
+ * @}
+ * @}
+ */
+
+#endif /* AVUTIL_CHANNEL_LAYOUT_H */
+/*
+ * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (c) 2008 Peter Ross
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_CHANNEL_LAYOUT_H
+#define AVUTIL_CHANNEL_LAYOUT_H
+
+#include <stdint.h>
+
+/**
+ * @file
+ * audio channel layout utility functions
+ */
+
+/**
+ * @addtogroup lavu_audio
+ * @{
+ */
+
+/**
+ * @defgroup channel_masks Audio channel masks
+ *
+ * A channel layout is a 64-bits integer with a bit set for every channel.
+ * The number of bits set must be equal to the number of channels.
+ * The value 0 means that the channel layout is not known.
+ * @note this data structure is not powerful enough to handle channels
+ * combinations that have the same channel multiple times, such as
+ * dual-mono.
+ *
+ * @{
+ */
+#define AV_CH_FRONT_LEFT 0x00000001
+#define AV_CH_FRONT_RIGHT 0x00000002
+#define AV_CH_FRONT_CENTER 0x00000004
+#define AV_CH_LOW_FREQUENCY 0x00000008
+#define AV_CH_BACK_LEFT 0x00000010
+#define AV_CH_BACK_RIGHT 0x00000020
+#define AV_CH_FRONT_LEFT_OF_CENTER 0x00000040
+#define AV_CH_FRONT_RIGHT_OF_CENTER 0x00000080
+#define AV_CH_BACK_CENTER 0x00000100
+#define AV_CH_SIDE_LEFT 0x00000200
+#define AV_CH_SIDE_RIGHT 0x00000400
+#define AV_CH_TOP_CENTER 0x00000800
+#define AV_CH_TOP_FRONT_LEFT 0x00001000
+#define AV_CH_TOP_FRONT_CENTER 0x00002000
+#define AV_CH_TOP_FRONT_RIGHT 0x00004000
+#define AV_CH_TOP_BACK_LEFT 0x00008000
+#define AV_CH_TOP_BACK_CENTER 0x00010000
+#define AV_CH_TOP_BACK_RIGHT 0x00020000
+#define AV_CH_STEREO_LEFT 0x20000000 ///< Stereo downmix.
+#define AV_CH_STEREO_RIGHT 0x40000000 ///< See AV_CH_STEREO_LEFT.
+#define AV_CH_WIDE_LEFT 0x0000000080000000ULL
+#define AV_CH_WIDE_RIGHT 0x0000000100000000ULL
+#define AV_CH_SURROUND_DIRECT_LEFT 0x0000000200000000ULL
+#define AV_CH_SURROUND_DIRECT_RIGHT 0x0000000400000000ULL
+#define AV_CH_LOW_FREQUENCY_2 0x0000000800000000ULL
+
+/** Channel mask value used for AVCodecContext.request_channel_layout
+ to indicate that the user requests the channel order of the decoder output
+ to be the native codec channel order. */
+#define AV_CH_LAYOUT_NATIVE 0x8000000000000000ULL
+
+/**
+ * @}
+ * @defgroup channel_mask_c Audio channel layouts
+ * @{
+ * */
+#define AV_CH_LAYOUT_MONO (AV_CH_FRONT_CENTER)
+#define AV_CH_LAYOUT_STEREO (AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT)
+#define AV_CH_LAYOUT_2POINT1 (AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_2_1 (AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_SURROUND (AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER)
+#define AV_CH_LAYOUT_3POINT1 (AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_4POINT0 (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_4POINT1 (AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_2_2 (AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
+#define AV_CH_LAYOUT_QUAD (AV_CH_LAYOUT_STEREO|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_5POINT0 (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
+#define AV_CH_LAYOUT_5POINT1 (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_5POINT0_BACK (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_5POINT1_BACK (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_6POINT0 (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT0_FRONT (AV_CH_LAYOUT_2_2|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_HEXAGONAL (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT1 (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT1_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT1_FRONT (AV_CH_LAYOUT_6POINT0_FRONT|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_7POINT0 (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_7POINT0_FRONT (AV_CH_LAYOUT_5POINT0|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_7POINT1 (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_7POINT1_WIDE (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_7POINT1_WIDE_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_OCTAGONAL (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_STEREO_DOWNMIX (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT)
+
+enum AVMatrixEncoding {
+ AV_MATRIX_ENCODING_NONE,
+ AV_MATRIX_ENCODING_DOLBY,
+ AV_MATRIX_ENCODING_DPLII,
+ AV_MATRIX_ENCODING_DPLIIX,
+ AV_MATRIX_ENCODING_DPLIIZ,
+ AV_MATRIX_ENCODING_DOLBYEX,
+ AV_MATRIX_ENCODING_DOLBYHEADPHONE,
+ AV_MATRIX_ENCODING_NB
+};
+
+/**
+ * Return a channel layout id that matches name, or 0 if no match is found.
+ *
+ * name can be one or several of the following notations,
+ * separated by '+' or '|':
+ * - the name of an usual channel layout (mono, stereo, 4.0, quad, 5.0,
+ * 5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix);
+ * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC,
+ * SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR);
+ * - a number of channels, in decimal, optionally followed by 'c', yielding
+ * the default channel layout for that number of channels (@see
+ * av_get_default_channel_layout);
+ * - a channel layout mask, in hexadecimal starting with "0x" (see the
+ * AV_CH_* macros).
+ *
+ * @warning Starting from the next major bump the trailing character
+ * 'c' to specify a number of channels will be required, while a
+ * channel layout mask could also be specified as a decimal number
+ * (if and only if not followed by "c").
+ *
+ * Example: "stereo+FC" = "2c+FC" = "2c+1c" = "0x7"
+ */
+uint64_t av_get_channel_layout(const char *name);
+
+/**
+ * Return a description of a channel layout.
+ * If nb_channels is <= 0, it is guessed from the channel_layout.
+ *
+ * @param buf put here the string containing the channel layout
+ * @param buf_size size in bytes of the buffer
+ */
+void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, uint64_t channel_layout);
+
+struct AVBPrint;
+/**
+ * Append a description of a channel layout to a bprint buffer.
+ */
+void av_bprint_channel_layout(struct AVBPrint *bp, int nb_channels, uint64_t channel_layout);
+
+/**
+ * Return the number of channels in the channel layout.
+ */
+int av_get_channel_layout_nb_channels(uint64_t channel_layout);
+
+/**
+ * Return default channel layout for a given number of channels.
+ */
+int64_t av_get_default_channel_layout(int nb_channels);
+
+/**
+ * Get the index of a channel in channel_layout.
+ *
+ * @param channel a channel layout describing exactly one channel which must be
+ * present in channel_layout.
+ *
+ * @return index of channel in channel_layout on success, a negative AVERROR
+ * on error.
+ */
+int av_get_channel_layout_channel_index(uint64_t channel_layout,
+ uint64_t channel);
+
+/**
+ * Get the channel with the given index in channel_layout.
+ */
+uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index);
+
+/**
+ * Get the name of a given channel.
+ *
+ * @return channel name on success, NULL on error.
+ */
+const char *av_get_channel_name(uint64_t channel);
+
+/**
+ * Get the description of a given channel.
+ *
+ * @param channel a channel layout with a single channel
+ * @return channel description on success, NULL on error
+ */
+const char *av_get_channel_description(uint64_t channel);
+
+/**
+ * Get the value and name of a standard channel layout.
+ *
+ * @param[in] index index in an internal list, starting at 0
+ * @param[out] layout channel layout mask
+ * @param[out] name name of the layout
+ * @return 0 if the layout exists,
+ * <0 if index is beyond the limits
+ */
+int av_get_standard_channel_layout(unsigned index, uint64_t *layout,
+ const char **name);
+
+/**
+ * @}
+ * @}
+ */
+
+#endif /* AVUTIL_CHANNEL_LAYOUT_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/ffmpeg_android/libavutil/common.h -> gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/common.h Changed

@@ -19,27 +19,45 @@
 */
 
 /**
- * @file libavutil/common.h
+ * @file
 * common internal and external API header
 */
 
 #ifndef AVUTIL_COMMON_H
 #define AVUTIL_COMMON_H
 
-#include <ctype.h>
+#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS) && !defined(UINT64_C)
+#error missing -D__STDC_CONSTANT_MACROS / #define __STDC_CONSTANT_MACROS
+#endif
+
 #include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <math.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "attributes.h"
+#include "version.h"
+#include "libavutil/avconfig.h"
+
+#if AV_HAVE_BIGENDIAN
+# define AV_NE(be, le) (be)
+#else
+# define AV_NE(be, le) (le)
+#endif
 
 //rounded division & shift
 #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
 /* assume b>0 */
 #define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
+/* assume a>0 and b>0 */
+#define FF_CEIL_RSHIFT(a,b) (!av_builtin_constant_p(b) ? -((-(a)) >> (b)) \
+ : ((a) + (1<<(b)) - 1) >> (b))
+#define FFUDIV(a,b) (((a)>0 ?(a):(a)-(b)+1) / (b))
+#define FFUMOD(a,b) ((a)-(b)*FFUDIV(a,b))
 #define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
 #define FFSIGN(a) ((a) > 0 ? 1 : -1)
 
@@ -53,162 +71,265 @@
 #define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
 
 /* misc math functions */
-extern const uint8_t ff_log2_tab[256];
-
-extern const uint8_t av_reverse[256];
-
-static inline av_const int av_log2_c(unsigned int v)
-{
- int n = 0;
- if (v & 0xffff0000) {
- v >>= 16;
- n += 16;
- }
- if (v & 0xff00) {
- v >>= 8;
- n += 8;
- }
- n += ff_log2_tab[v];
-
- return n;
-}
-
-static inline av_const int av_log2_16bit_c(unsigned int v)
-{
- int n = 0;
- if (v & 0xff00) {
- v >>= 8;
- n += 8;
- }
- n += ff_log2_tab[v];
 
- return n;
-}
+/**
+ * Reverse the order of the bits of an 8-bits unsigned integer.
+ */
+#if FF_API_AV_REVERSE
+extern attribute_deprecated const uint8_t av_reverse[256];
+#endif
 
 #ifdef HAVE_AV_CONFIG_H
 # include "config.h"
 # include "intmath.h"
 #endif
 
+/* Pull in unguarded fallback defines at the end of this file. */
+#include "common.h"
+
 #ifndef av_log2
-# define av_log2 av_log2_c
+av_const int av_log2(unsigned v);
 #endif
+
 #ifndef av_log2_16bit
-# define av_log2_16bit av_log2_16bit_c
+av_const int av_log2_16bit(unsigned v);
 #endif
 
 /**
- * Clips a signed integer value into the amin-amax range.
+ * Clip a signed integer value into the amin-amax range.
 * @param a value to clip
 * @param amin minimum value of the clip range
 * @param amax maximum value of the clip range
 * @return clipped value
 */
-static inline av_const int av_clip(int a, int amin, int amax)
+static av_always_inline av_const int av_clip_c(int a, int amin, int amax)
 {
+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
+ if (amin > amax) abort();
+#endif
 if (a < amin) return amin;
 else if (a > amax) return amax;
 else return a;
 }
 
 /**
- * Clips a signed integer value into the 0-255 range.
+ * Clip a signed 64bit integer value into the amin-amax range.
 * @param a value to clip
+ * @param amin minimum value of the clip range
+ * @param amax maximum value of the clip range
 * @return clipped value
 */
-static inline av_const uint8_t av_clip_uint8(int a)
+static av_always_inline av_const int64_t av_clip64_c(int64_t a, int64_t amin, int64_t amax)
 {
- if (a&(~255)) return (-a)>>31;
- else return a;
+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
+ if (amin > amax) abort();
+#endif
+ if (a < amin) return amin;
+ else if (a > amax) return amax;
+ else return a;
 }
 
 /**
- * Clips a signed integer value into the 0-65535 range.
+ * Clip a signed integer value into the 0-255 range.
 * @param a value to clip
 * @return clipped value
 */
-static inline av_const uint16_t av_clip_uint16(int a)
+static av_always_inline av_const uint8_t av_clip_uint8_c(int a)
+{
+ if (a&(~0xFF)) return (-a)>>31;
+ else return a;
+}
+
+/**
+ * Clip a signed integer value into the -128,127 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const int8_t av_clip_int8_c(int a)
+{
+ if ((a+0x80) & ~0xFF) return (a>>31) ^ 0x7F;
+ else return a;
+}
+
+/**
+ * Clip a signed integer value into the 0-65535 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const uint16_t av_clip_uint16_c(int a)
+{
+ if (a&(~0xFFFF)) return (-a)>>31;
+ else return a;
+}
+
+/**
+ * Clip a signed integer value into the -32768,32767 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const int16_t av_clip_int16_c(int a)
+{
+ if ((a+0x8000) & ~0xFFFF) return (a>>31) ^ 0x7FFF;
+ else return a;
+}
+
+/**
+ * Clip a signed 64-bit integer value into the -2147483648,2147483647 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a)
+{
+ if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (int32_t)((a>>63) ^ 0x7FFFFFFF);
+ else return (int32_t)a;
+}
+
+/**
+ * Clip a signed integer to an unsigned power of two range.
+ * @param a value to clip
+ * @param p bit position to clip at
+ * @return clipped value
+ */
+static av_always_inline av_const unsigned av_clip_uintp2_c(int a, int p)
+{
+ if (a & ~((1<<p) - 1)) return -a >> 31 & ((1<<p) - 1);
+ else return a;
+}
+
+/**
+ * Add two signed 32-bit values with saturation.
+ *
+ * @param a one value
+ * @param b another value
+ * @return sum with signed saturation
+ */
+static av_always_inline int av_sat_add32_c(int a, int b)
+{
+ return av_clipl_int32((int64_t)a + b);
+}
+
+/**
+ * Add a doubled value to another value with saturation at both stages.
+ *
+ * @param a first value
+ * @param b value doubled and added to a
+ * @return sum with signed saturation
+ */
+static av_always_inline int av_sat_dadd32_c(int a, int b)
 {
- if (a&(~65535)) return (-a)>>31;
- else return a;
+ return av_sat_add32(a, av_sat_add32(b, b));
 }
 
 /**
- * Clips a signed integer value into the -32768,32767 range.
+ * Clip a float value into the amin-amax range.
 * @param a value to clip
+ * @param amin minimum value of the clip range
+ * @param amax maximum value of the clip range
 * @return clipped value
 */
-static inline av_const int16_t av_clip_int16(int a)
+static av_always_inline av_const float av_clipf_c(float a, float amin, float amax)
 {
- if ((a+32768) & ~65535) return (a>>31) ^ 32767;
- else return a;
+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
+ if (amin > amax) abort();
+#endif
+ if (a < amin) return amin;
+ else if (a > amax) return amax;
+ else return a;
 }
 
 /**
- * Clips a float value into the amin-amax range.
+ * Clip a double value into the amin-amax range.
 * @param a value to clip
 * @param amin minimum value of the clip range
 * @param amax maximum value of the clip range
 * @return clipped value
 */
-static inline av_const float av_clipf(float a, float amin, float amax)
+static av_always_inline av_const double av_clipd_c(double a, double amin, double amax)
 {
+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
+ if (amin > amax) abort();
+#endif
 if (a < amin) return amin;
 else if (a > amax) return amax;
 else return a;
 }
 
-/** Computes ceil(log2(x)).
+/** Compute ceil(log2(x)).
 * @param x value used to compute ceil(log2(x))
 * @return computed ceiling of log2(x)
 */
-static inline av_const int av_ceil_log2(int x)
+static av_always_inline av_const int av_ceil_log2_c(int x)
 {
 return av_log2((x - 1) << 1);
 }
 
-#define MKTAG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24))
-#define MKBETAG(a,b,c,d) (d | (c << 8) | (b << 16) | (a << 24))
-
-/*!
- * \def GET_UTF8(val, GET_BYTE, ERROR)
- * Converts a UTF-8 character (up to 4 bytes long) to its 32-bit UCS-4 encoded form
- * \param val is the output and should be of type uint32_t. It holds the converted
- * UCS-4 character and should be a left value.
- * \param GET_BYTE gets UTF-8 encoded bytes from any proper source. It can be
- * a function or a statement whose return value or evaluated value is of type
- * uint8_t. It will be executed up to 4 times for values in the valid UTF-8 range,
- * and up to 7 times in the general case.
- * \param ERROR action that should be taken when an invalid UTF-8 byte is returned
- * from GET_BYTE. It should be a statement that jumps out of the macro,
- * like exit(), goto, return, break, or continue.
+/**
+ * Count number of bits set to one in x
+ * @param x value to count bits of
+ * @return the number of bits set to one in x
+ */
+static av_always_inline av_const int av_popcount_c(uint32_t x)
+{
+ x -= (x >> 1) & 0x55555555;
+ x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
+ x = (x + (x >> 4)) & 0x0F0F0F0F;
+ x += x >> 8;
+ return (x + (x >> 16)) & 0x3F;
+}
+
+/**
+ * Count number of bits set to one in x
+ * @param x value to count bits of
+ * @return the number of bits set to one in x
+ */
+static av_always_inline av_const int av_popcount64_c(uint64_t x)
+{
+ return av_popcount((uint32_t)x) + av_popcount((uint32_t)(x >> 32));
+}
+
+#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24))
+#define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24))
+
+/**
+ * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form.
+ *
+ * @param val Output value, must be an lvalue of type uint32_t.
+ * @param GET_BYTE Expression reading one byte from the input.
+ * Evaluated up to 7 times (4 for the currently
+ * assigned Unicode range). With a memory buffer
+ * input, this could be *ptr++.
+ * @param ERROR Expression to be evaluated on invalid input,
+ * typically a goto statement.
+ *
+ * @warning ERROR should not contain a loop control statement which
+ * could interact with the internal while loop, and should force an
+ * exit from the macro code (e.g. through a goto or a return) in order
+ * to prevent undefined results.
 */
 #define GET_UTF8(val, GET_BYTE, ERROR)\
 val= GET_BYTE;\
 {\
- int ones= 7 - av_log2(val ^ 255);\
- if(ones==1)\
+ uint32_t top = (val & 128) >> 1;\
+ if ((val & 0xc0) == 0x80 || val >= 0xFE)\
 ERROR\
- val&= 127>>ones;\
- while(--ones > 0){\
+ while (val & top) {\
 int tmp= GET_BYTE - 128;\
 if(tmp>>6)\
 ERROR\
 val= (val<<6) + tmp;\
+ top <<= 5;\
 }\
+ val &= (top << 1) - 1;\
 }
 
-/*!
- * \def GET_UTF16(val, GET_16BIT, ERROR)
- * Converts a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form
- * \param val is the output and should be of type uint32_t. It holds the converted
- * UCS-4 character and should be a left value.
- * \param GET_16BIT gets two bytes of UTF-16 encoded data converted to native endianness.
- * It can be a function or a statement whose return value or evaluated value is of type
- * uint16_t. It will be executed up to 2 times.
- * \param ERROR action that should be taken when an invalid UTF-16 surrogate is
- * returned from GET_BYTE. It should be a statement that jumps out of the macro,
- * like exit(), goto, return, break, or continue.
+/**
+ * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form.
+ *
+ * @param val Output value, must be an lvalue of type uint32_t.
+ * @param GET_16BIT Expression returning two bytes of UTF-16 data converted
+ * to native byte order. Evaluated one or two times.
+ * @param ERROR Expression to be evaluated on invalid input,
+ * typically a goto statement.
 */
 #define GET_UTF16(val, GET_16BIT, ERROR)\
 val = GET_16BIT;\
@@ -222,16 +343,16 @@
 }\
 }\
 
-/*!
- * \def PUT_UTF8(val, tmp, PUT_BYTE)
- * Converts a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long).
- * \param val is an input-only argument and should be of type uint32_t. It holds
+/**
+ * @def PUT_UTF8(val, tmp, PUT_BYTE)
+ * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long).
+ * @param val is an input-only argument and should be of type uint32_t. It holds
 * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If
 * val is given as a function it is executed only once.
- * \param tmp is a temporary variable and should be of type uint8_t. It
+ * @param tmp is a temporary variable and should be of type uint8_t. It
 * represents an intermediate value during conversion that is to be
 * output by PUT_BYTE.
- * \param PUT_BYTE writes the converted UTF-8 bytes to any proper destination.
+ * @param PUT_BYTE writes the converted UTF-8 bytes to any proper destination.
 * It could be a function or a statement, and uses tmp as the input byte.
 * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be
 * executed up to 4 times for values in the valid UTF-8 range and up to
@@ -258,16 +379,16 @@
 }\
 }
 
-/*!
- * \def PUT_UTF16(val, tmp, PUT_16BIT)
- * Converts a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes).
- * \param val is an input-only argument and should be of type uint32_t. It holds
+/**
+ * @def PUT_UTF16(val, tmp, PUT_16BIT)
+ * Convert a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes).
+ * @param val is an input-only argument and should be of type uint32_t. It holds
 * a UCS-4 encoded Unicode character that is to be converted to UTF-16. If
 * val is given as a function it is executed only once.
- * \param tmp is a temporary variable and should be of type uint16_t. It
+ * @param tmp is a temporary variable and should be of type uint16_t. It
 * represents an intermediate value during conversion that is to be
 * output by PUT_16BIT.
- * \param PUT_16BIT writes the converted UTF-16 data to any proper destination
+ * @param PUT_16BIT writes the converted UTF-16 data to any proper destination
 * in desired endianness. It could be a function or a statement, and uses tmp
 * as the input byte. For example, PUT_BYTE could be "*output++ = tmp;"
 * PUT_BYTE will be executed 1 or 2 times depending on input character.
@@ -295,3 +416,54 @@
 #endif /* HAVE_AV_CONFIG_H */
 
 #endif /* AVUTIL_COMMON_H */
+
+/*
+ * The following definitions are outside the multiple inclusion guard
+ * to ensure they are immediately available in intmath.h.
+ */
+
+#ifndef av_ceil_log2
+# define av_ceil_log2 av_ceil_log2_c
+#endif
+#ifndef av_clip
+# define av_clip av_clip_c
+#endif
+#ifndef av_clip64
+# define av_clip64 av_clip64_c
+#endif
+#ifndef av_clip_uint8
+# define av_clip_uint8 av_clip_uint8_c
+#endif
+#ifndef av_clip_int8
+# define av_clip_int8 av_clip_int8_c
+#endif
+#ifndef av_clip_uint16
+# define av_clip_uint16 av_clip_uint16_c
+#endif
+#ifndef av_clip_int16
+# define av_clip_int16 av_clip_int16_c
+#endif
+#ifndef av_clipl_int32
+# define av_clipl_int32 av_clipl_int32_c
+#endif
+#ifndef av_clip_uintp2
+# define av_clip_uintp2 av_clip_uintp2_c
+#endif
+#ifndef av_sat_add32
+# define av_sat_add32 av_sat_add32_c
+#endif
+#ifndef av_sat_dadd32
+# define av_sat_dadd32 av_sat_dadd32_c
+#endif
+#ifndef av_clipf
+# define av_clipf av_clipf_c
+#endif
+#ifndef av_clipd
+# define av_clipd av_clipd_c
+#endif
+#ifndef av_popcount
+# define av_popcount av_popcount_c
+#endif
+#ifndef av_popcount64
+# define av_popcount64 av_popcount64_c
+#endif

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/cpu.h Added

@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_CPU_H
+#define AVUTIL_CPU_H
+
+#include "attributes.h"
+
+#define AV_CPU_FLAG_FORCE 0x80000000 /* force usage of selected flags (OR) */
+
+ /* lower 16 bits - CPU features */
+#define AV_CPU_FLAG_MMX 0x0001 ///< standard MMX
+#define AV_CPU_FLAG_MMXEXT 0x0002 ///< SSE integer functions or AMD MMX ext
+#define AV_CPU_FLAG_MMX2 0x0002 ///< SSE integer functions or AMD MMX ext
+#define AV_CPU_FLAG_3DNOW 0x0004 ///< AMD 3DNOW
+#define AV_CPU_FLAG_SSE 0x0008 ///< SSE functions
+#define AV_CPU_FLAG_SSE2 0x0010 ///< PIV SSE2 functions
+#define AV_CPU_FLAG_SSE2SLOW 0x40000000 ///< SSE2 supported, but usually not faster
+ ///< than regular MMX/SSE (e.g. Core1)
+#define AV_CPU_FLAG_3DNOWEXT 0x0020 ///< AMD 3DNowExt
+#define AV_CPU_FLAG_SSE3 0x0040 ///< Prescott SSE3 functions
+#define AV_CPU_FLAG_SSE3SLOW 0x20000000 ///< SSE3 supported, but usually not faster
+ ///< than regular MMX/SSE (e.g. Core1)
+#define AV_CPU_FLAG_SSSE3 0x0080 ///< Conroe SSSE3 functions
+#define AV_CPU_FLAG_ATOM 0x10000000 ///< Atom processor, some SSSE3 instructions are slower
+#define AV_CPU_FLAG_SSE4 0x0100 ///< Penryn SSE4.1 functions
+#define AV_CPU_FLAG_SSE42 0x0200 ///< Nehalem SSE4.2 functions
+#define AV_CPU_FLAG_AVX 0x4000 ///< AVX functions: requires OS support even if YMM registers aren't used
+#define AV_CPU_FLAG_XOP 0x0400 ///< Bulldozer XOP functions
+#define AV_CPU_FLAG_FMA4 0x0800 ///< Bulldozer FMA4 functions
+// #if LIBAVUTIL_VERSION_MAJOR <52
+#define AV_CPU_FLAG_CMOV 0x1001000 ///< supports cmov instruction
+// #else
+// #define AV_CPU_FLAG_CMOV 0x1000 ///< supports cmov instruction
+// #endif
+#define AV_CPU_FLAG_AVX2 0x8000 ///< AVX2 functions: requires OS support even if YMM registers aren't used
+#define AV_CPU_FLAG_FMA3 0x10000 ///< Haswell FMA3 functions
+#define AV_CPU_FLAG_BMI1 0x20000 ///< Bit Manipulation Instruction Set 1
+#define AV_CPU_FLAG_BMI2 0x40000 ///< Bit Manipulation Instruction Set 2
+
+#define AV_CPU_FLAG_ALTIVEC 0x0001 ///< standard
+
+#define AV_CPU_FLAG_ARMV5TE (1 << 0)
+#define AV_CPU_FLAG_ARMV6 (1 << 1)
+#define AV_CPU_FLAG_ARMV6T2 (1 << 2)
+#define AV_CPU_FLAG_VFP (1 << 3)
+#define AV_CPU_FLAG_VFPV3 (1 << 4)
+#define AV_CPU_FLAG_NEON (1 << 5)
+#define AV_CPU_FLAG_ARMV8 (1 << 6)
+#define AV_CPU_FLAG_SETEND (1 <<16)
+
+/**
+ * Return the flags which specify extensions supported by the CPU.
+ * The returned value is affected by av_force_cpu_flags() if that was used
+ * before. So av_get_cpu_flags() can easily be used in a application to
+ * detect the enabled cpu flags.
+ */
+int av_get_cpu_flags(void);
+
+/**
+ * Disables cpu detection and forces the specified flags.
+ * -1 is a special case that disables forcing of specific flags.
+ */
+void av_force_cpu_flags(int flags);
+
+/**
+ * Set a mask on flags returned by av_get_cpu_flags().
+ * This function is mainly useful for testing.
+ * Please use av_force_cpu_flags() and av_get_cpu_flags() instead which are more flexible
+ *
+ * @warning this function is not thread safe.
+ */
+attribute_deprecated void av_set_cpu_flags_mask(int mask);
+
+/**
+ * Parse CPU flags from a string.
+ *
+ * The returned flags contain the specified flags as well as related unspecified flags.
+ *
+ * This function exists only for compatibility with libav.
+ * Please use av_parse_cpu_caps() when possible.
+ * @return a combination of AV_CPU_* flags, negative on error.
+ */
+attribute_deprecated
+int av_parse_cpu_flags(const char *s);
+
+/**
+ * Parse CPU caps from a string and update the given AV_CPU_* flags based on that.
+ *
+ * @return negative on error.
+ */
+int av_parse_cpu_caps(unsigned *flags, const char *s);
+
+/**
+ * @return the number of logical CPU cores present.
+ */
+int av_cpu_count(void);
+
+#endif /* AVUTIL_CPU_H */
+/*
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_CPU_H
+#define AVUTIL_CPU_H
+
+#include "attributes.h"
+
+#define AV_CPU_FLAG_FORCE 0x80000000 /* force usage of selected flags (OR) */
+
+ /* lower 16 bits - CPU features */
+#define AV_CPU_FLAG_MMX 0x0001 ///< standard MMX
+#define AV_CPU_FLAG_MMXEXT 0x0002 ///< SSE integer functions or AMD MMX ext
+#define AV_CPU_FLAG_MMX2 0x0002 ///< SSE integer functions or AMD MMX ext
+#define AV_CPU_FLAG_3DNOW 0x0004 ///< AMD 3DNOW
+#define AV_CPU_FLAG_SSE 0x0008 ///< SSE functions
+#define AV_CPU_FLAG_SSE2 0x0010 ///< PIV SSE2 functions
+#define AV_CPU_FLAG_SSE2SLOW 0x40000000 ///< SSE2 supported, but usually not faster
+ ///< than regular MMX/SSE (e.g. Core1)
+#define AV_CPU_FLAG_3DNOWEXT 0x0020 ///< AMD 3DNowExt
+#define AV_CPU_FLAG_SSE3 0x0040 ///< Prescott SSE3 functions
+#define AV_CPU_FLAG_SSE3SLOW 0x20000000 ///< SSE3 supported, but usually not faster
+ ///< than regular MMX/SSE (e.g. Core1)
+#define AV_CPU_FLAG_SSSE3 0x0080 ///< Conroe SSSE3 functions
+#define AV_CPU_FLAG_ATOM 0x10000000 ///< Atom processor, some SSSE3 instructions are slower
+#define AV_CPU_FLAG_SSE4 0x0100 ///< Penryn SSE4.1 functions
+#define AV_CPU_FLAG_SSE42 0x0200 ///< Nehalem SSE4.2 functions
+#define AV_CPU_FLAG_AVX 0x4000 ///< AVX functions: requires OS support even if YMM registers aren't used
+#define AV_CPU_FLAG_XOP 0x0400 ///< Bulldozer XOP functions
+#define AV_CPU_FLAG_FMA4 0x0800 ///< Bulldozer FMA4 functions
+// #if LIBAVUTIL_VERSION_MAJOR <52
+#define AV_CPU_FLAG_CMOV 0x1001000 ///< supports cmov instruction
+// #else
+// #define AV_CPU_FLAG_CMOV 0x1000 ///< supports cmov instruction
+// #endif
+#define AV_CPU_FLAG_AVX2 0x8000 ///< AVX2 functions: requires OS support even if YMM registers aren't used
+#define AV_CPU_FLAG_FMA3 0x10000 ///< Haswell FMA3 functions
+#define AV_CPU_FLAG_BMI1 0x20000 ///< Bit Manipulation Instruction Set 1
+#define AV_CPU_FLAG_BMI2 0x40000 ///< Bit Manipulation Instruction Set 2
+
+#define AV_CPU_FLAG_ALTIVEC 0x0001 ///< standard
+
+#define AV_CPU_FLAG_ARMV5TE (1 << 0)
+#define AV_CPU_FLAG_ARMV6 (1 << 1)
+#define AV_CPU_FLAG_ARMV6T2 (1 << 2)
+#define AV_CPU_FLAG_VFP (1 << 3)
+#define AV_CPU_FLAG_VFPV3 (1 << 4)
+#define AV_CPU_FLAG_NEON (1 << 5)
+#define AV_CPU_FLAG_ARMV8 (1 << 6)
+#define AV_CPU_FLAG_SETEND (1 <<16)
+
+/**
+ * Return the flags which specify extensions supported by the CPU.
+ * The returned value is affected by av_force_cpu_flags() if that was used
+ * before. So av_get_cpu_flags() can easily be used in a application to
+ * detect the enabled cpu flags.
+ */
+int av_get_cpu_flags(void);
+
+/**
+ * Disables cpu detection and forces the specified flags.
+ * -1 is a special case that disables forcing of specific flags.
+ */
+void av_force_cpu_flags(int flags);
+
+/**
+ * Set a mask on flags returned by av_get_cpu_flags().
+ * This function is mainly useful for testing.
+ * Please use av_force_cpu_flags() and av_get_cpu_flags() instead which are more flexible
+ *
+ * @warning this function is not thread safe.
+ */
+attribute_deprecated void av_set_cpu_flags_mask(int mask);
+
+/**
+ * Parse CPU flags from a string.
+ *
+ * The returned flags contain the specified flags as well as related unspecified flags.
+ *
+ * This function exists only for compatibility with libav.
+ * Please use av_parse_cpu_caps() when possible.
+ * @return a combination of AV_CPU_* flags, negative on error.
+ */
+attribute_deprecated
+int av_parse_cpu_flags(const char *s);
+
+/**
+ * Parse CPU caps from a string and update the given AV_CPU_* flags based on that.
+ *
+ * @return negative on error.
+ */
+int av_parse_cpu_caps(unsigned *flags, const char *s);
+
+/**
+ * @return the number of logical CPU cores present.
+ */
+int av_cpu_count(void);
+
+#endif /* AVUTIL_CPU_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/crc.h Added

@@ -0,0 +1,172 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_CRC_H
+#define AVUTIL_CRC_H
+
+#include <stdint.h>
+#include <stddef.h>
+#include "attributes.h"
+
+/**
+ * @defgroup lavu_crc32 CRC32
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+typedef uint32_t AVCRC;
+
+typedef enum {
+ AV_CRC_8_ATM,
+ AV_CRC_16_ANSI,
+ AV_CRC_16_CCITT,
+ AV_CRC_32_IEEE,
+ AV_CRC_32_IEEE_LE, /*< reversed bitorder version of AV_CRC_32_IEEE */
+ AV_CRC_16_ANSI_LE, /*< reversed bitorder version of AV_CRC_16_ANSI */
+ AV_CRC_24_IEEE = 12,
+ AV_CRC_MAX, /*< Not part of public API! Do not use outside libavutil. */
+}AVCRCId;
+
+/**
+ * Initialize a CRC table.
+ * @param ctx must be an array of size sizeof(AVCRC)*257 or sizeof(AVCRC)*1024
+ * @param le If 1, the lowest bit represents the coefficient for the highest
+ * exponent of the corresponding polynomial (both for poly and
+ * actual CRC).
+ * If 0, you must swap the CRC parameter and the result of av_crc
+ * if you need the standard representation (can be simplified in
+ * most cases to e.g. bswap16):
+ * av_bswap32(crc << (32-bits))
+ * @param bits number of bits for the CRC
+ * @param poly generator polynomial without the x**bits coefficient, in the
+ * representation as specified by le
+ * @param ctx_size size of ctx in bytes
+ * @return <0 on failure
+ */
+int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size);
+
+/**
+ * Get an initialized standard CRC table.
+ * @param crc_id ID of a standard CRC
+ * @return a pointer to the CRC table or NULL on failure
+ */
+const AVCRC *av_crc_get_table(AVCRCId crc_id);
+
+/**
+ * Calculate the CRC of a block.
+ * @param crc CRC of previous blocks if any or initial value for CRC
+ * @return CRC updated with the data from the given block
+ *
+ * @see av_crc_init() "le" parameter
+ */
+uint32_t av_crc(const AVCRC *ctx, uint32_t crc,
+ const uint8_t *buffer, size_t length) av_pure;
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_CRC_H */
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_CRC_H
+#define AVUTIL_CRC_H
+
+#include <stdint.h>
+#include <stddef.h>
+#include "attributes.h"
+
+/**
+ * @defgroup lavu_crc32 CRC32
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+typedef uint32_t AVCRC;
+
+typedef enum {
+ AV_CRC_8_ATM,
+ AV_CRC_16_ANSI,
+ AV_CRC_16_CCITT,
+ AV_CRC_32_IEEE,
+ AV_CRC_32_IEEE_LE, /*< reversed bitorder version of AV_CRC_32_IEEE */
+ AV_CRC_16_ANSI_LE, /*< reversed bitorder version of AV_CRC_16_ANSI */
+ AV_CRC_24_IEEE = 12,
+ AV_CRC_MAX, /*< Not part of public API! Do not use outside libavutil. */
+}AVCRCId;
+
+/**
+ * Initialize a CRC table.
+ * @param ctx must be an array of size sizeof(AVCRC)*257 or sizeof(AVCRC)*1024
+ * @param le If 1, the lowest bit represents the coefficient for the highest
+ * exponent of the corresponding polynomial (both for poly and
+ * actual CRC).
+ * If 0, you must swap the CRC parameter and the result of av_crc
+ * if you need the standard representation (can be simplified in
+ * most cases to e.g. bswap16):
+ * av_bswap32(crc << (32-bits))
+ * @param bits number of bits for the CRC
+ * @param poly generator polynomial without the x**bits coefficient, in the
+ * representation as specified by le
+ * @param ctx_size size of ctx in bytes
+ * @return <0 on failure
+ */
+int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size);
+
+/**
+ * Get an initialized standard CRC table.
+ * @param crc_id ID of a standard CRC
+ * @return a pointer to the CRC table or NULL on failure
+ */
+const AVCRC *av_crc_get_table(AVCRCId crc_id);
+
+/**
+ * Calculate the CRC of a block.
+ * @param crc CRC of previous blocks if any or initial value for CRC
+ * @return CRC updated with the data from the given block
+ *
+ * @see av_crc_init() "le" parameter
+ */
+uint32_t av_crc(const AVCRC *ctx, uint32_t crc,
+ const uint8_t *buffer, size_t length) av_pure;
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_CRC_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/dict.h Added

@@ -0,0 +1,356 @@
+/*
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Public dictionary API.
+ * @deprecated
+ * AVDictionary is provided for compatibility with libav. It is both in
+ * implementation as well as API inefficient. It does not scale and is
+ * extremely slow with large dictionaries.
+ * It is recommended that new code uses our tree container from tree.c/h
+ * where applicable, which uses AVL trees to achieve O(log n) performance.
+ */
+
+#ifndef AVUTIL_DICT_H
+#define AVUTIL_DICT_H
+
+#include <stdint.h>
+
+#include "version.h"
+
+/**
+ * @addtogroup lavu_dict AVDictionary
+ * @ingroup lavu_data
+ *
+ * @brief Simple key:value store
+ *
+ * @{
+ * Dictionaries are used for storing key:value pairs. To create
+ * an AVDictionary, simply pass an address of a NULL pointer to
+ * av_dict_set(). NULL can be used as an empty dictionary wherever
+ * a pointer to an AVDictionary is required.
+ * Use av_dict_get() to retrieve an entry or iterate over all
+ * entries and finally av_dict_free() to free the dictionary
+ * and all its contents.
+ *
+ @code
+ AVDictionary *d = NULL; // "create" an empty dictionary
+ AVDictionaryEntry *t = NULL;
+
+ av_dict_set(&d, "foo", "bar", 0); // add an entry
+
+ char *k = av_strdup("key"); // if your strings are already allocated,
+ char *v = av_strdup("value"); // you can avoid copying them like this
+ av_dict_set(&d, k, v, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
+
+ while (t = av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX)) {
+ <....> // iterate over all entries in d
+ }
+ av_dict_free(&d);
+ @endcode
+ *
+ */
+
+#define AV_DICT_MATCH_CASE 1 /**< Only get an entry with exact-case key match. Only relevant in av_dict_get(). */
+#define AV_DICT_IGNORE_SUFFIX 2 /**< Return first entry in a dictionary whose first part corresponds to the search key,
+ ignoring the suffix of the found key string. Only relevant in av_dict_get(). */
+#define AV_DICT_DONT_STRDUP_KEY 4 /**< Take ownership of a key that's been
+ allocated with av_malloc() or another memory allocation function. */
+#define AV_DICT_DONT_STRDUP_VAL 8 /**< Take ownership of a value that's been
+ allocated with av_malloc() or another memory allocation function. */
+#define AV_DICT_DONT_OVERWRITE 16 ///< Don't overwrite existing entries.
+#define AV_DICT_APPEND 32 /**< If the entry already exists, append to it. Note that no
+ delimiter is added, the strings are simply concatenated. */
+
+typedef struct AVDictionaryEntry {
+ char *key;
+ char *value;
+} AVDictionaryEntry;
+
+typedef struct AVDictionary AVDictionary;
+
+/**
+ * Get a dictionary entry with matching key.
+ *
+ * The returned entry key or value must not be changed, or it will
+ * cause undefined behavior.
+ *
+ * To iterate through all the dictionary entries, you can set the matching key
+ * to the null string "" and set the AV_DICT_IGNORE_SUFFIX flag.
+ *
+ * @param prev Set to the previous matching element to find the next.
+ * If set to NULL the first matching element is returned.
+ * @param key matching key
+ * @param flags a collection of AV_DICT_* flags controlling how the entry is retrieved
+ * @return found entry or NULL in case no matching entry was found in the dictionary
+ */
+AVDictionaryEntry *av_dict_get(FF_CONST_AVUTIL53 AVDictionary *m, const char *key,
+ const AVDictionaryEntry *prev, int flags);
+
+/**
+ * Get number of entries in dictionary.
+ *
+ * @param m dictionary
+ * @return number of entries in dictionary
+ */
+int av_dict_count(const AVDictionary *m);
+
+/**
+ * Set the given entry in *pm, overwriting an existing entry.
+ *
+ * Note: If AV_DICT_DONT_STRDUP_KEY or AV_DICT_DONT_STRDUP_VAL is set,
+ * these arguments will be freed on error.
+ *
+ * @param pm pointer to a pointer to a dictionary struct. If *pm is NULL
+ * a dictionary struct is allocated and put in *pm.
+ * @param key entry key to add to *pm (will be av_strduped depending on flags)
+ * @param value entry value to add to *pm (will be av_strduped depending on flags).
+ * Passing a NULL value will cause an existing entry to be deleted.
+ * @return >= 0 on success otherwise an error code <0
+ */
+int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags);
+
+/**
+ * Convenience wrapper for av_dict_set that converts the value to a string
+ * and stores it.
+ *
+ * Note: If AV_DICT_DONT_STRDUP_KEY is set, key will be freed on error.
+ */
+int av_dict_set_int(AVDictionary **pm, const char *key, int64_t value, int flags);
+
+/**
+ * Parse the key/value pairs list and add the parsed entries to a dictionary.
+ *
+ * In case of failure, all the successfully set entries are stored in
+ * *pm. You may need to manually free the created dictionary.
+ *
+ * @param key_val_sep a 0-terminated list of characters used to separate
+ * key from value
+ * @param pairs_sep a 0-terminated list of characters used to separate
+ * two pairs from each other
+ * @param flags flags to use when adding to dictionary.
+ * AV_DICT_DONT_STRDUP_KEY and AV_DICT_DONT_STRDUP_VAL
+ * are ignored since the key/value tokens will always
+ * be duplicated.
+ * @return 0 on success, negative AVERROR code on failure
+ */
+int av_dict_parse_string(AVDictionary **pm, const char *str,
+ const char *key_val_sep, const char *pairs_sep,
+ int flags);
+
+/**
+ * Copy entries from one AVDictionary struct into another.
+ * @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL,
+ * this function will allocate a struct for you and put it in *dst
+ * @param src pointer to source AVDictionary struct
+ * @param flags flags to use when setting entries in *dst
+ * @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag
+ */
+void av_dict_copy(AVDictionary **dst, FF_CONST_AVUTIL53 AVDictionary *src, int flags);
+
+/**
+ * Free all the memory allocated for an AVDictionary struct
+ * and all keys and values.
+ */
+void av_dict_free(AVDictionary **m);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_DICT_H */
+/*
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Public dictionary API.
+ * @deprecated
+ * AVDictionary is provided for compatibility with libav. It is both in
+ * implementation as well as API inefficient. It does not scale and is
+ * extremely slow with large dictionaries.
+ * It is recommended that new code uses our tree container from tree.c/h
+ * where applicable, which uses AVL trees to achieve O(log n) performance.
+ */
+
+#ifndef AVUTIL_DICT_H
+#define AVUTIL_DICT_H
+
+#include <stdint.h>
+
+#include "version.h"
+
+/**
+ * @addtogroup lavu_dict AVDictionary
+ * @ingroup lavu_data
+ *
+ * @brief Simple key:value store
+ *
+ * @{
+ * Dictionaries are used for storing key:value pairs. To create
+ * an AVDictionary, simply pass an address of a NULL pointer to
+ * av_dict_set(). NULL can be used as an empty dictionary wherever
+ * a pointer to an AVDictionary is required.
+ * Use av_dict_get() to retrieve an entry or iterate over all
+ * entries and finally av_dict_free() to free the dictionary
+ * and all its contents.
+ *
+ @code
+ AVDictionary *d = NULL; // "create" an empty dictionary
+ AVDictionaryEntry *t = NULL;
+
+ av_dict_set(&d, "foo", "bar", 0); // add an entry
+
+ char *k = av_strdup("key"); // if your strings are already allocated,
+ char *v = av_strdup("value"); // you can avoid copying them like this
+ av_dict_set(&d, k, v, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
+
+ while (t = av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX)) {
+ <....> // iterate over all entries in d
+ }
+ av_dict_free(&d);
+ @endcode
+ *
+ */
+
+#define AV_DICT_MATCH_CASE 1 /**< Only get an entry with exact-case key match. Only relevant in av_dict_get(). */
+#define AV_DICT_IGNORE_SUFFIX 2 /**< Return first entry in a dictionary whose first part corresponds to the search key,
+ ignoring the suffix of the found key string. Only relevant in av_dict_get(). */
+#define AV_DICT_DONT_STRDUP_KEY 4 /**< Take ownership of a key that's been
+ allocated with av_malloc() or another memory allocation function. */
+#define AV_DICT_DONT_STRDUP_VAL 8 /**< Take ownership of a value that's been
+ allocated with av_malloc() or another memory allocation function. */
+#define AV_DICT_DONT_OVERWRITE 16 ///< Don't overwrite existing entries.
+#define AV_DICT_APPEND 32 /**< If the entry already exists, append to it. Note that no
+ delimiter is added, the strings are simply concatenated. */
+
+typedef struct AVDictionaryEntry {
+ char *key;
+ char *value;
+} AVDictionaryEntry;
+
+typedef struct AVDictionary AVDictionary;
+
+/**
+ * Get a dictionary entry with matching key.
+ *
+ * The returned entry key or value must not be changed, or it will
+ * cause undefined behavior.
+ *
+ * To iterate through all the dictionary entries, you can set the matching key
+ * to the null string "" and set the AV_DICT_IGNORE_SUFFIX flag.
+ *
+ * @param prev Set to the previous matching element to find the next.
+ * If set to NULL the first matching element is returned.
+ * @param key matching key
+ * @param flags a collection of AV_DICT_* flags controlling how the entry is retrieved
+ * @return found entry or NULL in case no matching entry was found in the dictionary
+ */
+AVDictionaryEntry *av_dict_get(FF_CONST_AVUTIL53 AVDictionary *m, const char *key,
+ const AVDictionaryEntry *prev, int flags);
+
+/**
+ * Get number of entries in dictionary.
+ *
+ * @param m dictionary
+ * @return number of entries in dictionary
+ */
+int av_dict_count(const AVDictionary *m);
+
+/**
+ * Set the given entry in *pm, overwriting an existing entry.
+ *
+ * Note: If AV_DICT_DONT_STRDUP_KEY or AV_DICT_DONT_STRDUP_VAL is set,
+ * these arguments will be freed on error.
+ *
+ * @param pm pointer to a pointer to a dictionary struct. If *pm is NULL
+ * a dictionary struct is allocated and put in *pm.
+ * @param key entry key to add to *pm (will be av_strduped depending on flags)
+ * @param value entry value to add to *pm (will be av_strduped depending on flags).
+ * Passing a NULL value will cause an existing entry to be deleted.
+ * @return >= 0 on success otherwise an error code <0
+ */
+int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags);
+
+/**
+ * Convenience wrapper for av_dict_set that converts the value to a string
+ * and stores it.
+ *
+ * Note: If AV_DICT_DONT_STRDUP_KEY is set, key will be freed on error.
+ */
+int av_dict_set_int(AVDictionary **pm, const char *key, int64_t value, int flags);
+
+/**
+ * Parse the key/value pairs list and add the parsed entries to a dictionary.
+ *
+ * In case of failure, all the successfully set entries are stored in
+ * *pm. You may need to manually free the created dictionary.
+ *
+ * @param key_val_sep a 0-terminated list of characters used to separate
+ * key from value
+ * @param pairs_sep a 0-terminated list of characters used to separate
+ * two pairs from each other
+ * @param flags flags to use when adding to dictionary.
+ * AV_DICT_DONT_STRDUP_KEY and AV_DICT_DONT_STRDUP_VAL
+ * are ignored since the key/value tokens will always
+ * be duplicated.
+ * @return 0 on success, negative AVERROR code on failure
+ */
+int av_dict_parse_string(AVDictionary **pm, const char *str,
+ const char *key_val_sep, const char *pairs_sep,
+ int flags);
+
+/**
+ * Copy entries from one AVDictionary struct into another.
+ * @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL,
+ * this function will allocate a struct for you and put it in *dst
+ * @param src pointer to source AVDictionary struct
+ * @param flags flags to use when setting entries in *dst
+ * @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag
+ */
+void av_dict_copy(AVDictionary **dst, FF_CONST_AVUTIL53 AVDictionary *src, int flags);
+
+/**
+ * Free all the memory allocated for an AVDictionary struct
+ * and all keys and values.
+ */
+void av_dict_free(AVDictionary **m);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_DICT_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/display.h Added

@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2014 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_DISPLAY_H
+#define AVUTIL_DISPLAY_H
+
+#include <stdint.h>
+
+/**
+ * The display transformation matrix specifies an affine transformation that
+ * should be applied to video frames for correct presentation. It is compatible
+ * with the matrices stored in the ISO/IEC 14496-12 container format.
+ *
+ * The data is a 3x3 matrix represented as a 9-element array:
+ *
+ * | a b u |
+ * (a, b, u, c, d, v, x, y, w) -> | c d v |
+ * | x y w |
+ *
+ * All numbers are stored in native endianness, as 16.16 fixed-point values,
+ * except for u, v and w, which are stored as 2.30 fixed-point values.
+ *
+ * The transformation maps a point (p, q) in the source (pre-transformation)
+ * frame to the point (p', q') in the destination (post-transformation) frame as
+ * follows:
+ * | a b u |
+ * (p, q, 1) . | c d v | = z * (p', q', 1)
+ * | x y w |
+ *
+ * The transformation can also be more explicitly written in components as
+ * follows:
+ * p' = (a * p + c * q + x) / z;
+ * q' = (b * p + d * q + y) / z;
+ * z = u * p + v * q + w
+ */
+
+/**
+ * Extract the rotation component of the transformation matrix.
+ *
+ * @param matrix the transformation matrix
+ * @return the angle (in degrees) by which the transformation rotates the frame.
+ * The angle will be in range [-180.0, 180.0], or NaN if the matrix is
+ * singular.
+ *
+ * @note floating point numbers are inherently inexact, so callers are
+ * recommended to round the return value to nearest integer before use.
+ */
+double av_display_rotation_get(const int32_t matrix[9]);
+
+/**
+ * Initialize a transformation matrix describing a pure rotation by the
+ * specified angle (in degrees).
+ *
+ * @param matrix an allocated transformation matrix (will be fully overwritten
+ * by this function)
+ * @param angle rotation angle in degrees.
+ */
+void av_display_rotation_set(int32_t matrix[9], double angle);
+
+/**
+ * Flip the input matrix horizontally and/or vertically.
+ *
+ * @param matrix an allocated transformation matrix
+ * @param hflip whether the matrix should be flipped horizontally
+ * @param vflip whether the matrix should be flipped vertically
+ */
+void av_display_matrix_flip(int32_t matrix[9], int hflip, int vflip);
+
+#endif /* AVUTIL_DISPLAY_H */
+/*
+ * Copyright (c) 2014 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_DISPLAY_H
+#define AVUTIL_DISPLAY_H
+
+#include <stdint.h>
+
+/**
+ * The display transformation matrix specifies an affine transformation that
+ * should be applied to video frames for correct presentation. It is compatible
+ * with the matrices stored in the ISO/IEC 14496-12 container format.
+ *
+ * The data is a 3x3 matrix represented as a 9-element array:
+ *
+ * | a b u |
+ * (a, b, u, c, d, v, x, y, w) -> | c d v |
+ * | x y w |
+ *
+ * All numbers are stored in native endianness, as 16.16 fixed-point values,
+ * except for u, v and w, which are stored as 2.30 fixed-point values.
+ *
+ * The transformation maps a point (p, q) in the source (pre-transformation)
+ * frame to the point (p', q') in the destination (post-transformation) frame as
+ * follows:
+ * | a b u |
+ * (p, q, 1) . | c d v | = z * (p', q', 1)
+ * | x y w |
+ *
+ * The transformation can also be more explicitly written in components as
+ * follows:
+ * p' = (a * p + c * q + x) / z;
+ * q' = (b * p + d * q + y) / z;
+ * z = u * p + v * q + w
+ */
+
+/**
+ * Extract the rotation component of the transformation matrix.
+ *
+ * @param matrix the transformation matrix
+ * @return the angle (in degrees) by which the transformation rotates the frame.
+ * The angle will be in range [-180.0, 180.0], or NaN if the matrix is
+ * singular.
+ *
+ * @note floating point numbers are inherently inexact, so callers are
+ * recommended to round the return value to nearest integer before use.
+ */
+double av_display_rotation_get(const int32_t matrix[9]);
+
+/**
+ * Initialize a transformation matrix describing a pure rotation by the
+ * specified angle (in degrees).
+ *
+ * @param matrix an allocated transformation matrix (will be fully overwritten
+ * by this function)
+ * @param angle rotation angle in degrees.
+ */
+void av_display_rotation_set(int32_t matrix[9], double angle);
+
+/**
+ * Flip the input matrix horizontally and/or vertically.
+ *
+ * @param matrix an allocated transformation matrix
+ * @param hflip whether the matrix should be flipped horizontally
+ * @param vflip whether the matrix should be flipped vertically
+ */
+void av_display_matrix_flip(int32_t matrix[9], int hflip, int vflip);
+
+#endif /* AVUTIL_DISPLAY_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/downmix_info.h Added

@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) 2014 Tim Walker <tdskywalker@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_DOWNMIX_INFO_H
+#define AVUTIL_DOWNMIX_INFO_H
+
+#include "frame.h"
+
+/**
+ * @file
+ * audio downmix medatata
+ */
+
+/**
+ * @addtogroup lavu_audio
+ * @{
+ */
+
+/**
+ * @defgroup downmix_info Audio downmix metadata
+ * @{
+ */
+
+/**
+ * Possible downmix types.
+ */
+enum AVDownmixType {
+ AV_DOWNMIX_TYPE_UNKNOWN, /**< Not indicated. */
+ AV_DOWNMIX_TYPE_LORO, /**< Lo/Ro 2-channel downmix (Stereo). */
+ AV_DOWNMIX_TYPE_LTRT, /**< Lt/Rt 2-channel downmix, Dolby Surround compatible. */
+ AV_DOWNMIX_TYPE_DPLII, /**< Lt/Rt 2-channel downmix, Dolby Pro Logic II compatible. */
+ AV_DOWNMIX_TYPE_NB /**< Number of downmix types. Not part of ABI. */
+};
+
+/**
+ * This structure describes optional metadata relevant to a downmix procedure.
+ *
+ * All fields are set by the decoder to the value indicated in the audio
+ * bitstream (if present), or to a "sane" default otherwise.
+ */
+typedef struct AVDownmixInfo {
+ /**
+ * Type of downmix preferred by the mastering engineer.
+ */
+ enum AVDownmixType preferred_downmix_type;
+
+ /**
+ * Absolute scale factor representing the nominal level of the center
+ * channel during a regular downmix.
+ */
+ double center_mix_level;
+
+ /**
+ * Absolute scale factor representing the nominal level of the center
+ * channel during an Lt/Rt compatible downmix.
+ */
+ double center_mix_level_ltrt;
+
+ /**
+ * Absolute scale factor representing the nominal level of the surround
+ * channels during a regular downmix.
+ */
+ double surround_mix_level;
+
+ /**
+ * Absolute scale factor representing the nominal level of the surround
+ * channels during an Lt/Rt compatible downmix.
+ */
+ double surround_mix_level_ltrt;
+
+ /**
+ * Absolute scale factor representing the level at which the LFE data is
+ * mixed into L/R channels during downmixing.
+ */
+ double lfe_mix_level;
+} AVDownmixInfo;
+
+/**
+ * Get a frame's AV_FRAME_DATA_DOWNMIX_INFO side data for editing.
+ *
+ * If the side data is absent, it is created and added to the frame.
+ *
+ * @param frame the frame for which the side data is to be obtained or created
+ *
+ * @return the AVDownmixInfo structure to be edited by the caller, or NULL if
+ * the structure cannot be allocated.
+ */
+AVDownmixInfo *av_downmix_info_update_side_data(AVFrame *frame);
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_DOWNMIX_INFO_H */
+/*
+ * Copyright (c) 2014 Tim Walker <tdskywalker@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_DOWNMIX_INFO_H
+#define AVUTIL_DOWNMIX_INFO_H
+
+#include "frame.h"
+
+/**
+ * @file
+ * audio downmix medatata
+ */
+
+/**
+ * @addtogroup lavu_audio
+ * @{
+ */
+
+/**
+ * @defgroup downmix_info Audio downmix metadata
+ * @{
+ */
+
+/**
+ * Possible downmix types.
+ */
+enum AVDownmixType {
+ AV_DOWNMIX_TYPE_UNKNOWN, /**< Not indicated. */
+ AV_DOWNMIX_TYPE_LORO, /**< Lo/Ro 2-channel downmix (Stereo). */
+ AV_DOWNMIX_TYPE_LTRT, /**< Lt/Rt 2-channel downmix, Dolby Surround compatible. */
+ AV_DOWNMIX_TYPE_DPLII, /**< Lt/Rt 2-channel downmix, Dolby Pro Logic II compatible. */
+ AV_DOWNMIX_TYPE_NB /**< Number of downmix types. Not part of ABI. */
+};
+
+/**
+ * This structure describes optional metadata relevant to a downmix procedure.
+ *
+ * All fields are set by the decoder to the value indicated in the audio
+ * bitstream (if present), or to a "sane" default otherwise.
+ */
+typedef struct AVDownmixInfo {
+ /**
+ * Type of downmix preferred by the mastering engineer.
+ */
+ enum AVDownmixType preferred_downmix_type;
+
+ /**
+ * Absolute scale factor representing the nominal level of the center
+ * channel during a regular downmix.
+ */
+ double center_mix_level;
+
+ /**
+ * Absolute scale factor representing the nominal level of the center
+ * channel during an Lt/Rt compatible downmix.
+ */
+ double center_mix_level_ltrt;
+
+ /**
+ * Absolute scale factor representing the nominal level of the surround
+ * channels during a regular downmix.
+ */
+ double surround_mix_level;
+
+ /**
+ * Absolute scale factor representing the nominal level of the surround
+ * channels during an Lt/Rt compatible downmix.
+ */
+ double surround_mix_level_ltrt;
+
+ /**
+ * Absolute scale factor representing the level at which the LFE data is
+ * mixed into L/R channels during downmixing.
+ */
+ double lfe_mix_level;
+} AVDownmixInfo;
+
+/**
+ * Get a frame's AV_FRAME_DATA_DOWNMIX_INFO side data for editing.
+ *
+ * If the side data is absent, it is created and added to the frame.
+ *
+ * @param frame the frame for which the side data is to be obtained or created
+ *
+ * @return the AVDownmixInfo structure to be edited by the caller, or NULL if
+ * the structure cannot be allocated.
+ */
+AVDownmixInfo *av_downmix_info_update_side_data(AVFrame *frame);
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_DOWNMIX_INFO_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/ffmpeg_android/libavutil/error.h -> gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/error.h Changed

@@ -17,7 +17,7 @@
 */
 
 /**
- * @file libavutil/error.h
+ * @file
 * error code definitions
 */
 
@@ -25,7 +25,14 @@
 #define AVUTIL_ERROR_H
 
 #include <errno.h>
-#include "avutil.h"
+#include <stddef.h>
+
+/**
+ * @addtogroup lavu_error
+ *
+ * @{
+ */
+
 
 /* error handling */
 #if EDOM > 0
@@ -37,34 +44,76 @@
 #define AVUNERROR(e) (e)
 #endif
 
-#if LIBAVUTIL_VERSION_MAJOR < 51
-#define AVERROR_INVALIDDATA AVERROR(EINVAL) ///< Invalid data found when processing input
-#define AVERROR_IO AVERROR(EIO) ///< I/O error
-#define AVERROR_NOENT AVERROR(ENOENT) ///< No such file or directory
-#define AVERROR_NOFMT AVERROR(EILSEQ) ///< Unknown format
-#define AVERROR_NOMEM AVERROR(ENOMEM) ///< Not enough memory
-#define AVERROR_NUMEXPECTED AVERROR(EDOM) ///< Number syntax expected in filename
-#define AVERROR_UNKNOWN AVERROR(EINVAL) ///< Unknown error
-#endif
+#define FFERRTAG(a, b, c, d) (-(int)MKTAG(a, b, c, d))
 
-#define AVERROR_EOF AVERROR(EPIPE) ///< End of file
-#define AVERROR_NOTSUPP AVERROR(ENOSYS) ///< Operation not supported
+#define AVERROR_BSF_NOT_FOUND FFERRTAG(0xF8,'B','S','F') ///< Bitstream filter not found
+#define AVERROR_BUG FFERRTAG( 'B','U','G','!') ///< Internal bug, also see AVERROR_BUG2
+#define AVERROR_BUFFER_TOO_SMALL FFERRTAG( 'B','U','F','S') ///< Buffer too small
+#define AVERROR_DECODER_NOT_FOUND FFERRTAG(0xF8,'D','E','C') ///< Decoder not found
+#define AVERROR_DEMUXER_NOT_FOUND FFERRTAG(0xF8,'D','E','M') ///< Demuxer not found
+#define AVERROR_ENCODER_NOT_FOUND FFERRTAG(0xF8,'E','N','C') ///< Encoder not found
+#define AVERROR_EOF FFERRTAG( 'E','O','F',' ') ///< End of file
+#define AVERROR_EXIT FFERRTAG( 'E','X','I','T') ///< Immediate exit was requested; the called function should not be restarted
+#define AVERROR_EXTERNAL FFERRTAG( 'E','X','T',' ') ///< Generic error in an external library
+#define AVERROR_FILTER_NOT_FOUND FFERRTAG(0xF8,'F','I','L') ///< Filter not found
+#define AVERROR_INVALIDDATA FFERRTAG( 'I','N','D','A') ///< Invalid data found when processing input
+#define AVERROR_MUXER_NOT_FOUND FFERRTAG(0xF8,'M','U','X') ///< Muxer not found
+#define AVERROR_OPTION_NOT_FOUND FFERRTAG(0xF8,'O','P','T') ///< Option not found
+#define AVERROR_PATCHWELCOME FFERRTAG( 'P','A','W','E') ///< Not yet implemented in FFmpeg, patches welcome
+#define AVERROR_PROTOCOL_NOT_FOUND FFERRTAG(0xF8,'P','R','O') ///< Protocol not found
 
-#define AVERROR_PATCHWELCOME (-MKTAG('P','A','W','E')) ///< Not yet implemented in FFmpeg, patches welcome
+#define AVERROR_STREAM_NOT_FOUND FFERRTAG(0xF8,'S','T','R') ///< Stream not found
+/**
+ * This is semantically identical to AVERROR_BUG
+ * it has been introduced in Libav after our AVERROR_BUG and with a modified value.
+ */
+#define AVERROR_BUG2 FFERRTAG( 'B','U','G',' ')
+#define AVERROR_UNKNOWN FFERRTAG( 'U','N','K','N') ///< Unknown error, typically from an external library
+#define AVERROR_EXPERIMENTAL (-0x2bb2afa8) ///< Requested feature is flagged experimental. Set strict_std_compliance if you really want to use it.
+#define AVERROR_INPUT_CHANGED (-0x636e6701) ///< Input changed between calls. Reconfiguration is required. (can be OR-ed with AVERROR_OUTPUT_CHANGED)
+#define AVERROR_OUTPUT_CHANGED (-0x636e6702) ///< Output changed between calls. Reconfiguration is required. (can be OR-ed with AVERROR_INPUT_CHANGED)
 
-#if LIBAVUTIL_VERSION_MAJOR > 50
-#define AVERROR_INVALIDDATA (-MKTAG('I','N','D','A')) ///< Invalid data found when processing input
-#define AVERROR_NUMEXPECTED (-MKTAG('N','U','E','X')) ///< Number syntax expected in filename
-#endif
+#define AV_ERROR_MAX_STRING_SIZE 64
 
 /**
- * Puts a description of the AVERROR code errnum in errbuf.
+ * Put a description of the AVERROR code errnum in errbuf.
 * In case of failure the global variable errno is set to indicate the
- * error.
+ * error. Even in case of failure av_strerror() will print a generic
+ * error message indicating the errnum provided to errbuf.
 *
+ * @param errnum error code to describe
+ * @param errbuf buffer to which description is written
 * @param errbuf_size the size in bytes of errbuf
- * @return 0 on success, a negative value otherwise
+ * @return 0 on success, a negative value if a description for errnum
+ * cannot be found
 */
 int av_strerror(int errnum, char *errbuf, size_t errbuf_size);
 
+/**
+ * Fill the provided buffer with a string containing an error string
+ * corresponding to the AVERROR code errnum.
+ *
+ * @param errbuf a buffer
+ * @param errbuf_size size in bytes of errbuf
+ * @param errnum error code to describe
+ * @return the buffer in input, filled with the error description
+ * @see av_strerror()
+ */
+static inline char *av_make_error_string(char *errbuf, size_t errbuf_size, int errnum)
+{
+ av_strerror(errnum, errbuf, errbuf_size);
+ return errbuf;
+}
+
+/**
+ * Convenience macro, the return value should be used only directly in
+ * function arguments but never stand-alone.
+ */
+#define av_err2str(errnum) \
+ av_make_error_string((char[AV_ERROR_MAX_STRING_SIZE]){0}, AV_ERROR_MAX_STRING_SIZE, errnum)
+
+/**
+ * @}
+ */
+
 #endif /* AVUTIL_ERROR_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/eval.h Added

@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 2002 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * simple arithmetic expression evaluator
+ */
+
+#ifndef AVUTIL_EVAL_H
+#define AVUTIL_EVAL_H
+
+#include "avutil.h"
+
+typedef struct AVExpr AVExpr;
+
+/**
+ * Parse and evaluate an expression.
+ * Note, this is significantly slower than av_expr_eval().
+ *
+ * @param res a pointer to a double where is put the result value of
+ * the expression, or NAN in case of error
+ * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
+ * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
+ * @param const_values a zero terminated array of values for the identifiers from const_names
+ * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
+ * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
+ * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
+ * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
+ * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
+ * @param log_ctx parent logging context
+ * @return >= 0 in case of success, a negative value corresponding to an
+ * AVERROR code otherwise
+ */
+int av_expr_parse_and_eval(double *res, const char *s,
+ const char * const *const_names, const double *const_values,
+ const char * const *func1_names, double (* const *funcs1)(void *, double),
+ const char * const *func2_names, double (* const *funcs2)(void *, double, double),
+ void *opaque, int log_offset, void *log_ctx);
+
+/**
+ * Parse an expression.
+ *
+ * @param expr a pointer where is put an AVExpr containing the parsed
+ * value in case of successful parsing, or NULL otherwise.
+ * The pointed to AVExpr must be freed with av_expr_free() by the user
+ * when it is not needed anymore.
+ * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
+ * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
+ * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
+ * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
+ * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
+ * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
+ * @param log_ctx parent logging context
+ * @return >= 0 in case of success, a negative value corresponding to an
+ * AVERROR code otherwise
+ */
+int av_expr_parse(AVExpr **expr, const char *s,
+ const char * const *const_names,
+ const char * const *func1_names, double (* const *funcs1)(void *, double),
+ const char * const *func2_names, double (* const *funcs2)(void *, double, double),
+ int log_offset, void *log_ctx);
+
+/**
+ * Evaluate a previously parsed expression.
+ *
+ * @param const_values a zero terminated array of values for the identifiers from av_expr_parse() const_names
+ * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
+ * @return the value of the expression
+ */
+double av_expr_eval(AVExpr *e, const double *const_values, void *opaque);
+
+/**
+ * Free a parsed expression previously created with av_expr_parse().
+ */
+void av_expr_free(AVExpr *e);
+
+/**
+ * Parse the string in numstr and return its value as a double. If
+ * the string is empty, contains only whitespaces, or does not contain
+ * an initial substring that has the expected syntax for a
+ * floating-point number, no conversion is performed. In this case,
+ * returns a value of zero and the value returned in tail is the value
+ * of numstr.
+ *
+ * @param numstr a string representing a number, may contain one of
+ * the International System number postfixes, for example 'K', 'M',
+ * 'G'. If 'i' is appended after the postfix, powers of 2 are used
+ * instead of powers of 10. The 'B' postfix multiplies the value for
+ * 8, and can be appended after another postfix or used alone. This
+ * allows using for example 'KB', 'MiB', 'G' and 'B' as postfix.
+ * @param tail if non-NULL puts here the pointer to the char next
+ * after the last parsed character
+ */
+double av_strtod(const char *numstr, char **tail);
+
+#endif /* AVUTIL_EVAL_H */
+/*
+ * Copyright (c) 2002 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * simple arithmetic expression evaluator
+ */
+
+#ifndef AVUTIL_EVAL_H
+#define AVUTIL_EVAL_H
+
+#include "avutil.h"
+
+typedef struct AVExpr AVExpr;
+
+/**
+ * Parse and evaluate an expression.
+ * Note, this is significantly slower than av_expr_eval().
+ *
+ * @param res a pointer to a double where is put the result value of
+ * the expression, or NAN in case of error
+ * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
+ * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
+ * @param const_values a zero terminated array of values for the identifiers from const_names
+ * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
+ * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
+ * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
+ * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
+ * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
+ * @param log_ctx parent logging context
+ * @return >= 0 in case of success, a negative value corresponding to an
+ * AVERROR code otherwise
+ */
+int av_expr_parse_and_eval(double *res, const char *s,
+ const char * const *const_names, const double *const_values,
+ const char * const *func1_names, double (* const *funcs1)(void *, double),
+ const char * const *func2_names, double (* const *funcs2)(void *, double, double),
+ void *opaque, int log_offset, void *log_ctx);
+
+/**
+ * Parse an expression.
+ *
+ * @param expr a pointer where is put an AVExpr containing the parsed
+ * value in case of successful parsing, or NULL otherwise.
+ * The pointed to AVExpr must be freed with av_expr_free() by the user
+ * when it is not needed anymore.
+ * @param s expression as a zero terminated string, for example "1+2^3+5*5+sin(2/3)"
+ * @param const_names NULL terminated array of zero terminated strings of constant identifiers, for example {"PI", "E", 0}
+ * @param func1_names NULL terminated array of zero terminated strings of funcs1 identifiers
+ * @param funcs1 NULL terminated array of function pointers for functions which take 1 argument
+ * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers
+ * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments
+ * @param log_ctx parent logging context
+ * @return >= 0 in case of success, a negative value corresponding to an
+ * AVERROR code otherwise
+ */
+int av_expr_parse(AVExpr **expr, const char *s,
+ const char * const *const_names,
+ const char * const *func1_names, double (* const *funcs1)(void *, double),
+ const char * const *func2_names, double (* const *funcs2)(void *, double, double),
+ int log_offset, void *log_ctx);
+
+/**
+ * Evaluate a previously parsed expression.
+ *
+ * @param const_values a zero terminated array of values for the identifiers from av_expr_parse() const_names
+ * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2
+ * @return the value of the expression
+ */
+double av_expr_eval(AVExpr *e, const double *const_values, void *opaque);
+
+/**
+ * Free a parsed expression previously created with av_expr_parse().
+ */
+void av_expr_free(AVExpr *e);
+
+/**
+ * Parse the string in numstr and return its value as a double. If
+ * the string is empty, contains only whitespaces, or does not contain
+ * an initial substring that has the expected syntax for a
+ * floating-point number, no conversion is performed. In this case,
+ * returns a value of zero and the value returned in tail is the value
+ * of numstr.
+ *
+ * @param numstr a string representing a number, may contain one of
+ * the International System number postfixes, for example 'K', 'M',
+ * 'G'. If 'i' is appended after the postfix, powers of 2 are used
+ * instead of powers of 10. The 'B' postfix multiplies the value for
+ * 8, and can be appended after another postfix or used alone. This
+ * allows using for example 'KB', 'MiB', 'G' and 'B' as postfix.
+ * @param tail if non-NULL puts here the pointer to the char next
+ * after the last parsed character
+ */
+double av_strtod(const char *numstr, char **tail);
+
+#endif /* AVUTIL_EVAL_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/ffversion.h Added

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/fifo.h Added

@@ -0,0 +1,316 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * a very simple circular buffer FIFO implementation
+ */
+
+#ifndef AVUTIL_FIFO_H
+#define AVUTIL_FIFO_H
+
+#include <stdint.h>
+#include "avutil.h"
+#include "attributes.h"
+
+typedef struct AVFifoBuffer {
+ uint8_t *buffer;
+ uint8_t *rptr, *wptr, *end;
+ uint32_t rndx, wndx;
+} AVFifoBuffer;
+
+/**
+ * Initialize an AVFifoBuffer.
+ * @param size of FIFO
+ * @return AVFifoBuffer or NULL in case of memory allocation failure
+ */
+AVFifoBuffer *av_fifo_alloc(unsigned int size);
+
+/**
+ * Initialize an AVFifoBuffer.
+ * @param nmemb number of elements
+ * @param size size of the single element
+ * @return AVFifoBuffer or NULL in case of memory allocation failure
+ */
+AVFifoBuffer *av_fifo_alloc_array(size_t nmemb, size_t size);
+
+/**
+ * Free an AVFifoBuffer.
+ * @param f AVFifoBuffer to free
+ */
+void av_fifo_free(AVFifoBuffer *f);
+
+/**
+ * Free an AVFifoBuffer and reset pointer to NULL.
+ * @param f AVFifoBuffer to free
+ */
+void av_fifo_freep(AVFifoBuffer **f);
+
+/**
+ * Reset the AVFifoBuffer to the state right after av_fifo_alloc, in particular it is emptied.
+ * @param f AVFifoBuffer to reset
+ */
+void av_fifo_reset(AVFifoBuffer *f);
+
+/**
+ * Return the amount of data in bytes in the AVFifoBuffer, that is the
+ * amount of data you can read from it.
+ * @param f AVFifoBuffer to read from
+ * @return size
+ */
+int av_fifo_size(FF_CONST_AVUTIL53 AVFifoBuffer *f);
+
+/**
+ * Return the amount of space in bytes in the AVFifoBuffer, that is the
+ * amount of data you can write into it.
+ * @param f AVFifoBuffer to write into
+ * @return size
+ */
+int av_fifo_space(FF_CONST_AVUTIL53 AVFifoBuffer *f);
+
+/**
+ * Feed data from an AVFifoBuffer to a user-supplied callback.
+ * @param f AVFifoBuffer to read from
+ * @param buf_size number of bytes to read
+ * @param func generic read function
+ * @param dest data destination
+ */
+int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int));
+
+/**
+ * Feed data from a user-supplied callback to an AVFifoBuffer.
+ * @param f AVFifoBuffer to write to
+ * @param src data source; non-const since it may be used as a
+ * modifiable context by the function defined in func
+ * @param size number of bytes to write
+ * @param func generic write function; the first parameter is src,
+ * the second is dest_buf, the third is dest_buf_size.
+ * func must return the number of bytes written to dest_buf, or <= 0 to
+ * indicate no more data available to write.
+ * If func is NULL, src is interpreted as a simple byte array for source data.
+ * @return the number of bytes written to the FIFO
+ */
+int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int));
+
+/**
+ * Resize an AVFifoBuffer.
+ * In case of reallocation failure, the old FIFO is kept unchanged.
+ *
+ * @param f AVFifoBuffer to resize
+ * @param size new AVFifoBuffer size in bytes
+ * @return <0 for failure, >=0 otherwise
+ */
+int av_fifo_realloc2(AVFifoBuffer *f, unsigned int size);
+
+/**
+ * Enlarge an AVFifoBuffer.
+ * In case of reallocation failure, the old FIFO is kept unchanged.
+ * The new fifo size may be larger than the requested size.
+ *
+ * @param f AVFifoBuffer to resize
+ * @param additional_space the amount of space in bytes to allocate in addition to av_fifo_size()
+ * @return <0 for failure, >=0 otherwise
+ */
+int av_fifo_grow(AVFifoBuffer *f, unsigned int additional_space);
+
+/**
+ * Read and discard the specified amount of data from an AVFifoBuffer.
+ * @param f AVFifoBuffer to read from
+ * @param size amount of data to read in bytes
+ */
+void av_fifo_drain(AVFifoBuffer *f, int size);
+
+/**
+ * Return a pointer to the data stored in a FIFO buffer at a certain offset.
+ * The FIFO buffer is not modified.
+ *
+ * @param f AVFifoBuffer to peek at, f must be non-NULL
+ * @param offs an offset in bytes, its absolute value must be less
+ * than the used buffer size or the returned pointer will
+ * point outside to the buffer data.
+ * The used buffer size can be checked with av_fifo_size().
+ */
+static inline uint8_t *av_fifo_peek2(const AVFifoBuffer *f, int offs)
+{
+ uint8_t *ptr = f->rptr + offs;
+ if (ptr >= f->end)
+ ptr = f->buffer + (ptr - f->end);
+ else if (ptr < f->buffer)
+ ptr = f->end - (f->buffer - ptr);
+ return ptr;
+}
+
+#endif /* AVUTIL_FIFO_H */
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * a very simple circular buffer FIFO implementation
+ */
+
+#ifndef AVUTIL_FIFO_H
+#define AVUTIL_FIFO_H
+
+#include <stdint.h>
+#include "avutil.h"
+#include "attributes.h"
+
+typedef struct AVFifoBuffer {
+ uint8_t *buffer;
+ uint8_t *rptr, *wptr, *end;
+ uint32_t rndx, wndx;
+} AVFifoBuffer;
+
+/**
+ * Initialize an AVFifoBuffer.
+ * @param size of FIFO
+ * @return AVFifoBuffer or NULL in case of memory allocation failure
+ */
+AVFifoBuffer *av_fifo_alloc(unsigned int size);
+
+/**
+ * Initialize an AVFifoBuffer.
+ * @param nmemb number of elements
+ * @param size size of the single element
+ * @return AVFifoBuffer or NULL in case of memory allocation failure
+ */
+AVFifoBuffer *av_fifo_alloc_array(size_t nmemb, size_t size);
+
+/**
+ * Free an AVFifoBuffer.
+ * @param f AVFifoBuffer to free
+ */
+void av_fifo_free(AVFifoBuffer *f);
+
+/**
+ * Free an AVFifoBuffer and reset pointer to NULL.
+ * @param f AVFifoBuffer to free
+ */
+void av_fifo_freep(AVFifoBuffer **f);
+
+/**
+ * Reset the AVFifoBuffer to the state right after av_fifo_alloc, in particular it is emptied.
+ * @param f AVFifoBuffer to reset
+ */
+void av_fifo_reset(AVFifoBuffer *f);
+
+/**
+ * Return the amount of data in bytes in the AVFifoBuffer, that is the
+ * amount of data you can read from it.
+ * @param f AVFifoBuffer to read from
+ * @return size
+ */
+int av_fifo_size(FF_CONST_AVUTIL53 AVFifoBuffer *f);
+
+/**
+ * Return the amount of space in bytes in the AVFifoBuffer, that is the
+ * amount of data you can write into it.
+ * @param f AVFifoBuffer to write into
+ * @return size
+ */
+int av_fifo_space(FF_CONST_AVUTIL53 AVFifoBuffer *f);
+
+/**
+ * Feed data from an AVFifoBuffer to a user-supplied callback.
+ * @param f AVFifoBuffer to read from
+ * @param buf_size number of bytes to read
+ * @param func generic read function
+ * @param dest data destination
+ */
+int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int));
+
+/**
+ * Feed data from a user-supplied callback to an AVFifoBuffer.
+ * @param f AVFifoBuffer to write to
+ * @param src data source; non-const since it may be used as a
+ * modifiable context by the function defined in func
+ * @param size number of bytes to write
+ * @param func generic write function; the first parameter is src,
+ * the second is dest_buf, the third is dest_buf_size.
+ * func must return the number of bytes written to dest_buf, or <= 0 to
+ * indicate no more data available to write.
+ * If func is NULL, src is interpreted as a simple byte array for source data.
+ * @return the number of bytes written to the FIFO
+ */
+int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int));
+
+/**
+ * Resize an AVFifoBuffer.
+ * In case of reallocation failure, the old FIFO is kept unchanged.
+ *
+ * @param f AVFifoBuffer to resize
+ * @param size new AVFifoBuffer size in bytes
+ * @return <0 for failure, >=0 otherwise
+ */
+int av_fifo_realloc2(AVFifoBuffer *f, unsigned int size);
+
+/**
+ * Enlarge an AVFifoBuffer.
+ * In case of reallocation failure, the old FIFO is kept unchanged.
+ * The new fifo size may be larger than the requested size.
+ *
+ * @param f AVFifoBuffer to resize
+ * @param additional_space the amount of space in bytes to allocate in addition to av_fifo_size()
+ * @return <0 for failure, >=0 otherwise
+ */
+int av_fifo_grow(AVFifoBuffer *f, unsigned int additional_space);
+
+/**
+ * Read and discard the specified amount of data from an AVFifoBuffer.
+ * @param f AVFifoBuffer to read from
+ * @param size amount of data to read in bytes
+ */
+void av_fifo_drain(AVFifoBuffer *f, int size);
+
+/**
+ * Return a pointer to the data stored in a FIFO buffer at a certain offset.
+ * The FIFO buffer is not modified.
+ *
+ * @param f AVFifoBuffer to peek at, f must be non-NULL
+ * @param offs an offset in bytes, its absolute value must be less
+ * than the used buffer size or the returned pointer will
+ * point outside to the buffer data.
+ * The used buffer size can be checked with av_fifo_size().
+ */
+static inline uint8_t *av_fifo_peek2(const AVFifoBuffer *f, int offs)
+{
+ uint8_t *ptr = f->rptr + offs;
+ if (ptr >= f->end)
+ ptr = f->buffer + (ptr - f->end);
+ else if (ptr < f->buffer)
+ ptr = f->end - (f->buffer - ptr);
+ return ptr;
+}
+
+#endif /* AVUTIL_FIFO_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/file.h Added

@@ -0,0 +1,132 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_FILE_H
+#define AVUTIL_FILE_H
+
+#include <stdint.h>
+
+#include "avutil.h"
+
+/**
+ * @file
+ * Misc file utilities.
+ */
+
+/**
+ * Read the file with name filename, and put its content in a newly
+ * allocated buffer or map it with mmap() when available.
+ * In case of success set *bufptr to the read or mmapped buffer, and
+ * *size to the size in bytes of the buffer in *bufptr.
+ * The returned buffer must be released with av_file_unmap().
+ *
+ * @param log_offset loglevel offset used for logging
+ * @param log_ctx context used for logging
+ * @return a non negative number in case of success, a negative value
+ * corresponding to an AVERROR error code in case of failure
+ */
+int av_file_map(const char *filename, uint8_t **bufptr, size_t *size,
+ int log_offset, void *log_ctx);
+
+/**
+ * Unmap or free the buffer bufptr created by av_file_map().
+ *
+ * @param size size in bytes of bufptr, must be the same as returned
+ * by av_file_map()
+ */
+void av_file_unmap(uint8_t *bufptr, size_t size);
+
+/**
+ * Wrapper to work around the lack of mkstemp() on mingw.
+ * Also, tries to create file in /tmp first, if possible.
+ * *prefix can be a character constant; *filename will be allocated internally.
+ * @return file descriptor of opened file (or -1 on error)
+ * and opened file name in **filename.
+ * @note On very old libcs it is necessary to set a secure umask before
+ * calling this, av_tempfile() can't call umask itself as it is used in
+ * libraries and could interfere with the calling application.
+ */
+int av_tempfile(const char *prefix, char **filename, int log_offset, void *log_ctx);
+
+#endif /* AVUTIL_FILE_H */
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_FILE_H
+#define AVUTIL_FILE_H
+
+#include <stdint.h>
+
+#include "avutil.h"
+
+/**
+ * @file
+ * Misc file utilities.
+ */
+
+/**
+ * Read the file with name filename, and put its content in a newly
+ * allocated buffer or map it with mmap() when available.
+ * In case of success set *bufptr to the read or mmapped buffer, and
+ * *size to the size in bytes of the buffer in *bufptr.
+ * The returned buffer must be released with av_file_unmap().
+ *
+ * @param log_offset loglevel offset used for logging
+ * @param log_ctx context used for logging
+ * @return a non negative number in case of success, a negative value
+ * corresponding to an AVERROR error code in case of failure
+ */
+int av_file_map(const char *filename, uint8_t **bufptr, size_t *size,
+ int log_offset, void *log_ctx);
+
+/**
+ * Unmap or free the buffer bufptr created by av_file_map().
+ *
+ * @param size size in bytes of bufptr, must be the same as returned
+ * by av_file_map()
+ */
+void av_file_unmap(uint8_t *bufptr, size_t size);
+
+/**
+ * Wrapper to work around the lack of mkstemp() on mingw.
+ * Also, tries to create file in /tmp first, if possible.
+ * *prefix can be a character constant; *filename will be allocated internally.
+ * @return file descriptor of opened file (or -1 on error)
+ * and opened file name in **filename.
+ * @note On very old libcs it is necessary to set a secure umask before
+ * calling this, av_tempfile() can't call umask itself as it is used in
+ * libraries and could interfere with the calling application.
+ */
+int av_tempfile(const char *prefix, char **filename, int log_offset, void *log_ctx);
+
+#endif /* AVUTIL_FILE_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/frame.h Added

@@ -0,0 +1,1518 @@
+/*
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * @ingroup lavu_frame
+ * reference-counted frame API
+ */
+
+#ifndef AVUTIL_FRAME_H
+#define AVUTIL_FRAME_H
+
+#include <stdint.h>
+
+#include "avutil.h"
+#include "buffer.h"
+#include "dict.h"
+#include "rational.h"
+#include "samplefmt.h"
+#include "pixfmt.h"
+#include "version.h"
+
+
+/**
+ * @defgroup lavu_frame AVFrame
+ * @ingroup lavu_data
+ *
+ * @{
+ * AVFrame is an abstraction for reference-counted raw multimedia data.
+ */
+
+enum AVFrameSideDataType {
+ /**
+ * The data is the AVPanScan struct defined in libavcodec.
+ */
+ AV_FRAME_DATA_PANSCAN,
+ /**
+ * ATSC A53 Part 4 Closed Captions.
+ * A53 CC bitstream is stored as uint8_t in AVFrameSideData.data.
+ * The number of bytes of CC data is AVFrameSideData.size.
+ */
+ AV_FRAME_DATA_A53_CC,
+ /**
+ * Stereoscopic 3d metadata.
+ * The data is the AVStereo3D struct defined in libavutil/stereo3d.h.
+ */
+ AV_FRAME_DATA_STEREO3D,
+ /**
+ * The data is the AVMatrixEncoding enum defined in libavutil/channel_layout.h.
+ */
+ AV_FRAME_DATA_MATRIXENCODING,
+ /**
+ * Metadata relevant to a downmix procedure.
+ * The data is the AVDownmixInfo struct defined in libavutil/downmix_info.h.
+ */
+ AV_FRAME_DATA_DOWNMIX_INFO,
+ /**
+ * ReplayGain information in the form of the AVReplayGain struct.
+ */
+ AV_FRAME_DATA_REPLAYGAIN,
+ /**
+ * This side data contains a 3x3 transformation matrix describing an affine
+ * transformation that needs to be applied to the frame for correct
+ * presentation.
+ *
+ * See libavutil/display.h for a detailed description of the data.
+ */
+ AV_FRAME_DATA_DISPLAYMATRIX,
+ /**
+ * Active Format Description data consisting of a single byte as specified
+ * in ETSI TS 101 154 using AVActiveFormatDescription enum.
+ */
+ AV_FRAME_DATA_AFD,
+ /**
+ * Motion vectors exported by some codecs (on demand through the export_mvs
+ * flag set in the libavcodec AVCodecContext flags2 option).
+ * The data is the AVMotionVector struct defined in
+ * libavutil/motion_vector.h.
+ */
+ AV_FRAME_DATA_MOTION_VECTORS,
+};
+
+enum AVActiveFormatDescription {
+ AV_AFD_SAME = 8,
+ AV_AFD_4_3 = 9,
+ AV_AFD_16_9 = 10,
+ AV_AFD_14_9 = 11,
+ AV_AFD_4_3_SP_14_9 = 13,
+ AV_AFD_16_9_SP_14_9 = 14,
+ AV_AFD_SP_4_3 = 15,
+};
+
+typedef struct AVFrameSideData {
+ enum AVFrameSideDataType type;
+ uint8_t *data;
+ int size;
+ AVDictionary *metadata;
+} AVFrameSideData;
+
+/**
+ * This structure describes decoded (raw) audio or video data.
+ *
+ * AVFrame must be allocated using av_frame_alloc(). Note that this only
+ * allocates the AVFrame itself, the buffers for the data must be managed
+ * through other means (see below).
+ * AVFrame must be freed with av_frame_free().
+ *
+ * AVFrame is typically allocated once and then reused multiple times to hold
+ * different data (e.g. a single AVFrame to hold frames received from a
+ * decoder). In such a case, av_frame_unref() will free any references held by
+ * the frame and reset it to its original clean state before it
+ * is reused again.
+ *
+ * The data described by an AVFrame is usually reference counted through the
+ * AVBuffer API. The underlying buffer references are stored in AVFrame.buf /
+ * AVFrame.extended_buf. An AVFrame is considered to be reference counted if at
+ * least one reference is set, i.e. if AVFrame.buf[0] != NULL. In such a case,
+ * every single data plane must be contained in one of the buffers in
+ * AVFrame.buf or AVFrame.extended_buf.
+ * There may be a single buffer for all the data, or one separate buffer for
+ * each plane, or anything in between.
+ *
+ * sizeof(AVFrame) is not a part of the public ABI, so new fields may be added
+ * to the end with a minor bump.
+ * Similarly fields that are marked as to be only accessed by
+ * av_opt_ptr() can be reordered. This allows 2 forks to add fields
+ * without breaking compatibility with each other.
+ */
+typedef struct AVFrame {
+#define AV_NUM_DATA_POINTERS 8
+ /**
+ * pointer to the picture/channel planes.
+ * This might be different from the first allocated byte
+ *
+ * Some decoders access areas outside 0,0 - width,height, please
+ * see avcodec_align_dimensions2(). Some filters and swscale can read
+ * up to 16 bytes beyond the planes, if these filters are to be used,
+ * then 16 extra bytes must be allocated.
+ */
+ uint8_t *data[AV_NUM_DATA_POINTERS];
+
+ /**
+ * For video, size in bytes of each picture line.
+ * For audio, size in bytes of each plane.
+ *
+ * For audio, only linesize[0] may be set. For planar audio, each channel
+ * plane must be the same size.
+ *
+ * For video the linesizes should be multiples of the CPUs alignment
+ * preference, this is 16 or 32 for modern desktop CPUs.
+ * Some code requires such alignment other code can be slower without
+ * correct alignment, for yet other it makes no difference.
+ *
+ * @note The linesize may be larger than the size of usable data -- there
+ * may be extra padding present for performance reasons.
+ */
+ int linesize[AV_NUM_DATA_POINTERS];
+
+ /**
+ * pointers to the data planes/channels.
+ *
+ * For video, this should simply point to data[].
+ *
+ * For planar audio, each channel has a separate data pointer, and
+ * linesize[0] contains the size of each channel buffer.
+ * For packed audio, there is just one data pointer, and linesize[0]
+ * contains the total size of the buffer for all channels.
+ *
+ * Note: Both data and extended_data should always be set in a valid frame,
+ * but for planar audio with more channels that can fit in data,
+ * extended_data must be used in order to access all channels.
+ */
+ uint8_t **extended_data;
+
+ /**
+ * width and height of the video frame
+ */
+ int width, height;
+
+ /**
+ * number of audio samples (per channel) described by this frame
+ */
+ int nb_samples;
+
+ /**
+ * format of the frame, -1 if unknown or unset
+ * Values correspond to enum AVPixelFormat for video frames,
+ * enum AVSampleFormat for audio)
+ */
+ int format;
+
+ /**
+ * 1 -> keyframe, 0-> not
+ */
+ int key_frame;
+
+ /**
+ * Picture type of the frame.
+ */
+ enum AVPictureType pict_type;
+
+#if FF_API_AVFRAME_LAVC
+ attribute_deprecated
+ uint8_t *base[AV_NUM_DATA_POINTERS];
+#endif
+
+ /**
+ * Sample aspect ratio for the video frame, 0/1 if unknown/unspecified.
+ */
+ AVRational sample_aspect_ratio;
+
+ /**
+ * Presentation timestamp in time_base units (time when frame should be shown to user).
+ */
+ int64_t pts;
+
+ /**
+ * PTS copied from the AVPacket that was decoded to produce this frame.
+ */
+ int64_t pkt_pts;
+
+ /**
+ * DTS copied from the AVPacket that triggered returning this frame. (if frame threading isn't used)
+ * This is also the Presentation time of this AVFrame calculated from
+ * only AVPacket.dts values without pts values.
+ */
+ int64_t pkt_dts;
+
+ /**
+ * picture number in bitstream order
+ */
+ int coded_picture_number;
+ /**
+ * picture number in display order
+ */
+ int display_picture_number;
+
+ /**
+ * quality (between 1 (good) and FF_LAMBDA_MAX (bad))
+ */
+ int quality;
+
+#if FF_API_AVFRAME_LAVC
+ attribute_deprecated
+ int reference;
+
+ /**
+ * QP table
+ */
+ attribute_deprecated
+ int8_t *qscale_table;
+ /**
+ * QP store stride
+ */
+ attribute_deprecated
+ int qstride;
+
+ attribute_deprecated
+ int qscale_type;
+
+ /**
+ * mbskip_table[mb]>=1 if MB didn't change
+ * stride= mb_width = (width+15)>>4
+ */
+ attribute_deprecated
+ uint8_t *mbskip_table;
+
+ /**
+ * motion vector table
+ * @code
+ * example:
+ * int mv_sample_log2= 4 - motion_subsample_log2;
+ * int mb_width= (width+15)>>4;
+ * int mv_stride= (mb_width << mv_sample_log2) + 1;
+ * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];
+ * @endcode
+ */
+ int16_t (*motion_val[2])[2];
+
+ /**
+ * macroblock type table
+ * mb_type_base + mb_width + 2
+ */
+ attribute_deprecated
+ uint32_t *mb_type;
+
+ /**
+ * DCT coefficients
+ */
+ attribute_deprecated
+ short *dct_coeff;
+
+ /**
+ * motion reference frame index
+ * the order in which these are stored can depend on the codec.
+ */
+ attribute_deprecated
+ int8_t *ref_index[2];
+#endif
+
+ /**
+ * for some private data of the user
+ */
+ void *opaque;
+
+ /**
+ * error
+ */
+ uint64_t error[AV_NUM_DATA_POINTERS];
+
+#if FF_API_AVFRAME_LAVC
+ attribute_deprecated
+ int type;
+#endif
+
+ /**
+ * When decoding, this signals how much the picture must be delayed.
+ * extra_delay = repeat_pict / (2*fps)
+ */
+ int repeat_pict;
+
+ /**
+ * The content of the picture is interlaced.
+ */
+ int interlaced_frame;
+
+ /**
+ * If the content is interlaced, is top field displayed first.
+ */
+ int top_field_first;
+
+ /**
+ * Tell user application that palette has changed from previous frame.
+ */
+ int palette_has_changed;
+
+#if FF_API_AVFRAME_LAVC
+ attribute_deprecated
+ int buffer_hints;
+
+ /**
+ * Pan scan.
+ */
+ attribute_deprecated
+ struct AVPanScan *pan_scan;
+#endif
+
+ /**
+ * reordered opaque 64bit (generally an integer or a double precision float
+ * PTS but can be anything).
+ * The user sets AVCodecContext.reordered_opaque to represent the input at
+ * that time,
+ * the decoder reorders values as needed and sets AVFrame.reordered_opaque
+ * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque
+ * @deprecated in favor of pkt_pts
+ */
+ int64_t reordered_opaque;
+
+#if FF_API_AVFRAME_LAVC
+ /**
+ * @deprecated this field is unused
+ */
+ attribute_deprecated void *hwaccel_picture_private;
+
+ attribute_deprecated
+ struct AVCodecContext *owner;
+ attribute_deprecated
+ void *thread_opaque;
+
+ /**
+ * log2 of the size of the block which a single vector in motion_val represents:
+ * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)
+ */
+ uint8_t motion_subsample_log2;
+#endif
+
+ /**
+ * Sample rate of the audio data.
+ */
+ int sample_rate;
+
+ /**
+ * Channel layout of the audio data.
+ */
+ uint64_t channel_layout;
+
+ /**
+ * AVBuffer references backing the data for this frame. If all elements of
+ * this array are NULL, then this frame is not reference counted.
+ *
+ * There may be at most one AVBuffer per data plane, so for video this array
+ * always contains all the references. For planar audio with more than
+ * AV_NUM_DATA_POINTERS channels, there may be more buffers than can fit in
+ * this array. Then the extra AVBufferRef pointers are stored in the
+ * extended_buf array.
+ */
+ AVBufferRef *buf[AV_NUM_DATA_POINTERS];
+
+ /**
+ * For planar audio which requires more than AV_NUM_DATA_POINTERS
+ * AVBufferRef pointers, this array will hold all the references which
+ * cannot fit into AVFrame.buf.
+ *
+ * Note that this is different from AVFrame.extended_data, which always
+ * contains all the pointers. This array only contains the extra pointers,
+ * which cannot fit into AVFrame.buf.
+ *
+ * This array is always allocated using av_malloc() by whoever constructs
+ * the frame. It is freed in av_frame_unref().
+ */
+ AVBufferRef **extended_buf;
+ /**
+ * Number of elements in extended_buf.
+ */
+ int nb_extended_buf;
+
+ AVFrameSideData **side_data;
+ int nb_side_data;
+
+/**
+ * @defgroup lavu_frame_flags AV_FRAME_FLAGS
+ * Flags describing additional frame properties.
+ *
+ * @{
+ */
+
+/**
+ * The frame data may be corrupted, e.g. due to decoding errors.
+ */
+#define AV_FRAME_FLAG_CORRUPT (1 << 0)
+/**
+ * @}
+ */
+
+ /**
+ * Frame flags, a combination of @ref lavu_frame_flags
+ */
+ int flags;
+
+ /**
+ * MPEG vs JPEG YUV range.
+ * It must be accessed using av_frame_get_color_range() and
+ * av_frame_set_color_range().
+ * - encoding: Set by user
+ * - decoding: Set by libavcodec
+ */
+ enum AVColorRange color_range;
+
+ enum AVColorPrimaries color_primaries;
+
+ enum AVColorTransferCharacteristic color_trc;
+
+ /**
+ * YUV colorspace type.
+ * It must be accessed using av_frame_get_colorspace() and
+ * av_frame_set_colorspace().
+ * - encoding: Set by user
+ * - decoding: Set by libavcodec
+ */
+ enum AVColorSpace colorspace;
+
+ enum AVChromaLocation chroma_location;
+
+ /**
+ * frame timestamp estimated using various heuristics, in stream time base
+ * Code outside libavcodec should access this field using:
+ * av_frame_get_best_effort_timestamp(frame)
+ * - encoding: unused
+ * - decoding: set by libavcodec, read by user.
+ */
+ int64_t best_effort_timestamp;
+
+ /**
+ * reordered pos from the last AVPacket that has been input into the decoder
+ * Code outside libavcodec should access this field using:
+ * av_frame_get_pkt_pos(frame)
+ * - encoding: unused
+ * - decoding: Read by user.
+ */
+ int64_t pkt_pos;
+
+ /**
+ * duration of the corresponding packet, expressed in
+ * AVStream->time_base units, 0 if unknown.
+ * Code outside libavcodec should access this field using:
+ * av_frame_get_pkt_duration(frame)
+ * - encoding: unused
+ * - decoding: Read by user.
+ */
+ int64_t pkt_duration;
+
+ /**
+ * metadata.
+ * Code outside libavcodec should access this field using:
+ * av_frame_get_metadata(frame)
+ * - encoding: Set by user.
+ * - decoding: Set by libavcodec.
+ */
+ AVDictionary *metadata;
+
+ /**
+ * decode error flags of the frame, set to a combination of
+ * FF_DECODE_ERROR_xxx flags if the decoder produced a frame, but there
+ * were errors during the decoding.
+ * Code outside libavcodec should access this field using:
+ * av_frame_get_decode_error_flags(frame)
+ * - encoding: unused
+ * - decoding: set by libavcodec, read by user.
+ */
+ int decode_error_flags;
+#define FF_DECODE_ERROR_INVALID_BITSTREAM 1
+#define FF_DECODE_ERROR_MISSING_REFERENCE 2
+
+ /**
+ * number of audio channels, only used for audio.
+ * Code outside libavcodec should access this field using:
+ * av_frame_get_channels(frame)
+ * - encoding: unused
+ * - decoding: Read by user.
+ */
+ int channels;
+
+ /**
+ * size of the corresponding packet containing the compressed
+ * frame. It must be accessed using av_frame_get_pkt_size() and
+ * av_frame_set_pkt_size().
+ * It is set to a negative value if unknown.
+ * - encoding: unused
+ * - decoding: set by libavcodec, read by user.
+ */
+ int pkt_size;
+
+ /**
+ * Not to be accessed directly from outside libavutil
+ */
+ AVBufferRef *qp_table_buf;
+} AVFrame;
+
+/**
+ * Accessors for some AVFrame fields.
+ * The position of these field in the structure is not part of the ABI,
+ * they should not be accessed directly outside libavcodec.
+ */
+int64_t av_frame_get_best_effort_timestamp(const AVFrame *frame);
+void av_frame_set_best_effort_timestamp(AVFrame *frame, int64_t val);
+int64_t av_frame_get_pkt_duration (const AVFrame *frame);
+void av_frame_set_pkt_duration (AVFrame *frame, int64_t val);
+int64_t av_frame_get_pkt_pos (const AVFrame *frame);
+void av_frame_set_pkt_pos (AVFrame *frame, int64_t val);
+int64_t av_frame_get_channel_layout (const AVFrame *frame);
+void av_frame_set_channel_layout (AVFrame *frame, int64_t val);
+int av_frame_get_channels (const AVFrame *frame);
+void av_frame_set_channels (AVFrame *frame, int val);
+int av_frame_get_sample_rate (const AVFrame *frame);
+void av_frame_set_sample_rate (AVFrame *frame, int val);
+AVDictionary *av_frame_get_metadata (const AVFrame *frame);
+void av_frame_set_metadata (AVFrame *frame, AVDictionary *val);
+int av_frame_get_decode_error_flags (const AVFrame *frame);
+void av_frame_set_decode_error_flags (AVFrame *frame, int val);
+int av_frame_get_pkt_size(const AVFrame *frame);
+void av_frame_set_pkt_size(AVFrame *frame, int val);
+AVDictionary **avpriv_frame_get_metadatap(AVFrame *frame);
+int8_t *av_frame_get_qp_table(AVFrame *f, int *stride, int *type);
+int av_frame_set_qp_table(AVFrame *f, AVBufferRef *buf, int stride, int type);
+enum AVColorSpace av_frame_get_colorspace(const AVFrame *frame);
+void av_frame_set_colorspace(AVFrame *frame, enum AVColorSpace val);
+enum AVColorRange av_frame_get_color_range(const AVFrame *frame);
+void av_frame_set_color_range(AVFrame *frame, enum AVColorRange val);
+
+/**
+ * Get the name of a colorspace.
+ * @return a static string identifying the colorspace; can be NULL.
+ */
+const char *av_get_colorspace_name(enum AVColorSpace val);
+
+/**
+ * Allocate an AVFrame and set its fields to default values. The resulting
+ * struct must be freed using av_frame_free().
+ *
+ * @return An AVFrame filled with default values or NULL on failure.
+ *
+ * @note this only allocates the AVFrame itself, not the data buffers. Those
+ * must be allocated through other means, e.g. with av_frame_get_buffer() or
+ * manually.
+ */
+AVFrame *av_frame_alloc(void);
+
+/**
+ * Free the frame and any dynamically allocated objects in it,
+ * e.g. extended_data. If the frame is reference counted, it will be
+ * unreferenced first.
+ *
+ * @param frame frame to be freed. The pointer will be set to NULL.
+ */
+void av_frame_free(AVFrame **frame);
+
+/**
+ * Set up a new reference to the data described by the source frame.
+ *
+ * Copy frame properties from src to dst and create a new reference for each
+ * AVBufferRef from src.
+ *
+ * If src is not reference counted, new buffers are allocated and the data is
+ * copied.
+ *
+ * @return 0 on success, a negative AVERROR on error
+ */
+int av_frame_ref(AVFrame *dst, const AVFrame *src);
+
+/**
+ * Create a new frame that references the same data as src.
+ *
+ * This is a shortcut for av_frame_alloc()+av_frame_ref().
+ *
+ * @return newly created AVFrame on success, NULL on error.
+ */
+AVFrame *av_frame_clone(const AVFrame *src);
+
+/**
+ * Unreference all the buffers referenced by frame and reset the frame fields.
+ */
+void av_frame_unref(AVFrame *frame);
+
+/**
+ * Move everythnig contained in src to dst and reset src.
+ */
+void av_frame_move_ref(AVFrame *dst, AVFrame *src);
+
+/**
+ * Allocate new buffer(s) for audio or video data.
+ *
+ * The following fields must be set on frame before calling this function:
+ * - format (pixel format for video, sample format for audio)
+ * - width and height for video
+ * - nb_samples and channel_layout for audio
+ *
+ * This function will fill AVFrame.data and AVFrame.buf arrays and, if
+ * necessary, allocate and fill AVFrame.extended_data and AVFrame.extended_buf.
+ * For planar formats, one buffer will be allocated for each plane.
+ *
+ * @param frame frame in which to store the new buffers.
+ * @param align required buffer size alignment
+ *
+ * @return 0 on success, a negative AVERROR on error.
+ */
+int av_frame_get_buffer(AVFrame *frame, int align);
+
+/**
+ * Check if the frame data is writable.
+ *
+ * @return A positive value if the frame data is writable (which is true if and
+ * only if each of the underlying buffers has only one reference, namely the one
+ * stored in this frame). Return 0 otherwise.
+ *
+ * If 1 is returned the answer is valid until av_buffer_ref() is called on any
+ * of the underlying AVBufferRefs (e.g. through av_frame_ref() or directly).
+ *
+ * @see av_frame_make_writable(), av_buffer_is_writable()
+ */
+int av_frame_is_writable(AVFrame *frame);
+
+/**
+ * Ensure that the frame data is writable, avoiding data copy if possible.
+ *
+ * Do nothing if the frame is writable, allocate new buffers and copy the data
+ * if it is not.
+ *
+ * @return 0 on success, a negative AVERROR on error.
+ *
+ * @see av_frame_is_writable(), av_buffer_is_writable(),
+ * av_buffer_make_writable()
+ */
+int av_frame_make_writable(AVFrame *frame);
+
+/**
+ * Copy the frame data from src to dst.
+ *
+ * This function does not allocate anything, dst must be already initialized and
+ * allocated with the same parameters as src.
+ *
+ * This function only copies the frame data (i.e. the contents of the data /
+ * extended data arrays), not any other properties.
+ *
+ * @return >= 0 on success, a negative AVERROR on error.
+ */
+int av_frame_copy(AVFrame *dst, const AVFrame *src);
+
+/**
+ * Copy only "metadata" fields from src to dst.
+ *
+ * Metadata for the purpose of this function are those fields that do not affect
+ * the data layout in the buffers. E.g. pts, sample rate (for audio) or sample
+ * aspect ratio (for video), but not width/height or channel layout.
+ * Side data is also copied.
+ */
+int av_frame_copy_props(AVFrame *dst, const AVFrame *src);
+
+/**
+ * Get the buffer reference a given data plane is stored in.
+ *
+ * @param plane index of the data plane of interest in frame->extended_data.
+ *
+ * @return the buffer reference that contains the plane or NULL if the input
+ * frame is not valid.
+ */
+AVBufferRef *av_frame_get_plane_buffer(AVFrame *frame, int plane);
+
+/**
+ * Add a new side data to a frame.
+ *
+ * @param frame a frame to which the side data should be added
+ * @param type type of the added side data
+ * @param size size of the side data
+ *
+ * @return newly added side data on success, NULL on error
+ */
+AVFrameSideData *av_frame_new_side_data(AVFrame *frame,
+ enum AVFrameSideDataType type,
+ int size);
+
+/**
+ * @return a pointer to the side data of a given type on success, NULL if there
+ * is no side data with such type in this frame.
+ */
+AVFrameSideData *av_frame_get_side_data(const AVFrame *frame,
+ enum AVFrameSideDataType type);
+
+/**
+ * If side data of the supplied type exists in the frame, free it and remove it
+ * from the frame.
+ */
+void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type);
+
+/**
+ * @return a string identifying the side data type
+ */
+const char *av_frame_side_data_name(enum AVFrameSideDataType type);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_FRAME_H */
+/*
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * @ingroup lavu_frame
+ * reference-counted frame API
+ */
+
+#ifndef AVUTIL_FRAME_H
+#define AVUTIL_FRAME_H
+
+#include <stdint.h>
+
+#include "avutil.h"
+#include "buffer.h"
+#include "dict.h"
+#include "rational.h"
+#include "samplefmt.h"
+#include "pixfmt.h"
+#include "version.h"
+
+
+/**
+ * @defgroup lavu_frame AVFrame
+ * @ingroup lavu_data
+ *
+ * @{
+ * AVFrame is an abstraction for reference-counted raw multimedia data.
+ */
+
+enum AVFrameSideDataType {
+ /**
+ * The data is the AVPanScan struct defined in libavcodec.
+ */
+ AV_FRAME_DATA_PANSCAN,
+ /**
+ * ATSC A53 Part 4 Closed Captions.
+ * A53 CC bitstream is stored as uint8_t in AVFrameSideData.data.
+ * The number of bytes of CC data is AVFrameSideData.size.
+ */
+ AV_FRAME_DATA_A53_CC,
+ /**
+ * Stereoscopic 3d metadata.
+ * The data is the AVStereo3D struct defined in libavutil/stereo3d.h.
+ */
+ AV_FRAME_DATA_STEREO3D,
+ /**
+ * The data is the AVMatrixEncoding enum defined in libavutil/channel_layout.h.
+ */
+ AV_FRAME_DATA_MATRIXENCODING,
+ /**
+ * Metadata relevant to a downmix procedure.
+ * The data is the AVDownmixInfo struct defined in libavutil/downmix_info.h.
+ */
+ AV_FRAME_DATA_DOWNMIX_INFO,
+ /**
+ * ReplayGain information in the form of the AVReplayGain struct.
+ */
+ AV_FRAME_DATA_REPLAYGAIN,
+ /**
+ * This side data contains a 3x3 transformation matrix describing an affine
+ * transformation that needs to be applied to the frame for correct
+ * presentation.
+ *
+ * See libavutil/display.h for a detailed description of the data.
+ */
+ AV_FRAME_DATA_DISPLAYMATRIX,
+ /**
+ * Active Format Description data consisting of a single byte as specified
+ * in ETSI TS 101 154 using AVActiveFormatDescription enum.
+ */
+ AV_FRAME_DATA_AFD,
+ /**
+ * Motion vectors exported by some codecs (on demand through the export_mvs
+ * flag set in the libavcodec AVCodecContext flags2 option).
+ * The data is the AVMotionVector struct defined in
+ * libavutil/motion_vector.h.
+ */
+ AV_FRAME_DATA_MOTION_VECTORS,
+};
+
+enum AVActiveFormatDescription {
+ AV_AFD_SAME = 8,
+ AV_AFD_4_3 = 9,
+ AV_AFD_16_9 = 10,
+ AV_AFD_14_9 = 11,
+ AV_AFD_4_3_SP_14_9 = 13,
+ AV_AFD_16_9_SP_14_9 = 14,
+ AV_AFD_SP_4_3 = 15,
+};
+
+typedef struct AVFrameSideData {
+ enum AVFrameSideDataType type;
+ uint8_t *data;
+ int size;
+ AVDictionary *metadata;
+} AVFrameSideData;
+
+/**
+ * This structure describes decoded (raw) audio or video data.
+ *
+ * AVFrame must be allocated using av_frame_alloc(). Note that this only
+ * allocates the AVFrame itself, the buffers for the data must be managed
+ * through other means (see below).
+ * AVFrame must be freed with av_frame_free().
+ *
+ * AVFrame is typically allocated once and then reused multiple times to hold
+ * different data (e.g. a single AVFrame to hold frames received from a
+ * decoder). In such a case, av_frame_unref() will free any references held by
+ * the frame and reset it to its original clean state before it
+ * is reused again.
+ *
+ * The data described by an AVFrame is usually reference counted through the
+ * AVBuffer API. The underlying buffer references are stored in AVFrame.buf /
+ * AVFrame.extended_buf. An AVFrame is considered to be reference counted if at
+ * least one reference is set, i.e. if AVFrame.buf[0] != NULL. In such a case,
+ * every single data plane must be contained in one of the buffers in
+ * AVFrame.buf or AVFrame.extended_buf.
+ * There may be a single buffer for all the data, or one separate buffer for
+ * each plane, or anything in between.
+ *
+ * sizeof(AVFrame) is not a part of the public ABI, so new fields may be added
+ * to the end with a minor bump.
+ * Similarly fields that are marked as to be only accessed by
+ * av_opt_ptr() can be reordered. This allows 2 forks to add fields
+ * without breaking compatibility with each other.
+ */
+typedef struct AVFrame {
+#define AV_NUM_DATA_POINTERS 8
+ /**
+ * pointer to the picture/channel planes.
+ * This might be different from the first allocated byte
+ *
+ * Some decoders access areas outside 0,0 - width,height, please
+ * see avcodec_align_dimensions2(). Some filters and swscale can read
+ * up to 16 bytes beyond the planes, if these filters are to be used,
+ * then 16 extra bytes must be allocated.
+ */
+ uint8_t *data[AV_NUM_DATA_POINTERS];
+
+ /**
+ * For video, size in bytes of each picture line.
+ * For audio, size in bytes of each plane.
+ *
+ * For audio, only linesize[0] may be set. For planar audio, each channel
+ * plane must be the same size.
+ *
+ * For video the linesizes should be multiples of the CPUs alignment
+ * preference, this is 16 or 32 for modern desktop CPUs.
+ * Some code requires such alignment other code can be slower without
+ * correct alignment, for yet other it makes no difference.
+ *
+ * @note The linesize may be larger than the size of usable data -- there
+ * may be extra padding present for performance reasons.
+ */
+ int linesize[AV_NUM_DATA_POINTERS];
+
+ /**
+ * pointers to the data planes/channels.
+ *
+ * For video, this should simply point to data[].
+ *
+ * For planar audio, each channel has a separate data pointer, and
+ * linesize[0] contains the size of each channel buffer.
+ * For packed audio, there is just one data pointer, and linesize[0]
+ * contains the total size of the buffer for all channels.
+ *
+ * Note: Both data and extended_data should always be set in a valid frame,
+ * but for planar audio with more channels that can fit in data,
+ * extended_data must be used in order to access all channels.
+ */
+ uint8_t **extended_data;
+
+ /**
+ * width and height of the video frame
+ */
+ int width, height;
+
+ /**
+ * number of audio samples (per channel) described by this frame
+ */
+ int nb_samples;
+
+ /**
+ * format of the frame, -1 if unknown or unset
+ * Values correspond to enum AVPixelFormat for video frames,
+ * enum AVSampleFormat for audio)
+ */
+ int format;
+
+ /**
+ * 1 -> keyframe, 0-> not
+ */
+ int key_frame;
+
+ /**
+ * Picture type of the frame.
+ */
+ enum AVPictureType pict_type;
+
+#if FF_API_AVFRAME_LAVC
+ attribute_deprecated
+ uint8_t *base[AV_NUM_DATA_POINTERS];
+#endif
+
+ /**
+ * Sample aspect ratio for the video frame, 0/1 if unknown/unspecified.
+ */
+ AVRational sample_aspect_ratio;
+
+ /**
+ * Presentation timestamp in time_base units (time when frame should be shown to user).
+ */
+ int64_t pts;
+
+ /**
+ * PTS copied from the AVPacket that was decoded to produce this frame.
+ */
+ int64_t pkt_pts;
+
+ /**
+ * DTS copied from the AVPacket that triggered returning this frame. (if frame threading isn't used)
+ * This is also the Presentation time of this AVFrame calculated from
+ * only AVPacket.dts values without pts values.
+ */
+ int64_t pkt_dts;
+
+ /**
+ * picture number in bitstream order
+ */
+ int coded_picture_number;
+ /**
+ * picture number in display order
+ */
+ int display_picture_number;
+
+ /**
+ * quality (between 1 (good) and FF_LAMBDA_MAX (bad))
+ */
+ int quality;
+
+#if FF_API_AVFRAME_LAVC
+ attribute_deprecated
+ int reference;
+
+ /**
+ * QP table
+ */
+ attribute_deprecated
+ int8_t *qscale_table;
+ /**
+ * QP store stride
+ */
+ attribute_deprecated
+ int qstride;
+
+ attribute_deprecated
+ int qscale_type;
+
+ /**
+ * mbskip_table[mb]>=1 if MB didn't change
+ * stride= mb_width = (width+15)>>4
+ */
+ attribute_deprecated
+ uint8_t *mbskip_table;
+
+ /**
+ * motion vector table
+ * @code
+ * example:
+ * int mv_sample_log2= 4 - motion_subsample_log2;
+ * int mb_width= (width+15)>>4;
+ * int mv_stride= (mb_width << mv_sample_log2) + 1;
+ * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];
+ * @endcode
+ */
+ int16_t (*motion_val[2])[2];
+
+ /**
+ * macroblock type table
+ * mb_type_base + mb_width + 2
+ */
+ attribute_deprecated
+ uint32_t *mb_type;
+
+ /**
+ * DCT coefficients
+ */
+ attribute_deprecated
+ short *dct_coeff;
+
+ /**
+ * motion reference frame index
+ * the order in which these are stored can depend on the codec.
+ */
+ attribute_deprecated
+ int8_t *ref_index[2];
+#endif
+
+ /**
+ * for some private data of the user
+ */
+ void *opaque;
+
+ /**
+ * error
+ */
+ uint64_t error[AV_NUM_DATA_POINTERS];
+
+#if FF_API_AVFRAME_LAVC
+ attribute_deprecated
+ int type;
+#endif
+
+ /**
+ * When decoding, this signals how much the picture must be delayed.
+ * extra_delay = repeat_pict / (2*fps)
+ */
+ int repeat_pict;
+
+ /**
+ * The content of the picture is interlaced.
+ */
+ int interlaced_frame;
+
+ /**
+ * If the content is interlaced, is top field displayed first.
+ */
+ int top_field_first;
+
+ /**
+ * Tell user application that palette has changed from previous frame.
+ */
+ int palette_has_changed;
+
+#if FF_API_AVFRAME_LAVC
+ attribute_deprecated
+ int buffer_hints;
+
+ /**
+ * Pan scan.
+ */
+ attribute_deprecated
+ struct AVPanScan *pan_scan;
+#endif
+
+ /**
+ * reordered opaque 64bit (generally an integer or a double precision float
+ * PTS but can be anything).
+ * The user sets AVCodecContext.reordered_opaque to represent the input at
+ * that time,
+ * the decoder reorders values as needed and sets AVFrame.reordered_opaque
+ * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque
+ * @deprecated in favor of pkt_pts
+ */
+ int64_t reordered_opaque;
+
+#if FF_API_AVFRAME_LAVC
+ /**
+ * @deprecated this field is unused
+ */
+ attribute_deprecated void *hwaccel_picture_private;
+
+ attribute_deprecated
+ struct AVCodecContext *owner;
+ attribute_deprecated
+ void *thread_opaque;
+
+ /**
+ * log2 of the size of the block which a single vector in motion_val represents:
+ * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)
+ */
+ uint8_t motion_subsample_log2;
+#endif
+
+ /**
+ * Sample rate of the audio data.
+ */
+ int sample_rate;
+
+ /**
+ * Channel layout of the audio data.
+ */
+ uint64_t channel_layout;
+
+ /**
+ * AVBuffer references backing the data for this frame. If all elements of
+ * this array are NULL, then this frame is not reference counted.
+ *
+ * There may be at most one AVBuffer per data plane, so for video this array
+ * always contains all the references. For planar audio with more than
+ * AV_NUM_DATA_POINTERS channels, there may be more buffers than can fit in
+ * this array. Then the extra AVBufferRef pointers are stored in the
+ * extended_buf array.
+ */
+ AVBufferRef *buf[AV_NUM_DATA_POINTERS];
+
+ /**
+ * For planar audio which requires more than AV_NUM_DATA_POINTERS
+ * AVBufferRef pointers, this array will hold all the references which
+ * cannot fit into AVFrame.buf.
+ *
+ * Note that this is different from AVFrame.extended_data, which always
+ * contains all the pointers. This array only contains the extra pointers,
+ * which cannot fit into AVFrame.buf.
+ *
+ * This array is always allocated using av_malloc() by whoever constructs
+ * the frame. It is freed in av_frame_unref().
+ */
+ AVBufferRef **extended_buf;
+ /**
+ * Number of elements in extended_buf.
+ */
+ int nb_extended_buf;
+
+ AVFrameSideData **side_data;
+ int nb_side_data;
+
+/**
+ * @defgroup lavu_frame_flags AV_FRAME_FLAGS
+ * Flags describing additional frame properties.
+ *
+ * @{
+ */
+
+/**
+ * The frame data may be corrupted, e.g. due to decoding errors.
+ */
+#define AV_FRAME_FLAG_CORRUPT (1 << 0)
+/**
+ * @}
+ */
+
+ /**
+ * Frame flags, a combination of @ref lavu_frame_flags
+ */
+ int flags;
+
+ /**
+ * MPEG vs JPEG YUV range.
+ * It must be accessed using av_frame_get_color_range() and
+ * av_frame_set_color_range().
+ * - encoding: Set by user
+ * - decoding: Set by libavcodec
+ */
+ enum AVColorRange color_range;
+
+ enum AVColorPrimaries color_primaries;
+
+ enum AVColorTransferCharacteristic color_trc;
+
+ /**
+ * YUV colorspace type.
+ * It must be accessed using av_frame_get_colorspace() and
+ * av_frame_set_colorspace().
+ * - encoding: Set by user
+ * - decoding: Set by libavcodec
+ */
+ enum AVColorSpace colorspace;
+
+ enum AVChromaLocation chroma_location;
+
+ /**
+ * frame timestamp estimated using various heuristics, in stream time base
+ * Code outside libavcodec should access this field using:
+ * av_frame_get_best_effort_timestamp(frame)
+ * - encoding: unused
+ * - decoding: set by libavcodec, read by user.
+ */
+ int64_t best_effort_timestamp;
+
+ /**
+ * reordered pos from the last AVPacket that has been input into the decoder
+ * Code outside libavcodec should access this field using:
+ * av_frame_get_pkt_pos(frame)
+ * - encoding: unused
+ * - decoding: Read by user.
+ */
+ int64_t pkt_pos;
+
+ /**
+ * duration of the corresponding packet, expressed in
+ * AVStream->time_base units, 0 if unknown.
+ * Code outside libavcodec should access this field using:
+ * av_frame_get_pkt_duration(frame)
+ * - encoding: unused
+ * - decoding: Read by user.
+ */
+ int64_t pkt_duration;
+
+ /**
+ * metadata.
+ * Code outside libavcodec should access this field using:
+ * av_frame_get_metadata(frame)
+ * - encoding: Set by user.
+ * - decoding: Set by libavcodec.
+ */
+ AVDictionary *metadata;
+
+ /**
+ * decode error flags of the frame, set to a combination of
+ * FF_DECODE_ERROR_xxx flags if the decoder produced a frame, but there
+ * were errors during the decoding.
+ * Code outside libavcodec should access this field using:
+ * av_frame_get_decode_error_flags(frame)
+ * - encoding: unused
+ * - decoding: set by libavcodec, read by user.
+ */
+ int decode_error_flags;
+#define FF_DECODE_ERROR_INVALID_BITSTREAM 1
+#define FF_DECODE_ERROR_MISSING_REFERENCE 2
+
+ /**
+ * number of audio channels, only used for audio.
+ * Code outside libavcodec should access this field using:
+ * av_frame_get_channels(frame)
+ * - encoding: unused
+ * - decoding: Read by user.
+ */
+ int channels;
+
+ /**
+ * size of the corresponding packet containing the compressed
+ * frame. It must be accessed using av_frame_get_pkt_size() and
+ * av_frame_set_pkt_size().
+ * It is set to a negative value if unknown.
+ * - encoding: unused
+ * - decoding: set by libavcodec, read by user.
+ */
+ int pkt_size;
+
+ /**
+ * Not to be accessed directly from outside libavutil
+ */
+ AVBufferRef *qp_table_buf;
+} AVFrame;
+
+/**
+ * Accessors for some AVFrame fields.
+ * The position of these field in the structure is not part of the ABI,
+ * they should not be accessed directly outside libavcodec.
+ */
+int64_t av_frame_get_best_effort_timestamp(const AVFrame *frame);
+void av_frame_set_best_effort_timestamp(AVFrame *frame, int64_t val);
+int64_t av_frame_get_pkt_duration (const AVFrame *frame);
+void av_frame_set_pkt_duration (AVFrame *frame, int64_t val);
+int64_t av_frame_get_pkt_pos (const AVFrame *frame);
+void av_frame_set_pkt_pos (AVFrame *frame, int64_t val);
+int64_t av_frame_get_channel_layout (const AVFrame *frame);
+void av_frame_set_channel_layout (AVFrame *frame, int64_t val);
+int av_frame_get_channels (const AVFrame *frame);
+void av_frame_set_channels (AVFrame *frame, int val);
+int av_frame_get_sample_rate (const AVFrame *frame);
+void av_frame_set_sample_rate (AVFrame *frame, int val);
+AVDictionary *av_frame_get_metadata (const AVFrame *frame);
+void av_frame_set_metadata (AVFrame *frame, AVDictionary *val);
+int av_frame_get_decode_error_flags (const AVFrame *frame);
+void av_frame_set_decode_error_flags (AVFrame *frame, int val);
+int av_frame_get_pkt_size(const AVFrame *frame);
+void av_frame_set_pkt_size(AVFrame *frame, int val);
+AVDictionary **avpriv_frame_get_metadatap(AVFrame *frame);
+int8_t *av_frame_get_qp_table(AVFrame *f, int *stride, int *type);
+int av_frame_set_qp_table(AVFrame *f, AVBufferRef *buf, int stride, int type);
+enum AVColorSpace av_frame_get_colorspace(const AVFrame *frame);
+void av_frame_set_colorspace(AVFrame *frame, enum AVColorSpace val);
+enum AVColorRange av_frame_get_color_range(const AVFrame *frame);
+void av_frame_set_color_range(AVFrame *frame, enum AVColorRange val);
+
+/**
+ * Get the name of a colorspace.
+ * @return a static string identifying the colorspace; can be NULL.
+ */
+const char *av_get_colorspace_name(enum AVColorSpace val);
+
+/**
+ * Allocate an AVFrame and set its fields to default values. The resulting
+ * struct must be freed using av_frame_free().
+ *
+ * @return An AVFrame filled with default values or NULL on failure.
+ *
+ * @note this only allocates the AVFrame itself, not the data buffers. Those
+ * must be allocated through other means, e.g. with av_frame_get_buffer() or
+ * manually.
+ */
+AVFrame *av_frame_alloc(void);
+
+/**
+ * Free the frame and any dynamically allocated objects in it,
+ * e.g. extended_data. If the frame is reference counted, it will be
+ * unreferenced first.
+ *
+ * @param frame frame to be freed. The pointer will be set to NULL.
+ */
+void av_frame_free(AVFrame **frame);
+
+/**
+ * Set up a new reference to the data described by the source frame.
+ *
+ * Copy frame properties from src to dst and create a new reference for each
+ * AVBufferRef from src.
+ *
+ * If src is not reference counted, new buffers are allocated and the data is
+ * copied.
+ *
+ * @return 0 on success, a negative AVERROR on error
+ */
+int av_frame_ref(AVFrame *dst, const AVFrame *src);
+
+/**
+ * Create a new frame that references the same data as src.
+ *
+ * This is a shortcut for av_frame_alloc()+av_frame_ref().
+ *
+ * @return newly created AVFrame on success, NULL on error.
+ */
+AVFrame *av_frame_clone(const AVFrame *src);
+
+/**
+ * Unreference all the buffers referenced by frame and reset the frame fields.
+ */
+void av_frame_unref(AVFrame *frame);
+
+/**
+ * Move everythnig contained in src to dst and reset src.
+ */
+void av_frame_move_ref(AVFrame *dst, AVFrame *src);
+
+/**
+ * Allocate new buffer(s) for audio or video data.
+ *
+ * The following fields must be set on frame before calling this function:
+ * - format (pixel format for video, sample format for audio)
+ * - width and height for video
+ * - nb_samples and channel_layout for audio
+ *
+ * This function will fill AVFrame.data and AVFrame.buf arrays and, if
+ * necessary, allocate and fill AVFrame.extended_data and AVFrame.extended_buf.
+ * For planar formats, one buffer will be allocated for each plane.
+ *
+ * @param frame frame in which to store the new buffers.
+ * @param align required buffer size alignment
+ *
+ * @return 0 on success, a negative AVERROR on error.
+ */
+int av_frame_get_buffer(AVFrame *frame, int align);
+
+/**
+ * Check if the frame data is writable.
+ *
+ * @return A positive value if the frame data is writable (which is true if and
+ * only if each of the underlying buffers has only one reference, namely the one
+ * stored in this frame). Return 0 otherwise.
+ *
+ * If 1 is returned the answer is valid until av_buffer_ref() is called on any
+ * of the underlying AVBufferRefs (e.g. through av_frame_ref() or directly).
+ *
+ * @see av_frame_make_writable(), av_buffer_is_writable()
+ */
+int av_frame_is_writable(AVFrame *frame);
+
+/**
+ * Ensure that the frame data is writable, avoiding data copy if possible.
+ *
+ * Do nothing if the frame is writable, allocate new buffers and copy the data
+ * if it is not.
+ *
+ * @return 0 on success, a negative AVERROR on error.
+ *
+ * @see av_frame_is_writable(), av_buffer_is_writable(),
+ * av_buffer_make_writable()
+ */
+int av_frame_make_writable(AVFrame *frame);
+
+/**
+ * Copy the frame data from src to dst.
+ *
+ * This function does not allocate anything, dst must be already initialized and
+ * allocated with the same parameters as src.
+ *
+ * This function only copies the frame data (i.e. the contents of the data /
+ * extended data arrays), not any other properties.
+ *
+ * @return >= 0 on success, a negative AVERROR on error.
+ */
+int av_frame_copy(AVFrame *dst, const AVFrame *src);
+
+/**
+ * Copy only "metadata" fields from src to dst.
+ *
+ * Metadata for the purpose of this function are those fields that do not affect
+ * the data layout in the buffers. E.g. pts, sample rate (for audio) or sample
+ * aspect ratio (for video), but not width/height or channel layout.
+ * Side data is also copied.
+ */
+int av_frame_copy_props(AVFrame *dst, const AVFrame *src);
+
+/**
+ * Get the buffer reference a given data plane is stored in.
+ *
+ * @param plane index of the data plane of interest in frame->extended_data.
+ *
+ * @return the buffer reference that contains the plane or NULL if the input
+ * frame is not valid.
+ */
+AVBufferRef *av_frame_get_plane_buffer(AVFrame *frame, int plane);
+
+/**
+ * Add a new side data to a frame.
+ *
+ * @param frame a frame to which the side data should be added
+ * @param type type of the added side data
+ * @param size size of the side data
+ *
+ * @return newly added side data on success, NULL on error
+ */
+AVFrameSideData *av_frame_new_side_data(AVFrame *frame,
+ enum AVFrameSideDataType type,
+ int size);
+
+/**
+ * @return a pointer to the side data of a given type on success, NULL if there
+ * is no side data with such type in this frame.
+ */
+AVFrameSideData *av_frame_get_side_data(const AVFrame *frame,
+ enum AVFrameSideDataType type);
+
+/**
+ * If side data of the supplied type exists in the frame, free it and remove it
+ * from the frame.
+ */
+void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type);
+
+/**
+ * @return a string identifying the side data type
+ */
+const char *av_frame_side_data_name(enum AVFrameSideDataType type);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_FRAME_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/hash.h Added

@@ -0,0 +1,224 @@
+/*
+ * Copyright (C) 2013 Reimar Döffinger <Reimar.Doeffinger@gmx.de>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_HASH_H
+#define AVUTIL_HASH_H
+
+#include <stdint.h>
+
+struct AVHashContext;
+
+/**
+ * Allocate a hash context for the algorithm specified by name.
+ *
+ * @return >= 0 for success, a negative error code for failure
+ * @note The context is not initialized, you must call av_hash_init().
+ */
+int av_hash_alloc(struct AVHashContext **ctx, const char *name);
+
+/**
+ * Get the names of available hash algorithms.
+ *
+ * This function can be used to enumerate the algorithms.
+ *
+ * @param i index of the hash algorithm, starting from 0
+ * @return a pointer to a static string or NULL if i is out of range
+ */
+const char *av_hash_names(int i);
+
+/**
+ * Get the name of the algorithm corresponding to the given hash context.
+ */
+const char *av_hash_get_name(const struct AVHashContext *ctx);
+
+/**
+ * Maximum value that av_hash_get_size will currently return.
+ *
+ * You can use this if you absolutely want or need to use static allocation
+ * and are fine with not supporting hashes newly added to libavutil without
+ * recompilation.
+ * Note that you still need to check against av_hash_get_size, adding new hashes
+ * with larger sizes will not be considered an ABI change and should not cause
+ * your code to overflow a buffer.
+ */
+#define AV_HASH_MAX_SIZE 64
+
+/**
+ * Get the size of the resulting hash value in bytes.
+ *
+ * The pointer passed to av_hash_final have space for at least this many bytes.
+ */
+int av_hash_get_size(const struct AVHashContext *ctx);
+
+/**
+ * Initialize or reset a hash context.
+ */
+void av_hash_init(struct AVHashContext *ctx);
+
+/**
+ * Update a hash context with additional data.
+ */
+void av_hash_update(struct AVHashContext *ctx, const uint8_t *src, int len);
+
+/**
+ * Finalize a hash context and compute the actual hash value.
+ */
+void av_hash_final(struct AVHashContext *ctx, uint8_t *dst);
+
+/**
+ * Finalize a hash context and compute the actual hash value.
+ * If size is smaller than the hash size, the hash is truncated;
+ * if size is larger, the buffer is padded with 0.
+ */
+void av_hash_final_bin(struct AVHashContext *ctx, uint8_t *dst, int size);
+
+/**
+ * Finalize a hash context and compute the actual hash value as a hex string.
+ * The string is always 0-terminated.
+ * If size is smaller than 2 * hash_size + 1, the hex string is truncated.
+ */
+void av_hash_final_hex(struct AVHashContext *ctx, uint8_t *dst, int size);
+
+/**
+ * Finalize a hash context and compute the actual hash value as a base64 string.
+ * The string is always 0-terminated.
+ * If size is smaller than AV_BASE64_SIZE(hash_size), the base64 string is
+ * truncated.
+ */
+void av_hash_final_b64(struct AVHashContext *ctx, uint8_t *dst, int size);
+
+/**
+ * Free hash context.
+ */
+void av_hash_freep(struct AVHashContext **ctx);
+
+#endif /* AVUTIL_HASH_H */
+/*
+ * Copyright (C) 2013 Reimar Döffinger <Reimar.Doeffinger@gmx.de>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_HASH_H
+#define AVUTIL_HASH_H
+
+#include <stdint.h>
+
+struct AVHashContext;
+
+/**
+ * Allocate a hash context for the algorithm specified by name.
+ *
+ * @return >= 0 for success, a negative error code for failure
+ * @note The context is not initialized, you must call av_hash_init().
+ */
+int av_hash_alloc(struct AVHashContext **ctx, const char *name);
+
+/**
+ * Get the names of available hash algorithms.
+ *
+ * This function can be used to enumerate the algorithms.
+ *
+ * @param i index of the hash algorithm, starting from 0
+ * @return a pointer to a static string or NULL if i is out of range
+ */
+const char *av_hash_names(int i);
+
+/**
+ * Get the name of the algorithm corresponding to the given hash context.
+ */
+const char *av_hash_get_name(const struct AVHashContext *ctx);
+
+/**
+ * Maximum value that av_hash_get_size will currently return.
+ *
+ * You can use this if you absolutely want or need to use static allocation
+ * and are fine with not supporting hashes newly added to libavutil without
+ * recompilation.
+ * Note that you still need to check against av_hash_get_size, adding new hashes
+ * with larger sizes will not be considered an ABI change and should not cause
+ * your code to overflow a buffer.
+ */
+#define AV_HASH_MAX_SIZE 64
+
+/**
+ * Get the size of the resulting hash value in bytes.
+ *
+ * The pointer passed to av_hash_final have space for at least this many bytes.
+ */
+int av_hash_get_size(const struct AVHashContext *ctx);
+
+/**
+ * Initialize or reset a hash context.
+ */
+void av_hash_init(struct AVHashContext *ctx);
+
+/**
+ * Update a hash context with additional data.
+ */
+void av_hash_update(struct AVHashContext *ctx, const uint8_t *src, int len);
+
+/**
+ * Finalize a hash context and compute the actual hash value.
+ */
+void av_hash_final(struct AVHashContext *ctx, uint8_t *dst);
+
+/**
+ * Finalize a hash context and compute the actual hash value.
+ * If size is smaller than the hash size, the hash is truncated;
+ * if size is larger, the buffer is padded with 0.
+ */
+void av_hash_final_bin(struct AVHashContext *ctx, uint8_t *dst, int size);
+
+/**
+ * Finalize a hash context and compute the actual hash value as a hex string.
+ * The string is always 0-terminated.
+ * If size is smaller than 2 * hash_size + 1, the hex string is truncated.
+ */
+void av_hash_final_hex(struct AVHashContext *ctx, uint8_t *dst, int size);
+
+/**
+ * Finalize a hash context and compute the actual hash value as a base64 string.
+ * The string is always 0-terminated.
+ * If size is smaller than AV_BASE64_SIZE(hash_size), the base64 string is
+ * truncated.
+ */
+void av_hash_final_b64(struct AVHashContext *ctx, uint8_t *dst, int size);
+
+/**
+ * Free hash context.
+ */
+void av_hash_freep(struct AVHashContext **ctx);
+
+#endif /* AVUTIL_HASH_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/hmac.h Added

@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2012 Martin Storsjo
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_HMAC_H
+#define AVUTIL_HMAC_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_hmac HMAC
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+enum AVHMACType {
+ AV_HMAC_MD5,
+ AV_HMAC_SHA1,
+ AV_HMAC_SHA224 = 10,
+ AV_HMAC_SHA256,
+ AV_HMAC_SHA384,
+ AV_HMAC_SHA512,
+};
+
+typedef struct AVHMAC AVHMAC;
+
+/**
+ * Allocate an AVHMAC context.
+ * @param type The hash function used for the HMAC.
+ */
+AVHMAC *av_hmac_alloc(enum AVHMACType type);
+
+/**
+ * Free an AVHMAC context.
+ * @param ctx The context to free, may be NULL
+ */
+void av_hmac_free(AVHMAC *ctx);
+
+/**
+ * Initialize an AVHMAC context with an authentication key.
+ * @param ctx The HMAC context
+ * @param key The authentication key
+ * @param keylen The length of the key, in bytes
+ */
+void av_hmac_init(AVHMAC *ctx, const uint8_t *key, unsigned int keylen);
+
+/**
+ * Hash data with the HMAC.
+ * @param ctx The HMAC context
+ * @param data The data to hash
+ * @param len The length of the data, in bytes
+ */
+void av_hmac_update(AVHMAC *ctx, const uint8_t *data, unsigned int len);
+
+/**
+ * Finish hashing and output the HMAC digest.
+ * @param ctx The HMAC context
+ * @param out The output buffer to write the digest into
+ * @param outlen The length of the out buffer, in bytes
+ * @return The number of bytes written to out, or a negative error code.
+ */
+int av_hmac_final(AVHMAC *ctx, uint8_t *out, unsigned int outlen);
+
+/**
+ * Hash an array of data with a key.
+ * @param ctx The HMAC context
+ * @param data The data to hash
+ * @param len The length of the data, in bytes
+ * @param key The authentication key
+ * @param keylen The length of the key, in bytes
+ * @param out The output buffer to write the digest into
+ * @param outlen The length of the out buffer, in bytes
+ * @return The number of bytes written to out, or a negative error code.
+ */
+int av_hmac_calc(AVHMAC *ctx, const uint8_t *data, unsigned int len,
+ const uint8_t *key, unsigned int keylen,
+ uint8_t *out, unsigned int outlen);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_HMAC_H */
+/*
+ * Copyright (C) 2012 Martin Storsjo
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_HMAC_H
+#define AVUTIL_HMAC_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_hmac HMAC
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+enum AVHMACType {
+ AV_HMAC_MD5,
+ AV_HMAC_SHA1,
+ AV_HMAC_SHA224 = 10,
+ AV_HMAC_SHA256,
+ AV_HMAC_SHA384,
+ AV_HMAC_SHA512,
+};
+
+typedef struct AVHMAC AVHMAC;
+
+/**
+ * Allocate an AVHMAC context.
+ * @param type The hash function used for the HMAC.
+ */
+AVHMAC *av_hmac_alloc(enum AVHMACType type);
+
+/**
+ * Free an AVHMAC context.
+ * @param ctx The context to free, may be NULL
+ */
+void av_hmac_free(AVHMAC *ctx);
+
+/**
+ * Initialize an AVHMAC context with an authentication key.
+ * @param ctx The HMAC context
+ * @param key The authentication key
+ * @param keylen The length of the key, in bytes
+ */
+void av_hmac_init(AVHMAC *ctx, const uint8_t *key, unsigned int keylen);
+
+/**
+ * Hash data with the HMAC.
+ * @param ctx The HMAC context
+ * @param data The data to hash
+ * @param len The length of the data, in bytes
+ */
+void av_hmac_update(AVHMAC *ctx, const uint8_t *data, unsigned int len);
+
+/**
+ * Finish hashing and output the HMAC digest.
+ * @param ctx The HMAC context
+ * @param out The output buffer to write the digest into
+ * @param outlen The length of the out buffer, in bytes
+ * @return The number of bytes written to out, or a negative error code.
+ */
+int av_hmac_final(AVHMAC *ctx, uint8_t *out, unsigned int outlen);
+
+/**
+ * Hash an array of data with a key.
+ * @param ctx The HMAC context
+ * @param data The data to hash
+ * @param len The length of the data, in bytes
+ * @param key The authentication key
+ * @param keylen The length of the key, in bytes
+ * @param out The output buffer to write the digest into
+ * @param outlen The length of the out buffer, in bytes
+ * @return The number of bytes written to out, or a negative error code.
+ */
+int av_hmac_calc(AVHMAC *ctx, const uint8_t *data, unsigned int len,
+ const uint8_t *key, unsigned int keylen,
+ uint8_t *out, unsigned int outlen);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_HMAC_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/imgutils.h Added

@@ -0,0 +1,426 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_IMGUTILS_H
+#define AVUTIL_IMGUTILS_H
+
+/**
+ * @file
+ * misc image utilities
+ *
+ * @addtogroup lavu_picture
+ * @{
+ */
+
+#include "avutil.h"
+#include "pixdesc.h"
+#include "rational.h"
+
+/**
+ * Compute the max pixel step for each plane of an image with a
+ * format described by pixdesc.
+ *
+ * The pixel step is the distance in bytes between the first byte of
+ * the group of bytes which describe a pixel component and the first
+ * byte of the successive group in the same plane for the same
+ * component.
+ *
+ * @param max_pixsteps an array which is filled with the max pixel step
+ * for each plane. Since a plane may contain different pixel
+ * components, the computed max_pixsteps[plane] is relative to the
+ * component in the plane with the max pixel step.
+ * @param max_pixstep_comps an array which is filled with the component
+ * for each plane which has the max pixel step. May be NULL.
+ */
+void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
+                                const AVPixFmtDescriptor *pixdesc);
+
+/**
+ * Compute the size of an image line with format pix_fmt and width
+ * width for the plane plane.
+ *
+ * @return the computed size in bytes
+ */
+int av_image_get_linesize(enum AVPixelFormat pix_fmt, int width, int plane);
+
+/**
+ * Fill plane linesizes for an image with pixel format pix_fmt and
+ * width width.
+ *
+ * @param linesizes array to be filled with the linesize for each plane
+ * @return >= 0 in case of success, a negative error code otherwise
+ */
+int av_image_fill_linesizes(int linesizes[4], enum AVPixelFormat pix_fmt, int width);
+
+/**
+ * Fill plane data pointers for an image with pixel format pix_fmt and
+ * height height.
+ *
+ * @param data pointers array to be filled with the pointer for each image plane
+ * @param ptr the pointer to a buffer which will contain the image
+ * @param linesizes the array containing the linesize for each
+ * plane, should be filled by av_image_fill_linesizes()
+ * @return the size in bytes required for the image buffer, a negative
+ * error code in case of failure
+ */
+int av_image_fill_pointers(uint8_t *data[4], enum AVPixelFormat pix_fmt, int height,
+                           uint8_t *ptr, const int linesizes[4]);
+
+/**
+ * Allocate an image with size w and h and pixel format pix_fmt, and
+ * fill pointers and linesizes accordingly.
+ * The allocated image buffer has to be freed by using
+ * av_freep(&pointers[0]).
+ *
+ * @param align the value to use for buffer size alignment
+ * @return the size in bytes required for the image buffer, a negative
+ * error code in case of failure
+ */
+int av_image_alloc(uint8_t *pointers[4], int linesizes[4],
+                   int w, int h, enum AVPixelFormat pix_fmt, int align);
+
+/**
+ * Copy image plane from src to dst.
+ * That is, copy "height" number of lines of "bytewidth" bytes each.
+ * The first byte of each successive line is separated by *_linesize
+ * bytes.
+ *
+ * bytewidth must be contained by both absolute values of dst_linesize
+ * and src_linesize, otherwise the function behavior is undefined.
+ *
+ * @param dst_linesize linesize for the image plane in dst
+ * @param src_linesize linesize for the image plane in src
+ */
+void av_image_copy_plane(uint8_t       *dst, int dst_linesize,
+                         const uint8_t *src, int src_linesize,
+                         int bytewidth, int height);
+
+/**
+ * Copy image in src_data to dst_data.
+ *
+ * @param dst_linesizes linesizes for the image in dst_data
+ * @param src_linesizes linesizes for the image in src_data
+ */
+void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4],
+                   const uint8_t *src_data[4], const int src_linesizes[4],
+                   enum AVPixelFormat pix_fmt, int width, int height);
+
+/**
+ * Setup the data pointers and linesizes based on the specified image
+ * parameters and the provided array.
+ *
+ * The fields of the given image are filled in by using the src
+ * address which points to the image data buffer. Depending on the
+ * specified pixel format, one or multiple image data pointers and
+ * line sizes will be set.  If a planar format is specified, several
+ * pointers will be set pointing to the different picture planes and
+ * the line sizes of the different planes will be stored in the
+ * lines_sizes array. Call with !src to get the required
+ * size for the src buffer.
+ *
+ * To allocate the buffer and fill in the dst_data and dst_linesize in
+ * one call, use av_image_alloc().
+ *
+ * @param dst_data      data pointers to be filled in
+ * @param dst_linesizes linesizes for the image in dst_data to be filled in
+ * @param src           buffer which will contain or contains the actual image data, can be NULL
+ * @param pix_fmt       the pixel format of the image
+ * @param width         the width of the image in pixels
+ * @param height        the height of the image in pixels
+ * @param align         the value used in src for linesize alignment
+ * @return the size in bytes required for src, a negative error code
+ * in case of failure
+ */
+int av_image_fill_arrays(uint8_t *dst_data[4], int dst_linesize[4],
+                         const uint8_t *src,
+                         enum AVPixelFormat pix_fmt, int width, int height, int align);
+
+/**
+ * Return the size in bytes of the amount of data required to store an
+ * image with the given parameters.
+ *
+ * @param[in] align the assumed linesize alignment
+ */
+int av_image_get_buffer_size(enum AVPixelFormat pix_fmt, int width, int height, int align);
+
+/**
+ * Copy image data from an image into a buffer.
+ *
+ * av_image_get_buffer_size() can be used to compute the required size
+ * for the buffer to fill.
+ *
+ * @param dst           a buffer into which picture data will be copied
+ * @param dst_size      the size in bytes of dst
+ * @param src_data      pointers containing the source image data
+ * @param src_linesizes linesizes for the image in src_data
+ * @param pix_fmt       the pixel format of the source image
+ * @param width         the width of the source image in pixels
+ * @param height        the height of the source image in pixels
+ * @param align         the assumed linesize alignment for dst
+ * @return the number of bytes written to dst, or a negative value
+ * (error code) on error
+ */
+int av_image_copy_to_buffer(uint8_t *dst, int dst_size,
+                            const uint8_t * const src_data[4], const int src_linesize[4],
+                            enum AVPixelFormat pix_fmt, int width, int height, int align);
+
+/**
+ * Check if the given dimension of an image is valid, meaning that all
+ * bytes of the image can be addressed with a signed int.
+ *
+ * @param w the width of the picture
+ * @param h the height of the picture
+ * @param log_offset the offset to sum to the log level for logging with log_ctx
+ * @param log_ctx the parent logging context, it may be NULL
+ * @return >= 0 if valid, a negative error code otherwise
+ */
+int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx);
+
+/**
+ * Check if the given sample aspect ratio of an image is valid.
+ *
+ * It is considered invalid if the denominator is 0 or if applying the ratio
+ * to the image size would make the smaller dimension less than 1. If the
+ * sar numerator is 0, it is considered unknown and will return as valid.
+ *
+ * @param w width of the image
+ * @param h height of the image
+ * @param sar sample aspect ratio of the image
+ * @return 0 if valid, a negative AVERROR code otherwise
+ */
+int av_image_check_sar(unsigned int w, unsigned int h, AVRational sar);
+
+/**
+ * @}
+ */
+
+
+#endif /* AVUTIL_IMGUTILS_H */
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_IMGUTILS_H
+#define AVUTIL_IMGUTILS_H
+
+/**
+ * @file
+ * misc image utilities
+ *
+ * @addtogroup lavu_picture
+ * @{
+ */
+
+#include "avutil.h"
+#include "pixdesc.h"
+#include "rational.h"
+
+/**
+ * Compute the max pixel step for each plane of an image with a
+ * format described by pixdesc.
+ *
+ * The pixel step is the distance in bytes between the first byte of
+ * the group of bytes which describe a pixel component and the first
+ * byte of the successive group in the same plane for the same
+ * component.
+ *
+ * @param max_pixsteps an array which is filled with the max pixel step
+ * for each plane. Since a plane may contain different pixel
+ * components, the computed max_pixsteps[plane] is relative to the
+ * component in the plane with the max pixel step.
+ * @param max_pixstep_comps an array which is filled with the component
+ * for each plane which has the max pixel step. May be NULL.
+ */
+void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
+                                const AVPixFmtDescriptor *pixdesc);
+
+/**
+ * Compute the size of an image line with format pix_fmt and width
+ * width for the plane plane.
+ *
+ * @return the computed size in bytes
+ */
+int av_image_get_linesize(enum AVPixelFormat pix_fmt, int width, int plane);
+
+/**
+ * Fill plane linesizes for an image with pixel format pix_fmt and
+ * width width.
+ *
+ * @param linesizes array to be filled with the linesize for each plane
+ * @return >= 0 in case of success, a negative error code otherwise
+ */
+int av_image_fill_linesizes(int linesizes[4], enum AVPixelFormat pix_fmt, int width);
+
+/**
+ * Fill plane data pointers for an image with pixel format pix_fmt and
+ * height height.
+ *
+ * @param data pointers array to be filled with the pointer for each image plane
+ * @param ptr the pointer to a buffer which will contain the image
+ * @param linesizes the array containing the linesize for each
+ * plane, should be filled by av_image_fill_linesizes()
+ * @return the size in bytes required for the image buffer, a negative
+ * error code in case of failure
+ */
+int av_image_fill_pointers(uint8_t *data[4], enum AVPixelFormat pix_fmt, int height,
+                           uint8_t *ptr, const int linesizes[4]);
+
+/**
+ * Allocate an image with size w and h and pixel format pix_fmt, and
+ * fill pointers and linesizes accordingly.
+ * The allocated image buffer has to be freed by using
+ * av_freep(&pointers[0]).
+ *
+ * @param align the value to use for buffer size alignment
+ * @return the size in bytes required for the image buffer, a negative
+ * error code in case of failure
+ */
+int av_image_alloc(uint8_t *pointers[4], int linesizes[4],
+                   int w, int h, enum AVPixelFormat pix_fmt, int align);
+
+/**
+ * Copy image plane from src to dst.
+ * That is, copy "height" number of lines of "bytewidth" bytes each.
+ * The first byte of each successive line is separated by *_linesize
+ * bytes.
+ *
+ * bytewidth must be contained by both absolute values of dst_linesize
+ * and src_linesize, otherwise the function behavior is undefined.
+ *
+ * @param dst_linesize linesize for the image plane in dst
+ * @param src_linesize linesize for the image plane in src
+ */
+void av_image_copy_plane(uint8_t       *dst, int dst_linesize,
+                         const uint8_t *src, int src_linesize,
+                         int bytewidth, int height);
+
+/**
+ * Copy image in src_data to dst_data.
+ *
+ * @param dst_linesizes linesizes for the image in dst_data
+ * @param src_linesizes linesizes for the image in src_data
+ */
+void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4],
+                   const uint8_t *src_data[4], const int src_linesizes[4],
+                   enum AVPixelFormat pix_fmt, int width, int height);
+
+/**
+ * Setup the data pointers and linesizes based on the specified image
+ * parameters and the provided array.
+ *
+ * The fields of the given image are filled in by using the src
+ * address which points to the image data buffer. Depending on the
+ * specified pixel format, one or multiple image data pointers and
+ * line sizes will be set.  If a planar format is specified, several
+ * pointers will be set pointing to the different picture planes and
+ * the line sizes of the different planes will be stored in the
+ * lines_sizes array. Call with !src to get the required
+ * size for the src buffer.
+ *
+ * To allocate the buffer and fill in the dst_data and dst_linesize in
+ * one call, use av_image_alloc().
+ *
+ * @param dst_data      data pointers to be filled in
+ * @param dst_linesizes linesizes for the image in dst_data to be filled in
+ * @param src           buffer which will contain or contains the actual image data, can be NULL
+ * @param pix_fmt       the pixel format of the image
+ * @param width         the width of the image in pixels
+ * @param height        the height of the image in pixels
+ * @param align         the value used in src for linesize alignment
+ * @return the size in bytes required for src, a negative error code
+ * in case of failure
+ */
+int av_image_fill_arrays(uint8_t *dst_data[4], int dst_linesize[4],
+                         const uint8_t *src,
+                         enum AVPixelFormat pix_fmt, int width, int height, int align);
+
+/**
+ * Return the size in bytes of the amount of data required to store an
+ * image with the given parameters.
+ *
+ * @param[in] align the assumed linesize alignment
+ */
+int av_image_get_buffer_size(enum AVPixelFormat pix_fmt, int width, int height, int align);
+
+/**
+ * Copy image data from an image into a buffer.
+ *
+ * av_image_get_buffer_size() can be used to compute the required size
+ * for the buffer to fill.
+ *
+ * @param dst           a buffer into which picture data will be copied
+ * @param dst_size      the size in bytes of dst
+ * @param src_data      pointers containing the source image data
+ * @param src_linesizes linesizes for the image in src_data
+ * @param pix_fmt       the pixel format of the source image
+ * @param width         the width of the source image in pixels
+ * @param height        the height of the source image in pixels
+ * @param align         the assumed linesize alignment for dst
+ * @return the number of bytes written to dst, or a negative value
+ * (error code) on error
+ */
+int av_image_copy_to_buffer(uint8_t *dst, int dst_size,
+                            const uint8_t * const src_data[4], const int src_linesize[4],
+                            enum AVPixelFormat pix_fmt, int width, int height, int align);
+
+/**
+ * Check if the given dimension of an image is valid, meaning that all
+ * bytes of the image can be addressed with a signed int.
+ *
+ * @param w the width of the picture
+ * @param h the height of the picture
+ * @param log_offset the offset to sum to the log level for logging with log_ctx
+ * @param log_ctx the parent logging context, it may be NULL
+ * @return >= 0 if valid, a negative error code otherwise
+ */
+int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx);
+
+/**
+ * Check if the given sample aspect ratio of an image is valid.
+ *
+ * It is considered invalid if the denominator is 0 or if applying the ratio
+ * to the image size would make the smaller dimension less than 1. If the
+ * sar numerator is 0, it is considered unknown and will return as valid.
+ *
+ * @param w width of the image
+ * @param h height of the image
+ * @param sar sample aspect ratio of the image
+ * @return 0 if valid, a negative AVERROR code otherwise
+ */
+int av_image_check_sar(unsigned int w, unsigned int h, AVRational sar);
+
+/**
+ * @}
+ */
+
+
+#endif /* AVUTIL_IMGUTILS_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/intfloat.h Added

@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2011 Mans Rullgard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_INTFLOAT_H
+#define AVUTIL_INTFLOAT_H
+
+#include <stdint.h>
+#include "attributes.h"
+
+union av_intfloat32 {
+ uint32_t i;
+ float f;
+};
+
+union av_intfloat64 {
+ uint64_t i;
+ double f;
+};
+
+/**
+ * Reinterpret a 32-bit integer as a float.
+ */
+static av_always_inline float av_int2float(uint32_t i)
+{
+ union av_intfloat32 v;
+ v.i = i;
+ return v.f;
+}
+
+/**
+ * Reinterpret a float as a 32-bit integer.
+ */
+static av_always_inline uint32_t av_float2int(float f)
+{
+ union av_intfloat32 v;
+ v.f = f;
+ return v.i;
+}
+
+/**
+ * Reinterpret a 64-bit integer as a double.
+ */
+static av_always_inline double av_int2double(uint64_t i)
+{
+ union av_intfloat64 v;
+ v.i = i;
+ return v.f;
+}
+
+/**
+ * Reinterpret a double as a 64-bit integer.
+ */
+static av_always_inline uint64_t av_double2int(double f)
+{
+ union av_intfloat64 v;
+ v.f = f;
+ return v.i;
+}
+
+#endif /* AVUTIL_INTFLOAT_H */
+/*
+ * Copyright (c) 2011 Mans Rullgard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_INTFLOAT_H
+#define AVUTIL_INTFLOAT_H
+
+#include <stdint.h>
+#include "attributes.h"
+
+union av_intfloat32 {
+ uint32_t i;
+ float f;
+};
+
+union av_intfloat64 {
+ uint64_t i;
+ double f;
+};
+
+/**
+ * Reinterpret a 32-bit integer as a float.
+ */
+static av_always_inline float av_int2float(uint32_t i)
+{
+ union av_intfloat32 v;
+ v.i = i;
+ return v.f;
+}
+
+/**
+ * Reinterpret a float as a 32-bit integer.
+ */
+static av_always_inline uint32_t av_float2int(float f)
+{
+ union av_intfloat32 v;
+ v.f = f;
+ return v.i;
+}
+
+/**
+ * Reinterpret a 64-bit integer as a double.
+ */
+static av_always_inline double av_int2double(uint64_t i)
+{
+ union av_intfloat64 v;
+ v.i = i;
+ return v.f;
+}
+
+/**
+ * Reinterpret a double as a 64-bit integer.
+ */
+static av_always_inline uint64_t av_double2int(double f)
+{
+ union av_intfloat64 v;
+ v.f = f;
+ return v.i;
+}
+
+#endif /* AVUTIL_INTFLOAT_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/ffmpeg_android/libavutil/intfloat_readwrite.h -> gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/intfloat_readwrite.h Changed

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/intreadwrite.h Added

@@ -0,0 +1,1258 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_INTREADWRITE_H
+#define AVUTIL_INTREADWRITE_H
+
+#include <stdint.h>
+#include "libavutil/avconfig.h"
+#include "attributes.h"
+#include "bswap.h"
+
+typedef union {
+ uint64_t u64;
+ uint32_t u32[2];
+ uint16_t u16[4];
+ uint8_t u8 [8];
+ double f64;
+ float f32[2];
+} av_alias av_alias64;
+
+typedef union {
+ uint32_t u32;
+ uint16_t u16[2];
+ uint8_t u8 [4];
+ float f32;
+} av_alias av_alias32;
+
+typedef union {
+ uint16_t u16;
+ uint8_t u8 [2];
+} av_alias av_alias16;
+
+/*
+ * Arch-specific headers can provide any combination of
+ * AV_[RW][BLN](16|24|32|48|64) and AV_(COPY|SWAP|ZERO)(64|128) macros.
+ * Preprocessor symbols must be defined, even if these are implemented
+ * as inline functions.
+ *
+ * R/W means read/write, B/L/N means big/little/native endianness.
+ * The following macros require aligned access, compared to their
+ * unaligned variants: AV_(COPY|SWAP|ZERO)(64|128), AV_[RW]N[8-64]A.
+ * Incorrect usage may range from abysmal performance to crash
+ * depending on the platform.
+ *
+ * The unaligned variants are AV_[RW][BLN][8-64] and AV_COPY*U.
+ */
+
+#ifdef HAVE_AV_CONFIG_H
+
+#include "config.h"
+
+#if ARCH_ARM
+# include "arm/intreadwrite.h"
+#elif ARCH_AVR32
+# include "avr32/intreadwrite.h"
+#elif ARCH_MIPS
+# include "mips/intreadwrite.h"
+#elif ARCH_PPC
+# include "ppc/intreadwrite.h"
+#elif ARCH_TOMI
+# include "tomi/intreadwrite.h"
+#elif ARCH_X86
+# include "x86/intreadwrite.h"
+#endif
+
+#endif /* HAVE_AV_CONFIG_H */
+
+/*
+ * Map AV_RNXX <-> AV_R[BL]XX for all variants provided by per-arch headers.
+ */
+
+#if AV_HAVE_BIGENDIAN
+
+# if defined(AV_RN16) && !defined(AV_RB16)
+# define AV_RB16(p) AV_RN16(p)
+# elif !defined(AV_RN16) && defined(AV_RB16)
+# define AV_RN16(p) AV_RB16(p)
+# endif
+
+# if defined(AV_WN16) && !defined(AV_WB16)
+# define AV_WB16(p, v) AV_WN16(p, v)
+# elif !defined(AV_WN16) && defined(AV_WB16)
+# define AV_WN16(p, v) AV_WB16(p, v)
+# endif
+
+# if defined(AV_RN24) && !defined(AV_RB24)
+# define AV_RB24(p) AV_RN24(p)
+# elif !defined(AV_RN24) && defined(AV_RB24)
+# define AV_RN24(p) AV_RB24(p)
+# endif
+
+# if defined(AV_WN24) && !defined(AV_WB24)
+# define AV_WB24(p, v) AV_WN24(p, v)
+# elif !defined(AV_WN24) && defined(AV_WB24)
+# define AV_WN24(p, v) AV_WB24(p, v)
+# endif
+
+# if defined(AV_RN32) && !defined(AV_RB32)
+# define AV_RB32(p) AV_RN32(p)
+# elif !defined(AV_RN32) && defined(AV_RB32)
+# define AV_RN32(p) AV_RB32(p)
+# endif
+
+# if defined(AV_WN32) && !defined(AV_WB32)
+# define AV_WB32(p, v) AV_WN32(p, v)
+# elif !defined(AV_WN32) && defined(AV_WB32)
+# define AV_WN32(p, v) AV_WB32(p, v)
+# endif
+
+# if defined(AV_RN48) && !defined(AV_RB48)
+# define AV_RB48(p) AV_RN48(p)
+# elif !defined(AV_RN48) && defined(AV_RB48)
+# define AV_RN48(p) AV_RB48(p)
+# endif
+
+# if defined(AV_WN48) && !defined(AV_WB48)
+# define AV_WB48(p, v) AV_WN48(p, v)
+# elif !defined(AV_WN48) && defined(AV_WB48)
+# define AV_WN48(p, v) AV_WB48(p, v)
+# endif
+
+# if defined(AV_RN64) && !defined(AV_RB64)
+# define AV_RB64(p) AV_RN64(p)
+# elif !defined(AV_RN64) && defined(AV_RB64)
+# define AV_RN64(p) AV_RB64(p)
+# endif
+
+# if defined(AV_WN64) && !defined(AV_WB64)
+# define AV_WB64(p, v) AV_WN64(p, v)
+# elif !defined(AV_WN64) && defined(AV_WB64)
+# define AV_WN64(p, v) AV_WB64(p, v)
+# endif
+
+#else /* AV_HAVE_BIGENDIAN */
+
+# if defined(AV_RN16) && !defined(AV_RL16)
+# define AV_RL16(p) AV_RN16(p)
+# elif !defined(AV_RN16) && defined(AV_RL16)
+# define AV_RN16(p) AV_RL16(p)
+# endif
+
+# if defined(AV_WN16) && !defined(AV_WL16)
+# define AV_WL16(p, v) AV_WN16(p, v)
+# elif !defined(AV_WN16) && defined(AV_WL16)
+# define AV_WN16(p, v) AV_WL16(p, v)
+# endif
+
+# if defined(AV_RN24) && !defined(AV_RL24)
+# define AV_RL24(p) AV_RN24(p)
+# elif !defined(AV_RN24) && defined(AV_RL24)
+# define AV_RN24(p) AV_RL24(p)
+# endif
+
+# if defined(AV_WN24) && !defined(AV_WL24)
+# define AV_WL24(p, v) AV_WN24(p, v)
+# elif !defined(AV_WN24) && defined(AV_WL24)
+# define AV_WN24(p, v) AV_WL24(p, v)
+# endif
+
+# if defined(AV_RN32) && !defined(AV_RL32)
+# define AV_RL32(p) AV_RN32(p)
+# elif !defined(AV_RN32) && defined(AV_RL32)
+# define AV_RN32(p) AV_RL32(p)
+# endif
+
+# if defined(AV_WN32) && !defined(AV_WL32)
+# define AV_WL32(p, v) AV_WN32(p, v)
+# elif !defined(AV_WN32) && defined(AV_WL32)
+# define AV_WN32(p, v) AV_WL32(p, v)
+# endif
+
+# if defined(AV_RN48) && !defined(AV_RL48)
+# define AV_RL48(p) AV_RN48(p)
+# elif !defined(AV_RN48) && defined(AV_RL48)
+# define AV_RN48(p) AV_RL48(p)
+# endif
+
+# if defined(AV_WN48) && !defined(AV_WL48)
+# define AV_WL48(p, v) AV_WN48(p, v)
+# elif !defined(AV_WN48) && defined(AV_WL48)
+# define AV_WN48(p, v) AV_WL48(p, v)
+# endif
+
+# if defined(AV_RN64) && !defined(AV_RL64)
+# define AV_RL64(p) AV_RN64(p)
+# elif !defined(AV_RN64) && defined(AV_RL64)
+# define AV_RN64(p) AV_RL64(p)
+# endif
+
+# if defined(AV_WN64) && !defined(AV_WL64)
+# define AV_WL64(p, v) AV_WN64(p, v)
+# elif !defined(AV_WN64) && defined(AV_WL64)
+# define AV_WN64(p, v) AV_WL64(p, v)
+# endif
+
+#endif /* !AV_HAVE_BIGENDIAN */
+
+/*
+ * Define AV_[RW]N helper macros to simplify definitions not provided
+ * by per-arch headers.
+ */
+
+#if defined(__GNUC__) && !defined(__TI_COMPILER_VERSION__)
+
+union unaligned_64 { uint64_t l; } __attribute__((packed)) av_alias;
+union unaligned_32 { uint32_t l; } __attribute__((packed)) av_alias;
+union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias;
+
+# define AV_RN(s, p) (((const union unaligned_##s *) (p))->l)
+# define AV_WN(s, p, v) ((((union unaligned_##s *) (p))->l) = (v))
+
+#elif defined(__DECC)
+
+# define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p)))
+# define AV_WN(s, p, v) (*((__unaligned uint##s##_t*)(p)) = (v))
+
+#elif AV_HAVE_FAST_UNALIGNED
+
+# define AV_RN(s, p) (((const av_alias##s*)(p))->u##s)
+# define AV_WN(s, p, v) (((av_alias##s*)(p))->u##s = (v))
+
+#else
+
+#ifndef AV_RB16
+# define AV_RB16(x) \
+ ((((const uint8_t*)(x))[0] << 8) | \
+ ((const uint8_t*)(x))[1])
+#endif
+#ifndef AV_WB16
+# define AV_WB16(p, darg) do { \
+ unsigned d = (darg); \
+ ((uint8_t*)(p))[1] = (d); \
+ ((uint8_t*)(p))[0] = (d)>>8; \
+ } while(0)
+#endif
+
+#ifndef AV_RL16
+# define AV_RL16(x) \
+ ((((const uint8_t*)(x))[1] << 8) | \
+ ((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL16
+# define AV_WL16(p, darg) do { \
+ unsigned d = (darg); \
+ ((uint8_t*)(p))[0] = (d); \
+ ((uint8_t*)(p))[1] = (d)>>8; \
+ } while(0)
+#endif
+
+#ifndef AV_RB32
+# define AV_RB32(x) \
+ (((uint32_t)((const uint8_t*)(x))[0] << 24) | \
+ (((const uint8_t*)(x))[1] << 16) | \
+ (((const uint8_t*)(x))[2] << 8) | \
+ ((const uint8_t*)(x))[3])
+#endif
+#ifndef AV_WB32
+# define AV_WB32(p, darg) do { \
+ unsigned d = (darg); \
+ ((uint8_t*)(p))[3] = (d); \
+ ((uint8_t*)(p))[2] = (d)>>8; \
+ ((uint8_t*)(p))[1] = (d)>>16; \
+ ((uint8_t*)(p))[0] = (d)>>24; \
+ } while(0)
+#endif
+
+#ifndef AV_RL32
+# define AV_RL32(x) \
+ (((uint32_t)((const uint8_t*)(x))[3] << 24) | \
+ (((const uint8_t*)(x))[2] << 16) | \
+ (((const uint8_t*)(x))[1] << 8) | \
+ ((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL32
+# define AV_WL32(p, darg) do { \
+ unsigned d = (darg); \
+ ((uint8_t*)(p))[0] = (d); \
+ ((uint8_t*)(p))[1] = (d)>>8; \
+ ((uint8_t*)(p))[2] = (d)>>16; \
+ ((uint8_t*)(p))[3] = (d)>>24; \
+ } while(0)
+#endif
+
+#ifndef AV_RB64
+# define AV_RB64(x) \
+ (((uint64_t)((const uint8_t*)(x))[0] << 56) | \
+ ((uint64_t)((const uint8_t*)(x))[1] << 48) | \
+ ((uint64_t)((const uint8_t*)(x))[2] << 40) | \
+ ((uint64_t)((const uint8_t*)(x))[3] << 32) | \
+ ((uint64_t)((const uint8_t*)(x))[4] << 24) | \
+ ((uint64_t)((const uint8_t*)(x))[5] << 16) | \
+ ((uint64_t)((const uint8_t*)(x))[6] << 8) | \
+ (uint64_t)((const uint8_t*)(x))[7])
+#endif
+#ifndef AV_WB64
+# define AV_WB64(p, darg) do { \
+ uint64_t d = (darg); \
+ ((uint8_t*)(p))[7] = (d); \
+ ((uint8_t*)(p))[6] = (d)>>8; \
+ ((uint8_t*)(p))[5] = (d)>>16; \
+ ((uint8_t*)(p))[4] = (d)>>24; \
+ ((uint8_t*)(p))[3] = (d)>>32; \
+ ((uint8_t*)(p))[2] = (d)>>40; \
+ ((uint8_t*)(p))[1] = (d)>>48; \
+ ((uint8_t*)(p))[0] = (d)>>56; \
+ } while(0)
+#endif
+
+#ifndef AV_RL64
+# define AV_RL64(x) \
+ (((uint64_t)((const uint8_t*)(x))[7] << 56) | \
+ ((uint64_t)((const uint8_t*)(x))[6] << 48) | \
+ ((uint64_t)((const uint8_t*)(x))[5] << 40) | \
+ ((uint64_t)((const uint8_t*)(x))[4] << 32) | \
+ ((uint64_t)((const uint8_t*)(x))[3] << 24) | \
+ ((uint64_t)((const uint8_t*)(x))[2] << 16) | \
+ ((uint64_t)((const uint8_t*)(x))[1] << 8) | \
+ (uint64_t)((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL64
+# define AV_WL64(p, darg) do { \
+ uint64_t d = (darg); \
+ ((uint8_t*)(p))[0] = (d); \
+ ((uint8_t*)(p))[1] = (d)>>8; \
+ ((uint8_t*)(p))[2] = (d)>>16; \
+ ((uint8_t*)(p))[3] = (d)>>24; \
+ ((uint8_t*)(p))[4] = (d)>>32; \
+ ((uint8_t*)(p))[5] = (d)>>40; \
+ ((uint8_t*)(p))[6] = (d)>>48; \
+ ((uint8_t*)(p))[7] = (d)>>56; \
+ } while(0)
+#endif
+
+#if AV_HAVE_BIGENDIAN
+# define AV_RN(s, p) AV_RB##s(p)
+# define AV_WN(s, p, v) AV_WB##s(p, v)
+#else
+# define AV_RN(s, p) AV_RL##s(p)
+# define AV_WN(s, p, v) AV_WL##s(p, v)
+#endif
+
+#endif /* HAVE_FAST_UNALIGNED */
+
+#ifndef AV_RN16
+# define AV_RN16(p) AV_RN(16, p)
+#endif
+
+#ifndef AV_RN32
+# define AV_RN32(p) AV_RN(32, p)
+#endif
+
+#ifndef AV_RN64
+# define AV_RN64(p) AV_RN(64, p)
+#endif
+
+#ifndef AV_WN16
+# define AV_WN16(p, v) AV_WN(16, p, v)
+#endif
+
+#ifndef AV_WN32
+# define AV_WN32(p, v) AV_WN(32, p, v)
+#endif
+
+#ifndef AV_WN64
+# define AV_WN64(p, v) AV_WN(64, p, v)
+#endif
+
+#if AV_HAVE_BIGENDIAN
+# define AV_RB(s, p) AV_RN##s(p)
+# define AV_WB(s, p, v) AV_WN##s(p, v)
+# define AV_RL(s, p) av_bswap##s(AV_RN##s(p))
+# define AV_WL(s, p, v) AV_WN##s(p, av_bswap##s(v))
+#else
+# define AV_RB(s, p) av_bswap##s(AV_RN##s(p))
+# define AV_WB(s, p, v) AV_WN##s(p, av_bswap##s(v))
+# define AV_RL(s, p) AV_RN##s(p)
+# define AV_WL(s, p, v) AV_WN##s(p, v)
+#endif
+
+#define AV_RB8(x) (((const uint8_t*)(x))[0])
+#define AV_WB8(p, d) do { ((uint8_t*)(p))[0] = (d); } while(0)
+
+#define AV_RL8(x) AV_RB8(x)
+#define AV_WL8(p, d) AV_WB8(p, d)
+
+#ifndef AV_RB16
+# define AV_RB16(p) AV_RB(16, p)
+#endif
+#ifndef AV_WB16
+# define AV_WB16(p, v) AV_WB(16, p, v)
+#endif
+
+#ifndef AV_RL16
+# define AV_RL16(p) AV_RL(16, p)
+#endif
+#ifndef AV_WL16
+# define AV_WL16(p, v) AV_WL(16, p, v)
+#endif
+
+#ifndef AV_RB32
+# define AV_RB32(p) AV_RB(32, p)
+#endif
+#ifndef AV_WB32
+# define AV_WB32(p, v) AV_WB(32, p, v)
+#endif
+
+#ifndef AV_RL32
+# define AV_RL32(p) AV_RL(32, p)
+#endif
+#ifndef AV_WL32
+# define AV_WL32(p, v) AV_WL(32, p, v)
+#endif
+
+#ifndef AV_RB64
+# define AV_RB64(p) AV_RB(64, p)
+#endif
+#ifndef AV_WB64
+# define AV_WB64(p, v) AV_WB(64, p, v)
+#endif
+
+#ifndef AV_RL64
+# define AV_RL64(p) AV_RL(64, p)
+#endif
+#ifndef AV_WL64
+# define AV_WL64(p, v) AV_WL(64, p, v)
+#endif
+
+#ifndef AV_RB24
+# define AV_RB24(x) \
+ ((((const uint8_t*)(x))[0] << 16) | \
+ (((const uint8_t*)(x))[1] << 8) | \
+ ((const uint8_t*)(x))[2])
+#endif
+#ifndef AV_WB24
+# define AV_WB24(p, d) do { \
+ ((uint8_t*)(p))[2] = (d); \
+ ((uint8_t*)(p))[1] = (d)>>8; \
+ ((uint8_t*)(p))[0] = (d)>>16; \
+ } while(0)
+#endif
+
+#ifndef AV_RL24
+# define AV_RL24(x) \
+ ((((const uint8_t*)(x))[2] << 16) | \
+ (((const uint8_t*)(x))[1] << 8) | \
+ ((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL24
+# define AV_WL24(p, d) do { \
+ ((uint8_t*)(p))[0] = (d); \
+ ((uint8_t*)(p))[1] = (d)>>8; \
+ ((uint8_t*)(p))[2] = (d)>>16; \
+ } while(0)
+#endif
+
+#ifndef AV_RB48
+# define AV_RB48(x) \
+ (((uint64_t)((const uint8_t*)(x))[0] << 40) | \
+ ((uint64_t)((const uint8_t*)(x))[1] << 32) | \
+ ((uint64_t)((const uint8_t*)(x))[2] << 24) | \
+ ((uint64_t)((const uint8_t*)(x))[3] << 16) | \
+ ((uint64_t)((const uint8_t*)(x))[4] << 8) | \
+ (uint64_t)((const uint8_t*)(x))[5])
+#endif
+#ifndef AV_WB48
+# define AV_WB48(p, darg) do { \
+ uint64_t d = (darg); \
+ ((uint8_t*)(p))[5] = (d); \
+ ((uint8_t*)(p))[4] = (d)>>8; \
+ ((uint8_t*)(p))[3] = (d)>>16; \
+ ((uint8_t*)(p))[2] = (d)>>24; \
+ ((uint8_t*)(p))[1] = (d)>>32; \
+ ((uint8_t*)(p))[0] = (d)>>40; \
+ } while(0)
+#endif
+
+#ifndef AV_RL48
+# define AV_RL48(x) \
+ (((uint64_t)((const uint8_t*)(x))[5] << 40) | \
+ ((uint64_t)((const uint8_t*)(x))[4] << 32) | \
+ ((uint64_t)((const uint8_t*)(x))[3] << 24) | \
+ ((uint64_t)((const uint8_t*)(x))[2] << 16) | \
+ ((uint64_t)((const uint8_t*)(x))[1] << 8) | \
+ (uint64_t)((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL48
+# define AV_WL48(p, darg) do { \
+ uint64_t d = (darg); \
+ ((uint8_t*)(p))[0] = (d); \
+ ((uint8_t*)(p))[1] = (d)>>8; \
+ ((uint8_t*)(p))[2] = (d)>>16; \
+ ((uint8_t*)(p))[3] = (d)>>24; \
+ ((uint8_t*)(p))[4] = (d)>>32; \
+ ((uint8_t*)(p))[5] = (d)>>40; \
+ } while(0)
+#endif
+
+/*
+ * The AV_[RW]NA macros access naturally aligned data
+ * in a type-safe way.
+ */
+
+#define AV_RNA(s, p) (((const av_alias##s*)(p))->u##s)
+#define AV_WNA(s, p, v) (((av_alias##s*)(p))->u##s = (v))
+
+#ifndef AV_RN16A
+# define AV_RN16A(p) AV_RNA(16, p)
+#endif
+
+#ifndef AV_RN32A
+# define AV_RN32A(p) AV_RNA(32, p)
+#endif
+
+#ifndef AV_RN64A
+# define AV_RN64A(p) AV_RNA(64, p)
+#endif
+
+#ifndef AV_WN16A
+# define AV_WN16A(p, v) AV_WNA(16, p, v)
+#endif
+
+#ifndef AV_WN32A
+# define AV_WN32A(p, v) AV_WNA(32, p, v)
+#endif
+
+#ifndef AV_WN64A
+# define AV_WN64A(p, v) AV_WNA(64, p, v)
+#endif
+
+/*
+ * The AV_COPYxxU macros are suitable for copying data to/from unaligned
+ * memory locations.
+ */
+
+#define AV_COPYU(n, d, s) AV_WN##n(d, AV_RN##n(s));
+
+#ifndef AV_COPY16U
+# define AV_COPY16U(d, s) AV_COPYU(16, d, s)
+#endif
+
+#ifndef AV_COPY32U
+# define AV_COPY32U(d, s) AV_COPYU(32, d, s)
+#endif
+
+#ifndef AV_COPY64U
+# define AV_COPY64U(d, s) AV_COPYU(64, d, s)
+#endif
+
+#ifndef AV_COPY128U
+# define AV_COPY128U(d, s) \
+ do { \
+ AV_COPY64U(d, s); \
+ AV_COPY64U((char *)(d) + 8, (const char *)(s) + 8); \
+ } while(0)
+#endif
+
+/* Parameters for AV_COPY*, AV_SWAP*, AV_ZERO* must be
+ * naturally aligned. They may be implemented using MMX,
+ * so emms_c() must be called before using any float code
+ * afterwards.
+ */
+
+#define AV_COPY(n, d, s) \
+ (((av_alias##n*)(d))->u##n = ((const av_alias##n*)(s))->u##n)
+
+#ifndef AV_COPY16
+# define AV_COPY16(d, s) AV_COPY(16, d, s)
+#endif
+
+#ifndef AV_COPY32
+# define AV_COPY32(d, s) AV_COPY(32, d, s)
+#endif
+
+#ifndef AV_COPY64
+# define AV_COPY64(d, s) AV_COPY(64, d, s)
+#endif
+
+#ifndef AV_COPY128
+# define AV_COPY128(d, s) \
+ do { \
+ AV_COPY64(d, s); \
+ AV_COPY64((char*)(d)+8, (char*)(s)+8); \
+ } while(0)
+#endif
+
+#define AV_SWAP(n, a, b) FFSWAP(av_alias##n, *(av_alias##n*)(a), *(av_alias##n*)(b))
+
+#ifndef AV_SWAP64
+# define AV_SWAP64(a, b) AV_SWAP(64, a, b)
+#endif
+
+#define AV_ZERO(n, d) (((av_alias##n*)(d))->u##n = 0)
+
+#ifndef AV_ZERO16
+# define AV_ZERO16(d) AV_ZERO(16, d)
+#endif
+
+#ifndef AV_ZERO32
+# define AV_ZERO32(d) AV_ZERO(32, d)
+#endif
+
+#ifndef AV_ZERO64
+# define AV_ZERO64(d) AV_ZERO(64, d)
+#endif
+
+#ifndef AV_ZERO128
+# define AV_ZERO128(d) \
+ do { \
+ AV_ZERO64(d); \
+ AV_ZERO64((char*)(d)+8); \
+ } while(0)
+#endif
+
+#endif /* AVUTIL_INTREADWRITE_H */
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_INTREADWRITE_H
+#define AVUTIL_INTREADWRITE_H
+
+#include <stdint.h>
+#include "libavutil/avconfig.h"
+#include "attributes.h"
+#include "bswap.h"
+
+typedef union {
+ uint64_t u64;
+ uint32_t u32[2];
+ uint16_t u16[4];
+ uint8_t u8 [8];
+ double f64;
+ float f32[2];
+} av_alias av_alias64;
+
+typedef union {
+ uint32_t u32;
+ uint16_t u16[2];
+ uint8_t u8 [4];
+ float f32;
+} av_alias av_alias32;
+
+typedef union {
+ uint16_t u16;
+ uint8_t u8 [2];
+} av_alias av_alias16;
+
+/*
+ * Arch-specific headers can provide any combination of
+ * AV_[RW][BLN](16|24|32|48|64) and AV_(COPY|SWAP|ZERO)(64|128) macros.
+ * Preprocessor symbols must be defined, even if these are implemented
+ * as inline functions.
+ *
+ * R/W means read/write, B/L/N means big/little/native endianness.
+ * The following macros require aligned access, compared to their
+ * unaligned variants: AV_(COPY|SWAP|ZERO)(64|128), AV_[RW]N[8-64]A.
+ * Incorrect usage may range from abysmal performance to crash
+ * depending on the platform.
+ *
+ * The unaligned variants are AV_[RW][BLN][8-64] and AV_COPY*U.
+ */
+
+#ifdef HAVE_AV_CONFIG_H
+
+#include "config.h"
+
+#if ARCH_ARM
+# include "arm/intreadwrite.h"
+#elif ARCH_AVR32
+# include "avr32/intreadwrite.h"
+#elif ARCH_MIPS
+# include "mips/intreadwrite.h"
+#elif ARCH_PPC
+# include "ppc/intreadwrite.h"
+#elif ARCH_TOMI
+# include "tomi/intreadwrite.h"
+#elif ARCH_X86
+# include "x86/intreadwrite.h"
+#endif
+
+#endif /* HAVE_AV_CONFIG_H */
+
+/*
+ * Map AV_RNXX <-> AV_R[BL]XX for all variants provided by per-arch headers.
+ */
+
+#if AV_HAVE_BIGENDIAN
+
+# if defined(AV_RN16) && !defined(AV_RB16)
+# define AV_RB16(p) AV_RN16(p)
+# elif !defined(AV_RN16) && defined(AV_RB16)
+# define AV_RN16(p) AV_RB16(p)
+# endif
+
+# if defined(AV_WN16) && !defined(AV_WB16)
+# define AV_WB16(p, v) AV_WN16(p, v)
+# elif !defined(AV_WN16) && defined(AV_WB16)
+# define AV_WN16(p, v) AV_WB16(p, v)
+# endif
+
+# if defined(AV_RN24) && !defined(AV_RB24)
+# define AV_RB24(p) AV_RN24(p)
+# elif !defined(AV_RN24) && defined(AV_RB24)
+# define AV_RN24(p) AV_RB24(p)
+# endif
+
+# if defined(AV_WN24) && !defined(AV_WB24)
+# define AV_WB24(p, v) AV_WN24(p, v)
+# elif !defined(AV_WN24) && defined(AV_WB24)
+# define AV_WN24(p, v) AV_WB24(p, v)
+# endif
+
+# if defined(AV_RN32) && !defined(AV_RB32)
+# define AV_RB32(p) AV_RN32(p)
+# elif !defined(AV_RN32) && defined(AV_RB32)
+# define AV_RN32(p) AV_RB32(p)
+# endif
+
+# if defined(AV_WN32) && !defined(AV_WB32)
+# define AV_WB32(p, v) AV_WN32(p, v)
+# elif !defined(AV_WN32) && defined(AV_WB32)
+# define AV_WN32(p, v) AV_WB32(p, v)
+# endif
+
+# if defined(AV_RN48) && !defined(AV_RB48)
+# define AV_RB48(p) AV_RN48(p)
+# elif !defined(AV_RN48) && defined(AV_RB48)
+# define AV_RN48(p) AV_RB48(p)
+# endif
+
+# if defined(AV_WN48) && !defined(AV_WB48)
+# define AV_WB48(p, v) AV_WN48(p, v)
+# elif !defined(AV_WN48) && defined(AV_WB48)
+# define AV_WN48(p, v) AV_WB48(p, v)
+# endif
+
+# if defined(AV_RN64) && !defined(AV_RB64)
+# define AV_RB64(p) AV_RN64(p)
+# elif !defined(AV_RN64) && defined(AV_RB64)
+# define AV_RN64(p) AV_RB64(p)
+# endif
+
+# if defined(AV_WN64) && !defined(AV_WB64)
+# define AV_WB64(p, v) AV_WN64(p, v)
+# elif !defined(AV_WN64) && defined(AV_WB64)
+# define AV_WN64(p, v) AV_WB64(p, v)
+# endif
+
+#else /* AV_HAVE_BIGENDIAN */
+
+# if defined(AV_RN16) && !defined(AV_RL16)
+# define AV_RL16(p) AV_RN16(p)
+# elif !defined(AV_RN16) && defined(AV_RL16)
+# define AV_RN16(p) AV_RL16(p)
+# endif
+
+# if defined(AV_WN16) && !defined(AV_WL16)
+# define AV_WL16(p, v) AV_WN16(p, v)
+# elif !defined(AV_WN16) && defined(AV_WL16)
+# define AV_WN16(p, v) AV_WL16(p, v)
+# endif
+
+# if defined(AV_RN24) && !defined(AV_RL24)
+# define AV_RL24(p) AV_RN24(p)
+# elif !defined(AV_RN24) && defined(AV_RL24)
+# define AV_RN24(p) AV_RL24(p)
+# endif
+
+# if defined(AV_WN24) && !defined(AV_WL24)
+# define AV_WL24(p, v) AV_WN24(p, v)
+# elif !defined(AV_WN24) && defined(AV_WL24)
+# define AV_WN24(p, v) AV_WL24(p, v)
+# endif
+
+# if defined(AV_RN32) && !defined(AV_RL32)
+# define AV_RL32(p) AV_RN32(p)
+# elif !defined(AV_RN32) && defined(AV_RL32)
+# define AV_RN32(p) AV_RL32(p)
+# endif
+
+# if defined(AV_WN32) && !defined(AV_WL32)
+# define AV_WL32(p, v) AV_WN32(p, v)
+# elif !defined(AV_WN32) && defined(AV_WL32)
+# define AV_WN32(p, v) AV_WL32(p, v)
+# endif
+
+# if defined(AV_RN48) && !defined(AV_RL48)
+# define AV_RL48(p) AV_RN48(p)
+# elif !defined(AV_RN48) && defined(AV_RL48)
+# define AV_RN48(p) AV_RL48(p)
+# endif
+
+# if defined(AV_WN48) && !defined(AV_WL48)
+# define AV_WL48(p, v) AV_WN48(p, v)
+# elif !defined(AV_WN48) && defined(AV_WL48)
+# define AV_WN48(p, v) AV_WL48(p, v)
+# endif
+
+# if defined(AV_RN64) && !defined(AV_RL64)
+# define AV_RL64(p) AV_RN64(p)
+# elif !defined(AV_RN64) && defined(AV_RL64)
+# define AV_RN64(p) AV_RL64(p)
+# endif
+
+# if defined(AV_WN64) && !defined(AV_WL64)
+# define AV_WL64(p, v) AV_WN64(p, v)
+# elif !defined(AV_WN64) && defined(AV_WL64)
+# define AV_WN64(p, v) AV_WL64(p, v)
+# endif
+
+#endif /* !AV_HAVE_BIGENDIAN */
+
+/*
+ * Define AV_[RW]N helper macros to simplify definitions not provided
+ * by per-arch headers.
+ */
+
+#if defined(__GNUC__) && !defined(__TI_COMPILER_VERSION__)
+
+union unaligned_64 { uint64_t l; } __attribute__((packed)) av_alias;
+union unaligned_32 { uint32_t l; } __attribute__((packed)) av_alias;
+union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias;
+
+# define AV_RN(s, p) (((const union unaligned_##s *) (p))->l)
+# define AV_WN(s, p, v) ((((union unaligned_##s *) (p))->l) = (v))
+
+#elif defined(__DECC)
+
+# define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p)))
+# define AV_WN(s, p, v) (*((__unaligned uint##s##_t*)(p)) = (v))
+
+#elif AV_HAVE_FAST_UNALIGNED
+
+# define AV_RN(s, p) (((const av_alias##s*)(p))->u##s)
+# define AV_WN(s, p, v) (((av_alias##s*)(p))->u##s = (v))
+
+#else
+
+#ifndef AV_RB16
+# define AV_RB16(x) \
+ ((((const uint8_t*)(x))[0] << 8) | \
+ ((const uint8_t*)(x))[1])
+#endif
+#ifndef AV_WB16
+# define AV_WB16(p, darg) do { \
+ unsigned d = (darg); \
+ ((uint8_t*)(p))[1] = (d); \
+ ((uint8_t*)(p))[0] = (d)>>8; \
+ } while(0)
+#endif
+
+#ifndef AV_RL16
+# define AV_RL16(x) \
+ ((((const uint8_t*)(x))[1] << 8) | \
+ ((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL16
+# define AV_WL16(p, darg) do { \
+ unsigned d = (darg); \
+ ((uint8_t*)(p))[0] = (d); \
+ ((uint8_t*)(p))[1] = (d)>>8; \
+ } while(0)
+#endif
+
+#ifndef AV_RB32
+# define AV_RB32(x) \
+ (((uint32_t)((const uint8_t*)(x))[0] << 24) | \
+ (((const uint8_t*)(x))[1] << 16) | \
+ (((const uint8_t*)(x))[2] << 8) | \
+ ((const uint8_t*)(x))[3])
+#endif
+#ifndef AV_WB32
+# define AV_WB32(p, darg) do { \
+ unsigned d = (darg); \
+ ((uint8_t*)(p))[3] = (d); \
+ ((uint8_t*)(p))[2] = (d)>>8; \
+ ((uint8_t*)(p))[1] = (d)>>16; \
+ ((uint8_t*)(p))[0] = (d)>>24; \
+ } while(0)
+#endif
+
+#ifndef AV_RL32
+# define AV_RL32(x) \
+ (((uint32_t)((const uint8_t*)(x))[3] << 24) | \
+ (((const uint8_t*)(x))[2] << 16) | \
+ (((const uint8_t*)(x))[1] << 8) | \
+ ((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL32
+# define AV_WL32(p, darg) do { \
+ unsigned d = (darg); \
+ ((uint8_t*)(p))[0] = (d); \
+ ((uint8_t*)(p))[1] = (d)>>8; \
+ ((uint8_t*)(p))[2] = (d)>>16; \
+ ((uint8_t*)(p))[3] = (d)>>24; \
+ } while(0)
+#endif
+
+#ifndef AV_RB64
+# define AV_RB64(x) \
+ (((uint64_t)((const uint8_t*)(x))[0] << 56) | \
+ ((uint64_t)((const uint8_t*)(x))[1] << 48) | \
+ ((uint64_t)((const uint8_t*)(x))[2] << 40) | \
+ ((uint64_t)((const uint8_t*)(x))[3] << 32) | \
+ ((uint64_t)((const uint8_t*)(x))[4] << 24) | \
+ ((uint64_t)((const uint8_t*)(x))[5] << 16) | \
+ ((uint64_t)((const uint8_t*)(x))[6] << 8) | \
+ (uint64_t)((const uint8_t*)(x))[7])
+#endif
+#ifndef AV_WB64
+# define AV_WB64(p, darg) do { \
+ uint64_t d = (darg); \
+ ((uint8_t*)(p))[7] = (d); \
+ ((uint8_t*)(p))[6] = (d)>>8; \
+ ((uint8_t*)(p))[5] = (d)>>16; \
+ ((uint8_t*)(p))[4] = (d)>>24; \
+ ((uint8_t*)(p))[3] = (d)>>32; \
+ ((uint8_t*)(p))[2] = (d)>>40; \
+ ((uint8_t*)(p))[1] = (d)>>48; \
+ ((uint8_t*)(p))[0] = (d)>>56; \
+ } while(0)
+#endif
+
+#ifndef AV_RL64
+# define AV_RL64(x) \
+ (((uint64_t)((const uint8_t*)(x))[7] << 56) | \
+ ((uint64_t)((const uint8_t*)(x))[6] << 48) | \
+ ((uint64_t)((const uint8_t*)(x))[5] << 40) | \
+ ((uint64_t)((const uint8_t*)(x))[4] << 32) | \
+ ((uint64_t)((const uint8_t*)(x))[3] << 24) | \
+ ((uint64_t)((const uint8_t*)(x))[2] << 16) | \
+ ((uint64_t)((const uint8_t*)(x))[1] << 8) | \
+ (uint64_t)((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL64
+# define AV_WL64(p, darg) do { \
+ uint64_t d = (darg); \
+ ((uint8_t*)(p))[0] = (d); \
+ ((uint8_t*)(p))[1] = (d)>>8; \
+ ((uint8_t*)(p))[2] = (d)>>16; \
+ ((uint8_t*)(p))[3] = (d)>>24; \
+ ((uint8_t*)(p))[4] = (d)>>32; \
+ ((uint8_t*)(p))[5] = (d)>>40; \
+ ((uint8_t*)(p))[6] = (d)>>48; \
+ ((uint8_t*)(p))[7] = (d)>>56; \
+ } while(0)
+#endif
+
+#if AV_HAVE_BIGENDIAN
+# define AV_RN(s, p) AV_RB##s(p)
+# define AV_WN(s, p, v) AV_WB##s(p, v)
+#else
+# define AV_RN(s, p) AV_RL##s(p)
+# define AV_WN(s, p, v) AV_WL##s(p, v)
+#endif
+
+#endif /* HAVE_FAST_UNALIGNED */
+
+#ifndef AV_RN16
+# define AV_RN16(p) AV_RN(16, p)
+#endif
+
+#ifndef AV_RN32
+# define AV_RN32(p) AV_RN(32, p)
+#endif
+
+#ifndef AV_RN64
+# define AV_RN64(p) AV_RN(64, p)
+#endif
+
+#ifndef AV_WN16
+# define AV_WN16(p, v) AV_WN(16, p, v)
+#endif
+
+#ifndef AV_WN32
+# define AV_WN32(p, v) AV_WN(32, p, v)
+#endif
+
+#ifndef AV_WN64
+# define AV_WN64(p, v) AV_WN(64, p, v)
+#endif
+
+#if AV_HAVE_BIGENDIAN
+# define AV_RB(s, p) AV_RN##s(p)
+# define AV_WB(s, p, v) AV_WN##s(p, v)
+# define AV_RL(s, p) av_bswap##s(AV_RN##s(p))
+# define AV_WL(s, p, v) AV_WN##s(p, av_bswap##s(v))
+#else
+# define AV_RB(s, p) av_bswap##s(AV_RN##s(p))
+# define AV_WB(s, p, v) AV_WN##s(p, av_bswap##s(v))
+# define AV_RL(s, p) AV_RN##s(p)
+# define AV_WL(s, p, v) AV_WN##s(p, v)
+#endif
+
+#define AV_RB8(x) (((const uint8_t*)(x))[0])
+#define AV_WB8(p, d) do { ((uint8_t*)(p))[0] = (d); } while(0)
+
+#define AV_RL8(x) AV_RB8(x)
+#define AV_WL8(p, d) AV_WB8(p, d)
+
+#ifndef AV_RB16
+# define AV_RB16(p) AV_RB(16, p)
+#endif
+#ifndef AV_WB16
+# define AV_WB16(p, v) AV_WB(16, p, v)
+#endif
+
+#ifndef AV_RL16
+# define AV_RL16(p) AV_RL(16, p)
+#endif
+#ifndef AV_WL16
+# define AV_WL16(p, v) AV_WL(16, p, v)
+#endif
+
+#ifndef AV_RB32
+# define AV_RB32(p) AV_RB(32, p)
+#endif
+#ifndef AV_WB32
+# define AV_WB32(p, v) AV_WB(32, p, v)
+#endif
+
+#ifndef AV_RL32
+# define AV_RL32(p) AV_RL(32, p)
+#endif
+#ifndef AV_WL32
+# define AV_WL32(p, v) AV_WL(32, p, v)
+#endif
+
+#ifndef AV_RB64
+# define AV_RB64(p) AV_RB(64, p)
+#endif
+#ifndef AV_WB64
+# define AV_WB64(p, v) AV_WB(64, p, v)
+#endif
+
+#ifndef AV_RL64
+# define AV_RL64(p) AV_RL(64, p)
+#endif
+#ifndef AV_WL64
+# define AV_WL64(p, v) AV_WL(64, p, v)
+#endif
+
+#ifndef AV_RB24
+# define AV_RB24(x) \
+ ((((const uint8_t*)(x))[0] << 16) | \
+ (((const uint8_t*)(x))[1] << 8) | \
+ ((const uint8_t*)(x))[2])
+#endif
+#ifndef AV_WB24
+# define AV_WB24(p, d) do { \
+ ((uint8_t*)(p))[2] = (d); \
+ ((uint8_t*)(p))[1] = (d)>>8; \
+ ((uint8_t*)(p))[0] = (d)>>16; \
+ } while(0)
+#endif
+
+#ifndef AV_RL24
+# define AV_RL24(x) \
+ ((((const uint8_t*)(x))[2] << 16) | \
+ (((const uint8_t*)(x))[1] << 8) | \
+ ((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL24
+# define AV_WL24(p, d) do { \
+ ((uint8_t*)(p))[0] = (d); \
+ ((uint8_t*)(p))[1] = (d)>>8; \
+ ((uint8_t*)(p))[2] = (d)>>16; \
+ } while(0)
+#endif
+
+#ifndef AV_RB48
+# define AV_RB48(x) \
+ (((uint64_t)((const uint8_t*)(x))[0] << 40) | \
+ ((uint64_t)((const uint8_t*)(x))[1] << 32) | \
+ ((uint64_t)((const uint8_t*)(x))[2] << 24) | \
+ ((uint64_t)((const uint8_t*)(x))[3] << 16) | \
+ ((uint64_t)((const uint8_t*)(x))[4] << 8) | \
+ (uint64_t)((const uint8_t*)(x))[5])
+#endif
+#ifndef AV_WB48
+# define AV_WB48(p, darg) do { \
+ uint64_t d = (darg); \
+ ((uint8_t*)(p))[5] = (d); \
+ ((uint8_t*)(p))[4] = (d)>>8; \
+ ((uint8_t*)(p))[3] = (d)>>16; \
+ ((uint8_t*)(p))[2] = (d)>>24; \
+ ((uint8_t*)(p))[1] = (d)>>32; \
+ ((uint8_t*)(p))[0] = (d)>>40; \
+ } while(0)
+#endif
+
+#ifndef AV_RL48
+# define AV_RL48(x) \
+ (((uint64_t)((const uint8_t*)(x))[5] << 40) | \
+ ((uint64_t)((const uint8_t*)(x))[4] << 32) | \
+ ((uint64_t)((const uint8_t*)(x))[3] << 24) | \
+ ((uint64_t)((const uint8_t*)(x))[2] << 16) | \
+ ((uint64_t)((const uint8_t*)(x))[1] << 8) | \
+ (uint64_t)((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL48
+# define AV_WL48(p, darg) do { \
+ uint64_t d = (darg); \
+ ((uint8_t*)(p))[0] = (d); \
+ ((uint8_t*)(p))[1] = (d)>>8; \
+ ((uint8_t*)(p))[2] = (d)>>16; \
+ ((uint8_t*)(p))[3] = (d)>>24; \
+ ((uint8_t*)(p))[4] = (d)>>32; \
+ ((uint8_t*)(p))[5] = (d)>>40; \
+ } while(0)
+#endif
+
+/*
+ * The AV_[RW]NA macros access naturally aligned data
+ * in a type-safe way.
+ */
+
+#define AV_RNA(s, p) (((const av_alias##s*)(p))->u##s)
+#define AV_WNA(s, p, v) (((av_alias##s*)(p))->u##s = (v))
+
+#ifndef AV_RN16A
+# define AV_RN16A(p) AV_RNA(16, p)
+#endif
+
+#ifndef AV_RN32A
+# define AV_RN32A(p) AV_RNA(32, p)
+#endif
+
+#ifndef AV_RN64A
+# define AV_RN64A(p) AV_RNA(64, p)
+#endif
+
+#ifndef AV_WN16A
+# define AV_WN16A(p, v) AV_WNA(16, p, v)
+#endif
+
+#ifndef AV_WN32A
+# define AV_WN32A(p, v) AV_WNA(32, p, v)
+#endif
+
+#ifndef AV_WN64A
+# define AV_WN64A(p, v) AV_WNA(64, p, v)
+#endif
+
+/*
+ * The AV_COPYxxU macros are suitable for copying data to/from unaligned
+ * memory locations.
+ */
+
+#define AV_COPYU(n, d, s) AV_WN##n(d, AV_RN##n(s));
+
+#ifndef AV_COPY16U
+# define AV_COPY16U(d, s) AV_COPYU(16, d, s)
+#endif
+
+#ifndef AV_COPY32U
+# define AV_COPY32U(d, s) AV_COPYU(32, d, s)
+#endif
+
+#ifndef AV_COPY64U
+# define AV_COPY64U(d, s) AV_COPYU(64, d, s)
+#endif
+
+#ifndef AV_COPY128U
+# define AV_COPY128U(d, s) \
+ do { \
+ AV_COPY64U(d, s); \
+ AV_COPY64U((char *)(d) + 8, (const char *)(s) + 8); \
+ } while(0)
+#endif
+
+/* Parameters for AV_COPY*, AV_SWAP*, AV_ZERO* must be
+ * naturally aligned. They may be implemented using MMX,
+ * so emms_c() must be called before using any float code
+ * afterwards.
+ */
+
+#define AV_COPY(n, d, s) \
+ (((av_alias##n*)(d))->u##n = ((const av_alias##n*)(s))->u##n)
+
+#ifndef AV_COPY16
+# define AV_COPY16(d, s) AV_COPY(16, d, s)
+#endif
+
+#ifndef AV_COPY32
+# define AV_COPY32(d, s) AV_COPY(32, d, s)
+#endif
+
+#ifndef AV_COPY64
+# define AV_COPY64(d, s) AV_COPY(64, d, s)
+#endif
+
+#ifndef AV_COPY128
+# define AV_COPY128(d, s) \
+ do { \
+ AV_COPY64(d, s); \
+ AV_COPY64((char*)(d)+8, (char*)(s)+8); \
+ } while(0)
+#endif
+
+#define AV_SWAP(n, a, b) FFSWAP(av_alias##n, *(av_alias##n*)(a), *(av_alias##n*)(b))
+
+#ifndef AV_SWAP64
+# define AV_SWAP64(a, b) AV_SWAP(64, a, b)
+#endif
+
+#define AV_ZERO(n, d) (((av_alias##n*)(d))->u##n = 0)
+
+#ifndef AV_ZERO16
+# define AV_ZERO16(d) AV_ZERO(16, d)
+#endif
+
+#ifndef AV_ZERO32
+# define AV_ZERO32(d) AV_ZERO(32, d)
+#endif
+
+#ifndef AV_ZERO64
+# define AV_ZERO64(d) AV_ZERO(64, d)
+#endif
+
+#ifndef AV_ZERO128
+# define AV_ZERO128(d) \
+ do { \
+ AV_ZERO64(d); \
+ AV_ZERO64((char*)(d)+8); \
+ } while(0)
+#endif
+
+#endif /* AVUTIL_INTREADWRITE_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/lfg.h Added

@@ -0,0 +1,124 @@
+/*
+ * Lagged Fibonacci PRNG
+ * Copyright (c) 2008 Michael Niedermayer
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_LFG_H
+#define AVUTIL_LFG_H
+
+typedef struct AVLFG {
+    unsigned int state[64];
+    int index;
+} AVLFG;
+
+void av_lfg_init(AVLFG *c, unsigned int seed);
+
+/**
+ * Get the next random unsigned 32-bit number using an ALFG.
+ *
+ * Please also consider a simple LCG like state= state*1664525+1013904223,
+ * it may be good enough and faster for your specific use case.
+ */
+static inline unsigned int av_lfg_get(AVLFG *c){
+    c->state[c->index & 63] = c->state[(c->index-24) & 63] + c->state[(c->index-55) & 63];
+    return c->state[c->index++ & 63];
+}
+
+/**
+ * Get the next random unsigned 32-bit number using a MLFG.
+ *
+ * Please also consider av_lfg_get() above, it is faster.
+ */
+static inline unsigned int av_mlfg_get(AVLFG *c){
+    unsigned int a= c->state[(c->index-55) & 63];
+    unsigned int b= c->state[(c->index-24) & 63];
+    return c->state[c->index++ & 63] = 2*a*b+a+b;
+}
+
+/**
+ * Get the next two numbers generated by a Box-Muller Gaussian
+ * generator using the random numbers issued by lfg.
+ *
+ * @param out array where the two generated numbers are placed
+ */
+void av_bmg_get(AVLFG *lfg, double out[2]);
+
+#endif /* AVUTIL_LFG_H */
+/*
+ * Lagged Fibonacci PRNG
+ * Copyright (c) 2008 Michael Niedermayer
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_LFG_H
+#define AVUTIL_LFG_H
+
+typedef struct AVLFG {
+    unsigned int state[64];
+    int index;
+} AVLFG;
+
+void av_lfg_init(AVLFG *c, unsigned int seed);
+
+/**
+ * Get the next random unsigned 32-bit number using an ALFG.
+ *
+ * Please also consider a simple LCG like state= state*1664525+1013904223,
+ * it may be good enough and faster for your specific use case.
+ */
+static inline unsigned int av_lfg_get(AVLFG *c){
+    c->state[c->index & 63] = c->state[(c->index-24) & 63] + c->state[(c->index-55) & 63];
+    return c->state[c->index++ & 63];
+}
+
+/**
+ * Get the next random unsigned 32-bit number using a MLFG.
+ *
+ * Please also consider av_lfg_get() above, it is faster.
+ */
+static inline unsigned int av_mlfg_get(AVLFG *c){
+    unsigned int a= c->state[(c->index-55) & 63];
+    unsigned int b= c->state[(c->index-24) & 63];
+    return c->state[c->index++ & 63] = 2*a*b+a+b;
+}
+
+/**
+ * Get the next two numbers generated by a Box-Muller Gaussian
+ * generator using the random numbers issued by lfg.
+ *
+ * @param out array where the two generated numbers are placed
+ */
+void av_bmg_get(AVLFG *lfg, double out[2]);
+
+#endif /* AVUTIL_LFG_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/ffmpeg_android/libavutil/log.h -> gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/log.h Changed

@@ -23,13 +23,47 @@
 
 #include <stdarg.h>
 #include "avutil.h"
+#include "attributes.h"
+
+typedef enum {
+ AV_CLASS_CATEGORY_NA = 0,
+ AV_CLASS_CATEGORY_INPUT,
+ AV_CLASS_CATEGORY_OUTPUT,
+ AV_CLASS_CATEGORY_MUXER,
+ AV_CLASS_CATEGORY_DEMUXER,
+ AV_CLASS_CATEGORY_ENCODER,
+ AV_CLASS_CATEGORY_DECODER,
+ AV_CLASS_CATEGORY_FILTER,
+ AV_CLASS_CATEGORY_BITSTREAM_FILTER,
+ AV_CLASS_CATEGORY_SWSCALER,
+ AV_CLASS_CATEGORY_SWRESAMPLER,
+ AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT = 40,
+ AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT,
+ AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT,
+ AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT,
+ AV_CLASS_CATEGORY_DEVICE_OUTPUT,
+ AV_CLASS_CATEGORY_DEVICE_INPUT,
+ AV_CLASS_CATEGORY_NB, ///< not part of ABI/API
+}AVClassCategory;
+
+#define AV_IS_INPUT_DEVICE(category) \
+ (((category) == AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT) || \
+ ((category) == AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT) || \
+ ((category) == AV_CLASS_CATEGORY_DEVICE_INPUT))
+
+#define AV_IS_OUTPUT_DEVICE(category) \
+ (((category) == AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT) || \
+ ((category) == AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT) || \
+ ((category) == AV_CLASS_CATEGORY_DEVICE_OUTPUT))
+
+struct AVOptionRanges;
 
 /**
- * Describes the class of an AVClass context structure. That is an
+ * Describe the class of an AVClass context structure. That is an
 * arbitrary struct of which the first field is a pointer to an
 * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.).
 */
-typedef struct {
+typedef struct AVClass {
 /**
 * The name of the class; usually it is the same name as the
 * context structure type to which the AVClass is associated.
@@ -48,10 +82,78 @@
 * @see av_set_default_options()
 */
 const struct AVOption *option;
+
+ /**
+ * LIBAVUTIL_VERSION with which this structure was created.
+ * This is used to allow fields to be added without requiring major
+ * version bumps everywhere.
+ */
+
+ int version;
+
+ /**
+ * Offset in the structure where log_level_offset is stored.
+ * 0 means there is no such variable
+ */
+ int log_level_offset_offset;
+
+ /**
+ * Offset in the structure where a pointer to the parent context for
+ * logging is stored. For example a decoder could pass its AVCodecContext
+ * to eval as such a parent context, which an av_log() implementation
+ * could then leverage to display the parent context.
+ * The offset can be NULL.
+ */
+ int parent_log_context_offset;
+
+ /**
+ * Return next AVOptions-enabled child or NULL
+ */
+ void* (*child_next)(void *obj, void *prev);
+
+ /**
+ * Return an AVClass corresponding to the next potential
+ * AVOptions-enabled child.
+ *
+ * The difference between child_next and this is that
+ * child_next iterates over _already existing_ objects, while
+ * child_class_next iterates over _all possible_ children.
+ */
+ const struct AVClass* (*child_class_next)(const struct AVClass *prev);
+
+ /**
+ * Category used for visualization (like color)
+ * This is only set if the category is equal for all objects using this class.
+ * available since version (51 << 16 | 56 << 8 | 100)
+ */
+ AVClassCategory category;
+
+ /**
+ * Callback to return the category.
+ * available since version (51 << 16 | 59 << 8 | 100)
+ */
+ AVClassCategory (*get_category)(void* ctx);
+
+ /**
+ * Callback to return the supported/allowed ranges.
+ * available since version (52.12)
+ */
+ int (*query_ranges)(struct AVOptionRanges **, void *obj, const char *key, int flags);
 } AVClass;
 
-/* av_log API */
+/**
+ * @addtogroup lavu_log
+ *
+ * @{
+ *
+ * @defgroup lavu_log_constants Logging Constants
+ *
+ * @{
+ */
 
+/**
+ * Print no output.
+ */
 #define AV_LOG_QUIET -8
 
 /**
@@ -78,7 +180,14 @@
 */
 #define AV_LOG_WARNING 24
 
+/**
+ * Standard information.
+ */
 #define AV_LOG_INFO 32
+
+/**
+ * Detailed information.
+ */
 #define AV_LOG_VERBOSE 40
 
 /**
@@ -86,30 +195,156 @@
 */
 #define AV_LOG_DEBUG 48
 
+#define AV_LOG_MAX_OFFSET (AV_LOG_DEBUG - AV_LOG_QUIET)
+
 /**
- * Sends the specified message to the log if the level is less than or equal
+ * @}
+ */
+
+/**
+ * Sets additional colors for extended debugging sessions.
+ * @code
+ av_log(ctx, AV_LOG_DEBUG|AV_LOG_C(134), "Message in purple\n");
+ @endcode
+ * Requires 256color terminal support. Uses outside debugging is not
+ * recommended.
+ */
+#define AV_LOG_C(x) (x << 8)
+
+/**
+ * Send the specified message to the log if the level is less than or equal
 * to the current av_log_level. By default, all logging messages are sent to
- * stderr. This behavior can be altered by setting a different av_vlog callback
+ * stderr. This behavior can be altered by setting a different logging callback
 * function.
+ * @see av_log_set_callback
 *
 * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
+ * pointer to an AVClass struct.
+ * @param level The importance level of the message expressed using a @ref
+ * lavu_log_constants "Logging Constant".
 * @param fmt The format string (printf-compatible) that specifies how
- * subsequent arguments are converted to output.
- * @see av_vlog
+ * subsequent arguments are converted to output.
 */
-#ifdef __GNUC__
-void av_log(void*, int level, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 3, 4)));
+void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4);
+
+
+/**
+ * Send the specified message to the log if the level is less than or equal
+ * to the current av_log_level. By default, all logging messages are sent to
+ * stderr. This behavior can be altered by setting a different logging callback
+ * function.
+ * @see av_log_set_callback
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ * pointer to an AVClass struct.
+ * @param level The importance level of the message expressed using a @ref
+ * lavu_log_constants "Logging Constant".
+ * @param fmt The format string (printf-compatible) that specifies how
+ * subsequent arguments are converted to output.
+ * @param vl The arguments referenced by the format string.
+ */
+void av_vlog(void *avcl, int level, const char *fmt, va_list vl);
+
+/**
+ * Get the current log level
+ *
+ * @see lavu_log_constants
+ *
+ * @return Current log level
+ */
+int av_log_get_level(void);
+
+/**
+ * Set the log level
+ *
+ * @see lavu_log_constants
+ *
+ * @param level Logging level
+ */
+void av_log_set_level(int level);
+
+/**
+ * Set the logging callback
+ *
+ * @note The callback must be thread safe, even if the application does not use
+ * threads itself as some codecs are multithreaded.
+ *
+ * @see av_log_default_callback
+ *
+ * @param callback A logging function with a compatible signature.
+ */
+void av_log_set_callback(void (*callback)(void*, int, const char*, va_list));
+
+/**
+ * Default logging callback
+ *
+ * It prints the message to stderr, optionally colorizing it.
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ * pointer to an AVClass struct.
+ * @param level The importance level of the message expressed using a @ref
+ * lavu_log_constants "Logging Constant".
+ * @param fmt The format string (printf-compatible) that specifies how
+ * subsequent arguments are converted to output.
+ * @param vl The arguments referenced by the format string.
+ */
+void av_log_default_callback(void *avcl, int level, const char *fmt,
+ va_list vl);
+
+/**
+ * Return the context name
+ *
+ * @param ctx The AVClass context
+ *
+ * @return The AVClass class_name
+ */
+const char* av_default_item_name(void* ctx);
+AVClassCategory av_default_get_category(void *ptr);
+
+/**
+ * Format a line of log the same way as the default callback.
+ * @param line buffer to receive the formated line
+ * @param line_size size of the buffer
+ * @param print_prefix used to store whether the prefix must be printed;
+ * must point to a persistent integer initially set to 1
+ */
+void av_log_format_line(void *ptr, int level, const char *fmt, va_list vl,
+ char *line, int line_size, int *print_prefix);
+
+/**
+ * av_dlog macros
+ * Useful to print debug messages that shouldn't get compiled in normally.
+ */
+
+#ifdef DEBUG
+# define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__)
 #else
-void av_log(void*, int level, const char *fmt, ...);
+# define av_dlog(pctx, ...) do { if (0) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0)
 #endif
 
-void av_vlog(void*, int level, const char *fmt, va_list);
-int av_log_get_level(void);
-void av_log_set_level(int);
-void av_log_set_callback(void (*)(void*, int, const char*, va_list));
-void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl);
+/**
+ * Skip repeated messages, this requires the user app to use av_log() instead of
+ * (f)printf as the 2 would otherwise interfere and lead to
+ * "Last message repeated x times" messages below (f)printf messages with some
+ * bad luck.
+ * Also to receive the last, "last repeated" line if any, the user app must
+ * call av_log(NULL, AV_LOG_QUIET, "%s", ""); at the end
+ */
+#define AV_LOG_SKIP_REPEATED 1
+
+/**
+ * Include the log severity in messages originating from codecs.
+ *
+ * Results in messages such as:
+ * [rawvideo @ 0xDEADBEEF] [error] encode did not produce valid pts
+ */
+#define AV_LOG_PRINT_LEVEL 2
+
+void av_log_set_flags(int arg);
+int av_log_get_flags(void);
+
+/**
+ * @}
+ */
 
 #endif /* AVUTIL_LOG_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/lzo.h Added

@@ -0,0 +1,132 @@
+/*
+ * LZO 1x decompression
+ * copyright (c) 2006 Reimar Doeffinger
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_LZO_H
+#define AVUTIL_LZO_H
+
+/**
+ * @defgroup lavu_lzo LZO
+ * @ingroup lavu_crypto
+ *
+ * @{
+ */
+
+#include <stdint.h>
+
+/** @name Error flags returned by av_lzo1x_decode
+ * @{ */
+/// end of the input buffer reached before decoding finished
+#define AV_LZO_INPUT_DEPLETED 1
+/// decoded data did not fit into output buffer
+#define AV_LZO_OUTPUT_FULL 2
+/// a reference to previously decoded data was wrong
+#define AV_LZO_INVALID_BACKPTR 4
+/// a non-specific error in the compressed bitstream
+#define AV_LZO_ERROR 8
+/** @} */
+
+#define AV_LZO_INPUT_PADDING 8
+#define AV_LZO_OUTPUT_PADDING 12
+
+/**
+ * @brief Decodes LZO 1x compressed data.
+ * @param out output buffer
+ * @param outlen size of output buffer, number of bytes left are returned here
+ * @param in input buffer
+ * @param inlen size of input buffer, number of bytes left are returned here
+ * @return 0 on success, otherwise a combination of the error flags above
+ *
+ * Make sure all buffers are appropriately padded, in must provide
+ * AV_LZO_INPUT_PADDING, out must provide AV_LZO_OUTPUT_PADDING additional bytes.
+ */
+int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_LZO_H */
+/*
+ * LZO 1x decompression
+ * copyright (c) 2006 Reimar Doeffinger
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_LZO_H
+#define AVUTIL_LZO_H
+
+/**
+ * @defgroup lavu_lzo LZO
+ * @ingroup lavu_crypto
+ *
+ * @{
+ */
+
+#include <stdint.h>
+
+/** @name Error flags returned by av_lzo1x_decode
+ * @{ */
+/// end of the input buffer reached before decoding finished
+#define AV_LZO_INPUT_DEPLETED 1
+/// decoded data did not fit into output buffer
+#define AV_LZO_OUTPUT_FULL 2
+/// a reference to previously decoded data was wrong
+#define AV_LZO_INVALID_BACKPTR 4
+/// a non-specific error in the compressed bitstream
+#define AV_LZO_ERROR 8
+/** @} */
+
+#define AV_LZO_INPUT_PADDING 8
+#define AV_LZO_OUTPUT_PADDING 12
+
+/**
+ * @brief Decodes LZO 1x compressed data.
+ * @param out output buffer
+ * @param outlen size of output buffer, number of bytes left are returned here
+ * @param in input buffer
+ * @param inlen size of input buffer, number of bytes left are returned here
+ * @return 0 on success, otherwise a combination of the error flags above
+ *
+ * Make sure all buffers are appropriately padded, in must provide
+ * AV_LZO_INPUT_PADDING, out must provide AV_LZO_OUTPUT_PADDING additional bytes.
+ */
+int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_LZO_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/macros.h Added

@@ -0,0 +1,96 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * @ingroup lavu
+ * Utility Preprocessor macros
+ */
+
+#ifndef AVUTIL_MACROS_H
+#define AVUTIL_MACROS_H
+
+/**
+ * @addtogroup preproc_misc Preprocessor String Macros
+ *
+ * String manipulation macros
+ *
+ * @{
+ */
+
+#define AV_STRINGIFY(s)         AV_TOSTRING(s)
+#define AV_TOSTRING(s) #s
+
+#define AV_GLUE(a, b) a ## b
+#define AV_JOIN(a, b) AV_GLUE(a, b)
+
+/**
+ * @}
+ */
+
+#define AV_PRAGMA(s) _Pragma(#s)
+
+#endif /* AVUTIL_MACROS_H */
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * @ingroup lavu
+ * Utility Preprocessor macros
+ */
+
+#ifndef AVUTIL_MACROS_H
+#define AVUTIL_MACROS_H
+
+/**
+ * @addtogroup preproc_misc Preprocessor String Macros
+ *
+ * String manipulation macros
+ *
+ * @{
+ */
+
+#define AV_STRINGIFY(s)         AV_TOSTRING(s)
+#define AV_TOSTRING(s) #s
+
+#define AV_GLUE(a, b) a ## b
+#define AV_JOIN(a, b) AV_GLUE(a, b)
+
+/**
+ * @}
+ */
+
+#define AV_PRAGMA(s) _Pragma(#s)
+
+#endif /* AVUTIL_MACROS_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/ffmpeg_android/libavutil/mathematics.h -> gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/mathematics.h Changed

@@ -1,5 +1,5 @@
 /*
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
+ * copyright (c) 2005-2012 Michael Niedermayer <michaelni@gmx.at>
 *
 * This file is part of FFmpeg.
 *
@@ -25,6 +25,7 @@
 #include <math.h>
 #include "attributes.h"
 #include "rational.h"
+#include "intfloat.h"
 
 #ifndef M_E
 #define M_E 2.7182818284590452354 /* e */
@@ -38,9 +39,15 @@
 #ifndef M_LOG2_10
 #define M_LOG2_10 3.32192809488736234787 /* log_2 10 */
 #endif
+#ifndef M_PHI
+#define M_PHI 1.61803398874989484820 /* phi / golden ratio */
+#endif
 #ifndef M_PI
 #define M_PI 3.14159265358979323846 /* pi */
 #endif
+#ifndef M_PI_2
+#define M_PI_2 1.57079632679489661923 /* pi/2 */
+#endif
 #ifndef M_SQRT1_2
 #define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */
 #endif
@@ -48,51 +55,110 @@
 #define M_SQRT2 1.41421356237309504880 /* sqrt(2) */
 #endif
 #ifndef NAN
-#define NAN (0.0/0.0)
+#define NAN av_int2float(0x7fc00000)
 #endif
 #ifndef INFINITY
-#define INFINITY (1.0/0.0)
+#define INFINITY av_int2float(0x7f800000)
 #endif
 
+/**
+ * @addtogroup lavu_math
+ * @{
+ */
+
+
 enum AVRounding {
 AV_ROUND_ZERO = 0, ///< Round toward zero.
 AV_ROUND_INF = 1, ///< Round away from zero.
 AV_ROUND_DOWN = 2, ///< Round toward -infinity.
 AV_ROUND_UP = 3, ///< Round toward +infinity.
 AV_ROUND_NEAR_INF = 5, ///< Round to nearest and halfway cases away from zero.
+ AV_ROUND_PASS_MINMAX = 8192, ///< Flag to pass INT64_MIN/MAX through instead of rescaling, this avoids special cases for AV_NOPTS_VALUE
 };
 
 /**
- * Returns the greatest common divisor of a and b.
+ * Return the greatest common divisor of a and b.
 * If both a and b are 0 or either or both are <0 then behavior is
 * undefined.
 */
 int64_t av_const av_gcd(int64_t a, int64_t b);
 
 /**
- * Rescales a 64-bit integer with rounding to nearest.
+ * Rescale a 64-bit integer with rounding to nearest.
 * A simple a*b/c isn't possible as it can overflow.
 */
 int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const;
 
 /**
- * Rescales a 64-bit integer with specified rounding.
+ * Rescale a 64-bit integer with specified rounding.
 * A simple a*b/c isn't possible as it can overflow.
+ *
+ * @return rescaled value a, or if AV_ROUND_PASS_MINMAX is set and a is
+ * INT64_MIN or INT64_MAX then a is passed through unchanged.
 */
 int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_const;
 
 /**
- * Rescales a 64-bit integer by 2 rational numbers.
+ * Rescale a 64-bit integer by 2 rational numbers.
 */
 int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
 
 /**
- * Compares 2 timestamps each in its own timebases.
+ * Rescale a 64-bit integer by 2 rational numbers with specified rounding.
+ *
+ * @return rescaled value a, or if AV_ROUND_PASS_MINMAX is set and a is
+ * INT64_MIN or INT64_MAX then a is passed through unchanged.
+ */
+int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq,
+ enum AVRounding) av_const;
+
+/**
+ * Compare 2 timestamps each in its own timebases.
 * The result of the function is undefined if one of the timestamps
 * is outside the int64_t range when represented in the others timebase.
 * @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position
 */
 int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b);
 
+/**
+ * Compare 2 integers modulo mod.
+ * That is we compare integers a and b for which only the least
+ * significant log2(mod) bits are known.
+ *
+ * @param mod must be a power of 2
+ * @return a negative value if a is smaller than b
+ * a positive value if a is greater than b
+ * 0 if a equals b
+ */
+int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod);
+
+/**
+ * Rescale a timestamp while preserving known durations.
+ *
+ * @param in_ts Input timestamp
+ * @param in_tb Input timebase
+ * @param fs_tb Duration and *last timebase
+ * @param duration duration till the next call
+ * @param out_tb Output timebase
+ */
+int64_t av_rescale_delta(AVRational in_tb, int64_t in_ts, AVRational fs_tb, int duration, int64_t *last, AVRational out_tb);
+
+/**
+ * Add a value to a timestamp.
+ *
+ * This function guarantees that when the same value is repeatly added that
+ * no accumulation of rounding errors occurs.
+ *
+ * @param ts Input timestamp
+ * @param ts_tb Input timestamp timebase
+ * @param inc value to add to ts
+ * @param inc_tb inc timebase
+ */
+int64_t av_add_stable(AVRational ts_tb, int64_t ts, AVRational inc_tb, int64_t inc);
+
+
+ /**
+ * @}
+ */
 
 #endif /* AVUTIL_MATHEMATICS_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/md5.h Added

@@ -0,0 +1,162 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_MD5_H
+#define AVUTIL_MD5_H
+
+#include <stdint.h>
+
+#include "attributes.h"
+#include "version.h"
+
+/**
+ * @defgroup lavu_md5 MD5
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+extern const int av_md5_size;
+
+struct AVMD5;
+
+/**
+ * Allocate an AVMD5 context.
+ */
+struct AVMD5 *av_md5_alloc(void);
+
+/**
+ * Initialize MD5 hashing.
+ *
+ * @param ctx pointer to the function context (of size av_md5_size)
+ */
+void av_md5_init(struct AVMD5 *ctx);
+
+/**
+ * Update hash value.
+ *
+ * @param ctx hash function context
+ * @param src input data to update hash with
+ * @param len input data length
+ */
+void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, int len);
+
+/**
+ * Finish hashing and output digest value.
+ *
+ * @param ctx hash function context
+ * @param dst buffer where output digest value is stored
+ */
+void av_md5_final(struct AVMD5 *ctx, uint8_t *dst);
+
+/**
+ * Hash an array of data.
+ *
+ * @param dst The output buffer to write the digest into
+ * @param src The data to hash
+ * @param len The length of the data, in bytes
+ */
+void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_MD5_H */
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_MD5_H
+#define AVUTIL_MD5_H
+
+#include <stdint.h>
+
+#include "attributes.h"
+#include "version.h"
+
+/**
+ * @defgroup lavu_md5 MD5
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+extern const int av_md5_size;
+
+struct AVMD5;
+
+/**
+ * Allocate an AVMD5 context.
+ */
+struct AVMD5 *av_md5_alloc(void);
+
+/**
+ * Initialize MD5 hashing.
+ *
+ * @param ctx pointer to the function context (of size av_md5_size)
+ */
+void av_md5_init(struct AVMD5 *ctx);
+
+/**
+ * Update hash value.
+ *
+ * @param ctx hash function context
+ * @param src input data to update hash with
+ * @param len input data length
+ */
+void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, int len);
+
+/**
+ * Finish hashing and output digest value.
+ *
+ * @param ctx hash function context
+ * @param dst buffer where output digest value is stored
+ */
+void av_md5_final(struct AVMD5 *ctx, uint8_t *dst);
+
+/**
+ * Hash an array of data.
+ *
+ * @param dst The output buffer to write the digest into
+ * @param src The data to hash
+ * @param len The length of the data, in bytes
+ */
+void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_MD5_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/ffmpeg_android/libavutil/mem.h -> gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/mem.h Changed

@@ -19,16 +19,27 @@
 */
 
 /**
- * @file libavutil/mem.h
+ * @file
 * memory handling functions
 */
 
 #ifndef AVUTIL_MEM_H
 #define AVUTIL_MEM_H
 
+#include <limits.h>
+#include <stdint.h>
+
 #include "attributes.h"
+#include "error.h"
+#include "avutil.h"
+
+/**
+ * @addtogroup lavu_mem
+ * @{
+ */
+
 
-#if defined(__ICC) || defined(__SUNPRO_C)
+#if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || defined(__SUNPRO_C)
 #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v
 #define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n))) v
 #elif defined(__TI_COMPILER_VERSION__)
@@ -40,7 +51,7 @@
 static const t __attribute__((aligned(n))) v
 #elif defined(__GNUC__)
 #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v
- #define DECLARE_ASM_CONST(n,t,v) static const t attribute_used __attribute__ ((aligned (n))) v
+ #define DECLARE_ASM_CONST(n,t,v) static const t av_used __attribute__ ((aligned (n))) v
 #elif defined(_MSC_VER)
 #define DECLARE_ALIGNED(n,t,v) __declspec(align(n)) t v
 #define DECLARE_ASM_CONST(n,t,v) __declspec(align(n)) static const t v
@@ -55,38 +66,126 @@
 #define av_malloc_attrib
 #endif
 
-#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3)
- #define av_alloc_size(n) __attribute__((alloc_size(n)))
+#if AV_GCC_VERSION_AT_LEAST(4,3)
+ #define av_alloc_size(...) __attribute__((alloc_size(__VA_ARGS__)))
 #else
- #define av_alloc_size(n)
+ #define av_alloc_size(...)
 #endif
 
 /**
- * Allocates a block of size bytes with alignment suitable for all
+ * Allocate a block of size bytes with alignment suitable for all
 * memory accesses (including vectors if available on the CPU).
 * @param size Size in bytes for the memory block to be allocated.
 * @return Pointer to the allocated block, NULL if the block cannot
 * be allocated.
 * @see av_mallocz()
 */
-void *av_malloc(unsigned int size) av_malloc_attrib av_alloc_size(1);
+void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
 
 /**
- * Allocates or reallocates a block of memory.
- * If ptr is NULL and size > 0, allocates a new block. If
- * size is zero, frees the memory block pointed to by ptr.
- * @param size Size in bytes for the memory block to be allocated or
- * reallocated.
+ * Allocate a block of size * nmemb bytes with av_malloc().
+ * @param nmemb Number of elements
+ * @param size Size of the single element
+ * @return Pointer to the allocated block, NULL if the block cannot
+ * be allocated.
+ * @see av_malloc()
+ */
+av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t size)
+{
+ if (!size || nmemb >= INT_MAX / size)
+ return NULL;
+ return av_malloc(nmemb * size);
+}
+
+/**
+ * Allocate or reallocate a block of memory.
+ * If ptr is NULL and size > 0, allocate a new block. If
+ * size is zero, free the memory block pointed to by ptr.
 * @param ptr Pointer to a memory block already allocated with
- * av_malloc(z)() or av_realloc() or NULL.
- * @return Pointer to a newly reallocated block or NULL if the block
+ * av_realloc() or NULL.
+ * @param size Size in bytes of the memory block to be allocated or
+ * reallocated.
+ * @return Pointer to a newly-reallocated block or NULL if the block
 * cannot be reallocated or the function is used to free the memory block.
+ * @warning Pointers originating from the av_malloc() family of functions must
+ * not be passed to av_realloc(). The former can be implemented using
+ * memalign() (or other functions), and there is no guarantee that
+ * pointers from such functions can be passed to realloc() at all.
+ * The situation is undefined according to POSIX and may crash with
+ * some libc implementations.
 * @see av_fast_realloc()
 */
-void *av_realloc(void *ptr, unsigned int size) av_alloc_size(2);
+void *av_realloc(void *ptr, size_t size) av_alloc_size(2);
+
+/**
+ * Allocate or reallocate a block of memory.
+ * This function does the same thing as av_realloc, except:
+ * - It takes two arguments and checks the result of the multiplication for
+ * integer overflow.
+ * - It frees the input block in case of failure, thus avoiding the memory
+ * leak with the classic "buf = realloc(buf); if (!buf) return -1;".
+ */
+void *av_realloc_f(void *ptr, size_t nelem, size_t elsize);
 
 /**
- * Frees a memory block which has been allocated with av_malloc(z)() or
+ * Allocate or reallocate a block of memory.
+ * If *ptr is NULL and size > 0, allocate a new block. If
+ * size is zero, free the memory block pointed to by ptr.
+ * @param ptr Pointer to a pointer to a memory block already allocated
+ * with av_realloc(), or pointer to a pointer to NULL.
+ * The pointer is updated on success, or freed on failure.
+ * @param size Size in bytes for the memory block to be allocated or
+ * reallocated
+ * @return Zero on success, an AVERROR error code on failure.
+ * @warning Pointers originating from the av_malloc() family of functions must
+ * not be passed to av_reallocp(). The former can be implemented using
+ * memalign() (or other functions), and there is no guarantee that
+ * pointers from such functions can be passed to realloc() at all.
+ * The situation is undefined according to POSIX and may crash with
+ * some libc implementations.
+ */
+int av_reallocp(void *ptr, size_t size);
+
+/**
+ * Allocate or reallocate an array.
+ * If ptr is NULL and nmemb > 0, allocate a new block. If
+ * nmemb is zero, free the memory block pointed to by ptr.
+ * @param ptr Pointer to a memory block already allocated with
+ * av_realloc() or NULL.
+ * @param nmemb Number of elements
+ * @param size Size of the single element
+ * @return Pointer to a newly-reallocated block or NULL if the block
+ * cannot be reallocated or the function is used to free the memory block.
+ * @warning Pointers originating from the av_malloc() family of functions must
+ * not be passed to av_realloc(). The former can be implemented using
+ * memalign() (or other functions), and there is no guarantee that
+ * pointers from such functions can be passed to realloc() at all.
+ * The situation is undefined according to POSIX and may crash with
+ * some libc implementations.
+ */
+av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size);
+
+/**
+ * Allocate or reallocate an array through a pointer to a pointer.
+ * If *ptr is NULL and nmemb > 0, allocate a new block. If
+ * nmemb is zero, free the memory block pointed to by ptr.
+ * @param ptr Pointer to a pointer to a memory block already allocated
+ * with av_realloc(), or pointer to a pointer to NULL.
+ * The pointer is updated on success, or freed on failure.
+ * @param nmemb Number of elements
+ * @param size Size of the single element
+ * @return Zero on success, an AVERROR error code on failure.
+ * @warning Pointers originating from the av_malloc() family of functions must
+ * not be passed to av_realloc(). The former can be implemented using
+ * memalign() (or other functions), and there is no guarantee that
+ * pointers from such functions can be passed to realloc() at all.
+ * The situation is undefined according to POSIX and may crash with
+ * some libc implementations.
+ */
+av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
+
+/**
+ * Free a memory block which has been allocated with av_malloc(z)() or
 * av_realloc().
 * @param ptr Pointer to the memory block which should be freed.
 * @note ptr = NULL is explicitly allowed.
@@ -96,30 +195,195 @@
 void av_free(void *ptr);
 
 /**
- * Allocates a block of size bytes with alignment suitable for all
+ * Allocate a block of size bytes with alignment suitable for all
 * memory accesses (including vectors if available on the CPU) and
- * zeroes all the bytes of the block.
+ * zero all the bytes of the block.
 * @param size Size in bytes for the memory block to be allocated.
 * @return Pointer to the allocated block, NULL if it cannot be allocated.
 * @see av_malloc()
 */
-void *av_mallocz(unsigned int size) av_malloc_attrib av_alloc_size(1);
+void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
 
 /**
- * Duplicates the string s.
+ * Allocate a block of nmemb * size bytes with alignment suitable for all
+ * memory accesses (including vectors if available on the CPU) and
+ * zero all the bytes of the block.
+ * The allocation will fail if nmemb * size is greater than or equal
+ * to INT_MAX.
+ * @param nmemb
+ * @param size
+ * @return Pointer to the allocated block, NULL if it cannot be allocated.
+ */
+void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib;
+
+/**
+ * Allocate a block of size * nmemb bytes with av_mallocz().
+ * @param nmemb Number of elements
+ * @param size Size of the single element
+ * @return Pointer to the allocated block, NULL if the block cannot
+ * be allocated.
+ * @see av_mallocz()
+ * @see av_malloc_array()
+ */
+av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t size)
+{
+ if (!size || nmemb >= INT_MAX / size)
+ return NULL;
+ return av_mallocz(nmemb * size);
+}
+
+/**
+ * Duplicate the string s.
 * @param s string to be duplicated
- * @return Pointer to a newly allocated string containing a
+ * @return Pointer to a newly-allocated string containing a
 * copy of s or NULL if the string cannot be allocated.
 */
 char *av_strdup(const char *s) av_malloc_attrib;
 
 /**
- * Frees a memory block which has been allocated with av_malloc(z)() or
+ * Duplicate a substring of the string s.
+ * @param s string to be duplicated
+ * @param len the maximum length of the resulting string (not counting the
+ * terminating byte).
+ * @return Pointer to a newly-allocated string containing a
+ * copy of s or NULL if the string cannot be allocated.
+ */
+char *av_strndup(const char *s, size_t len) av_malloc_attrib;
+
+/**
+ * Duplicate the buffer p.
+ * @param p buffer to be duplicated
+ * @return Pointer to a newly allocated buffer containing a
+ * copy of p or NULL if the buffer cannot be allocated.
+ */
+void *av_memdup(const void *p, size_t size);
+
+/**
+ * Free a memory block which has been allocated with av_malloc(z)() or
 * av_realloc() and set the pointer pointing to it to NULL.
 * @param ptr Pointer to the pointer to the memory block which should
 * be freed.
+ * @note passing a pointer to a NULL pointer is safe and leads to no action.
 * @see av_free()
 */
 void av_freep(void *ptr);
 
+/**
+ * Add an element to a dynamic array.
+ *
+ * The array to grow is supposed to be an array of pointers to
+ * structures, and the element to add must be a pointer to an already
+ * allocated structure.
+ *
+ * The array is reallocated when its size reaches powers of 2.
+ * Therefore, the amortized cost of adding an element is constant.
+ *
+ * In case of success, the pointer to the array is updated in order to
+ * point to the new grown array, and the number pointed to by nb_ptr
+ * is incremented.
+ * In case of failure, the array is freed, *tab_ptr is set to NULL and
+ * *nb_ptr is set to 0.
+ *
+ * @param tab_ptr pointer to the array to grow
+ * @param nb_ptr pointer to the number of elements in the array
+ * @param elem element to add
+ * @see av_dynarray_add_nofree(), av_dynarray2_add()
+ */
+void av_dynarray_add(void *tab_ptr, int *nb_ptr, void *elem);
+
+/**
+ * Add an element to a dynamic array.
+ *
+ * Function has the same functionality as av_dynarray_add(),
+ * but it doesn't free memory on fails. It returns error code
+ * instead and leave current buffer untouched.
+ *
+ * @param tab_ptr pointer to the array to grow
+ * @param nb_ptr pointer to the number of elements in the array
+ * @param elem element to add
+ * @return >=0 on success, negative otherwise.
+ * @see av_dynarray_add(), av_dynarray2_add()
+ */
+int av_dynarray_add_nofree(void *tab_ptr, int *nb_ptr, void *elem);
+
+/**
+ * Add an element of size elem_size to a dynamic array.
+ *
+ * The array is reallocated when its number of elements reaches powers of 2.
+ * Therefore, the amortized cost of adding an element is constant.
+ *
+ * In case of success, the pointer to the array is updated in order to
+ * point to the new grown array, and the number pointed to by nb_ptr
+ * is incremented.
+ * In case of failure, the array is freed, *tab_ptr is set to NULL and
+ * *nb_ptr is set to 0.
+ *
+ * @param tab_ptr pointer to the array to grow
+ * @param nb_ptr pointer to the number of elements in the array
+ * @param elem_size size in bytes of the elements in the array
+ * @param elem_data pointer to the data of the element to add. If NULL, the space of
+ * the new added element is not filled.
+ * @return pointer to the data of the element to copy in the new allocated space.
+ * If NULL, the new allocated space is left uninitialized."
+ * @see av_dynarray_add(), av_dynarray_add_nofree()
+ */
+void *av_dynarray2_add(void **tab_ptr, int *nb_ptr, size_t elem_size,
+ const uint8_t *elem_data);
+
+/**
+ * Multiply two size_t values checking for overflow.
+ * @return 0 if success, AVERROR(EINVAL) if overflow.
+ */
+static inline int av_size_mult(size_t a, size_t b, size_t *r)
+{
+ size_t t = a * b;
+ /* Hack inspired from glibc: only try the division if nelem and elsize
+ * are both greater than sqrt(SIZE_MAX). */
+ if ((a | b) >= ((size_t)1 << (sizeof(size_t) * 4)) && a && t / a != b)
+ return AVERROR(EINVAL);
+ *r = t;
+ return 0;
+}
+
+/**
+ * Set the maximum size that may me allocated in one block.
+ */
+void av_max_alloc(size_t max);
+
+/**
+ * deliberately overlapping memcpy implementation
+ * @param dst destination buffer
+ * @param back how many bytes back we start (the initial size of the overlapping window), must be > 0
+ * @param cnt number of bytes to copy, must be >= 0
+ *
+ * cnt > back is valid, this will copy the bytes we just copied,
+ * thus creating a repeating pattern with a period length of back.
+ */
+void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
+
+/**
+ * Reallocate the given block if it is not large enough, otherwise do nothing.
+ *
+ * @see av_realloc
+ */
+void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
+
+/**
+ * Allocate a buffer, reusing the given one if large enough.
+ *
+ * Contrary to av_fast_realloc the current buffer contents might not be
+ * preserved and on error the old buffer is freed, thus no special
+ * handling to avoid memleaks is necessary.
+ *
+ * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer
+ * @param size size of the buffer *ptr points to
+ * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
+ * *size 0 if an error occurred.
+ */
+void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
+
+/**
+ * @}
+ */
+
 #endif /* AVUTIL_MEM_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/motion_vector.h Added

@@ -0,0 +1,100 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_MOTION_VECTOR_H
+#define AVUTIL_MOTION_VECTOR_H
+
+#include <stdint.h>
+
+typedef struct AVMotionVector {
+ /**
+ * Where the current macroblock comes from; negative value when it comes
+ * from the past, positive value when it comes from the future.
+ * XXX: set exact relative ref frame reference instead of a +/- 1 "direction".
+ */
+ int32_t source;
+ /**
+ * Width and height of the block.
+ */
+ uint8_t w, h;
+ /**
+ * Absolute source position. Can be outside the frame area.
+ */
+ int16_t src_x, src_y;
+ /**
+ * Absolute destination position. Can be outside the frame area.
+ */
+ int16_t dst_x, dst_y;
+ /**
+ * Extra flag information.
+ * Currently unused.
+ */
+ uint64_t flags;
+} AVMotionVector;
+
+#endif /* AVUTIL_MOTION_VECTOR_H */
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_MOTION_VECTOR_H
+#define AVUTIL_MOTION_VECTOR_H
+
+#include <stdint.h>
+
+typedef struct AVMotionVector {
+ /**
+ * Where the current macroblock comes from; negative value when it comes
+ * from the past, positive value when it comes from the future.
+ * XXX: set exact relative ref frame reference instead of a +/- 1 "direction".
+ */
+ int32_t source;
+ /**
+ * Width and height of the block.
+ */
+ uint8_t w, h;
+ /**
+ * Absolute source position. Can be outside the frame area.
+ */
+ int16_t src_x, src_y;
+ /**
+ * Absolute destination position. Can be outside the frame area.
+ */
+ int16_t dst_x, dst_y;
+ /**
+ * Extra flag information.
+ * Currently unused.
+ */
+ uint64_t flags;
+} AVMotionVector;
+
+#endif /* AVUTIL_MOTION_VECTOR_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/murmur3.h Added

@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2013 Reimar Döffinger <Reimar.Doeffinger@gmx.de>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_MURMUR3_H
+#define AVUTIL_MURMUR3_H
+
+#include <stdint.h>
+
+struct AVMurMur3 *av_murmur3_alloc(void);
+void av_murmur3_init_seeded(struct AVMurMur3 *c, uint64_t seed);
+void av_murmur3_init(struct AVMurMur3 *c);
+void av_murmur3_update(struct AVMurMur3 *c, const uint8_t *src, int len);
+void av_murmur3_final(struct AVMurMur3 *c, uint8_t dst[16]);
+
+#endif /* AVUTIL_MURMUR3_H */
+/*
+ * Copyright (C) 2013 Reimar Döffinger <Reimar.Doeffinger@gmx.de>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_MURMUR3_H
+#define AVUTIL_MURMUR3_H
+
+#include <stdint.h>
+
+struct AVMurMur3 *av_murmur3_alloc(void);
+void av_murmur3_init_seeded(struct AVMurMur3 *c, uint64_t seed);
+void av_murmur3_init(struct AVMurMur3 *c);
+void av_murmur3_update(struct AVMurMur3 *c, const uint8_t *src, int len);
+void av_murmur3_final(struct AVMurMur3 *c, uint8_t dst[16]);
+
+#endif /* AVUTIL_MURMUR3_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/old_pix_fmts.h Added

@@ -0,0 +1,354 @@
+/*
+ * copyright (c) 2006-2012 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_OLD_PIX_FMTS_H
+#define AVUTIL_OLD_PIX_FMTS_H
+
+/*
+ * This header exists to prevent new pixel formats from being accidentally added
+ * to the deprecated list.
+ * Do not include it directly. It will be removed on next major bump
+ *
+ * Do not add new items to this list. Use the AVPixelFormat enum instead.
+ */
+ PIX_FMT_NONE = AV_PIX_FMT_NONE,
+ PIX_FMT_YUV420P, ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
+ PIX_FMT_YUYV422, ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
+ PIX_FMT_RGB24, ///< packed RGB 8:8:8, 24bpp, RGBRGB...
+ PIX_FMT_BGR24, ///< packed RGB 8:8:8, 24bpp, BGRBGR...
+ PIX_FMT_YUV422P, ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
+ PIX_FMT_YUV444P, ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
+ PIX_FMT_YUV410P, ///< planar YUV 4:1:0, 9bpp, (1 Cr & Cb sample per 4x4 Y samples)
+ PIX_FMT_YUV411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
+ PIX_FMT_GRAY8, ///< Y , 8bpp
+ PIX_FMT_MONOWHITE, ///< Y , 1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
+ PIX_FMT_MONOBLACK, ///< Y , 1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
+ PIX_FMT_PAL8, ///< 8 bit with PIX_FMT_RGB32 palette
+ PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
+ PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
+ PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
+#if FF_API_XVMC
+ PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
+ PIX_FMT_XVMC_MPEG2_IDCT,
+#endif /* FF_API_XVMC */
+ PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
+ PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
+ PIX_FMT_BGR8, ///< packed RGB 3:3:2, 8bpp, (msb)2B 3G 3R(lsb)
+ PIX_FMT_BGR4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+ PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1B 2G 1R(lsb)
+ PIX_FMT_RGB8, ///< packed RGB 3:3:2, 8bpp, (msb)2R 3G 3B(lsb)
+ PIX_FMT_RGB4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+ PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1R 2G 1B(lsb)
+ PIX_FMT_NV12, ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
+ PIX_FMT_NV21, ///< as above, but U and V bytes are swapped
+
+ PIX_FMT_ARGB, ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
+ PIX_FMT_RGBA, ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
+ PIX_FMT_ABGR, ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
+ PIX_FMT_BGRA, ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
+
+ PIX_FMT_GRAY16BE, ///< Y , 16bpp, big-endian
+ PIX_FMT_GRAY16LE, ///< Y , 16bpp, little-endian
+ PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
+ PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
+ PIX_FMT_YUVA420P, ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
+#if FF_API_VDPAU
+ PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+ PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+ PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+ PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+ PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+#endif
+ PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
+ PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
+
+ PIX_FMT_RGB565BE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), big-endian
+ PIX_FMT_RGB565LE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), little-endian
+ PIX_FMT_RGB555BE, ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
+ PIX_FMT_RGB555LE, ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
+
+ PIX_FMT_BGR565BE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), big-endian
+ PIX_FMT_BGR565LE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), little-endian
+ PIX_FMT_BGR555BE, ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
+ PIX_FMT_BGR555LE, ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
+
+ PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
+ PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
+ PIX_FMT_VAAPI_VLD, ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+
+ PIX_FMT_YUV420P16LE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+ PIX_FMT_YUV420P16BE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+ PIX_FMT_YUV422P16LE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+ PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+ PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+ PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+#if FF_API_VDPAU
+ PIX_FMT_VDPAU_MPEG4, ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+#endif
+ PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
+
+ PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
+ PIX_FMT_RGB444BE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
+ PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
+ PIX_FMT_BGR444BE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
+ PIX_FMT_GRAY8A, ///< 8bit gray, 8bit alpha
+ PIX_FMT_BGR48BE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
+ PIX_FMT_BGR48LE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
+
+ //the following 10 formats have the disadvantage of needing 1 format for each bit depth, thus
+ //If you want to support multiple bit depths, then using PIX_FMT_YUV420P16* with the bpp stored separately
+ //is better
+ PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+ PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+ PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+ PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+ PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+ PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+ PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+ PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+ PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+ PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+ PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+ PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+ PIX_FMT_VDA_VLD, ///< hardware decoding through VDA
+
+#ifdef AV_PIX_FMT_ABI_GIT_MASTER
+ PIX_FMT_RGBA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+ PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+ PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+ PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+#endif
+ PIX_FMT_GBRP, ///< planar GBR 4:4:4 24bpp
+ PIX_FMT_GBRP9BE, ///< planar GBR 4:4:4 27bpp, big endian
+ PIX_FMT_GBRP9LE, ///< planar GBR 4:4:4 27bpp, little endian
+ PIX_FMT_GBRP10BE, ///< planar GBR 4:4:4 30bpp, big endian
+ PIX_FMT_GBRP10LE, ///< planar GBR 4:4:4 30bpp, little endian
+ PIX_FMT_GBRP16BE, ///< planar GBR 4:4:4 48bpp, big endian
+ PIX_FMT_GBRP16LE, ///< planar GBR 4:4:4 48bpp, little endian
+
+#ifndef AV_PIX_FMT_ABI_GIT_MASTER
+ PIX_FMT_RGBA64BE=0x123, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+ PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+ PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+ PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+#endif
+ PIX_FMT_0RGB=0x123+4, ///< packed RGB 8:8:8, 32bpp, 0RGB0RGB...
+ PIX_FMT_RGB0, ///< packed RGB 8:8:8, 32bpp, RGB0RGB0...
+ PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, 0BGR0BGR...
+ PIX_FMT_BGR0, ///< packed BGR 8:8:8, 32bpp, BGR0BGR0...
+ PIX_FMT_YUVA444P, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
+ PIX_FMT_YUVA422P, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
+
+ PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+ PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+ PIX_FMT_YUV420P14BE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+ PIX_FMT_YUV420P14LE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+ PIX_FMT_YUV422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+ PIX_FMT_YUV422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+ PIX_FMT_YUV422P14BE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+ PIX_FMT_YUV422P14LE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+ PIX_FMT_YUV444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+ PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+ PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+ PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+ PIX_FMT_GBRP12BE, ///< planar GBR 4:4:4 36bpp, big endian
+ PIX_FMT_GBRP12LE, ///< planar GBR 4:4:4 36bpp, little endian
+ PIX_FMT_GBRP14BE, ///< planar GBR 4:4:4 42bpp, big endian
+ PIX_FMT_GBRP14LE, ///< planar GBR 4:4:4 42bpp, little endian
+
+ PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
+#endif /* AVUTIL_OLD_PIX_FMTS_H */
+/*
+ * copyright (c) 2006-2012 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_OLD_PIX_FMTS_H
+#define AVUTIL_OLD_PIX_FMTS_H
+
+/*
+ * This header exists to prevent new pixel formats from being accidentally added
+ * to the deprecated list.
+ * Do not include it directly. It will be removed on next major bump
+ *
+ * Do not add new items to this list. Use the AVPixelFormat enum instead.
+ */
+ PIX_FMT_NONE = AV_PIX_FMT_NONE,
+ PIX_FMT_YUV420P, ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
+ PIX_FMT_YUYV422, ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
+ PIX_FMT_RGB24, ///< packed RGB 8:8:8, 24bpp, RGBRGB...
+ PIX_FMT_BGR24, ///< packed RGB 8:8:8, 24bpp, BGRBGR...
+ PIX_FMT_YUV422P, ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
+ PIX_FMT_YUV444P, ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
+ PIX_FMT_YUV410P, ///< planar YUV 4:1:0, 9bpp, (1 Cr & Cb sample per 4x4 Y samples)
+ PIX_FMT_YUV411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
+ PIX_FMT_GRAY8, ///< Y , 8bpp
+ PIX_FMT_MONOWHITE, ///< Y , 1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
+ PIX_FMT_MONOBLACK, ///< Y , 1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
+ PIX_FMT_PAL8, ///< 8 bit with PIX_FMT_RGB32 palette
+ PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
+ PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
+ PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
+#if FF_API_XVMC
+ PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
+ PIX_FMT_XVMC_MPEG2_IDCT,
+#endif /* FF_API_XVMC */
+ PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
+ PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
+ PIX_FMT_BGR8, ///< packed RGB 3:3:2, 8bpp, (msb)2B 3G 3R(lsb)
+ PIX_FMT_BGR4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+ PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1B 2G 1R(lsb)
+ PIX_FMT_RGB8, ///< packed RGB 3:3:2, 8bpp, (msb)2R 3G 3B(lsb)
+ PIX_FMT_RGB4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+ PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1R 2G 1B(lsb)
+ PIX_FMT_NV12, ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
+ PIX_FMT_NV21, ///< as above, but U and V bytes are swapped
+
+ PIX_FMT_ARGB, ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
+ PIX_FMT_RGBA, ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
+ PIX_FMT_ABGR, ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
+ PIX_FMT_BGRA, ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
+
+ PIX_FMT_GRAY16BE, ///< Y , 16bpp, big-endian
+ PIX_FMT_GRAY16LE, ///< Y , 16bpp, little-endian
+ PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
+ PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
+ PIX_FMT_YUVA420P, ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
+#if FF_API_VDPAU
+ PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+ PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+ PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+ PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+ PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+#endif
+ PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
+ PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
+
+ PIX_FMT_RGB565BE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), big-endian
+ PIX_FMT_RGB565LE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), little-endian
+ PIX_FMT_RGB555BE, ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
+ PIX_FMT_RGB555LE, ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
+
+ PIX_FMT_BGR565BE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), big-endian
+ PIX_FMT_BGR565LE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), little-endian
+ PIX_FMT_BGR555BE, ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
+ PIX_FMT_BGR555LE, ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
+
+ PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
+ PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
+ PIX_FMT_VAAPI_VLD, ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+
+ PIX_FMT_YUV420P16LE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+ PIX_FMT_YUV420P16BE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+ PIX_FMT_YUV422P16LE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+ PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+ PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+ PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+#if FF_API_VDPAU
+ PIX_FMT_VDPAU_MPEG4, ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+#endif
+ PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
+
+ PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
+ PIX_FMT_RGB444BE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
+ PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
+ PIX_FMT_BGR444BE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
+ PIX_FMT_GRAY8A, ///< 8bit gray, 8bit alpha
+ PIX_FMT_BGR48BE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
+ PIX_FMT_BGR48LE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
+
+ //the following 10 formats have the disadvantage of needing 1 format for each bit depth, thus
+ //If you want to support multiple bit depths, then using PIX_FMT_YUV420P16* with the bpp stored separately
+ //is better
+ PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+ PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+ PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+ PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+ PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+ PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+ PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+ PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+ PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+ PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+ PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+ PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+ PIX_FMT_VDA_VLD, ///< hardware decoding through VDA
+
+#ifdef AV_PIX_FMT_ABI_GIT_MASTER
+ PIX_FMT_RGBA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+ PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+ PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+ PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+#endif
+ PIX_FMT_GBRP, ///< planar GBR 4:4:4 24bpp
+ PIX_FMT_GBRP9BE, ///< planar GBR 4:4:4 27bpp, big endian
+ PIX_FMT_GBRP9LE, ///< planar GBR 4:4:4 27bpp, little endian
+ PIX_FMT_GBRP10BE, ///< planar GBR 4:4:4 30bpp, big endian
+ PIX_FMT_GBRP10LE, ///< planar GBR 4:4:4 30bpp, little endian
+ PIX_FMT_GBRP16BE, ///< planar GBR 4:4:4 48bpp, big endian
+ PIX_FMT_GBRP16LE, ///< planar GBR 4:4:4 48bpp, little endian
+
+#ifndef AV_PIX_FMT_ABI_GIT_MASTER
+ PIX_FMT_RGBA64BE=0x123, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+ PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+ PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+ PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+#endif
+ PIX_FMT_0RGB=0x123+4, ///< packed RGB 8:8:8, 32bpp, 0RGB0RGB...
+ PIX_FMT_RGB0, ///< packed RGB 8:8:8, 32bpp, RGB0RGB0...
+ PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, 0BGR0BGR...
+ PIX_FMT_BGR0, ///< packed BGR 8:8:8, 32bpp, BGR0BGR0...
+ PIX_FMT_YUVA444P, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
+ PIX_FMT_YUVA422P, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
+
+ PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+ PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+ PIX_FMT_YUV420P14BE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+ PIX_FMT_YUV420P14LE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+ PIX_FMT_YUV422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+ PIX_FMT_YUV422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+ PIX_FMT_YUV422P14BE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+ PIX_FMT_YUV422P14LE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+ PIX_FMT_YUV444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+ PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+ PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+ PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+ PIX_FMT_GBRP12BE, ///< planar GBR 4:4:4 36bpp, big endian
+ PIX_FMT_GBRP12LE, ///< planar GBR 4:4:4 36bpp, little endian
+ PIX_FMT_GBRP14BE, ///< planar GBR 4:4:4 42bpp, big endian
+ PIX_FMT_GBRP14LE, ///< planar GBR 4:4:4 42bpp, little endian
+
+ PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
+#endif /* AVUTIL_OLD_PIX_FMTS_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/opt.h Added

@@ -0,0 +1,1718 @@
+/*
+ * AVOptions
+ * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_OPT_H
+#define AVUTIL_OPT_H
+
+/**
+ * @file
+ * AVOptions
+ */
+
+#include "rational.h"
+#include "avutil.h"
+#include "dict.h"
+#include "log.h"
+#include "pixfmt.h"
+#include "samplefmt.h"
+
+/**
+ * @defgroup avoptions AVOptions
+ * @ingroup lavu_data
+ * @{
+ * AVOptions provide a generic system to declare options on arbitrary structs
+ * ("objects"). An option can have a help text, a type and a range of possible
+ * values. Options may then be enumerated, read and written to.
+ *
+ * @section avoptions_implement Implementing AVOptions
+ * This section describes how to add AVOptions capabilities to a struct.
+ *
+ * All AVOptions-related information is stored in an AVClass. Therefore
+ * the first member of the struct should be a pointer to an AVClass describing it.
+ * The option field of the AVClass must be set to a NULL-terminated static array
+ * of AVOptions. Each AVOption must have a non-empty name, a type, a default
+ * value and for number-type AVOptions also a range of allowed values. It must
+ * also declare an offset in bytes from the start of the struct, where the field
+ * associated with this AVOption is located. Other fields in the AVOption struct
+ * should also be set when applicable, but are not required.
+ *
+ * The following example illustrates an AVOptions-enabled struct:
+ * @code
+ * typedef struct test_struct {
+ * AVClass *class;
+ * int int_opt;
+ * char *str_opt;
+ * uint8_t *bin_opt;
+ * int bin_len;
+ * } test_struct;
+ *
+ * static const AVOption test_options[] = {
+ * { "test_int", "This is a test option of int type.", offsetof(test_struct, int_opt),
+ * AV_OPT_TYPE_INT, { .i64 = -1 }, INT_MIN, INT_MAX },
+ * { "test_str", "This is a test option of string type.", offsetof(test_struct, str_opt),
+ * AV_OPT_TYPE_STRING },
+ * { "test_bin", "This is a test option of binary type.", offsetof(test_struct, bin_opt),
+ * AV_OPT_TYPE_BINARY },
+ * { NULL },
+ * };
+ *
+ * static const AVClass test_class = {
+ * .class_name = "test class",
+ * .item_name = av_default_item_name,
+ * .option = test_options,
+ * .version = LIBAVUTIL_VERSION_INT,
+ * };
+ * @endcode
+ *
+ * Next, when allocating your struct, you must ensure that the AVClass pointer
+ * is set to the correct value. Then, av_opt_set_defaults() can be called to
+ * initialize defaults. After that the struct is ready to be used with the
+ * AVOptions API.
+ *
+ * When cleaning up, you may use the av_opt_free() function to automatically
+ * free all the allocated string and binary options.
+ *
+ * Continuing with the above example:
+ *
+ * @code
+ * test_struct *alloc_test_struct(void)
+ * {
+ * test_struct *ret = av_malloc(sizeof(*ret));
+ * ret->class = &test_class;
+ * av_opt_set_defaults(ret);
+ * return ret;
+ * }
+ * void free_test_struct(test_struct **foo)
+ * {
+ * av_opt_free(*foo);
+ * av_freep(foo);
+ * }
+ * @endcode
+ *
+ * @subsection avoptions_implement_nesting Nesting
+ * It may happen that an AVOptions-enabled struct contains another
+ * AVOptions-enabled struct as a member (e.g. AVCodecContext in
+ * libavcodec exports generic options, while its priv_data field exports
+ * codec-specific options). In such a case, it is possible to set up the
+ * parent struct to export a child's options. To do that, simply
+ * implement AVClass.child_next() and AVClass.child_class_next() in the
+ * parent struct's AVClass.
+ * Assuming that the test_struct from above now also contains a
+ * child_struct field:
+ *
+ * @code
+ * typedef struct child_struct {
+ * AVClass *class;
+ * int flags_opt;
+ * } child_struct;
+ * static const AVOption child_opts[] = {
+ * { "test_flags", "This is a test option of flags type.",
+ * offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX },
+ * { NULL },
+ * };
+ * static const AVClass child_class = {
+ * .class_name = "child class",
+ * .item_name = av_default_item_name,
+ * .option = child_opts,
+ * .version = LIBAVUTIL_VERSION_INT,
+ * };
+ *
+ * void *child_next(void *obj, void *prev)
+ * {
+ * test_struct *t = obj;
+ * if (!prev && t->child_struct)
+ * return t->child_struct;
+ * return NULL
+ * }
+ * const AVClass child_class_next(const AVClass *prev)
+ * {
+ * return prev ? NULL : &child_class;
+ * }
+ * @endcode
+ * Putting child_next() and child_class_next() as defined above into
+ * test_class will now make child_struct's options accessible through
+ * test_struct (again, proper setup as described above needs to be done on
+ * child_struct right after it is created).
+ *
+ * From the above example it might not be clear why both child_next()
+ * and child_class_next() are needed. The distinction is that child_next()
+ * iterates over actually existing objects, while child_class_next()
+ * iterates over all possible child classes. E.g. if an AVCodecContext
+ * was initialized to use a codec which has private options, then its
+ * child_next() will return AVCodecContext.priv_data and finish
+ * iterating. OTOH child_class_next() on AVCodecContext.av_class will
+ * iterate over all available codecs with private options.
+ *
+ * @subsection avoptions_implement_named_constants Named constants
+ * It is possible to create named constants for options. Simply set the unit
+ * field of the option the constants should apply to a string and
+ * create the constants themselves as options of type AV_OPT_TYPE_CONST
+ * with their unit field set to the same string.
+ * Their default_val field should contain the value of the named
+ * constant.
+ * For example, to add some named constants for the test_flags option
+ * above, put the following into the child_opts array:
+ * @code
+ * { "test_flags", "This is a test option of flags type.",
+ * offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX, "test_unit" },
+ * { "flag1", "This is a flag with value 16", 0, AV_OPT_TYPE_CONST, { .i64 = 16 }, 0, 0, "test_unit" },
+ * @endcode
+ *
+ * @section avoptions_use Using AVOptions
+ * This section deals with accessing options in an AVOptions-enabled struct.
+ * Such structs in FFmpeg are e.g. AVCodecContext in libavcodec or
+ * AVFormatContext in libavformat.
+ *
+ * @subsection avoptions_use_examine Examining AVOptions
+ * The basic functions for examining options are av_opt_next(), which iterates
+ * over all options defined for one object, and av_opt_find(), which searches
+ * for an option with the given name.
+ *
+ * The situation is more complicated with nesting. An AVOptions-enabled struct
+ * may have AVOptions-enabled children. Passing the AV_OPT_SEARCH_CHILDREN flag
+ * to av_opt_find() will make the function search children recursively.
+ *
+ * For enumerating there are basically two cases. The first is when you want to
+ * get all options that may potentially exist on the struct and its children
+ * (e.g. when constructing documentation). In that case you should call
+ * av_opt_child_class_next() recursively on the parent struct's AVClass. The
+ * second case is when you have an already initialized struct with all its
+ * children and you want to get all options that can be actually written or read
+ * from it. In that case you should call av_opt_child_next() recursively (and
+ * av_opt_next() on each result).
+ *
+ * @subsection avoptions_use_get_set Reading and writing AVOptions
+ * When setting options, you often have a string read directly from the
+ * user. In such a case, simply passing it to av_opt_set() is enough. For
+ * non-string type options, av_opt_set() will parse the string according to the
+ * option type.
+ *
+ * Similarly av_opt_get() will read any option type and convert it to a string
+ * which will be returned. Do not forget that the string is allocated, so you
+ * have to free it with av_free().
+ *
+ * In some cases it may be more convenient to put all options into an
+ * AVDictionary and call av_opt_set_dict() on it. A specific case of this
+ * are the format/codec open functions in lavf/lavc which take a dictionary
+ * filled with option as a parameter. This allows to set some options
+ * that cannot be set otherwise, since e.g. the input file format is not known
+ * before the file is actually opened.
+ */
+
+enum AVOptionType{
+ AV_OPT_TYPE_FLAGS,
+ AV_OPT_TYPE_INT,
+ AV_OPT_TYPE_INT64,
+ AV_OPT_TYPE_DOUBLE,
+ AV_OPT_TYPE_FLOAT,
+ AV_OPT_TYPE_STRING,
+ AV_OPT_TYPE_RATIONAL,
+ AV_OPT_TYPE_BINARY, ///< offset must point to a pointer immediately followed by an int for the length
+ AV_OPT_TYPE_DICT,
+ AV_OPT_TYPE_CONST = 128,
+ AV_OPT_TYPE_IMAGE_SIZE = MKBETAG('S','I','Z','E'), ///< offset must point to two consecutive integers
+ AV_OPT_TYPE_PIXEL_FMT = MKBETAG('P','F','M','T'),
+ AV_OPT_TYPE_SAMPLE_FMT = MKBETAG('S','F','M','T'),
+ AV_OPT_TYPE_VIDEO_RATE = MKBETAG('V','R','A','T'), ///< offset must point to AVRational
+ AV_OPT_TYPE_DURATION = MKBETAG('D','U','R',' '),
+ AV_OPT_TYPE_COLOR = MKBETAG('C','O','L','R'),
+ AV_OPT_TYPE_CHANNEL_LAYOUT = MKBETAG('C','H','L','A'),
+#if FF_API_OLD_AVOPTIONS
+ FF_OPT_TYPE_FLAGS = 0,
+ FF_OPT_TYPE_INT,
+ FF_OPT_TYPE_INT64,
+ FF_OPT_TYPE_DOUBLE,
+ FF_OPT_TYPE_FLOAT,
+ FF_OPT_TYPE_STRING,
+ FF_OPT_TYPE_RATIONAL,
+ FF_OPT_TYPE_BINARY, ///< offset must point to a pointer immediately followed by an int for the length
+ FF_OPT_TYPE_CONST=128,
+#endif
+};
+
+/**
+ * AVOption
+ */
+typedef struct AVOption {
+ const char *name;
+
+ /**
+ * short English help text
+ * @todo What about other languages?
+ */
+ const char *help;
+
+ /**
+ * The offset relative to the context structure where the option
+ * value is stored. It should be 0 for named constants.
+ */
+ int offset;
+ enum AVOptionType type;
+
+ /**
+ * the default value for scalar options
+ */
+ union {
+ int64_t i64;
+ double dbl;
+ const char *str;
+ /* TODO those are unused now */
+ AVRational q;
+ } default_val;
+ double min; ///< minimum valid value for the option
+ double max; ///< maximum valid value for the option
+
+ int flags;
+#define AV_OPT_FLAG_ENCODING_PARAM 1 ///< a generic parameter which can be set by the user for muxing or encoding
+#define AV_OPT_FLAG_DECODING_PARAM 2 ///< a generic parameter which can be set by the user for demuxing or decoding
+#if FF_API_OPT_TYPE_METADATA
+#define AV_OPT_FLAG_METADATA 4 ///< some data extracted or inserted into the file like title, comment, ...
+#endif
+#define AV_OPT_FLAG_AUDIO_PARAM 8
+#define AV_OPT_FLAG_VIDEO_PARAM 16
+#define AV_OPT_FLAG_SUBTITLE_PARAM 32
+/**
+ * The option is inteded for exporting values to the caller.
+ */
+#define AV_OPT_FLAG_EXPORT 64
+/**
+ * The option may not be set through the AVOptions API, only read.
+ * This flag only makes sense when AV_OPT_FLAG_EXPORT is also set.
+ */
+#define AV_OPT_FLAG_READONLY 128
+#define AV_OPT_FLAG_FILTERING_PARAM (1<<16) ///< a generic parameter which can be set by the user for filtering
+//FIXME think about enc-audio, ... style flags
+
+ /**
+ * The logical unit to which the option belongs. Non-constant
+ * options and corresponding named constants share the same
+ * unit. May be NULL.
+ */
+ const char *unit;
+} AVOption;
+
+/**
+ * A single allowed range of values, or a single allowed value.
+ */
+typedef struct AVOptionRange {
+ const char *str;
+ /**
+ * Value range.
+ * For string ranges this represents the min/max length.
+ * For dimensions this represents the min/max pixel count or width/height in multi-component case.
+ */
+ double value_min, value_max;
+ /**
+ * Value's component range.
+ * For string this represents the unicode range for chars, 0-127 limits to ASCII.
+ */
+ double component_min, component_max;
+ /**
+ * Range flag.
+ * If set to 1 the struct encodes a range, if set to 0 a single value.
+ */
+ int is_range;
+} AVOptionRange;
+
+/**
+ * List of AVOptionRange structs.
+ */
+typedef struct AVOptionRanges {
+ /**
+ * Array of option ranges.
+ *
+ * Most of option types use just one component.
+ * Following describes multi-component option types:
+ *
+ * AV_OPT_TYPE_IMAGE_SIZE:
+ * component index 0: range of pixel count (width * height).
+ * component index 1: range of width.
+ * component index 2: range of height.
+ *
+ * @note To obtain multi-component version of this structure, user must
+ * provide AV_OPT_MULTI_COMPONENT_RANGE to av_opt_query_ranges or
+ * av_opt_query_ranges_default function.
+ *
+ * Multi-component range can be read as in following example:
+ *
+ * @code
+ * int range_index, component_index;
+ * AVOptionRanges *ranges;
+ * AVOptionRange *range[3]; //may require more than 3 in the future.
+ * av_opt_query_ranges(&ranges, obj, key, AV_OPT_MULTI_COMPONENT_RANGE);
+ * for (range_index = 0; range_index < ranges->nb_ranges; range_index++) {
+ * for (component_index = 0; component_index < ranges->nb_components; component_index++)
+ * range[component_index] = ranges->range[ranges->nb_ranges * component_index + range_index];
+ * //do something with range here.
+ * }
+ * av_opt_freep_ranges(&ranges);
+ * @endcode
+ */
+ AVOptionRange **range;
+ /**
+ * Number of ranges per component.
+ */
+ int nb_ranges;
+ /**
+ * Number of componentes.
+ */
+ int nb_components;
+} AVOptionRanges;
+
+
+#if FF_API_FIND_OPT
+/**
+ * Look for an option in obj. Look only for the options which
+ * have the flags set as specified in mask and flags (that is,
+ * for which it is the case that (opt->flags & mask) == flags).
+ *
+ * @param[in] obj a pointer to a struct whose first element is a
+ * pointer to an AVClass
+ * @param[in] name the name of the option to look for
+ * @param[in] unit the unit of the option to look for, or any if NULL
+ * @return a pointer to the option found, or NULL if no option
+ * has been found
+ *
+ * @deprecated use av_opt_find.
+ */
+attribute_deprecated
+const AVOption *av_find_opt(void *obj, const char *name, const char *unit, int mask, int flags);
+#endif
+
+#if FF_API_OLD_AVOPTIONS
+/**
+ * Set the field of obj with the given name to value.
+ *
+ * @param[in] obj A struct whose first element is a pointer to an
+ * AVClass.
+ * @param[in] name the name of the field to set
+ * @param[in] val The value to set. If the field is not of a string
+ * type, then the given string is parsed.
+ * SI postfixes and some named scalars are supported.
+ * If the field is of a numeric type, it has to be a numeric or named
+ * scalar. Behavior with more than one scalar and +- infix operators
+ * is undefined.
+ * If the field is of a flags type, it has to be a sequence of numeric
+ * scalars or named flags separated by '+' or '-'. Prefixing a flag
+ * with '+' causes it to be set without affecting the other flags;
+ * similarly, '-' unsets a flag.
+ * @param[out] o_out if non-NULL put here a pointer to the AVOption
+ * found
+ * @param alloc this parameter is currently ignored
+ * @return 0 if the value has been set, or an AVERROR code in case of
+ * error:
+ * AVERROR_OPTION_NOT_FOUND if no matching option exists
+ * AVERROR(ERANGE) if the value is out of range
+ * AVERROR(EINVAL) if the value is not valid
+ * @deprecated use av_opt_set()
+ */
+attribute_deprecated
+int av_set_string3(void *obj, const char *name, const char *val, int alloc, const AVOption **o_out);
+
+attribute_deprecated const AVOption *av_set_double(void *obj, const char *name, double n);
+attribute_deprecated const AVOption *av_set_q(void *obj, const char *name, AVRational n);
+attribute_deprecated const AVOption *av_set_int(void *obj, const char *name, int64_t n);
+
+double av_get_double(void *obj, const char *name, const AVOption **o_out);
+AVRational av_get_q(void *obj, const char *name, const AVOption **o_out);
+int64_t av_get_int(void *obj, const char *name, const AVOption **o_out);
+attribute_deprecated const char *av_get_string(void *obj, const char *name, const AVOption **o_out, char *buf, int buf_len);
+attribute_deprecated const AVOption *av_next_option(void *obj, const AVOption *last);
+#endif
+
+/**
+ * Show the obj options.
+ *
+ * @param req_flags requested flags for the options to show. Show only the
+ * options for which it is opt->flags & req_flags.
+ * @param rej_flags rejected flags for the options to show. Show only the
+ * options for which it is !(opt->flags & req_flags).
+ * @param av_log_obj log context to use for showing the options
+ */
+int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags);
+
+/**
+ * Set the values of all AVOption fields to their default values.
+ *
+ * @param s an AVOption-enabled struct (its first member must be a pointer to AVClass)
+ */
+void av_opt_set_defaults(void *s);
+
+#if FF_API_OLD_AVOPTIONS
+attribute_deprecated
+void av_opt_set_defaults2(void *s, int mask, int flags);
+#endif
+
+/**
+ * Parse the key/value pairs list in opts. For each key/value pair
+ * found, stores the value in the field in ctx that is named like the
+ * key. ctx must be an AVClass context, storing is done using
+ * AVOptions.
+ *
+ * @param opts options string to parse, may be NULL
+ * @param key_val_sep a 0-terminated list of characters used to
+ * separate key from value
+ * @param pairs_sep a 0-terminated list of characters used to separate
+ * two pairs from each other
+ * @return the number of successfully set key/value pairs, or a negative
+ * value corresponding to an AVERROR code in case of error:
+ * AVERROR(EINVAL) if opts cannot be parsed,
+ * the error code issued by av_set_string3() if a key/value pair
+ * cannot be set
+ */
+int av_set_options_string(void *ctx, const char *opts,
+ const char *key_val_sep, const char *pairs_sep);
+
+/**
+ * Parse the key-value pairs list in opts. For each key=value pair found,
+ * set the value of the corresponding option in ctx.
+ *
+ * @param ctx the AVClass object to set options on
+ * @param opts the options string, key-value pairs separated by a
+ * delimiter
+ * @param shorthand a NULL-terminated array of options names for shorthand
+ * notation: if the first field in opts has no key part,
+ * the key is taken from the first element of shorthand;
+ * then again for the second, etc., until either opts is
+ * finished, shorthand is finished or a named option is
+ * found; after that, all options must be named
+ * @param key_val_sep a 0-terminated list of characters used to separate
+ * key from value, for example '='
+ * @param pairs_sep a 0-terminated list of characters used to separate
+ * two pairs from each other, for example ':' or ','
+ * @return the number of successfully set key=value pairs, or a negative
+ * value corresponding to an AVERROR code in case of error:
+ * AVERROR(EINVAL) if opts cannot be parsed,
+ * the error code issued by av_set_string3() if a key/value pair
+ * cannot be set
+ *
+ * Options names must use only the following characters: a-z A-Z 0-9 - . / _
+ * Separators must use characters distinct from option names and from each
+ * other.
+ */
+int av_opt_set_from_string(void *ctx, const char *opts,
+ const char *const *shorthand,
+ const char *key_val_sep, const char *pairs_sep);
+/**
+ * Free all allocated objects in obj.
+ */
+void av_opt_free(void *obj);
+
+/**
+ * Check whether a particular flag is set in a flags field.
+ *
+ * @param field_name the name of the flag field option
+ * @param flag_name the name of the flag to check
+ * @return non-zero if the flag is set, zero if the flag isn't set,
+ * isn't of the right type, or the flags field doesn't exist.
+ */
+int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name);
+
+/**
+ * Set all the options from a given dictionary on an object.
+ *
+ * @param obj a struct whose first element is a pointer to AVClass
+ * @param options options to process. This dictionary will be freed and replaced
+ * by a new one containing all options not found in obj.
+ * Of course this new dictionary needs to be freed by caller
+ * with av_dict_free().
+ *
+ * @return 0 on success, a negative AVERROR if some option was found in obj,
+ * but could not be set.
+ *
+ * @see av_dict_copy()
+ */
+int av_opt_set_dict(void *obj, struct AVDictionary **options);
+
+
+/**
+ * Set all the options from a given dictionary on an object.
+ *
+ * @param obj a struct whose first element is a pointer to AVClass
+ * @param options options to process. This dictionary will be freed and replaced
+ * by a new one containing all options not found in obj.
+ * Of course this new dictionary needs to be freed by caller
+ * with av_dict_free().
+ * @param search_flags A combination of AV_OPT_SEARCH_*.
+ *
+ * @return 0 on success, a negative AVERROR if some option was found in obj,
+ * but could not be set.
+ *
+ * @see av_dict_copy()
+ */
+int av_opt_set_dict2(void *obj, struct AVDictionary **options, int search_flags);
+
+/**
+ * Extract a key-value pair from the beginning of a string.
+ *
+ * @param ropts pointer to the options string, will be updated to
+ * point to the rest of the string (one of the pairs_sep
+ * or the final NUL)
+ * @param key_val_sep a 0-terminated list of characters used to separate
+ * key from value, for example '='
+ * @param pairs_sep a 0-terminated list of characters used to separate
+ * two pairs from each other, for example ':' or ','
+ * @param flags flags; see the AV_OPT_FLAG_* values below
+ * @param rkey parsed key; must be freed using av_free()
+ * @param rval parsed value; must be freed using av_free()
+ *
+ * @return >=0 for success, or a negative value corresponding to an
+ * AVERROR code in case of error; in particular:
+ * AVERROR(EINVAL) if no key is present
+ *
+ */
+int av_opt_get_key_value(const char **ropts,
+ const char *key_val_sep, const char *pairs_sep,
+ unsigned flags,
+ char **rkey, char **rval);
+
+enum {
+
+ /**
+ * Accept to parse a value without a key; the key will then be returned
+ * as NULL.
+ */
+ AV_OPT_FLAG_IMPLICIT_KEY = 1,
+};
+
+/**
+ * @defgroup opt_eval_funcs Evaluating option strings
+ * @{
+ * This group of functions can be used to evaluate option strings
+ * and get numbers out of them. They do the same thing as av_opt_set(),
+ * except the result is written into the caller-supplied pointer.
+ *
+ * @param obj a struct whose first element is a pointer to AVClass.
+ * @param o an option for which the string is to be evaluated.
+ * @param val string to be evaluated.
+ * @param *_out value of the string will be written here.
+ *
+ * @return 0 on success, a negative number on failure.
+ */
+int av_opt_eval_flags (void *obj, const AVOption *o, const char *val, int *flags_out);
+int av_opt_eval_int (void *obj, const AVOption *o, const char *val, int *int_out);
+int av_opt_eval_int64 (void *obj, const AVOption *o, const char *val, int64_t *int64_out);
+int av_opt_eval_float (void *obj, const AVOption *o, const char *val, float *float_out);
+int av_opt_eval_double(void *obj, const AVOption *o, const char *val, double *double_out);
+int av_opt_eval_q (void *obj, const AVOption *o, const char *val, AVRational *q_out);
+/**
+ * @}
+ */
+
+#define AV_OPT_SEARCH_CHILDREN 0x0001 /**< Search in possible children of the
+ given object first. */
+/**
+ * The obj passed to av_opt_find() is fake -- only a double pointer to AVClass
+ * instead of a required pointer to a struct containing AVClass. This is
+ * useful for searching for options without needing to allocate the corresponding
+ * object.
+ */
+#define AV_OPT_SEARCH_FAKE_OBJ 0x0002
+
+/**
+ * Allows av_opt_query_ranges and av_opt_query_ranges_default to return more than
+ * one component for certain option types.
+ * @see AVOptionRanges for details.
+ */
+#define AV_OPT_MULTI_COMPONENT_RANGE 0x1000
+
+/**
+ * Look for an option in an object. Consider only options which
+ * have all the specified flags set.
+ *
+ * @param[in] obj A pointer to a struct whose first element is a
+ * pointer to an AVClass.
+ * Alternatively a double pointer to an AVClass, if
+ * AV_OPT_SEARCH_FAKE_OBJ search flag is set.
+ * @param[in] name The name of the option to look for.
+ * @param[in] unit When searching for named constants, name of the unit
+ * it belongs to.
+ * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG).
+ * @param search_flags A combination of AV_OPT_SEARCH_*.
+ *
+ * @return A pointer to the option found, or NULL if no option
+ * was found.
+ *
+ * @note Options found with AV_OPT_SEARCH_CHILDREN flag may not be settable
+ * directly with av_set_string3(). Use special calls which take an options
+ * AVDictionary (e.g. avformat_open_input()) to set options found with this
+ * flag.
+ */
+const AVOption *av_opt_find(void *obj, const char *name, const char *unit,
+ int opt_flags, int search_flags);
+
+/**
+ * Look for an option in an object. Consider only options which
+ * have all the specified flags set.
+ *
+ * @param[in] obj A pointer to a struct whose first element is a
+ * pointer to an AVClass.
+ * Alternatively a double pointer to an AVClass, if
+ * AV_OPT_SEARCH_FAKE_OBJ search flag is set.
+ * @param[in] name The name of the option to look for.
+ * @param[in] unit When searching for named constants, name of the unit
+ * it belongs to.
+ * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG).
+ * @param search_flags A combination of AV_OPT_SEARCH_*.
+ * @param[out] target_obj if non-NULL, an object to which the option belongs will be
+ * written here. It may be different from obj if AV_OPT_SEARCH_CHILDREN is present
+ * in search_flags. This parameter is ignored if search_flags contain
+ * AV_OPT_SEARCH_FAKE_OBJ.
+ *
+ * @return A pointer to the option found, or NULL if no option
+ * was found.
+ */
+const AVOption *av_opt_find2(void *obj, const char *name, const char *unit,
+ int opt_flags, int search_flags, void **target_obj);
+
+/**
+ * Iterate over all AVOptions belonging to obj.
+ *
+ * @param obj an AVOptions-enabled struct or a double pointer to an
+ * AVClass describing it.
+ * @param prev result of the previous call to av_opt_next() on this object
+ * or NULL
+ * @return next AVOption or NULL
+ */
+const AVOption *av_opt_next(void *obj, const AVOption *prev);
+
+/**
+ * Iterate over AVOptions-enabled children of obj.
+ *
+ * @param prev result of a previous call to this function or NULL
+ * @return next AVOptions-enabled child or NULL
+ */
+void *av_opt_child_next(void *obj, void *prev);
+
+/**
+ * Iterate over potential AVOptions-enabled children of parent.
+ *
+ * @param prev result of a previous call to this function or NULL
+ * @return AVClass corresponding to next potential child or NULL
+ */
+const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *prev);
+
+/**
+ * @defgroup opt_set_funcs Option setting functions
+ * @{
+ * Those functions set the field of obj with the given name to value.
+ *
+ * @param[in] obj A struct whose first element is a pointer to an AVClass.
+ * @param[in] name the name of the field to set
+ * @param[in] val The value to set. In case of av_opt_set() if the field is not
+ * of a string type, then the given string is parsed.
+ * SI postfixes and some named scalars are supported.
+ * If the field is of a numeric type, it has to be a numeric or named
+ * scalar. Behavior with more than one scalar and +- infix operators
+ * is undefined.
+ * If the field is of a flags type, it has to be a sequence of numeric
+ * scalars or named flags separated by '+' or '-'. Prefixing a flag
+ * with '+' causes it to be set without affecting the other flags;
+ * similarly, '-' unsets a flag.
+ * @param search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN
+ * is passed here, then the option may be set on a child of obj.
+ *
+ * @return 0 if the value has been set, or an AVERROR code in case of
+ * error:
+ * AVERROR_OPTION_NOT_FOUND if no matching option exists
+ * AVERROR(ERANGE) if the value is out of range
+ * AVERROR(EINVAL) if the value is not valid
+ */
+int av_opt_set (void *obj, const char *name, const char *val, int search_flags);
+int av_opt_set_int (void *obj, const char *name, int64_t val, int search_flags);
+int av_opt_set_double (void *obj, const char *name, double val, int search_flags);
+int av_opt_set_q (void *obj, const char *name, AVRational val, int search_flags);
+int av_opt_set_bin (void *obj, const char *name, const uint8_t *val, int size, int search_flags);
+int av_opt_set_image_size(void *obj, const char *name, int w, int h, int search_flags);
+int av_opt_set_pixel_fmt (void *obj, const char *name, enum AVPixelFormat fmt, int search_flags);
+int av_opt_set_sample_fmt(void *obj, const char *name, enum AVSampleFormat fmt, int search_flags);
+int av_opt_set_video_rate(void *obj, const char *name, AVRational val, int search_flags);
+int av_opt_set_channel_layout(void *obj, const char *name, int64_t ch_layout, int search_flags);
+/**
+ * @note Any old dictionary present is discarded and replaced with a copy of the new one. The
+ * caller still owns val is and responsible for freeing it.
+ */
+int av_opt_set_dict_val(void *obj, const char *name, const AVDictionary *val, int search_flags);
+
+/**
+ * Set a binary option to an integer list.
+ *
+ * @param obj AVClass object to set options on
+ * @param name name of the binary option
+ * @param val pointer to an integer list (must have the correct type with
+ * regard to the contents of the list)
+ * @param term list terminator (usually 0 or -1)
+ * @param flags search flags
+ */
+#define av_opt_set_int_list(obj, name, val, term, flags) \
+ (av_int_list_length(val, term) > INT_MAX / sizeof(*(val)) ? \
+ AVERROR(EINVAL) : \
+ av_opt_set_bin(obj, name, (const uint8_t *)(val), \
+ av_int_list_length(val, term) * sizeof(*(val)), flags))
+
+/**
+ * @}
+ */
+
+/**
+ * @defgroup opt_get_funcs Option getting functions
+ * @{
+ * Those functions get a value of the option with the given name from an object.
+ *
+ * @param[in] obj a struct whose first element is a pointer to an AVClass.
+ * @param[in] name name of the option to get.
+ * @param[in] search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN
+ * is passed here, then the option may be found in a child of obj.
+ * @param[out] out_val value of the option will be written here
+ * @return >=0 on success, a negative error code otherwise
+ */
+/**
+ * @note the returned string will be av_malloc()ed and must be av_free()ed by the caller
+ */
+int av_opt_get (void *obj, const char *name, int search_flags, uint8_t **out_val);
+int av_opt_get_int (void *obj, const char *name, int search_flags, int64_t *out_val);
+int av_opt_get_double (void *obj, const char *name, int search_flags, double *out_val);
+int av_opt_get_q (void *obj, const char *name, int search_flags, AVRational *out_val);
+int av_opt_get_image_size(void *obj, const char *name, int search_flags, int *w_out, int *h_out);
+int av_opt_get_pixel_fmt (void *obj, const char *name, int search_flags, enum AVPixelFormat *out_fmt);
+int av_opt_get_sample_fmt(void *obj, const char *name, int search_flags, enum AVSampleFormat *out_fmt);
+int av_opt_get_video_rate(void *obj, const char *name, int search_flags, AVRational *out_val);
+int av_opt_get_channel_layout(void *obj, const char *name, int search_flags, int64_t *ch_layout);
+/**
+ * @param[out] out_val The returned dictionary is a copy of the actual value and must
+ * be freed with av_dict_free() by the caller
+ */
+int av_opt_get_dict_val(void *obj, const char *name, int search_flags, AVDictionary **out_val);
+/**
+ * @}
+ */
+/**
+ * Gets a pointer to the requested field in a struct.
+ * This function allows accessing a struct even when its fields are moved or
+ * renamed since the application making the access has been compiled,
+ *
+ * @returns a pointer to the field, it can be cast to the correct type and read
+ * or written to.
+ */
+void *av_opt_ptr(const AVClass *avclass, void *obj, const char *name);
+
+/**
+ * Free an AVOptionRanges struct and set it to NULL.
+ */
+void av_opt_freep_ranges(AVOptionRanges **ranges);
+
+/**
+ * Get a list of allowed ranges for the given option.
+ *
+ * The returned list may depend on other fields in obj like for example profile.
+ *
+ * @param flags is a bitmask of flags, undefined flags should not be set and should be ignored
+ * AV_OPT_SEARCH_FAKE_OBJ indicates that the obj is a double pointer to a AVClass instead of a full instance
+ * AV_OPT_MULTI_COMPONENT_RANGE indicates that function may return more than one component, @see AVOptionRanges
+ *
+ * The result must be freed with av_opt_freep_ranges.
+ *
+ * @return number of compontents returned on success, a negative errro code otherwise
+ */
+int av_opt_query_ranges(AVOptionRanges **, void *obj, const char *key, int flags);
+
+int av_opt_copy(void *dest, void *src);
+
+/**
+ * Get a default list of allowed ranges for the given option.
+ *
+ * This list is constructed without using the AVClass.query_ranges() callback
+ * and can be used as fallback from within the callback.
+ *
+ * @param flags is a bitmask of flags, undefined flags should not be set and should be ignored
+ * AV_OPT_SEARCH_FAKE_OBJ indicates that the obj is a double pointer to a AVClass instead of a full instance
+ * AV_OPT_MULTI_COMPONENT_RANGE indicates that function may return more than one component, @see AVOptionRanges
+ *
+ * The result must be freed with av_opt_free_ranges.
+ *
+ * @return number of compontents returned on success, a negative errro code otherwise
+ */
+int av_opt_query_ranges_default(AVOptionRanges **, void *obj, const char *key, int flags);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_OPT_H */
+/*
+ * AVOptions
+ * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_OPT_H
+#define AVUTIL_OPT_H
+
+/**
+ * @file
+ * AVOptions
+ */
+
+#include "rational.h"
+#include "avutil.h"
+#include "dict.h"
+#include "log.h"
+#include "pixfmt.h"
+#include "samplefmt.h"
+
+/**
+ * @defgroup avoptions AVOptions
+ * @ingroup lavu_data
+ * @{
+ * AVOptions provide a generic system to declare options on arbitrary structs
+ * ("objects"). An option can have a help text, a type and a range of possible
+ * values. Options may then be enumerated, read and written to.
+ *
+ * @section avoptions_implement Implementing AVOptions
+ * This section describes how to add AVOptions capabilities to a struct.
+ *
+ * All AVOptions-related information is stored in an AVClass. Therefore
+ * the first member of the struct should be a pointer to an AVClass describing it.
+ * The option field of the AVClass must be set to a NULL-terminated static array
+ * of AVOptions. Each AVOption must have a non-empty name, a type, a default
+ * value and for number-type AVOptions also a range of allowed values. It must
+ * also declare an offset in bytes from the start of the struct, where the field
+ * associated with this AVOption is located. Other fields in the AVOption struct
+ * should also be set when applicable, but are not required.
+ *
+ * The following example illustrates an AVOptions-enabled struct:
+ * @code
+ * typedef struct test_struct {
+ * AVClass *class;
+ * int int_opt;
+ * char *str_opt;
+ * uint8_t *bin_opt;
+ * int bin_len;
+ * } test_struct;
+ *
+ * static const AVOption test_options[] = {
+ * { "test_int", "This is a test option of int type.", offsetof(test_struct, int_opt),
+ * AV_OPT_TYPE_INT, { .i64 = -1 }, INT_MIN, INT_MAX },
+ * { "test_str", "This is a test option of string type.", offsetof(test_struct, str_opt),
+ * AV_OPT_TYPE_STRING },
+ * { "test_bin", "This is a test option of binary type.", offsetof(test_struct, bin_opt),
+ * AV_OPT_TYPE_BINARY },
+ * { NULL },
+ * };
+ *
+ * static const AVClass test_class = {
+ * .class_name = "test class",
+ * .item_name = av_default_item_name,
+ * .option = test_options,
+ * .version = LIBAVUTIL_VERSION_INT,
+ * };
+ * @endcode
+ *
+ * Next, when allocating your struct, you must ensure that the AVClass pointer
+ * is set to the correct value. Then, av_opt_set_defaults() can be called to
+ * initialize defaults. After that the struct is ready to be used with the
+ * AVOptions API.
+ *
+ * When cleaning up, you may use the av_opt_free() function to automatically
+ * free all the allocated string and binary options.
+ *
+ * Continuing with the above example:
+ *
+ * @code
+ * test_struct *alloc_test_struct(void)
+ * {
+ * test_struct *ret = av_malloc(sizeof(*ret));
+ * ret->class = &test_class;
+ * av_opt_set_defaults(ret);
+ * return ret;
+ * }
+ * void free_test_struct(test_struct **foo)
+ * {
+ * av_opt_free(*foo);
+ * av_freep(foo);
+ * }
+ * @endcode
+ *
+ * @subsection avoptions_implement_nesting Nesting
+ * It may happen that an AVOptions-enabled struct contains another
+ * AVOptions-enabled struct as a member (e.g. AVCodecContext in
+ * libavcodec exports generic options, while its priv_data field exports
+ * codec-specific options). In such a case, it is possible to set up the
+ * parent struct to export a child's options. To do that, simply
+ * implement AVClass.child_next() and AVClass.child_class_next() in the
+ * parent struct's AVClass.
+ * Assuming that the test_struct from above now also contains a
+ * child_struct field:
+ *
+ * @code
+ * typedef struct child_struct {
+ * AVClass *class;
+ * int flags_opt;
+ * } child_struct;
+ * static const AVOption child_opts[] = {
+ * { "test_flags", "This is a test option of flags type.",
+ * offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX },
+ * { NULL },
+ * };
+ * static const AVClass child_class = {
+ * .class_name = "child class",
+ * .item_name = av_default_item_name,
+ * .option = child_opts,
+ * .version = LIBAVUTIL_VERSION_INT,
+ * };
+ *
+ * void *child_next(void *obj, void *prev)
+ * {
+ * test_struct *t = obj;
+ * if (!prev && t->child_struct)
+ * return t->child_struct;
+ * return NULL
+ * }
+ * const AVClass child_class_next(const AVClass *prev)
+ * {
+ * return prev ? NULL : &child_class;
+ * }
+ * @endcode
+ * Putting child_next() and child_class_next() as defined above into
+ * test_class will now make child_struct's options accessible through
+ * test_struct (again, proper setup as described above needs to be done on
+ * child_struct right after it is created).
+ *
+ * From the above example it might not be clear why both child_next()
+ * and child_class_next() are needed. The distinction is that child_next()
+ * iterates over actually existing objects, while child_class_next()
+ * iterates over all possible child classes. E.g. if an AVCodecContext
+ * was initialized to use a codec which has private options, then its
+ * child_next() will return AVCodecContext.priv_data and finish
+ * iterating. OTOH child_class_next() on AVCodecContext.av_class will
+ * iterate over all available codecs with private options.
+ *
+ * @subsection avoptions_implement_named_constants Named constants
+ * It is possible to create named constants for options. Simply set the unit
+ * field of the option the constants should apply to a string and
+ * create the constants themselves as options of type AV_OPT_TYPE_CONST
+ * with their unit field set to the same string.
+ * Their default_val field should contain the value of the named
+ * constant.
+ * For example, to add some named constants for the test_flags option
+ * above, put the following into the child_opts array:
+ * @code
+ * { "test_flags", "This is a test option of flags type.",
+ * offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX, "test_unit" },
+ * { "flag1", "This is a flag with value 16", 0, AV_OPT_TYPE_CONST, { .i64 = 16 }, 0, 0, "test_unit" },
+ * @endcode
+ *
+ * @section avoptions_use Using AVOptions
+ * This section deals with accessing options in an AVOptions-enabled struct.
+ * Such structs in FFmpeg are e.g. AVCodecContext in libavcodec or
+ * AVFormatContext in libavformat.
+ *
+ * @subsection avoptions_use_examine Examining AVOptions
+ * The basic functions for examining options are av_opt_next(), which iterates
+ * over all options defined for one object, and av_opt_find(), which searches
+ * for an option with the given name.
+ *
+ * The situation is more complicated with nesting. An AVOptions-enabled struct
+ * may have AVOptions-enabled children. Passing the AV_OPT_SEARCH_CHILDREN flag
+ * to av_opt_find() will make the function search children recursively.
+ *
+ * For enumerating there are basically two cases. The first is when you want to
+ * get all options that may potentially exist on the struct and its children
+ * (e.g. when constructing documentation). In that case you should call
+ * av_opt_child_class_next() recursively on the parent struct's AVClass. The
+ * second case is when you have an already initialized struct with all its
+ * children and you want to get all options that can be actually written or read
+ * from it. In that case you should call av_opt_child_next() recursively (and
+ * av_opt_next() on each result).
+ *
+ * @subsection avoptions_use_get_set Reading and writing AVOptions
+ * When setting options, you often have a string read directly from the
+ * user. In such a case, simply passing it to av_opt_set() is enough. For
+ * non-string type options, av_opt_set() will parse the string according to the
+ * option type.
+ *
+ * Similarly av_opt_get() will read any option type and convert it to a string
+ * which will be returned. Do not forget that the string is allocated, so you
+ * have to free it with av_free().
+ *
+ * In some cases it may be more convenient to put all options into an
+ * AVDictionary and call av_opt_set_dict() on it. A specific case of this
+ * are the format/codec open functions in lavf/lavc which take a dictionary
+ * filled with option as a parameter. This allows to set some options
+ * that cannot be set otherwise, since e.g. the input file format is not known
+ * before the file is actually opened.
+ */
+
+enum AVOptionType{
+ AV_OPT_TYPE_FLAGS,
+ AV_OPT_TYPE_INT,
+ AV_OPT_TYPE_INT64,
+ AV_OPT_TYPE_DOUBLE,
+ AV_OPT_TYPE_FLOAT,
+ AV_OPT_TYPE_STRING,
+ AV_OPT_TYPE_RATIONAL,
+ AV_OPT_TYPE_BINARY, ///< offset must point to a pointer immediately followed by an int for the length
+ AV_OPT_TYPE_DICT,
+ AV_OPT_TYPE_CONST = 128,
+ AV_OPT_TYPE_IMAGE_SIZE = MKBETAG('S','I','Z','E'), ///< offset must point to two consecutive integers
+ AV_OPT_TYPE_PIXEL_FMT = MKBETAG('P','F','M','T'),
+ AV_OPT_TYPE_SAMPLE_FMT = MKBETAG('S','F','M','T'),
+ AV_OPT_TYPE_VIDEO_RATE = MKBETAG('V','R','A','T'), ///< offset must point to AVRational
+ AV_OPT_TYPE_DURATION = MKBETAG('D','U','R',' '),
+ AV_OPT_TYPE_COLOR = MKBETAG('C','O','L','R'),
+ AV_OPT_TYPE_CHANNEL_LAYOUT = MKBETAG('C','H','L','A'),
+#if FF_API_OLD_AVOPTIONS
+ FF_OPT_TYPE_FLAGS = 0,
+ FF_OPT_TYPE_INT,
+ FF_OPT_TYPE_INT64,
+ FF_OPT_TYPE_DOUBLE,
+ FF_OPT_TYPE_FLOAT,
+ FF_OPT_TYPE_STRING,
+ FF_OPT_TYPE_RATIONAL,
+ FF_OPT_TYPE_BINARY, ///< offset must point to a pointer immediately followed by an int for the length
+ FF_OPT_TYPE_CONST=128,
+#endif
+};
+
+/**
+ * AVOption
+ */
+typedef struct AVOption {
+ const char *name;
+
+ /**
+ * short English help text
+ * @todo What about other languages?
+ */
+ const char *help;
+
+ /**
+ * The offset relative to the context structure where the option
+ * value is stored. It should be 0 for named constants.
+ */
+ int offset;
+ enum AVOptionType type;
+
+ /**
+ * the default value for scalar options
+ */
+ union {
+ int64_t i64;
+ double dbl;
+ const char *str;
+ /* TODO those are unused now */
+ AVRational q;
+ } default_val;
+ double min; ///< minimum valid value for the option
+ double max; ///< maximum valid value for the option
+
+ int flags;
+#define AV_OPT_FLAG_ENCODING_PARAM 1 ///< a generic parameter which can be set by the user for muxing or encoding
+#define AV_OPT_FLAG_DECODING_PARAM 2 ///< a generic parameter which can be set by the user for demuxing or decoding
+#if FF_API_OPT_TYPE_METADATA
+#define AV_OPT_FLAG_METADATA 4 ///< some data extracted or inserted into the file like title, comment, ...
+#endif
+#define AV_OPT_FLAG_AUDIO_PARAM 8
+#define AV_OPT_FLAG_VIDEO_PARAM 16
+#define AV_OPT_FLAG_SUBTITLE_PARAM 32
+/**
+ * The option is inteded for exporting values to the caller.
+ */
+#define AV_OPT_FLAG_EXPORT 64
+/**
+ * The option may not be set through the AVOptions API, only read.
+ * This flag only makes sense when AV_OPT_FLAG_EXPORT is also set.
+ */
+#define AV_OPT_FLAG_READONLY 128
+#define AV_OPT_FLAG_FILTERING_PARAM (1<<16) ///< a generic parameter which can be set by the user for filtering
+//FIXME think about enc-audio, ... style flags
+
+ /**
+ * The logical unit to which the option belongs. Non-constant
+ * options and corresponding named constants share the same
+ * unit. May be NULL.
+ */
+ const char *unit;
+} AVOption;
+
+/**
+ * A single allowed range of values, or a single allowed value.
+ */
+typedef struct AVOptionRange {
+ const char *str;
+ /**
+ * Value range.
+ * For string ranges this represents the min/max length.
+ * For dimensions this represents the min/max pixel count or width/height in multi-component case.
+ */
+ double value_min, value_max;
+ /**
+ * Value's component range.
+ * For string this represents the unicode range for chars, 0-127 limits to ASCII.
+ */
+ double component_min, component_max;
+ /**
+ * Range flag.
+ * If set to 1 the struct encodes a range, if set to 0 a single value.
+ */
+ int is_range;
+} AVOptionRange;
+
+/**
+ * List of AVOptionRange structs.
+ */
+typedef struct AVOptionRanges {
+ /**
+ * Array of option ranges.
+ *
+ * Most of option types use just one component.
+ * Following describes multi-component option types:
+ *
+ * AV_OPT_TYPE_IMAGE_SIZE:
+ * component index 0: range of pixel count (width * height).
+ * component index 1: range of width.
+ * component index 2: range of height.
+ *
+ * @note To obtain multi-component version of this structure, user must
+ * provide AV_OPT_MULTI_COMPONENT_RANGE to av_opt_query_ranges or
+ * av_opt_query_ranges_default function.
+ *
+ * Multi-component range can be read as in following example:
+ *
+ * @code
+ * int range_index, component_index;
+ * AVOptionRanges *ranges;
+ * AVOptionRange *range[3]; //may require more than 3 in the future.
+ * av_opt_query_ranges(&ranges, obj, key, AV_OPT_MULTI_COMPONENT_RANGE);
+ * for (range_index = 0; range_index < ranges->nb_ranges; range_index++) {
+ * for (component_index = 0; component_index < ranges->nb_components; component_index++)
+ * range[component_index] = ranges->range[ranges->nb_ranges * component_index + range_index];
+ * //do something with range here.
+ * }
+ * av_opt_freep_ranges(&ranges);
+ * @endcode
+ */
+ AVOptionRange **range;
+ /**
+ * Number of ranges per component.
+ */
+ int nb_ranges;
+ /**
+ * Number of componentes.
+ */
+ int nb_components;
+} AVOptionRanges;
+
+
+#if FF_API_FIND_OPT
+/**
+ * Look for an option in obj. Look only for the options which
+ * have the flags set as specified in mask and flags (that is,
+ * for which it is the case that (opt->flags & mask) == flags).
+ *
+ * @param[in] obj a pointer to a struct whose first element is a
+ * pointer to an AVClass
+ * @param[in] name the name of the option to look for
+ * @param[in] unit the unit of the option to look for, or any if NULL
+ * @return a pointer to the option found, or NULL if no option
+ * has been found
+ *
+ * @deprecated use av_opt_find.
+ */
+attribute_deprecated
+const AVOption *av_find_opt(void *obj, const char *name, const char *unit, int mask, int flags);
+#endif
+
+#if FF_API_OLD_AVOPTIONS
+/**
+ * Set the field of obj with the given name to value.
+ *
+ * @param[in] obj A struct whose first element is a pointer to an
+ * AVClass.
+ * @param[in] name the name of the field to set
+ * @param[in] val The value to set. If the field is not of a string
+ * type, then the given string is parsed.
+ * SI postfixes and some named scalars are supported.
+ * If the field is of a numeric type, it has to be a numeric or named
+ * scalar. Behavior with more than one scalar and +- infix operators
+ * is undefined.
+ * If the field is of a flags type, it has to be a sequence of numeric
+ * scalars or named flags separated by '+' or '-'. Prefixing a flag
+ * with '+' causes it to be set without affecting the other flags;
+ * similarly, '-' unsets a flag.
+ * @param[out] o_out if non-NULL put here a pointer to the AVOption
+ * found
+ * @param alloc this parameter is currently ignored
+ * @return 0 if the value has been set, or an AVERROR code in case of
+ * error:
+ * AVERROR_OPTION_NOT_FOUND if no matching option exists
+ * AVERROR(ERANGE) if the value is out of range
+ * AVERROR(EINVAL) if the value is not valid
+ * @deprecated use av_opt_set()
+ */
+attribute_deprecated
+int av_set_string3(void *obj, const char *name, const char *val, int alloc, const AVOption **o_out);
+
+attribute_deprecated const AVOption *av_set_double(void *obj, const char *name, double n);
+attribute_deprecated const AVOption *av_set_q(void *obj, const char *name, AVRational n);
+attribute_deprecated const AVOption *av_set_int(void *obj, const char *name, int64_t n);
+
+double av_get_double(void *obj, const char *name, const AVOption **o_out);
+AVRational av_get_q(void *obj, const char *name, const AVOption **o_out);
+int64_t av_get_int(void *obj, const char *name, const AVOption **o_out);
+attribute_deprecated const char *av_get_string(void *obj, const char *name, const AVOption **o_out, char *buf, int buf_len);
+attribute_deprecated const AVOption *av_next_option(void *obj, const AVOption *last);
+#endif
+
+/**
+ * Show the obj options.
+ *
+ * @param req_flags requested flags for the options to show. Show only the
+ * options for which it is opt->flags & req_flags.
+ * @param rej_flags rejected flags for the options to show. Show only the
+ * options for which it is !(opt->flags & req_flags).
+ * @param av_log_obj log context to use for showing the options
+ */
+int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags);
+
+/**
+ * Set the values of all AVOption fields to their default values.
+ *
+ * @param s an AVOption-enabled struct (its first member must be a pointer to AVClass)
+ */
+void av_opt_set_defaults(void *s);
+
+#if FF_API_OLD_AVOPTIONS
+attribute_deprecated
+void av_opt_set_defaults2(void *s, int mask, int flags);
+#endif
+
+/**
+ * Parse the key/value pairs list in opts. For each key/value pair
+ * found, stores the value in the field in ctx that is named like the
+ * key. ctx must be an AVClass context, storing is done using
+ * AVOptions.
+ *
+ * @param opts options string to parse, may be NULL
+ * @param key_val_sep a 0-terminated list of characters used to
+ * separate key from value
+ * @param pairs_sep a 0-terminated list of characters used to separate
+ * two pairs from each other
+ * @return the number of successfully set key/value pairs, or a negative
+ * value corresponding to an AVERROR code in case of error:
+ * AVERROR(EINVAL) if opts cannot be parsed,
+ * the error code issued by av_set_string3() if a key/value pair
+ * cannot be set
+ */
+int av_set_options_string(void *ctx, const char *opts,
+ const char *key_val_sep, const char *pairs_sep);
+
+/**
+ * Parse the key-value pairs list in opts. For each key=value pair found,
+ * set the value of the corresponding option in ctx.
+ *
+ * @param ctx the AVClass object to set options on
+ * @param opts the options string, key-value pairs separated by a
+ * delimiter
+ * @param shorthand a NULL-terminated array of options names for shorthand
+ * notation: if the first field in opts has no key part,
+ * the key is taken from the first element of shorthand;
+ * then again for the second, etc., until either opts is
+ * finished, shorthand is finished or a named option is
+ * found; after that, all options must be named
+ * @param key_val_sep a 0-terminated list of characters used to separate
+ * key from value, for example '='
+ * @param pairs_sep a 0-terminated list of characters used to separate
+ * two pairs from each other, for example ':' or ','
+ * @return the number of successfully set key=value pairs, or a negative
+ * value corresponding to an AVERROR code in case of error:
+ * AVERROR(EINVAL) if opts cannot be parsed,
+ * the error code issued by av_set_string3() if a key/value pair
+ * cannot be set
+ *
+ * Options names must use only the following characters: a-z A-Z 0-9 - . / _
+ * Separators must use characters distinct from option names and from each
+ * other.
+ */
+int av_opt_set_from_string(void *ctx, const char *opts,
+ const char *const *shorthand,
+ const char *key_val_sep, const char *pairs_sep);
+/**
+ * Free all allocated objects in obj.
+ */
+void av_opt_free(void *obj);
+
+/**
+ * Check whether a particular flag is set in a flags field.
+ *
+ * @param field_name the name of the flag field option
+ * @param flag_name the name of the flag to check
+ * @return non-zero if the flag is set, zero if the flag isn't set,
+ * isn't of the right type, or the flags field doesn't exist.
+ */
+int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name);
+
+/**
+ * Set all the options from a given dictionary on an object.
+ *
+ * @param obj a struct whose first element is a pointer to AVClass
+ * @param options options to process. This dictionary will be freed and replaced
+ * by a new one containing all options not found in obj.
+ * Of course this new dictionary needs to be freed by caller
+ * with av_dict_free().
+ *
+ * @return 0 on success, a negative AVERROR if some option was found in obj,
+ * but could not be set.
+ *
+ * @see av_dict_copy()
+ */
+int av_opt_set_dict(void *obj, struct AVDictionary **options);
+
+
+/**
+ * Set all the options from a given dictionary on an object.
+ *
+ * @param obj a struct whose first element is a pointer to AVClass
+ * @param options options to process. This dictionary will be freed and replaced
+ * by a new one containing all options not found in obj.
+ * Of course this new dictionary needs to be freed by caller
+ * with av_dict_free().
+ * @param search_flags A combination of AV_OPT_SEARCH_*.
+ *
+ * @return 0 on success, a negative AVERROR if some option was found in obj,
+ * but could not be set.
+ *
+ * @see av_dict_copy()
+ */
+int av_opt_set_dict2(void *obj, struct AVDictionary **options, int search_flags);
+
+/**
+ * Extract a key-value pair from the beginning of a string.
+ *
+ * @param ropts pointer to the options string, will be updated to
+ * point to the rest of the string (one of the pairs_sep
+ * or the final NUL)
+ * @param key_val_sep a 0-terminated list of characters used to separate
+ * key from value, for example '='
+ * @param pairs_sep a 0-terminated list of characters used to separate
+ * two pairs from each other, for example ':' or ','
+ * @param flags flags; see the AV_OPT_FLAG_* values below
+ * @param rkey parsed key; must be freed using av_free()
+ * @param rval parsed value; must be freed using av_free()
+ *
+ * @return >=0 for success, or a negative value corresponding to an
+ * AVERROR code in case of error; in particular:
+ * AVERROR(EINVAL) if no key is present
+ *
+ */
+int av_opt_get_key_value(const char **ropts,
+ const char *key_val_sep, const char *pairs_sep,
+ unsigned flags,
+ char **rkey, char **rval);
+
+enum {
+
+ /**
+ * Accept to parse a value without a key; the key will then be returned
+ * as NULL.
+ */
+ AV_OPT_FLAG_IMPLICIT_KEY = 1,
+};
+
+/**
+ * @defgroup opt_eval_funcs Evaluating option strings
+ * @{
+ * This group of functions can be used to evaluate option strings
+ * and get numbers out of them. They do the same thing as av_opt_set(),
+ * except the result is written into the caller-supplied pointer.
+ *
+ * @param obj a struct whose first element is a pointer to AVClass.
+ * @param o an option for which the string is to be evaluated.
+ * @param val string to be evaluated.
+ * @param *_out value of the string will be written here.
+ *
+ * @return 0 on success, a negative number on failure.
+ */
+int av_opt_eval_flags (void *obj, const AVOption *o, const char *val, int *flags_out);
+int av_opt_eval_int (void *obj, const AVOption *o, const char *val, int *int_out);
+int av_opt_eval_int64 (void *obj, const AVOption *o, const char *val, int64_t *int64_out);
+int av_opt_eval_float (void *obj, const AVOption *o, const char *val, float *float_out);
+int av_opt_eval_double(void *obj, const AVOption *o, const char *val, double *double_out);
+int av_opt_eval_q (void *obj, const AVOption *o, const char *val, AVRational *q_out);
+/**
+ * @}
+ */
+
+#define AV_OPT_SEARCH_CHILDREN 0x0001 /**< Search in possible children of the
+ given object first. */
+/**
+ * The obj passed to av_opt_find() is fake -- only a double pointer to AVClass
+ * instead of a required pointer to a struct containing AVClass. This is
+ * useful for searching for options without needing to allocate the corresponding
+ * object.
+ */
+#define AV_OPT_SEARCH_FAKE_OBJ 0x0002
+
+/**
+ * Allows av_opt_query_ranges and av_opt_query_ranges_default to return more than
+ * one component for certain option types.
+ * @see AVOptionRanges for details.
+ */
+#define AV_OPT_MULTI_COMPONENT_RANGE 0x1000
+
+/**
+ * Look for an option in an object. Consider only options which
+ * have all the specified flags set.
+ *
+ * @param[in] obj A pointer to a struct whose first element is a
+ * pointer to an AVClass.
+ * Alternatively a double pointer to an AVClass, if
+ * AV_OPT_SEARCH_FAKE_OBJ search flag is set.
+ * @param[in] name The name of the option to look for.
+ * @param[in] unit When searching for named constants, name of the unit
+ * it belongs to.
+ * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG).
+ * @param search_flags A combination of AV_OPT_SEARCH_*.
+ *
+ * @return A pointer to the option found, or NULL if no option
+ * was found.
+ *
+ * @note Options found with AV_OPT_SEARCH_CHILDREN flag may not be settable
+ * directly with av_set_string3(). Use special calls which take an options
+ * AVDictionary (e.g. avformat_open_input()) to set options found with this
+ * flag.
+ */
+const AVOption *av_opt_find(void *obj, const char *name, const char *unit,
+ int opt_flags, int search_flags);
+
+/**
+ * Look for an option in an object. Consider only options which
+ * have all the specified flags set.
+ *
+ * @param[in] obj A pointer to a struct whose first element is a
+ * pointer to an AVClass.
+ * Alternatively a double pointer to an AVClass, if
+ * AV_OPT_SEARCH_FAKE_OBJ search flag is set.
+ * @param[in] name The name of the option to look for.
+ * @param[in] unit When searching for named constants, name of the unit
+ * it belongs to.
+ * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG).
+ * @param search_flags A combination of AV_OPT_SEARCH_*.
+ * @param[out] target_obj if non-NULL, an object to which the option belongs will be
+ * written here. It may be different from obj if AV_OPT_SEARCH_CHILDREN is present
+ * in search_flags. This parameter is ignored if search_flags contain
+ * AV_OPT_SEARCH_FAKE_OBJ.
+ *
+ * @return A pointer to the option found, or NULL if no option
+ * was found.
+ */
+const AVOption *av_opt_find2(void *obj, const char *name, const char *unit,
+ int opt_flags, int search_flags, void **target_obj);
+
+/**
+ * Iterate over all AVOptions belonging to obj.
+ *
+ * @param obj an AVOptions-enabled struct or a double pointer to an
+ * AVClass describing it.
+ * @param prev result of the previous call to av_opt_next() on this object
+ * or NULL
+ * @return next AVOption or NULL
+ */
+const AVOption *av_opt_next(void *obj, const AVOption *prev);
+
+/**
+ * Iterate over AVOptions-enabled children of obj.
+ *
+ * @param prev result of a previous call to this function or NULL
+ * @return next AVOptions-enabled child or NULL
+ */
+void *av_opt_child_next(void *obj, void *prev);
+
+/**
+ * Iterate over potential AVOptions-enabled children of parent.
+ *
+ * @param prev result of a previous call to this function or NULL
+ * @return AVClass corresponding to next potential child or NULL
+ */
+const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *prev);
+
+/**
+ * @defgroup opt_set_funcs Option setting functions
+ * @{
+ * Those functions set the field of obj with the given name to value.
+ *
+ * @param[in] obj A struct whose first element is a pointer to an AVClass.
+ * @param[in] name the name of the field to set
+ * @param[in] val The value to set. In case of av_opt_set() if the field is not
+ * of a string type, then the given string is parsed.
+ * SI postfixes and some named scalars are supported.
+ * If the field is of a numeric type, it has to be a numeric or named
+ * scalar. Behavior with more than one scalar and +- infix operators
+ * is undefined.
+ * If the field is of a flags type, it has to be a sequence of numeric
+ * scalars or named flags separated by '+' or '-'. Prefixing a flag
+ * with '+' causes it to be set without affecting the other flags;
+ * similarly, '-' unsets a flag.
+ * @param search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN
+ * is passed here, then the option may be set on a child of obj.
+ *
+ * @return 0 if the value has been set, or an AVERROR code in case of
+ * error:
+ * AVERROR_OPTION_NOT_FOUND if no matching option exists
+ * AVERROR(ERANGE) if the value is out of range
+ * AVERROR(EINVAL) if the value is not valid
+ */
+int av_opt_set (void *obj, const char *name, const char *val, int search_flags);
+int av_opt_set_int (void *obj, const char *name, int64_t val, int search_flags);
+int av_opt_set_double (void *obj, const char *name, double val, int search_flags);
+int av_opt_set_q (void *obj, const char *name, AVRational val, int search_flags);
+int av_opt_set_bin (void *obj, const char *name, const uint8_t *val, int size, int search_flags);
+int av_opt_set_image_size(void *obj, const char *name, int w, int h, int search_flags);
+int av_opt_set_pixel_fmt (void *obj, const char *name, enum AVPixelFormat fmt, int search_flags);
+int av_opt_set_sample_fmt(void *obj, const char *name, enum AVSampleFormat fmt, int search_flags);
+int av_opt_set_video_rate(void *obj, const char *name, AVRational val, int search_flags);
+int av_opt_set_channel_layout(void *obj, const char *name, int64_t ch_layout, int search_flags);
+/**
+ * @note Any old dictionary present is discarded and replaced with a copy of the new one. The
+ * caller still owns val is and responsible for freeing it.
+ */
+int av_opt_set_dict_val(void *obj, const char *name, const AVDictionary *val, int search_flags);
+
+/**
+ * Set a binary option to an integer list.
+ *
+ * @param obj AVClass object to set options on
+ * @param name name of the binary option
+ * @param val pointer to an integer list (must have the correct type with
+ * regard to the contents of the list)
+ * @param term list terminator (usually 0 or -1)
+ * @param flags search flags
+ */
+#define av_opt_set_int_list(obj, name, val, term, flags) \
+ (av_int_list_length(val, term) > INT_MAX / sizeof(*(val)) ? \
+ AVERROR(EINVAL) : \
+ av_opt_set_bin(obj, name, (const uint8_t *)(val), \
+ av_int_list_length(val, term) * sizeof(*(val)), flags))
+
+/**
+ * @}
+ */
+
+/**
+ * @defgroup opt_get_funcs Option getting functions
+ * @{
+ * Those functions get a value of the option with the given name from an object.
+ *
+ * @param[in] obj a struct whose first element is a pointer to an AVClass.
+ * @param[in] name name of the option to get.
+ * @param[in] search_flags flags passed to av_opt_find2. I.e. if AV_OPT_SEARCH_CHILDREN
+ * is passed here, then the option may be found in a child of obj.
+ * @param[out] out_val value of the option will be written here
+ * @return >=0 on success, a negative error code otherwise
+ */
+/**
+ * @note the returned string will be av_malloc()ed and must be av_free()ed by the caller
+ */
+int av_opt_get (void *obj, const char *name, int search_flags, uint8_t **out_val);
+int av_opt_get_int (void *obj, const char *name, int search_flags, int64_t *out_val);
+int av_opt_get_double (void *obj, const char *name, int search_flags, double *out_val);
+int av_opt_get_q (void *obj, const char *name, int search_flags, AVRational *out_val);
+int av_opt_get_image_size(void *obj, const char *name, int search_flags, int *w_out, int *h_out);
+int av_opt_get_pixel_fmt (void *obj, const char *name, int search_flags, enum AVPixelFormat *out_fmt);
+int av_opt_get_sample_fmt(void *obj, const char *name, int search_flags, enum AVSampleFormat *out_fmt);
+int av_opt_get_video_rate(void *obj, const char *name, int search_flags, AVRational *out_val);
+int av_opt_get_channel_layout(void *obj, const char *name, int search_flags, int64_t *ch_layout);
+/**
+ * @param[out] out_val The returned dictionary is a copy of the actual value and must
+ * be freed with av_dict_free() by the caller
+ */
+int av_opt_get_dict_val(void *obj, const char *name, int search_flags, AVDictionary **out_val);
+/**
+ * @}
+ */
+/**
+ * Gets a pointer to the requested field in a struct.
+ * This function allows accessing a struct even when its fields are moved or
+ * renamed since the application making the access has been compiled,
+ *
+ * @returns a pointer to the field, it can be cast to the correct type and read
+ * or written to.
+ */
+void *av_opt_ptr(const AVClass *avclass, void *obj, const char *name);
+
+/**
+ * Free an AVOptionRanges struct and set it to NULL.
+ */
+void av_opt_freep_ranges(AVOptionRanges **ranges);
+
+/**
+ * Get a list of allowed ranges for the given option.
+ *
+ * The returned list may depend on other fields in obj like for example profile.
+ *
+ * @param flags is a bitmask of flags, undefined flags should not be set and should be ignored
+ * AV_OPT_SEARCH_FAKE_OBJ indicates that the obj is a double pointer to a AVClass instead of a full instance
+ * AV_OPT_MULTI_COMPONENT_RANGE indicates that function may return more than one component, @see AVOptionRanges
+ *
+ * The result must be freed with av_opt_freep_ranges.
+ *
+ * @return number of compontents returned on success, a negative errro code otherwise
+ */
+int av_opt_query_ranges(AVOptionRanges **, void *obj, const char *key, int flags);
+
+int av_opt_copy(void *dest, void *src);
+
+/**
+ * Get a default list of allowed ranges for the given option.
+ *
+ * This list is constructed without using the AVClass.query_ranges() callback
+ * and can be used as fallback from within the callback.
+ *
+ * @param flags is a bitmask of flags, undefined flags should not be set and should be ignored
+ * AV_OPT_SEARCH_FAKE_OBJ indicates that the obj is a double pointer to a AVClass instead of a full instance
+ * AV_OPT_MULTI_COMPONENT_RANGE indicates that function may return more than one component, @see AVOptionRanges
+ *
+ * The result must be freed with av_opt_free_ranges.
+ *
+ * @return number of compontents returned on success, a negative errro code otherwise
+ */
+int av_opt_query_ranges_default(AVOptionRanges **, void *obj, const char *key, int flags);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_OPT_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/parseutils.h Added

@@ -0,0 +1,374 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_PARSEUTILS_H
+#define AVUTIL_PARSEUTILS_H
+
+#include <time.h>
+
+#include "rational.h"
+
+/**
+ * @file
+ * misc parsing utilities
+ */
+
+/**
+ * Parse str and store the parsed ratio in q.
+ *
+ * Note that a ratio with infinite (1/0) or negative value is
+ * considered valid, so you should check on the returned value if you
+ * want to exclude those values.
+ *
+ * The undefined value can be expressed using the "0:0" string.
+ *
+ * @param[in,out] q pointer to the AVRational which will contain the ratio
+ * @param[in] str the string to parse: it has to be a string in the format
+ * num:den, a float number or an expression
+ * @param[in] max the maximum allowed numerator and denominator
+ * @param[in] log_offset log level offset which is applied to the log
+ * level of log_ctx
+ * @param[in] log_ctx parent logging context
+ * @return >= 0 on success, a negative error code otherwise
+ */
+int av_parse_ratio(AVRational *q, const char *str, int max,
+ int log_offset, void *log_ctx);
+
+#define av_parse_ratio_quiet(rate, str, max) \
+ av_parse_ratio(rate, str, max, AV_LOG_MAX_OFFSET, NULL)
+
+/**
+ * Parse str and put in width_ptr and height_ptr the detected values.
+ *
+ * @param[in,out] width_ptr pointer to the variable which will contain the detected
+ * width value
+ * @param[in,out] height_ptr pointer to the variable which will contain the detected
+ * height value
+ * @param[in] str the string to parse: it has to be a string in the format
+ * width x height or a valid video size abbreviation.
+ * @return >= 0 on success, a negative error code otherwise
+ */
+int av_parse_video_size(int *width_ptr, int *height_ptr, const char *str);
+
+/**
+ * Parse str and store the detected values in *rate.
+ *
+ * @param[in,out] rate pointer to the AVRational which will contain the detected
+ * frame rate
+ * @param[in] str the string to parse: it has to be a string in the format
+ * rate_num / rate_den, a float number or a valid video rate abbreviation
+ * @return >= 0 on success, a negative error code otherwise
+ */
+int av_parse_video_rate(AVRational *rate, const char *str);
+
+/**
+ * Put the RGBA values that correspond to color_string in rgba_color.
+ *
+ * @param color_string a string specifying a color. It can be the name of
+ * a color (case insensitive match) or a [0x|#]RRGGBB[AA] sequence,
+ * possibly followed by "@" and a string representing the alpha
+ * component.
+ * The alpha component may be a string composed by "0x" followed by an
+ * hexadecimal number or a decimal number between 0.0 and 1.0, which
+ * represents the opacity value (0x00/0.0 means completely transparent,
+ * 0xff/1.0 completely opaque).
+ * If the alpha component is not specified then 0xff is assumed.
+ * The string "random" will result in a random color.
+ * @param slen length of the initial part of color_string containing the
+ * color. It can be set to -1 if color_string is a null terminated string
+ * containing nothing else than the color.
+ * @return >= 0 in case of success, a negative value in case of
+ * failure (for example if color_string cannot be parsed).
+ */
+int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen,
+ void *log_ctx);
+
+/**
+ * Get the name of a color from the internal table of hard-coded named
+ * colors.
+ *
+ * This function is meant to enumerate the color names recognized by
+ * av_parse_color().
+ *
+ * @param color_idx index of the requested color, starting from 0
+ * @param rgbp if not NULL, will point to a 3-elements array with the color value in RGB
+ * @return the color name string or NULL if color_idx is not in the array
+ */
+const char *av_get_known_color_name(int color_idx, const uint8_t **rgb);
+
+/**
+ * Parse timestr and return in *time a corresponding number of
+ * microseconds.
+ *
+ * @param timeval puts here the number of microseconds corresponding
+ * to the string in timestr. If the string represents a duration, it
+ * is the number of microseconds contained in the time interval. If
+ * the string is a date, is the number of microseconds since 1st of
+ * January, 1970 up to the time of the parsed date. If timestr cannot
+ * be successfully parsed, set *time to INT64_MIN.
+
+ * @param timestr a string representing a date or a duration.
+ * - If a date the syntax is:
+ * @code
+ * [{YYYY-MM-DD|YYYYMMDD}[T|t| ]]{{HH:MM:SS[.m...]]]}|{HHMMSS[.m...]]]}}[Z]
+ * now
+ * @endcode
+ * If the value is "now" it takes the current time.
+ * Time is local time unless Z is appended, in which case it is
+ * interpreted as UTC.
+ * If the year-month-day part is not specified it takes the current
+ * year-month-day.
+ * - If a duration the syntax is:
+ * @code
+ * [-][HH:]MM:SS[.m...]
+ * [-]S+[.m...]
+ * @endcode
+ * @param duration flag which tells how to interpret timestr, if not
+ * zero timestr is interpreted as a duration, otherwise as a date
+ * @return >= 0 in case of success, a negative value corresponding to an
+ * AVERROR code otherwise
+ */
+int av_parse_time(int64_t *timeval, const char *timestr, int duration);
+
+/**
+ * Parse the input string p according to the format string fmt and
+ * store its results in the structure dt.
+ * This implementation supports only a subset of the formats supported
+ * by the standard strptime().
+ *
+ * In particular it actually supports the parameters:
+ * - %H: the hour as a decimal number, using a 24-hour clock, in the
+ * range '00' through '23'
+ * - %J: hours as a decimal number, in the range '0' through INT_MAX
+ * - %M: the minute as a decimal number, using a 24-hour clock, in the
+ * range '00' through '59'
+ * - %S: the second as a decimal number, using a 24-hour clock, in the
+ * range '00' through '59'
+ * - %Y: the year as a decimal number, using the Gregorian calendar
+ * - %m: the month as a decimal number, in the range '1' through '12'
+ * - %d: the day of the month as a decimal number, in the range '1'
+ * through '31'
+ * - %%: a literal '%'
+ *
+ * @return a pointer to the first character not processed in this
+ * function call, or NULL in case the function fails to match all of
+ * the fmt string and therefore an error occurred
+ */
+char *av_small_strptime(const char *p, const char *fmt, struct tm *dt);
+
+/**
+ * Attempt to find a specific tag in a URL.
+ *
+ * syntax: '?tag1=val1&tag2=val2...'. Little URL decoding is done.
+ * Return 1 if found.
+ */
+int av_find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
+
+/**
+ * Convert the decomposed UTC time in tm to a time_t value.
+ */
+time_t av_timegm(struct tm *tm);
+
+#endif /* AVUTIL_PARSEUTILS_H */
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_PARSEUTILS_H
+#define AVUTIL_PARSEUTILS_H
+
+#include <time.h>
+
+#include "rational.h"
+
+/**
+ * @file
+ * misc parsing utilities
+ */
+
+/**
+ * Parse str and store the parsed ratio in q.
+ *
+ * Note that a ratio with infinite (1/0) or negative value is
+ * considered valid, so you should check on the returned value if you
+ * want to exclude those values.
+ *
+ * The undefined value can be expressed using the "0:0" string.
+ *
+ * @param[in,out] q pointer to the AVRational which will contain the ratio
+ * @param[in] str the string to parse: it has to be a string in the format
+ * num:den, a float number or an expression
+ * @param[in] max the maximum allowed numerator and denominator
+ * @param[in] log_offset log level offset which is applied to the log
+ * level of log_ctx
+ * @param[in] log_ctx parent logging context
+ * @return >= 0 on success, a negative error code otherwise
+ */
+int av_parse_ratio(AVRational *q, const char *str, int max,
+ int log_offset, void *log_ctx);
+
+#define av_parse_ratio_quiet(rate, str, max) \
+ av_parse_ratio(rate, str, max, AV_LOG_MAX_OFFSET, NULL)
+
+/**
+ * Parse str and put in width_ptr and height_ptr the detected values.
+ *
+ * @param[in,out] width_ptr pointer to the variable which will contain the detected
+ * width value
+ * @param[in,out] height_ptr pointer to the variable which will contain the detected
+ * height value
+ * @param[in] str the string to parse: it has to be a string in the format
+ * width x height or a valid video size abbreviation.
+ * @return >= 0 on success, a negative error code otherwise
+ */
+int av_parse_video_size(int *width_ptr, int *height_ptr, const char *str);
+
+/**
+ * Parse str and store the detected values in *rate.
+ *
+ * @param[in,out] rate pointer to the AVRational which will contain the detected
+ * frame rate
+ * @param[in] str the string to parse: it has to be a string in the format
+ * rate_num / rate_den, a float number or a valid video rate abbreviation
+ * @return >= 0 on success, a negative error code otherwise
+ */
+int av_parse_video_rate(AVRational *rate, const char *str);
+
+/**
+ * Put the RGBA values that correspond to color_string in rgba_color.
+ *
+ * @param color_string a string specifying a color. It can be the name of
+ * a color (case insensitive match) or a [0x|#]RRGGBB[AA] sequence,
+ * possibly followed by "@" and a string representing the alpha
+ * component.
+ * The alpha component may be a string composed by "0x" followed by an
+ * hexadecimal number or a decimal number between 0.0 and 1.0, which
+ * represents the opacity value (0x00/0.0 means completely transparent,
+ * 0xff/1.0 completely opaque).
+ * If the alpha component is not specified then 0xff is assumed.
+ * The string "random" will result in a random color.
+ * @param slen length of the initial part of color_string containing the
+ * color. It can be set to -1 if color_string is a null terminated string
+ * containing nothing else than the color.
+ * @return >= 0 in case of success, a negative value in case of
+ * failure (for example if color_string cannot be parsed).
+ */
+int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen,
+ void *log_ctx);
+
+/**
+ * Get the name of a color from the internal table of hard-coded named
+ * colors.
+ *
+ * This function is meant to enumerate the color names recognized by
+ * av_parse_color().
+ *
+ * @param color_idx index of the requested color, starting from 0
+ * @param rgbp if not NULL, will point to a 3-elements array with the color value in RGB
+ * @return the color name string or NULL if color_idx is not in the array
+ */
+const char *av_get_known_color_name(int color_idx, const uint8_t **rgb);
+
+/**
+ * Parse timestr and return in *time a corresponding number of
+ * microseconds.
+ *
+ * @param timeval puts here the number of microseconds corresponding
+ * to the string in timestr. If the string represents a duration, it
+ * is the number of microseconds contained in the time interval. If
+ * the string is a date, is the number of microseconds since 1st of
+ * January, 1970 up to the time of the parsed date. If timestr cannot
+ * be successfully parsed, set *time to INT64_MIN.
+
+ * @param timestr a string representing a date or a duration.
+ * - If a date the syntax is:
+ * @code
+ * [{YYYY-MM-DD|YYYYMMDD}[T|t| ]]{{HH:MM:SS[.m...]]]}|{HHMMSS[.m...]]]}}[Z]
+ * now
+ * @endcode
+ * If the value is "now" it takes the current time.
+ * Time is local time unless Z is appended, in which case it is
+ * interpreted as UTC.
+ * If the year-month-day part is not specified it takes the current
+ * year-month-day.
+ * - If a duration the syntax is:
+ * @code
+ * [-][HH:]MM:SS[.m...]
+ * [-]S+[.m...]
+ * @endcode
+ * @param duration flag which tells how to interpret timestr, if not
+ * zero timestr is interpreted as a duration, otherwise as a date
+ * @return >= 0 in case of success, a negative value corresponding to an
+ * AVERROR code otherwise
+ */
+int av_parse_time(int64_t *timeval, const char *timestr, int duration);
+
+/**
+ * Parse the input string p according to the format string fmt and
+ * store its results in the structure dt.
+ * This implementation supports only a subset of the formats supported
+ * by the standard strptime().
+ *
+ * In particular it actually supports the parameters:
+ * - %H: the hour as a decimal number, using a 24-hour clock, in the
+ * range '00' through '23'
+ * - %J: hours as a decimal number, in the range '0' through INT_MAX
+ * - %M: the minute as a decimal number, using a 24-hour clock, in the
+ * range '00' through '59'
+ * - %S: the second as a decimal number, using a 24-hour clock, in the
+ * range '00' through '59'
+ * - %Y: the year as a decimal number, using the Gregorian calendar
+ * - %m: the month as a decimal number, in the range '1' through '12'
+ * - %d: the day of the month as a decimal number, in the range '1'
+ * through '31'
+ * - %%: a literal '%'
+ *
+ * @return a pointer to the first character not processed in this
+ * function call, or NULL in case the function fails to match all of
+ * the fmt string and therefore an error occurred
+ */
+char *av_small_strptime(const char *p, const char *fmt, struct tm *dt);
+
+/**
+ * Attempt to find a specific tag in a URL.
+ *
+ * syntax: '?tag1=val1&tag2=val2...'. Little URL decoding is done.
+ * Return 1 if found.
+ */
+int av_find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
+
+/**
+ * Convert the decomposed UTC time in tm to a time_t value.
+ */
+time_t av_timegm(struct tm *tm);
+
+#endif /* AVUTIL_PARSEUTILS_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/pixdesc.h Added

@@ -0,0 +1,718 @@
+/*
+ * pixel format descriptor
+ * Copyright (c) 2009 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_PIXDESC_H
+#define AVUTIL_PIXDESC_H
+
+#include <inttypes.h>
+
+#include "attributes.h"
+#include "pixfmt.h"
+
+typedef struct AVComponentDescriptor {
+ /**
+ * Which of the 4 planes contains the component.
+ */
+ uint16_t plane : 2;
+
+ /**
+ * Number of elements between 2 horizontally consecutive pixels minus 1.
+ * Elements are bits for bitstream formats, bytes otherwise.
+ */
+ uint16_t step_minus1 : 3;
+
+ /**
+ * Number of elements before the component of the first pixel plus 1.
+ * Elements are bits for bitstream formats, bytes otherwise.
+ */
+ uint16_t offset_plus1 : 3;
+
+ /**
+ * Number of least significant bits that must be shifted away
+ * to get the value.
+ */
+ uint16_t shift : 3;
+
+ /**
+ * Number of bits in the component minus 1.
+ */
+ uint16_t depth_minus1 : 4;
+} AVComponentDescriptor;
+
+/**
+ * Descriptor that unambiguously describes how the bits of a pixel are
+ * stored in the up to 4 data planes of an image. It also stores the
+ * subsampling factors and number of components.
+ *
+ * @note This is separate of the colorspace (RGB, YCbCr, YPbPr, JPEG-style YUV
+ * and all the YUV variants) AVPixFmtDescriptor just stores how values
+ * are stored not what these values represent.
+ */
+typedef struct AVPixFmtDescriptor {
+ const char *name;
+ uint8_t nb_components; ///< The number of components each pixel has, (1-4)
+
+ /**
+ * Amount to shift the luma width right to find the chroma width.
+ * For YV12 this is 1 for example.
+ * chroma_width = -((-luma_width) >> log2_chroma_w)
+ * The note above is needed to ensure rounding up.
+ * This value only refers to the chroma components.
+ */
+ uint8_t log2_chroma_w; ///< chroma_width = -((-luma_width )>>log2_chroma_w)
+
+ /**
+ * Amount to shift the luma height right to find the chroma height.
+ * For YV12 this is 1 for example.
+ * chroma_height= -((-luma_height) >> log2_chroma_h)
+ * The note above is needed to ensure rounding up.
+ * This value only refers to the chroma components.
+ */
+ uint8_t log2_chroma_h;
+ uint8_t flags;
+
+ /**
+ * Parameters that describe how pixels are packed.
+ * If the format has 2 or 4 components, then alpha is last.
+ * If the format has 1 or 2 components, then luma is 0.
+ * If the format has 3 or 4 components,
+ * if the RGB flag is set then 0 is red, 1 is green and 2 is blue;
+ * otherwise 0 is luma, 1 is chroma-U and 2 is chroma-V.
+ */
+ AVComponentDescriptor comp[4];
+
+ /**
+ * Alternative comma-separated names.
+ */
+ const char *alias;
+} AVPixFmtDescriptor;
+
+/**
+ * Pixel format is big-endian.
+ */
+#define AV_PIX_FMT_FLAG_BE (1 << 0)
+/**
+ * Pixel format has a palette in data[1], values are indexes in this palette.
+ */
+#define AV_PIX_FMT_FLAG_PAL (1 << 1)
+/**
+ * All values of a component are bit-wise packed end to end.
+ */
+#define AV_PIX_FMT_FLAG_BITSTREAM (1 << 2)
+/**
+ * Pixel format is an HW accelerated format.
+ */
+#define AV_PIX_FMT_FLAG_HWACCEL (1 << 3)
+/**
+ * At least one pixel component is not in the first data plane.
+ */
+#define AV_PIX_FMT_FLAG_PLANAR (1 << 4)
+/**
+ * The pixel format contains RGB-like data (as opposed to YUV/grayscale).
+ */
+#define AV_PIX_FMT_FLAG_RGB (1 << 5)
+/**
+ * The pixel format is "pseudo-paletted". This means that FFmpeg treats it as
+ * paletted internally, but the palette is generated by the decoder and is not
+ * stored in the file.
+ */
+#define AV_PIX_FMT_FLAG_PSEUDOPAL (1 << 6)
+/**
+ * The pixel format has an alpha channel.
+ */
+#define AV_PIX_FMT_FLAG_ALPHA (1 << 7)
+
+#if FF_API_PIX_FMT
+/**
+ * @deprecated use the AV_PIX_FMT_FLAG_* flags
+ */
+#define PIX_FMT_BE AV_PIX_FMT_FLAG_BE
+#define PIX_FMT_PAL AV_PIX_FMT_FLAG_PAL
+#define PIX_FMT_BITSTREAM AV_PIX_FMT_FLAG_BITSTREAM
+#define PIX_FMT_HWACCEL AV_PIX_FMT_FLAG_HWACCEL
+#define PIX_FMT_PLANAR AV_PIX_FMT_FLAG_PLANAR
+#define PIX_FMT_RGB AV_PIX_FMT_FLAG_RGB
+#define PIX_FMT_PSEUDOPAL AV_PIX_FMT_FLAG_PSEUDOPAL
+#define PIX_FMT_ALPHA AV_PIX_FMT_FLAG_ALPHA
+#endif
+
+#if FF_API_PIX_FMT_DESC
+/**
+ * The array of all the pixel format descriptors.
+ */
+extern attribute_deprecated const AVPixFmtDescriptor av_pix_fmt_descriptors[];
+#endif
+
+/**
+ * Read a line from an image, and write the values of the
+ * pixel format component c to dst.
+ *
+ * @param data the array containing the pointers to the planes of the image
+ * @param linesize the array containing the linesizes of the image
+ * @param desc the pixel format descriptor for the image
+ * @param x the horizontal coordinate of the first pixel to read
+ * @param y the vertical coordinate of the first pixel to read
+ * @param w the width of the line to read, that is the number of
+ * values to write to dst
+ * @param read_pal_component if not zero and the format is a paletted
+ * format writes the values corresponding to the palette
+ * component c in data[1] to dst, rather than the palette indexes in
+ * data[0]. The behavior is undefined if the format is not paletted.
+ */
+void av_read_image_line(uint16_t *dst, const uint8_t *data[4],
+ const int linesize[4], const AVPixFmtDescriptor *desc,
+ int x, int y, int c, int w, int read_pal_component);
+
+/**
+ * Write the values from src to the pixel format component c of an
+ * image line.
+ *
+ * @param src array containing the values to write
+ * @param data the array containing the pointers to the planes of the
+ * image to write into. It is supposed to be zeroed.
+ * @param linesize the array containing the linesizes of the image
+ * @param desc the pixel format descriptor for the image
+ * @param x the horizontal coordinate of the first pixel to write
+ * @param y the vertical coordinate of the first pixel to write
+ * @param w the width of the line to write, that is the number of
+ * values to write to the image line
+ */
+void av_write_image_line(const uint16_t *src, uint8_t *data[4],
+ const int linesize[4], const AVPixFmtDescriptor *desc,
+ int x, int y, int c, int w);
+
+/**
+ * Return the pixel format corresponding to name.
+ *
+ * If there is no pixel format with name name, then looks for a
+ * pixel format with the name corresponding to the native endian
+ * format of name.
+ * For example in a little-endian system, first looks for "gray16",
+ * then for "gray16le".
+ *
+ * Finally if no pixel format has been found, returns AV_PIX_FMT_NONE.
+ */
+enum AVPixelFormat av_get_pix_fmt(const char *name);
+
+/**
+ * Return the short name for a pixel format, NULL in case pix_fmt is
+ * unknown.
+ *
+ * @see av_get_pix_fmt(), av_get_pix_fmt_string()
+ */
+const char *av_get_pix_fmt_name(enum AVPixelFormat pix_fmt);
+
+/**
+ * Print in buf the string corresponding to the pixel format with
+ * number pix_fmt, or a header if pix_fmt is negative.
+ *
+ * @param buf the buffer where to write the string
+ * @param buf_size the size of buf
+ * @param pix_fmt the number of the pixel format to print the
+ * corresponding info string, or a negative value to print the
+ * corresponding header.
+ */
+char *av_get_pix_fmt_string(char *buf, int buf_size,
+ enum AVPixelFormat pix_fmt);
+
+/**
+ * Return the number of bits per pixel used by the pixel format
+ * described by pixdesc. Note that this is not the same as the number
+ * of bits per sample.
+ *
+ * The returned number of bits refers to the number of bits actually
+ * used for storing the pixel information, that is padding bits are
+ * not counted.
+ */
+int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
+
+/**
+ * Return the number of bits per pixel for the pixel format
+ * described by pixdesc, including any padding or unused bits.
+ */
+int av_get_padded_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
+
+/**
+ * @return a pixel format descriptor for provided pixel format or NULL if
+ * this pixel format is unknown.
+ */
+const AVPixFmtDescriptor *av_pix_fmt_desc_get(enum AVPixelFormat pix_fmt);
+
+/**
+ * Iterate over all pixel format descriptors known to libavutil.
+ *
+ * @param prev previous descriptor. NULL to get the first descriptor.
+ *
+ * @return next descriptor or NULL after the last descriptor
+ */
+const AVPixFmtDescriptor *av_pix_fmt_desc_next(const AVPixFmtDescriptor *prev);
+
+/**
+ * @return an AVPixelFormat id described by desc, or AV_PIX_FMT_NONE if desc
+ * is not a valid pointer to a pixel format descriptor.
+ */
+enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc);
+
+/**
+ * Utility function to access log2_chroma_w log2_chroma_h from
+ * the pixel format AVPixFmtDescriptor.
+ *
+ * See av_get_chroma_sub_sample() for a function that asserts a
+ * valid pixel format instead of returning an error code.
+ * Its recommended that you use avcodec_get_chroma_sub_sample unless
+ * you do check the return code!
+ *
+ * @param[in] pix_fmt the pixel format
+ * @param[out] h_shift store log2_chroma_w
+ * @param[out] v_shift store log2_chroma_h
+ *
+ * @return 0 on success, AVERROR(ENOSYS) on invalid or unknown pixel format
+ */
+int av_pix_fmt_get_chroma_sub_sample(enum AVPixelFormat pix_fmt,
+ int *h_shift, int *v_shift);
+
+/**
+ * @return number of planes in pix_fmt, a negative AVERROR if pix_fmt is not a
+ * valid pixel format.
+ */
+int av_pix_fmt_count_planes(enum AVPixelFormat pix_fmt);
+
+void ff_check_pixfmt_descriptors(void);
+
+/**
+ * Utility function to swap the endianness of a pixel format.
+ *
+ * @param[in] pix_fmt the pixel format
+ *
+ * @return pixel format with swapped endianness if it exists,
+ * otherwise AV_PIX_FMT_NONE
+ */
+enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt);
+
+#define FF_LOSS_RESOLUTION 0x0001 /**< loss due to resolution change */
+#define FF_LOSS_DEPTH 0x0002 /**< loss due to color depth change */
+#define FF_LOSS_COLORSPACE 0x0004 /**< loss due to color space conversion */
+#define FF_LOSS_ALPHA 0x0008 /**< loss of alpha bits */
+#define FF_LOSS_COLORQUANT 0x0010 /**< loss due to color quantization */
+#define FF_LOSS_CHROMA 0x0020 /**< loss of chroma (e.g. RGB to gray conversion) */
+
+/**
+ * Compute what kind of losses will occur when converting from one specific
+ * pixel format to another.
+ * When converting from one pixel format to another, information loss may occur.
+ * For example, when converting from RGB24 to GRAY, the color information will
+ * be lost. Similarly, other losses occur when converting from some formats to
+ * other formats. These losses can involve loss of chroma, but also loss of
+ * resolution, loss of color depth, loss due to the color space conversion, loss
+ * of the alpha bits or loss due to color quantization.
+ * av_get_fix_fmt_loss() informs you about the various types of losses
+ * which will occur when converting from one pixel format to another.
+ *
+ * @param[in] dst_pix_fmt destination pixel format
+ * @param[in] src_pix_fmt source pixel format
+ * @param[in] has_alpha Whether the source pixel format alpha channel is used.
+ * @return Combination of flags informing you what kind of losses will occur
+ * (maximum loss for an invalid dst_pix_fmt).
+ */
+int av_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt,
+ enum AVPixelFormat src_pix_fmt,
+ int has_alpha);
+
+/**
+ * Compute what kind of losses will occur when converting from one specific
+ * pixel format to another.
+ * When converting from one pixel format to another, information loss may occur.
+ * For example, when converting from RGB24 to GRAY, the color information will
+ * be lost. Similarly, other losses occur when converting from some formats to
+ * other formats. These losses can involve loss of chroma, but also loss of
+ * resolution, loss of color depth, loss due to the color space conversion, loss
+ * of the alpha bits or loss due to color quantization.
+ * av_get_fix_fmt_loss() informs you about the various types of losses
+ * which will occur when converting from one pixel format to another.
+ *
+ * @param[in] dst_pix_fmt destination pixel format
+ * @param[in] src_pix_fmt source pixel format
+ * @param[in] has_alpha Whether the source pixel format alpha channel is used.
+ * @return Combination of flags informing you what kind of losses will occur
+ * (maximum loss for an invalid dst_pix_fmt).
+ */
+enum AVPixelFormat av_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2,
+ enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr);
+#endif /* AVUTIL_PIXDESC_H */
+/*
+ * pixel format descriptor
+ * Copyright (c) 2009 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_PIXDESC_H
+#define AVUTIL_PIXDESC_H
+
+#include <inttypes.h>
+
+#include "attributes.h"
+#include "pixfmt.h"
+
+typedef struct AVComponentDescriptor {
+ /**
+ * Which of the 4 planes contains the component.
+ */
+ uint16_t plane : 2;
+
+ /**
+ * Number of elements between 2 horizontally consecutive pixels minus 1.
+ * Elements are bits for bitstream formats, bytes otherwise.
+ */
+ uint16_t step_minus1 : 3;
+
+ /**
+ * Number of elements before the component of the first pixel plus 1.
+ * Elements are bits for bitstream formats, bytes otherwise.
+ */
+ uint16_t offset_plus1 : 3;
+
+ /**
+ * Number of least significant bits that must be shifted away
+ * to get the value.
+ */
+ uint16_t shift : 3;
+
+ /**
+ * Number of bits in the component minus 1.
+ */
+ uint16_t depth_minus1 : 4;
+} AVComponentDescriptor;
+
+/**
+ * Descriptor that unambiguously describes how the bits of a pixel are
+ * stored in the up to 4 data planes of an image. It also stores the
+ * subsampling factors and number of components.
+ *
+ * @note This is separate of the colorspace (RGB, YCbCr, YPbPr, JPEG-style YUV
+ * and all the YUV variants) AVPixFmtDescriptor just stores how values
+ * are stored not what these values represent.
+ */
+typedef struct AVPixFmtDescriptor {
+ const char *name;
+ uint8_t nb_components; ///< The number of components each pixel has, (1-4)
+
+ /**
+ * Amount to shift the luma width right to find the chroma width.
+ * For YV12 this is 1 for example.
+ * chroma_width = -((-luma_width) >> log2_chroma_w)
+ * The note above is needed to ensure rounding up.
+ * This value only refers to the chroma components.
+ */
+ uint8_t log2_chroma_w; ///< chroma_width = -((-luma_width )>>log2_chroma_w)
+
+ /**
+ * Amount to shift the luma height right to find the chroma height.
+ * For YV12 this is 1 for example.
+ * chroma_height= -((-luma_height) >> log2_chroma_h)
+ * The note above is needed to ensure rounding up.
+ * This value only refers to the chroma components.
+ */
+ uint8_t log2_chroma_h;
+ uint8_t flags;
+
+ /**
+ * Parameters that describe how pixels are packed.
+ * If the format has 2 or 4 components, then alpha is last.
+ * If the format has 1 or 2 components, then luma is 0.
+ * If the format has 3 or 4 components,
+ * if the RGB flag is set then 0 is red, 1 is green and 2 is blue;
+ * otherwise 0 is luma, 1 is chroma-U and 2 is chroma-V.
+ */
+ AVComponentDescriptor comp[4];
+
+ /**
+ * Alternative comma-separated names.
+ */
+ const char *alias;
+} AVPixFmtDescriptor;
+
+/**
+ * Pixel format is big-endian.
+ */
+#define AV_PIX_FMT_FLAG_BE (1 << 0)
+/**
+ * Pixel format has a palette in data[1], values are indexes in this palette.
+ */
+#define AV_PIX_FMT_FLAG_PAL (1 << 1)
+/**
+ * All values of a component are bit-wise packed end to end.
+ */
+#define AV_PIX_FMT_FLAG_BITSTREAM (1 << 2)
+/**
+ * Pixel format is an HW accelerated format.
+ */
+#define AV_PIX_FMT_FLAG_HWACCEL (1 << 3)
+/**
+ * At least one pixel component is not in the first data plane.
+ */
+#define AV_PIX_FMT_FLAG_PLANAR (1 << 4)
+/**
+ * The pixel format contains RGB-like data (as opposed to YUV/grayscale).
+ */
+#define AV_PIX_FMT_FLAG_RGB (1 << 5)
+/**
+ * The pixel format is "pseudo-paletted". This means that FFmpeg treats it as
+ * paletted internally, but the palette is generated by the decoder and is not
+ * stored in the file.
+ */
+#define AV_PIX_FMT_FLAG_PSEUDOPAL (1 << 6)
+/**
+ * The pixel format has an alpha channel.
+ */
+#define AV_PIX_FMT_FLAG_ALPHA (1 << 7)
+
+#if FF_API_PIX_FMT
+/**
+ * @deprecated use the AV_PIX_FMT_FLAG_* flags
+ */
+#define PIX_FMT_BE AV_PIX_FMT_FLAG_BE
+#define PIX_FMT_PAL AV_PIX_FMT_FLAG_PAL
+#define PIX_FMT_BITSTREAM AV_PIX_FMT_FLAG_BITSTREAM
+#define PIX_FMT_HWACCEL AV_PIX_FMT_FLAG_HWACCEL
+#define PIX_FMT_PLANAR AV_PIX_FMT_FLAG_PLANAR
+#define PIX_FMT_RGB AV_PIX_FMT_FLAG_RGB
+#define PIX_FMT_PSEUDOPAL AV_PIX_FMT_FLAG_PSEUDOPAL
+#define PIX_FMT_ALPHA AV_PIX_FMT_FLAG_ALPHA
+#endif
+
+#if FF_API_PIX_FMT_DESC
+/**
+ * The array of all the pixel format descriptors.
+ */
+extern attribute_deprecated const AVPixFmtDescriptor av_pix_fmt_descriptors[];
+#endif
+
+/**
+ * Read a line from an image, and write the values of the
+ * pixel format component c to dst.
+ *
+ * @param data the array containing the pointers to the planes of the image
+ * @param linesize the array containing the linesizes of the image
+ * @param desc the pixel format descriptor for the image
+ * @param x the horizontal coordinate of the first pixel to read
+ * @param y the vertical coordinate of the first pixel to read
+ * @param w the width of the line to read, that is the number of
+ * values to write to dst
+ * @param read_pal_component if not zero and the format is a paletted
+ * format writes the values corresponding to the palette
+ * component c in data[1] to dst, rather than the palette indexes in
+ * data[0]. The behavior is undefined if the format is not paletted.
+ */
+void av_read_image_line(uint16_t *dst, const uint8_t *data[4],
+ const int linesize[4], const AVPixFmtDescriptor *desc,
+ int x, int y, int c, int w, int read_pal_component);
+
+/**
+ * Write the values from src to the pixel format component c of an
+ * image line.
+ *
+ * @param src array containing the values to write
+ * @param data the array containing the pointers to the planes of the
+ * image to write into. It is supposed to be zeroed.
+ * @param linesize the array containing the linesizes of the image
+ * @param desc the pixel format descriptor for the image
+ * @param x the horizontal coordinate of the first pixel to write
+ * @param y the vertical coordinate of the first pixel to write
+ * @param w the width of the line to write, that is the number of
+ * values to write to the image line
+ */
+void av_write_image_line(const uint16_t *src, uint8_t *data[4],
+ const int linesize[4], const AVPixFmtDescriptor *desc,
+ int x, int y, int c, int w);
+
+/**
+ * Return the pixel format corresponding to name.
+ *
+ * If there is no pixel format with name name, then looks for a
+ * pixel format with the name corresponding to the native endian
+ * format of name.
+ * For example in a little-endian system, first looks for "gray16",
+ * then for "gray16le".
+ *
+ * Finally if no pixel format has been found, returns AV_PIX_FMT_NONE.
+ */
+enum AVPixelFormat av_get_pix_fmt(const char *name);
+
+/**
+ * Return the short name for a pixel format, NULL in case pix_fmt is
+ * unknown.
+ *
+ * @see av_get_pix_fmt(), av_get_pix_fmt_string()
+ */
+const char *av_get_pix_fmt_name(enum AVPixelFormat pix_fmt);
+
+/**
+ * Print in buf the string corresponding to the pixel format with
+ * number pix_fmt, or a header if pix_fmt is negative.
+ *
+ * @param buf the buffer where to write the string
+ * @param buf_size the size of buf
+ * @param pix_fmt the number of the pixel format to print the
+ * corresponding info string, or a negative value to print the
+ * corresponding header.
+ */
+char *av_get_pix_fmt_string(char *buf, int buf_size,
+ enum AVPixelFormat pix_fmt);
+
+/**
+ * Return the number of bits per pixel used by the pixel format
+ * described by pixdesc. Note that this is not the same as the number
+ * of bits per sample.
+ *
+ * The returned number of bits refers to the number of bits actually
+ * used for storing the pixel information, that is padding bits are
+ * not counted.
+ */
+int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
+
+/**
+ * Return the number of bits per pixel for the pixel format
+ * described by pixdesc, including any padding or unused bits.
+ */
+int av_get_padded_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
+
+/**
+ * @return a pixel format descriptor for provided pixel format or NULL if
+ * this pixel format is unknown.
+ */
+const AVPixFmtDescriptor *av_pix_fmt_desc_get(enum AVPixelFormat pix_fmt);
+
+/**
+ * Iterate over all pixel format descriptors known to libavutil.
+ *
+ * @param prev previous descriptor. NULL to get the first descriptor.
+ *
+ * @return next descriptor or NULL after the last descriptor
+ */
+const AVPixFmtDescriptor *av_pix_fmt_desc_next(const AVPixFmtDescriptor *prev);
+
+/**
+ * @return an AVPixelFormat id described by desc, or AV_PIX_FMT_NONE if desc
+ * is not a valid pointer to a pixel format descriptor.
+ */
+enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc);
+
+/**
+ * Utility function to access log2_chroma_w log2_chroma_h from
+ * the pixel format AVPixFmtDescriptor.
+ *
+ * See av_get_chroma_sub_sample() for a function that asserts a
+ * valid pixel format instead of returning an error code.
+ * Its recommended that you use avcodec_get_chroma_sub_sample unless
+ * you do check the return code!
+ *
+ * @param[in] pix_fmt the pixel format
+ * @param[out] h_shift store log2_chroma_w
+ * @param[out] v_shift store log2_chroma_h
+ *
+ * @return 0 on success, AVERROR(ENOSYS) on invalid or unknown pixel format
+ */
+int av_pix_fmt_get_chroma_sub_sample(enum AVPixelFormat pix_fmt,
+ int *h_shift, int *v_shift);
+
+/**
+ * @return number of planes in pix_fmt, a negative AVERROR if pix_fmt is not a
+ * valid pixel format.
+ */
+int av_pix_fmt_count_planes(enum AVPixelFormat pix_fmt);
+
+void ff_check_pixfmt_descriptors(void);
+
+/**
+ * Utility function to swap the endianness of a pixel format.
+ *
+ * @param[in] pix_fmt the pixel format
+ *
+ * @return pixel format with swapped endianness if it exists,
+ * otherwise AV_PIX_FMT_NONE
+ */
+enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt);
+
+#define FF_LOSS_RESOLUTION 0x0001 /**< loss due to resolution change */
+#define FF_LOSS_DEPTH 0x0002 /**< loss due to color depth change */
+#define FF_LOSS_COLORSPACE 0x0004 /**< loss due to color space conversion */
+#define FF_LOSS_ALPHA 0x0008 /**< loss of alpha bits */
+#define FF_LOSS_COLORQUANT 0x0010 /**< loss due to color quantization */
+#define FF_LOSS_CHROMA 0x0020 /**< loss of chroma (e.g. RGB to gray conversion) */
+
+/**
+ * Compute what kind of losses will occur when converting from one specific
+ * pixel format to another.
+ * When converting from one pixel format to another, information loss may occur.
+ * For example, when converting from RGB24 to GRAY, the color information will
+ * be lost. Similarly, other losses occur when converting from some formats to
+ * other formats. These losses can involve loss of chroma, but also loss of
+ * resolution, loss of color depth, loss due to the color space conversion, loss
+ * of the alpha bits or loss due to color quantization.
+ * av_get_fix_fmt_loss() informs you about the various types of losses
+ * which will occur when converting from one pixel format to another.
+ *
+ * @param[in] dst_pix_fmt destination pixel format
+ * @param[in] src_pix_fmt source pixel format
+ * @param[in] has_alpha Whether the source pixel format alpha channel is used.
+ * @return Combination of flags informing you what kind of losses will occur
+ * (maximum loss for an invalid dst_pix_fmt).
+ */
+int av_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt,
+ enum AVPixelFormat src_pix_fmt,
+ int has_alpha);
+
+/**
+ * Compute what kind of losses will occur when converting from one specific
+ * pixel format to another.
+ * When converting from one pixel format to another, information loss may occur.
+ * For example, when converting from RGB24 to GRAY, the color information will
+ * be lost. Similarly, other losses occur when converting from some formats to
+ * other formats. These losses can involve loss of chroma, but also loss of
+ * resolution, loss of color depth, loss due to the color space conversion, loss
+ * of the alpha bits or loss due to color quantization.
+ * av_get_fix_fmt_loss() informs you about the various types of losses
+ * which will occur when converting from one pixel format to another.
+ *
+ * @param[in] dst_pix_fmt destination pixel format
+ * @param[in] src_pix_fmt source pixel format
+ * @param[in] has_alpha Whether the source pixel format alpha channel is used.
+ * @return Combination of flags informing you what kind of losses will occur
+ * (maximum loss for an invalid dst_pix_fmt).
+ */
+enum AVPixelFormat av_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2,
+ enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr);
+#endif /* AVUTIL_PIXDESC_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/pixelutils.h Added

@@ -0,0 +1,104 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_PIXELUTILS_H
+#define AVUTIL_PIXELUTILS_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include "common.h"
+
+/**
+ * Sum of abs(src1[x] - src2[x])
+ */
+typedef int (*av_pixelutils_sad_fn)(const uint8_t *src1, ptrdiff_t stride1,
+ const uint8_t *src2, ptrdiff_t stride2);
+
+/**
+ * Get a potentially optimized pointer to a Sum-of-absolute-differences
+ * function (see the av_pixelutils_sad_fn prototype).
+ *
+ * @param w_bits 1<<w_bits is the requested width of the block size
+ * @param h_bits 1<<h_bits is the requested height of the block size
+ * @param aligned If set to 2, the returned sad function will assume src1 and
+ * src2 addresses are aligned on the block size.
+ * If set to 1, the returned sad function will assume src1 is
+ * aligned on the block size.
+ * If set to 0, the returned sad function assume no particular
+ * alignment.
+ * @param log_ctx context used for logging, can be NULL
+ *
+ * @return a pointer to the SAD function or NULL in case of error (because of
+ * invalid parameters)
+ */
+av_pixelutils_sad_fn av_pixelutils_get_sad_fn(int w_bits, int h_bits,
+ int aligned, void *log_ctx);
+
+#endif /* AVUTIL_PIXELUTILS_H */
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_PIXELUTILS_H
+#define AVUTIL_PIXELUTILS_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include "common.h"
+
+/**
+ * Sum of abs(src1[x] - src2[x])
+ */
+typedef int (*av_pixelutils_sad_fn)(const uint8_t *src1, ptrdiff_t stride1,
+ const uint8_t *src2, ptrdiff_t stride2);
+
+/**
+ * Get a potentially optimized pointer to a Sum-of-absolute-differences
+ * function (see the av_pixelutils_sad_fn prototype).
+ *
+ * @param w_bits 1<<w_bits is the requested width of the block size
+ * @param h_bits 1<<h_bits is the requested height of the block size
+ * @param aligned If set to 2, the returned sad function will assume src1 and
+ * src2 addresses are aligned on the block size.
+ * If set to 1, the returned sad function will assume src1 is
+ * aligned on the block size.
+ * If set to 0, the returned sad function assume no particular
+ * alignment.
+ * @param log_ctx context used for logging, can be NULL
+ *
+ * @return a pointer to the SAD function or NULL in case of error (because of
+ * invalid parameters)
+ */
+av_pixelutils_sad_fn av_pixelutils_get_sad_fn(int w_bits, int h_bits,
+ int aligned, void *log_ctx);
+
+#endif /* AVUTIL_PIXELUTILS_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/ffmpeg_android/libavutil/pixfmt.h -> gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/pixfmt.h Changed

@@ -22,141 +22,497 @@
 #define AVUTIL_PIXFMT_H
 
 /**
- * @file libavutil/pixfmt.h
+ * @file
 * pixel format definitions
 *
- * @warning This file has to be considered an internal but installed
- * header, so it should not be directly included in your projects.
 */
 
 #include "libavutil/avconfig.h"
+#include "version.h"
+
+#define AVPALETTE_SIZE 1024
+#define AVPALETTE_COUNT 256
 
 /**
- * Pixel format. Notes:
+ * Pixel format.
 *
- * PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
+ * @note
+ * AV_PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
 * color is put together as:
 * (A << 24) | (R << 16) | (G << 8) | B
 * This is stored as BGRA on little-endian CPU architectures and ARGB on
 * big-endian CPUs.
 *
- * When the pixel format is palettized RGB (PIX_FMT_PAL8), the palettized
+ * @par
+ * When the pixel format is palettized RGB (AV_PIX_FMT_PAL8), the palettized
 * image data is stored in AVFrame.data[0]. The palette is transported in
 * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
- * formatted the same as in PIX_FMT_RGB32 described above (i.e., it is
+ * formatted the same as in AV_PIX_FMT_RGB32 described above (i.e., it is
 * also endian-specific). Note also that the individual RGB palette
 * components stored in AVFrame.data[1] should be in the range 0..255.
 * This is important as many custom PAL8 video codecs that were designed
 * to run on the IBM VGA graphics adapter use 6-bit palette components.
 *
+ * @par
 * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like
 * for pal8. This palette is filled in automatically by the function
 * allocating the picture.
 *
- * Note, make sure that all newly added big endian formats have pix_fmt&1==1
- * and that all newly added little endian formats have pix_fmt&1==0
- * this allows simpler detection of big vs little endian.
+ * @note
+ * Make sure that all newly added big-endian formats have (pix_fmt & 1) == 1
+ * and that all newly added little-endian formats have (pix_fmt & 1) == 0.
+ * This allows simpler detection of big vs little-endian.
 */
-enum PixelFormat {
- PIX_FMT_NONE= -1,
- PIX_FMT_YUV420P, ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
- PIX_FMT_YUYV422, ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
- PIX_FMT_RGB24, ///< packed RGB 8:8:8, 24bpp, RGBRGB...
- PIX_FMT_BGR24, ///< packed RGB 8:8:8, 24bpp, BGRBGR...
- PIX_FMT_YUV422P, ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
- PIX_FMT_YUV444P, ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
- PIX_FMT_YUV410P, ///< planar YUV 4:1:0, 9bpp, (1 Cr & Cb sample per 4x4 Y samples)
- PIX_FMT_YUV411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
- PIX_FMT_GRAY8, ///< Y , 8bpp
- PIX_FMT_MONOWHITE, ///< Y , 1bpp, 0 is white, 1 is black
- PIX_FMT_MONOBLACK, ///< Y , 1bpp, 0 is black, 1 is white
- PIX_FMT_PAL8, ///< 8 bit with PIX_FMT_RGB32 palette
- PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG)
- PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG)
- PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG)
- PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
- PIX_FMT_XVMC_MPEG2_IDCT,
- PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
- PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
- PIX_FMT_BGR8, ///< packed RGB 3:3:2, 8bpp, (msb)2B 3G 3R(lsb)
- PIX_FMT_BGR4, ///< packed RGB 1:2:1, 4bpp, (msb)1B 2G 1R(lsb)
- PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1B 2G 1R(lsb)
- PIX_FMT_RGB8, ///< packed RGB 3:3:2, 8bpp, (msb)2R 3G 3B(lsb)
- PIX_FMT_RGB4, ///< packed RGB 1:2:1, 4bpp, (msb)1R 2G 1B(lsb)
- PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1R 2G 1B(lsb)
- PIX_FMT_NV12, ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 for UV
- PIX_FMT_NV21, ///< as above, but U and V bytes are swapped
-
- PIX_FMT_ARGB, ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
- PIX_FMT_RGBA, ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
- PIX_FMT_ABGR, ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
- PIX_FMT_BGRA, ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
-
- PIX_FMT_GRAY16BE, ///< Y , 16bpp, big-endian
- PIX_FMT_GRAY16LE, ///< Y , 16bpp, little-endian
- PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
- PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG)
- PIX_FMT_YUVA420P, ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
- PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
- PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
- PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
- PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
- PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
- PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, big-endian
- PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, little-endian
-
- PIX_FMT_RGB565BE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), big-endian
- PIX_FMT_RGB565LE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), little-endian
- PIX_FMT_RGB555BE, ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
- PIX_FMT_RGB555LE, ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
-
- PIX_FMT_BGR565BE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), big-endian
- PIX_FMT_BGR565LE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), little-endian
- PIX_FMT_BGR555BE, ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
- PIX_FMT_BGR555LE, ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
-
- PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
- PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
- PIX_FMT_VAAPI_VLD, ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-
- PIX_FMT_YUV420P16LE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
- PIX_FMT_YUV420P16BE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
- PIX_FMT_YUV422P16LE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
- PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
- PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
- PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
- PIX_FMT_VDPAU_MPEG4, ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
- PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
-
- PIX_FMT_RGB444BE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
- PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
- PIX_FMT_BGR444BE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
- PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
- PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
+enum AVPixelFormat {
+ AV_PIX_FMT_NONE = -1,
+ AV_PIX_FMT_YUV420P, ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
+ AV_PIX_FMT_YUYV422, ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
+ AV_PIX_FMT_RGB24, ///< packed RGB 8:8:8, 24bpp, RGBRGB...
+ AV_PIX_FMT_BGR24, ///< packed RGB 8:8:8, 24bpp, BGRBGR...
+ AV_PIX_FMT_YUV422P, ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
+ AV_PIX_FMT_YUV444P, ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
+ AV_PIX_FMT_YUV410P, ///< planar YUV 4:1:0, 9bpp, (1 Cr & Cb sample per 4x4 Y samples)
+ AV_PIX_FMT_YUV411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
+ AV_PIX_FMT_GRAY8, ///< Y , 8bpp
+ AV_PIX_FMT_MONOWHITE, ///< Y , 1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
+ AV_PIX_FMT_MONOBLACK, ///< Y , 1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
+ AV_PIX_FMT_PAL8, ///< 8 bit with PIX_FMT_RGB32 palette
+ AV_PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
+ AV_PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
+ AV_PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
+#if FF_API_XVMC
+ AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
+ AV_PIX_FMT_XVMC_MPEG2_IDCT,
+#define AV_PIX_FMT_XVMC AV_PIX_FMT_XVMC_MPEG2_IDCT
+#endif /* FF_API_XVMC */
+ AV_PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
+ AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
+ AV_PIX_FMT_BGR8, ///< packed RGB 3:3:2, 8bpp, (msb)2B 3G 3R(lsb)
+ AV_PIX_FMT_BGR4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+ AV_PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1B 2G 1R(lsb)
+ AV_PIX_FMT_RGB8, ///< packed RGB 3:3:2, 8bpp, (msb)2R 3G 3B(lsb)
+ AV_PIX_FMT_RGB4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+ AV_PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1R 2G 1B(lsb)
+ AV_PIX_FMT_NV12, ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
+ AV_PIX_FMT_NV21, ///< as above, but U and V bytes are swapped
+
+ AV_PIX_FMT_ARGB, ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
+ AV_PIX_FMT_RGBA, ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
+ AV_PIX_FMT_ABGR, ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
+ AV_PIX_FMT_BGRA, ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
+
+ AV_PIX_FMT_GRAY16BE, ///< Y , 16bpp, big-endian
+ AV_PIX_FMT_GRAY16LE, ///< Y , 16bpp, little-endian
+ AV_PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
+ AV_PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
+ AV_PIX_FMT_YUVA420P, ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
+#if FF_API_VDPAU
+ AV_PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+ AV_PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+ AV_PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+ AV_PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+ AV_PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+#endif
+ AV_PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
+ AV_PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
+
+ AV_PIX_FMT_RGB565BE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), big-endian
+ AV_PIX_FMT_RGB565LE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), little-endian
+ AV_PIX_FMT_RGB555BE, ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
+ AV_PIX_FMT_RGB555LE, ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
+
+ AV_PIX_FMT_BGR565BE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), big-endian
+ AV_PIX_FMT_BGR565LE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), little-endian
+ AV_PIX_FMT_BGR555BE, ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
+ AV_PIX_FMT_BGR555LE, ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
+
+ AV_PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
+ AV_PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
+ AV_PIX_FMT_VAAPI_VLD, ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+
+ AV_PIX_FMT_YUV420P16LE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+ AV_PIX_FMT_YUV420P16BE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+ AV_PIX_FMT_YUV422P16LE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+ AV_PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+ AV_PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+ AV_PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+#if FF_API_VDPAU
+ AV_PIX_FMT_VDPAU_MPEG4, ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+#endif
+ AV_PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
+
+ AV_PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
+ AV_PIX_FMT_RGB444BE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
+ AV_PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
+ AV_PIX_FMT_BGR444BE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
+ AV_PIX_FMT_YA8, ///< 8bit gray, 8bit alpha
+
+ AV_PIX_FMT_Y400A = AV_PIX_FMT_YA8, ///< alias for AV_PIX_FMT_YA8
+ AV_PIX_FMT_GRAY8A= AV_PIX_FMT_YA8, ///< alias for AV_PIX_FMT_YA8
+
+ AV_PIX_FMT_BGR48BE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
+ AV_PIX_FMT_BGR48LE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
+
+ /**
+ * The following 12 formats have the disadvantage of needing 1 format for each bit depth.
+ * Notice that each 9/10 bits sample is stored in 16 bits with extra padding.
+ * If you want to support multiple bit depths, then using AV_PIX_FMT_YUV420P16* with the bpp stored separately is better.
+ */
+ AV_PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+ AV_PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+ AV_PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+ AV_PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+ AV_PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+ AV_PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+ AV_PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+ AV_PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+ AV_PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+ AV_PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+ AV_PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+ AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+ AV_PIX_FMT_VDA_VLD, ///< hardware decoding through VDA
+
+#ifdef AV_PIX_FMT_ABI_GIT_MASTER
+ AV_PIX_FMT_RGBA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+ AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+ AV_PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+ AV_PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+#endif
+ AV_PIX_FMT_GBRP, ///< planar GBR 4:4:4 24bpp
+ AV_PIX_FMT_GBRP9BE, ///< planar GBR 4:4:4 27bpp, big-endian
+ AV_PIX_FMT_GBRP9LE, ///< planar GBR 4:4:4 27bpp, little-endian
+ AV_PIX_FMT_GBRP10BE, ///< planar GBR 4:4:4 30bpp, big-endian
+ AV_PIX_FMT_GBRP10LE, ///< planar GBR 4:4:4 30bpp, little-endian
+ AV_PIX_FMT_GBRP16BE, ///< planar GBR 4:4:4 48bpp, big-endian
+ AV_PIX_FMT_GBRP16LE, ///< planar GBR 4:4:4 48bpp, little-endian
+
+ /**
+ * duplicated pixel formats for compatibility with libav.
+ * FFmpeg supports these formats since May 8 2012 and Jan 28 2012 (commits f9ca1ac7 and 143a5c55)
+ * Libav added them Oct 12 2012 with incompatible values (commit 6d5600e85)
+ */
+ AV_PIX_FMT_YUVA422P_LIBAV, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
+ AV_PIX_FMT_YUVA444P_LIBAV, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
+
+ AV_PIX_FMT_YUVA420P9BE, ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), big-endian
+ AV_PIX_FMT_YUVA420P9LE, ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), little-endian
+ AV_PIX_FMT_YUVA422P9BE, ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), big-endian
+ AV_PIX_FMT_YUVA422P9LE, ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), little-endian
+ AV_PIX_FMT_YUVA444P9BE, ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), big-endian
+ AV_PIX_FMT_YUVA444P9LE, ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), little-endian
+ AV_PIX_FMT_YUVA420P10BE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian)
+ AV_PIX_FMT_YUVA420P10LE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian)
+ AV_PIX_FMT_YUVA422P10BE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian)
+ AV_PIX_FMT_YUVA422P10LE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian)
+ AV_PIX_FMT_YUVA444P10BE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian)
+ AV_PIX_FMT_YUVA444P10LE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian)
+ AV_PIX_FMT_YUVA420P16BE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian)
+ AV_PIX_FMT_YUVA420P16LE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian)
+ AV_PIX_FMT_YUVA422P16BE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian)
+ AV_PIX_FMT_YUVA422P16LE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian)
+ AV_PIX_FMT_YUVA444P16BE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian)
+ AV_PIX_FMT_YUVA444P16LE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian)
+
+ AV_PIX_FMT_VDPAU, ///< HW acceleration through VDPAU, Picture.data[3] contains a VdpVideoSurface
+
+ AV_PIX_FMT_XYZ12LE, ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb), the 2-byte value for each X/Y/Z is stored as little-endian, the 4 lower bits are set to 0
+ AV_PIX_FMT_XYZ12BE, ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb), the 2-byte value for each X/Y/Z is stored as big-endian, the 4 lower bits are set to 0
+ AV_PIX_FMT_NV16, ///< interleaved chroma YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
+ AV_PIX_FMT_NV20LE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+ AV_PIX_FMT_NV20BE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+
+ /**
+ * duplicated pixel formats for compatibility with libav.
+ * FFmpeg supports these formats since Sat Sep 24 06:01:45 2011 +0200 (commits 9569a3c9f41387a8c7d1ce97d8693520477a66c3)
+ * also see Fri Nov 25 01:38:21 2011 +0100 92afb431621c79155fcb7171d26f137eb1bee028
+ * Libav added them Sun Mar 16 23:05:47 2014 +0100 with incompatible values (commit 1481d24c3a0abf81e1d7a514547bd5305232be30)
+ */
+ AV_PIX_FMT_RGBA64BE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+ AV_PIX_FMT_RGBA64LE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+ AV_PIX_FMT_BGRA64BE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+ AV_PIX_FMT_BGRA64LE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+
+ AV_PIX_FMT_YVYU422, ///< packed YUV 4:2:2, 16bpp, Y0 Cr Y1 Cb
+
+ AV_PIX_FMT_VDA, ///< HW acceleration through VDA, data[3] contains a CVPixelBufferRef
+
+ AV_PIX_FMT_YA16BE, ///< 16bit gray, 16bit alpha (big-endian)
+ AV_PIX_FMT_YA16LE, ///< 16bit gray, 16bit alpha (little-endian)
+
+
+#ifndef AV_PIX_FMT_ABI_GIT_MASTER
+ AV_PIX_FMT_RGBA64BE=0x123, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+ AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+ AV_PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+ AV_PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+#endif
+ AV_PIX_FMT_0RGB=0x123+4, ///< packed RGB 8:8:8, 32bpp, 0RGB0RGB...
+ AV_PIX_FMT_RGB0, ///< packed RGB 8:8:8, 32bpp, RGB0RGB0...
+ AV_PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, 0BGR0BGR...
+ AV_PIX_FMT_BGR0, ///< packed BGR 8:8:8, 32bpp, BGR0BGR0...
+ AV_PIX_FMT_YUVA444P, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
+ AV_PIX_FMT_YUVA422P, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
+
+ AV_PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+ AV_PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+ AV_PIX_FMT_YUV420P14BE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+ AV_PIX_FMT_YUV420P14LE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+ AV_PIX_FMT_YUV422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+ AV_PIX_FMT_YUV422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+ AV_PIX_FMT_YUV422P14BE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+ AV_PIX_FMT_YUV422P14LE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+ AV_PIX_FMT_YUV444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+ AV_PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+ AV_PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+ AV_PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+ AV_PIX_FMT_GBRP12BE, ///< planar GBR 4:4:4 36bpp, big-endian
+ AV_PIX_FMT_GBRP12LE, ///< planar GBR 4:4:4 36bpp, little-endian
+ AV_PIX_FMT_GBRP14BE, ///< planar GBR 4:4:4 42bpp, big-endian
+ AV_PIX_FMT_GBRP14LE, ///< planar GBR 4:4:4 42bpp, little-endian
+ AV_PIX_FMT_GBRAP, ///< planar GBRA 4:4:4:4 32bpp
+ AV_PIX_FMT_GBRAP16BE, ///< planar GBRA 4:4:4:4 64bpp, big-endian
+ AV_PIX_FMT_GBRAP16LE, ///< planar GBRA 4:4:4:4 64bpp, little-endian
+ AV_PIX_FMT_YUVJ411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples) full scale (JPEG), deprecated in favor of PIX_FMT_YUV411P and setting color_range
+
+ AV_PIX_FMT_BAYER_BGGR8, ///< bayer, BGBG..(odd line), GRGR..(even line), 8-bit samples */
+ AV_PIX_FMT_BAYER_RGGB8, ///< bayer, RGRG..(odd line), GBGB..(even line), 8-bit samples */
+ AV_PIX_FMT_BAYER_GBRG8, ///< bayer, GBGB..(odd line), RGRG..(even line), 8-bit samples */
+ AV_PIX_FMT_BAYER_GRBG8, ///< bayer, GRGR..(odd line), BGBG..(even line), 8-bit samples */
+ AV_PIX_FMT_BAYER_BGGR16LE, ///< bayer, BGBG..(odd line), GRGR..(even line), 16-bit samples, little-endian */
+ AV_PIX_FMT_BAYER_BGGR16BE, ///< bayer, BGBG..(odd line), GRGR..(even line), 16-bit samples, big-endian */
+ AV_PIX_FMT_BAYER_RGGB16LE, ///< bayer, RGRG..(odd line), GBGB..(even line), 16-bit samples, little-endian */
+ AV_PIX_FMT_BAYER_RGGB16BE, ///< bayer, RGRG..(odd line), GBGB..(even line), 16-bit samples, big-endian */
+ AV_PIX_FMT_BAYER_GBRG16LE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, little-endian */
+ AV_PIX_FMT_BAYER_GBRG16BE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, big-endian */
+ AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, little-endian */
+ AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, big-endian */
+#if !FF_API_XVMC
+ AV_PIX_FMT_XVMC,///< XVideo Motion Acceleration via common packet passing
+#endif /* !FF_API_XVMC */
+
+ AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
+
+#if FF_API_PIX_FMT
+#include "old_pix_fmts.h"
+#endif
 };
 
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
+#define AV_PIX_FMT_YUVA422P AV_PIX_FMT_YUVA422P_LIBAV
+#define AV_PIX_FMT_YUVA444P AV_PIX_FMT_YUVA444P_LIBAV
+#define AV_PIX_FMT_RGBA64BE AV_PIX_FMT_RGBA64BE_LIBAV
+#define AV_PIX_FMT_RGBA64LE AV_PIX_FMT_RGBA64LE_LIBAV
+#define AV_PIX_FMT_BGRA64BE AV_PIX_FMT_BGRA64BE_LIBAV
+#define AV_PIX_FMT_BGRA64LE AV_PIX_FMT_BGRA64LE_LIBAV
+#endif
+
+
+#define AV_PIX_FMT_Y400A AV_PIX_FMT_GRAY8A
+#define AV_PIX_FMT_GBR24P AV_PIX_FMT_GBRP
+
 #if AV_HAVE_BIGENDIAN
-# define PIX_FMT_NE(be, le) PIX_FMT_##be
+# define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##be
 #else
-# define PIX_FMT_NE(be, le) PIX_FMT_##le
+# define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##le
+#endif
+
+#define AV_PIX_FMT_RGB32 AV_PIX_FMT_NE(ARGB, BGRA)
+#define AV_PIX_FMT_RGB32_1 AV_PIX_FMT_NE(RGBA, ABGR)
+#define AV_PIX_FMT_BGR32 AV_PIX_FMT_NE(ABGR, RGBA)
+#define AV_PIX_FMT_BGR32_1 AV_PIX_FMT_NE(BGRA, ARGB)
+#define AV_PIX_FMT_0RGB32 AV_PIX_FMT_NE(0RGB, BGR0)
+#define AV_PIX_FMT_0BGR32 AV_PIX_FMT_NE(0BGR, RGB0)
+
+#define AV_PIX_FMT_GRAY16 AV_PIX_FMT_NE(GRAY16BE, GRAY16LE)
+#define AV_PIX_FMT_YA16 AV_PIX_FMT_NE(YA16BE, YA16LE)
+#define AV_PIX_FMT_RGB48 AV_PIX_FMT_NE(RGB48BE, RGB48LE)
+#define AV_PIX_FMT_RGB565 AV_PIX_FMT_NE(RGB565BE, RGB565LE)
+#define AV_PIX_FMT_RGB555 AV_PIX_FMT_NE(RGB555BE, RGB555LE)
+#define AV_PIX_FMT_RGB444 AV_PIX_FMT_NE(RGB444BE, RGB444LE)
+#define AV_PIX_FMT_RGBA64 AV_PIX_FMT_NE(RGBA64BE, RGBA64LE)
+#define AV_PIX_FMT_BGR48 AV_PIX_FMT_NE(BGR48BE, BGR48LE)
+#define AV_PIX_FMT_BGR565 AV_PIX_FMT_NE(BGR565BE, BGR565LE)
+#define AV_PIX_FMT_BGR555 AV_PIX_FMT_NE(BGR555BE, BGR555LE)
+#define AV_PIX_FMT_BGR444 AV_PIX_FMT_NE(BGR444BE, BGR444LE)
+#define AV_PIX_FMT_BGRA64 AV_PIX_FMT_NE(BGRA64BE, BGRA64LE)
+
+#define AV_PIX_FMT_YUV420P9 AV_PIX_FMT_NE(YUV420P9BE , YUV420P9LE)
+#define AV_PIX_FMT_YUV422P9 AV_PIX_FMT_NE(YUV422P9BE , YUV422P9LE)
+#define AV_PIX_FMT_YUV444P9 AV_PIX_FMT_NE(YUV444P9BE , YUV444P9LE)
+#define AV_PIX_FMT_YUV420P10 AV_PIX_FMT_NE(YUV420P10BE, YUV420P10LE)
+#define AV_PIX_FMT_YUV422P10 AV_PIX_FMT_NE(YUV422P10BE, YUV422P10LE)
+#define AV_PIX_FMT_YUV444P10 AV_PIX_FMT_NE(YUV444P10BE, YUV444P10LE)
+#define AV_PIX_FMT_YUV420P12 AV_PIX_FMT_NE(YUV420P12BE, YUV420P12LE)
+#define AV_PIX_FMT_YUV422P12 AV_PIX_FMT_NE(YUV422P12BE, YUV422P12LE)
+#define AV_PIX_FMT_YUV444P12 AV_PIX_FMT_NE(YUV444P12BE, YUV444P12LE)
+#define AV_PIX_FMT_YUV420P14 AV_PIX_FMT_NE(YUV420P14BE, YUV420P14LE)
+#define AV_PIX_FMT_YUV422P14 AV_PIX_FMT_NE(YUV422P14BE, YUV422P14LE)
+#define AV_PIX_FMT_YUV444P14 AV_PIX_FMT_NE(YUV444P14BE, YUV444P14LE)
+#define AV_PIX_FMT_YUV420P16 AV_PIX_FMT_NE(YUV420P16BE, YUV420P16LE)
+#define AV_PIX_FMT_YUV422P16 AV_PIX_FMT_NE(YUV422P16BE, YUV422P16LE)
+#define AV_PIX_FMT_YUV444P16 AV_PIX_FMT_NE(YUV444P16BE, YUV444P16LE)
+
+#define AV_PIX_FMT_GBRP9 AV_PIX_FMT_NE(GBRP9BE , GBRP9LE)
+#define AV_PIX_FMT_GBRP10 AV_PIX_FMT_NE(GBRP10BE, GBRP10LE)
+#define AV_PIX_FMT_GBRP12 AV_PIX_FMT_NE(GBRP12BE, GBRP12LE)
+#define AV_PIX_FMT_GBRP14 AV_PIX_FMT_NE(GBRP14BE, GBRP14LE)
+#define AV_PIX_FMT_GBRP16 AV_PIX_FMT_NE(GBRP16BE, GBRP16LE)
+#define AV_PIX_FMT_GBRAP16 AV_PIX_FMT_NE(GBRAP16BE, GBRAP16LE)
+
+#define AV_PIX_FMT_BAYER_BGGR16 AV_PIX_FMT_NE(BAYER_BGGR16BE, BAYER_BGGR16LE)
+#define AV_PIX_FMT_BAYER_RGGB16 AV_PIX_FMT_NE(BAYER_RGGB16BE, BAYER_RGGB16LE)
+#define AV_PIX_FMT_BAYER_GBRG16 AV_PIX_FMT_NE(BAYER_GBRG16BE, BAYER_GBRG16LE)
+#define AV_PIX_FMT_BAYER_GRBG16 AV_PIX_FMT_NE(BAYER_GRBG16BE, BAYER_GRBG16LE)
+
+
+#define AV_PIX_FMT_YUVA420P9 AV_PIX_FMT_NE(YUVA420P9BE , YUVA420P9LE)
+#define AV_PIX_FMT_YUVA422P9 AV_PIX_FMT_NE(YUVA422P9BE , YUVA422P9LE)
+#define AV_PIX_FMT_YUVA444P9 AV_PIX_FMT_NE(YUVA444P9BE , YUVA444P9LE)
+#define AV_PIX_FMT_YUVA420P10 AV_PIX_FMT_NE(YUVA420P10BE, YUVA420P10LE)
+#define AV_PIX_FMT_YUVA422P10 AV_PIX_FMT_NE(YUVA422P10BE, YUVA422P10LE)
+#define AV_PIX_FMT_YUVA444P10 AV_PIX_FMT_NE(YUVA444P10BE, YUVA444P10LE)
+#define AV_PIX_FMT_YUVA420P16 AV_PIX_FMT_NE(YUVA420P16BE, YUVA420P16LE)
+#define AV_PIX_FMT_YUVA422P16 AV_PIX_FMT_NE(YUVA422P16BE, YUVA422P16LE)
+#define AV_PIX_FMT_YUVA444P16 AV_PIX_FMT_NE(YUVA444P16BE, YUVA444P16LE)
+
+#define AV_PIX_FMT_XYZ12 AV_PIX_FMT_NE(XYZ12BE, XYZ12LE)
+#define AV_PIX_FMT_NV20 AV_PIX_FMT_NE(NV20BE, NV20LE)
+
+
+#if FF_API_PIX_FMT
+#define PixelFormat AVPixelFormat
+
+#define PIX_FMT_Y400A AV_PIX_FMT_Y400A
+#define PIX_FMT_GBR24P AV_PIX_FMT_GBR24P
+
+#define PIX_FMT_NE(be, le) AV_PIX_FMT_NE(be, le)
+
+#define PIX_FMT_RGB32 AV_PIX_FMT_RGB32
+#define PIX_FMT_RGB32_1 AV_PIX_FMT_RGB32_1
+#define PIX_FMT_BGR32 AV_PIX_FMT_BGR32
+#define PIX_FMT_BGR32_1 AV_PIX_FMT_BGR32_1
+#define PIX_FMT_0RGB32 AV_PIX_FMT_0RGB32
+#define PIX_FMT_0BGR32 AV_PIX_FMT_0BGR32
+
+#define PIX_FMT_GRAY16 AV_PIX_FMT_GRAY16
+#define PIX_FMT_RGB48 AV_PIX_FMT_RGB48
+#define PIX_FMT_RGB565 AV_PIX_FMT_RGB565
+#define PIX_FMT_RGB555 AV_PIX_FMT_RGB555
+#define PIX_FMT_RGB444 AV_PIX_FMT_RGB444
+#define PIX_FMT_BGR48 AV_PIX_FMT_BGR48
+#define PIX_FMT_BGR565 AV_PIX_FMT_BGR565
+#define PIX_FMT_BGR555 AV_PIX_FMT_BGR555
+#define PIX_FMT_BGR444 AV_PIX_FMT_BGR444
+
+#define PIX_FMT_YUV420P9 AV_PIX_FMT_YUV420P9
+#define PIX_FMT_YUV422P9 AV_PIX_FMT_YUV422P9
+#define PIX_FMT_YUV444P9 AV_PIX_FMT_YUV444P9
+#define PIX_FMT_YUV420P10 AV_PIX_FMT_YUV420P10
+#define PIX_FMT_YUV422P10 AV_PIX_FMT_YUV422P10
+#define PIX_FMT_YUV444P10 AV_PIX_FMT_YUV444P10
+#define PIX_FMT_YUV420P12 AV_PIX_FMT_YUV420P12
+#define PIX_FMT_YUV422P12 AV_PIX_FMT_YUV422P12
+#define PIX_FMT_YUV444P12 AV_PIX_FMT_YUV444P12
+#define PIX_FMT_YUV420P14 AV_PIX_FMT_YUV420P14
+#define PIX_FMT_YUV422P14 AV_PIX_FMT_YUV422P14
+#define PIX_FMT_YUV444P14 AV_PIX_FMT_YUV444P14
+#define PIX_FMT_YUV420P16 AV_PIX_FMT_YUV420P16
+#define PIX_FMT_YUV422P16 AV_PIX_FMT_YUV422P16
+#define PIX_FMT_YUV444P16 AV_PIX_FMT_YUV444P16
+
+#define PIX_FMT_RGBA64 AV_PIX_FMT_RGBA64
+#define PIX_FMT_BGRA64 AV_PIX_FMT_BGRA64
+#define PIX_FMT_GBRP9 AV_PIX_FMT_GBRP9
+#define PIX_FMT_GBRP10 AV_PIX_FMT_GBRP10
+#define PIX_FMT_GBRP12 AV_PIX_FMT_GBRP12
+#define PIX_FMT_GBRP14 AV_PIX_FMT_GBRP14
+#define PIX_FMT_GBRP16 AV_PIX_FMT_GBRP16
 #endif
 
-#define PIX_FMT_RGB32 PIX_FMT_NE(ARGB, BGRA)
-#define PIX_FMT_RGB32_1 PIX_FMT_NE(RGBA, ABGR)
-#define PIX_FMT_BGR32 PIX_FMT_NE(ABGR, RGBA)
-#define PIX_FMT_BGR32_1 PIX_FMT_NE(BGRA, ARGB)
-
-#define PIX_FMT_GRAY16 PIX_FMT_NE(GRAY16BE, GRAY16LE)
-#define PIX_FMT_RGB48 PIX_FMT_NE(RGB48BE, RGB48LE)
-#define PIX_FMT_RGB565 PIX_FMT_NE(RGB565BE, RGB565LE)
-#define PIX_FMT_RGB555 PIX_FMT_NE(RGB555BE, RGB555LE)
-#define PIX_FMT_RGB444 PIX_FMT_NE(RGB444BE, RGB444LE)
-#define PIX_FMT_BGR565 PIX_FMT_NE(BGR565BE, BGR565LE)
-#define PIX_FMT_BGR555 PIX_FMT_NE(BGR555BE, BGR555LE)
-#define PIX_FMT_BGR444 PIX_FMT_NE(BGR444BE, BGR444LE)
-
-#define PIX_FMT_YUV420P16 PIX_FMT_NE(YUV420P16BE, YUV420P16LE)
-#define PIX_FMT_YUV422P16 PIX_FMT_NE(YUV422P16BE, YUV422P16LE)
-#define PIX_FMT_YUV444P16 PIX_FMT_NE(YUV444P16BE, YUV444P16LE)
+/**
+ * Chromaticity coordinates of the source primaries.
+ */
+enum AVColorPrimaries {
+ AVCOL_PRI_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
+ AVCOL_PRI_UNSPECIFIED = 2,
+ AVCOL_PRI_RESERVED = 3,
+ AVCOL_PRI_BT470M = 4,
+ AVCOL_PRI_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
+ AVCOL_PRI_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
+ AVCOL_PRI_SMPTE240M = 7, ///< functionally identical to above
+ AVCOL_PRI_FILM = 8,
+ AVCOL_PRI_BT2020 = 9, ///< ITU-R BT2020
+ AVCOL_PRI_NB, ///< Not part of ABI
+};
+
+/**
+ * Color Transfer Characteristic.
+ */
+enum AVColorTransferCharacteristic {
+ AVCOL_TRC_BT709 = 1, ///< also ITU-R BT1361
+ AVCOL_TRC_UNSPECIFIED = 2,
+ AVCOL_TRC_RESERVED = 3,
+ AVCOL_TRC_GAMMA22 = 4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
+ AVCOL_TRC_GAMMA28 = 5, ///< also ITU-R BT470BG
+ AVCOL_TRC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 or 625 / ITU-R BT1358 525 or 625 / ITU-R BT1700 NTSC
+ AVCOL_TRC_SMPTE240M = 7,
+ AVCOL_TRC_LINEAR = 8, ///< "Linear transfer characteristics"
+ AVCOL_TRC_LOG = 9, ///< "Logarithmic transfer characteristic (100:1 range)"
+ AVCOL_TRC_LOG_SQRT = 10, ///< "Logarithmic transfer characteristic (100 * Sqrt(10) : 1 range)"
+ AVCOL_TRC_IEC61966_2_4 = 11, ///< IEC 61966-2-4
+ AVCOL_TRC_BT1361_ECG = 12, ///< ITU-R BT1361 Extended Colour Gamut
+ AVCOL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC)
+ AVCOL_TRC_BT2020_10 = 14, ///< ITU-R BT2020 for 10 bit system
+ AVCOL_TRC_BT2020_12 = 15, ///< ITU-R BT2020 for 12 bit system
+ AVCOL_TRC_NB, ///< Not part of ABI
+};
+
+/**
+ * YUV colorspace type.
+ */
+enum AVColorSpace {
+ AVCOL_SPC_RGB = 0,
+ AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
+ AVCOL_SPC_UNSPECIFIED = 2,
+ AVCOL_SPC_RESERVED = 3,
+ AVCOL_SPC_FCC = 4,
+ AVCOL_SPC_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
+ AVCOL_SPC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
+ AVCOL_SPC_SMPTE240M = 7,
+ AVCOL_SPC_YCOCG = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
+ AVCOL_SPC_BT2020_NCL = 9, ///< ITU-R BT2020 non-constant luminance system
+ AVCOL_SPC_BT2020_CL = 10, ///< ITU-R BT2020 constant luminance system
+ AVCOL_SPC_NB, ///< Not part of ABI
+};
+#define AVCOL_SPC_YCGCO AVCOL_SPC_YCOCG
+
+
+/**
+ * MPEG vs JPEG YUV range.
+ */
+enum AVColorRange {
+ AVCOL_RANGE_UNSPECIFIED = 0,
+ AVCOL_RANGE_MPEG = 1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges
+ AVCOL_RANGE_JPEG = 2, ///< the normal 2^n-1 "JPEG" YUV ranges
+ AVCOL_RANGE_NB, ///< Not part of ABI
+};
+
+/**
+ * Location of chroma samples.
+ *
+ * X X 3 4 X X are luma samples,
+ * 1 2 1-6 are possible chroma positions
+ * X X 5 6 X 0 is undefined/unknown position
+ */
+enum AVChromaLocation {
+ AVCHROMA_LOC_UNSPECIFIED = 0,
+ AVCHROMA_LOC_LEFT = 1, ///< mpeg2/4, h264 default
+ AVCHROMA_LOC_CENTER = 2, ///< mpeg1, jpeg, h263
+ AVCHROMA_LOC_TOPLEFT = 3, ///< DV
+ AVCHROMA_LOC_TOP = 4,
+ AVCHROMA_LOC_BOTTOMLEFT = 5,
+ AVCHROMA_LOC_BOTTOM = 6,
+ AVCHROMA_LOC_NB, ///< Not part of ABI
+};
 
 #endif /* AVUTIL_PIXFMT_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/random_seed.h Added

@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2009 Baptiste Coudurier <baptiste.coudurier@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_RANDOM_SEED_H
+#define AVUTIL_RANDOM_SEED_H
+
+#include <stdint.h>
+/**
+ * @addtogroup lavu_crypto
+ * @{
+ */
+
+/**
+ * Get a seed to use in conjunction with random functions.
+ * This function tries to provide a good seed at a best effort bases.
+ * Its possible to call this function multiple times if more bits are needed.
+ * It can be quite slow, which is why it should only be used as seed for a faster
+ * PRNG. The quality of the seed depends on the platform.
+ */
+uint32_t av_get_random_seed(void);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_RANDOM_SEED_H */
+/*
+ * Copyright (c) 2009 Baptiste Coudurier <baptiste.coudurier@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_RANDOM_SEED_H
+#define AVUTIL_RANDOM_SEED_H
+
+#include <stdint.h>
+/**
+ * @addtogroup lavu_crypto
+ * @{
+ */
+
+/**
+ * Get a seed to use in conjunction with random functions.
+ * This function tries to provide a good seed at a best effort bases.
+ * Its possible to call this function multiple times if more bits are needed.
+ * It can be quite slow, which is why it should only be used as seed for a faster
+ * PRNG. The quality of the seed depends on the platform.
+ */
+uint32_t av_get_random_seed(void);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_RANDOM_SEED_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/ffmpeg_android/libavutil/rational.h -> gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/rational.h Changed

@@ -20,7 +20,7 @@
 */
 
 /**
- * @file libavutil/rational.h
+ * @file
 * rational numbers
 * @author Michael Niedermayer <michaelni@gmx.at>
 */
@@ -29,9 +29,15 @@
 #define AVUTIL_RATIONAL_H
 
 #include <stdint.h>
+#include <limits.h>
 #include "attributes.h"
 
 /**
+ * @addtogroup lavu_math
+ * @{
+ */
+
+/**
 * rational number numerator/denominator
 */
 typedef struct AVRational{
@@ -40,20 +46,34 @@
 } AVRational;
 
 /**
- * Compares two rationals.
+ * Create a rational.
+ * Useful for compilers that do not support compound literals.
+ * @note The return value is not reduced.
+ */
+static inline AVRational av_make_q(int num, int den)
+{
+ AVRational r = { num, den };
+ return r;
+}
+
+/**
+ * Compare two rationals.
 * @param a first rational
 * @param b second rational
- * @return 0 if a==b, 1 if a>b and -1 if ab, -1 if a<b, and INT_MIN if one of the
+ * values is of the form 0/0
 */
 static inline int av_cmp_q(AVRational a, AVRational b){
 const int64_t tmp= a.num * (int64_t)b.den - b.num * (int64_t)a.den;
 
- if(tmp) return (tmp>>63)|1;
- else return 0;
+ if(tmp) return (int)((tmp ^ a.den ^ b.den)>>63)|1;
+ else if(b.den && a.den) return 0;
+ else if(a.num && b.num) return (a.num>>31) - (b.num>>31);
+ else return INT_MIN;
 }
 
 /**
- * Converts rational to double.
+ * Convert rational to double.
 * @param a rational to convert
 * @return (double) a
 */
@@ -62,7 +82,7 @@
 }
 
 /**
- * Reduces a fraction.
+ * Reduce a fraction.
 * This is useful for framerate calculations.
 * @param dst_num destination numerator
 * @param dst_den destination denominator
@@ -74,7 +94,7 @@
 int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max);
 
 /**
- * Multiplies two rationals.
+ * Multiply two rationals.
 * @param b first rational
 * @param c second rational
 * @return b*c
@@ -82,7 +102,7 @@
 AVRational av_mul_q(AVRational b, AVRational c) av_const;
 
 /**
- * Divides one rational by another.
+ * Divide one rational by another.
 * @param b first rational
 * @param c second rational
 * @return b/c
@@ -90,7 +110,7 @@
 AVRational av_div_q(AVRational b, AVRational c) av_const;
 
 /**
- * Adds two rationals.
+ * Add two rationals.
 * @param b first rational
 * @param c second rational
 * @return b+c
@@ -98,7 +118,7 @@
 AVRational av_add_q(AVRational b, AVRational c) av_const;
 
 /**
- * Subtracts one rational from another.
+ * Subtract one rational from another.
 * @param b first rational
 * @param c second rational
 * @return b-c
@@ -106,7 +126,20 @@
 AVRational av_sub_q(AVRational b, AVRational c) av_const;
 
 /**
- * Converts a double precision floating point number to a rational.
+ * Invert a rational.
+ * @param q value
+ * @return 1 / q
+ */
+static av_always_inline AVRational av_inv_q(AVRational q)
+{
+ AVRational r = { q.den, q.num };
+ return r;
+}
+
+/**
+ * Convert a double precision floating point number to a rational.
+ * inf is expressed as {1,0} or {-1,0} depending on the sign.
+ *
 * @param d double to convert
 * @param max the maximum allowed numerator and denominator
 * @return (AVRational) d
@@ -120,10 +153,14 @@
 int av_nearer_q(AVRational q, AVRational q1, AVRational q2);
 
 /**
- * Finds the nearest value in q_list to q.
+ * Find the nearest value in q_list to q.
 * @param q_list an array of rationals terminated by {0, 0}
 * @return the index of the nearest value found in the array
 */
 int av_find_nearest_q_idx(AVRational q, const AVRational* q_list);
 
+/**
+ * @}
+ */
+
 #endif /* AVUTIL_RATIONAL_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/replaygain.h Added

@@ -0,0 +1,102 @@
+/*
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_REPLAYGAIN_H
+#define AVUTIL_REPLAYGAIN_H
+
+#include <stdint.h>
+
+/**
+ * ReplayGain information (see
+ * http://wiki.hydrogenaudio.org/index.php?title=ReplayGain_1.0_specification).
+ * The size of this struct is a part of the public ABI.
+ */
+typedef struct AVReplayGain {
+ /**
+ * Track replay gain in microbels (divide by 100000 to get the value in dB).
+ * Should be set to INT32_MIN when unknown.
+ */
+ int32_t track_gain;
+ /**
+ * Peak track amplitude, with 100000 representing full scale (but values
+ * may overflow). 0 when unknown.
+ */
+ uint32_t track_peak;
+ /**
+ * Same as track_gain, but for the whole album.
+ */
+ int32_t album_gain;
+ /**
+ * Same as track_peak, but for the whole album,
+ */
+ uint32_t album_peak;
+} AVReplayGain;
+
+#endif /* AVUTIL_REPLAYGAIN_H */
+/*
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_REPLAYGAIN_H
+#define AVUTIL_REPLAYGAIN_H
+
+#include <stdint.h>
+
+/**
+ * ReplayGain information (see
+ * http://wiki.hydrogenaudio.org/index.php?title=ReplayGain_1.0_specification).
+ * The size of this struct is a part of the public ABI.
+ */
+typedef struct AVReplayGain {
+ /**
+ * Track replay gain in microbels (divide by 100000 to get the value in dB).
+ * Should be set to INT32_MIN when unknown.
+ */
+ int32_t track_gain;
+ /**
+ * Peak track amplitude, with 100000 representing full scale (but values
+ * may overflow). 0 when unknown.
+ */
+ uint32_t track_peak;
+ /**
+ * Same as track_gain, but for the whole album.
+ */
+ int32_t album_gain;
+ /**
+ * Same as track_peak, but for the whole album,
+ */
+ uint32_t album_peak;
+} AVReplayGain;
+
+#endif /* AVUTIL_REPLAYGAIN_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/ripemd.h Added

@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (C) 2013 James Almer <jamrial@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_RIPEMD_H
+#define AVUTIL_RIPEMD_H
+
+#include <stdint.h>
+
+#include "attributes.h"
+#include "version.h"
+
+/**
+ * @defgroup lavu_ripemd RIPEMD
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+extern const int av_ripemd_size;
+
+struct AVRIPEMD;
+
+/**
+ * Allocate an AVRIPEMD context.
+ */
+struct AVRIPEMD *av_ripemd_alloc(void);
+
+/**
+ * Initialize RIPEMD hashing.
+ *
+ * @param context pointer to the function context (of size av_ripemd_size)
+ * @param bits number of bits in digest (128, 160, 256 or 320 bits)
+ * @return zero if initialization succeeded, -1 otherwise
+ */
+int av_ripemd_init(struct AVRIPEMD* context, int bits);
+
+/**
+ * Update hash value.
+ *
+ * @param context hash function context
+ * @param data input data to update hash with
+ * @param len input data length
+ */
+void av_ripemd_update(struct AVRIPEMD* context, const uint8_t* data, unsigned int len);
+
+/**
+ * Finish hashing and output digest value.
+ *
+ * @param context hash function context
+ * @param digest buffer where output digest value is stored
+ */
+void av_ripemd_final(struct AVRIPEMD* context, uint8_t *digest);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_RIPEMD_H */
+/*
+ * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (C) 2013 James Almer <jamrial@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_RIPEMD_H
+#define AVUTIL_RIPEMD_H
+
+#include <stdint.h>
+
+#include "attributes.h"
+#include "version.h"
+
+/**
+ * @defgroup lavu_ripemd RIPEMD
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+extern const int av_ripemd_size;
+
+struct AVRIPEMD;
+
+/**
+ * Allocate an AVRIPEMD context.
+ */
+struct AVRIPEMD *av_ripemd_alloc(void);
+
+/**
+ * Initialize RIPEMD hashing.
+ *
+ * @param context pointer to the function context (of size av_ripemd_size)
+ * @param bits number of bits in digest (128, 160, 256 or 320 bits)
+ * @return zero if initialization succeeded, -1 otherwise
+ */
+int av_ripemd_init(struct AVRIPEMD* context, int bits);
+
+/**
+ * Update hash value.
+ *
+ * @param context hash function context
+ * @param data input data to update hash with
+ * @param len input data length
+ */
+void av_ripemd_update(struct AVRIPEMD* context, const uint8_t* data, unsigned int len);
+
+/**
+ * Finish hashing and output digest value.
+ *
+ * @param context hash function context
+ * @param digest buffer where output digest value is stored
+ */
+void av_ripemd_final(struct AVRIPEMD* context, uint8_t *digest);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_RIPEMD_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/samplefmt.h Added

@@ -0,0 +1,558 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_SAMPLEFMT_H
+#define AVUTIL_SAMPLEFMT_H
+
+#include <stdint.h>
+
+#include "avutil.h"
+#include "attributes.h"
+
+/**
+ * @addtogroup lavu_audio
+ * @{
+ *
+ * @defgroup lavu_sampfmts Audio sample formats
+ *
+ * Audio sample format enumeration and related convenience functions.
+ * @{
+ *
+ */
+
+/**
+ * Audio sample formats
+ *
+ * - The data described by the sample format is always in native-endian order.
+ * Sample values can be expressed by native C types, hence the lack of a signed
+ * 24-bit sample format even though it is a common raw audio data format.
+ *
+ * - The floating-point formats are based on full volume being in the range
+ * [-1.0, 1.0]. Any values outside this range are beyond full volume level.
+ *
+ * - The data layout as used in av_samples_fill_arrays() and elsewhere in FFmpeg
+ * (such as AVFrame in libavcodec) is as follows:
+ *
+ * @par
+ * For planar sample formats, each audio channel is in a separate data plane,
+ * and linesize is the buffer size, in bytes, for a single plane. All data
+ * planes must be the same size. For packed sample formats, only the first data
+ * plane is used, and samples for each channel are interleaved. In this case,
+ * linesize is the buffer size, in bytes, for the 1 plane.
+ *
+ */
+enum AVSampleFormat {
+ AV_SAMPLE_FMT_NONE = -1,
+ AV_SAMPLE_FMT_U8, ///< unsigned 8 bits
+ AV_SAMPLE_FMT_S16, ///< signed 16 bits
+ AV_SAMPLE_FMT_S32, ///< signed 32 bits
+ AV_SAMPLE_FMT_FLT, ///< float
+ AV_SAMPLE_FMT_DBL, ///< double
+
+ AV_SAMPLE_FMT_U8P, ///< unsigned 8 bits, planar
+ AV_SAMPLE_FMT_S16P, ///< signed 16 bits, planar
+ AV_SAMPLE_FMT_S32P, ///< signed 32 bits, planar
+ AV_SAMPLE_FMT_FLTP, ///< float, planar
+ AV_SAMPLE_FMT_DBLP, ///< double, planar
+
+ AV_SAMPLE_FMT_NB ///< Number of sample formats. DO NOT USE if linking dynamically
+};
+
+/**
+ * Return the name of sample_fmt, or NULL if sample_fmt is not
+ * recognized.
+ */
+const char *av_get_sample_fmt_name(enum AVSampleFormat sample_fmt);
+
+/**
+ * Return a sample format corresponding to name, or AV_SAMPLE_FMT_NONE
+ * on error.
+ */
+enum AVSampleFormat av_get_sample_fmt(const char *name);
+
+/**
+ * Return the planar<->packed alternative form of the given sample format, or
+ * AV_SAMPLE_FMT_NONE on error. If the passed sample_fmt is already in the
+ * requested planar/packed format, the format returned is the same as the
+ * input.
+ */
+enum AVSampleFormat av_get_alt_sample_fmt(enum AVSampleFormat sample_fmt, int planar);
+
+/**
+ * Get the packed alternative form of the given sample format.
+ *
+ * If the passed sample_fmt is already in packed format, the format returned is
+ * the same as the input.
+ *
+ * @return the packed alternative form of the given sample format or
+ AV_SAMPLE_FMT_NONE on error.
+ */
+enum AVSampleFormat av_get_packed_sample_fmt(enum AVSampleFormat sample_fmt);
+
+/**
+ * Get the planar alternative form of the given sample format.
+ *
+ * If the passed sample_fmt is already in planar format, the format returned is
+ * the same as the input.
+ *
+ * @return the planar alternative form of the given sample format or
+ AV_SAMPLE_FMT_NONE on error.
+ */
+enum AVSampleFormat av_get_planar_sample_fmt(enum AVSampleFormat sample_fmt);
+
+/**
+ * Generate a string corresponding to the sample format with
+ * sample_fmt, or a header if sample_fmt is negative.
+ *
+ * @param buf the buffer where to write the string
+ * @param buf_size the size of buf
+ * @param sample_fmt the number of the sample format to print the
+ * corresponding info string, or a negative value to print the
+ * corresponding header.
+ * @return the pointer to the filled buffer or NULL if sample_fmt is
+ * unknown or in case of other errors
+ */
+char *av_get_sample_fmt_string(char *buf, int buf_size, enum AVSampleFormat sample_fmt);
+
+#if FF_API_GET_BITS_PER_SAMPLE_FMT
+/**
+ * @deprecated Use av_get_bytes_per_sample() instead.
+ */
+attribute_deprecated
+int av_get_bits_per_sample_fmt(enum AVSampleFormat sample_fmt);
+#endif
+
+/**
+ * Return number of bytes per sample.
+ *
+ * @param sample_fmt the sample format
+ * @return number of bytes per sample or zero if unknown for the given
+ * sample format
+ */
+int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt);
+
+/**
+ * Check if the sample format is planar.
+ *
+ * @param sample_fmt the sample format to inspect
+ * @return 1 if the sample format is planar, 0 if it is interleaved
+ */
+int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt);
+
+/**
+ * Get the required buffer size for the given audio parameters.
+ *
+ * @param[out] linesize calculated linesize, may be NULL
+ * @param nb_channels the number of channels
+ * @param nb_samples the number of samples in a single channel
+ * @param sample_fmt the sample format
+ * @param align buffer size alignment (0 = default, 1 = no alignment)
+ * @return required buffer size, or negative error code on failure
+ */
+int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples,
+ enum AVSampleFormat sample_fmt, int align);
+
+/**
+ * @}
+ *
+ * @defgroup lavu_sampmanip Samples manipulation
+ *
+ * Functions that manipulate audio samples
+ * @{
+ */
+
+/**
+ * Fill plane data pointers and linesize for samples with sample
+ * format sample_fmt.
+ *
+ * The audio_data array is filled with the pointers to the samples data planes:
+ * for planar, set the start point of each channel's data within the buffer,
+ * for packed, set the start point of the entire buffer only.
+ *
+ * The value pointed to by linesize is set to the aligned size of each
+ * channel's data buffer for planar layout, or to the aligned size of the
+ * buffer for all channels for packed layout.
+ *
+ * The buffer in buf must be big enough to contain all the samples
+ * (use av_samples_get_buffer_size() to compute its minimum size),
+ * otherwise the audio_data pointers will point to invalid data.
+ *
+ * @see enum AVSampleFormat
+ * The documentation for AVSampleFormat describes the data layout.
+ *
+ * @param[out] audio_data array to be filled with the pointer for each channel
+ * @param[out] linesize calculated linesize, may be NULL
+ * @param buf the pointer to a buffer containing the samples
+ * @param nb_channels the number of channels
+ * @param nb_samples the number of samples in a single channel
+ * @param sample_fmt the sample format
+ * @param align buffer size alignment (0 = default, 1 = no alignment)
+ * @return >=0 on success or a negative error code on failure
+ * @todo return minimum size in bytes required for the buffer in case
+ * of success at the next bump
+ */
+int av_samples_fill_arrays(uint8_t **audio_data, int *linesize,
+ const uint8_t *buf,
+ int nb_channels, int nb_samples,
+ enum AVSampleFormat sample_fmt, int align);
+
+/**
+ * Allocate a samples buffer for nb_samples samples, and fill data pointers and
+ * linesize accordingly.
+ * The allocated samples buffer can be freed by using av_freep(&audio_data[0])
+ * Allocated data will be initialized to silence.
+ *
+ * @see enum AVSampleFormat
+ * The documentation for AVSampleFormat describes the data layout.
+ *
+ * @param[out] audio_data array to be filled with the pointer for each channel
+ * @param[out] linesize aligned size for audio buffer(s), may be NULL
+ * @param nb_channels number of audio channels
+ * @param nb_samples number of samples per channel
+ * @param align buffer size alignment (0 = default, 1 = no alignment)
+ * @return >=0 on success or a negative error code on failure
+ * @todo return the size of the allocated buffer in case of success at the next bump
+ * @see av_samples_fill_arrays()
+ * @see av_samples_alloc_array_and_samples()
+ */
+int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels,
+ int nb_samples, enum AVSampleFormat sample_fmt, int align);
+
+/**
+ * Allocate a data pointers array, samples buffer for nb_samples
+ * samples, and fill data pointers and linesize accordingly.
+ *
+ * This is the same as av_samples_alloc(), but also allocates the data
+ * pointers array.
+ *
+ * @see av_samples_alloc()
+ */
+int av_samples_alloc_array_and_samples(uint8_t ***audio_data, int *linesize, int nb_channels,
+ int nb_samples, enum AVSampleFormat sample_fmt, int align);
+
+/**
+ * Copy samples from src to dst.
+ *
+ * @param dst destination array of pointers to data planes
+ * @param src source array of pointers to data planes
+ * @param dst_offset offset in samples at which the data will be written to dst
+ * @param src_offset offset in samples at which the data will be read from src
+ * @param nb_samples number of samples to be copied
+ * @param nb_channels number of audio channels
+ * @param sample_fmt audio sample format
+ */
+int av_samples_copy(uint8_t **dst, uint8_t * const *src, int dst_offset,
+ int src_offset, int nb_samples, int nb_channels,
+ enum AVSampleFormat sample_fmt);
+
+/**
+ * Fill an audio buffer with silence.
+ *
+ * @param audio_data array of pointers to data planes
+ * @param offset offset in samples at which to start filling
+ * @param nb_samples number of samples to fill
+ * @param nb_channels number of audio channels
+ * @param sample_fmt audio sample format
+ */
+int av_samples_set_silence(uint8_t **audio_data, int offset, int nb_samples,
+ int nb_channels, enum AVSampleFormat sample_fmt);
+
+/**
+ * @}
+ * @}
+ */
+#endif /* AVUTIL_SAMPLEFMT_H */
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_SAMPLEFMT_H
+#define AVUTIL_SAMPLEFMT_H
+
+#include <stdint.h>
+
+#include "avutil.h"
+#include "attributes.h"
+
+/**
+ * @addtogroup lavu_audio
+ * @{
+ *
+ * @defgroup lavu_sampfmts Audio sample formats
+ *
+ * Audio sample format enumeration and related convenience functions.
+ * @{
+ *
+ */
+
+/**
+ * Audio sample formats
+ *
+ * - The data described by the sample format is always in native-endian order.
+ * Sample values can be expressed by native C types, hence the lack of a signed
+ * 24-bit sample format even though it is a common raw audio data format.
+ *
+ * - The floating-point formats are based on full volume being in the range
+ * [-1.0, 1.0]. Any values outside this range are beyond full volume level.
+ *
+ * - The data layout as used in av_samples_fill_arrays() and elsewhere in FFmpeg
+ * (such as AVFrame in libavcodec) is as follows:
+ *
+ * @par
+ * For planar sample formats, each audio channel is in a separate data plane,
+ * and linesize is the buffer size, in bytes, for a single plane. All data
+ * planes must be the same size. For packed sample formats, only the first data
+ * plane is used, and samples for each channel are interleaved. In this case,
+ * linesize is the buffer size, in bytes, for the 1 plane.
+ *
+ */
+enum AVSampleFormat {
+ AV_SAMPLE_FMT_NONE = -1,
+ AV_SAMPLE_FMT_U8, ///< unsigned 8 bits
+ AV_SAMPLE_FMT_S16, ///< signed 16 bits
+ AV_SAMPLE_FMT_S32, ///< signed 32 bits
+ AV_SAMPLE_FMT_FLT, ///< float
+ AV_SAMPLE_FMT_DBL, ///< double
+
+ AV_SAMPLE_FMT_U8P, ///< unsigned 8 bits, planar
+ AV_SAMPLE_FMT_S16P, ///< signed 16 bits, planar
+ AV_SAMPLE_FMT_S32P, ///< signed 32 bits, planar
+ AV_SAMPLE_FMT_FLTP, ///< float, planar
+ AV_SAMPLE_FMT_DBLP, ///< double, planar
+
+ AV_SAMPLE_FMT_NB ///< Number of sample formats. DO NOT USE if linking dynamically
+};
+
+/**
+ * Return the name of sample_fmt, or NULL if sample_fmt is not
+ * recognized.
+ */
+const char *av_get_sample_fmt_name(enum AVSampleFormat sample_fmt);
+
+/**
+ * Return a sample format corresponding to name, or AV_SAMPLE_FMT_NONE
+ * on error.
+ */
+enum AVSampleFormat av_get_sample_fmt(const char *name);
+
+/**
+ * Return the planar<->packed alternative form of the given sample format, or
+ * AV_SAMPLE_FMT_NONE on error. If the passed sample_fmt is already in the
+ * requested planar/packed format, the format returned is the same as the
+ * input.
+ */
+enum AVSampleFormat av_get_alt_sample_fmt(enum AVSampleFormat sample_fmt, int planar);
+
+/**
+ * Get the packed alternative form of the given sample format.
+ *
+ * If the passed sample_fmt is already in packed format, the format returned is
+ * the same as the input.
+ *
+ * @return the packed alternative form of the given sample format or
+ AV_SAMPLE_FMT_NONE on error.
+ */
+enum AVSampleFormat av_get_packed_sample_fmt(enum AVSampleFormat sample_fmt);
+
+/**
+ * Get the planar alternative form of the given sample format.
+ *
+ * If the passed sample_fmt is already in planar format, the format returned is
+ * the same as the input.
+ *
+ * @return the planar alternative form of the given sample format or
+ AV_SAMPLE_FMT_NONE on error.
+ */
+enum AVSampleFormat av_get_planar_sample_fmt(enum AVSampleFormat sample_fmt);
+
+/**
+ * Generate a string corresponding to the sample format with
+ * sample_fmt, or a header if sample_fmt is negative.
+ *
+ * @param buf the buffer where to write the string
+ * @param buf_size the size of buf
+ * @param sample_fmt the number of the sample format to print the
+ * corresponding info string, or a negative value to print the
+ * corresponding header.
+ * @return the pointer to the filled buffer or NULL if sample_fmt is
+ * unknown or in case of other errors
+ */
+char *av_get_sample_fmt_string(char *buf, int buf_size, enum AVSampleFormat sample_fmt);
+
+#if FF_API_GET_BITS_PER_SAMPLE_FMT
+/**
+ * @deprecated Use av_get_bytes_per_sample() instead.
+ */
+attribute_deprecated
+int av_get_bits_per_sample_fmt(enum AVSampleFormat sample_fmt);
+#endif
+
+/**
+ * Return number of bytes per sample.
+ *
+ * @param sample_fmt the sample format
+ * @return number of bytes per sample or zero if unknown for the given
+ * sample format
+ */
+int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt);
+
+/**
+ * Check if the sample format is planar.
+ *
+ * @param sample_fmt the sample format to inspect
+ * @return 1 if the sample format is planar, 0 if it is interleaved
+ */
+int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt);
+
+/**
+ * Get the required buffer size for the given audio parameters.
+ *
+ * @param[out] linesize calculated linesize, may be NULL
+ * @param nb_channels the number of channels
+ * @param nb_samples the number of samples in a single channel
+ * @param sample_fmt the sample format
+ * @param align buffer size alignment (0 = default, 1 = no alignment)
+ * @return required buffer size, or negative error code on failure
+ */
+int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples,
+ enum AVSampleFormat sample_fmt, int align);
+
+/**
+ * @}
+ *
+ * @defgroup lavu_sampmanip Samples manipulation
+ *
+ * Functions that manipulate audio samples
+ * @{
+ */
+
+/**
+ * Fill plane data pointers and linesize for samples with sample
+ * format sample_fmt.
+ *
+ * The audio_data array is filled with the pointers to the samples data planes:
+ * for planar, set the start point of each channel's data within the buffer,
+ * for packed, set the start point of the entire buffer only.
+ *
+ * The value pointed to by linesize is set to the aligned size of each
+ * channel's data buffer for planar layout, or to the aligned size of the
+ * buffer for all channels for packed layout.
+ *
+ * The buffer in buf must be big enough to contain all the samples
+ * (use av_samples_get_buffer_size() to compute its minimum size),
+ * otherwise the audio_data pointers will point to invalid data.
+ *
+ * @see enum AVSampleFormat
+ * The documentation for AVSampleFormat describes the data layout.
+ *
+ * @param[out] audio_data array to be filled with the pointer for each channel
+ * @param[out] linesize calculated linesize, may be NULL
+ * @param buf the pointer to a buffer containing the samples
+ * @param nb_channels the number of channels
+ * @param nb_samples the number of samples in a single channel
+ * @param sample_fmt the sample format
+ * @param align buffer size alignment (0 = default, 1 = no alignment)
+ * @return >=0 on success or a negative error code on failure
+ * @todo return minimum size in bytes required for the buffer in case
+ * of success at the next bump
+ */
+int av_samples_fill_arrays(uint8_t **audio_data, int *linesize,
+ const uint8_t *buf,
+ int nb_channels, int nb_samples,
+ enum AVSampleFormat sample_fmt, int align);
+
+/**
+ * Allocate a samples buffer for nb_samples samples, and fill data pointers and
+ * linesize accordingly.
+ * The allocated samples buffer can be freed by using av_freep(&audio_data[0])
+ * Allocated data will be initialized to silence.
+ *
+ * @see enum AVSampleFormat
+ * The documentation for AVSampleFormat describes the data layout.
+ *
+ * @param[out] audio_data array to be filled with the pointer for each channel
+ * @param[out] linesize aligned size for audio buffer(s), may be NULL
+ * @param nb_channels number of audio channels
+ * @param nb_samples number of samples per channel
+ * @param align buffer size alignment (0 = default, 1 = no alignment)
+ * @return >=0 on success or a negative error code on failure
+ * @todo return the size of the allocated buffer in case of success at the next bump
+ * @see av_samples_fill_arrays()
+ * @see av_samples_alloc_array_and_samples()
+ */
+int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels,
+ int nb_samples, enum AVSampleFormat sample_fmt, int align);
+
+/**
+ * Allocate a data pointers array, samples buffer for nb_samples
+ * samples, and fill data pointers and linesize accordingly.
+ *
+ * This is the same as av_samples_alloc(), but also allocates the data
+ * pointers array.
+ *
+ * @see av_samples_alloc()
+ */
+int av_samples_alloc_array_and_samples(uint8_t ***audio_data, int *linesize, int nb_channels,
+ int nb_samples, enum AVSampleFormat sample_fmt, int align);
+
+/**
+ * Copy samples from src to dst.
+ *
+ * @param dst destination array of pointers to data planes
+ * @param src source array of pointers to data planes
+ * @param dst_offset offset in samples at which the data will be written to dst
+ * @param src_offset offset in samples at which the data will be read from src
+ * @param nb_samples number of samples to be copied
+ * @param nb_channels number of audio channels
+ * @param sample_fmt audio sample format
+ */
+int av_samples_copy(uint8_t **dst, uint8_t * const *src, int dst_offset,
+ int src_offset, int nb_samples, int nb_channels,
+ enum AVSampleFormat sample_fmt);
+
+/**
+ * Fill an audio buffer with silence.
+ *
+ * @param audio_data array of pointers to data planes
+ * @param offset offset in samples at which to start filling
+ * @param nb_samples number of samples to fill
+ * @param nb_channels number of audio channels
+ * @param sample_fmt audio sample format
+ */
+int av_samples_set_silence(uint8_t **audio_data, int offset, int nb_samples,
+ int nb_channels, enum AVSampleFormat sample_fmt);
+
+/**
+ * @}
+ * @}
+ */
+#endif /* AVUTIL_SAMPLEFMT_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/sha.h Added

@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_SHA_H
+#define AVUTIL_SHA_H
+
+#include <stdint.h>
+
+#include "attributes.h"
+#include "version.h"
+
+/**
+ * @defgroup lavu_sha SHA
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+extern const int av_sha_size;
+
+struct AVSHA;
+
+/**
+ * Allocate an AVSHA context.
+ */
+struct AVSHA *av_sha_alloc(void);
+
+/**
+ * Initialize SHA-1 or SHA-2 hashing.
+ *
+ * @param context pointer to the function context (of size av_sha_size)
+ * @param bits number of bits in digest (SHA-1 - 160 bits, SHA-2 224 or 256 bits)
+ * @return zero if initialization succeeded, -1 otherwise
+ */
+int av_sha_init(struct AVSHA* context, int bits);
+
+/**
+ * Update hash value.
+ *
+ * @param context hash function context
+ * @param data input data to update hash with
+ * @param len input data length
+ */
+void av_sha_update(struct AVSHA* context, const uint8_t* data, unsigned int len);
+
+/**
+ * Finish hashing and output digest value.
+ *
+ * @param context hash function context
+ * @param digest buffer where output digest value is stored
+ */
+void av_sha_final(struct AVSHA* context, uint8_t *digest);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_SHA_H */
+/*
+ * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_SHA_H
+#define AVUTIL_SHA_H
+
+#include <stdint.h>
+
+#include "attributes.h"
+#include "version.h"
+
+/**
+ * @defgroup lavu_sha SHA
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+extern const int av_sha_size;
+
+struct AVSHA;
+
+/**
+ * Allocate an AVSHA context.
+ */
+struct AVSHA *av_sha_alloc(void);
+
+/**
+ * Initialize SHA-1 or SHA-2 hashing.
+ *
+ * @param context pointer to the function context (of size av_sha_size)
+ * @param bits number of bits in digest (SHA-1 - 160 bits, SHA-2 224 or 256 bits)
+ * @return zero if initialization succeeded, -1 otherwise
+ */
+int av_sha_init(struct AVSHA* context, int bits);
+
+/**
+ * Update hash value.
+ *
+ * @param context hash function context
+ * @param data input data to update hash with
+ * @param len input data length
+ */
+void av_sha_update(struct AVSHA* context, const uint8_t* data, unsigned int len);
+
+/**
+ * Finish hashing and output digest value.
+ *
+ * @param context hash function context
+ * @param digest buffer where output digest value is stored
+ */
+void av_sha_final(struct AVSHA* context, uint8_t *digest);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_SHA_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/sha512.h Added

@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (C) 2013 James Almer <jamrial@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_SHA512_H
+#define AVUTIL_SHA512_H
+
+#include <stdint.h>
+
+#include "attributes.h"
+#include "version.h"
+
+/**
+ * @defgroup lavu_sha512 SHA512
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+extern const int av_sha512_size;
+
+struct AVSHA512;
+
+/**
+ * Allocate an AVSHA512 context.
+ */
+struct AVSHA512 *av_sha512_alloc(void);
+
+/**
+ * Initialize SHA-2 512 hashing.
+ *
+ * @param context pointer to the function context (of size av_sha512_size)
+ * @param bits number of bits in digest (224, 256, 384 or 512 bits)
+ * @return zero if initialization succeeded, -1 otherwise
+ */
+int av_sha512_init(struct AVSHA512* context, int bits);
+
+/**
+ * Update hash value.
+ *
+ * @param context hash function context
+ * @param data input data to update hash with
+ * @param len input data length
+ */
+void av_sha512_update(struct AVSHA512* context, const uint8_t* data, unsigned int len);
+
+/**
+ * Finish hashing and output digest value.
+ *
+ * @param context hash function context
+ * @param digest buffer where output digest value is stored
+ */
+void av_sha512_final(struct AVSHA512* context, uint8_t *digest);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_SHA512_H */
+/*
+ * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (C) 2013 James Almer <jamrial@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_SHA512_H
+#define AVUTIL_SHA512_H
+
+#include <stdint.h>
+
+#include "attributes.h"
+#include "version.h"
+
+/**
+ * @defgroup lavu_sha512 SHA512
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+extern const int av_sha512_size;
+
+struct AVSHA512;
+
+/**
+ * Allocate an AVSHA512 context.
+ */
+struct AVSHA512 *av_sha512_alloc(void);
+
+/**
+ * Initialize SHA-2 512 hashing.
+ *
+ * @param context pointer to the function context (of size av_sha512_size)
+ * @param bits number of bits in digest (224, 256, 384 or 512 bits)
+ * @return zero if initialization succeeded, -1 otherwise
+ */
+int av_sha512_init(struct AVSHA512* context, int bits);
+
+/**
+ * Update hash value.
+ *
+ * @param context hash function context
+ * @param data input data to update hash with
+ * @param len input data length
+ */
+void av_sha512_update(struct AVSHA512* context, const uint8_t* data, unsigned int len);
+
+/**
+ * Finish hashing and output digest value.
+ *
+ * @param context hash function context
+ * @param digest buffer where output digest value is stored
+ */
+void av_sha512_final(struct AVSHA512* context, uint8_t *digest);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_SHA512_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/stereo3d.h Added

@@ -0,0 +1,304 @@
+/*
+ * Copyright (c) 2013 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_STEREO3D_H
+#define AVUTIL_STEREO3D_H
+
+#include <stdint.h>
+
+#include "frame.h"
+
+/**
+ * List of possible 3D Types
+ */
+enum AVStereo3DType {
+ /**
+ * Video is not stereoscopic (and metadata has to be there).
+ */
+ AV_STEREO3D_2D,
+
+ /**
+ * Views are next to each other.
+ *
+ * LLLLRRRR
+ * LLLLRRRR
+ * LLLLRRRR
+ * ...
+ */
+ AV_STEREO3D_SIDEBYSIDE,
+
+ /**
+ * Views are on top of each other.
+ *
+ * LLLLLLLL
+ * LLLLLLLL
+ * RRRRRRRR
+ * RRRRRRRR
+ */
+ AV_STEREO3D_TOPBOTTOM,
+
+ /**
+ * Views are alternated temporally.
+ *
+ * frame0 frame1 frame2 ...
+ * LLLLLLLL RRRRRRRR LLLLLLLL
+ * LLLLLLLL RRRRRRRR LLLLLLLL
+ * LLLLLLLL RRRRRRRR LLLLLLLL
+ * ... ... ...
+ */
+ AV_STEREO3D_FRAMESEQUENCE,
+
+ /**
+ * Views are packed in a checkerboard-like structure per pixel.
+ *
+ * LRLRLRLR
+ * RLRLRLRL
+ * LRLRLRLR
+ * ...
+ */
+ AV_STEREO3D_CHECKERBOARD,
+
+ /**
+ * Views are next to each other, but when upscaling
+ * apply a checkerboard pattern.
+ *
+ * LLLLRRRR L L L L R R R R
+ * LLLLRRRR => L L L L R R R R
+ * LLLLRRRR L L L L R R R R
+ * LLLLRRRR L L L L R R R R
+ */
+ AV_STEREO3D_SIDEBYSIDE_QUINCUNX,
+
+ /**
+ * Views are packed per line, as if interlaced.
+ *
+ * LLLLLLLL
+ * RRRRRRRR
+ * LLLLLLLL
+ * ...
+ */
+ AV_STEREO3D_LINES,
+
+ /**
+ * Views are packed per column.
+ *
+ * LRLRLRLR
+ * LRLRLRLR
+ * LRLRLRLR
+ * ...
+ */
+ AV_STEREO3D_COLUMNS,
+};
+
+
+/**
+ * Inverted views, Right/Bottom represents the left view.
+ */
+#define AV_STEREO3D_FLAG_INVERT (1 << 0)
+
+/**
+ * Stereo 3D type: this structure describes how two videos are packed
+ * within a single video surface, with additional information as needed.
+ *
+ * @note The struct must be allocated with av_stereo3d_alloc() and
+ * its size is not a part of the public ABI.
+ */
+typedef struct AVStereo3D {
+ /**
+ * How views are packed within the video.
+ */
+ enum AVStereo3DType type;
+
+ /**
+ * Additional information about the frame packing.
+ */
+ int flags;
+} AVStereo3D;
+
+/**
+ * Allocate an AVStereo3D structure and set its fields to default values.
+ * The resulting struct can be freed using av_freep().
+ *
+ * @return An AVStereo3D filled with default values or NULL on failure.
+ */
+AVStereo3D *av_stereo3d_alloc(void);
+
+/**
+ * Allocate a complete AVFrameSideData and add it to the frame.
+ *
+ * @param frame The frame which side data is added to.
+ *
+ * @return The AVStereo3D structure to be filled by caller.
+ */
+AVStereo3D *av_stereo3d_create_side_data(AVFrame *frame);
+
+#endif /* AVUTIL_STEREO3D_H */
+/*
+ * Copyright (c) 2013 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_STEREO3D_H
+#define AVUTIL_STEREO3D_H
+
+#include <stdint.h>
+
+#include "frame.h"
+
+/**
+ * List of possible 3D Types
+ */
+enum AVStereo3DType {
+ /**
+ * Video is not stereoscopic (and metadata has to be there).
+ */
+ AV_STEREO3D_2D,
+
+ /**
+ * Views are next to each other.
+ *
+ * LLLLRRRR
+ * LLLLRRRR
+ * LLLLRRRR
+ * ...
+ */
+ AV_STEREO3D_SIDEBYSIDE,
+
+ /**
+ * Views are on top of each other.
+ *
+ * LLLLLLLL
+ * LLLLLLLL
+ * RRRRRRRR
+ * RRRRRRRR
+ */
+ AV_STEREO3D_TOPBOTTOM,
+
+ /**
+ * Views are alternated temporally.
+ *
+ * frame0 frame1 frame2 ...
+ * LLLLLLLL RRRRRRRR LLLLLLLL
+ * LLLLLLLL RRRRRRRR LLLLLLLL
+ * LLLLLLLL RRRRRRRR LLLLLLLL
+ * ... ... ...
+ */
+ AV_STEREO3D_FRAMESEQUENCE,
+
+ /**
+ * Views are packed in a checkerboard-like structure per pixel.
+ *
+ * LRLRLRLR
+ * RLRLRLRL
+ * LRLRLRLR
+ * ...
+ */
+ AV_STEREO3D_CHECKERBOARD,
+
+ /**
+ * Views are next to each other, but when upscaling
+ * apply a checkerboard pattern.
+ *
+ * LLLLRRRR L L L L R R R R
+ * LLLLRRRR => L L L L R R R R
+ * LLLLRRRR L L L L R R R R
+ * LLLLRRRR L L L L R R R R
+ */
+ AV_STEREO3D_SIDEBYSIDE_QUINCUNX,
+
+ /**
+ * Views are packed per line, as if interlaced.
+ *
+ * LLLLLLLL
+ * RRRRRRRR
+ * LLLLLLLL
+ * ...
+ */
+ AV_STEREO3D_LINES,
+
+ /**
+ * Views are packed per column.
+ *
+ * LRLRLRLR
+ * LRLRLRLR
+ * LRLRLRLR
+ * ...
+ */
+ AV_STEREO3D_COLUMNS,
+};
+
+
+/**
+ * Inverted views, Right/Bottom represents the left view.
+ */
+#define AV_STEREO3D_FLAG_INVERT (1 << 0)
+
+/**
+ * Stereo 3D type: this structure describes how two videos are packed
+ * within a single video surface, with additional information as needed.
+ *
+ * @note The struct must be allocated with av_stereo3d_alloc() and
+ * its size is not a part of the public ABI.
+ */
+typedef struct AVStereo3D {
+ /**
+ * How views are packed within the video.
+ */
+ enum AVStereo3DType type;
+
+ /**
+ * Additional information about the frame packing.
+ */
+ int flags;
+} AVStereo3D;
+
+/**
+ * Allocate an AVStereo3D structure and set its fields to default values.
+ * The resulting struct can be freed using av_freep().
+ *
+ * @return An AVStereo3D filled with default values or NULL on failure.
+ */
+AVStereo3D *av_stereo3d_alloc(void);
+
+/**
+ * Allocate a complete AVFrameSideData and add it to the frame.
+ *
+ * @param frame The frame which side data is added to.
+ *
+ * @return The AVStereo3D structure to be filled by caller.
+ */
+AVStereo3D *av_stereo3d_create_side_data(AVFrame *frame);
+
+#endif /* AVUTIL_STEREO3D_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/threadmessage.h Added

@@ -0,0 +1,182 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with FFmpeg; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_THREADMESSAGE_H
+#define AVUTIL_THREADMESSAGE_H
+
+typedef struct AVThreadMessageQueue AVThreadMessageQueue;
+
+typedef enum AVThreadMessageFlags {
+
+ /**
+ * Perform non-blocking operation.
+ * If this flag is set, send and recv operations are non-blocking and
+ * return AVERROR(EAGAIN) immediately if they can not proceed.
+ */
+ AV_THREAD_MESSAGE_NONBLOCK = 1,
+
+} AVThreadMessageFlags;
+
+/**
+ * Allocate a new message queue.
+ *
+ * @param mq pointer to the message queue
+ * @param nelem maximum number of elements in the queue
+ * @param elsize size of each element in the queue
+ * @return >=0 for success; <0 for error, in particular AVERROR(ENOSYS) if
+ * lavu was built without thread support
+ */
+int av_thread_message_queue_alloc(AVThreadMessageQueue **mq,
+ unsigned nelem,
+ unsigned elsize);
+
+/**
+ * Free a message queue.
+ *
+ * The message queue must no longer be in use by another thread.
+ */
+void av_thread_message_queue_free(AVThreadMessageQueue **mq);
+
+/**
+ * Send a message on the queue.
+ */
+int av_thread_message_queue_send(AVThreadMessageQueue *mq,
+ void *msg,
+ unsigned flags);
+
+/**
+ * Receive a message from the queue.
+ */
+int av_thread_message_queue_recv(AVThreadMessageQueue *mq,
+ void *msg,
+ unsigned flags);
+
+/**
+ * Set the sending error code.
+ *
+ * If the error code is set to non-zero, av_thread_message_queue_recv() will
+ * return it immediately when there are no longer available messages.
+ * Conventional values, such as AVERROR_EOF or AVERROR(EAGAIN), can be used
+ * to cause the receiving thread to stop or suspend its operation.
+ */
+void av_thread_message_queue_set_err_send(AVThreadMessageQueue *mq,
+ int err);
+
+/**
+ * Set the receiving error code.
+ *
+ * If the error code is set to non-zero, av_thread_message_queue_send() will
+ * return it immediately. Conventional values, such as AVERROR_EOF or
+ * AVERROR(EAGAIN), can be used to cause the sending thread to stop or
+ * suspend its operation.
+ */
+void av_thread_message_queue_set_err_recv(AVThreadMessageQueue *mq,
+ int err);
+
+#endif /* AVUTIL_THREADMESSAGE_H */
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with FFmpeg; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_THREADMESSAGE_H
+#define AVUTIL_THREADMESSAGE_H
+
+typedef struct AVThreadMessageQueue AVThreadMessageQueue;
+
+typedef enum AVThreadMessageFlags {
+
+ /**
+ * Perform non-blocking operation.
+ * If this flag is set, send and recv operations are non-blocking and
+ * return AVERROR(EAGAIN) immediately if they can not proceed.
+ */
+ AV_THREAD_MESSAGE_NONBLOCK = 1,
+
+} AVThreadMessageFlags;
+
+/**
+ * Allocate a new message queue.
+ *
+ * @param mq pointer to the message queue
+ * @param nelem maximum number of elements in the queue
+ * @param elsize size of each element in the queue
+ * @return >=0 for success; <0 for error, in particular AVERROR(ENOSYS) if
+ * lavu was built without thread support
+ */
+int av_thread_message_queue_alloc(AVThreadMessageQueue **mq,
+ unsigned nelem,
+ unsigned elsize);
+
+/**
+ * Free a message queue.
+ *
+ * The message queue must no longer be in use by another thread.
+ */
+void av_thread_message_queue_free(AVThreadMessageQueue **mq);
+
+/**
+ * Send a message on the queue.
+ */
+int av_thread_message_queue_send(AVThreadMessageQueue *mq,
+ void *msg,
+ unsigned flags);
+
+/**
+ * Receive a message from the queue.
+ */
+int av_thread_message_queue_recv(AVThreadMessageQueue *mq,
+ void *msg,
+ unsigned flags);
+
+/**
+ * Set the sending error code.
+ *
+ * If the error code is set to non-zero, av_thread_message_queue_recv() will
+ * return it immediately when there are no longer available messages.
+ * Conventional values, such as AVERROR_EOF or AVERROR(EAGAIN), can be used
+ * to cause the receiving thread to stop or suspend its operation.
+ */
+void av_thread_message_queue_set_err_send(AVThreadMessageQueue *mq,
+ int err);
+
+/**
+ * Set the receiving error code.
+ *
+ * If the error code is set to non-zero, av_thread_message_queue_send() will
+ * return it immediately. Conventional values, such as AVERROR_EOF or
+ * AVERROR(EAGAIN), can be used to cause the sending thread to stop or
+ * suspend its operation.
+ */
+void av_thread_message_queue_set_err_recv(AVThreadMessageQueue *mq,
+ int err);
+
+#endif /* AVUTIL_THREADMESSAGE_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/time.h Added

@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2000-2003 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_TIME_H
+#define AVUTIL_TIME_H
+
+#include <stdint.h>
+
+/**
+ * Get the current time in microseconds.
+ */
+int64_t av_gettime(void);
+
+/**
+ * Get the current time in microseconds since some unspecified starting point.
+ * On platforms that support it, the time comes from a monotonic clock
+ * This property makes this time source ideal for measuring relative time.
+ * If a monotonic clock is not available on the targeted platform, the
+ * implementation fallsback on using av_gettime().
+ */
+int64_t av_gettime_relative(void);
+
+/**
+ * Indicates with a boolean result if the av_gettime_relative() time source
+ * is monotonic.
+ */
+int av_gettime_relative_is_monotonic(void);
+
+/**
+ * Sleep for a period of time. Although the duration is expressed in
+ * microseconds, the actual delay may be rounded to the precision of the
+ * system timer.
+ *
+ * @param usec Number of microseconds to sleep.
+ * @return zero on success or (negative) error code.
+ */
+int av_usleep(unsigned usec);
+
+#endif /* AVUTIL_TIME_H */
+/*
+ * Copyright (c) 2000-2003 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_TIME_H
+#define AVUTIL_TIME_H
+
+#include <stdint.h>
+
+/**
+ * Get the current time in microseconds.
+ */
+int64_t av_gettime(void);
+
+/**
+ * Get the current time in microseconds since some unspecified starting point.
+ * On platforms that support it, the time comes from a monotonic clock
+ * This property makes this time source ideal for measuring relative time.
+ * If a monotonic clock is not available on the targeted platform, the
+ * implementation fallsback on using av_gettime().
+ */
+int64_t av_gettime_relative(void);
+
+/**
+ * Indicates with a boolean result if the av_gettime_relative() time source
+ * is monotonic.
+ */
+int av_gettime_relative_is_monotonic(void);
+
+/**
+ * Sleep for a period of time. Although the duration is expressed in
+ * microseconds, the actual delay may be rounded to the precision of the
+ * system timer.
+ *
+ * @param usec Number of microseconds to sleep.
+ * @return zero on success or (negative) error code.
+ */
+int av_usleep(unsigned usec);
+
+#endif /* AVUTIL_TIME_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/timecode.h Added

@@ -0,0 +1,280 @@
+/*
+ * Copyright (c) 2006 Smartjog S.A.S, Baptiste Coudurier <baptiste.coudurier@gmail.com>
+ * Copyright (c) 2011-2012 Smartjog S.A.S, Clément Bœsch <clement.boesch@smartjog.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Timecode helpers header
+ */
+
+#ifndef AVUTIL_TIMECODE_H
+#define AVUTIL_TIMECODE_H
+
+#include <stdint.h>
+#include "rational.h"
+
+#define AV_TIMECODE_STR_SIZE 16
+
+enum AVTimecodeFlag {
+ AV_TIMECODE_FLAG_DROPFRAME = 1<<0, ///< timecode is drop frame
+ AV_TIMECODE_FLAG_24HOURSMAX = 1<<1, ///< timecode wraps after 24 hours
+ AV_TIMECODE_FLAG_ALLOWNEGATIVE = 1<<2, ///< negative time values are allowed
+};
+
+typedef struct {
+ int start; ///< timecode frame start (first base frame number)
+ uint32_t flags; ///< flags such as drop frame, +24 hours support, ...
+ AVRational rate; ///< frame rate in rational form
+ unsigned fps; ///< frame per second; must be consistent with the rate field
+} AVTimecode;
+
+/**
+ * Adjust frame number for NTSC drop frame time code.
+ *
+ * @param framenum frame number to adjust
+ * @param fps frame per second, 30 or 60
+ * @return adjusted frame number
+ * @warning adjustment is only valid in NTSC 29.97 and 59.94
+ */
+int av_timecode_adjust_ntsc_framenum2(int framenum, int fps);
+
+/**
+ * Convert frame number to SMPTE 12M binary representation.
+ *
+ * @param tc timecode data correctly initialized
+ * @param framenum frame number
+ * @return the SMPTE binary representation
+ *
+ * @note Frame number adjustment is automatically done in case of drop timecode,
+ * you do NOT have to call av_timecode_adjust_ntsc_framenum2().
+ * @note The frame number is relative to tc->start.
+ * @note Color frame (CF), binary group flags (BGF) and biphase mark polarity
+ * correction (PC) bits are set to zero.
+ */
+uint32_t av_timecode_get_smpte_from_framenum(const AVTimecode *tc, int framenum);
+
+/**
+ * Load timecode string in buf.
+ *
+ * @param buf destination buffer, must be at least AV_TIMECODE_STR_SIZE long
+ * @param tc timecode data correctly initialized
+ * @param framenum frame number
+ * @return the buf parameter
+ *
+ * @note Timecode representation can be a negative timecode and have more than
+ * 24 hours, but will only be honored if the flags are correctly set.
+ * @note The frame number is relative to tc->start.
+ */
+char *av_timecode_make_string(const AVTimecode *tc, char *buf, int framenum);
+
+/**
+ * Get the timecode string from the SMPTE timecode format.
+ *
+ * @param buf destination buffer, must be at least AV_TIMECODE_STR_SIZE long
+ * @param tcsmpte the 32-bit SMPTE timecode
+ * @param prevent_df prevent the use of a drop flag when it is known the DF bit
+ * is arbitrary
+ * @return the buf parameter
+ */
+char *av_timecode_make_smpte_tc_string(char *buf, uint32_t tcsmpte, int prevent_df);
+
+/**
+ * Get the timecode string from the 25-bit timecode format (MPEG GOP format).
+ *
+ * @param buf destination buffer, must be at least AV_TIMECODE_STR_SIZE long
+ * @param tc25bit the 25-bits timecode
+ * @return the buf parameter
+ */
+char *av_timecode_make_mpeg_tc_string(char *buf, uint32_t tc25bit);
+
+/**
+ * Init a timecode struct with the passed parameters.
+ *
+ * @param log_ctx a pointer to an arbitrary struct of which the first field
+ * is a pointer to an AVClass struct (used for av_log)
+ * @param tc pointer to an allocated AVTimecode
+ * @param rate frame rate in rational form
+ * @param flags miscellaneous flags such as drop frame, +24 hours, ...
+ * (see AVTimecodeFlag)
+ * @param frame_start the first frame number
+ * @return 0 on success, AVERROR otherwise
+ */
+int av_timecode_init(AVTimecode *tc, AVRational rate, int flags, int frame_start, void *log_ctx);
+
+/**
+ * Parse timecode representation (hh:mm:ss[:;.]ff).
+ *
+ * @param log_ctx a pointer to an arbitrary struct of which the first field is a
+ * pointer to an AVClass struct (used for av_log).
+ * @param tc pointer to an allocated AVTimecode
+ * @param rate frame rate in rational form
+ * @param str timecode string which will determine the frame start
+ * @return 0 on success, AVERROR otherwise
+ */
+int av_timecode_init_from_string(AVTimecode *tc, AVRational rate, const char *str, void *log_ctx);
+
+/**
+ * Check if the timecode feature is available for the given frame rate
+ *
+ * @return 0 if supported, <0 otherwise
+ */
+int av_timecode_check_frame_rate(AVRational rate);
+
+#endif /* AVUTIL_TIMECODE_H */
+/*
+ * Copyright (c) 2006 Smartjog S.A.S, Baptiste Coudurier <baptiste.coudurier@gmail.com>
+ * Copyright (c) 2011-2012 Smartjog S.A.S, Clément Bœsch <clement.boesch@smartjog.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Timecode helpers header
+ */
+
+#ifndef AVUTIL_TIMECODE_H
+#define AVUTIL_TIMECODE_H
+
+#include <stdint.h>
+#include "rational.h"
+
+#define AV_TIMECODE_STR_SIZE 16
+
+enum AVTimecodeFlag {
+ AV_TIMECODE_FLAG_DROPFRAME = 1<<0, ///< timecode is drop frame
+ AV_TIMECODE_FLAG_24HOURSMAX = 1<<1, ///< timecode wraps after 24 hours
+ AV_TIMECODE_FLAG_ALLOWNEGATIVE = 1<<2, ///< negative time values are allowed
+};
+
+typedef struct {
+ int start; ///< timecode frame start (first base frame number)
+ uint32_t flags; ///< flags such as drop frame, +24 hours support, ...
+ AVRational rate; ///< frame rate in rational form
+ unsigned fps; ///< frame per second; must be consistent with the rate field
+} AVTimecode;
+
+/**
+ * Adjust frame number for NTSC drop frame time code.
+ *
+ * @param framenum frame number to adjust
+ * @param fps frame per second, 30 or 60
+ * @return adjusted frame number
+ * @warning adjustment is only valid in NTSC 29.97 and 59.94
+ */
+int av_timecode_adjust_ntsc_framenum2(int framenum, int fps);
+
+/**
+ * Convert frame number to SMPTE 12M binary representation.
+ *
+ * @param tc timecode data correctly initialized
+ * @param framenum frame number
+ * @return the SMPTE binary representation
+ *
+ * @note Frame number adjustment is automatically done in case of drop timecode,
+ * you do NOT have to call av_timecode_adjust_ntsc_framenum2().
+ * @note The frame number is relative to tc->start.
+ * @note Color frame (CF), binary group flags (BGF) and biphase mark polarity
+ * correction (PC) bits are set to zero.
+ */
+uint32_t av_timecode_get_smpte_from_framenum(const AVTimecode *tc, int framenum);
+
+/**
+ * Load timecode string in buf.
+ *
+ * @param buf destination buffer, must be at least AV_TIMECODE_STR_SIZE long
+ * @param tc timecode data correctly initialized
+ * @param framenum frame number
+ * @return the buf parameter
+ *
+ * @note Timecode representation can be a negative timecode and have more than
+ * 24 hours, but will only be honored if the flags are correctly set.
+ * @note The frame number is relative to tc->start.
+ */
+char *av_timecode_make_string(const AVTimecode *tc, char *buf, int framenum);
+
+/**
+ * Get the timecode string from the SMPTE timecode format.
+ *
+ * @param buf destination buffer, must be at least AV_TIMECODE_STR_SIZE long
+ * @param tcsmpte the 32-bit SMPTE timecode
+ * @param prevent_df prevent the use of a drop flag when it is known the DF bit
+ * is arbitrary
+ * @return the buf parameter
+ */
+char *av_timecode_make_smpte_tc_string(char *buf, uint32_t tcsmpte, int prevent_df);
+
+/**
+ * Get the timecode string from the 25-bit timecode format (MPEG GOP format).
+ *
+ * @param buf destination buffer, must be at least AV_TIMECODE_STR_SIZE long
+ * @param tc25bit the 25-bits timecode
+ * @return the buf parameter
+ */
+char *av_timecode_make_mpeg_tc_string(char *buf, uint32_t tc25bit);
+
+/**
+ * Init a timecode struct with the passed parameters.
+ *
+ * @param log_ctx a pointer to an arbitrary struct of which the first field
+ * is a pointer to an AVClass struct (used for av_log)
+ * @param tc pointer to an allocated AVTimecode
+ * @param rate frame rate in rational form
+ * @param flags miscellaneous flags such as drop frame, +24 hours, ...
+ * (see AVTimecodeFlag)
+ * @param frame_start the first frame number
+ * @return 0 on success, AVERROR otherwise
+ */
+int av_timecode_init(AVTimecode *tc, AVRational rate, int flags, int frame_start, void *log_ctx);
+
+/**
+ * Parse timecode representation (hh:mm:ss[:;.]ff).
+ *
+ * @param log_ctx a pointer to an arbitrary struct of which the first field is a
+ * pointer to an AVClass struct (used for av_log).
+ * @param tc pointer to an allocated AVTimecode
+ * @param rate frame rate in rational form
+ * @param str timecode string which will determine the frame start
+ * @return 0 on success, AVERROR otherwise
+ */
+int av_timecode_init_from_string(AVTimecode *tc, AVRational rate, const char *str, void *log_ctx);
+
+/**
+ * Check if the timecode feature is available for the given frame rate
+ *
+ * @return 0 if supported, <0 otherwise
+ */
+int av_timecode_check_frame_rate(AVRational rate);
+
+#endif /* AVUTIL_TIMECODE_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/timestamp.h Added

@@ -0,0 +1,156 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * timestamp utils, mostly useful for debugging/logging purposes
+ */
+
+#ifndef AVUTIL_TIMESTAMP_H
+#define AVUTIL_TIMESTAMP_H
+
+#include "common.h"
+
+#if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) && !defined(PRId64)
+#error missing -D__STDC_FORMAT_MACROS / #define __STDC_FORMAT_MACROS
+#endif
+
+#define AV_TS_MAX_STRING_SIZE 32
+
+/**
+ * Fill the provided buffer with a string containing a timestamp
+ * representation.
+ *
+ * @param buf a buffer with size in bytes of at least AV_TS_MAX_STRING_SIZE
+ * @param ts the timestamp to represent
+ * @return the buffer in input
+ */
+static inline char *av_ts_make_string(char *buf, int64_t ts)
+{
+    if (ts == AV_NOPTS_VALUE) snprintf(buf, AV_TS_MAX_STRING_SIZE, "NOPTS");
+    else                      snprintf(buf, AV_TS_MAX_STRING_SIZE, "%"PRId64, ts);
+    return buf;
+}
+
+/**
+ * Convenience macro, the return value should be used only directly in
+ * function arguments but never stand-alone.
+ */
+#define av_ts2str(ts) av_ts_make_string((char[AV_TS_MAX_STRING_SIZE]){0}, ts)
+
+/**
+ * Fill the provided buffer with a string containing a timestamp time
+ * representation.
+ *
+ * @param buf a buffer with size in bytes of at least AV_TS_MAX_STRING_SIZE
+ * @param ts the timestamp to represent
+ * @param tb the timebase of the timestamp
+ * @return the buffer in input
+ */
+static inline char *av_ts_make_time_string(char *buf, int64_t ts, AVRational *tb)
+{
+    if (ts == AV_NOPTS_VALUE) snprintf(buf, AV_TS_MAX_STRING_SIZE, "NOPTS");
+    else                      snprintf(buf, AV_TS_MAX_STRING_SIZE, "%.6g", av_q2d(*tb) * ts);
+    return buf;
+}
+
+/**
+ * Convenience macro, the return value should be used only directly in
+ * function arguments but never stand-alone.
+ */
+#define av_ts2timestr(ts, tb) av_ts_make_time_string((char[AV_TS_MAX_STRING_SIZE]){0}, ts, tb)
+
+#endif /* AVUTIL_TIMESTAMP_H */
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * timestamp utils, mostly useful for debugging/logging purposes
+ */
+
+#ifndef AVUTIL_TIMESTAMP_H
+#define AVUTIL_TIMESTAMP_H
+
+#include "common.h"
+
+#if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) && !defined(PRId64)
+#error missing -D__STDC_FORMAT_MACROS / #define __STDC_FORMAT_MACROS
+#endif
+
+#define AV_TS_MAX_STRING_SIZE 32
+
+/**
+ * Fill the provided buffer with a string containing a timestamp
+ * representation.
+ *
+ * @param buf a buffer with size in bytes of at least AV_TS_MAX_STRING_SIZE
+ * @param ts the timestamp to represent
+ * @return the buffer in input
+ */
+static inline char *av_ts_make_string(char *buf, int64_t ts)
+{
+    if (ts == AV_NOPTS_VALUE) snprintf(buf, AV_TS_MAX_STRING_SIZE, "NOPTS");
+    else                      snprintf(buf, AV_TS_MAX_STRING_SIZE, "%"PRId64, ts);
+    return buf;
+}
+
+/**
+ * Convenience macro, the return value should be used only directly in
+ * function arguments but never stand-alone.
+ */
+#define av_ts2str(ts) av_ts_make_string((char[AV_TS_MAX_STRING_SIZE]){0}, ts)
+
+/**
+ * Fill the provided buffer with a string containing a timestamp time
+ * representation.
+ *
+ * @param buf a buffer with size in bytes of at least AV_TS_MAX_STRING_SIZE
+ * @param ts the timestamp to represent
+ * @param tb the timebase of the timestamp
+ * @return the buffer in input
+ */
+static inline char *av_ts_make_time_string(char *buf, int64_t ts, AVRational *tb)
+{
+    if (ts == AV_NOPTS_VALUE) snprintf(buf, AV_TS_MAX_STRING_SIZE, "NOPTS");
+    else                      snprintf(buf, AV_TS_MAX_STRING_SIZE, "%.6g", av_q2d(*tb) * ts);
+    return buf;
+}
+
+/**
+ * Convenience macro, the return value should be used only directly in
+ * function arguments but never stand-alone.
+ */
+#define av_ts2timestr(ts, tb) av_ts_make_time_string((char[AV_TS_MAX_STRING_SIZE]){0}, ts, tb)
+
+#endif /* AVUTIL_TIMESTAMP_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/version.h Added

@@ -0,0 +1,310 @@
+/*
+ * copyright (c) 2003 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_VERSION_H
+#define AVUTIL_VERSION_H
+
+#include "macros.h"
+
+/**
+ * @addtogroup version_utils
+ *
+ * Useful to check and match library version in order to maintain
+ * backward compatibility.
+ *
+ * @{
+ */
+
+#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
+#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
+#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
+
+/**
+ * @}
+ */
+
+/**
+ * @file
+ * @ingroup lavu
+ * Libavutil version macros
+ */
+
+/**
+ * @defgroup lavu_ver Version and Build diagnostics
+ *
+ * Macros and function useful to check at compiletime and at runtime
+ * which version of libavutil is in use.
+ *
+ * @{
+ */
+
+#define LIBAVUTIL_VERSION_MAJOR 54
+#define LIBAVUTIL_VERSION_MINOR 7
+#define LIBAVUTIL_VERSION_MICRO 100
+
+#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
+ LIBAVUTIL_VERSION_MINOR, \
+ LIBAVUTIL_VERSION_MICRO)
+#define LIBAVUTIL_VERSION AV_VERSION(LIBAVUTIL_VERSION_MAJOR, \
+ LIBAVUTIL_VERSION_MINOR, \
+ LIBAVUTIL_VERSION_MICRO)
+#define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT
+
+#define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
+
+/**
+ * @}
+ *
+ * @defgroup depr_guards Deprecation guards
+ * FF_API_* defines may be placed below to indicate public API that will be
+ * dropped at a future version bump. The defines themselves are not part of
+ * the public API and may change, break or disappear at any time.
+ *
+ * @{
+ */
+
+#ifndef FF_API_GET_BITS_PER_SAMPLE_FMT
+#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_FIND_OPT
+#define FF_API_FIND_OPT (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OLD_AVOPTIONS
+#define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_PIX_FMT
+#define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_CONTEXT_SIZE
+#define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_PIX_FMT_DESC
+#define FF_API_PIX_FMT_DESC (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_AV_REVERSE
+#define FF_API_AV_REVERSE (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_AUDIOCONVERT
+#define FF_API_AUDIOCONVERT (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_CPU_FLAG_MMX2
+#define FF_API_CPU_FLAG_MMX2 (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_SAMPLES_UTILS_RETURN_ZERO
+#define FF_API_SAMPLES_UTILS_RETURN_ZERO (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_LLS_PRIVATE
+#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_LLS1
+#define FF_API_LLS1 (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_AVFRAME_LAVC
+#define FF_API_AVFRAME_LAVC (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_VDPAU
+#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_GET_CHANNEL_LAYOUT_COMPAT
+#define FF_API_GET_CHANNEL_LAYOUT_COMPAT (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_OLD_OPENCL
+#define FF_API_OLD_OPENCL (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_XVMC
+#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_INTFLOAT
+#define FF_API_INTFLOAT (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OPT_TYPE_METADATA
+#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+
+
+#ifndef FF_CONST_AVUTIL53
+#if LIBAVUTIL_VERSION_MAJOR >= 53
+#define FF_CONST_AVUTIL53 const
+#else
+#define FF_CONST_AVUTIL53
+#endif
+#endif
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_VERSION_H */
+
+/*
+ * copyright (c) 2003 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_VERSION_H
+#define AVUTIL_VERSION_H
+
+#include "macros.h"
+
+/**
+ * @addtogroup version_utils
+ *
+ * Useful to check and match library version in order to maintain
+ * backward compatibility.
+ *
+ * @{
+ */
+
+#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
+#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
+#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
+
+/**
+ * @}
+ */
+
+/**
+ * @file
+ * @ingroup lavu
+ * Libavutil version macros
+ */
+
+/**
+ * @defgroup lavu_ver Version and Build diagnostics
+ *
+ * Macros and function useful to check at compiletime and at runtime
+ * which version of libavutil is in use.
+ *
+ * @{
+ */
+
+#define LIBAVUTIL_VERSION_MAJOR 54
+#define LIBAVUTIL_VERSION_MINOR 7
+#define LIBAVUTIL_VERSION_MICRO 100
+
+#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
+ LIBAVUTIL_VERSION_MINOR, \
+ LIBAVUTIL_VERSION_MICRO)
+#define LIBAVUTIL_VERSION AV_VERSION(LIBAVUTIL_VERSION_MAJOR, \
+ LIBAVUTIL_VERSION_MINOR, \
+ LIBAVUTIL_VERSION_MICRO)
+#define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT
+
+#define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
+
+/**
+ * @}
+ *
+ * @defgroup depr_guards Deprecation guards
+ * FF_API_* defines may be placed below to indicate public API that will be
+ * dropped at a future version bump. The defines themselves are not part of
+ * the public API and may change, break or disappear at any time.
+ *
+ * @{
+ */
+
+#ifndef FF_API_GET_BITS_PER_SAMPLE_FMT
+#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_FIND_OPT
+#define FF_API_FIND_OPT (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OLD_AVOPTIONS
+#define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_PIX_FMT
+#define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_CONTEXT_SIZE
+#define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_PIX_FMT_DESC
+#define FF_API_PIX_FMT_DESC (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_AV_REVERSE
+#define FF_API_AV_REVERSE (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_AUDIOCONVERT
+#define FF_API_AUDIOCONVERT (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_CPU_FLAG_MMX2
+#define FF_API_CPU_FLAG_MMX2 (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_SAMPLES_UTILS_RETURN_ZERO
+#define FF_API_SAMPLES_UTILS_RETURN_ZERO (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_LLS_PRIVATE
+#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_LLS1
+#define FF_API_LLS1 (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_AVFRAME_LAVC
+#define FF_API_AVFRAME_LAVC (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_VDPAU
+#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_GET_CHANNEL_LAYOUT_COMPAT
+#define FF_API_GET_CHANNEL_LAYOUT_COMPAT (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_OLD_OPENCL
+#define FF_API_OLD_OPENCL (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_XVMC
+#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_INTFLOAT
+#define FF_API_INTFLOAT (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OPT_TYPE_METADATA
+#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
+
+
+#ifndef FF_CONST_AVUTIL53
+#if LIBAVUTIL_VERSION_MAJOR >= 53
+#define FF_CONST_AVUTIL53 const
+#else
+#define FF_CONST_AVUTIL53
+#endif
+#endif
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_VERSION_H */
+

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libavutil/xtea.h Added

@@ -0,0 +1,128 @@
+/*
+ * A 32-bit implementation of the XTEA algorithm
+ * Copyright (c) 2012 Samuel Pitoiset
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_XTEA_H
+#define AVUTIL_XTEA_H
+
+#include <stdint.h>
+
+/**
+ * @file
+ * @brief Public header for libavutil XTEA algorithm
+ * @defgroup lavu_xtea XTEA
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+typedef struct AVXTEA {
+ uint32_t key[16];
+} AVXTEA;
+
+/**
+ * Initialize an AVXTEA context.
+ *
+ * @param ctx an AVXTEA context
+ * @param key a key of 16 bytes used for encryption/decryption
+ */
+void av_xtea_init(struct AVXTEA *ctx, const uint8_t key[16]);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ *
+ * @param ctx an AVXTEA context
+ * @param dst destination array, can be equal to src
+ * @param src source array, can be equal to dst
+ * @param count number of 8 byte blocks
+ * @param iv initialization vector for CBC mode, if NULL then ECB will be used
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_xtea_crypt(struct AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
+ int count, uint8_t *iv, int decrypt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_XTEA_H */
+/*
+ * A 32-bit implementation of the XTEA algorithm
+ * Copyright (c) 2012 Samuel Pitoiset
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_XTEA_H
+#define AVUTIL_XTEA_H
+
+#include <stdint.h>
+
+/**
+ * @file
+ * @brief Public header for libavutil XTEA algorithm
+ * @defgroup lavu_xtea XTEA
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+typedef struct AVXTEA {
+ uint32_t key[16];
+} AVXTEA;
+
+/**
+ * Initialize an AVXTEA context.
+ *
+ * @param ctx an AVXTEA context
+ * @param key a key of 16 bytes used for encryption/decryption
+ */
+void av_xtea_init(struct AVXTEA *ctx, const uint8_t key[16]);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ *
+ * @param ctx an AVXTEA context
+ * @param dst destination array, can be equal to src
+ * @param src source array, can be equal to dst
+ * @param count number of 8 byte blocks
+ * @param iv initialization vector for CBC mode, if NULL then ECB will be used
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_xtea_crypt(struct AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
+ int count, uint8_t *iv, int decrypt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_XTEA_H */

gpac-0.5.1.svn5491.tar.xz/extra_lib/include/ffmpeg_android/libswscale/swscale.h -> gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libswscale/swscale.h Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2003 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (C) 2001-2011 Michael Niedermayer <michaelni@gmx.at>
 *
 * This file is part of FFmpeg.
 *
@@ -23,38 +23,32 @@
 
 /**
 * @file
- * @brief
- * external api for the swscale stuff
+ * @ingroup libsws
+ * external API header
 */
 
-#include "libavutil/avutil.h"
-
-#define LIBSWSCALE_VERSION_MAJOR 0
-#define LIBSWSCALE_VERSION_MINOR 11
-#define LIBSWSCALE_VERSION_MICRO 0
-
-#define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
- LIBSWSCALE_VERSION_MINOR, \
- LIBSWSCALE_VERSION_MICRO)
-#define LIBSWSCALE_VERSION AV_VERSION(LIBSWSCALE_VERSION_MAJOR, \
- LIBSWSCALE_VERSION_MINOR, \
- LIBSWSCALE_VERSION_MICRO)
-#define LIBSWSCALE_BUILD LIBSWSCALE_VERSION_INT
+#include <stdint.h>
 
-#define LIBSWSCALE_IDENT "SwS" AV_STRINGIFY(LIBSWSCALE_VERSION)
+#include "libavutil/avutil.h"
+#include "libavutil/log.h"
+#include "libavutil/pixfmt.h"
+#include "version.h"
 
 /**
- * Returns the LIBSWSCALE_VERSION_INT constant.
+ * @defgroup libsws Color conversion and scaling
+ * @{
+ *
+ * Return the LIBSWSCALE_VERSION_INT constant.
 */
 unsigned swscale_version(void);
 
 /**
- * Returns the libswscale build-time configuration.
+ * Return the libswscale build-time configuration.
 */
 const char *swscale_configuration(void);
 
 /**
- * Returns the libswscale license.
+ * Return the libswscale license.
 */
 const char *swscale_license(void);
 
@@ -86,12 +80,23 @@
 #define SWS_DIRECT_BGR 0x8000
 #define SWS_ACCURATE_RND 0x40000
 #define SWS_BITEXACT 0x80000
+#define SWS_ERROR_DIFFUSION 0x800000
 
+#if FF_API_SWS_CPU_CAPS
+/**
+ * CPU caps are autodetected now, those flags
+ * are only provided for API compatibility.
+ */
 #define SWS_CPU_CAPS_MMX 0x80000000
+#define SWS_CPU_CAPS_MMXEXT 0x20000000
 #define SWS_CPU_CAPS_MMX2 0x20000000
 #define SWS_CPU_CAPS_3DNOW 0x40000000
 #define SWS_CPU_CAPS_ALTIVEC 0x10000000
+#if FF_API_ARCH_BFIN
 #define SWS_CPU_CAPS_BFIN 0x01000000
+#endif
+#define SWS_CPU_CAPS_SSE2 0x02000000
+#endif
 
 #define SWS_MAX_REDUCE_CUTOFF 0.002
 
@@ -104,7 +109,7 @@
 #define SWS_CS_DEFAULT 5
 
 /**
- * Returns a pointer to yuv<->rgb coefficients for the given colorspace
+ * Return a pointer to yuv<->rgb coefficients for the given colorspace
 * suitable for sws_setColorspaceDetails().
 *
 * @param colorspace One of the SWS_CS_* macros. If invalid,
@@ -112,16 +117,15 @@
 */
 const int *sws_getCoefficients(int colorspace);
 
-
 // when used for filters they must have an odd number of elements
 // coeffs cannot be shared between vectors
-typedef struct {
+typedef struct SwsVector {
 double *coeff; ///< pointer to the list of coefficients
 int length; ///< number of coefficients in the vector
 } SwsVector;
 
 // vectors can be shared
-typedef struct {
+typedef struct SwsFilter {
 SwsVector *lumH;
 SwsVector *lumV;
 SwsVector *chrH;
@@ -131,25 +135,47 @@
 struct SwsContext;
 
 /**
- * Returns a positive value if pix_fmt is a supported input format, 0
+ * Return a positive value if pix_fmt is a supported input format, 0
 * otherwise.
 */
-int sws_isSupportedInput(enum PixelFormat pix_fmt);
+int sws_isSupportedInput(enum AVPixelFormat pix_fmt);
 
 /**
- * Returns a positive value if pix_fmt is a supported output format, 0
+ * Return a positive value if pix_fmt is a supported output format, 0
 * otherwise.
 */
-int sws_isSupportedOutput(enum PixelFormat pix_fmt);
+int sws_isSupportedOutput(enum AVPixelFormat pix_fmt);
+
+/**
+ * @param[in] pix_fmt the pixel format
+ * @return a positive value if an endianness conversion for pix_fmt is
+ * supported, 0 otherwise.
+ */
+int sws_isSupportedEndiannessConversion(enum AVPixelFormat pix_fmt);
 
 /**
- * Frees the swscaler context swsContext.
+ * Allocate an empty SwsContext. This must be filled and passed to
+ * sws_init_context(). For filling see AVOptions, options.c and
+ * sws_setColorspaceDetails().
+ */
+struct SwsContext *sws_alloc_context(void);
+
+/**
+ * Initialize the swscaler context sws_context.
+ *
+ * @return zero or positive value on success, a negative value on
+ * error
+ */
+int sws_init_context(struct SwsContext *sws_context, SwsFilter *srcFilter, SwsFilter *dstFilter);
+
+/**
+ * Free the swscaler context swsContext.
 * If swsContext is NULL, then does nothing.
 */
 void sws_freeContext(struct SwsContext *swsContext);
 
 /**
- * Allocates and returns a SwsContext. You need it to perform
+ * Allocate and return an SwsContext. You need it to perform
 * scaling/conversion operations using sws_scale().
 *
 * @param srcW the width of the source image
@@ -160,14 +186,16 @@
 * @param dstFormat the destination image format
 * @param flags specify which algorithm and options to use for rescaling
 * @return a pointer to an allocated context, or NULL in case of error
+ * @note this function is to be removed after a saner alternative is
+ * written
 */
-struct SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat,
- int dstW, int dstH, enum PixelFormat dstFormat,
+struct SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat,
+ int dstW, int dstH, enum AVPixelFormat dstFormat,
 int flags, SwsFilter *srcFilter,
 SwsFilter *dstFilter, const double *param);
 
 /**
- * Scales the image slice in srcSlice and puts the resulting scaled
+ * Scale the image slice in srcSlice and put the resulting scaled
 * slice in the image in dst. A slice is a sequence of consecutive
 * rows in an image.
 *
@@ -175,7 +203,7 @@
 * top-bottom or bottom-top order. If slices are provided in
 * non-sequential order the behavior of the function is undefined.
 *
- * @param context the scaling context previously created with
+ * @param c the scaling context previously created with
 * sws_getContext()
 * @param srcSlice the array containing the pointers to the planes of
 * the source slice
@@ -192,20 +220,18 @@
 * the destination image
 * @return the height of the output slice
 */
-int sws_scale(struct SwsContext *context, const uint8_t* const srcSlice[], const int srcStride[],
- int srcSliceY, int srcSliceH, uint8_t* const dst[], const int dstStride[]);
-#if LIBSWSCALE_VERSION_MAJOR < 1
-/**
- * @deprecated Use sws_scale() instead.
- */
-int sws_scale_ordered(struct SwsContext *context, const uint8_t* const src[],
- int srcStride[], int srcSliceY, int srcSliceH,
- uint8_t* dst[], int dstStride[]) attribute_deprecated;
-#endif
+int sws_scale(struct SwsContext *c, const uint8_t *const srcSlice[],
+ const int srcStride[], int srcSliceY, int srcSliceH,
+ uint8_t *const dst[], const int dstStride[]);
 
 /**
- * @param inv_table the yuv2rgb coefficients, normally ff_yuv2rgb_coeffs[x]
- * @param fullRange if 1 then the luma range is 0..255 if 0 it is 16..235
+ * @param dstRange flag indicating the while-black range of the output (1=jpeg / 0=mpeg)
+ * @param srcRange flag indicating the while-black range of the input (1=jpeg / 0=mpeg)
+ * @param table the yuv2rgb coefficients describing the output yuv space, normally ff_yuv2rgb_coeffs[x]
+ * @param inv_table the yuv2rgb coefficients describing the input yuv space, normally ff_yuv2rgb_coeffs[x]
+ * @param brightness 16.16 fixed point brightness correction
+ * @param contrast 16.16 fixed point contrast correction
+ * @param saturation 16.16 fixed point saturation correction
 * @return -1 if not supported
 */
 int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4],
@@ -220,35 +246,35 @@
 int *brightness, int *contrast, int *saturation);
 
 /**
- * Allocates and returns an uninitialized vector with length coefficients.
+ * Allocate and return an uninitialized vector with length coefficients.
 */
 SwsVector *sws_allocVec(int length);
 
 /**
- * Returns a normalized Gaussian curve used to filter stuff
- * quality=3 is high quality, lower is lower quality.
+ * Return a normalized Gaussian curve used to filter stuff
+ * quality = 3 is high quality, lower is lower quality.
 */
 SwsVector *sws_getGaussianVec(double variance, double quality);
 
 /**
- * Allocates and returns a vector with length coefficients, all
+ * Allocate and return a vector with length coefficients, all
 * with the same value c.
 */
 SwsVector *sws_getConstVec(double c, int length);
 
 /**
- * Allocates and returns a vector with just one coefficient, with
+ * Allocate and return a vector with just one coefficient, with
 * value 1.0.
 */
 SwsVector *sws_getIdentityVec(void);
 
 /**
- * Scales all the coefficients of a by the scalar value.
+ * Scale all the coefficients of a by the scalar value.
 */
 void sws_scaleVec(SwsVector *a, double scalar);
 
 /**
- * Scales all the coefficients of a so that their sum equals height.
+ * Scale all the coefficients of a so that their sum equals height.
 */
 void sws_normalizeVec(SwsVector *a, double height);
 void sws_convVec(SwsVector *a, SwsVector *b);
@@ -257,20 +283,13 @@
 void sws_shiftVec(SwsVector *a, int shift);
 
 /**
- * Allocates and returns a clone of the vector a, that is a vector
+ * Allocate and return a clone of the vector a, that is a vector
 * with the same coefficients as a.
 */
 SwsVector *sws_cloneVec(SwsVector *a);
 
-#if LIBSWSCALE_VERSION_MAJOR < 1
-/**
- * @deprecated Use sws_printVec2() instead.
- */
-attribute_deprecated void sws_printVec(SwsVector *a);
-#endif
-
 /**
- * Prints with av_log() a textual representation of the vector a
+ * Print with av_log() a textual representation of the vector a
 * if log_level <= av_log_level.
 */
 void sws_printVec2(SwsVector *a, AVClass *log_ctx, int log_level);
@@ -284,8 +303,7 @@
 void sws_freeFilter(SwsFilter *filter);
 
 /**
- * Checks if context can be reused, otherwise reallocates a new
- * one.
+ * Check if context can be reused, otherwise reallocate a new one.
 *
 * If context is NULL, just calls sws_getContext() to get a new
 * context. Otherwise, checks if the parameters are the ones already
@@ -297,13 +315,13 @@
 * are assumed to remain the same.
 */
 struct SwsContext *sws_getCachedContext(struct SwsContext *context,
- int srcW, int srcH, enum PixelFormat srcFormat,
- int dstW, int dstH, enum PixelFormat dstFormat,
+ int srcW, int srcH, enum AVPixelFormat srcFormat,
+ int dstW, int dstH, enum AVPixelFormat dstFormat,
 int flags, SwsFilter *srcFilter,
 SwsFilter *dstFilter, const double *param);
 
 /**
- * Converts an 8bit paletted frame into a frame with a color depth of 32-bits.
+ * Convert an 8-bit paletted frame into a frame with a color depth of 32 bits.
 *
 * The output frame will have the same packed format as the palette.
 *
@@ -312,10 +330,10 @@
 * @param num_pixels number of pixels to convert
 * @param palette array with [256] entries, which must match color arrangement (RGB or BGR) of src
 */
-void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
+void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette);
 
 /**
- * Converts an 8bit paletted frame into a frame with a color depth of 24 bits.
+ * Convert an 8-bit paletted frame into a frame with a color depth of 24 bits.
 *
 * With the palette format "ABCD", the destination frame ends up with the format "ABC".
 *
@@ -324,7 +342,18 @@
 * @param num_pixels number of pixels to convert
 * @param palette array with [256] entries, which must match color arrangement (RGB or BGR) of src
 */
-void sws_convertPalette8ToPacked24(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
+void sws_convertPalette8ToPacked24(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette);
+
+/**
+ * Get the AVClass for swsContext. It can be used in combination with
+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
+ *
+ * @see av_opt_find().
+ */
+const AVClass *sws_get_class(void);
 
+/**
+ * @}
+ */
 
 #endif /* SWSCALE_SWSCALE_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/include/ffmpeg_android/libswscale/version.h Added

@@ -0,0 +1,118 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef SWSCALE_VERSION_H
+#define SWSCALE_VERSION_H
+
+/**
+ * @file
+ * swscale version macros
+ */
+
+#include "libavutil/version.h"
+
+#define LIBSWSCALE_VERSION_MAJOR 3
+#define LIBSWSCALE_VERSION_MINOR 0
+#define LIBSWSCALE_VERSION_MICRO 100
+
+#define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
+ LIBSWSCALE_VERSION_MINOR, \
+ LIBSWSCALE_VERSION_MICRO)
+#define LIBSWSCALE_VERSION AV_VERSION(LIBSWSCALE_VERSION_MAJOR, \
+ LIBSWSCALE_VERSION_MINOR, \
+ LIBSWSCALE_VERSION_MICRO)
+#define LIBSWSCALE_BUILD LIBSWSCALE_VERSION_INT
+
+#define LIBSWSCALE_IDENT "SwS" AV_STRINGIFY(LIBSWSCALE_VERSION)
+
+/**
+ * FF_API_* defines may be placed below to indicate public API that will be
+ * dropped at a future version bump. The defines themselves are not part of
+ * the public API and may change, break or disappear at any time.
+ */
+
+#ifndef FF_API_SWS_CPU_CAPS
+#define FF_API_SWS_CPU_CAPS (LIBSWSCALE_VERSION_MAJOR < 4)
+#endif
+#ifndef FF_API_SWS_FORMAT_NAME
+#define FF_API_SWS_FORMAT_NAME (LIBSWSCALE_VERSION_MAJOR < 3)
+#endif
+#ifndef FF_API_ARCH_BFIN
+#define FF_API_ARCH_BFIN (LIBSWSCALE_VERSION_MAJOR < 4)
+#endif
+
+#endif /* SWSCALE_VERSION_H */
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef SWSCALE_VERSION_H
+#define SWSCALE_VERSION_H
+
+/**
+ * @file
+ * swscale version macros
+ */
+
+#include "libavutil/version.h"
+
+#define LIBSWSCALE_VERSION_MAJOR 3
+#define LIBSWSCALE_VERSION_MINOR 0
+#define LIBSWSCALE_VERSION_MICRO 100
+
+#define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
+ LIBSWSCALE_VERSION_MINOR, \
+ LIBSWSCALE_VERSION_MICRO)
+#define LIBSWSCALE_VERSION AV_VERSION(LIBSWSCALE_VERSION_MAJOR, \
+ LIBSWSCALE_VERSION_MINOR, \
+ LIBSWSCALE_VERSION_MICRO)
+#define LIBSWSCALE_BUILD LIBSWSCALE_VERSION_INT
+
+#define LIBSWSCALE_IDENT "SwS" AV_STRINGIFY(LIBSWSCALE_VERSION)
+
+/**
+ * FF_API_* defines may be placed below to indicate public API that will be
+ * dropped at a future version bump. The defines themselves are not part of
+ * the public API and may change, break or disappear at any time.
+ */
+
+#ifndef FF_API_SWS_CPU_CAPS
+#define FF_API_SWS_CPU_CAPS (LIBSWSCALE_VERSION_MAJOR < 4)
+#endif
+#ifndef FF_API_SWS_FORMAT_NAME
+#define FF_API_SWS_FORMAT_NAME (LIBSWSCALE_VERSION_MAJOR < 3)
+#endif
+#ifndef FF_API_ARCH_BFIN
+#define FF_API_ARCH_BFIN (LIBSWSCALE_VERSION_MAJOR < 4)
+#endif
+
+#endif /* SWSCALE_VERSION_H */

gpac-0.5.1.svn5619.tar.xz/extra_lib/lib/android/x86 Added

gpac-0.5.1.svn5491.tar.xz/gui/extensions/H2B2VS/h2b2vs.js -> gpac-0.5.1.svn5619.tar.xz/gui/extensions/H2B2VS/h2b2vs.js Changed

@@ -8,6 +8,9 @@
             case GF_EVENT_ADDON_DETECTED:
                 this.confirm_addon(evt);
                 return true;
+            case GF_EVENT_QUIT:
+                this.save_session();
+                return false;
             default:
                 return false;
         }
@@ -24,6 +27,8 @@
         if (!this.setup) {
             gwlib_add_event_filter(this.create_event_filter(this));
             this.setup = true;
+
+            this.restore_session();
             return;
         }
 
@@ -195,6 +200,86 @@
             if (!value) return;
             this.extension.do_activate_addon(this);
         }
+    },
+
+    do_xhr: function (url, cmd) {
+        var xhr = new XMLHttpRequest();
+        xhr.open('POST', url, false);
+
+        xhr.setRequestHeader('Content-Type', 'application/json');
+        xhr.setRequestHeader('Content-Length', cmd.length);
+        xhr.send(cmd);
+
+        if ((xhr.status != 200) || (xhr.readyState != 4)) {
+            if (xhr.status) {
+                gwlog(l_err, '[H2B2VS] Failed to query server: ' + xhr.responseText);
+            } else {
+                gwlog(l_err, '[H2B2VS] Failed to send request');
+            }
+            return null;
+        }
+        gwlog(l_deb, 'Command sent is ' + cmd + ' - response is ' + xhr.responseText);
+
+        var obj = gwskin.parse(xhr.responseText);
+        if (typeof obj.result == 'undefined') {
+            gwlog(l_err, '[H2B2VS] Non conformant response object ' + xhr.responseText);
+            return null;
+        }
+        if (obj.result != 0) {
+            gwlog(l_inf, '[H2B2VS] No session found for user - ' + xhr.responseText);
+            return null;
+        }
+        return obj;
+    },
+
+    restore_session: function () {
+
+        if (gwskin.media_url) {
+            gwlog(l_inf, 'URL was given when opening, skipping session restore');
+            return;
+        }
+        var server = this.get_option('SessionServer', null);
+        var user = this.get_option('UserID', null);
+        if (!server || !user) return;
+
+        var url = server + 'getData';
+        var cmd = 'ID=' + user;
+
+        var obj = this.do_xhr(url, cmd);
+        if (!obj) return;
+
+        var dlg = gw_new_confirm_wnd(null, 'Restore last session ?');
+        dlg.set_alpha(0.95);
+        dlg.show();
+        dlg.sess = obj.data;
+
+        dlg.on_confirm = function (value) {
+            if (!value) return;
+            gwskin.restore_session(this.sess.url, this.sess.media_time, this.sess.media_clock);
+        }
+    },
+
+    save_session: function () {
+        var server = this.get_option('SessionServer', null);
+        var user = this.get_option('UserID', null);
+        if (!server || !user) return;
+
+        var obj = {};
+        var url = gwskin.pvr_url;
+        if (url === '') url = gwskin.media_url;
+
+        obj.url = url.replace(/\\/g, "/");
+        obj.media_time = 0;
+        obj.media_clock = 0;
+        if (typeof gwskin.media_time != 'undefined') obj.media_time = gwskin.media_time;
+        if (typeof gwskin.media_clock != 'undefined') obj.media_clock = gwskin.media_clock;
+
+        var str = gwskin.stringify(obj);
+
+        var url = server + 'setData';
+        var cmd = 'ID=' + user + '&Data=' + str;
+        this.do_xhr(url, cmd);
+
     }
 };

gpac-0.5.1.svn5491.tar.xz/gui/extensions/player/player.js -> gpac-0.5.1.svn5619.tar.xz/gui/extensions/player/player.js Changed

@@ -91,9 +91,9 @@
 msg.show();
 }
 return 1;
- case GF_EVENT_NAVIGATE:
- this.set_movie_url(evt.target_url);
- return 1;
+ case GF_EVENT_NAVIGATE:
+ this.set_movie_url(evt.target_url);
+ return 1;
 }
 },
 
@@ -149,7 +149,13 @@
 //success !
 ext.current_url = this.url[0];
 ext.set_speed(ext.initial_speed);
- ext.movie_control.mediaStartTime = ext.initial_start;
+ if (ext.initial_start >= 0) {
+ ext.movie_control.mediaStartTime = ext.initial_start;
+ } else {
+ ext.movie_control.mediaStartTime = 0;
+ ext.movie_control.mediaStopTime = ext.initial_start;
+ alert('MC stopTime is ' + ext.movie_control.mediaStopTime + ' TS buffer is ' + ext.timeshift_depth);
+ }
 ext.movie_control.loop = ext.initial_loop;
 
 ext.movie_control.url[0] = ext.current_url;
@@ -283,8 +289,12 @@
 // alert('URL is now buffering');
 }
 this.movie.children[0].on_tsb_change = function (evt) {
- if (this.extension.root_odm) {
- this.extension.set_timeshift_depth(this.extension.root_odm.timeshift_depth);
+ if (this.extension.root_odm) {
+ this.extension.set_timeshift_depth(this.extension.root_odm.timeshift_depth);
+
+ var main_addon_url = this.extension.root_odm.main_addon_url;
+ if (main_addon_url != null) gwskin.pvr_url = main_addon_url;
+
 }
 }
 this.movie.children[0].on_main_addon = function (evt) {
@@ -345,6 +355,7 @@
 wnd.extension = this;
 
 wnd.set_corners(true, true, false, false);
+ wnd.set_alpha(0.95);
 
 /*first set of controls*/
 wnd.infobar = gw_new_grid_container(wnd);
@@ -371,7 +382,7 @@
 return;
 }
 if (type != 2) return;
- alert('set media stop time to ' + (-time));
+
 this.extension.movie_control.mediaStopTime = -time;
 this.extension.controler.layout();
 return;
@@ -383,18 +394,18 @@
 }
 gw_background_control(false);
 switch (type) {
- //start sliding 
+ //start sliding 
 case 1:
 this.extension.set_state(this.extension.GF_STATE_PAUSE);
 this.extension.set_speed(0);
 break;
- //done sliding 
+ //done sliding 
 case 2:
 this.extension.set_state(this.extension.GF_STATE_PLAY);
 this.extension.movie_control.mediaStartTime = time;
 this.extension.set_speed(1);
 break;
- //init slide, go in play mode 
+ //init slide, go in play mode 
 default:
 if (this.extension.state == this.extension.GF_STATE_STOP)
 this.extension.set_state(this.extension.GF_STATE_PLAY);
@@ -428,10 +439,9 @@
 this.extension.root_odm.disable_main_addon();
 }
 else if (this.extension.movie_control.mediaStopTime < 0) {
+ this.extension.set_time(0);
 this.extension.movie_control.mediaStopTime = 0;
 this.extension.controler.layout();
- this.extension.set_time(0);
-
 }
 }
 
@@ -630,9 +640,9 @@
 this.move(0, Math.floor((height - gw_display_height) / 2));
 
 this.on_size(width, height);
-
- this.fullscreen.switch_icon(gpac.fullscreen ? 1 : 0);
-
+
+ this.fullscreen.switch_icon(gpac.fullscreen ? 1 : 0);
+
 
 width -= control_icon_size / 2;
 min_w = control_icon_size;
@@ -680,14 +690,14 @@
 
 if (this.extension.root_odm && !this.extension.dynamic_scene && !this.extension.root_odm.is_over)
 is_over = false;
-
- this.media_list.show();
-
+
+ // this.media_list.show();
+
 } else {
 this.stats.hide();
 this.stop.hide();
 this.play.hide();
- this.media_list.hide();
+ this.media_list.hide();
 }
 
 if (this.extension.duration) {
@@ -722,7 +732,8 @@
 }
 }
 
- if (min_w + full_w + time_w < width) {
+ // if (min_w + full_w + time_w < width) {
+ if (1) {
 if (this.media_line.visible)
 this.media_line.set_size(width - min_w - full_w, control_icon_size / 3);
 
@@ -802,12 +813,24 @@
 }
 
 wnd.on_display_size = function (w, h) {
+ var def_width = 640;
+ if (!gpac.fullscreen) {
+ if (w < def_width) {
+ gpac.set_size(480, h);
+ return;
+ }
+ } else {
+ if (w < def_width) {
+ def_width = w;
+ }
+ }
+
 // this.set_size(w, 1.2 * gwskin.default_icon_height);
 
 if (this.extension.movie_connected) h = 3.3 * gwskin.default_icon_height;
- else h = 2.2 * gwskin.default_icon_height;
+ else h = 1.1 * gwskin.default_icon_height;
 
- this.set_size(480, h);
+ this.set_size(def_width, h);
 
 this.layout();
 }
@@ -886,6 +909,12 @@
 }
 }
 
+ gwskin.media_url = '';
+ gwskin.pvr_url = '';
+ gwskin.media_time = 0;
+ gwskin.media_clock = 0;
+ gwskin.restore_session = this.create_restore_session(this);
+
 if (url_arg != null) {
 this.set_playlist_mode(false);
 var def_addon = this.default_addon;
@@ -904,6 +933,7 @@
 var notif = gw_new_message(null, 'GPAC Arguments', label);
 notif.show();
 */
+
 }
 
 this.controler.show();
@@ -916,8 +946,22 @@
 }
 },
 
+ create_restore_session: function (__anobj) {
+ return function (url, media_time, media_clock) {
+ __anobj.set_movie_url(url);
+ if (media_clock) {
+ var time_in_tsb = (new Date()).getTime() - media_clock;
+ if (time_in_tsb >= 0) {
+ __anobj.initial_start = -time_in_tsb / 1000;
+ }
+
+ } else {
+ __anobj.initial_start = media_time;
+ }
+ }
+ },
+
 declare_addons: function () {
- alert('addon is ' + this.default_addon);
 if (this.default_addon && (this.default_addon != '')) {
 var addon_url = this.default_addon;
 if (addon_url.indexOf('://') < 0) addon_url = 'gpac://' + addon_url;
@@ -927,12 +971,11 @@
 
 set_time: function (value) {
 var h, m, s, str;
-
 str = '';
 if (this.timeshift_depth) {
 var pos = 100;
 var time_in_tsb = 0;
- 
+
 if (this.movie_control.mediaStopTime < 0) {
 time_in_tsb = this.root_odm.timeshift_time;
 if (this.timeshift_depth > time_in_tsb) {
@@ -940,7 +983,11 @@
 }
 }
 this.controler.media_line.set_value(pos);
+
+ gwskin.media_clock = (new Date()).getTime() - time_in_tsb * 1000;
+
 if (!time_in_tsb) {
+ this.controler.time.set_label('live');
 this.controler.time.hide();
 this.controler.layout();
 return;
@@ -952,10 +999,13 @@
 }
 str = '-';
 value = time_in_tsb;
+
 } else {
 if (!this.duration) return;
 
 this.current_time = value;
+ gwskin.media_time = value;
+
 if (this.duration) {
 this.controler.media_line.set_value(100 * value / this.duration);
 }
@@ -1014,7 +1064,6 @@
 dlg.layout();
 },
 set_timeshift_depth: function (value) {
- alert('timeshift is ' + value);
 if (this.timeshift_depth == value) return;
 
 this.timeshift_depth = value;
@@ -1093,6 +1142,8 @@
 if (this.controlled_renderer) this.controlled_renderer.Play();
 this.state = state;
 this.controler.play.switch_icon(this.icon_pause);
+ if (this.movie_control.mediaSpeed != 1);
+ this.movie_control.mediaStartTime = -1;
 this.set_speed(1);
 return;
 }
@@ -1121,13 +1172,15 @@
 } else {
 this.controler.forward.set_label('');
 }
- this.controler.layout();
- alert('speed is '+ this.movie_control.mediaSpeed);
+ this.controler.layout();
 },
 
 set_movie_url: function (url) {
 this.initial_play_done = false;
 
+ gwskin.media_url = url;
+ gwskin.pvr_url = '';
+
 if ((url == '') || (url == this.current_url)) {
 this.movie.children[0].url[0] = url;
 this.movie_control.url[0] = url;

gpac-0.5.1.svn5491.tar.xz/gui/gui.js -> gpac-0.5.1.svn5619.tar.xz/gui/gui.js Changed

gpac-0.5.1.svn5491.tar.xz/gui/gwlib.js -> gpac-0.5.1.svn5619.tar.xz/gui/gwlib.js Changed

@@ -7,7 +7,13 @@
 
 /*log function*/
 function gwlog(lev, str) {
- if (lev <= gw_log_level) alert('[GUI] ' + str);
+ if (lev <= gw_log_level) {
+ if (str.charAt(0) != '[') {
+ alert('[GUI] ' + str);
+ } else {
+ alert(str);
+ }
+ }
 }
 
 /*log levels*/
@@ -473,13 +479,12 @@
 tt.move(pos.x, pos.y);
 }
 
-gwskin.default_label_font_size = 14;
-gwskin.default_text_font_size = 14;
-
+gwskin.default_label_font_size = 18;
+gwskin.default_text_font_size = 18;
 gwskin.default_font_family = 'SANS';
-gwskin.default_icon_text_spacing = 6;
-gwskin.default_control_height = 48;
-gwskin.default_icon_height = 24;
+gwskin.default_icon_text_spacing = 8;
+gwskin.default_control_height = 64;
+gwskin.default_icon_height = 48;
 
 
 //create styles
@@ -928,6 +933,9 @@
 return this._to_string(obj);
 }
 gwskin.parse = function (serial_obj) {
+ if (serial_obj.charAt(0) != '(') {
+ return eval('(' + serial_obj + ')' );
+ }
 return eval(serial_obj);
 }

gpac-0.5.1.svn5491.tar.xz/include/gpac/bifs.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/bifs.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/cache.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/cache.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/color.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/color.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/compositor.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/compositor.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/configuration.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/configuration.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/constants.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/constants.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/dash.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/dash.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/download.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/download.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/events.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/events.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/bifs_dev.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/internal/bifs_dev.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/compositor_dev.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/internal/compositor_dev.h Changed

@@ -512,6 +512,9 @@
 	struct _gf_sc_texture_handler *hybgl_txh;
 	GF_Mesh *hybgl_mesh;
 	GF_Mesh *hybgl_mesh_background;
+
+	char *screen_buffer;
+	u32 screen_buffer_alloc_size;
 #endif
 
 	Bool texture_from_decoder_memory;
@@ -1028,6 +1031,7 @@
 void gf_afc_unload(GF_AudioFilterChain *afc);
 void gf_afc_reset(GF_AudioFilterChain *afc);
 
+
 /*the audio renderer*/
 typedef struct _audio_render
 {
@@ -1036,17 +1040,24 @@
 	Bool disable_resync;
 	Bool disable_multichannel;
 
-	/*startup time (the audio renderer is used when present as the system clock)*/
-	u32 startTime;
 	/*frozen time counter if set*/
 	Bool Frozen;
-	u32 FreezeTime;
+	/*startup time, used when no audio output is set*/
+	u32 start_time;
+	/*freeze time, used when no audio output is set*/
+	u32 freeze_time;
+
+	/*system clock compute when audio output is present*/
+	u32 current_time, bytes_per_second, time_at_last_config;
+	//number of bytes requested by sound card since last reconfig
+	u64 bytes_requested;
 
 	/*final output*/
 	GF_AudioMixer *mixer;
 	Bool need_reconfig;
 	/*client*/
 	GF_User *user;
+	u32 config_forced;
 
 	GF_List *audio_listeners;
 	/*audio thread if output not self-threaded*/
@@ -1058,6 +1069,9 @@
 
 	GF_AudioFilterChain filter_chain;
 	u32 nb_filled, nb_used;
+
+	Bool step_mode;
+
 } GF_AudioRenderer;
 
 /*creates audio renderer*/
@@ -1090,6 +1104,9 @@
 void gf_sc_ar_reconfig(GF_AudioRenderer *ar);
 u32 gf_sc_ar_get_delay(GF_AudioRenderer *ar);
 
+void gf_sc_flush_next_audio(GF_Compositor *compositor);
+Bool gf_sc_check_audio_pending(GF_Compositor *compositor);
+
 /*the sound node interface for intensity & spatialization*/
 typedef struct _soundinterface
 {

gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/dvb_mpe_dev.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/internal/dvb_mpe_dev.h Changed

@@ -81,7 +81,7 @@
 	u32 address_mask;
 	u8 address[4];
 	u8 slash_mask;
-	u32 rx_port[10];   /* list of the adress port */
+	u32 rx_port[10];   /* list of the address port */
 } GF_M2TS_IP_Target;
 
 typedef struct
@@ -131,8 +131,8 @@
 	u32 u32_TTL;                       /* (Time To Live) when = 0 , the packet is ignored and error message */
 	u32 u32_protocol;                  /* TCP = 6, UDP = 17, ICMP = 1 */
 	u32 u32_crc;
-	u8 u8_tx_adr[4];                   /* source adress */
-	u8 u8_rx_adr[4];                   /* destination adress */
+	u8 u8_tx_adr[4];                   /* source address */
+	u8 u8_rx_adr[4];                   /* destination address */
 	u32 u32_size_option;               /* size of the option before payload */
 	u32 u32_padding;                   /* = 1 if where read padding columns */
 	u32 u32_sum;
@@ -200,7 +200,7 @@
 
 u32 gf_m2ts_ipdatagram_reader(u8 *datagram, GF_M2TS_IP_Packet *ip_packet, u32 offset);
 void gf_m2ts_process_ipdatagram(MPE_FEC_FRAME *mff,GF_M2TS_Demuxer *ts);
-Bool gf_m2ts_compare_ip(u8 rx_ip_adress[4], u8 ip_adress_bootstrap[4]);
+Bool gf_m2ts_compare_ip(u8 rx_ip_address[4], u8 ip_address_bootstrap[4]);
 
 struct _sock_entry
 {

gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/isomedia_dev.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/internal/isomedia_dev.h Changed

@@ -631,7 +631,8 @@
 typedef struct
 {
 	GF_ISOM_FULL_BOX
-	u32 reserved;
+	u16 balance;
+	u16 reserved;
 } GF_SoundMediaHeaderBox;
 
 typedef struct
@@ -1279,7 +1280,7 @@
 	u32 dataEntryIndex;
 } GF_MediaInformationBox;
 
-GF_Err stbl_AppendDependencyType(GF_SampleTableBox *stbl, u32 dependsOn, u32 dependedOn, u32 redundant);
+GF_Err stbl_AppendDependencyType(GF_SampleTableBox *stbl, u32 isLeading, u32 dependsOn, u32 dependedOn, u32 redundant);
 
 typedef struct
 {
@@ -2340,7 +2341,11 @@
 GF_SampleEncryptionBox * gf_isom_create_samp_enc_box(u8 version, u32 flags);
 
 void gf_isom_cenc_get_default_info_ex(GF_TrackBox *trak, u32 sampleDescriptionIndex, u32 *default_IsEncrypted, u8 *default_IV_size, bin128 *default_KID);
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 GF_Err gf_isom_get_sample_cenc_info_ex(GF_TrackBox *trak, GF_TrackFragmentBox *traf, u32 sample_number, u32 *IsEncrypted, u8 *IV_size, bin128 *KID);
+#else
+GF_Err gf_isom_get_sample_cenc_info_ex(GF_TrackBox *trak, void *traf, u32 sample_number, u32 *IsEncrypted, u8 *IV_size, bin128 *KID);
+#endif
 
 GF_Err senc_Parse(GF_BitStream *bs, GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_SampleEncryptionBox *ptr);
 
@@ -2662,7 +2667,7 @@
 GF_Err stbl_GetPaddingBits(GF_PaddingBitsBox *padb, u32 SampleNumber, u8 *PadBits);
 u32 stbl_GetSampleFragmentCount(GF_SampleFragmentBox *stsf, u32 sampleNumber);
 u32 stbl_GetSampleFragmentSize(GF_SampleFragmentBox *stsf, u32 sampleNumber, u32 FragmentIndex);
-GF_Err stbl_GetSampleDepType(GF_SampleDependencyTypeBox *stbl, u32 SampleNumber, u32 *dependsOn, u32 *dependedOn, u32 *redundant);
+GF_Err stbl_GetSampleDepType(GF_SampleDependencyTypeBox *stbl, u32 SampleNumber, u32 *isLeading, u32 *dependsOn, u32 *dependedOn, u32 *redundant);
 
 
 /*unpack sample2chunk and chunk offset so that we have 1 sample per chunk (edition mode only)*/
@@ -2689,8 +2694,8 @@
 u8 RequestTrack(GF_MovieBox *moov, u32 TrackID);
 /*Track-Media setup*/
 GF_Err NewMedia(GF_MediaBox **mdia, u32 MediaType, u32 TimeScale);
-GF_Err Media_ParseODFrame(GF_MediaBox *mdia, GF_ISOSample *sample, GF_ISOSample **od_samp);
-GF_Err Media_AddSample(GF_MediaBox *mdia, u64 data_offset, GF_ISOSample *sample, u32 StreamDescIndex, u32 syncShadowNumber);
+GF_Err Media_ParseODFrame(GF_MediaBox *mdia, const GF_ISOSample *sample, GF_ISOSample **od_samp);
+GF_Err Media_AddSample(GF_MediaBox *mdia, u64 data_offset, const GF_ISOSample *sample, u32 StreamDescIndex, u32 syncShadowNumber);
 GF_Err Media_CreateDataRef(GF_DataReferenceBox *dref, char *URLname, char *URNname, u32 *dataRefIndex);
 /*update a media sample. ONLY in edit mode*/
 GF_Err Media_UpdateSample(GF_MediaBox *mdia, u32 sampleNumber, GF_ISOSample *sample, Bool data_only);

gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/m3u8.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/internal/m3u8.h Changed

@@ -1,8 +1,8 @@
 /**
 *			GPAC - Multimedia Framework C SDK
 *
- *					Authors: Pierre Souchay - Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2010-2012
+ *					Authors: Pierre Souchay - Jean Le Feuvre - Romain Bouqueau
+ *			Copyright (c) Telecom ParisTech 2010-2012, Romain Bouqueau
 *					All rights reserved
 *
 * This file is part of GPAC
@@ -24,160 +24,84 @@
 */
 #ifndef M3U8_PLAYLIST_H
 #define M3U8_PLAYLIST_H
+
 #include <gpac/tools.h>
 #include <gpac/list.h>
 
-/**
- * Global Structure
- *
- * For a stream with multiple bandwidths and multiple programs
- *
- * VariantPlayList
- * |
- * |_ program id 1
- * | |
- * | |_ bandwidth X : playlistElement1
- * | |- bandwidth Y : playlistElement2
- * |
- * |- program id 2
- * |
- * |_ bandwidth Z : playlistElement
- *
- * For a "normal" playlist
- *
- * VariantPlayList
- * |
- * |_ program id 1
- * |
- * |_ bandwidth 0 : playlistElement1
- *
- * Where PlaylistElement can be :
- * - a stream (real resource)
- * - a playlist (list of PlaylistElements itself)
- */
 
-#define M3U8_UNKOWN_MIME_TYPE "unknown"
+#define M3U8_UNKNOWN_MIME_TYPE "unknown"
 
 /**
- * Basic Stream structure
+ * Basic Media structure
 */
-typedef struct s_stream {
-	u8 i;
-} Stream;
+typedef struct s_media {
+	int i; //unused: C requires that a struct or union has at least one member
+} Media;
 
 /**
 * The playlist contains a list of elements to play
 */
-typedef struct s_playList {
-	int currentMediaSequence;
-	int target_duration;
-	int mediaSequenceMin;
-	int mediaSequenceMax;
-	int computed_duration;
-	char is_ended;
-	GF_List * elements;
-} Playlist;
+struct s_playList {
+	int current_media_seq;
+	int media_seq_min;
+	int media_seq_max;
+	double target_duration;
+	double computed_duration;
+	Bool is_ended;
+	GF_List *elements; /*PlaylistElement*/
+};
+typedef struct s_playList Playlist;
 
-typedef enum e_playlistElementType { TYPE_PLAYLIST, TYPE_STREAM, TYPE_UNKNOWN} PlaylistElementType;
+typedef enum e_playlistElementType { TYPE_PLAYLIST, TYPE_MEDIA, TYPE_UNKNOWN } PlaylistElementType;
 
 /**
 * The Structure containing the playlist element
 */
-typedef struct s_playlistElement {
-	int durationInfo;
-	u64 byteRangeStart, byteRangeEnd;
+struct s_playlistElement {
+	double duration_info;
+	u64 byte_range_start, byte_range_end;
 	int bandwidth, width, height;
-	char * title;
-	char * codecs;
-	char * url;
-	PlaylistElementType elementType;
+	char *title;
+	char *codecs;
+	char *language;
+	char *audio_group;
+	char *video_group;
+	char *url;
+	PlaylistElementType element_type;
 	union {
 		Playlist playlist;
-		Stream stream;
+		Media media;
 	} element;
+};
+typedef struct s_playlistElement PlaylistElement;
 
-} PlaylistElement;
-
-typedef struct s_program {
-	int programId;
-	GF_List * bitrates;
-	int currentBitrateIndex;
-	int computed_duration;
-} Program;
-
+struct s_stream {
+	int stream_id; //may be a real PROGRAM_ID, or a converted GROUP_ID with GROUP_ID_TO_PROGRAM_ID
+	GF_List *variants; /*PlaylistElement*/
+	double computed_duration;
+};
+typedef struct s_stream Stream;
 
 /**
 * The root playlist, can contains several PlaylistElements structures
 */
-typedef struct s_variantPlaylist {
-	GF_List * programs;
-	int currentProgram;
-	Bool playlistNeedsRefresh;
-} VariantPlaylist;
-
-/**
- * Creates a new playlist
- * \return NULL if playlist could not be allocated
- *
-Playlist * playlist_new();
-*/
-/**
- * Deletes a given playlist and all of its sub elements
- *
-GF_Err playlist_del(Playlist *);
-*/
-
-/**
- * Deletes an Playlist element
- */
-GF_Err playlist_element_del(PlaylistElement *);
+struct s_masterPlaylist {
+	GF_List *streams; /*Stream*/
+	int current_stream;
+	Bool playlist_needs_refresh;
+};
+typedef struct s_masterPlaylist MasterPlaylist;
 
-/**
- * Creates a new program properly initialized
- */
-Program * program_new(int programId);
 
 /**
- * Deletes the specified program
- */
-GF_Err program_del(Program * program);
-
-/**
- * Creates an Playlist element.
- * This element can be either a playlist of a stream according to first parameter.
- * \return NULL if element could not be created. Elements will be deleted recusively
- */
-PlaylistElement * playlist_element_new(PlaylistElementType elementType, const char * url, const char * title, const char *codecs, int durationInfo, u64 byteRangeStart, u64 byteRangeEnd);
-
-/**
- * Creates a new VariantPlaylist
- * \return NULL if VariantPlaylist element could not be allocated
- */
-VariantPlaylist * variant_playlist_new ();
-
-/**
- * Deletes the given VariantPlaylist and all of its sub elements
- */
-GF_Err variant_playlist_del(VariantPlaylist *);
-
-GF_Err playlist_element_dump(const PlaylistElement * e, int indent);
-
-GF_Err variant_playlist_dump(const VariantPlaylist *);
-
-Program * variant_playlist_find_matching_program(const VariantPlaylist *, const u32 programId);
-
-Program * variant_playlist_get_current_program(const VariantPlaylist *);
-
-
-
-/**
- * Parse the given playlist file
+ * Parse the given m3u8 playlist file
 * \param file The file from cache to parse
 * \param playlist The playlist to fill. If argument is null, and file is valid, playlist will be allocated
 * \param baseURL The base URL of the playlist
 * \return GF_OK if playlist valid
 */
-GF_Err parse_root_playlist(const char * file, VariantPlaylist ** playlist, const char * baseURL);
+GF_Err gf_m3u8_parse_master_playlist(const char *file, MasterPlaylist **playlist, const char *baseURL);
+
 /**
 * Parse the given playlist file as a subplaylist of an existing playlist
 * \param file The file from cache to parse
@@ -187,7 +111,11 @@
 * \param sub_playlist existing subplaylist element in the playlist in which the playlist is parsed
 * \return GF_OK if playlist valid
 */
-GF_Err parse_sub_playlist(const char * file, VariantPlaylist ** playlist, const char * baseURL, Program * in_program, PlaylistElement *sub_playlist);
+GF_Err gf_m3u8_parse_sub_playlist(const char *file, MasterPlaylist **playlist, const char *baseURL, Stream *in_program, PlaylistElement *sub_playlist);
 
-#endif /* M3U8_PLAYLIST_H */
+/**
+ * Deletes the given MasterPlaylist and all of its sub elements
+ */
+GF_Err gf_m3u8_master_playlist_del(MasterPlaylist *playlist);
 
+#endif /* M3U8_PLAYLIST_H */

gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/media_dev.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/internal/media_dev.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/mpd.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/internal/mpd.h Changed

@@ -41,12 +41,26 @@
 	u32 dummy;
 } GF_MPD_ContentComponent;
 
-/*TODO*/
+
+//some elments are typically overloaded in XML, we keep the attributes / childrne nodes here. The attributes list is NULL if no extensions were found, otherwise it is a list of @GF_XMLAttribute.
+//The children list is NULL if no extensions were found, otherwise it is a list of @GF_XMLNode
+#define MPD_EXTENSIBLE	\
+	GF_List *attributes;	\
+	GF_List *children;	\
+
+typedef struct
+{
+	MPD_EXTENSIBLE
+} GF_MPD_ExtensibleVirtual;
+
 typedef struct
 {
+	MPD_EXTENSIBLE
+
 	char *scheme_id_uri; /*MANDATORY*/
 	char *value;
 	char *id;
+
 } GF_MPD_Descriptor;
 
 /*TODO*/
@@ -92,6 +106,12 @@
 	u32 num, den;
 } GF_MPD_Fractional;
 
+typedef struct
+{
+	u32 trackID;
+	char *stsd;
+	s64 mediaOffset;
+} GF_MPD_ISOBMFInfo;
 
 #define GF_MPD_SEGMENT_BASE	\
 	u32 timescale;	\
@@ -181,6 +201,7 @@
 	GF_List *content_protection;	\
 	GF_List *essential_properties;	\
 	GF_List *supplemental_properties;	\
+	GF_List *isobmf_tracks;	\
  
 typedef struct {
 	GF_MPD_COMMON_ATTRIBUTES_ELEMENTS
@@ -305,6 +326,8 @@
 } GF_MPD_Type;
 
 typedef struct {
+	MPD_EXTENSIBLE
+
 	char *ID;
 	char *profiles;	/*MANDATORY*/
 	GF_MPD_Type type;
@@ -347,6 +370,9 @@
 
 void gf_mpd_period_free(void *_item);
 
+GF_Err gf_mpd_write_file(GF_MPD *mpd, char *file_name);
+
+
 typedef struct _gf_file_get GF_FileDownload;
 struct _gf_file_get
 {
@@ -362,5 +388,24 @@
 /*converts M3U8 to MPD - getter is optional (download will still be processed if NULL)*/
 GF_Err gf_m3u8_to_mpd(const char *m3u8_file, const char *base_url, const char *mpd_file, u32 reload_count, char *mimeTypeForM3U8Segments, Bool do_import, Bool use_mpd_templates, GF_FileDownload *getter);
 
+
+
+typedef enum
+{
+	GF_MPD_RESOLVE_URL_MEDIA,
+	GF_MPD_RESOLVE_URL_INIT,
+	GF_MPD_RESOLVE_URL_INDEX,
+	//same as GF_MPD_RESOLVE_URL_MEDIA but does not replace $Time$ and $Number$
+	GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE,
+} GF_MPD_URLResolveType;
+
+/*resolves a URL based for a given segment, based on the MPD url, the type of resolution 
+	item_index: current downloading index of the segment
+	nb_segments_removed: number of segments removed when pruging the MPD after updates (can be 0). The start number will be offset by this value
+*/
+GF_Err gf_mpd_resolve_url(GF_MPD *mpd, GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set, GF_MPD_Period *period, const char *mpd_url, GF_MPD_URLResolveType resolve_type, u32 item_index, u32 nb_segments_removed, char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration, Bool *is_in_base_url);
+
+
+
 #endif // _MPD_H_

gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/scenegraph_dev.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/internal/scenegraph_dev.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/smjs_api.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/internal/smjs_api.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/internal/terminal_dev.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/internal/terminal_dev.h Changed

@@ -271,7 +271,10 @@
 Bool gf_scene_process_anchor(GF_Node *caller, GF_Event *evt);
 void gf_scene_force_size_to_video(GF_Scene *scene, GF_MediaObject *mo);
 
-Bool gf_scene_check_clocks(GF_ClientService *ns, GF_Scene *scene);
+//check clock status. 
+//If @check_buffering is 0, returns 1 if all clocks have seen eos, 0 otherwise
+//If @check_buffering is 1, returns 1 if no clock is buffering, 0 otheriwse
+Bool gf_scene_check_clocks(GF_ClientService *ns, GF_Scene *scene, Bool check_buffering);
 
 void gf_scene_notify_event(GF_Scene *scene, u32 event_type, GF_Node *n, void *dom_evt, GF_Err code, Bool no_queueing);
 
@@ -1093,7 +1096,7 @@
 void gf_odm_reset_media_control(GF_ObjectManager *odm, Bool signal_reset);
 
 /*GF_MediaObject: link between real object manager and scene. although there is a one-to-one mapping between a
-MediaObject and an ObjectManager, we have to keep them seperated in order to handle OD remove commands which destroy
+MediaObject and an ObjectManager, we have to keep them separated in order to handle OD remove commands which destroy
 ObjectManagers. */
 struct _mediaobj
 {

gpac-0.5.1.svn5491.tar.xz/include/gpac/iso639.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/iso639.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/isomedia.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/isomedia.h Changed

@@ -560,6 +560,8 @@
 /*returns sync flag of sample*/
 u8 gf_isom_get_sample_sync(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber);
 
+GF_Err gf_isom_get_sample_flags(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 *is_leading, u32 *dependsOn, u32 *dependedOn, u32 *redundant);
+
 /*gets a sample given a desired decoding time IN MEDIA TIME SCALE
 and set the StreamDescIndex of this sample
 this index allows to retrieve the stream description if needed (2 media in 1 track)
@@ -747,12 +749,21 @@
 	User Data Manipulation (cf write API too)
 */
 
+//returns the number of entries in UDTA of the track if trackNumber is not 0, or of the movie otherwise
+u32 gf_isom_get_udta_count(GF_ISOFile *movie, u32 trackNumber);
+
+//returns the type (box 4CC and UUID if any) of the given entry in UDTA of the track if trackNumber is not 0, or of the movie otherwise. udta_idx is 1-based index.
+GF_Err gf_isom_get_udta_type(GF_ISOFile *movie, u32 trackNumber, u32 udta_idx, u32 *UserDataType, bin128 *UUID);
+
 /* Gets the number of UserDataItems with the same ID / UUID in the desired track or
 in the movie if trackNumber is set to 0*/
 u32 gf_isom_get_user_data_count(GF_ISOFile *the_file, u32 trackNumber, u32 UserDataType, bin128 UUID);
 /* Gets the UserData for the specified item from the track or the movie if trackNumber is set to 0
 data is allocated by the function and is yours to free
-you musty pass (userData != NULL && *userData=NULL)*/
+you musty pass (userData != NULL && *userData=NULL)
+
+if UserDataIndex is 0, all boxes with type==UserDataType will be serialized (including box header and size) in the buffer
+*/
 GF_Err gf_isom_get_user_data(GF_ISOFile *the_file, u32 trackNumber, u32 UserDataType, bin128 UUID, u32 UserDataIndex, char **userData, u32 *userDataSize);
 
 
@@ -870,7 +881,7 @@
 GF_Err gf_isom_rewrite_track_dependencies(GF_ISOFile *movie, u32 trackNumber);
 
 /*Add samples to a track. Use streamDescriptionIndex to specify the desired stream (if several)*/
-GF_Err gf_isom_add_sample(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_ISOSample *sample);
+GF_Err gf_isom_add_sample(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, const GF_ISOSample *sample);
 
 //copies all sample dependency, subSample and sample group information from the given sampleNumber in source file to the last added sample in dest file
 GF_Err gf_isom_copy_sample_info(GF_ISOFile *dst, u32 dst_track, GF_ISOFile *src, u32 src_track, u32 sampleNumber);
@@ -1031,6 +1042,9 @@
 /*adds track, moov (trackNumber=0) or file-level (trackNumber=0xFFFFFFFF) UUID box of given type*/
 GF_Err gf_isom_add_uuid(GF_ISOFile *movie, u32 trackNumber, bin128 UUID, char *data, u32 data_size);
 
+/*Add a user data item in the desired track or in the movie if TrackNumber is 0, using a serialzed buffer of ISOBMFF boxes*/
+GF_Err gf_isom_add_user_data_boxes(GF_ISOFile *the_file, u32 trackNumber, char *data, u32 DataLength);
+
 /*
 		Update of the Writing API for IsoMedia Version 2
 */
@@ -1348,7 +1362,7 @@
 
 */
 
-GF_Err gf_isom_fragment_add_sample(GF_ISOFile *the_file, u32 TrackID, GF_ISOSample *sample,
+GF_Err gf_isom_fragment_add_sample(GF_ISOFile *the_file, u32 TrackID, const GF_ISOSample *sample,
                                    u32 StreamDescriptionIndex,
                                    u32 Duration, u8 PaddingBits, u16 DegradationPriority, Bool redundantCoding);
 
@@ -1814,6 +1828,14 @@
 
 GF_Err gf_isom_stxt_info_get(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, char **mime, char **config);
 
+typedef enum
+{
+	GF_ISOM_TEXT_FLAGS_OVERWRITE = 0,
+	GF_ISOM_TEXT_FLAGS_TOGGLE,
+	GF_ISOM_TEXT_FLAGS_UNTOGGLE,
+} GF_TextFlagsMode;
+//sets text display flags according to given mode. If SampleDescriptionIndex is 0, sets the flags for all text descriptions.
+GF_Err gf_isom_text_set_display_flags(GF_ISOFile *file, u32 track, u32 SampleDescriptionIndex, u32 flags, GF_TextFlagsMode op_type);
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
@@ -2170,8 +2192,10 @@
 ********************************************************************/
 enum
 {
-	/*probe is only used ti check if iTunes info are present*/
+	/*probe is only used to check if iTunes info are present*/
 	GF_ISOM_ITUNE_PROBE = 0,
+	/*probe is only used to remove all tags*/
+	GF_ISOM_ITUNE_ALL = 1,
 	GF_ISOM_ITUNE_ALBUM	= GF_4CC( 0xA9, 'a', 'l', 'b' ),
 	GF_ISOM_ITUNE_ARTIST = GF_4CC( 0xA9, 'A', 'R', 'T' ),
 	GF_ISOM_ITUNE_COMMENT = GF_4CC( 0xA9, 'c', 'm', 't' ),

gpac-0.5.1.svn5491.tar.xz/include/gpac/mediaobject.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/mediaobject.h Changed

@@ -98,10 +98,22 @@
 /*returns min frame duration for his object or 0 if unknown*/
 u32 gf_mo_get_min_frame_dur(GF_MediaObject *mo);
 
+typedef enum
+{	
+	//never resync the content of the decoded media buffer (used fo audio)
+	//if clock is paused do not fetch
+	GF_MO_FETCH = 0,
+	//always resync the content of the decoded media buffer to the current time (used for video)
+	GF_MO_FETCH_RESYNC,
+	//never resync the content of the decoded media buffer (used fo audio)
+	//if clock is paused,  do fetch (used for audio extraction)
+	GF_MO_FETCH_PAUSED
+} GF_MOFetchMode;
+
 /*fetch media data
 
 */
-char *gf_mo_fetch_data(GF_MediaObject *mo, Bool resync, Bool *eos, u32 *timestamp, u32 *size, s32 *ms_until_pres, s32 *ms_until_next);
+char *gf_mo_fetch_data(GF_MediaObject *mo, GF_MOFetchMode resync, Bool *eos, u32 *timestamp, u32 *size, s32 *ms_until_pres, s32 *ms_until_next);
 
 /*release given amount of media data - nb_bytes is used for audio  - drop_mode can take the following values:
 -1: do not drop

gpac-0.5.1.svn5491.tar.xz/include/gpac/modules/audio_out.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/modules/audio_out.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/mpeg4_odf.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/mpeg4_odf.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/mpegts.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/mpegts.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/options.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/options.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/scene_manager.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/scene_manager.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/scenegraph.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/scenegraph.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/setup.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/setup.h Changed

@@ -325,12 +325,13 @@
 /*GPAC memory tracking*/
 #if defined(GPAC_MEMORY_TRACKING)
 
-void *gf_mem_malloc(size_t size, char *filename, int line);
-void *gf_mem_calloc(size_t num, size_t size_of, char *filename, int line);
-void *gf_mem_realloc(void *ptr, size_t size, char *filename, int line);
-void gf_mem_free(void *ptr, char *filename, int line);
-char *gf_mem_strdup(const char *str, char *filename, int line);
+void *gf_mem_malloc(size_t size, const char *filename, int line);
+void *gf_mem_calloc(size_t num, size_t size_of, const char *filename, int line);
+void *gf_mem_realloc(void *ptr, size_t size, const char *filename, int line);
+void gf_mem_free(void *ptr, const char *filename, int line);
+char *gf_mem_strdup(const char *str, const char *filename, int line);
 void gf_memory_print(void); /*prints the state of current allocations*/
+u64 gf_memory_size(); /*gets memory allocated in bytes*/
 
 #define gf_free(ptr) gf_mem_free(ptr, __FILE__, __LINE__)
 #define gf_malloc(size) gf_mem_malloc(size, __FILE__, __LINE__)

gpac-0.5.1.svn5491.tar.xz/include/gpac/terminal.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/terminal.h Changed

@@ -148,11 +148,17 @@
 */
 u32 gf_term_process_step(GF_Terminal *term);
 
-/*decodes all pending media and render frame until no scene changes are detected.
+/*decodes all pending media and render frame until no scene changes are detected and no clocks is buffering.
+This does not flush the backbuffer to the front buffer, you have to call @gf_term_process_flush_video for this
 NOTE: This can only be used when the terminal runs without visual thread (GF_TERM_NO_VISUAL_THREAD flag set)
 */
 GF_Err gf_term_process_flush(GF_Terminal *term);
 
+/*flushes video backbuffer to screen. This is typically used after gf_term_process_flush, once the screen buffer is no longer needed
+NOTE: This can only be used when the terminal runs without visual thread (GF_TERM_NO_VISUAL_THREAD flag set)
+*/
+GF_Err gf_term_process_flush_video(GF_Terminal *term);
+
 /*post user interaction to terminal*/
 /*NOT NEEDED WHEN THE TERMINAL IS HANDLING THE DISPLAY WINDOW (cf user.h)*/
 Bool gf_term_user_event(GF_Terminal *term, GF_Event *event);
@@ -203,6 +209,10 @@
 VERY BASIC INTERFACE*/
 void gf_term_switch_quality(GF_Terminal *term, Bool up);
 
+
+/*get global clock in milliseconds*/
+u32 gf_term_get_clock(GF_Terminal *term);
+
 #ifdef __cplusplus
 }
 #endif

gpac-0.5.1.svn5491.tar.xz/include/gpac/thread.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/thread.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/tools.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/tools.h Changed

gpac-0.5.1.svn5491.tar.xz/include/gpac/version.h -> gpac-0.5.1.svn5619.tar.xz/include/gpac/version.h Changed

gpac-0.5.1.svn5491.tar.xz/include/win32/inttypes.h -> gpac-0.5.1.svn5619.tar.xz/include/win32/inttypes.h Changed

gpac-0.5.1.svn5491.tar.xz/mkdmg.sh -> gpac-0.5.1.svn5619.tar.xz/mkdmg.sh Changed

@@ -41,6 +41,10 @@
 cp bin/gcc/MP4Client tmpdmg/Osmo4.app/Contents/MacOS/Osmo4
 cp bin/gcc/MP4Box tmpdmg/Osmo4.app/Contents/MacOS/MP4Box
 cp bin/gcc/MP42TS tmpdmg/Osmo4.app/Contents/MacOS/MP42TS
+if [ -f bin/gcc/DashCast ]
+then
+cp bin/gcc/DashCast tmpdmg/Osmo4.app/Contents/MacOS/DashCast
+fi
 
 cd tmpdmg/Osmo4.app/Contents/MacOS/
 
@@ -51,6 +55,11 @@
   rewrite_deps $dylib
 done
 
+if [ -f DashCast ]
+then
+  rewrite_deps DashCast
+fi
+
 echo rewriting APPS dependencies
 install_name_tool -change /usr/local/lib/libgpac.dylib @executable_path/lib/libgpac.dylib Osmo4
 install_name_tool -change /usr/local/lib/libgpac.dylib @executable_path/lib/libgpac.dylib MP4Box
@@ -59,6 +68,11 @@
 install_name_tool -change ../bin/gcc/libgpac.dylib @executable_path/lib/libgpac.dylib MP4Box
 install_name_tool -change ../bin/gcc/libgpac.dylib @executable_path/lib/libgpac.dylib MP42TS
 
+if [ -f DashCast ]
+then
+install_name_tool -change /usr/local/lib/libgpac.dylib @executable_path/lib/libgpac.dylib DashCast
+install_name_tool -change ../bin/gcc/libgpac.dylib @executable_path/lib/libgpac.dylib DashCast
+fi
 
 cd ../../../..
 
@@ -93,7 +107,7 @@
 hdiutil convert -format UDCO -o gpac_sla.dmg gpac.dmg
 rm gpac.dmg
 hdiutil unflatten gpac_sla.dmg
-/Developer/Tools/Rez /Developer/Headers/FlatCarbon/*.r $source_path/build/osxdmg/SLA.r -a -o gpac_sla.dmg
+Rez /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/*.r $source_path/build/osxdmg/SLA.r -a -o gpac_sla.dmg
 hdiutil flatten gpac_sla.dmg
 hdiutil internet-enable -yes gpac_sla.dmg

gpac-0.5.1.svn5491.tar.xz/modules/Makefile -> gpac-0.5.1.svn5619.tar.xz/modules/Makefile Changed

gpac-0.5.1.svn5491.tar.xz/modules/aac_in/aac_in.c -> gpac-0.5.1.svn5619.tar.xz/modules/aac_in/aac_in.c Changed

@@ -123,7 +123,7 @@
 {
 	GF_BitStream *dsi;
 	GF_ESD *esd;
-	u32 i, sbr_sr_idx;
+	u32 i, sbr_sr_idx, sbr_oti;
 
 	esd = gf_odf_desc_esd_new(0);
 	if (!esd)
@@ -142,16 +142,20 @@
 	gf_bs_write_int(dsi, read->nb_ch, 4);
 	gf_bs_align(dsi);
 
-	/*always signal implicit S	BR in case it's used*/
-	sbr_sr_idx = read->sr_idx;
-	for (i=0; i<16; i++) {
-		if (GF_M4ASampleRates[i] == (u32) 2*read->sample_rate) {
-			sbr_sr_idx = i;
-			break;
+	sbr_sr_idx = 0;
+	sbr_oti = 0;
+	/*always signal implicit SBR for <=24000, in case it's used*/
+	if (read->sample_rate<=24000) {
+		sbr_sr_idx = read->sr_idx;
+		for (i=0; i<16; i++) {
+			if (GF_M4ASampleRates[i] == (u32) 2*read->sample_rate) {
+				sbr_sr_idx = i;
+				break;
+			}
 		}
 	}
 	gf_bs_write_int(dsi, 0x2b7, 11);
-	gf_bs_write_int(dsi, 5, 5);
+	gf_bs_write_int(dsi, sbr_oti, 5);
 	gf_bs_write_int(dsi, 1, 1);
 	gf_bs_write_int(dsi, sbr_sr_idx, 4);
 
@@ -260,7 +264,7 @@
 
 	read->duration = 0;
 
-	if (0 && !read->is_remote) {
+	if (!read->is_remote) {
 		read->duration = 1024;
 		gf_bs_skip_bytes(bs, hdr.frame_size);
 		while (ADTS_SyncFrame(bs, !read->is_remote, &hdr)) {

gpac-0.5.1.svn5491.tar.xz/modules/aac_in/faad_dec.c -> gpac-0.5.1.svn5619.tar.xz/modules/aac_in/faad_dec.c Changed

@@ -376,19 +376,19 @@
 
 		*outBufferLength = ctx->out_size;
 		if (sizeof(short) * ctx->info.samples > *outBufferLength) {
-			*outBufferLength = ctx->out_size = sizeof(short)*ctx->info.samples;
+			*outBufferLength = ctx->out_size = (u32) (sizeof(short)*ctx->info.samples);
 		}
 		return GF_BUFFER_TOO_SMALL;
 	}
 	if (sizeof(short) * ctx->info.samples > *outBufferLength) {
-		*outBufferLength = sizeof(short)*ctx->info.samples;
+		*outBufferLength = (u32) (sizeof(short)*ctx->info.samples);
 		return GF_BUFFER_TOO_SMALL;
 	}
 
 	/*we assume left/right order*/
 	if (ctx->num_channels<=2) {
 		memcpy(outBuffer, buffer, sizeof(short)* ctx->info.samples);
-		*outBufferLength = sizeof(short)*ctx->info.samples;
+		*outBufferLength = (u32) (sizeof(short)*ctx->info.samples);
 		return GF_OK;
 	}
 	conv_in = (unsigned short *) buffer;
@@ -398,7 +398,7 @@
 			conv_out[i + j] = conv_in[i + ctx->ch_reorder[j]];
 		}
 	}
-	*outBufferLength = sizeof(short)*ctx->info.samples;
+	*outBufferLength = (u32) (sizeof(short)*ctx->info.samples);
 	return GF_OK;
 }

gpac-0.5.1.svn5491.tar.xz/modules/ctx_load/ctx_load.c -> gpac-0.5.1.svn5619.tar.xz/modules/ctx_load/ctx_load.c Changed

gpac-0.5.1.svn5619.tar.xz/modules/dektec_out Added

gpac-0.5.1.svn5619.tar.xz/modules/dektec_out/Makefile Added

@@ -0,0 +1,58 @@
+include ../../config.mak
+
+vpath %.c $(SRC_PATH)/modules/dektec_out
+
+CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include" -DGPAC_HAVE_CONFIG_H -I../../
+
+ifeq ($(DEBUGBUILD), yes)
+CFLAGS+=-g
+LDFLAGS+=-g
+endif
+
+ifeq ($(GPROFBUILD), yes)
+CFLAGS+=-pg
+LDFLAGS+=-pg
+endif
+
+ifeq ($(ENABLE_JOYSTICK), yes)
+CFLAGS+=-DENABLE_JOYSTICK
+endif
+
+ifeq ($(ENABLE_JOYSTICK_NO_CURSOR), yes)
+CFLAGS+=-DENABLE_JOYSTICK_NO_CURSOR
+endif
+
+#common obj
+OBJS= dektec_video.o
+
+SRCS := $(OBJS:.o=.cpp) 
+
+LIB=gm_dektec_out.$(DYN_LIB_SUFFIX)
+ifeq ($(CONFIG_WIN32),yes)
+#LDFLAGS+=-export-symbols dektec_out.def 
+endif
+
+
+all: $(LIB)
+
+
+$(LIB): $(OBJS)
+	$(CXX) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
+ifeq ($(STATICBUILD),yes)
+	$(CXX) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/gm_dektec_out-static.$(DYN_LIB_SUFFIX) $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac_static
+endif
+
+
+clean: 
+	rm -f $(OBJS) ../../bin/gcc/$(LIB)
+
+dep: depend
+
+depend:
+	rm -f .depend	
+	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
+
+distclean: clean
+	rm -f Makefile.bak .depend
+
+-include .depend

gpac-0.5.1.svn5619.tar.xz/modules/dektec_out/dektec_video.cpp Added

@@ -0,0 +1,348 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Romain Bouqueau
+ *			Copyright (c) Romain Bouqueau @ GPAC Licensing
+ *					All rights reserved
+ *
+ * This file is part of GPAC / Dektec SDI video render module
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#define _DTAPI_DISABLE_AUTO_LINK
+#include <DTAPI.h>
+
+extern "C" {
+
+	/*driver interfaces*/
+#include <gpac/modules/video_out.h>
+#include <gpac/modules/audio_out.h>
+#include <gpac/constants.h>
+#include <gpac/setup.h>
+
+
+//#define DEKTEC_DUMP_UYVY
+
+//TODO: use gf_stretch_bits and get values from config file
+#define DWIDTH 1920
+#define DHEIGHT 1080
+#define DFORMAT DTAPI_IOCONFIG_1080I50
+#define DNUMFIELDS 2
+
+
+	typedef struct
+	{
+		char *pixels;
+		unsigned char *pixels_UYVY;
+		u32 width, height, pixel_format, bpp;
+
+		DtDevice *dvc;
+		DtFrameBuffer *dtf;
+		bool isSending;
+		s64 frameNum;
+	} DtContext;
+
+//FIXME: referenced from dx
+	void dx_copy_pixels(GF_VideoSurface *dst_s, const GF_VideoSurface *src_s, const GF_Window *src_wnd);
+
+	static GF_Err Dektec_Blit(GF_VideoOutput *dr, GF_VideoSurface *video_src, GF_Window *src_wnd, GF_Window *dst_wnd, u32 overlay_type)
+	{
+		DtContext *dtc = (DtContext*)dr->opaque;
+		GF_VideoSurface temp_surf;
+		dx_copy_pixels(&temp_surf, video_src, src_wnd);
+		memset(&temp_surf, 0, sizeof(GF_VideoSurface));
+		temp_surf.pixel_format = GF_PIXEL_UYVY;
+		temp_surf.video_buffer = (char*)dtc->pixels_UYVY;
+		temp_surf.pitch_y = dtc->width*2;
+		dx_copy_pixels(&temp_surf, video_src, src_wnd);
+		return GF_OK;
+	}
+
+	static GF_Err Dektec_Flush(GF_VideoOutput *dr, GF_Window *dest)
+	{
+		DtContext *dtc = (DtContext*)dr->opaque;
+		DtFrameBuffer *dtf = dtc->dtf;
+		DTAPI_RESULT res;
+		if (!dtc->isSending) {
+			// Start transmission
+			res = dtf->Start();
+			if (res != DTAPI_OK) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MODULE, ("[Dektec Out] Can't start transmission: %s.\n", DtapiResult2Str(res)));
+			} else {
+				GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[Dektec Out] Transmission started.\n"));
+				dtc->isSending = true;
+			}
+		}
+		s64 firstSafeFrame=-1, lastSafeFrame=-1;
+		res = dtf->WaitFrame(firstSafeFrame, lastSafeFrame);
+		if (res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't get the next frame: %s\n", DtapiResult2Str(res)));
+			return GF_BAD_PARAM;
+		}
+
+		if (dtc->frameNum == -1)
+			dtc->frameNum = firstSafeFrame;
+
+		int numLines=-1, numWritten=DWIDTH*DHEIGHT*2/DNUMFIELDS;
+		res = dtf->WriteVideo(dtc->frameNum, dtc->pixels_UYVY, numWritten, DTAPI_SDI_FIELD1, DTAPI_SDI_8B, 1, numLines);
+		if (res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't write frame "LLD": %s\n", dtc->frameNum, DtapiResult2Str(res)));
+			return GF_BAD_PARAM;
+		}
+		numLines=-1, numWritten=DWIDTH*DHEIGHT*2/DNUMFIELDS;
+		res = dtf->WriteVideo(dtc->frameNum, dtc->pixels_UYVY+numWritten, numWritten, DTAPI_SDI_FIELD2, DTAPI_SDI_8B, 1, numLines);
+		if (res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't write frame "LLD": %s\n", dtc->frameNum, DtapiResult2Str(res)));
+			return GF_BAD_PARAM;
+		}
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Dektec Out] Written frame "LLD" [(0x%X,0x%X,0x%X,0x%X)(0x%X,0x%X,0x%X,0x%X)(0x%X,0x%X,0x%X,0x%X)(0x%X,0x%X,0x%X,0x%X)]\n", dtc->frameNum, DWIDTH, DHEIGHT,
+		 dtc->pixels_UYVY[0], dtc->pixels_UYVY[1], dtc->pixels_UYVY[2], dtc->pixels_UYVY[3], dtc->pixels_UYVY[4], dtc->pixels_UYVY[5], dtc->pixels_UYVY[6], dtc->pixels_UYVY[7],
+																				 dtc->pixels_UYVY[8], dtc->pixels_UYVY[9], dtc->pixels_UYVY[10], dtc->pixels_UYVY[11], dtc->pixels_UYVY[12], dtc->pixels_UYVY[13], dtc->pixels_UYVY[14], dtc->pixels_UYVY[15]));
+
+		// commit HANC/VANC - mandatory to form a valid frame
+		res = dtf->AncCommit(dtc->frameNum);
+		if (res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't write VANC for frame "LLD": %s\n", dtc->frameNum, DtapiResult2Str(res)));
+			return GF_BAD_PARAM;
+		}
+
+		dtc->frameNum++;
+
+#ifdef DEKTEC_DUMP_UYVY
+		char szName[1024];
+		sprintf(szName, "test.uyvy");
+		FILE *f = fopen(szName, "ab");
+		fwrite(dtc->pixels_UYVY, dtc->width*dtc->height*2, 1, f);
+		fclose(f);
+#endif
+		return GF_OK;
+	}
+
+	static GF_Err Dektec_LockBackBuffer(GF_VideoOutput *dr, GF_VideoSurface *vi, Bool do_lock)
+	{
+		DtContext *dtc = (DtContext*)dr->opaque;
+
+		if (do_lock) {
+			if (!vi) return GF_BAD_PARAM;
+			memset(vi, 0, sizeof(GF_VideoSurface));
+			vi->height = dtc->height;
+			vi->width = dtc->width;
+			vi->video_buffer = dtc->pixels;
+			vi->pitch_x = dtc->bpp;
+			vi->pitch_y = dtc->bpp * vi->width;/*the correct value here is dtc->pixel_format, but the soft raster only supports RGB*/
+			/*TODO: allocate a real RGB buffer, otherwise we will crash when displaying composed objects*/
+			vi->pixel_format = GF_PIXEL_RGB_24;
+		}
+		return GF_OK;
+	}
+
+	static void Dektec_Shutdown(GF_VideoOutput *dr)
+	{
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Dektec Out] Dektec_Shutdown\n"));
+		DtContext *dtc = (DtContext*)dr->opaque;
+		DtFrameBuffer *dtf = dtc->dtf;
+		DTAPI_RESULT res = dtf->Start(false);
+		if (res != DTAPI_OK)
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't stop transmission: %s\n", DtapiResult2Str(res)));
+		dtf->Detach();
+		dtc->dvc->Detach();
+		dtc->isSending = false;
+	}
+
+	static GF_Err Dektec_ProcessEvent(GF_VideoOutput *dr, GF_Event *evt)
+	{
+		DtFrameBuffer *dtf = (DtFrameBuffer*)(((DtContext*)dr->opaque)->dtf);
+
+		if (evt) {
+			switch (evt->type) {
+			case GF_EVENT_VIDEO_SETUP:
+				//FIXME: we do not know how to resize
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Dektec Out] resize (%ux%u) received.\n", evt->size.width, evt->size.height));
+				//Dektec_Shutdown(dr);
+				//Dektec_attach_start(dr);
+				if (evt->size.width != DWIDTH || evt->size.height != DHEIGHT) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[Dektec Out] Bad resize (%ux%u) received. Expected %dx%d.\n", evt->size.width, evt->size.height, DWIDTH, DHEIGHT));
+					//return GF_BAD_PARAM;
+					if (evt->size.width*evt->size.height > DWIDTH*DHEIGHT)
+						return GF_BAD_PARAM;
+				}
+				return GF_OK;
+			}
+		}
+		return GF_OK;
+	}
+
+	static GF_Err Dektec_resize(GF_VideoOutput *dr, u32 w, u32 h)
+	{
+		DtContext *dtc = (DtContext*)dr->opaque;
+		if (dtc->pixels) gf_free(dtc->pixels);
+		if (dtc->pixels_UYVY) gf_free(dtc->pixels_UYVY);
+		dtc->width = w;
+		dtc->height = h;
+		dtc->pixels = (char*)gf_malloc(dtc->bpp * w * h);
+		if (!dtc->pixels) return GF_OUT_OF_MEM;
+		memset(dtc->pixels, 0, dtc->bpp * w * h);
+		dtc->pixels_UYVY = (unsigned char*)gf_malloc(2 * w * h);
+		if (!dtc->pixels_UYVY) return GF_OUT_OF_MEM;
+		memset(dtc->pixels_UYVY, 0, 2 * w * h);
+		return GF_OK;
+	}
+
+	GF_Err Dektec_Setup(GF_VideoOutput *dr, void *os_handle, void *os_display, u32 init_flags)
+	{
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Dektec Out] Dektec_Setup\n"));
+		DtContext *dtc = (DtContext*)dr->opaque;
+		dtc->bpp = 3; //needed because lock_buffer expects RGB
+		dtc->pixel_format = GF_PIXEL_YV12;
+		dtc->isSending = false;
+		Dektec_resize(dr, DWIDTH, DHEIGHT);
+
+		int port = 1;
+		const char *opt;
+		opt = gf_modules_get_option((GF_BaseInterface *)dr, "DektecVideo", "SDIOutput");
+		if (opt) {
+			port = atoi(opt);
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[Dektec Out] No port specified, using default port: %d\n", port));
+		}
+
+		// Attach device and output channel objects to hardware
+		DtDevice *dvc = dtc->dvc;
+		DtFrameBuffer *dtf = dtc->dtf;
+		DTAPI_RESULT res;
+		res = dvc->AttachToType(2154);
+		if (res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] No DTA-2154 in system: %s\n", DtapiResult2Str(res)));
+			return GF_BAD_PARAM;
+		}
+
+		res = dvc->SetIoConfig(port, DTAPI_IOCONFIG_IODIR, DTAPI_IOCONFIG_OUTPUT, DTAPI_IOCONFIG_OUTPUT);
+		if (res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't set I/O config for the device: %s\n", DtapiResult2Str(res)));
+			return GF_BAD_PARAM;
+		}
+
+		res = dtf->AttachToOutput(dvc, port, 0);
+		if (res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't attach to port %d: %s\n", port, DtapiResult2Str(res)));
+			return GF_BAD_PARAM;
+		}
+
+		int IoStdValue=-1, IoStdSubValue=-1;
+		res = DtapiVidStd2IoStd(DFORMAT, IoStdValue, IoStdSubValue);
+		if (res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Unknown VidStd: %s\n", DtapiResult2Str(res)));
+			return GF_BAD_PARAM;
+		}
+
+		res = dtf->SetIoConfig(DTAPI_IOCONFIG_IOSTD, IoStdValue, IoStdSubValue);
+		if (res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't set I/O config: %s\n", DtapiResult2Str(res)));
+			return GF_BAD_PARAM;
+		}
+
+		dtc->frameNum = -1;
+
+		return GF_OK;
+	}
+
+	GF_VideoOutput *NewDektecVideoOutput()
+	{
+		GF_VideoOutput *driv = (GF_VideoOutput *) gf_malloc(sizeof(GF_VideoOutput));
+		memset(driv, 0, sizeof(GF_VideoOutput));
+		GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "Dektec Video Output", "gpac distribution")
+
+		DtDevice *dvc = new DtDevice;
+		DtFrameBuffer *dtf = new DtFrameBuffer;
+		if (!dtf || !dvc) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] DTA API couldn't be initialized.\n"));
+			delete dvc;
+			delete dtf;
+			gf_free(driv);
+			return NULL;
+		}
+
+		DtContext *dtc = new DtContext;
+		memset(dtc, 0, sizeof(DtContext));
+		dtc->dvc = dvc;
+		dtc->dtf = dtf;
+		driv->opaque = (void*)dtc;
+
+		driv->Flush = Dektec_Flush;
+		driv->LockBackBuffer = Dektec_LockBackBuffer;
+		driv->Setup = Dektec_Setup;
+		driv->Shutdown = Dektec_Shutdown;
+		driv->ProcessEvent = Dektec_ProcessEvent;
+		driv->Blit = Dektec_Blit;
+
+		driv->hw_caps |= GF_VIDEO_HW_HAS_YUV_OVERLAY | GF_VIDEO_HW_HAS_YUV;
+
+		return driv;
+	}
+
+	void DeleteDektecVideoOutput(void *ifce)
+	{
+		GF_VideoOutput *driv = (GF_VideoOutput *) ifce;
+		DtContext *dtc = (DtContext*)driv->opaque;
+		gf_free(dtc->pixels);
+		gf_free(dtc->pixels_UYVY);
+		delete(dtc->dtf);
+		delete(dtc->dvc);
+		delete(dtc);
+		gf_free(driv);
+	}
+
+
+#ifndef GPAC_STANDALONE_RENDER_2D
+
+	/*interface query*/
+	GPAC_MODULE_EXPORT
+	const u32 *QueryInterfaces()
+	{
+		static u32 si [] = {
+			GF_VIDEO_OUTPUT_INTERFACE,
+			0
+		};
+		return si;
+	}
+
+	/*interface create*/
+	GPAC_MODULE_EXPORT
+	GF_BaseInterface *LoadInterface(u32 InterfaceType)
+	{
+		if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return (GF_BaseInterface *) NewDektecVideoOutput();
+		return NULL;
+	}
+
+	/*interface destroy*/
+	GPAC_MODULE_EXPORT
+	void ShutdownInterface(GF_BaseInterface *ifce)
+	{
+		switch (ifce->InterfaceType) {
+		case GF_VIDEO_OUTPUT_INTERFACE:
+			DeleteDektecVideoOutput((GF_VideoOutput *)ifce);
+			break;
+		}
+	}
+
+
+	GPAC_MODULE_STATIC_DECLARATION( dektec_out )
+
+#endif
+
+} /* extern "C" */

gpac-0.5.1.svn5491.tar.xz/modules/dx_hw/copy_pixels.c -> gpac-0.5.1.svn5619.tar.xz/modules/dx_hw/copy_pixels.c Changed

gpac-0.5.1.svn5491.tar.xz/modules/ffmpeg_in/ffmpeg_decode.c -> gpac-0.5.1.svn5619.tar.xz/modules/ffmpeg_in/ffmpeg_decode.c Changed

@@ -327,7 +327,7 @@
 				}
 			}
 		}
-#ifndef FF_API_AVFRAME_LAVC
+#if !defined(FF_API_AVFRAME_LAVC)
 		*frame = avcodec_alloc_frame();
 #else
 		*frame = av_frame_alloc();
@@ -398,7 +398,7 @@
 
 #if defined(USE_AVCTX3)
 
-#ifndef FF_API_AVFRAME_LAVC
+#if !defined(FF_API_AVFRAME_LAVC)
 		ffd->audio_frame = avcodec_alloc_frame();
 #else
 		ffd->audio_frame = av_frame_alloc();
@@ -419,7 +419,7 @@
 			break;
 
 		case CODEC_ID_DVD_SUBTITLE:
-#ifndef FF_API_AVFRAME_LAVC
+#if !defined(FF_API_AVFRAME_LAVC)
 			*frame = avcodec_alloc_frame();
 #else
 			*frame = av_frame_alloc();
@@ -745,7 +745,7 @@
 		if (gotpic) {
 			//int inputDataSize = av_samples_get_buffer_size(NULL, ctx->channels, ffd->audio_frame->nb_samples, ctx->sample_fmt, 1);
 			gotpic = ffd->audio_frame->nb_samples * 2 * ctx->channels;
-			
+
 		}
 #elif defined(USE_AVCODEC2)
 		gotpic = 192000;
@@ -802,7 +802,7 @@
 			u32 i, size = ffd->audio_frame->nb_samples * ctx->channels;
 			s16 *output = (s16 *) outBuffer;
 			s8 *input = (s8 *) ffd->audio_frame->data;
-			for (i=0;i<size;i++) {
+			for (i=0; i<size; i++) {
 				output [i] = input[i] * 128;
 			}
 		} else if (ffd->audio_frame->format==AV_SAMPLE_FMT_S32) {
@@ -810,7 +810,7 @@
 			s16 *output = (s16 *) outBuffer;
 			s32 *input = (s32*) ffd->audio_frame->data;
 			shift = 1<<31;
-			for (i=0;i<size;i++) {
+			for (i=0; i<size; i++) {
 				output [i] = input[i] * shift;
 			}
 		} else if (ffd->audio_frame->format==AV_SAMPLE_FMT_S16) {

gpac-0.5.1.svn5491.tar.xz/modules/ffmpeg_in/ffmpeg_demux.c -> gpac-0.5.1.svn5619.tar.xz/modules/ffmpeg_in/ffmpeg_demux.c Changed

@@ -61,6 +61,15 @@
 #endif
 
 
+#if defined(GPAC_ANDROID) && (LIBAVFORMAT_VERSION_MAJOR <= 52) 
+
+#ifndef FF_API_CLOSE_INPUT_FILE
+#define FF_API_CLOSE_INPUT_FILE	1
+#endif
+
+#endif
+
+
 
 static u32 FFDemux_Run(void *par)
 {
@@ -301,7 +310,7 @@
 	}
 
 exit:
-#ifndef FF_API_CLOSE_INPUT_FILE
+#if FF_API_CLOSE_INPUT_FILE
 	if (ctx) av_close_input_file(ctx);
 #else
 	if (ctx) avformat_close_input(&ctx);
@@ -680,7 +689,7 @@
 
 		ffd->seekable = (av_seek_frame(ffd->ctx, -1, 0, AVSEEK_FLAG_BACKWARD)<0) ? 0 : 1;
 		if (!ffd->seekable) {
-#ifndef FF_API_CLOSE_INPUT_FILE
+#if FF_API_CLOSE_INPUT_FILE
 			av_close_input_file(ffd->ctx);
 #else
 			avformat_close_input(&ffd->ctx);
@@ -699,7 +708,7 @@
 
 err_exit:
 	GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] Error opening file %s: %s\n", url, gf_error_to_string(e)));
-#ifndef FF_API_CLOSE_INPUT_FILE
+#if FF_API_CLOSE_INPUT_FILE
 	if (ffd->ctx) av_close_input_file(ffd->ctx);
 #else
 	if (ffd->ctx) avformat_close_input(&ffd->ctx);
@@ -757,7 +766,7 @@
 
 	ffd->is_running = 0;
 
-#ifndef FF_API_CLOSE_INPUT_FILE
+#if FF_API_CLOSE_INPUT_FILE
 	if (ffd->ctx) av_close_input_file(ffd->ctx);
 #else
 	if (ffd->ctx) avformat_close_input(&ffd->ctx);

gpac-0.5.1.svn5491.tar.xz/modules/ft_font/ft_font.c -> gpac-0.5.1.svn5619.tar.xz/modules/ft_font/ft_font.c Changed

@@ -127,7 +127,7 @@
 	if (FT_New_Face(ftpriv->library, file_path, 0, & face )) return 0;
 	if (!face || !face->family_name) return 0;
 
-	num_faces = face->num_faces;
+	num_faces = (u32) face->num_faces;
 	/*locate right font in collection if several*/
 	for (i=0; i<num_faces; i++) {
 
@@ -226,9 +226,12 @@
 	}
 	gf_modules_set_option((GF_BaseInterface *)dr, "FontEngine", "RescanFonts", "no");
 
-	ftpriv->font_serif = NULL;
-	ftpriv->font_sans = NULL;
-	ftpriv->font_fixed = NULL;
+ if (ftpriv->font_fixed) gf_free(ftpriv->font_fixed);
+ ftpriv->font_fixed = NULL;
+ if (ftpriv->font_sans) gf_free(ftpriv->font_sans);
+ ftpriv->font_sans = NULL;
+ if (ftpriv->font_serif) gf_free(ftpriv->font_serif);
+ ftpriv->font_serif = NULL;
 
 	font_dir = ftpriv->font_dir;
 	ftpriv->font_dir = NULL;
@@ -344,15 +347,20 @@
 	if (!sOpt || !strcmp(sOpt, "yes") )
 		ft_rescan_fonts(dr);
 
-	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontSerif");
-	ftpriv->font_serif = gf_strdup(sOpt ? sOpt : "");
-
-	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontSans");
-	ftpriv->font_sans = gf_strdup(sOpt ? sOpt : "");
-
-	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontFixed");
-	ftpriv->font_fixed = gf_strdup(sOpt ? sOpt : "");
-
+ if (!ftpriv->font_serif) {
+ sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontSerif");
+ ftpriv->font_serif = gf_strdup(sOpt ? sOpt : "");
+ }
+ 
+ if (!ftpriv->font_sans) {
+ sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontSans");
+ ftpriv->font_sans = gf_strdup(sOpt ? sOpt : "");
+ }
+
+ if (!ftpriv->font_fixed) {
+ sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontFixed");
+ ftpriv->font_fixed = gf_strdup(sOpt ? sOpt : "");
+ }
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[FreeType] Init OK - font directory %s\n", ftpriv->font_dir));
 
 	return GF_OK;
@@ -556,16 +564,16 @@
 	s32 last_x, last_y;
 } ft_outliner;
 
-
-static int ft_move_to(const FT_Vector *to, void *user)
+int ft_move_to(const FT_Vector *to, void *user)
 {
 	ft_outliner *ftol = (ft_outliner *)user;
 	gf_path_add_move_to(ftol->path, INT2FIX(to->x), INT2FIX(to->y) );
-	ftol->last_x = to->x;
-	ftol->last_y = to->y;
+	ftol->last_x = (s32) to->x;
+	ftol->last_y = (s32) to->y;
 	return 0;
 }
-static int ft_line_to(const FT_Vector *to, void *user)
+
+int ft_line_to(const FT_Vector *to, void *user)
 {
 	ft_outliner *ftol = (ft_outliner *)user;
 	if ( (ftol->last_x == to->x) && (ftol->last_y == to->y)) {
@@ -575,14 +583,16 @@
 	}
 	return 0;
 }
-static int ft_conic_to(const FT_Vector * control, const FT_Vector *to, void *user)
+
+int ft_conic_to(const FT_Vector * control, const FT_Vector *to, void *user)
 {
 	ft_outliner *ftol = (ft_outliner *)user;
 	gf_path_add_quadratic_to(ftol->path, INT2FIX(control->x), INT2FIX(control->y), INT2FIX(to->x), INT2FIX(to->y) );
 	if ( (ftol->last_x == to->x) && (ftol->last_y == to->y)) gf_path_close(ftol->path);
 	return 0;
 }
-static int ft_cubic_to(const FT_Vector *c1, const FT_Vector *c2, const FT_Vector *to, void *user)
+
+int ft_cubic_to(const FT_Vector *c1, const FT_Vector *c2, const FT_Vector *to, void *user)
 {
 	ft_outliner *ftol = (ft_outliner *)user;
 	gf_path_add_cubic_to(ftol->path, INT2FIX(c1->x), INT2FIX(c1->y), INT2FIX(c2->x), INT2FIX(c2->y), INT2FIX(to->x), INT2FIX(to->y) );
@@ -643,14 +653,14 @@
 
 	glyph->ID = glyph_name;
 	glyph->utf_name = glyph_name;
-	glyph->horiz_advance = ftpriv->active_face->glyph->metrics.horiAdvance;
-	glyph->vert_advance = ftpriv->active_face->glyph->metrics.vertAdvance;
+	glyph->horiz_advance = (s32) ftpriv->active_face->glyph->metrics.horiAdvance;
+	glyph->vert_advance = (s32) ftpriv->active_face->glyph->metrics.vertAdvance;
 	/*
 		glyph->x = bbox.xMin;
 		glyph->y = bbox.yMax;
 	*/
-	glyph->width = ftpriv->active_face->glyph->metrics.width;
-	glyph->height = ftpriv->active_face->glyph->metrics.height;
+	glyph->width = (u32) ftpriv->active_face->glyph->metrics.width;
+	glyph->height = (u32) ftpriv->active_face->glyph->metrics.height;
 	FT_Done_Glyph((FT_Glyph) outline);
 	return glyph;
 }

gpac-0.5.1.svn5491.tar.xz/modules/gpac_js/gpac_js.c -> gpac-0.5.1.svn5619.tar.xz/modules/gpac_js/gpac_js.c Changed

@@ -96,300 +96,300 @@
 
 static SMJS_FUNC_PROP_GET( gpac_getProperty)
 
-	const char *res;
-	s32 prop_id;
-	GF_Terminal *term = gpac_get_term(c, obj);
-	if (!term) return JS_FALSE;
-
-	if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-	prop_id = SMJS_ID_TO_INT(id);
-
-	switch (prop_id) {
-	case -1: //"last_working_directory"
-		res = gf_cfg_get_key(term->user->config, "General", "LastWorkingDir");
-		if (!res) res = gf_cfg_get_key(term->user->config, "General", "ModulesDirectory");
-		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, res));
-		break;
-
-	case -2: //"scale_x")) 
-		*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(term->compositor->scale_x)) );
-		break;
-
-	case -3: //"scale_y"
-		*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(term->compositor->scale_y)) );
-		break;
-
-	case -4: //"translation_x"
-		*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(term->compositor->trans_x)) );
-		break;
-
-	case -5: //"translation_y"
-		*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(term->compositor->trans_y)) );
-		break;
-
-	case -6: //"rectangular_textures"
-	{
-		Bool any_size = GF_FALSE;
-	#ifndef GPAC_DISABLE_3D
-		if (term->compositor->gl_caps.npot_texture || term->compositor->gl_caps.rect_texture)
-			any_size = GF_TRUE;
-	#endif
-		*vp = BOOLEAN_TO_JSVAL( any_size ? JS_TRUE : JS_FALSE );
-	}
-		break;
+const char *res;
+s32 prop_id;
+GF_Terminal *term = gpac_get_term(c, obj);
+if (!term) return JS_FALSE;
+
+if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
+prop_id = SMJS_ID_TO_INT(id);
+
+switch (prop_id) {
+case -1: //"last_working_directory"
+	res = gf_cfg_get_key(term->user->config, "General", "LastWorkingDir");
+	if (!res) res = gf_cfg_get_key(term->user->config, "General", "ModulesDirectory");
+	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, res));
+	break;
+
+case -2: //"scale_x"))
+	*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(term->compositor->scale_x)) );
+	break;
+
+case -3: //"scale_y"
+	*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(term->compositor->scale_y)) );
+	break;
+
+case -4: //"translation_x"
+	*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(term->compositor->trans_x)) );
+	break;
+
+case -5: //"translation_y"
+	*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(term->compositor->trans_y)) );
+	break;
+
+case -6: //"rectangular_textures"
+{
+	Bool any_size = GF_FALSE;
+#ifndef GPAC_DISABLE_3D
+	if (term->compositor->gl_caps.npot_texture || term->compositor->gl_caps.rect_texture)
+		any_size = GF_TRUE;
+#endif
+	*vp = BOOLEAN_TO_JSVAL( any_size ? JS_TRUE : JS_FALSE );
+}
+break;
 
-	case -7: //"batteryOn"
-	{
-		Bool on_battery = GF_FALSE;
-		gf_sys_get_battery_state(&on_battery, NULL, NULL, NULL, NULL);
-		*vp = BOOLEAN_TO_JSVAL( on_battery ? JS_TRUE : JS_FALSE );
-	}
-		break;
+case -7: //"batteryOn"
+{
+	Bool on_battery = GF_FALSE;
+	gf_sys_get_battery_state(&on_battery, NULL, NULL, NULL, NULL);
+	*vp = BOOLEAN_TO_JSVAL( on_battery ? JS_TRUE : JS_FALSE );
+}
+break;
 
-	case -8: //	"batteryCharging"
-	{
-		u32 on_charge = 0;
-		gf_sys_get_battery_state(NULL, &on_charge, NULL, NULL, NULL);
-		*vp = BOOLEAN_TO_JSVAL( on_charge ? JS_TRUE : JS_FALSE );
-	}
-		break;
+case -8: //	"batteryCharging"
+{
+	u32 on_charge = 0;
+	gf_sys_get_battery_state(NULL, &on_charge, NULL, NULL, NULL);
+	*vp = BOOLEAN_TO_JSVAL( on_charge ? JS_TRUE : JS_FALSE );
+}
+break;
 
-	case -9: //	"batteryPercent"
-	{
-		u32 level = 0;
-		gf_sys_get_battery_state(NULL, NULL, &level, NULL, NULL);
-		*vp = INT_TO_JSVAL( level );
-	}
-		break;
+case -9: //	"batteryPercent"
+{
+	u32 level = 0;
+	gf_sys_get_battery_state(NULL, NULL, &level, NULL, NULL);
+	*vp = INT_TO_JSVAL( level );
+}
+break;
 
-	case -10: //"batteryLifeTime"
-	{
-		u32 level = 0;
-		gf_sys_get_battery_state(NULL, NULL, NULL, &level, NULL);
-		*vp = INT_TO_JSVAL( level );
-	}
-		break;
+case -10: //"batteryLifeTime"
+{
+	u32 level = 0;
+	gf_sys_get_battery_state(NULL, NULL, NULL, &level, NULL);
+	*vp = INT_TO_JSVAL( level );
+}
+break;
 
-	case -11: //"batteryFullLifeTime"
-	{
-		u32 level = 0;
-		gf_sys_get_battery_state(NULL, NULL, NULL, NULL, &level);
-		*vp = INT_TO_JSVAL( level );
-	}
-		break;
+case -11: //"batteryFullLifeTime"
+{
+	u32 level = 0;
+	gf_sys_get_battery_state(NULL, NULL, NULL, NULL, &level);
+	*vp = INT_TO_JSVAL( level );
+}
+break;
 
-	case -12: //"hostname"
-	{
-		char hostname[100];
-		gf_sk_get_host_name((char*)hostname);
-		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, hostname));
-	}
-		break;
+case -12: //"hostname"
+{
+	char hostname[100];
+	gf_sk_get_host_name((char*)hostname);
+	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, hostname));
+}
+break;
 
-	case -13: //"fullscreen"
-		*vp = BOOLEAN_TO_JSVAL( term->compositor->fullscreen ? JS_TRUE : JS_FALSE);
-		break;
+case -13: //"fullscreen"
+	*vp = BOOLEAN_TO_JSVAL( term->compositor->fullscreen ? JS_TRUE : JS_FALSE);
+	break;
 
-	case -14: //"current_path"
-	{
-		char *url = gf_url_concatenate(term->root_scene->root_od->net_service->url, "");
-		if (!url) url = gf_strdup("");
-		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, url));
-		gf_free(url);
-	}
-		break;
+case -14: //"current_path"
+{
+	char *url = gf_url_concatenate(term->root_scene->root_od->net_service->url, "");
+	if (!url) url = gf_strdup("");
+	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, url));
+	gf_free(url);
+}
+break;
 
-	case -15: //"volume"
-		*vp = INT_TO_JSVAL( gf_term_get_option(term, GF_OPT_AUDIO_VOLUME));
-		break;
+case -15: //"volume"
+	*vp = INT_TO_JSVAL( gf_term_get_option(term, GF_OPT_AUDIO_VOLUME));
+	break;
 
-	case -16: //"navigation"
-		*vp = INT_TO_JSVAL( gf_term_get_option(term, GF_OPT_NAVIGATION));
-		break;
+case -16: //"navigation"
+	*vp = INT_TO_JSVAL( gf_term_get_option(term, GF_OPT_NAVIGATION));
+	break;
 
-	case -17: //"navigation_type"
-		*vp = INT_TO_JSVAL( gf_term_get_option(term, GF_OPT_NAVIGATION_TYPE) );
-		break;
+case -17: //"navigation_type"
+	*vp = INT_TO_JSVAL( gf_term_get_option(term, GF_OPT_NAVIGATION_TYPE) );
+	break;
 
-	case -18: //"hardware_yuv"
-		*vp = INT_TO_JSVAL( (term->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_YUV) ? 1 : 0 );
-		break;
+case -18: //"hardware_yuv"
+	*vp = INT_TO_JSVAL( (term->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_YUV) ? 1 : 0 );
+	break;
 
-	case -19: //"hardware_rgb"
-		*vp = INT_TO_JSVAL( (term->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_RGB) ? 1 : 0 );
-		break;
+case -19: //"hardware_rgb"
+	*vp = INT_TO_JSVAL( (term->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_RGB) ? 1 : 0 );
+	break;
 
-	case -20: //"hardware_rgba"
-	{
-		u32 has_rgba = (term->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_RGBA) ? 1 : 0;
-	#ifndef GPAC_DISABLE_3D
-		if (term->compositor->hybrid_opengl || term->compositor->is_opengl) has_rgba = 1;
-	#endif
-		*vp = INT_TO_JSVAL( has_rgba );
-	}
-		break;
+case -20: //"hardware_rgba"
+{
+	u32 has_rgba = (term->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_RGBA) ? 1 : 0;
+#ifndef GPAC_DISABLE_3D
+	if (term->compositor->hybrid_opengl || term->compositor->is_opengl) has_rgba = 1;
+#endif
+	*vp = INT_TO_JSVAL( has_rgba );
+}
+break;
 
-	case -21: //"hardware_stretch"
-		*vp = INT_TO_JSVAL( (term->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_STRETCH) ? 1 : 0 );
-		break;
+case -21: //"hardware_stretch"
+	*vp = INT_TO_JSVAL( (term->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_STRETCH) ? 1 : 0 );
+	break;
 
-	case -22: //"screen_width"
-		*vp = INT_TO_JSVAL( term->compositor->video_out->max_screen_width);
-		break;
+case -22: //"screen_width"
+	*vp = INT_TO_JSVAL( term->compositor->video_out->max_screen_width);
+	break;
 
-	case -23: //"screen_height"
-		*vp = INT_TO_JSVAL( term->compositor->video_out->max_screen_height);
-		break;
+case -23: //"screen_height"
+	*vp = INT_TO_JSVAL( term->compositor->video_out->max_screen_height);
+	break;
 
-	case -24: //"http_max_bitrate"
-		*vp = INT_TO_JSVAL( gf_dm_get_data_rate(term->downloader));
-		break;
+case -24: //"http_max_bitrate"
+	*vp = INT_TO_JSVAL( gf_dm_get_data_rate(term->downloader));
+	break;
 
-	case -25: //"http_bitrate"
-		*vp = INT_TO_JSVAL( gf_dm_get_global_rate(term->downloader));
-		break;
+case -25: //"http_bitrate"
+	*vp = INT_TO_JSVAL( gf_dm_get_global_rate(term->downloader));
+	break;
 
-	case -26: //"fps"
-		*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, gf_sc_get_fps(term->compositor, 0) ) );
-		break;
+case -26: //"fps"
+	*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, gf_sc_get_fps(term->compositor, 0) ) );
+	break;
 
-	case -27: //"cpu_load" || "cpu"
-	{
-		GF_GPACJSExt *ext = (GF_GPACJSExt *)SMJS_GET_PRIVATE(c, obj);
-		gf_sys_get_rti(ext->rti_refresh_rate, &ext->rti, 0);
-		*vp = INT_TO_JSVAL(ext->rti.process_cpu_usage);
-	}
-		break;
+case -27: //"cpu_load" || "cpu"
+{
+	GF_GPACJSExt *ext = (GF_GPACJSExt *)SMJS_GET_PRIVATE(c, obj);
+	gf_sys_get_rti(ext->rti_refresh_rate, &ext->rti, 0);
+	*vp = INT_TO_JSVAL(ext->rti.process_cpu_usage);
+}
+break;
 
-	case -28: //"nb_cores"
-	{
-		GF_GPACJSExt *ext = (GF_GPACJSExt *)SMJS_GET_PRIVATE(c, obj);
-		gf_sys_get_rti(ext->rti_refresh_rate, &ext->rti, 0);
-		*vp = INT_TO_JSVAL(ext->rti.nb_cores);
-	}
-		break;
+case -28: //"nb_cores"
+{
+	GF_GPACJSExt *ext = (GF_GPACJSExt *)SMJS_GET_PRIVATE(c, obj);
+	gf_sys_get_rti(ext->rti_refresh_rate, &ext->rti, 0);
+	*vp = INT_TO_JSVAL(ext->rti.nb_cores);
+}
+break;
 
-	case -29: //"system_memory"
-	{
-		GF_GPACJSExt *ext = (GF_GPACJSExt *)SMJS_GET_PRIVATE(c, obj);
-		gf_sys_get_rti(ext->rti_refresh_rate, &ext->rti, 0);
-		*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, (Double) ext->rti.physical_memory ) );
-	}
-		break;
+case -29: //"system_memory"
+{
+	GF_GPACJSExt *ext = (GF_GPACJSExt *)SMJS_GET_PRIVATE(c, obj);
+	gf_sys_get_rti(ext->rti_refresh_rate, &ext->rti, 0);
+	*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, (Double) ext->rti.physical_memory ) );
+}
+break;
 
-	case -30: //"memory"
-	{
-		GF_GPACJSExt *ext = (GF_GPACJSExt *)SMJS_GET_PRIVATE(c, obj);
-		gf_sys_get_rti(ext->rti_refresh_rate, &ext->rti, 0);
-		*vp = INT_TO_JSVAL(ext->rti.process_memory);
-	}
-		break;
+case -30: //"memory"
+{
+	GF_GPACJSExt *ext = (GF_GPACJSExt *)SMJS_GET_PRIVATE(c, obj);
+	gf_sys_get_rti(ext->rti_refresh_rate, &ext->rti, 0);
+	*vp = INT_TO_JSVAL(ext->rti.process_memory);
+}
+break;
 
-	case -31: //"argc"
-		*vp = INT_TO_JSVAL(gf_sys_get_argc() );
-		break;
+case -31: //"argc"
+	*vp = INT_TO_JSVAL(gf_sys_get_argc() );
+	break;
 
-	case -36://"dpi_x"
-		*vp = INT_TO_JSVAL(term->compositor->video_out->dpi_x);
-		break;
+case -36://"dpi_x"
+	*vp = INT_TO_JSVAL(term->compositor->video_out->dpi_x);
+	break;
 
-	case -37://"dpi_y"
-		*vp = INT_TO_JSVAL(term->compositor->video_out->dpi_y);
-		break;
-	}
+case -37://"dpi_y"
+	*vp = INT_TO_JSVAL(term->compositor->video_out->dpi_y);
+	break;
+}
 
-	return JS_TRUE;
+return JS_TRUE;
 }
 
 
 static SMJS_FUNC_PROP_SET( gpac_setProperty)
 
-	s32 prop_id;
-	char *prop_val;
-	GF_Terminal *term = gpac_get_term(c, obj);
-	if (!term) return JS_FALSE;
+s32 prop_id;
+char *prop_val;
+GF_Terminal *term = gpac_get_term(c, obj);
+if (!term) return JS_FALSE;
 
-	if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-	prop_id = SMJS_ID_TO_INT(id);
+if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
+prop_id = SMJS_ID_TO_INT(id);
 
-	switch (prop_id) {
-	case -1: //"last_working_directory"
-		if (!JSVAL_IS_STRING(*vp)) {
-			return JS_FALSE;
-		}
-		prop_val = SMJS_CHARS(c, *vp);
-		gf_cfg_set_key(term->user->config, "General", "LastWorkingDir", prop_val);
-		SMJS_FREE(c, prop_val);
-		break;
-	case -32://"caption"
-	{
-		GF_Event evt;
-		if (!JSVAL_IS_STRING(*vp)) {
-			return JS_FALSE;
-		}
-		evt.type = GF_EVENT_SET_CAPTION;
-		evt.caption.caption = SMJS_CHARS(c, *vp);
-		gf_term_user_event(term, &evt);
-		SMJS_FREE(c, (char*)evt.caption.caption);
-	}
-		break;
-	case -13://"fullscreen"
-	{
-		/*no fullscreen for iOS (always on)*/
-	#ifndef GPAC_IPHONE
-		Bool res = (JSVAL_TO_BOOLEAN(*vp)==JS_TRUE) ? 1 : 0;
-		if (term->compositor->fullscreen != res) {
-			gf_term_set_option(term, GF_OPT_FULLSCREEN, res);
-		}
-	#endif
+switch (prop_id) {
+case -1: //"last_working_directory"
+	if (!JSVAL_IS_STRING(*vp)) {
+		return JS_FALSE;
 	}
-		break;
-	case -15: //"volume"
-		if (JSVAL_IS_NUMBER(*vp)) {
-			jsdouble d;
-			SMJS_GET_NUMBER(*vp, d);
-			gf_term_set_option(term, GF_OPT_AUDIO_VOLUME, (u32) d);
-		} else if (JSVAL_IS_INT(*vp)) {
-			gf_term_set_option(term, GF_OPT_AUDIO_VOLUME, JSVAL_TO_INT(*vp));
-		}
-		break;
-
-	case -16: //"navigation"
-		gf_term_set_option(term, GF_OPT_NAVIGATION, JSVAL_TO_INT(*vp) );
-		break;
-	case -17: //"navigation_type"
-		gf_term_set_option(term, GF_OPT_NAVIGATION_TYPE, 0);
-		break;
-	case -33: //"disable_hardware_blit"
-		term->compositor->disable_hardware_blit = JSVAL_TO_INT(*vp) ? 1 : 0;
-		gf_sc_set_option(term->compositor, GF_OPT_REFRESH, 0);
-		break;
-	case -34: //"disable_composite_blit"
-	{
-		Bool new_val = JSVAL_TO_INT(*vp) ? 1 : 0;
-		if (new_val != term->compositor->disable_composite_blit) {
-			term->compositor->disable_composite_blit = new_val;
-			term->compositor->rebuild_offscreen_textures = 1;
-			gf_sc_set_option(term->compositor, GF_OPT_REFRESH, 0);
-		}
+	prop_val = SMJS_CHARS(c, *vp);
+	gf_cfg_set_key(term->user->config, "General", "LastWorkingDir", prop_val);
+	SMJS_FREE(c, prop_val);
+	break;
+case -32://"caption"
+{
+	GF_Event evt;
+	if (!JSVAL_IS_STRING(*vp)) {
+		return JS_FALSE;
 	}
-		break;
-	case -24: //"http_max_bitrate"
-	{
-		u32 new_rate = JSVAL_TO_INT(*vp);
-		gf_dm_set_data_rate(term->downloader, new_rate);
+	evt.type = GF_EVENT_SET_CAPTION;
+	evt.caption.caption = SMJS_CHARS(c, *vp);
+	gf_term_user_event(term, &evt);
+	SMJS_FREE(c, (char*)evt.caption.caption);
+}
+break;
+case -13://"fullscreen"
+{
+	/*no fullscreen for iOS (always on)*/
+#ifndef GPAC_IPHONE
+	Bool res = (JSVAL_TO_BOOLEAN(*vp)==JS_TRUE) ? 1 : 0;
+	if (term->compositor->fullscreen != res) {
+		gf_term_set_option(term, GF_OPT_FULLSCREEN, res);
 	}
-		break;
-	case -35: //"focus_highlight"
-		term->compositor->disable_focus_highlight = JSVAL_TO_BOOLEAN(*vp) ? 0 : 1;
-		break;
+#endif
+}
+break;
+case -15: //"volume"
+	if (JSVAL_IS_NUMBER(*vp)) {
+		jsdouble d;
+		SMJS_GET_NUMBER(*vp, d);
+		gf_term_set_option(term, GF_OPT_AUDIO_VOLUME, (u32) d);
+	} else if (JSVAL_IS_INT(*vp)) {
+		gf_term_set_option(term, GF_OPT_AUDIO_VOLUME, JSVAL_TO_INT(*vp));
+	}
+	break;
+
+case -16: //"navigation"
+	gf_term_set_option(term, GF_OPT_NAVIGATION, JSVAL_TO_INT(*vp) );
+	break;
+case -17: //"navigation_type"
+	gf_term_set_option(term, GF_OPT_NAVIGATION_TYPE, 0);
+	break;
+case -33: //"disable_hardware_blit"
+	term->compositor->disable_hardware_blit = JSVAL_TO_INT(*vp) ? 1 : 0;
+	gf_sc_set_option(term->compositor, GF_OPT_REFRESH, 0);
+	break;
+case -34: //"disable_composite_blit"
+{
+	Bool new_val = JSVAL_TO_INT(*vp) ? 1 : 0;
+	if (new_val != term->compositor->disable_composite_blit) {
+		term->compositor->disable_composite_blit = new_val;
+		term->compositor->rebuild_offscreen_textures = 1;
+		gf_sc_set_option(term->compositor, GF_OPT_REFRESH, 0);
 	}
-	return JS_TRUE;
+}
+break;
+case -24: //"http_max_bitrate"
+{
+	u32 new_rate = JSVAL_TO_INT(*vp);
+	gf_dm_set_data_rate(term->downloader, new_rate);
+}
+break;
+case -35: //"focus_highlight"
+	term->compositor->disable_focus_highlight = JSVAL_TO_BOOLEAN(*vp) ? 0 : 1;
+	break;
+}
+return JS_TRUE;
 }
 
 static JSBool SMJS_FUNCTION(gpac_getOption)
 {
-	const char *opt;
+	const char *opt = NULL;
 	char *sec_name, *key_name;
 	s32 idx = -1;
 	JSString *s;
@@ -423,7 +423,9 @@
 		opt = gf_cfg_get_key(term->user->config, sec_name, key_name);
 	} else if (idx>=0) {
 		opt = gf_cfg_get_key_name(term->user->config, sec_name, idx);
-	}
+ } else {
+ opt = NULL;
+ }
 	if (key_name) {
 		SMJS_FREE(c, key_name);
 	}
@@ -930,17 +932,17 @@
 			*vp = INT_TO_JSVAL(com.quality_query.index);
 			break;
 		}
-	
-#if 0
+
+	#if 0
 		//otherwise use input channels
 		if (odm->codec->type==GF_STREAM_VISUAL) {
 			*vp = INT_TO_JSVAL(gf_list_count(odm->codec->inChannels));
 		} else {
 			*vp = INT_TO_JSVAL(0);
 		}
-#endif
+	#endif
 	}
-		break;
+	break;
 	case -29:
 		*vp = INT_TO_JSVAL(odi.max_buffer);
 		break;
@@ -974,7 +976,7 @@
 		gf_term_service_command(odm->net_service, &com);
 		*vp = INT_TO_JSVAL(com.net_stats.bw_down);
 	}
-		break;
+	break;
 	case -38:
 		*vp = INT_TO_JSVAL(gf_list_count(odm->net_service->dnloads) );
 		break;
@@ -1016,7 +1018,7 @@
 		gf_term_service_command(odm->net_service, &com);
 		*vp = INT_TO_JSVAL(com.timeshift.time);
 	}
-		break;
+	break;
 	case -41:
 		*vp = BOOLEAN_TO_JSVAL( (odm->addon || (!odm->subscene && odm->parentscene->root_od->addon)) ? JS_TRUE : JS_FALSE);
 		break;
@@ -1025,19 +1027,19 @@
 		GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
 		*vp = BOOLEAN_TO_JSVAL( scene->main_addon_selected ? JS_TRUE : JS_FALSE);
 	}
-		break;
+	break;
 	case -43:
 	{
 		GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
 		*vp = BOOLEAN_TO_JSVAL( gf_sc_is_over(odm->term->compositor, scene->graph) ? JS_TRUE : JS_FALSE);
 	}
-		break;
+	break;
 	case -44:
 	{
 		GF_Channel *ch = gf_list_get(odm->channels, 0);
 		*vp = BOOLEAN_TO_JSVAL((ch && ch->is_pulling) ? JS_TRUE : JS_FALSE);
 	}
-		break;
+	break;
 	case -45:
 		*vp = BOOLEAN_TO_JSVAL(odm->subscene && odm->subscene->is_dynamic_scene ? JS_TRUE : JS_FALSE);
 		break;
@@ -1054,12 +1056,32 @@
 			*vp = JSVAL_NULL;
 		}
 	}
-		break;
+	break;
 	case -47:
 		*vp = INT_TO_JSVAL( odi.ntp_diff);
 		break;
+
+	case -48:
+	{
+		GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
+		u32 i, count = gf_list_count(scene->resources);
+		*vp = JSVAL_NULL;
+		for (i=0; i < count; i++) {
+			GF_ObjectManager *an_odm = gf_list_get(scene->resources, i);
+			if (an_odm && an_odm->addon && (an_odm->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
+				if (!strstr(an_odm->addon->url, "://")) {
+					char szURL[GF_MAX_PATH];
+					sprintf(szURL, "gpac://%s", an_odm->addon->url);
+					*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szURL) );
+				} else {
+					*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, an_odm->addon->url) );
+				}
+			}
+		}
 	}
-	return JS_TRUE;
+	break;
+	}
+return JS_TRUE;
 }
 
 static JSBool SMJS_FUNCTION(gjs_odm_get_quality)
@@ -1114,10 +1136,10 @@
 	GF_ObjectManager *odm = (GF_ObjectManager *)SMJS_GET_PRIVATE(c, obj);
 
 	if (!odm) return JS_TRUE;
-	
+
 	if ((argc==1) && JSVAL_IS_STRING(argv[0])) {
 		ID = SMJS_CHARS(c, argv[0]);
-	} 
+	}
 	if (!ID) {
 		return JS_TRUE;
 	}
@@ -1130,7 +1152,7 @@
 	} else {
 		com.switch_quality.ID = ID;
 	}
-	
+
 	gf_term_service_command(odm->net_service, &com);
 
 	SMJS_FREE(c, ID);
@@ -1143,7 +1165,7 @@
 	GF_ObjectManager *odm = (GF_ObjectManager *)SMJS_GET_PRIVATE(c, obj);
 
 	if (!odm || !odm->subscene || !odm->subscene->main_addon_selected) return JS_TRUE;
-	
+
 	gf_scene_resume_live(odm->subscene);
 	return JS_TRUE;
 }
@@ -1181,10 +1203,10 @@
 		an_odm = gf_list_get(odm->subscene->resources, idx);
 	}
 	if (an_odm && an_odm->net_service) {
- JSObject *anobj;
- JSClass *_class = JS_GET_CLASS(c, obj);
- anobj = JS_NewObject(c, _class, 0, 0);
- SMJS_SET_PRIVATE(c, anobj, an_odm);
+		JSObject *anobj;
+		JSClass *_class = JS_GET_CLASS(c, obj);
+		anobj = JS_NewObject(c, _class, 0, 0);
+		SMJS_SET_PRIVATE(c, anobj, an_odm);
 		SMJS_SET_RVAL( OBJECT_TO_JSVAL(anobj) );
 	} else {
 		SMJS_SET_RVAL(JSVAL_NULL);
@@ -1209,6 +1231,32 @@
 	return JS_TRUE;
 }
 
+static void do_enable_addon(GF_ObjectManager *odm, char *addon_url, Bool enable_if_defined )
+{
+	GF_AssociatedContentLocation addon_info;
+	memset(&addon_info, 0, sizeof(GF_AssociatedContentLocation));
+	addon_info.external_URL = addon_url;
+	addon_info.timeline_id = -100;
+	addon_info.enable_if_defined = enable_if_defined;
+	gf_scene_register_associated_media(odm->subscene ? odm->subscene : odm->parentscene, &addon_info);
+}
+
+static JSBool SMJS_FUNCTION(gjs_odm_enable_addon)
+{
+	char *addon_url = NULL;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_ObjectManager *odm = (GF_ObjectManager *)SMJS_GET_PRIVATE(c, obj);
+
+	if (! JSVAL_IS_STRING(argv[0]) ) return JS_TRUE;
+
+	addon_url = SMJS_CHARS(c, argv[0]);
+	if (addon_url) {
+		do_enable_addon(odm, addon_url, GF_TRUE);
+	}
+	return JS_TRUE;
+}
+
 static JSBool SMJS_FUNCTION(gjs_odm_declare_addon)
 {
 	char *addon_url = NULL;
@@ -1220,12 +1268,7 @@
 
 	addon_url = SMJS_CHARS(c, argv[0]);
 	if (addon_url) {
-		GF_AssociatedContentLocation addon_info;
-		memset(&addon_info, 0, sizeof(GF_AssociatedContentLocation));
-		addon_info.external_URL = addon_url;
-		addon_info.timeline_id = -100;
-		addon_info.enable_if_defined = 1;
-		gf_scene_register_associated_media(odm->subscene ? odm->subscene : odm->parentscene, &addon_info);
+		do_enable_addon(odm, addon_url, GF_FALSE);
 	}
 	return JS_TRUE;
 }
@@ -1618,20 +1661,22 @@
 		SMJS_PROPERTY_SPEC("dynamic_scene",		-45, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 		SMJS_PROPERTY_SPEC("service_name",		-46, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 		SMJS_PROPERTY_SPEC("ntp_diff",			-47, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("main_addon_url",	-48, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+
 
 		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 	};
 
 	JSFunctionSpec odmClassFuncs[] = {
 		SMJS_FUNCTION_SPEC("declare_addon", gjs_odm_declare_addon, 1),
-		SMJS_FUNCTION_SPEC("enable_addon", gjs_odm_declare_addon, 1),
+		SMJS_FUNCTION_SPEC("enable_addon", gjs_odm_enable_addon, 1),
 		SMJS_FUNCTION_SPEC("addon_layout", gjs_odm_addon_layout, 1),
 		SMJS_FUNCTION_SPEC("get_resource", gjs_odm_get_resource, 1),
 		SMJS_FUNCTION_SPEC("get_quality", gjs_odm_get_quality, 1),
 		SMJS_FUNCTION_SPEC("select_service", gjs_odm_select_service, 1),
 		SMJS_FUNCTION_SPEC("select_quality", gjs_odm_select_quality, 1),
 		SMJS_FUNCTION_SPEC("disable_main_addon", gjs_odm_disable_main_addon, 1),
-		
+
 		SMJS_FUNCTION_SPEC(0, 0, 0)
 	};
 
@@ -1650,7 +1695,7 @@
 	gjs->nb_loaded++;
 
 	if (!scene) return;
- 
+
 	JS_SETUP_CLASS(gjs->gpacClass, "GPAC", JSCLASS_HAS_PRIVATE, gpac_getProperty, gpac_setProperty, JS_FinalizeStub);
 
 	if (!gjs->gpac_obj) {
@@ -1697,7 +1742,8 @@
 		DECLARE_GPAC_CONST(GF_EVENT_TIMESHIFT_UPDATE);
 		DECLARE_GPAC_CONST(GF_EVENT_TIMESHIFT_OVERFLOW);
 		DECLARE_GPAC_CONST(GF_EVENT_TIMESHIFT_UNDERRUN);
-		
+		DECLARE_GPAC_CONST(GF_EVENT_QUIT);
+
 		DECLARE_GPAC_CONST(GF_NAVIGATE_NONE);
 		DECLARE_GPAC_CONST(GF_NAVIGATE_WALK);
 		DECLARE_GPAC_CONST(GF_NAVIGATE_FLY);

gpac-0.5.1.svn5491.tar.xz/modules/ios_cam/ios_cam.c -> gpac-0.5.1.svn5619.tar.xz/modules/ios_cam/ios_cam.c Changed

gpac-0.5.1.svn5491.tar.xz/modules/isom_in/read.c -> gpac-0.5.1.svn5619.tar.xz/modules/isom_in/read.c Changed

gpac-0.5.1.svn5491.tar.xz/modules/mp3_in/mad_dec.c -> gpac-0.5.1.svn5619.tar.xz/modules/mp3_in/mad_dec.c Changed

gpac-0.5.1.svn5491.tar.xz/modules/mpd_in/mpd_in.c -> gpac-0.5.1.svn5619.tar.xz/modules/mpd_in/mpd_in.c Changed

@@ -89,10 +89,10 @@
 static u32 MPD_RegisterMimeTypes(const GF_InputService *plug)
 {
 	u32 i, c;
-	for (i = 0 ; GF_DASH_MPD_MIME_TYPES[i]; i++)
+	for (i=0; GF_DASH_MPD_MIME_TYPES[i]; i++)
 		gf_service_register_mime (plug, GF_DASH_MPD_MIME_TYPES[i], MPD_MPD_EXT, MPD_MPD_DESC);
 	c = i;
-	for (i = 0 ; GF_DASH_M3U8_MIME_TYPES[i]; i++)
+	for (i=0; GF_DASH_M3U8_MIME_TYPES[i]; i++)
 		gf_service_register_mime(plug, GF_DASH_M3U8_MIME_TYPES[i], MPD_M3U8_EXT, MPD_M3U8_DESC);
 	return c+i;
 }
@@ -102,16 +102,16 @@
 	u32 i;
 	char *sExt;
 	if (!plug || !url)
-		return 0;
+		return GF_FALSE;
 	sExt = strrchr(url, '.');
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Can Handle URL request from terminal for %s\n", url));
-	for (i = 0 ; GF_DASH_MPD_MIME_TYPES[i]; i++) {
+	for (i=0; GF_DASH_MPD_MIME_TYPES[i]; i++) {
 		if (gf_service_check_mime_register(plug, GF_DASH_MPD_MIME_TYPES[i], MPD_MPD_EXT, MPD_MPD_DESC, sExt))
-			return 1;
+			return GF_TRUE;
 	}
-	for (i = 0 ; GF_DASH_M3U8_MIME_TYPES[i]; i++) {
+	for (i=0; GF_DASH_M3U8_MIME_TYPES[i]; i++) {
 		if (gf_service_check_mime_register(plug, GF_DASH_M3U8_MIME_TYPES[i], MPD_M3U8_EXT, MPD_M3U8_DESC, sExt))
-			return 1;
+			return GF_TRUE;
 	}
 
 	return gf_dash_check_mpd_root_type(url);
@@ -147,7 +147,7 @@
 	GF_MPD_In *mpdin = (GF_MPD_In*) service->ifce->priv;
 	GF_Channel *ch;
 	GF_MPDGroup *group;
-	Bool do_map_time = 0;
+	Bool do_map_time = GF_FALSE;
 	if (!ns || !hdr) {
 		mpdin->fn_data_packet(service, ns, data, data_size, hdr, reception_status);
 		return;
@@ -168,9 +168,9 @@
 		if (!group->pto_setup) {
 			Double scale;
 			s64 start, dur;
- u64 pto;
+			u64 pto;
 			gf_dash_group_get_presentation_time_offset(mpdin->dash, i, &pto, &group->timescale);
- group->pto = (s64) pto;
+			group->pto = (s64) pto;
 			group->pto_setup = 1;
 
 			if (group->timescale && (group->timescale != ch->esd->slConfig->timestampResolution)) {
@@ -179,35 +179,35 @@
 			}
 			scale = ch->esd->slConfig->timestampResolution;
 			scale /= 1000;
-			dur = (u64) (scale * gf_dash_get_period_duration(mpdin->dash) );
+			dur = (u64) (scale * gf_dash_get_period_duration(mpdin->dash));
 			if (dur) {
 				group->max_cts_in_period = group->pto + dur;
 			} else {
 				group->max_cts_in_period = 0;
 			}
 
-			start = (u64) (scale * gf_dash_get_period_start(mpdin->dash) );
+			start = (u64) (scale * gf_dash_get_period_start(mpdin->dash));
 			group->pto -= start;
 		}
 		//filter any packet outside the current period
 		if (group->max_cts_in_period && (s64) hdr->compositionTimeStamp > group->max_cts_in_period) {
- GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Packet timestamp "LLU" larger than max CTS in period "LLU" - skipping\n", hdr->compositionTimeStamp, group->max_cts_in_period));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Packet timestamp "LLU" larger than max CTS in period "LLU" - skipping\n", hdr->compositionTimeStamp, group->max_cts_in_period));
 			return;
- }
+		}
 
 		//remap timestamps to our timeline
 		if ((s64) hdr->decodingTimeStamp >= group->pto)
 			hdr->decodingTimeStamp -= group->pto;
 		else {
- GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Packet DTS "LLU" less than PTO "LLU" - forcing CTS to 0\n", hdr->compositionTimeStamp, group->pto));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Packet DTS "LLU" less than PTO "LLU" - forcing CTS to 0\n", hdr->compositionTimeStamp, group->pto));
 			hdr->decodingTimeStamp = 0;
- }
-		if ((s64) hdr->compositionTimeStamp >= group->pto) 
+		}
+		if ((s64) hdr->compositionTimeStamp >= group->pto)
 			hdr->compositionTimeStamp -= group->pto;
 		else {
- GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Packet CTS "LLU" less than PTO "LLU" - forcing CTS to 0\n", hdr->compositionTimeStamp, group->pto));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Packet CTS "LLU" less than PTO "LLU" - forcing CTS to 0\n", hdr->compositionTimeStamp, group->pto));
 			hdr->compositionTimeStamp = 0;
- }
+		}
 	} else if (!group->pto_setup) {
 		do_map_time = 1;
 		group->pto_setup = 1;
@@ -312,14 +312,14 @@
 			gf_dash_group_discard_segment(mpdin->dash, group_idx);
 		}
 
-		while (gf_dash_is_running(mpdin->dash) ) {
+		while (gf_dash_is_running(mpdin->dash)) {
 			group_done=0;
 			nb_segments_cached = gf_dash_group_get_num_segments_ready(mpdin->dash, group_idx, &group_done);
 			if (nb_segments_cached>=1)
 				break;
 
 			if (group_done) {
-				if (!gf_dash_get_period_switch_status(mpdin->dash) && !gf_dash_in_last_period(mpdin->dash) ) {
+				if (!gf_dash_get_period_switch_status(mpdin->dash) && !gf_dash_in_last_period(mpdin->dash)) {
 					GF_NetworkCommand com;
 					param->url_query.in_end_of_period = 1;
 					memset(&com, 0, sizeof(GF_NetworkCommand));
@@ -378,7 +378,7 @@
 
 #ifndef GPAC_DISABLE_LOG
 		{
-			u32 timer2 = gf_sys_clock() - timer ;
+			u32 timer2 = gf_sys_clock() - timer;
 			if (timer2 > 1000) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Waiting for download to end took a long time : %u ms\n", timer2));
 			}
@@ -387,7 +387,7 @@
 			} else {
 				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[MPD_IN] Next Segment is %s\n", src_url));
 			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Waited %d ms - Elements in cache: %u/%u\n\tCache file name %s\n\tsegment start time %g sec\n", timer2, gf_dash_group_get_num_segments_ready(mpdin->dash, group_idx, &group_done), gf_dash_group_get_max_segments_in_cache(mpdin->dash, group_idx), param->url_query.next_url, gf_dash_group_current_segment_start_time(mpdin->dash, group_idx) ));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Waited %d ms - Elements in cache: %u/%u\n\tCache file name %s\n\tsegment start time %g sec\n", timer2, gf_dash_group_get_num_segments_ready(mpdin->dash, group_idx, &group_done), gf_dash_group_get_max_segments_in_cache(mpdin->dash, group_idx), param->url_query.next_url, gf_dash_group_current_segment_start_time(mpdin->dash, group_idx)));
 		}
 #endif
 	}
@@ -506,7 +506,7 @@
 
 	if (param->msg_type == GF_NETIO_PARSE_HEADER) {
 		if (!strcmp(param->name, "Dash-Newest-Segment")) {
-			gf_dash_resync_to_segment(group->mpdin->dash, param->value, gf_dm_sess_get_header(param->sess, "Dash-Oldest-Segment") );
+			gf_dash_resync_to_segment(group->mpdin->dash, param->value, gf_dm_sess_get_header(param->sess, "Dash-Oldest-Segment"));
 		}
 	}
 
@@ -561,7 +561,7 @@
 	} else {
 		sess = gf_service_download_new(mpdin->service, url, flags, NULL, NULL);
 	}
-	return (GF_DASHFileIOSession ) sess;
+	return (GF_DASHFileIOSession) sess;
 }
 void mpdin_dash_io_del(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
 {
@@ -681,7 +681,7 @@
 
 		//however select the default languague
 		opt = gf_modules_get_option((GF_BaseInterface *)mpdin->plug, "Systems", "LanguageName");
-		if (opt) 
+		if (opt)
 			gf_dash_groups_set_language(mpdin->dash, opt);
 
 		return GF_OK;
@@ -782,8 +782,8 @@
 			GF_MPDGroup *group = gf_dash_get_group_udta(mpdin->dash, group_idx);
 			if (group) {
 				GF_NetworkCommand com;
-				memset(&com, 0, sizeof(GF_NetworkCommand) );
-	
+				memset(&com, 0, sizeof(GF_NetworkCommand));
+
 				com.command_type = GF_NET_SERVICE_EVENT;
 				com.send_event.evt.type = GF_EVENT_QUALITY_SWITCHED;
 				gf_service_command(mpdin->service, &com, GF_OK);
@@ -803,7 +803,7 @@
 		com.send_event.evt.type = GF_EVENT_TIMESHIFT_UPDATE;
 		gf_service_command(mpdin->service, &com, GF_OK);
 	}
-	
+
 	return GF_OK;
 }
 
@@ -901,12 +901,11 @@
 	else if (opt && !strcmp(opt, "none")) mpdin->buffer_mode = MPDIN_BUFFER_NONE;
 	else mpdin->buffer_mode = MPDIN_BUFFER_MIN;
 
-
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "LowLatency");
 	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "LowLatency", "no");
 
-	if (opt && !strcmp(opt, "chunk") ) mpdin->use_low_latency = 1;
-	else if (opt && !strcmp(opt, "always") ) mpdin->use_low_latency = 2;
+	if (opt && !strcmp(opt, "chunk")) mpdin->use_low_latency = 1;
+	else if (opt && !strcmp(opt, "always")) mpdin->use_low_latency = 2;
 	else mpdin->use_low_latency = 0;
 
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "AllowAbort");
@@ -987,7 +986,7 @@
 	/*dash thread starts at the end of gf_dash_open */
 	e = gf_dash_open(mpdin->dash, url);
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD_IN] Error - cannot initialize DASH Client for %s: %s\n", url, gf_error_to_string(e) ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD_IN] Error - cannot initialize DASH Client for %s: %s\n", url, gf_error_to_string(e)));
 		mpdin->fn_connect_ack(mpdin->service, NULL, e);
 		return GF_OK;
 	}
@@ -1021,7 +1020,7 @@
 GF_Err MPD_CloseService(GF_InputService *plug)
 {
 	GF_MPD_In *mpdin = (GF_MPD_In*) plug->priv;
-	assert( mpdin );
+	assert(mpdin);
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Close Service (%p) request from terminal\n", mpdin->service));
 
 	mpdin->closed = 1;
@@ -1041,7 +1040,7 @@
 	GF_MPD_In *mpdin = (GF_MPD_In*) plug->priv;
 	GF_InputService *segment_ifce = NULL;
 
-	if (!plug || !plug->priv || !com ) return GF_SERVICE_ERROR;
+	if (!plug || !plug->priv || !com) return GF_SERVICE_ERROR;
 
 	segment_ifce = MPD_GetInputServiceForChannel(mpdin, com->base.on_channel);
 
@@ -1129,7 +1128,7 @@
 		if (idx < 0) return GF_BAD_PARAM;
 		com->net_stats.bw_down = 8 * gf_dash_group_get_download_rate(mpdin->dash, idx);
 	}
-		return GF_OK;
+	return GF_OK;
 
 	case GF_NET_SERVICE_QUALITY_QUERY:
 	{
@@ -1144,7 +1143,7 @@
 			return GF_OK;
 		}
 		if (com->quality_query.index>count) return GF_BAD_PARAM;
-	
+
 		e = gf_dash_group_get_quality_info(mpdin->dash, idx, com->quality_query.index-1, &qinfo);
 		if (e) return e;
 
@@ -1169,11 +1168,11 @@
 		return GF_OK;
 	}
 
-		break;
+	break;
 
 	case GF_NET_CHAN_BUFFER:
 		/*get it from MPD minBufferTime - if not in low latency mode, indicate the value given in MPD (not possible to fetch segments earlier) - to be more precise we should get the min segment duration for this group*/
-		if (!mpdin->use_low_latency && (mpdin->buffer_mode>=MPDIN_BUFFER_MIN) ) {
+		if (!mpdin->use_low_latency && (mpdin->buffer_mode>=MPDIN_BUFFER_MIN)) {
 			u32 max = gf_dash_get_min_buffer_time(mpdin->dash);
 			if (max>com->buffer.max)
 				com->buffer.max = max;
@@ -1239,17 +1238,19 @@
 		gf_dash_set_speed(mpdin->dash, com->play.speed);
 
 		/*don't seek if this command is the first PLAY request of objects declared by the subservice*/
-		if (! mpdin->in_seek && (!com->play.initial_broadcast_play || (com->play.start_range>2.0) ) ) {
+		if (! mpdin->in_seek && !com->play.initial_broadcast_play /*&& (com->play.start_range>2.0) */) {
 			Bool skip_seek;
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Play command from terminal on channel %p on Service (%p)\n", com->base.on_channel, mpdin->service));
 
-			mpdin->in_seek = 1;
+			mpdin->in_seek = GF_TRUE;
 
 			/*if start range request is the same as previous one, don't process it
 			- this happens at period switch when new objects are declared*/
-			skip_seek = 0;
+			skip_seek = GF_FALSE;
 			if (com->play.initial_broadcast_play && (mpdin->previous_start_range==com->play.start_range))
-				skip_seek = 1;
+				skip_seek = GF_TRUE;
+			if (gf_dash_is_m3u8(mpdin->dash) == GF_TRUE)
+				skip_seek = GF_TRUE;
 
 			mpdin->previous_start_range = com->play.start_range;
 
@@ -1271,7 +1272,7 @@
 
 			//to remove once we manage to keep the service alive
 			/*don't forward commands if a switch of period is to be scheduled, we are killing the service anyway ...*/
-			if (gf_dash_get_period_switch_status(mpdin->dash) ) return GF_OK;
+			if (gf_dash_get_period_switch_status(mpdin->dash)) return GF_OK;
 		}
 
 		gf_dash_group_select(mpdin->dash, idx, GF_TRUE);
@@ -1283,7 +1284,7 @@
 			u32 timescale;
 			com->play.start_range = gf_dash_group_get_start_range(mpdin->dash, idx);
 			gf_dash_group_get_presentation_time_offset(mpdin->dash, idx, &pto, &timescale);
-			com->play.start_range += ((Double)pto ) / timescale;
+			com->play.start_range += ((Double)pto) / timescale;
 		}
 
 		return segment_ifce->ServiceCommand(segment_ifce, com);
@@ -1397,7 +1398,7 @@
 	if (bi->InterfaceType!=GF_NET_CLIENT_INTERFACE) return;
 
 	mpdin = (GF_MPD_In*) ((GF_InputService*)bi)->priv;
-	assert( mpdin );
+	assert(mpdin);
 
 	if (mpdin->dash)
 		gf_dash_del(mpdin->dash);

gpac-0.5.1.svn5491.tar.xz/modules/mpegts_in/mpegts_in.c -> gpac-0.5.1.svn5619.tar.xz/modules/mpegts_in/mpegts_in.c Changed

@@ -375,7 +375,10 @@
 			gf_m2ts_set_pes_framing((GF_M2TS_PES *)es, GF_M2TS_PES_FRAMING_SKIP);
 
 		if (!prog->pmt_iod && !no_declare) {
-			MP2TS_DeclareStream(m2ts, (GF_M2TS_PES *)es, NULL, 0);
+			if (! (es->flags & GF_M2TS_ES_ALREADY_DECLARED)) {
+				MP2TS_DeclareStream(m2ts, (GF_M2TS_PES *)es, NULL, 0);
+				es->flags |= GF_M2TS_ES_ALREADY_DECLARED;
+			}
 		}
 		/*if IOD, streams not declared through OD framework are refered to by pid:// scheme, and will be declared upon
 		request by the terminal through GetServiceDesc*/
@@ -601,9 +604,12 @@
 		forward_m2ts_event(m2ts, evt_type, param);
 		break;
 	case GF_M2TS_EVT_PMT_REPEAT:
-//	case GF_M2TS_EVT_PMT_UPDATE:
 		M2TS_FlushRequested(m2ts);
 		break;
+	case GF_M2TS_EVT_PMT_UPDATE:
+		MP2TS_SetupProgram(m2ts, param, GF_TRUE, GF_FALSE);
+		break;
+
 	case GF_M2TS_EVT_SDT_FOUND:
 	case GF_M2TS_EVT_SDT_UPDATE:
 		m2ts->flush_sdt = 1;
@@ -659,7 +665,7 @@
 			slh.OCRflag = 1;
 			slh.m2ts_pcr = discontinuity ? 2 : 1;
 			slh.objectClockReference = ((GF_M2TS_PES_PCK *) param)->PTS;
-			
+
 			//check if our buffer level is low enough otherwise we would send the OCR_disc way too early
 			//we have to do this because the terminal doesn't "queue" clock discontinuities
 			if (m2ts->file_regulate && discontinuity) {
@@ -781,7 +787,7 @@
 			}
 		}
 	}
-		break;
+	break;
 	case GF_M2TS_EVT_TDT:
 		if (m2ts->hybrid_on) {
 			u32 i, count;
@@ -939,7 +945,13 @@
 	2: query next segment except currently downloading one
 	3: drop next segment
 */
-static GF_Err M2TS_QueryNextFile(void *udta, u32 query_type, const char **out_url, u64 *out_start_range, u64 *out_end_range, u32 *refresh_type)
+typedef enum {
+	INIT_RANGE = 0,
+	NEXT_SEGMENT,
+	NEXT_SEGMENT_EXCEPT_DL,
+	DROP_NEXT_SEGMENT,
+} DASHQueryType;
+static GF_Err M2TS_QueryNextFile(void *udta, DASHQueryType query_type, const char **out_url, u64 *out_start_range, u64 *out_end_range, u32 *refresh_type)
 {
 	GF_NetworkCommand param;
 	GF_Err query_ret;
@@ -952,9 +964,9 @@
 	if (out_end_range) *out_end_range = 0;
 
 	memset(&param, 0, sizeof(GF_NetworkCommand));
-	param.command_type = (query_type==0) ? GF_NET_SERVICE_QUERY_INIT_RANGE : GF_NET_SERVICE_QUERY_NEXT;
-	param.url_query.drop_first_segment = (query_type==3) ? 1 : 0;
-	param.url_query.current_download = (query_type==2) ? 0 : 1;
+	param.command_type = (query_type == INIT_RANGE) ? GF_NET_SERVICE_QUERY_INIT_RANGE : GF_NET_SERVICE_QUERY_NEXT;
+	param.url_query.drop_first_segment = (query_type == DROP_NEXT_SEGMENT) ? 1 : 0;
+	param.url_query.current_download = (query_type == NEXT_SEGMENT_EXCEPT_DL) ? 0 : 1;
 
 	//we are downloading the segment we play, don't delete it
 	if (m2ts->in_segment_download)
@@ -1045,7 +1057,7 @@
 		}
 	}
 
-	e = M2TS_QueryNextFile(m2ts, (flush_type==GF_M2TS_FLUSH_DATA) ? 2 : 1, &url, &start_byterange, &end_byterange, &refresh_type);
+	e = M2TS_QueryNextFile(m2ts, (flush_type==GF_M2TS_FLUSH_DATA) ? NEXT_SEGMENT_EXCEPT_DL : NEXT_SEGMENT, &url, &start_byterange, &end_byterange, &refresh_type);
 	if (e) {
 		m2ts->in_data_flush = 0;
 		gf_mx_v(m2ts->mx);
@@ -1055,7 +1067,7 @@
 
 	//done, drop segment
 	if (!m2ts->in_segment_download) {
-		e = M2TS_QueryNextFile(m2ts, 3, &url, &start_byterange, &end_byterange, &refresh_type);
+		e = M2TS_QueryNextFile(m2ts, DROP_NEXT_SEGMENT, &url, &start_byterange, &end_byterange, &refresh_type);
 
 		if (m2ts->has_pending_segments)
 			m2ts->has_pending_segments--;
@@ -1109,9 +1121,9 @@
 				u64 start_byterange, end_byterange;
 				gf_mx_p(m2ts->mx);
 				m2ts->in_data_flush = 1;
-				M2TS_QueryNextFile(m2ts, 0, NULL, &start_byterange, &end_byterange, NULL);
+				M2TS_QueryNextFile(m2ts, INIT_RANGE, NULL, &start_byterange, &end_byterange, NULL);
 				e = gf_m2ts_demux_file(m2ts->ts, url, start_byterange, end_byterange, 0, 0);
-				M2TS_QueryNextFile(m2ts, 3, NULL, NULL, NULL, NULL);
+				M2TS_QueryNextFile(m2ts, DROP_NEXT_SEGMENT, NULL, NULL, NULL, NULL);
 				m2ts->in_data_flush = 0;
 				gf_mx_v(m2ts->mx);
 			} else {
@@ -1470,7 +1482,7 @@
 				ts->end_range = (com->play.end_range>0) ? (u32) (com->play.end_range*1000) : 0;
 				m2ts->media_start_range = com->play.start_range;
 			}
-			if (!m2ts->map_media_time_on_prog_id) 
+			if (!m2ts->map_media_time_on_prog_id)
 				m2ts->map_media_time_on_prog_id = pes->program->number;
 
 			if (plug->query_proxy && ts->file)
@@ -1484,7 +1496,7 @@
 			}
 		}
 		//remap media time for this program
-		else if (!m2ts->map_media_time_on_prog_id) { 
+		else if (!m2ts->map_media_time_on_prog_id) {
 			m2ts->media_start_range = com->play.start_range;
 			m2ts->map_media_time_on_prog_id = pes->program->number;
 		}

gpac-0.5.1.svn5491.tar.xz/modules/opensvc_dec/opensvc_dec.c -> gpac-0.5.1.svn5619.tar.xz/modules/opensvc_dec/opensvc_dec.c Changed

gpac-0.5.1.svn5491.tar.xz/modules/osd/osd.c -> gpac-0.5.1.svn5619.tar.xz/modules/osd/osd.c Changed

gpac-0.5.1.svn5491.tar.xz/modules/platinum/GPACFileMediaServer.cpp -> gpac-0.5.1.svn5619.tar.xz/modules/platinum/GPACFileMediaServer.cpp Changed

@@ -112,7 +112,7 @@
 }
 
 NPT_Result
-GPAC_FileMediaServer::ServeFile(NPT_HttpRequest&              request,
+GPAC_FileMediaServer::ServeFile(const NPT_HttpRequest&              request,
                                 const NPT_HttpRequestContext& context,
                                 NPT_HttpResponse&             response,
                                 const NPT_String&             _file_path)
@@ -221,7 +221,8 @@
 GPAC_FileMediaServer::BuildFromFilePath(const NPT_String&        filepath,
                                         const PLT_HttpRequestContext &context,
                                         bool                     with_count,
-                                        bool                     keep_extension_in_title)
+                                        bool                     keep_extension_in_title,
+                                        bool                          allip)
 {
 	return BuildFromFilePathAndHost(filepath, &context, with_count, keep_extension_in_title, NULL);

gpac-0.5.1.svn5491.tar.xz/modules/platinum/GPACFileMediaServer.h -> gpac-0.5.1.svn5619.tar.xz/modules/platinum/GPACFileMediaServer.h Changed

@@ -108,7 +108,7 @@
 
 	virtual NPT_Result GetFilePath(const char* object_id, NPT_String& filepath);
 
-	virtual NPT_Result ServeFile(NPT_HttpRequest&              request,
+	virtual NPT_Result ServeFile(const NPT_HttpRequest&              request,
 	                             const NPT_HttpRequestContext& context,
 	                             NPT_HttpResponse&             response,
 	                             const NPT_String&             file_path);
@@ -116,7 +116,8 @@
 	virtual PLT_MediaObject* BuildFromFilePath(const NPT_String&             filepath,
 	        const PLT_HttpRequestContext& context,
 	        bool                          with_count = true,
-	        bool                          keep_extension_in_title = false);
+	        bool                          keep_extension_in_title = false,
+            bool                          allip = false);
 
 	PLT_MediaObject* BuildFromFilePathAndHost(const NPT_String&        filepath,
 	        const PLT_HttpRequestContext *context = NULL,

gpac-0.5.1.svn5491.tar.xz/modules/platinum/GPACMediaRenderer.h -> gpac-0.5.1.svn5619.tar.xz/modules/platinum/GPACMediaRenderer.h Changed

gpac-0.5.1.svn5491.tar.xz/modules/rtp_in/rtp_in.h -> gpac-0.5.1.svn5619.tar.xz/modules/rtp_in/rtp_in.h Changed

gpac-0.5.1.svn5491.tar.xz/modules/rtp_in/rtp_stream.c -> gpac-0.5.1.svn5619.tar.xz/modules/rtp_in/rtp_stream.c Changed

gpac-0.5.1.svn5491.tar.xz/modules/sdl_out/video.c -> gpac-0.5.1.svn5619.tar.xz/modules/sdl_out/video.c Changed

@@ -26,8 +26,6 @@
 #include "sdl_out.h"
 #include <gpac/user.h>
 
-//#include "unicode.h"
-
 #ifdef WIN32
 #include <windows.h>
 #endif
@@ -689,7 +687,7 @@
 		assert(height);
 #if SDL_VERSION_ATLEAST(2,0,0)
 		if (!ctx->screen) {
-			if (!(ctx->screen = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, flags))) {
+			if (!(ctx->screen = SDL_CreateWindow("", 0, 0, width, height, flags))) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Cannot create window: %s\n", SDL_GetError()));
 				gf_mx_v(ctx->evt_mx);
 				return GF_IO_ERR;
@@ -738,6 +736,8 @@
 		if (ctx->os_handle) flags &= ~SDL_WINDOW_RESIZABLE;
 
 #if SDL_VERSION_ATLEAST(2,0,0)
+ flags |= SDL_WINDOW_RESIZABLE;
+ 
 		if (!ctx->screen) {
 			if (!(ctx->screen = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, flags))) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Cannot create window: %s\n", SDL_GetError()));
@@ -745,6 +745,7 @@
 				return GF_IO_ERR;
 			}
 			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Window created\n"));
+ SDL_RaiseWindow(ctx->screen);
 		}
 		if ( !ctx->renderer ) {
 			u32 flags = SDL_RENDERER_ACCELERATED;
@@ -760,6 +761,9 @@
 			}
 		}
 		SDL_SetWindowSize(ctx->screen, width, height);
+ SDL_SetRenderDrawColor(ctx->renderer, 0, 0, 0, 255);
+ SDL_RenderClear(ctx->renderer);
+
 #else
 		ctx->screen = SDL_SetVideoMode(width, height, 0, flags);
 #endif
@@ -1256,7 +1260,7 @@
 		}
 #if SDL_VERSION_ATLEAST(2,0,0)
 		SDL_SetWindowDisplayMode(ctx->screen, &goodMode);
-		SDL_SetWindowFullscreen(ctx->screen, SDL_TRUE);
+		SDL_SetWindowFullscreen(ctx->screen, SDL_WINDOW_FULLSCREEN_DESKTOP);
 #else
 		ctx->screen = SDL_SetVideoMode(ctx->fs_width, ctx->fs_height, pref_bpp, flags);
 #endif
@@ -1274,12 +1278,12 @@
 		}
 	} else {
 #if SDL_VERSION_ATLEAST(2,0,0)
-		SDL_SetWindowFullscreen(ctx->screen, SDL_FALSE);
+		SDL_SetWindowFullscreen(ctx->screen, 0);
 #endif
 		SDLVid_ResizeWindow(dr, ctx->store_width, ctx->store_height);
 		*screen_width = ctx->store_width;
 		*screen_height = ctx->store_height;
-	}
+ }
 	gf_mx_v(ctx->evt_mx);
 	if (!ctx->screen) return GF_IO_ERR;
 	return GF_OK;
@@ -1554,8 +1558,8 @@
 	{
 		SDLVID();
 		if (ctx->fullscreen) {
-			ctx->store_width = evt->size.width;
-			ctx->store_height = evt->size.height;
+			//ctx->store_width = evt->size.width;
+			//ctx->store_height = evt->size.height;
 		} else {
 #ifdef GPAC_IPHONE
 // SDLVid_ResizeWindow(dr, dr->max_screen_width, dr->max_screen_height);
@@ -1569,24 +1573,24 @@
 	case GF_EVENT_MOVE:
 
 #if !defined(GPAC_IPHONE) && SDL_VERSION_ATLEAST(2,0,0)
- {
- SDLVID();
+	{
+		SDLVID();
 
-			if (ctx->fullscreen) return GF_OK;
- 
-			if (evt->move.relative == 2) {
-			}
-			else if (evt->move.relative) {
-				s32 x, y;
-				x = y = 0;
- SDL_GetWindowPosition(ctx->screen, &x, &y);
- SDL_SetWindowPosition(ctx->screen, x + evt->move.x, y + evt->move.y);
-			} else {
- SDL_SetWindowPosition(ctx->screen, evt->move.x, evt->move.y);
-			}
- }
+		if (ctx->fullscreen) return GF_OK;
+
+		if (evt->move.relative == 2) {
+		}
+		else if (evt->move.relative) {
+			s32 x, y;
+			x = y = 0;
+			SDL_GetWindowPosition(ctx->screen, &x, &y);
+			SDL_SetWindowPosition(ctx->screen, x + evt->move.x, y + evt->move.y);
+		} else {
+			SDL_SetWindowPosition(ctx->screen, evt->move.x, evt->move.y);
+		}
+	}
 #endif
- break;
+	break;
 	case GF_EVENT_VIDEO_SETUP:
 	{
 		SDLVID();

gpac-0.5.1.svn5491.tar.xz/modules/soft_raster/ftgrays.c -> gpac-0.5.1.svn5619.tar.xz/modules/soft_raster/ftgrays.c Changed

@@ -155,7 +155,7 @@
 {
 	if (( raster->area | raster->cover) && (raster->ey<raster->max_ey)) {
 		AACell *cell;
-		int y = raster->ey - raster->min_ey;
+		long y = raster->ey - raster->min_ey;
 		if (y>=0) {
 			AAScanline *sl = &raster->scanlines[y];
 			if (sl->num >= sl->alloc) {
@@ -695,7 +695,7 @@
 		if ( cur->x > x )
 			gray_hline( raster, x, y, cover * ( ONE_PIXEL * 2 ), cur->x - x, zero_non_zero_rule);
 	}
-	raster->render_span(y + raster->min_ey, raster->num_gray_spans, raster->gray_spans, raster->render_span_data );
+	raster->render_span((int) (y + raster->min_ey), raster->num_gray_spans, raster->gray_spans, raster->render_span_data );
 }
 
 
@@ -720,15 +720,15 @@
 	raster->mx = params->mx;
 #endif
 
-	size_y = raster->max_ey - raster->min_ey;
+	size_y = (int) (raster->max_ey - raster->min_ey);
 	if (raster->max_lines < size_y) {
 		raster->scanlines = (AAScanline*)gf_realloc(raster->scanlines, sizeof(AAScanline)*size_y);
 		memset(&raster->scanlines[raster->max_lines], 0, sizeof(AAScanline)*(size_y-raster->max_lines) );
 		raster->max_lines = size_y;
 	}
 
-	raster->ex = raster->max_ex+1;
-	raster->ey = raster->max_ey+1;
+	raster->ex = (int) (raster->max_ex+1);
+	raster->ey = (int) (raster->max_ey+1);
 	raster->cover = 0;
 	raster->area = 0;
 	EVG_Outline_Decompose(outline, raster);

gpac-0.5.1.svn5491.tar.xz/modules/svg_in/svg_in.c -> gpac-0.5.1.svn5619.tar.xz/modules/svg_in/svg_in.c Changed

gpac-0.5.1.svn5619.tar.xz/modules/validator/Makefile Added

gpac-0.5.1.svn5491.tar.xz/modules/validator/validator.c -> gpac-0.5.1.svn5619.tar.xz/modules/validator/validator.c Changed

@@ -35,6 +35,7 @@
 	GF_Terminal *term;
 
 	Bool is_recording;
+	Bool trace_mode;
 	char *prev_fps;
 	char *prev_alias;
 
@@ -101,13 +102,14 @@
 	gf_list_add(validator->xvs_node->content, snap_node);
 }
 
-static char *validator_get_snapshot_name(char *test_filename, Bool is_reference, u32 number)
+static char *validator_get_snapshot_name(GF_Validator *validator, Bool is_reference, u32 number)
 {
+	char *name = validator->test_filename ? validator->test_filename : validator->xvs_filename;
 	char *dot;
 	char dumpname[GF_MAX_PATH];
-	dot = strrchr(test_filename, '.');
+	dot = strrchr(name, '.');
 	dot[0] = 0;
-	sprintf(dumpname, "%s-%s-%03d.png", test_filename, (is_reference?"reference":"newest"), number);
+	sprintf(dumpname, "%s-%s-%03d.png", name, (is_reference?"reference":"newest"), number);
 	dot[0] = '.';
 	return gf_strdup(dumpname);
 }
@@ -119,7 +121,7 @@
 	GF_Terminal *term = validator->term;
 	char *dumpname;
 
-	dumpname = validator_get_snapshot_name(validator->test_filename, validator->is_recording, validator->snapshot_number);
+	dumpname = validator_get_snapshot_name(validator, validator->is_recording, validator->snapshot_number);
 
 	e = gf_term_get_screen_buffer(term, &fb);
 	if (e) {
@@ -159,8 +161,8 @@
 	u32 i;
 
 	u32 snap_number = validator->snapshot_number - 1;
-	ref_name = validator_get_snapshot_name(validator->test_filename, 1, snap_number);
-	new_name = validator_get_snapshot_name(validator->test_filename, 0, snap_number);
+	ref_name = validator_get_snapshot_name(validator, 1, snap_number);
+	new_name = validator_get_snapshot_name(validator, 0, snap_number);
 
 	e = gf_img_file_dec(ref_name, NULL, &ref_width, &ref_height, &ref_pixel_format, &ref_data, &ref_data_size);
 	if (e) {
@@ -221,7 +223,10 @@
 	switch (event->type) {
 	case GF_EVENT_CONNECT:
 		if (event->connect.is_connected) {
-			gf_sc_add_video_listener(validator->term->compositor, &validator->video_listener);
+			if (!validator->trace_mode) {
+				gf_sc_add_video_listener(validator->term->compositor, &validator->video_listener);
+			}
+
 			validator->ck = validator->term->root_scene->scene_codec ?
 			                validator->term->root_scene->scene_codec->ck :
 			                validator->term->root_scene->dyn_ck;
@@ -394,7 +399,9 @@
 	switch (event->type) {
 	case GF_EVENT_CONNECT:
 		if (event->connect.is_connected) {
-			gf_sc_add_video_listener(validator->term->compositor, &validator->video_listener);
+			if (!validator->trace_mode) {
+				gf_sc_add_video_listener(validator->term->compositor, &validator->video_listener);
+			}
 			validator->ck = validator->term->root_scene->scene_codec ? validator->term->root_scene->scene_codec->ck : validator->term->root_scene->dyn_ck;
 		}
 		break;
@@ -574,6 +581,7 @@
 			}
 			att_index++;
 		}
+
 		if (!att_file) {
 			gf_xml_dom_del(validator->xvs_parser);
 			validator->xvs_parser = NULL;
@@ -685,17 +693,20 @@
 static void validator_test_open(GF_Validator *validator)
 {
 	char filename[100];
-	if (validator->test_base)
-		sprintf(filename, "%s%c%s", validator->test_base, GF_PATH_SEPARATOR, validator->test_filename);
-	else
-		sprintf(filename, "%s", validator->test_filename);
-	gf_sc_add_video_listener(validator->term->compositor, &validator->video_listener);
-	if (validator->is_recording)
-		validator->snapshot_next_frame = 1;
-	gf_term_connect(validator->term, filename);
-	validator->ck = validator->term->root_scene->scene_codec ?
-	                validator->term->root_scene->scene_codec->ck :
-	                validator->term->root_scene->dyn_ck;
+	
+	if (!validator->trace_mode) {
+		if (validator->test_base)
+			sprintf(filename, "%s%c%s", validator->test_base, GF_PATH_SEPARATOR, validator->test_filename);
+		else
+			sprintf(filename, "%s", validator->test_filename);
+
+		gf_sc_add_video_listener(validator->term->compositor, &validator->video_listener);
+		if (validator->is_recording)
+			validator->snapshot_next_frame = 1;
+		gf_term_connect(validator->term, filename);
+
+	}
+//	validator->ck = validator->term->root_scene->scene_codec ? validator->term->root_scene->scene_codec->ck : validator->term->root_scene->dyn_ck;
 }
 
 static Bool validator_xvs_next(GF_Validator *validator, Bool reverse)
@@ -835,8 +846,14 @@
 		if (!validator->xvl_filename) {
 			validator->xvs_filename = (char *)gf_modules_get_option((GF_BaseInterface*)termext, "Validator", "XVS");
 			if (!validator->xvs_filename) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("Validator configuration without input, stopping.\n"));
-				return 0;
+				validator->xvs_filename = (char *)gf_modules_get_option((GF_BaseInterface*)termext, "Validator", "Trace");
+				if (!validator->xvs_filename) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("Validator configuration without input, stopping.\n"));
+					return 0;
+				}
+				validator->test_filename = validator->xvs_filename;
+				validator->trace_mode = 1;
+				GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator using trace file: %s\n", validator->xvs_filename));
 			} else {
 				GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator using scenario file: %s\n", validator->xvs_filename));
 			}
@@ -845,21 +862,9 @@
 		}
 
 		/* since we changed parameters of the compositor, we need to trigger a reconfiguration */
-		gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "FrameRate", "5.0");
-		gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "AntiAlias", "None");
-		gf_term_set_option(validator->term, GF_OPT_RELOAD_CONFIG, 1);
-
-		validator->evt_filter.udta = validator;
-		if (!validator->is_recording) {
-			validator->evt_filter.on_event = validator_on_event_play;
-			termext->caps |= GF_TERM_EXTENSION_NOT_THREADED;
-		} else {
-			validator->evt_filter.on_event = validator_on_event_record;
-		}
-		gf_term_add_event_filter(validator->term, &validator->evt_filter);
-		validator->video_listener.udta = validator;
-		validator->video_listener.on_video_frame = validator_on_video_frame;
-		validator->video_listener.on_video_reconfig = validator_on_video_reconfig;
+//		gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "FrameRate", "5.0");
+//		gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "AntiAlias", "None");
+//		gf_term_set_option(validator->term, GF_OPT_RELOAD_CONFIG, 1);
 
 		/* TODO: if start returns 0, the module is not loaded, so the above init (filter registration) is not removed,
 		   should probably return 1 all the time, to make sure stop is called */
@@ -886,6 +891,20 @@
 		} else {
 			return 0;
 		}
+
+		validator->evt_filter.udta = validator;
+		if (!validator->is_recording) {
+			validator->evt_filter.on_event = validator_on_event_play;
+			termext->caps |= GF_TERM_EXTENSION_NOT_THREADED;
+		} else {
+			validator->evt_filter.on_event = validator_on_event_record;
+		}
+		gf_term_add_event_filter(validator->term, &validator->evt_filter);
+		validator->video_listener.udta = validator;
+		validator->video_listener.on_video_frame = validator_on_video_frame;
+		validator->video_listener.on_video_reconfig = validator_on_video_reconfig;
+
+
 		if (!validator->is_recording) {
 			validator_load_event(validator);
 		}
@@ -904,10 +923,12 @@
 			validator->test_base = NULL;
 		}
 		/*auto-disable the recording by default*/
-		if (validator->is_recording) {
-			gf_modules_set_option((GF_BaseInterface*)termext, "Validator", "Mode", "Play");
-		} else {
-			gf_modules_set_option((GF_BaseInterface*)termext, "Validator", "Mode", "Disable");
+		if (!validator->trace_mode) {
+			if (validator->is_recording ) {
+				gf_modules_set_option((GF_BaseInterface*)termext, "Validator", "Mode", "Play");
+			} else {
+				gf_modules_set_option((GF_BaseInterface*)termext, "Validator", "Mode", "Disable");
+			}
 		}
 		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Stopping validator\n"));
 		if (validator->prev_fps) {
@@ -944,18 +965,20 @@
 			has_more_events = validator_load_event(validator);
 			if (!has_more_events) {
 				validator_xvs_close(validator);
-				gf_term_disconnect(validator->term);
-				gf_sc_remove_video_listener(validator->term->compositor, &validator->video_listener);
-				validator_xvs_next(validator, 0);
-				if (!validator->xvs_node) {
-					GF_Event evt;
-					memset(&evt, 0, sizeof(GF_Event));
-					evt.type = GF_EVENT_QUIT;
-					validator->term->compositor->video_out->on_event(validator->term->compositor->video_out->evt_cbk_hdl, &evt);
-				} else {
-					if (!validator->is_recording) {
-						validator_load_event(validator);
-					}
+                if (! validator->trace_mode) {
+                    gf_term_disconnect(validator->term);
+                    gf_sc_remove_video_listener(validator->term->compositor, &validator->video_listener);
+                    validator_xvs_next(validator, 0);
+                    if (!validator->xvs_node) {
+                        GF_Event evt;
+                        memset(&evt, 0, sizeof(GF_Event));
+                        evt.type = GF_EVENT_QUIT;
+                        validator->term->compositor->video_out->on_event(validator->term->compositor->video_out->evt_cbk_hdl, &evt);
+                    } else {
+                        if (!validator->is_recording) {
+                            validator_load_event(validator);
+                        }
+                    }
 				}
 			}
 		}

gpac-0.5.1.svn5491.tar.xz/modules/xvid_dec/xvid_wce/gmc.cpp -> gpac-0.5.1.svn5619.tar.xz/modules/xvid_dec/xvid_wce/gmc.cpp Changed

gpac-0.5.1.svn5491.tar.xz/packagers/win32_64/nsis/gpac_installer.nsi -> gpac-0.5.1.svn5619.tar.xz/packagers/win32_64/nsis/gpac_installer.nsi Changed

gpac-0.5.1.svn5491.tar.xz/regression_tests/bifs/bifs-timeline-mediasensor-segment-switch.bt -> gpac-0.5.1.svn5619.tar.xz/regression_tests/bifs/bifs-timeline-mediasensor-segment-switch.bt Changed

gpac-0.5.1.svn5491.tar.xz/regression_tests/bifs/bifs-timeline-mediasensor-segment.bt -> gpac-0.5.1.svn5619.tar.xz/regression_tests/bifs/bifs-timeline-mediasensor-segment.bt Changed

gpac-0.5.1.svn5491.tar.xz/regression_tests/bifs/bifs-timeline-mediasensor.bt -> gpac-0.5.1.svn5619.tar.xz/regression_tests/bifs/bifs-timeline-mediasensor.bt Changed

gpac-0.5.1.svn5491.tar.xz/src/Makefile -> gpac-0.5.1.svn5619.tar.xz/src/Makefile Changed

@@ -15,13 +15,13 @@
 endif
 
 ## libgpac objects gathering: src/utils
-LIBGPAC_UTILS=utils/os_divers.o utils/list.o utils/bitstream.o utils/error.o utils/alloc.o utils/url.o utils/configfile.o 
+LIBGPAC_UTILS=utils/os_divers.o utils/os_file.o utils/list.o utils/bitstream.o utils/error.o utils/alloc.o utils/url.o utils/configfile.o 
 ifeq ($(DISABLE_CORE_TOOLS), no)
-LIBGPAC_UTILS+=utils/sha1.o  utils/base_encoding.o utils/os_net.o utils/os_thread.o utils/os_config_init.o utils/cache.o utils/downloader.o utils/xml_parser.o utils/utf.o utils/token.o 
+LIBGPAC_UTILS+=utils/sha1.o  utils/base_encoding.o utils/os_net.o utils/os_thread.o utils/os_config_init.o utils/cache.o utils/downloader.o utils/xml_parser.o utils/utf.o utils/token.o utils/color.o 
 endif
 
 ifeq ($(DISABLE_PLAYER), no)
-LIBGPAC_UTILS+=utils/color.o utils/os_module.o utils/math.o utils/path2d.o utils/path2d_stroker.o utils/module.o utils/uni_bidi.o utils/ringbuffer.o utils/unicode.o utils/map.o 
+LIBGPAC_UTILS+=utils/os_module.o utils/math.o utils/path2d.o utils/path2d_stroker.o utils/module.o utils/uni_bidi.o utils/ringbuffer.o utils/unicode.o utils/map.o 
 endif
 
 ## libgpac objects gathering: src/ietf
@@ -140,11 +140,10 @@
 
 ifeq ($(DISABLE_PLAYER), no)
 LIBGPAC_MEDIATOOLS+=media_tools/html5_media.o media_tools/html5_mse.o
-ifeq ($(DISABLE_TTXT), no)
-LIBGPAC_MEDIATOOLS+=media_tools/webvtt.o
-endif
 endif
 
+LIBGPAC_MEDIATOOLS+=media_tools/webvtt.o
+
 
 ## libgpac objects gathering: src/scene_manager
 LIBGPAC_SCENEMANAGER=

gpac-0.5.1.svn5491.tar.xz/src/bifs/bifs_codec.c -> gpac-0.5.1.svn5619.tar.xz/src/bifs/bifs_codec.c Changed

gpac-0.5.1.svn5491.tar.xz/src/bifs/bifs_node_tables.c -> gpac-0.5.1.svn5619.tar.xz/src/bifs/bifs_node_tables.c Changed

@@ -1146,84 +1146,6 @@
 		return 0;
 	}
 }
-u32 GetChildrenNDT(GF_Node *node)
-{
-	if (!node) return 0;
-	switch (gf_node_get_tag(node)) {
-	case TAG_MPEG4_Anchor:
-		return NDT_SF3DNode;
-	case TAG_MPEG4_AudioBuffer:
-		return NDT_SFAudioNode;
-	case TAG_MPEG4_AudioDelay:
-		return NDT_SFAudioNode;
-	case TAG_MPEG4_AudioFX:
-		return NDT_SFAudioNode;
-	case TAG_MPEG4_AudioMix:
-		return NDT_SFAudioNode;
-	case TAG_MPEG4_AudioSource:
-		return NDT_SFAudioNode;
-	case TAG_MPEG4_AudioSwitch:
-		return NDT_SFAudioNode;
-	case TAG_MPEG4_Billboard:
-		return NDT_SF3DNode;
-	case TAG_MPEG4_Collision:
-		return NDT_SF3DNode;
-	case TAG_MPEG4_CompositeTexture2D:
-		return NDT_SF2DNode;
-	case TAG_MPEG4_CompositeTexture3D:
-		return NDT_SF3DNode;
-	case TAG_MPEG4_Form:
-		return NDT_SF2DNode;
-	case TAG_MPEG4_Group:
-		return NDT_SF3DNode;
-	case TAG_MPEG4_Layer2D:
-		return NDT_SF2DNode;
-	case TAG_MPEG4_Layer3D:
-		return NDT_SF3DNode;
-	case TAG_MPEG4_Layout:
-		return NDT_SF2DNode;
-	case TAG_MPEG4_OrderedGroup:
-		return NDT_SF3DNode;
-	case TAG_MPEG4_Transform:
-		return NDT_SF3DNode;
-	case TAG_MPEG4_Transform2D:
-		return NDT_SF2DNode;
-	case TAG_MPEG4_TemporalTransform:
-		return NDT_SF3DNode;
-	case TAG_MPEG4_TemporalGroup:
-		return NDT_SFTemporalNode;
-	case TAG_MPEG4_FFD:
-		return NDT_SF3DNode;
-	case TAG_MPEG4_SBBone:
-		return NDT_SF3DNode;
-	case TAG_MPEG4_SBSegment:
-		return NDT_SF3DNode;
-	case TAG_MPEG4_SBSite:
-		return NDT_SF3DNode;
-	case TAG_MPEG4_Clipper2D:
-		return NDT_SF2DNode;
-	case TAG_MPEG4_ColorTransform:
-		return NDT_SF3DNode;
-	case TAG_MPEG4_PathLayout:
-		return NDT_SF2DNode;
-	case TAG_MPEG4_TransformMatrix2D:
-		return NDT_SF2DNode;
-	case TAG_MPEG4_AdvancedAudioBuffer:
-		return NDT_SFAudioNode;
-	case TAG_MPEG4_AudioChannelConfig:
-		return NDT_SFAudioNode;
-	case TAG_MPEG4_Transform3DAudio:
-		return NDT_SF3DNode;
-	case TAG_MPEG4_FootPrintSetNode:
-		return NDT_SFGeometryNode;
-	case TAG_MPEG4_Shadow:
-		return NDT_SF3DNode;
-	case TAG_MPEG4_SpacePartition:
-		return NDT_SF3DNode;
-	default:
-		return 0;
-	}
-}

gpac-0.5.1.svn5491.tar.xz/src/bifs/field_encode.c -> gpac-0.5.1.svn5619.tar.xz/src/bifs/field_encode.c Changed

gpac-0.5.1.svn5491.tar.xz/src/compositor/audio_input.c -> gpac-0.5.1.svn5619.tar.xz/src/compositor/audio_input.c Changed

@@ -55,23 +55,33 @@
 	u32 obj_time, ts;
 	s32 drift;
 	Fixed speed;
+	Bool done;
 	GF_AudioInput *ai = (GF_AudioInput *) callback;
 	/*even if the stream is signaled as finished we must check it, because it may have been restarted by a mediaControl*/
 	if (!ai->stream) return NULL;
 
-	frame = gf_mo_fetch_data(ai->stream, 0, &ai->stream_finished, &ts, size, NULL, NULL);
+	done = ai->stream_finished;
+	frame = gf_mo_fetch_data(ai->stream, ai->compositor->audio_renderer->step_mode ? GF_MO_FETCH_PAUSED : GF_MO_FETCH, &ai->stream_finished, &ts, size, NULL, NULL);
 	/*invalidate scene on end of stream to refresh audio graph*/
-	if (ai->stream_finished) gf_sc_invalidate(ai->compositor, NULL);
+	if (done != ai->stream_finished) {
+		gf_sc_invalidate(ai->compositor, NULL);
+	}
 
 	/*no more data or not enough data, reset syncro drift*/
 	if (!frame) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_AUDIO, ("[Audio Input] No data in audio object (eos %d)\n", ai->stream_finished));
+		if (!ai->stream_finished) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_AUDIO, ("[Audio Input] No data in audio object\n"));
+		}
 		gf_mo_adjust_clock(ai->stream, 0);
 		*size = 0;
 		return NULL;
 	}
 	ai->need_release = 1;
 
+	//step mode, return the frame without sync check
+	if (ai->compositor->audio_renderer->step_mode) 
+		return frame;
+
 	speed = gf_mo_get_current_speed(ai->stream);
 
 	gf_mo_get_object_time(ai->stream, &obj_time);
@@ -150,7 +160,7 @@
 	/*watchout for object reuse*/
 	if (aifc->samplerate && (gf_mo_get_flags(ai->stream) & GF_MO_IS_INIT)) return 1;
 	if (!for_recf)
-		return 0;
+		return aifc->samplerate ? 1 : 0;
 
 	gf_mo_get_audio_info(ai->stream, &aifc->samplerate, &aifc->bps , &aifc->chan, &aifc->ch_cfg);

gpac-0.5.1.svn5491.tar.xz/src/compositor/audio_mixer.c -> gpac-0.5.1.svn5619.tar.xz/src/compositor/audio_mixer.c Changed

@@ -249,6 +249,13 @@
 		gf_mixer_lock(am, 0);
 		return 0;
 	}
+
+	if (am->ar && am->ar->config_forced) {
+		am->must_reconfig=0;
+		gf_mixer_lock(am, 0);
+		return 0;
+	}
+
 	numInit = 0;
 	max_sample_rate = am->sample_rate;
 	max_channels = am->nb_channels;
@@ -330,6 +337,7 @@
 	}
 
 	if (numInit == count) am->must_reconfig = 0;
+	if (am->ar) cfg_changed = 1;
 
 	gf_mixer_lock(am, 0);
 	return cfg_changed;
@@ -563,13 +571,15 @@
 	s32 *out_mix, nb_act_src;
 	char *data, *ptr;
 
+	//reset buffer whatever the state of the mixer is
+	memset(buffer, 0, buffer_size);
+
 	/*the config has changed we don't write to output since settings change*/
 	if (gf_mixer_reconfig(am)) return 0;
 
 	gf_mixer_lock(am, 1);
 	count = gf_list_count(am->sources);
 	if (!count) {
-		memset(buffer, 0, buffer_size);
 		gf_mixer_lock(am, 0);
 		return 0;
 	}
@@ -583,7 +593,6 @@
 		if (am->ar) {
 			am->must_reconfig = 1;
 			gf_mixer_reconfig(am);
-			memset(buffer, 0, buffer_size);
 			gf_mixer_lock(am, 0);
 			return 0;
 		}
@@ -610,9 +619,7 @@
 		if (!data || !size) break;
 		/*don't copy more than possible*/
 		if (size > buffer_size) size = buffer_size;
-		if (is_muted) {
-			memset(ptr, 0, size);
-		} else {
+		if (!is_muted) {
 			memcpy(ptr, data, size);
 		}
 		buffer_size -= size;
@@ -627,7 +634,6 @@
 			if (!data) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_AUDIO, ("[AudioMixer] not enough input data (%d still to fill)\n", buffer_size));
 			}
-			memset(ptr, 0, buffer_size);
 		}
 		gf_mixer_lock(am, 0);
 		return (in_size - buffer_size);
@@ -702,7 +708,6 @@
 		}
 	}
 	if (!nb_act_src) {
-		memset(buffer, 0, sizeof(char)*buffer_size);
 		gf_mixer_lock(am, 0);
 		return 0;
 	}
@@ -757,7 +762,6 @@
 	}
 
 	if (!nb_written) {
-		memset(buffer, 0, sizeof(char)*buffer_size);
 		gf_mixer_lock(am, 0);
 		return 0;
 	}
@@ -791,8 +795,6 @@
 	}
 
 	nb_written *= am->nb_channels*am->bits_per_sample/8;
-	if (buffer_size > nb_written)
-		memset((char *)buffer + nb_written, 0, sizeof(char)*(buffer_size-nb_written));
 
 	gf_mixer_lock(am, 0);
 	return nb_written;

gpac-0.5.1.svn5491.tar.xz/src/compositor/audio_render.c -> gpac-0.5.1.svn5619.tar.xz/src/compositor/audio_render.c Changed

@@ -277,6 +277,10 @@
 	ar->audio_out->SetVolume(ar->audio_out, ar->volume);
 	ar->audio_out->SetPan(ar->audio_out, ar->pan);
 
+	ar->time_at_last_config = ar->current_time;
+	ar->bytes_requested = 0;
+	ar->bytes_per_second = freq * nb_chan * nb_bits / 8;
+
 	if (ar->audio_listeners) {
 		u32 k=0;
 		GF_AudioListener *l;
@@ -287,6 +291,25 @@
 	return GF_OK;
 }
 
+static void gf_ar_pause(GF_AudioRenderer *ar, Bool DoFreeze, Bool for_reconfig, Bool reset_hw_buffer)
+{
+	gf_mixer_lock(ar->mixer, 1);
+	if (DoFreeze) {
+		if (!ar->Frozen) {
+			ar->freeze_time = gf_sys_clock();
+			if (!for_reconfig && ar->audio_out && ar->audio_out->Play) ar->audio_out->Play(ar->audio_out, 0);
+			ar->Frozen = 1;
+		}
+	} else {
+		if (ar->Frozen) {
+			if (!for_reconfig && ar->audio_out && ar->audio_out->Play) ar->audio_out->Play(ar->audio_out, reset_hw_buffer ? 2 : 1);
+			ar->Frozen = 0;
+			ar->start_time += gf_sys_clock() - ar->freeze_time;
+		}
+	}
+	gf_mixer_lock(ar->mixer, 0);
+}
+
 
 static u32 gf_ar_fill_output(void *ptr, char *buffer, u32 buffer_size)
 {
@@ -295,6 +318,8 @@
 	if (!ar->need_reconfig) {
 		u32 delay_ms = ar->disable_resync ?	0 : ar->audio_delay;
 
+		gf_mixer_lock(ar->mixer, 1);
+
 		if (ar->filter_chain.enable_filters) {
 			char *ptr = buffer;
 			u32 res = buffer_size;
@@ -330,18 +355,56 @@
 		} else {
 			written = gf_mixer_get_output(ar->mixer, buffer, buffer_size, delay_ms);
 		}
-		if (ar->audio_listeners) {
-			u32 k=0;
-			GF_AudioListener *l;
-			while ((l = gf_list_enum(ar->audio_listeners, &k))) {
-				l->on_audio_frame(l->udta, buffer, written, gf_sc_ar_get_clock(ar), delay_ms);
+		//done with one sim step, go back in pause
+		if (ar->step_mode) {
+			ar->step_mode = 0;
+			gf_ar_pause(ar, 1, 0, 0);
+		}
+		gf_mixer_lock(ar->mixer, 0);
+
+		if (!ar->need_reconfig) {
+			if (ar->audio_listeners) {
+				u32 k=0;
+				GF_AudioListener *l;
+				while ((l = gf_list_enum(ar->audio_listeners, &k))) {
+					l->on_audio_frame(l->udta, buffer, buffer_size, gf_sc_ar_get_clock(ar), delay_ms);
+				}
 			}
+
+			ar->bytes_requested += buffer_size;
+			ar->current_time = ar->time_at_last_config + (u32) (ar->bytes_requested * 1000 / ar->bytes_per_second);
 		}
+
 		return written;
 	}
 	return 0;
 }
 
+void gf_sc_flush_next_audio(GF_Compositor *compositor)
+{
+	if (!compositor->audio_renderer->audio_out)
+		return;
+
+	gf_mixer_lock(compositor->audio_renderer->mixer, 1);
+	compositor->audio_renderer->step_mode = 1;
+	//resume for one frame
+	if (compositor->audio_renderer->Frozen) {
+		gf_ar_pause(compositor->audio_renderer, 0, 0, 0);
+	}
+	gf_mixer_lock(compositor->audio_renderer->mixer, 0);
+}
+
+Bool gf_sc_check_audio_pending(GF_Compositor *compositor) 
+{
+	Bool res = 0;
+	gf_mixer_lock(compositor->audio_renderer->mixer, 1);
+	if (compositor->audio_renderer->step_mode) 
+		res = 1;
+	gf_mixer_lock(compositor->audio_renderer->mixer, 0);
+
+	return res;
+}
+
 u32 gf_ar_proc(void *p)
 {
 	GF_AudioRenderer *ar = (GF_AudioRenderer *) p;
@@ -360,7 +423,7 @@
 		//do mix even if mixer is empty, otherwise we will push the same buffer over and over to the sound card
 		if (ar->Frozen ) {
 			gf_mixer_lock(ar->mixer, 0);
-			gf_sleep(33);
+			gf_sleep(0);
 		} else {
 			if (ar->need_reconfig) gf_sc_ar_reconfig(ar);
 			ar->audio_out->WriteAudio(ar->audio_out);
@@ -476,7 +539,8 @@
 	}
 
 	/*init compositor timer*/
-	ar->startTime = gf_sys_clock();
+	ar->start_time = gf_sys_clock();
+	ar->current_time = 0;
 	return ar;
 }
 
@@ -522,28 +586,9 @@
 	gf_mixer_remove_all(ar->mixer);
 }
 
-static void gf_ar_freeze_intern(GF_AudioRenderer *ar, Bool DoFreeze, Bool for_reconfig, Bool reset_hw_buffer)
-{
-	gf_mixer_lock(ar->mixer, 1);
-	if (DoFreeze) {
-		if (!ar->Frozen) {
-			ar->FreezeTime = gf_sys_clock();
-			if (!for_reconfig && ar->audio_out && ar->audio_out->Play) ar->audio_out->Play(ar->audio_out, 0);
-			ar->Frozen = 1;
-		}
-	} else {
-		if (ar->Frozen) {
-			if (!for_reconfig && ar->audio_out && ar->audio_out->Play) ar->audio_out->Play(ar->audio_out, reset_hw_buffer ? 2 : 1);
-			ar->Frozen = 0;
-			ar->startTime += gf_sys_clock() - ar->FreezeTime;
-		}
-	}
-	gf_mixer_lock(ar->mixer, 0);
-}
-
 void gf_sc_ar_control(GF_AudioRenderer *ar, u32 PauseType)
 {
-	gf_ar_freeze_intern(ar, !PauseType, 0, (PauseType==2) ? 1 : 0);
+	gf_ar_pause(ar, !PauseType, 0, (PauseType==2) ? 1 : 0);
 }
 
 void gf_sc_ar_set_volume(GF_AudioRenderer *ar, u32 Volume)
@@ -617,10 +662,10 @@
 	/*lock mixer*/
 	gf_mixer_lock(ar->mixer, 1);
 
-	gf_ar_freeze_intern(ar, 1, 1, 0);
+	gf_ar_pause(ar, 1, 1, 0);
 	ar->need_reconfig = 0;
 	gf_ar_setup_output_format(ar);
-	gf_ar_freeze_intern(ar, 0, 1, 0);
+	gf_ar_pause(ar, 0, 1, 0);
 
 	/*unlock mixer*/
 	gf_mixer_lock(ar->mixer, 0);
@@ -634,8 +679,11 @@
 
 u32 gf_sc_ar_get_clock(GF_AudioRenderer *ar)
 {
-	if (ar->Frozen) return ar->FreezeTime - ar->startTime;
-	return gf_sys_clock() - ar->startTime;
+	if (ar->audio_out) return ar->current_time;
+
+	if (ar->Frozen) return ar->freeze_time - ar->start_time;
+
+	return gf_sys_clock() - ar->start_time;
 }
 
 GF_EXPORT
@@ -649,10 +697,10 @@
 	gf_afc_unload(&ar->filter_chain);
 	gf_afc_load(&ar->filter_chain, ar->user, (char*)gf_cfg_get_key(ar->user->config, "Audio", "Filter"));
 
-	gf_ar_freeze_intern(ar, 1, 1, 0);
+	gf_ar_pause(ar, 1, 1, 0);
 	ar->need_reconfig = 0;
 	gf_ar_setup_output_format(ar);
-	gf_ar_freeze_intern(ar, 0, 1, 0);
+	gf_ar_pause(ar, 0, 1, 0);
 
 	gf_mixer_lock(ar->mixer, 0);
 }

gpac-0.5.1.svn5491.tar.xz/src/compositor/compositor.c -> gpac-0.5.1.svn5619.tar.xz/src/compositor/compositor.c Changed

@@ -212,15 +212,19 @@
 }
 
 GF_EXPORT
-Bool gf_sc_draw_frame(GF_Compositor *compositor, u32 *ms_till_next)
+Bool gf_sc_draw_frame(GF_Compositor *compositor, Bool no_flush, u32 *ms_till_next)
 {
+	if (no_flush)
+		compositor->skip_flush=1;
 	gf_sc_simulation_tick(compositor);
+
 	if (ms_till_next) {
 		if ((s32) compositor->next_frame_delay == -1)
 			*ms_till_next = compositor->frame_duration;
 		else
 			*ms_till_next = MIN(compositor->next_frame_delay, compositor->frame_duration);
 	}
+	if (compositor->frame_delay<0) return 1;
 	if (compositor->frame_draw_type) return 1;
 	if (compositor->fonts_pending) return 1;
 	return GF_FALSE;
@@ -551,10 +555,13 @@
 	if ((tmp->user->init_flags & GF_TERM_NO_REGULATION) || !tmp->VisualThread)
 		tmp->no_regulation = GF_TRUE;
 
-	/*set default size if owning output*/
+#if 1
+ /*set default size if owning output*/
 	if (!tmp->user->os_window_handler) {
 		gf_sc_set_size(tmp, SC_DEF_WIDTH, SC_DEF_HEIGHT);
 	}
+#endif
+ 
 	/*try to load GL extensions*/
 #ifndef GPAC_DISABLE_3D
 	gf_sc_load_opengl_extensions(tmp, GF_FALSE);
@@ -622,6 +629,8 @@
 
 #ifndef GPAC_DISABLE_3D
 	if (compositor->unit_bbox) mesh_free(compositor->unit_bbox);
+
+	if (compositor->screen_buffer) gf_free(compositor->screen_buffer);
 #endif
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Unloading visual compositor module\n"));
@@ -698,6 +707,8 @@
 	/*step mode*/
 	if (PlayState==GF_STATE_STEP_PAUSE) {
 		compositor->step_mode = 1;
+		gf_sc_flush_next_audio(compositor);
+
 		if (!compositor->paused)
 			gf_term_set_option(compositor->term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
 		else {
@@ -1478,6 +1489,13 @@
 		compositor->freeze_display = value;
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
+	case GF_OPT_FORCE_AUDIO_CONFIG:
+		if (value) {
+			compositor->audio_renderer->config_forced++;
+		} else if (compositor->audio_renderer->config_forced) {
+			compositor->audio_renderer->config_forced --;
+		}
+		break;
 	case GF_OPT_RELOAD_CONFIG:
 		gf_sc_reload_config(compositor);
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
@@ -1909,6 +1927,7 @@
 
 static void gf_sc_recompute_ar(GF_Compositor *compositor, GF_Node *top_node)
 {
+	Bool force_pause = compositor->audio_renderer->Frozen ? 0 : 1;
 
 #ifndef GPAC_DISABLE_LOG
 	compositor->visual_config_time = 0;
@@ -1921,8 +1940,9 @@
 			time = gf_sys_clock();
 		}
 #endif
+		if (force_pause )
+			gf_sc_ar_control(compositor->audio_renderer, 0);
 
-		gf_sc_ar_control(compositor->audio_renderer, 0);
 #ifndef GPAC_DISABLE_3D
 		if (compositor->autoconfig_opengl) {
 			compositor->visual->type_3d = 1;
@@ -1965,7 +1985,8 @@
 #endif
 		}
 
-		gf_sc_ar_control(compositor->audio_renderer, 1);
+		if (force_pause )
+			gf_sc_ar_control(compositor->audio_renderer, 1);
 
 #ifndef GPAC_DISABLE_LOG
 		if (gf_log_tool_level_on(GF_LOG_RTI, GF_LOG_DEBUG)) {
@@ -2111,6 +2132,8 @@
 
 	if (!top_node && !compositor->visual->last_had_back && !compositor->visual->cur_context) {
 		//GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Scene has no root node, nothing to draw\n"));
+ //nothing to draw, skip flush
+ compositor->skip_flush = 1;
 		return;
 	}
 
@@ -2171,6 +2194,18 @@
 	}
 }
 
+void gf_sc_flush_video(GF_Compositor *compositor)
+{
+	GF_Window rc;
+
+	//release compositor in case we have vsync
+	gf_sc_lock(compositor, 0);
+	rc.x = rc.y = 0;
+	rc.w = compositor->display_width;
+	rc.h = compositor->display_height;
+	compositor->video_out->Flush(compositor->video_out, &rc);
+	gf_sc_lock(compositor, 1);
+}
 
 void gf_sc_simulation_tick(GF_Compositor *compositor)
 {
@@ -2217,6 +2252,7 @@
 			gf_sleep(compositor->bench_mode ? 2 : compositor->frame_duration);
 		}
 		compositor->force_bench_frame=0;
+		compositor->frame_draw_type = 0;
 		return;
 	}
 
@@ -2269,7 +2305,7 @@
 
 
 	//first update all natural textures to figure out timing
-	compositor->frame_delay = (u32) -1;
+	compositor->frame_delay = 0;
 	compositor->next_frame_delay = (u32) -1;
 	frame_duration = compositor->frame_duration;
 
@@ -2448,7 +2484,6 @@
 
 	/*if invalidated, draw*/
 	if (compositor->frame_draw_type) {
-		GF_Window rc;
 		Bool textures_released = 0;
 
 #ifndef GPAC_DISABLE_LOG
@@ -2495,14 +2530,7 @@
 		}
 
 		if (compositor->skip_flush!=1) {
-
-			//release compositor in case we have vsync
-			gf_sc_lock(compositor, 0);
-			rc.x = rc.y = 0;
-			rc.w = compositor->display_width;
-			rc.h = compositor->display_height;
-			compositor->video_out->Flush(compositor->video_out, &rc);
-			gf_sc_lock(compositor, 1);
+			gf_sc_flush_video(compositor);
 		} else {
 			compositor->skip_flush = 0;
 		}
@@ -2906,6 +2934,7 @@
 			} else {
 				/*remove pending resize notif*/
 				compositor->msg_type &= ~GF_SR_CFG_SET_SIZE;
+ compositor->msg_type &= ~GF_SR_CFG_WINDOWSIZE_NOTIF;
 			}
 			if (lock_ok) gf_sc_lock(compositor, GF_FALSE);
 		}

gpac-0.5.1.svn5491.tar.xz/src/compositor/gl_inc.h -> gpac-0.5.1.svn5619.tar.xz/src/compositor/gl_inc.h Changed

gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_layout.c -> gpac-0.5.1.svn5619.tar.xz/src/compositor/mpeg4_layout.c Changed

gpac-0.5.1.svn5491.tar.xz/src/compositor/mpeg4_textures.c -> gpac-0.5.1.svn5619.tar.xz/src/compositor/mpeg4_textures.c Changed

@@ -288,47 +288,66 @@
 			u32 out_size;
 			GF_Err e;
 
-			/*BT/XMT playback*/
+			/*BT/XMT playback: load to memory*/
 			if (ct->image.buffer) {
-				e = gf_img_file_dec(ct->image.buffer, (u32 *) &ct->objectTypeIndication, &txh->width, &txh->height, &txh->pixelformat, &txh->data, &out_size);
-				if (e==GF_OK) {
-					txh->needs_refresh = 1;
-					txh->stride = out_size / txh->height;
+				char *par = (char *) gf_scene_get_service_url( gf_node_get_graph(txh->owner ) );
+				char *src_url = gf_url_concatenate(par, ct->image.buffer);
+				FILE *test = fopen( src_url ? src_url : ct->image.buffer, "rb");
+				if (test) {
+					fseek(test, 0, SEEK_END);
+					ct->data_len = ftell(test);
+					ct->data = gf_malloc(sizeof(char)*ct->data_len);
+					fseek(test, 0, SEEK_SET);
+					if (ct->data_len != fread(ct->data, 1, ct->data_len, test)) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to load CacheTexture data from file %s: IO err\n", src_url ? src_url : ct->image.buffer ) );
+						gf_free(ct->data);
+						ct->data = NULL;
+						ct->data_len = 0;
+					}
+					fclose(test);
+				} else {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to load CacheTexture data from file %s: not found\n", src_url ? src_url : ct->image.buffer ) );
 				}
+				ct->image.buffer = NULL;
+				if (src_url) gf_free(src_url);
 			}
+
 			/*BIFS decoded playback*/
-			else {
-				switch (ct->objectTypeIndication) {
-				case GPAC_OTI_IMAGE_JPEG:
-					out_size = 0;
-					e = gf_img_jpeg_dec((char *) ct->data, ct->data_len, &txh->width, &txh->height, &txh->pixelformat, NULL, &out_size, 3);
-					if (e==GF_BUFFER_TOO_SMALL) {
-						u32 BPP;
-						txh->data = gf_malloc(sizeof(char) * out_size);
-						if (txh->pixelformat==GF_PIXEL_GREYSCALE) BPP = 1;
-						else BPP = 3;
-
-						e = gf_img_jpeg_dec((char *) ct->data, ct->data_len, &txh->width, &txh->height, &txh->pixelformat, txh->data, &out_size, BPP);
-						if (e==GF_OK) {
-							txh->needs_refresh = 1;
-							txh->stride = out_size / txh->height;
-						}
+			switch (ct->objectTypeIndication) {
+			case GPAC_OTI_IMAGE_JPEG:
+				out_size = 0;
+				e = gf_img_jpeg_dec((char *) ct->data, ct->data_len, &txh->width, &txh->height, &txh->pixelformat, NULL, &out_size, 3);
+				if (e==GF_BUFFER_TOO_SMALL) {
+					u32 BPP;
+					txh->data = gf_malloc(sizeof(char) * out_size);
+					if (txh->pixelformat==GF_PIXEL_GREYSCALE) BPP = 1;
+					else BPP = 3;
+
+					e = gf_img_jpeg_dec((char *) ct->data, ct->data_len, &txh->width, &txh->height, &txh->pixelformat, txh->data, &out_size, BPP);
+					if (e==GF_OK) {
+						gf_sc_texture_allocate(txh);
+						gf_sc_texture_set_data(txh);
+						txh->needs_refresh = 1;
+						txh->stride = out_size / txh->height;
 					}
-					break;
-				case GPAC_OTI_IMAGE_PNG:
-					out_size = 0;
-					e = gf_img_png_dec((char *) ct->data, ct->data_len, &txh->width, &txh->height, &txh->pixelformat, NULL, &out_size);
-					if (e==GF_BUFFER_TOO_SMALL) {
-						txh->data = gf_malloc(sizeof(char) * out_size);
-						e = gf_img_png_dec((char *) ct->data, ct->data_len, &txh->width, &txh->height, &txh->pixelformat, txh->data, &out_size);
-						if (e==GF_OK) {
-							txh->needs_refresh = 1;
-							txh->stride = out_size / txh->height;
-						}
+				}
+				break;
+			case GPAC_OTI_IMAGE_PNG:
+				out_size = 0;
+				e = gf_img_png_dec((char *) ct->data, ct->data_len, &txh->width, &txh->height, &txh->pixelformat, NULL, &out_size);
+				if (e==GF_BUFFER_TOO_SMALL) {
+					txh->data = gf_malloc(sizeof(char) * out_size);
+					e = gf_img_png_dec((char *) ct->data, ct->data_len, &txh->width, &txh->height, &txh->pixelformat, txh->data, &out_size);
+					if (e==GF_OK) {
+						gf_sc_texture_allocate(txh);
+						gf_sc_texture_set_data(txh);
+						txh->needs_refresh = 1;
+						txh->stride = out_size / txh->height;
 					}
-					break;
 				}
+				break;
 			}
+			
 #endif // GPAC_DISABLE_AV_PARSERS
 
 			/*cacheURL is specified, store the image*/

gpac-0.5.1.svn5491.tar.xz/src/compositor/texturing.c -> gpac-0.5.1.svn5619.tar.xz/src/compositor/texturing.c Changed

gpac-0.5.1.svn5491.tar.xz/src/compositor/visual_manager_2d.c -> gpac-0.5.1.svn5619.tar.xz/src/compositor/visual_manager_2d.c Changed

gpac-0.5.1.svn5491.tar.xz/src/compositor/visual_manager_3d_gl.c -> gpac-0.5.1.svn5619.tar.xz/src/compositor/visual_manager_3d_gl.c Changed

@@ -1096,7 +1096,7 @@
 		glLoadIdentity();
 		return;
 	}
-#ifdef GPAC_USE_OGL_ES
+#if defined(GPAC_USE_OGL_ES) && defined(GPAC_FIXED_POINT)
 	glLoadMatrixx(mat);
 #elif defined(GPAC_FIXED_POINT)
 	Float _mat[16];
@@ -1110,7 +1110,7 @@
 
 static void visual_3d_matrix_add(GF_VisualManager *visual, Fixed *mat)
 {
-#ifdef GPAC_USE_OGL_ES
+#if defined(GPAC_USE_OGL_ES) && defined(GPAC_FIXED_POINT)
 	glMultMatrixx(mat);
 #elif defined(GPAC_FIXED_POINT)
 	u32 i;
@@ -1166,7 +1166,7 @@
 			gf_mx_apply_plane(&mx, &p);
 		}
 
-#ifdef GPAC_USE_OGL_ES
+#if defined(GPAC_USE_OGL_ES) && defined(GPAC_FIXED_POINT)
 		g[0] = p.normal.x;
 		g[1] = p.normal.y;
 		g[2] = p.normal.z;
@@ -1177,8 +1177,14 @@
 		g[1] = FIX2FLT(p.normal.y);
 		g[2] = FIX2FLT(p.normal.z);
 		g[3] = FIX2FLT(p.d);
+
+#if defined(GPAC_USE_OGL_ES)
+		glClipPlanef(idx, g);
+#else
 		glClipPlane(idx, g);
 #endif
+
+#endif
 		glEnable(idx);
 
 		if (visual->clippers[i].is_2d_clip) {
@@ -1215,7 +1221,7 @@
 static void visual_3d_set_lights(GF_VisualManager *visual)
 {
 	u32 i;
-#ifdef GPAC_USE_OGL_ES
+#if defined(GPAC_USE_OGL_ES) && defined(GPAC_FIXED_POINT)
 	Fixed vals[4], exp;
 #else
 	Float vals[4], intensity, cutOffAngle, beamWidth, ambientIntensity, exp;
@@ -1235,7 +1241,7 @@
 		switch (li->type) {
 		//directionnal light
 		case 0:
-#ifdef GPAC_USE_OGL_ES
+#if defined(GPAC_USE_OGL_ES) && defined(GPAC_FIXED_POINT)
 			vals[0] = -li->direction.x;
 			vals[1] = -li->direction.y;
 			vals[2] = -li->direction.z;
@@ -1295,7 +1301,7 @@
 			beamWidth = FIX2FLT(li->beamWidth);
 #endif
 
-#ifdef GPAC_USE_OGL_ES
+#if defined(GPAC_USE_OGL_ES) && defined(GPAC_FIXED_POINT)
 			vals[0] = li->direction.x;
 			vals[1] = li->direction.y;
 			vals[2] = li->direction.z;
@@ -1370,7 +1376,7 @@
 
 		//point light
 		case 2:
-#ifdef GPAC_USE_OGL_ES
+#if defined(GPAC_USE_OGL_ES) && defined(GPAC_FIXED_POINT)
 			vals[0] = li->position.x;
 			vals[1] = li->position.y;
 			vals[2] = li->position.z;
@@ -1433,7 +1439,7 @@
 
 #ifndef GPAC_USE_TINYGL
 
-#ifdef GPAC_USE_OGL_ES
+#if defined(GPAC_USE_OGL_ES) && defined(GPAC_FIXED_POINT)
 	Fixed vals[4];
 	glEnable(GL_FOG);
 	if (!visual->fog_type) glFogx(GL_FOG_MODE, GL_LINEAR);
@@ -1451,9 +1457,17 @@
 #else
 	Float vals[4];
 	glEnable(GL_FOG);
+
+#if defined(GPAC_USE_OGL_ES)
+	if (!visual->fog_type) glFogf(GL_FOG_MODE, GL_LINEAR);
+	else if (visual->fog_type==1) glFogf(GL_FOG_MODE, GL_EXP);
+	else if (visual->fog_type==2) glFogf(GL_FOG_MODE, GL_EXP2);
+#else
 	if (!visual->fog_type) glFogi(GL_FOG_MODE, GL_LINEAR);
 	else if (visual->fog_type==1) glFogi(GL_FOG_MODE, GL_EXP);
 	else if (visual->fog_type==2) glFogi(GL_FOG_MODE, GL_EXP2);
+#endif
+
 	glFogf(GL_FOG_DENSITY, FIX2FLT(visual->fog_density));
 	glFogf(GL_FOG_START, 0);
 	glFogf(GL_FOG_END, FIX2FLT(visual->fog_visibility));
@@ -1518,7 +1532,7 @@
 	visual_3d_draw_aabb_node(tr_state, mesh, prim_type, fplanes, p_idx, mesh->aabb_root->neg);
 }
 
-#ifndef GPAC_ANDROID
+#if !defined(GPAC_ANDROID) && !defined(GPAC_IPHONE)
 
 static GLint my_glGetUniformLocation(GF_SHADERID glsl_program, const char *uniform_name)
 {
@@ -1733,7 +1747,7 @@
 		mesh->vbo_dirty = 0;
 	}
 
-#ifndef GPAC_ANDROID
+#if !defined(GPAC_ANDROID) && !defined(GPAC_IPHONE)
 	if (visual->compositor->shader_only_mode) {
 		visual_3d_draw_mesh_shader_only(tr_state, mesh, base_address);
 		return;
@@ -1853,7 +1867,7 @@
 				break;
 			}
 
-#ifdef GPAC_USE_OGL_ES
+#if defined(GPAC_USE_OGL_ES) && defined(GPAC_FIXED_POINT)
 			glMaterialxv(GL_FRONT_AND_BACK, mode, _rgba);
 #else
 			glMaterialfv(GL_FRONT_AND_BACK, mode, _rgba);
@@ -2528,21 +2542,28 @@
 	u32 hy;
 #endif //GPAC_USE_TINYGL
 
-	fb->width = compositor->vp_width;
-	fb->height = compositor->vp_height;
+	fb->width = compositor->display_width;
+	fb->height = compositor->display_height;
 
 	/*depthmap-only dump*/
 	if (depth_dump_mode==1) {
-		Float *depthp;
-		Float zFar, zNear;
+		//depth reading not supported on gles <= 1.1
 #ifdef GPAC_USE_OGL_ES
 		return GF_NOT_SUPPORTED;
 #else
+		Float *depthp;
+		Float zFar, zNear;
 
 		fb->pitch_x = 0;
 		fb->pitch_y = compositor->vp_width;
 
-		fb->video_buffer = (char*)gf_malloc(sizeof(char)* fb->pitch_y * fb->height);
+		if (compositor->screen_buffer_alloc_size < fb->pitch_y * fb->height) {
+			compositor->screen_buffer_alloc_size = fb->pitch_y * fb->height;
+			compositor->screen_buffer = gf_realloc(compositor->screen_buffer, compositor->screen_buffer_alloc_size);
+		}
+
+		fb->video_buffer = compositor->screen_buffer;
+		
 		//read as float
 		depthp = (Float*)gf_malloc(sizeof(Float)* fb->pitch_y * fb->height);
 		fb->pixel_format = GF_PIXEL_GREYSCALE;
@@ -2574,16 +2595,20 @@
 		return GF_NOT_SUPPORTED;
 #else
 		char *depth_data=NULL;
+		u32 size;
 		fb->pitch_x = 4;
 		fb->pitch_y = compositor->vp_width*4; /* 4 bytes for each rgbds pixel */
 
 #ifndef GPAC_USE_TINYGL
-		fb->video_buffer = (char*)gf_malloc(sizeof(char)* fb->pitch_y * fb->height);
+		size = fb->pitch_y * fb->height;
 #else
-		fb->video_buffer = (char*)gf_malloc(sizeof(char)* 2 * fb->pitch_y * fb->height);
+		size = 2 * fb->pitch_y * fb->height;
 #endif
-
-
+		if (compositor->screen_buffer_alloc_size < size) {
+			compositor->screen_buffer_alloc_size = size;
+			compositor->screen_buffer = gf_realloc(compositor->screen_buffer, compositor->screen_buffer_alloc_size);
+		}
+		fb->video_buffer = compositor->screen_buffer;
 
 #ifndef GPAC_USE_TINYGL
 
@@ -2626,12 +2651,19 @@
 
 #endif /*GPAC_USE_OGL_ES*/
 	} else { /*if (compositor->user && (compositor->user->init_flags & GF_TERM_WINDOW_TRANSPARENT))*/
+		u32 size;
 		fb->pitch_x = 4;
 		fb->pitch_y = 4*compositor->vp_width;
-		fb->video_buffer = (char*)gf_malloc(sizeof(char) * fb->pitch_y * fb->height);
+		size = fb->pitch_y * fb->height;
+		if (compositor->screen_buffer_alloc_size < size) {
+			compositor->screen_buffer_alloc_size = size;
+			compositor->screen_buffer = gf_realloc(compositor->screen_buffer, compositor->screen_buffer_alloc_size);
+		}
+
+		fb->video_buffer = compositor->screen_buffer;
 		fb->pixel_format = GF_PIXEL_RGBA;
 
-		glReadPixels(compositor->vp_x, compositor->vp_y, fb->width, fb->height, GL_RGBA, GL_UNSIGNED_BYTE, fb->video_buffer);
+		glReadPixels(0, 0, fb->width, fb->height, GL_RGBA, GL_UNSIGNED_BYTE, fb->video_buffer);
 		/*	} else {
 				fb->pitch_x = 3;
 				fb->pitch_y = 3*compositor->vp_width;
@@ -2658,7 +2690,6 @@
 
 GF_Err compositor_3d_release_screen_buffer(GF_Compositor *compositor, GF_VideoSurface *framebuffer)
 {
-	gf_free(framebuffer->video_buffer);
 	framebuffer->video_buffer = 0;
 	return GF_OK;
 }

gpac-0.5.1.svn5491.tar.xz/src/export.cpp -> gpac-0.5.1.svn5619.tar.xz/src/export.cpp Changed

@@ -360,6 +360,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_reset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_mime_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_get_header) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_get_header_sizes_and_times) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_set_data_rate) )
@@ -369,7 +370,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_cache_get_cache_filename) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cache_create_entry) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cache_get_mime_type) )
-#pragma comment (linker, EXPORT_SYMBOL(appendHttpCacheHeaders) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_cache_append_http_headers) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cache_open_write_cache) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cache_set_last_modified_on_server) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cache_set_etag_on_server) )
@@ -712,6 +713,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sample_padding) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_flags) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_for_media_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_for_movie_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_dts) )
@@ -887,11 +889,13 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_media_language) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_handler_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_add_user_data) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_add_user_data_boxes) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_user_data) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_user_data_item) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_use_compact_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_brand_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_modify_alternate_brand) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_reset_alt_brands) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sample_padding_bits) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_visual_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_pixel_aspect_ratio) )
@@ -952,6 +956,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_text_add_blink) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_text_set_wrap) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_text_to_sample) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_text_set_display_flags) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_track_protection) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_ismacryp_protection) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_change_ismacryp_protection) )
@@ -1475,6 +1480,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_bifs_encoder_get_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bifs_encoder_get_version) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bifs_encoder_get_rap) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_bifs_encoder_set_source_url) )
 #endif
 #endif /*GPAC_DISABLE_BIFS*/
 
@@ -1595,7 +1601,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_try_lock_javascript) )
 
 #ifndef GPAC_DISABLE_SVG
-#pragma comment (linker, EXPORT_SYMBOL(dom_js_pre_destroy) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sg_js_dom_pre_destroy) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_js_event_add_listener) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_js_event_remove_listener) )
 #endif
@@ -1728,6 +1734,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_simulation_frame_rate) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_step_clocks) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_process_flush) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_term_process_flush_video) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_service_get_interface) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_service_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_text_selection) )
@@ -1754,6 +1761,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_remove_event_filter) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_lock_media_queue) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_current_service_id) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_term_get_clock) )
 
 /*terminal_dev exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_new) )
@@ -1899,8 +1907,9 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_init_from_dom) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m3u8_to_mpd) )
-#pragma comment (linker, EXPORT_SYMBOL(parse_root_playlist) )
-#pragma comment (linker, EXPORT_SYMBOL(variant_playlist_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_m3u8_parse_master_playlist) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mpd_write_file) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mpd_resolve_url) )
 
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_demuxer_setup))
@@ -1963,7 +1972,10 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_open) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_close) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_url) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_is_m3u8) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_group_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_udta_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_udta_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_group_udta) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_group_udta) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_is_group_selected) )

gpac-0.5.1.svn5491.tar.xz/src/ietf/rtp.c -> gpac-0.5.1.svn5619.tar.xz/src/ietf/rtp.c Changed

gpac-0.5.1.svn5491.tar.xz/src/ietf/rtp_streamer.c -> gpac-0.5.1.svn5619.tar.xz/src/ietf/rtp_streamer.c Changed

gpac-0.5.1.svn5491.tar.xz/src/isomedia/avc_ext.c -> gpac-0.5.1.svn5619.tar.xz/src/isomedia/avc_ext.c Changed

gpac-0.5.1.svn5491.tar.xz/src/isomedia/box_code_base.c -> gpac-0.5.1.svn5619.tar.xz/src/isomedia/box_code_base.c Changed

@@ -280,7 +280,7 @@
 		gf_bs_write_int(bs, 0, 15);
 	}
 	if (ptr->notice) {
-		gf_bs_write_data(bs, ptr->notice, (unsigned long)strlen(ptr->notice) + 1);
+		gf_bs_write_data(bs, ptr->notice, (u32) (strlen(ptr->notice) + 1) );
 	}
 	return GF_OK;
 }
@@ -360,9 +360,9 @@
 
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
-	gf_bs_write_data(bs, ptr->schemeURI, (unsigned long)strlen(ptr->schemeURI) + 1);
+	gf_bs_write_data(bs, ptr->schemeURI, (u32) (strlen(ptr->schemeURI) + 1 ));
 	if (ptr->value) {
-		gf_bs_write_data(bs, ptr->value, (unsigned long)strlen(ptr->value) + 1);
+		gf_bs_write_data(bs, ptr->value, (u32) (strlen(ptr->value) + 1) );
 	}
 	return GF_OK;
 }
@@ -4416,7 +4416,8 @@
 	GF_SoundMediaHeaderBox *ptr = (GF_SoundMediaHeaderBox *)s;
 	e = gf_isom_full_box_read(s, bs);
 	if (e) return e;
-	ptr->reserved = gf_bs_read_u32(bs);
+	ptr->balance = gf_bs_read_u16(bs);
+	ptr->reserved = gf_bs_read_u16(bs);
 	return GF_OK;
 }
 
@@ -4436,7 +4437,8 @@
 	GF_SoundMediaHeaderBox *ptr = (GF_SoundMediaHeaderBox *)s;
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
-	gf_bs_write_u32(bs, ptr->reserved);
+	gf_bs_write_u16(bs, ptr->balance);
+	gf_bs_write_u16(bs, ptr->reserved);
 	return GF_OK;
 }
 
@@ -8272,9 +8274,9 @@
 	ptr->pcr_values = gf_malloc(sizeof(u64)*ptr->subsegment_count);
 	for (i=0; i<ptr->subsegment_count; i++) {
 		u64 data1 = gf_bs_read_u32(bs);
-		u64 data2 = gf_bs_read_u32(bs);
-		ptr->size -= 8;
-		ptr->pcr_values[i] = (data1 << 10) | (data2 >> 22);
+		u64 data2 = gf_bs_read_u16(bs);
+		ptr->size -= 6;
+		ptr->pcr_values[i] = (data1 << 10) | (data2 >> 6);
 
 	}
 	return GF_OK;
@@ -8295,10 +8297,10 @@
 
 	for (i=0; i<ptr->subsegment_count; i++ ) {
 		u32 data1 = (u32) (ptr->pcr_values[i] >> 10);
-		u32 data2 = (u32) ((ptr->pcr_values[i]& 0x3FF) << 22);
+		u16 data2 = (u16) (ptr->pcr_values[i] << 6);
 
 		gf_bs_write_u32(bs, data1);
-		gf_bs_write_u32(bs, data2);
+		gf_bs_write_u16(bs, data2);
 	}
 	return GF_OK;
 }
@@ -8311,7 +8313,7 @@
 	if (e) return e;
 
 	ptr->size += 4;
-	ptr->size += ptr->subsegment_count * 8;
+	ptr->size += ptr->subsegment_count * 6;
 
 	return GF_OK;
 }

gpac-0.5.1.svn5491.tar.xz/src/isomedia/box_code_drm.c -> gpac-0.5.1.svn5619.tar.xz/src/isomedia/box_code_drm.c Changed

gpac-0.5.1.svn5491.tar.xz/src/isomedia/box_dump.c -> gpac-0.5.1.svn5619.tar.xz/src/isomedia/box_dump.c Changed

gpac-0.5.1.svn5491.tar.xz/src/isomedia/isom_intern.c -> gpac-0.5.1.svn5619.tar.xz/src/isomedia/isom_intern.c Changed

gpac-0.5.1.svn5491.tar.xz/src/isomedia/isom_read.c -> gpac-0.5.1.svn5619.tar.xz/src/isomedia/isom_read.c Changed

@@ -1284,6 +1284,20 @@
 	return 1;
 }
 
+GF_EXPORT
+GF_Err gf_isom_get_sample_flags(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 *isLeading, u32 *dependsOn, u32 *dependedOn, u32 *redundant)
+{
+	GF_TrackBox *trak = NULL;
+	*isLeading = 0;
+	*dependsOn = 0;
+	*dependedOn = 0;
+	*redundant = 0;
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+	if (!trak->Media->information->sampleTable->SampleDep) return GF_BAD_PARAM;
+	return stbl_GetSampleDepType(trak->Media->information->sampleTable->SampleDep, sampleNumber, isLeading, dependsOn, dependedOn, redundant);
+}
+
 //return a sample give its number, and set the SampleDescIndex of this sample
 //this index allows to retrieve the stream description if needed (2 media in 1 track)
 //return NULL if error
@@ -1909,6 +1923,46 @@
 	return 0;
 }
 
+GF_EXPORT
+u32 gf_isom_get_udta_count(GF_ISOFile *movie, u32 trackNumber)
+{
+	GF_TrackBox *trak;
+	GF_UserDataBox *udta;
+	if (!movie || !movie->moov) return 0;
+
+	if (trackNumber) {
+		trak = gf_isom_get_track_from_file(movie, trackNumber);
+		if (!trak) return 0;
+		udta = trak->udta;
+	} else {
+		udta = movie->moov->udta;
+	}
+	if (udta) return gf_list_count(udta->recordList);
+	return 0;
+}
+
+GF_EXPORT
+GF_Err gf_isom_get_udta_type(GF_ISOFile *movie, u32 trackNumber, u32 udta_idx, u32 *UserDataType, bin128 *UUID)
+{
+	GF_TrackBox *trak;
+	GF_UserDataBox *udta;
+	GF_UserDataMap *map;
+	if (!movie || !movie->moov || !udta_idx) return GF_BAD_PARAM;
+
+	if (trackNumber) {
+		trak = gf_isom_get_track_from_file(movie, trackNumber);
+		if (!trak) return 0;
+		udta = trak->udta;
+	} else {
+		udta = movie->moov->udta;
+	}
+	if (!udta) return GF_BAD_PARAM;
+	if (udta_idx>gf_list_count(udta->recordList)) return GF_BAD_PARAM;
+	map = gf_list_get(udta->recordList, udta_idx - 1);
+	if (UserDataType) *UserDataType = map->boxType;
+	if (UUID) memcpy(*UUID, map->uuid, 16);
+	return GF_OK;
+}
 
 GF_EXPORT
 u32 gf_isom_get_user_data_count(GF_ISOFile *movie, u32 trackNumber, u32 UserDataType, bin128 UUID)
@@ -1948,6 +2002,7 @@
 {
 	GF_UserDataMap *map;
 	GF_UnknownBox *ptr;
+	GF_BitStream *bs;
 	u32 i;
 	bin128 t;
 	GF_TrackBox *trak;
@@ -1967,7 +2022,6 @@
 	if (UserDataType == GF_ISOM_BOX_TYPE_UUID) UserDataType = 0;
 	memset(t, 1, 16);
 
-	if (!UserDataIndex) return GF_BAD_PARAM;
 	if (!userData || !userDataSize || *userData) return GF_BAD_PARAM;
 
 	i=0;
@@ -1979,15 +2033,32 @@
 	return GF_BAD_PARAM;
 
 found:
+	if (UserDataIndex) {
+		if (UserDataIndex > gf_list_count(map->other_boxes) ) return GF_BAD_PARAM;
+		ptr = (GF_UnknownBox*)gf_list_get(map->other_boxes, UserDataIndex-1);
+
+		//ok alloc the data
+		*userData = (char *)gf_malloc(sizeof(char)*ptr->dataSize);
+		if (!*userData) return GF_OUT_OF_MEM;
+		memcpy(*userData, ptr->data, sizeof(char)*ptr->dataSize);
+		*userDataSize = ptr->dataSize;
+		return GF_OK;
+	}
 
-	if (UserDataIndex > gf_list_count(map->other_boxes) ) return GF_BAD_PARAM;
-	ptr = (GF_UnknownBox*)gf_list_get(map->other_boxes, UserDataIndex-1);
-
-	//ok alloc the data
-	*userData = (char *)gf_malloc(sizeof(char)*ptr->dataSize);
-	if (!*userData) return GF_OUT_OF_MEM;
-	memcpy(*userData, ptr->data, sizeof(char)*ptr->dataSize);
-	*userDataSize = ptr->dataSize;
+	//serialize all boxes
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	i=0;
+	while ( (ptr = gf_list_enum(map->other_boxes, &i))) {
+		u32 s = ptr->dataSize+8;
+		if (ptr->type==GF_ISOM_BOX_TYPE_UUID) s += 16;
+
+		gf_bs_write_u32(bs, s);
+		gf_bs_write_u32(bs, ptr->type);
+		if (ptr->type==GF_ISOM_BOX_TYPE_UUID) gf_bs_write_data(bs, (char *) map->uuid, 16);
+		gf_bs_write_data(bs, ptr->data, ptr->dataSize);
+	}
+	gf_bs_get_content(bs, userData, userDataSize);
+	gf_bs_del(bs);
 	return GF_OK;
 }
 
@@ -2269,7 +2340,7 @@
         gf_isom_box_del((GF_Box *)_a);\
         _a = __cast gf_isom_box_new(type);\
     }\
-
+ 
 
 GF_EXPORT
 GF_Err gf_isom_reset_tables(GF_ISOFile *movie, Bool reset_sample_count)
@@ -2292,7 +2363,7 @@
 				trak->dts_at_seg_start += dts + dur;
 			}
 		}
- 
+
 		RECREATE_BOX(stbl->ChunkOffset, (GF_Box *));
 		RECREATE_BOX(stbl->CompositionOffset, (GF_CompositionOffsetBox *));
 		RECREATE_BOX(stbl->DegradationPriority, (GF_DegradationPriorityBox *));
@@ -2311,7 +2382,7 @@
 #endif
 		}
 
-    }
+	}
 
 #endif
 	return GF_OK;
@@ -2371,7 +2442,7 @@
 					trak->dts_at_seg_start += dts + dur;
 				}
 			}
- 
+
 			RECREATE_BOX(stbl->ChunkOffset, (GF_Box *));
 			RECREATE_BOX(stbl->CompositionOffset, (GF_CompositionOffsetBox *));
 			RECREATE_BOX(stbl->DegradationPriority, (GF_DegradationPriorityBox *));
@@ -2383,7 +2454,7 @@
 			RECREATE_BOX(stbl->SyncSample, (GF_SyncSampleBox *));
 			RECREATE_BOX(stbl->TimeToSample, (GF_TimeToSampleBox *));
 
-        }
+		}
 
 
 		j = 0;
@@ -3550,7 +3621,11 @@
 }
 
 GF_EXPORT
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 GF_Err gf_isom_get_sample_cenc_info_ex(GF_TrackBox *trak, GF_TrackFragmentBox *traf, u32 sample_number, u32 *IsEncrypted, u8 *IV_size, bin128 *KID)
+#else
+GF_Err gf_isom_get_sample_cenc_info_ex(GF_TrackBox *trak, void *traf, u32 sample_number, u32 *IsEncrypted, u8 *IV_size, bin128 *KID)
+#endif
 {
 	GF_SampleGroupBox *sample_group;
 	u32 j, group_desc_index;
@@ -3566,6 +3641,11 @@
 	if (IV_size) *IV_size = 0;
 	if (KID) memset(*KID, 0, 16);
 
+#ifdef	GPAC_DISABLE_ISOM_FRAGMENTS
+	if (!traf)
+		return GF_BAD_PARAM;
+#endif
+
 	if (trak->Media->information->sampleTable->SampleSize && trak->Media->information->sampleTable->SampleSize->sampleCount>=sample_number) {
 		stbl_GetSampleInfos(trak->Media->information->sampleTable, sample_number, &offset, &chunkNum, &descIndex, &edit);
 	} else {

gpac-0.5.1.svn5491.tar.xz/src/isomedia/isom_write.c -> gpac-0.5.1.svn5619.tar.xz/src/isomedia/isom_write.c Changed

@@ -346,13 +346,36 @@
 GF_EXPORT
 GF_Err gf_isom_set_timescale(GF_ISOFile *movie, u32 timeScale)
 {
+	Double ts_scale;
+	GF_TrackBox *trak;
+	u32 i;
 	GF_Err e;
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 	gf_isom_insert_moov(movie);
 
+	if (movie->moov->mvhd->timeScale == timeScale) return GF_OK;
+
+	/*rewrite all durations and edit lists*/
+	ts_scale = timeScale;
+	ts_scale /= movie->moov->mvhd->timeScale;
+
 	movie->moov->mvhd->timeScale = timeScale;
 	movie->interleavingTime = timeScale;
+
+	movie->moov->mvhd->duration = (u64) (s64) ((s64) movie->moov->mvhd->duration * ts_scale);
+
+	i=0;
+	while ((trak = gf_list_enum(movie->moov->trackList, &i))) {
+		trak->Header->duration = (u64) (s64) ((s64) trak->Header->duration * ts_scale);
+		if (trak->editBox && trak->editBox->editList) {
+			u32 j, count = gf_list_count(trak->editBox->editList->entryList);
+			for (j=0; j<count; j++) {
+				GF_EdtsEntry *ent = (GF_EdtsEntry *)gf_list_get(trak->editBox->editList->entryList, j);
+				ent->segmentDuration = (u64) (s64) ((s64) ent->segmentDuration * ts_scale);
+			}
+		}
+	}
 	return GF_OK;
 }
 
@@ -616,7 +639,7 @@
 
 //Add samples to a track. Use streamDescriptionIndex to specify the desired stream (if several)
 GF_EXPORT
-GF_Err gf_isom_add_sample(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, GF_ISOSample *sample)
+GF_Err gf_isom_add_sample(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, const GF_ISOSample *sample)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
@@ -2251,6 +2274,7 @@
 }
 
 
+GF_EXPORT
 GF_Err gf_isom_reset_alt_brands(GF_ISOFile *movie)
 {
 	u32 *p;
@@ -2278,6 +2302,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_set_sample_padding_bits(GF_ISOFile *movie, u32 trackNumber, u32 sampleNumber, u8 NbBits)
 {
 	GF_TrackBox *trak;
@@ -2294,6 +2319,7 @@
 }
 
 
+GF_EXPORT
 GF_Err gf_isom_remove_user_data_item(GF_ISOFile *movie, u32 trackNumber, u32 UserDataType, bin128 UUID, u32 UserDataIndex)
 {
 	GF_UserDataMap *map;
@@ -2347,6 +2373,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_remove_user_data(GF_ISOFile *movie, u32 trackNumber, u32 UserDataType, bin128 UUID)
 {
 	GF_UserDataMap *map;
@@ -2389,6 +2416,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_add_user_data(GF_ISOFile *movie, u32 trackNumber, u32 UserDataType, bin128 UUID, char *data, u32 DataLength)
 {
 	GF_UnknownBox *a;
@@ -2428,6 +2456,40 @@
 	return udta_AddBox(udta, (GF_Box *) a);
 }
 
+GF_EXPORT
+GF_Err gf_isom_add_user_data_boxes(GF_ISOFile *movie, u32 trackNumber, char *data, u32 DataLength)
+{
+	GF_Err e;
+	GF_TrackBox *trak;
+	GF_UserDataBox *udta;
+	GF_BitStream *bs;
+
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	if (trackNumber) {
+		trak = gf_isom_get_track_from_file(movie, trackNumber);
+		if (!trak) return GF_BAD_PARAM;
+		if (!trak->udta) trak_AddBox((GF_Box*)trak, gf_isom_box_new(GF_ISOM_BOX_TYPE_UDTA));
+		udta = trak->udta;
+	} else {
+		if (!movie->moov->udta) moov_AddBox((GF_Box*)movie->moov, gf_isom_box_new(GF_ISOM_BOX_TYPE_UDTA));
+		udta = movie->moov->udta;
+	}
+	if (!udta) return GF_OUT_OF_MEM;
+
+	bs = gf_bs_new(data, DataLength, GF_BITSTREAM_READ);
+	while (gf_bs_available(bs)) {
+		GF_Box *a;
+		e = gf_isom_parse_box(&a, bs);
+		if (e) break;
+		e = udta_AddBox(udta, a);
+		if (e) break;
+	}
+	gf_bs_del(bs);
+	return e;
+}
+
 
 GF_Err gf_isom_add_sample_fragment(GF_ISOFile *movie, u32 trackNumber, u32 sampleNumber, u16 FragmentSize)
 {
@@ -3135,6 +3197,7 @@
 
 
 //changes track ID
+GF_EXPORT
 GF_Err gf_isom_set_track_id(GF_ISOFile *movie, u32 trackNumber, u32 trackID)
 {
 	GF_TrackReferenceTypeBox *ref;
@@ -4093,7 +4156,11 @@
 	if (!meta) return GF_BAD_PARAM;
 
 	ilst = gf_ismo_locate_box(meta->other_boxes, GF_ISOM_BOX_TYPE_ILST, NULL);
-	if (!ilst) return GF_NOT_SUPPORTED;
+	if (!ilst) {
+		ilst = (GF_ItemListBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_ILST);
+		if (!meta->other_boxes) meta->other_boxes = gf_list_new();
+		gf_list_add(meta->other_boxes, ilst);
+	}
 
 	if (tag==GF_ISOM_ITUNE_GENRE) {
 		btype = data ? GF_ISOM_BOX_TYPE_0xA9GEN : GF_ISOM_BOX_TYPE_GNRE;
@@ -4106,6 +4173,7 @@
 		if (info->type==btype) {
 			gf_list_rem(ilst->other_boxes, i-1);
 			gf_isom_box_del((GF_Box *) info);
+			info = NULL;
 			break;
 		}
 	}
@@ -4163,6 +4231,15 @@
 		info->data->flags = 0x15;
 		gf_bs_del(bs);
 	}
+
+	if (!info || (tag==GF_ISOM_ITUNE_ALL) ) {
+		if (!gf_list_count(ilst->other_boxes) || (tag==GF_ISOM_ITUNE_ALL) ) {
+			gf_list_del_item(meta->other_boxes, ilst);
+			gf_isom_box_del((GF_Box *) ilst);
+		}
+		return GF_OK;	
+	}
+
 	return gf_list_add(ilst->other_boxes, info);
 }
 
@@ -4958,14 +5035,14 @@
 
 	/*modify depends flags*/
 	if (src_trak->Media->information->sampleTable->SampleDep) {
-		u32 dependsOn, dependedOn, redundant;
+		u32 isLeading, dependsOn, dependedOn, redundant;
 
-		dependsOn = dependedOn = redundant = 0;
+		isLeading = dependsOn = dependedOn = redundant = 0;
 
-		e = stbl_GetSampleDepType(src_trak->Media->information->sampleTable->SampleDep, sampleNumber, &dependsOn, &dependedOn, &redundant);
+		e = stbl_GetSampleDepType(src_trak->Media->information->sampleTable->SampleDep, sampleNumber, &isLeading, &dependsOn, &dependedOn, &redundant);
 		if (e) return e;
 
-		e = stbl_AppendDependencyType(dst_trak->Media->information->sampleTable, dependsOn, dependedOn, redundant);
+		e = stbl_AppendDependencyType(dst_trak->Media->information->sampleTable, isLeading, dependsOn, dependedOn, redundant);
 		if (e) return e;
 	}
 
@@ -5017,6 +5094,42 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_isom_text_set_display_flags(GF_ISOFile *file, u32 track, u32 desc_index, u32 flags, GF_TextFlagsMode op_type)
+{
+	u32 i;
+	GF_Err e;
+	GF_TrackBox *trak;
+
+	e = CanAccessMovie(file, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(file, track);
+	if (!trak) return GF_BAD_PARAM;
+
+	for (i=0; i < gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes); i++) {
+		GF_Tx3gSampleEntryBox *txt;
+		if (desc_index && (i+1 != desc_index)) continue;
+
+		txt = gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, i);
+		if (txt->type != GF_ISOM_BOX_TYPE_TX3G) continue;
+
+		switch (op_type) {
+		case GF_ISOM_TEXT_FLAGS_TOGGLE:
+			txt->displayFlags |= flags;
+			break;
+		case GF_ISOM_TEXT_FLAGS_UNTOGGLE:
+			txt->displayFlags &= ~flags;
+			break;
+		default:
+			txt->displayFlags = flags;
+			break;
+		}
+	}
+	return GF_OK;
+	
+}
+
 
 #endif	/*!defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_ISOM_WRITE)*/

gpac-0.5.1.svn5491.tar.xz/src/isomedia/media.c -> gpac-0.5.1.svn5619.tar.xz/src/isomedia/media.c Changed

gpac-0.5.1.svn5491.tar.xz/src/isomedia/media_odf.c -> gpac-0.5.1.svn5619.tar.xz/src/isomedia/media_odf.c Changed

gpac-0.5.1.svn5491.tar.xz/src/isomedia/movie_fragments.c -> gpac-0.5.1.svn5619.tar.xz/src/isomedia/movie_fragments.c Changed

@@ -1670,7 +1670,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_fragment_add_sample(GF_ISOFile *movie, u32 TrackID, GF_ISOSample *sample, u32 DescIndex,
+GF_Err gf_isom_fragment_add_sample(GF_ISOFile *movie, u32 TrackID, const GF_ISOSample *sample, u32 DescIndex,
                                    u32 Duration, u8 PaddingBits, u16 DegradationPriority, Bool redundant_coding)
 {
 	u32 count, buffer_size;
@@ -1949,9 +1949,9 @@
 
 	/*modify depends flags*/
 	if (trak->Media->information->sampleTable->SampleDep) {
-		u32 dependsOn, dependedOn, redundant;
+		u32 isLeading, dependsOn, dependedOn, redundant;
 
-		dependsOn = dependedOn = redundant = 0;
+		isLeading = dependsOn = dependedOn = redundant = 0;
 		count = gf_list_count(traf->TrackRuns);
 		if (!count) return GF_BAD_PARAM;
 		trun = (GF_TrackFragmentRunBox *)gf_list_get(traf->TrackRuns, count-1);
@@ -1959,7 +1959,7 @@
 		if (!count) return GF_BAD_PARAM;
 
 		ent = (GF_TrunEntry *)gf_list_get(trun->entries, count-1);
-		e = stbl_GetSampleDepType(trak->Media->information->sampleTable->SampleDep, sampleNumber, &dependsOn, &dependedOn, &redundant);
+		e = stbl_GetSampleDepType(trak->Media->information->sampleTable->SampleDep, sampleNumber, &isLeading, &dependsOn, &dependedOn, &redundant);
 		if (e) return e;
 
 		GF_ISOM_RESET_FRAG_DEPEND_FLAGS(ent->flags);
@@ -2088,7 +2088,7 @@
 	return GF_NOT_SUPPORTED;
 }
 
-GF_Err gf_isom_fragment_add_sample(GF_ISOFile *the_file, u32 TrackID, GF_ISOSample *sample, u32 DescIndex,
+GF_Err gf_isom_fragment_add_sample(GF_ISOFile *the_file, u32 TrackID, const GF_ISOSample *sample, u32 DescIndex,
                                    u32 Duration, u8 PaddingBits, u16 DegradationPriority, Bool redCoded)
 {
 	return GF_NOT_SUPPORTED;

gpac-0.5.1.svn5491.tar.xz/src/isomedia/stbl_read.c -> gpac-0.5.1.svn5619.tar.xz/src/isomedia/stbl_read.c Changed

gpac-0.5.1.svn5491.tar.xz/src/isomedia/stbl_write.c -> gpac-0.5.1.svn5619.tar.xz/src/isomedia/stbl_write.c Changed

gpac-0.5.1.svn5491.tar.xz/src/isomedia/track.c -> gpac-0.5.1.svn5619.tar.xz/src/isomedia/track.c Changed

gpac-0.5.1.svn5491.tar.xz/src/isomedia/ttml.c -> gpac-0.5.1.svn5619.tar.xz/src/isomedia/ttml.c Changed

gpac-0.5.1.svn5491.tar.xz/src/media_tools/av_parsers.c -> gpac-0.5.1.svn5619.tar.xz/src/media_tools/av_parsers.c Changed

gpac-0.5.1.svn5491.tar.xz/src/media_tools/avilib.c -> gpac-0.5.1.svn5619.tar.xz/src/media_tools/avilib.c Changed

gpac-0.5.1.svn5491.tar.xz/src/media_tools/dash_client.c -> gpac-0.5.1.svn5619.tar.xz/src/media_tools/dash_client.c Changed

@@ -1,27 +1,27 @@
-/*
-*			GPAC - Multimedia Framework C SDK
-*
-*			Authors: Jean Le Feuvre, Cyril Concolato
-*			Copyright (c) Telecom ParisTech 2010-
-*					All rights reserved
-*
-* This file is part of GPAC / Adaptive HTTP Streaming
-*
-* GPAC is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation; either version 2, or (at your option)
-* any later version.
-*
-* GPAC is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; see the file COPYING. If not, write to
-* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-*/
+/**
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre, Cyril Concolato
+ *			Copyright (c) Telecom ParisTech 2010-
+ *					All rights reserved
+ *
+ * This file is part of GPAC / Adaptive HTTP Streaming
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
 
 #include <gpac/thread.h>
 #include <gpac/network.h>
@@ -373,7 +373,7 @@
 	if (local_url) {
 		char *rtype = gf_xml_get_root_type(local_url, NULL);
 		if (rtype) {
-			Bool handled = 0;
+			Bool handled = GF_FALSE;
 			if (!strcmp(rtype, "MPD")) {
 				handled = 1;
 			}
@@ -447,7 +447,7 @@
 	if (current_time < availabilityStartTime) {
 		//if more than 1 sec consider we have a pb
 		if (availabilityStartTime - current_time >= 1000) {
-			Bool broken_timing = 1;
+			Bool broken_timing = GF_TRUE;
 #ifndef _WIN32_WCE
 			time_t gtime1, gtime2;
 			struct tm *t1, *t2;
@@ -700,15 +700,15 @@
 * \param mime the mime-type to check
 * \return true if mime-type if MPD-OK
 */
-static Bool gf_dash_is_dash_mime(const char * mime) {
+static Bool gf_dash_is_dash_mime(const char *mime) {
 	u32 i;
 	if (!mime)
-		return 0;
+		return GF_FALSE;
 	for (i = 0 ; GF_DASH_MPD_MIME_TYPES[i] ; i++) {
 		if ( !stricmp(mime, GF_DASH_MPD_MIME_TYPES[i]))
 			return 1;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 /*!
@@ -735,7 +735,7 @@
 GF_EXPORT
 GF_Err gf_dash_group_check_bandwidth(GF_DashClient *dash, u32 idx)
 {
-	Bool default_switch_mode = 0;
+	Bool default_switch_mode = GF_FALSE;
 	u32 download_rate, set_idx, time_since_start, done, tot_size, time_until_end;
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
 	if (!group) return GF_BAD_PARAM;
@@ -837,8 +837,8 @@
 GF_Err gf_dash_download_resource(GF_DASHFileIO *dash_io, GF_DASHFileIOSession *sess, const char *url, u64 start_range, u64 end_range, u32 persistent_mode, GF_DASH_Group *group)
 {
 	s32 group_idx = -1;
-	Bool had_sess = 0;
-	Bool retry = 1;
+	Bool had_sess = GF_FALSE;
+	Bool retry = GF_TRUE;
 	GF_Err e;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading %s starting at UTC "LLU" ms\n", url, gf_net_get_utc() ));
@@ -1013,7 +1013,7 @@
 static void gf_dash_get_segment_duration(GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set, GF_MPD_Period *period, GF_MPD *mpd, u32 *nb_segments, Double *max_seg_duration)
 {
 	Double mediaDuration;
-	Bool single_segment = 0;
+	Bool single_segment = GF_FALSE;
 	u32 timescale;
 	u64 duration;
 	GF_MPD_SegmentTimeline *timeline = NULL;
@@ -1040,7 +1040,7 @@
 			if (rep->segment_list->segment_URLs) segments = rep->segment_list->segment_URLs;
 			if (rep->segment_list->segment_timeline) timeline = rep->segment_list->segment_timeline;
 		}
-		if (! timescale) timescale=1;
+		if (!timescale) timescale=1;
 
 		if (timeline) {
 			gf_dash_get_timeline_duration(mpd, period, timeline, timescale, nb_segments, max_seg_duration);
@@ -1535,7 +1535,7 @@
 	char * purl;
 	Double timeline_start_time;
 	GF_MPD *new_mpd;
-	Bool fetch_only = 0;
+	Bool fetch_only = GF_FALSE;
 
 	if (!dash->mpd_dnload) {
 		local_url = purl = NULL;
@@ -1782,7 +1782,7 @@
 
 				for (i=0; i<gf_list_count(new_segments); i++) {
 					GF_MPD_SegmentURL *new_seg = gf_list_get(new_segments, i);
-					Bool found = 0;
+					Bool found = GF_FALSE;
 					for (j=0; j<gf_list_count(segments); j++) {
 						GF_MPD_SegmentURL *seg = gf_list_get(segments, j);
 						if (seg->media && new_seg->media && !strcmp(seg->media, new_seg->media)) {
@@ -1861,7 +1861,7 @@
 		if (new_mpd->availabilityStartTime != dash->mpd->availabilityStartTime) {
 			s64 diff = new_mpd->availabilityStartTime;
 			diff -= dash->mpd->availabilityStartTime;
-			if (diff < 0) diff = diff;
+			if (diff < 0) diff = -diff;
 			if (diff>3000)
 				gf_dash_group_timeline_setup(new_mpd, group, fetch_time);
 		}
@@ -1994,7 +1994,7 @@
 	u32 i, bandwidth, min_bandwidth;
 	GF_MPD_Representation *rep_sel = NULL;
 	GF_MPD_Representation *min_rep_sel = NULL;
-	Bool min_bandwidth_selected = 0;
+	Bool min_bandwidth_selected = GF_FALSE;
 	bandwidth = 0;
 	min_bandwidth = (u32) -1;
 
@@ -2045,32 +2045,12 @@
 }
 
 
-
-typedef enum
+static GF_Err gf_dash_resolve_url(GF_MPD *mpd, GF_MPD_Representation *rep, GF_DASH_Group *group, const char *mpd_url, GF_MPD_URLResolveType resolve_type, u32 item_index, char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration, Bool *is_in_base_url)
 {
-	GF_DASH_RESOLVE_URL_MEDIA,
-	GF_DASH_RESOLVE_URL_INIT,
-	GF_DASH_RESOLVE_URL_INDEX,
-	//same as GF_DASH_RESOLVE_URL_MEDIA but does not replace $Time$ and $Number$
-	GF_DASH_RESOLVE_URL_MEDIA_TEMPLATE,
-} GF_DASHURLResolveType;
-
-
-
-static GF_Err gf_dash_resolve_url(GF_MPD *mpd, GF_MPD_Representation *rep, GF_DASH_Group *group, const char *mpd_url, GF_DASHURLResolveType resolve_type, u32 item_index, char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration, Bool *is_in_base_url)
-{
-	GF_MPD_BaseURL *url_child;
-	GF_MPD_SegmentTimeline *timeline = NULL;
-	u32 start_number = 1;
+	GF_Err e;
 	GF_MPD_AdaptationSet *set = group->adaptation_set;
 	GF_MPD_Period *period = group->period;
 	u32 timescale;
-	char *url;
-	char *url_to_solve, *solved_template, *first_sep, *media_url;
-	char *init_template, *index_template;
-
-	*out_range_start = *out_range_end = 0;
-	*out_url = NULL;
 
 	if (!group->timeline_setup) {
 		gf_dash_group_timeline_setup(mpd, group, 0);
@@ -2078,352 +2058,14 @@
 		item_index = group->download_segment_index;
 	}
 
-	/*resolve base URLs from document base (download location) to representation (media)*/
-	url = gf_strdup(mpd_url);
-
-	url_child = gf_list_get(mpd->base_URLs, 0);
-	if (url_child) {
-		char *t_url = gf_url_concatenate(url, url_child->URL);
-		gf_free(url);
-		url = t_url;
-	}
-
-	url_child = gf_list_get(period->base_URLs, 0);
-	if (url_child) {
-		char *t_url = gf_url_concatenate(url, url_child->URL);
-		gf_free(url);
-		url = t_url;
-	}
-
-	url_child = gf_list_get(set->base_URLs, 0);
-	if (url_child) {
-		char *t_url = gf_url_concatenate(url, url_child->URL);
-		gf_free(url);
-		url = t_url;
-	}
-
-	url_child = gf_list_get(rep->base_URLs, 0);
-	if (url_child) {
-		char *t_url = gf_url_concatenate(url, url_child->URL);
-		gf_free(url);
-		url = t_url;
-	}
-
 	gf_dash_resolve_duration(rep, set, period, segment_duration, &timescale, NULL, NULL);
-	*segment_duration = (resolve_type==GF_DASH_RESOLVE_URL_MEDIA) ? (u32) ((Double) ((*segment_duration) * 1000.0) / timescale) : 0;
-
-	/*single URL*/
-//	if (rep->segment_base || set->segment_base || period->segment_base) {
-	if (!rep->segment_list && !set->segment_list && !period->segment_list && !rep->segment_template && !set->segment_template && !period->segment_template) {
-		GF_MPD_URL *res_url;
-		GF_MPD_SegmentBase *base_seg = NULL;
-		if (item_index > 0)
-			return GF_EOS;
-		switch (resolve_type) {
-		case GF_DASH_RESOLVE_URL_MEDIA:
-		case GF_DASH_RESOLVE_URL_MEDIA_TEMPLATE:
-			if (!url) return GF_NON_COMPLIANT_BITSTREAM;
-			*out_url = url;
-			return GF_OK;
-		case GF_DASH_RESOLVE_URL_INIT:
-		case GF_DASH_RESOLVE_URL_INDEX:
-			res_url = NULL;
-			base_seg = rep->segment_base;
-			if (!base_seg) base_seg = set->segment_base;
-			if (!base_seg) base_seg = period->segment_base;
-
-			if (base_seg) {
-				if (resolve_type == GF_DASH_RESOLVE_URL_INDEX) {
-					res_url = base_seg->representation_index;
-				} else {
-					res_url = base_seg->initialization_segment;
-				}
-			}
-			if (is_in_base_url) *is_in_base_url = 0;
-			/*no initialization segment / index, use base URL*/
-			if (res_url && res_url->sourceURL) {
-				*out_url = gf_url_concatenate(url, res_url->sourceURL);
-				gf_free(url);
-			} else {
-				*out_url = url;
-				if (is_in_base_url) *is_in_base_url = 1;
-			}
-			if (res_url && res_url->byte_range) {
-				*out_range_start = res_url->byte_range->start_range;
-				*out_range_end = res_url->byte_range->end_range;
-			} else if (base_seg && base_seg->index_range && (resolve_type == GF_DASH_RESOLVE_URL_INDEX)) {
-				*out_range_start = base_seg->index_range->start_range;
-				*out_range_end = base_seg->index_range->end_range;
-			}
-			return GF_OK;
-		default:
-			break;
-		}
-		gf_free(url);
-		return GF_BAD_PARAM;
-	}
-
-	/*segmentList*/
-	if (rep->segment_list || set->segment_list || period->segment_list) {
-		GF_MPD_URL *init_url, *index_url;
-		GF_MPD_SegmentURL *segment;
-		GF_List *segments = NULL;
-		u32 segment_count;
-
-		init_url = index_url = NULL;
-
-		/*apply inheritance of attributes, lowest level having preceedence*/
-		if (period->segment_list) {
-			if (period->segment_list->initialization_segment) init_url = period->segment_list->initialization_segment;
-			if (period->segment_list->representation_index) index_url = period->segment_list->representation_index;
-			if (period->segment_list->segment_URLs) segments = period->segment_list->segment_URLs;
-			if (period->segment_list->start_number != (u32) -1) start_number = period->segment_list->start_number;
-			if (period->segment_list->segment_timeline) timeline = period->segment_list->segment_timeline;
-		}
-		if (set->segment_list) {
-			if (set->segment_list->initialization_segment) init_url = set->segment_list->initialization_segment;
-			if (set->segment_list->representation_index) index_url = set->segment_list->representation_index;
-			if (set->segment_list->segment_URLs) segments = set->segment_list->segment_URLs;
-			if (set->segment_list->start_number != (u32) -1) start_number = set->segment_list->start_number;
-			if (set->segment_list->segment_timeline) timeline = set->segment_list->segment_timeline;
-		}
-		if (rep->segment_list) {
-			if (rep->segment_list->initialization_segment) init_url = rep->segment_list->initialization_segment;
-			if (rep->segment_list->representation_index) index_url = rep->segment_list->representation_index;
-			if (rep->segment_list->segment_URLs) segments = rep->segment_list->segment_URLs;
-			if (rep->segment_list->start_number != (u32) -1) start_number = rep->segment_list->start_number;
-			if (rep->segment_list->segment_timeline) timeline = rep->segment_list->segment_timeline;
-		}
-
-
-		segment_count = gf_list_count(segments);
-
-		switch (resolve_type) {
-		case GF_DASH_RESOLVE_URL_INIT:
-			if (init_url) {
-				if (init_url->sourceURL) {
-					*out_url = gf_url_concatenate(url, init_url->sourceURL);
-					gf_free(url);
-				} else {
-					*out_url = url;
-				}
-				if (init_url->byte_range) {
-					*out_range_start = init_url->byte_range->start_range;
-					*out_range_end = init_url->byte_range->end_range;
-				}
-			} else {
-				gf_free(url);
-			}
-			return GF_OK;
-		case GF_DASH_RESOLVE_URL_MEDIA:
-		case GF_DASH_RESOLVE_URL_MEDIA_TEMPLATE:
-			if (!url) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Media URL is not set in segment list\n"));
-				return GF_SERVICE_ERROR;
-			}
-			if ((item_index >= segment_count) || ((s32) item_index < 0)) {
-				gf_free(url);
-				return GF_EOS;
-			}
-			*out_url = url;
-			segment = gf_list_get(segments, item_index);
-			if (segment->media) {
-				*out_url = gf_url_concatenate(url, segment->media);
-				gf_free(url);
-			}
-			if (segment->media_range) {
-				*out_range_start = segment->media_range->start_range;
-				*out_range_end = segment->media_range->end_range;
-			}
-			if (segment->duration) {
-				*segment_duration = (u32) ((Double) (segment->duration) * 1000.0 / timescale);
-			}
-			return GF_OK;
-		case GF_DASH_RESOLVE_URL_INDEX:
-			if (item_index >= segment_count) {
-				gf_free(url);
-				return GF_EOS;
-			}
-			*out_url = url;
-			segment = gf_list_get(segments, item_index);
-			if (segment->index) {
-				*out_url = gf_url_concatenate(url, segment->index);
-				gf_free(url);
-			}
-			if (segment->index_range) {
-				*out_range_start = segment->index_range->start_range;
-				*out_range_end = segment->index_range->end_range;
-			}
-			return GF_OK;
-		default:
-			break;
-		}
-		gf_free(url);
-		return GF_BAD_PARAM;
-	}
-
-	/*segmentTemplate*/
-	media_url = init_template = index_template = NULL;
-
-	/*apply inheritance of attributes, lowest level having preceedence*/
-	if (period->segment_template) {
-		if (period->segment_template->initialization) init_template = period->segment_template->initialization;
-		if (period->segment_template->index) index_template = period->segment_template->index;
-		if (period->segment_template->media) media_url = period->segment_template->media;
-		if (period->segment_template->start_number != (u32) -1) start_number = period->segment_template->start_number;
-		if (period->segment_template->segment_timeline) timeline = period->segment_template->segment_timeline;
-	}
-	if (set->segment_template) {
-		if (set->segment_template->initialization) init_template = set->segment_template->initialization;
-		if (set->segment_template->index) index_template = set->segment_template->index;
-		if (set->segment_template->media) media_url = set->segment_template->media;
-		if (set->segment_template->start_number != (u32) -1) start_number = set->segment_template->start_number;
-		if (set->segment_template->segment_timeline) timeline = set->segment_template->segment_timeline;
-	}
-	if (rep->segment_template) {
-		if (rep->segment_template->initialization) init_template = rep->segment_template->initialization;
-		if (rep->segment_template->index) index_template = rep->segment_template->index;
-		if (rep->segment_template->media) media_url = rep->segment_template->media;
-		if (rep->segment_template->start_number != (u32) -1) start_number = rep->segment_template->start_number;
-		if (rep->segment_template->segment_timeline) timeline = rep->segment_template->segment_timeline;
-	}
-
-	/*offset the start_number with the number of discarded segments (no longer in our lists)*/
-	start_number += group->nb_segments_purged;
+	*segment_duration = (resolve_type==GF_MPD_RESOLVE_URL_MEDIA) ? (u32) ((Double) ((*segment_duration) * 1000.0) / timescale) : 0;
 
-	if (!media_url) {
-		GF_MPD_BaseURL *base = gf_list_get(rep->base_URLs, 0);
-		if (!base) return GF_BAD_PARAM;
-		media_url = base->URL;
-	}
-	url_to_solve = NULL;
-	switch (resolve_type) {
-	case GF_DASH_RESOLVE_URL_INIT:
-		url_to_solve = init_template;
-		break;
-	case GF_DASH_RESOLVE_URL_MEDIA:
-	case GF_DASH_RESOLVE_URL_MEDIA_TEMPLATE:
-		url_to_solve = media_url;
-		break;
-	case GF_DASH_RESOLVE_URL_INDEX:
-		url_to_solve = index_template;
-		break;
-	default:
-		gf_free(url);
-		return GF_BAD_PARAM;
+	e = gf_mpd_resolve_url(mpd, rep, set, period, mpd_url, resolve_type, item_index, group->nb_segments_purged, out_url, out_range_start, out_range_end, segment_duration, is_in_base_url);
+	if (e == GF_NON_COMPLIANT_BITSTREAM) {
+		group->selection = GF_DASH_GROUP_NOT_SELECTABLE;
 	}
-	if (!url_to_solve) {
-		gf_free(url);
-		return GF_OK;
-	}
-	/*let's solve the template*/
-	solved_template = gf_malloc(sizeof(char)*(strlen(url_to_solve) + (rep->id ? strlen(rep->id) : 0) ) * 2 );
-	solved_template[0] = 0;
-	strcpy(solved_template, url_to_solve);
-	first_sep = strchr(solved_template, '$');
-	if (first_sep) first_sep[0] = 0;
-
-	first_sep = strchr(url_to_solve, '$');
-	while (first_sep) {
-		char szPrintFormat[50];
-		char szFormat[100];
-		char *format_tag;
-		char *second_sep = strchr(first_sep+1, '$');
-		if (!second_sep) {
-			gf_free(url);
-			gf_free(solved_template);
-			return GF_NON_COMPLIANT_BITSTREAM;
-		}
-		second_sep[0] = 0;
-		format_tag = strchr(first_sep+1, '%');
-
-		if (format_tag) {
-			strcpy(szPrintFormat, format_tag);
-			format_tag[0] = 0;
-			if (!strchr(szPrintFormat, 'd') && !strchr(szPrintFormat, 'i') && !strchr(szPrintFormat, 'u'))
-				strcat(szPrintFormat, "d");
-		} else {
-			strcpy(szPrintFormat, "%d");
-		}
-		/* identifier is $$ -> replace by $*/
-		if (!strlen(first_sep+1)) {
-			strcat(solved_template, "$");
-		}
-		else if (!strcmp(first_sep+1, "RepresentationID")) {
-			strcat(solved_template, rep->id);
-		}
-		else if (!strcmp(first_sep+1, "Number")) {
-			if (resolve_type==GF_DASH_RESOLVE_URL_MEDIA_TEMPLATE) {
-				strcat(solved_template, "$Number$");
-			} else {
-				sprintf(szFormat, szPrintFormat, start_number + item_index);
-				strcat(solved_template, szFormat);
-			}
-		}
-		else if (!strcmp(first_sep+1, "Index")) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Wrong template identifier Index detected - using Number instead\n\n"));
-			sprintf(szFormat, szPrintFormat, start_number + item_index);
-			strcat(solved_template, szFormat);
-		}
-		else if (!strcmp(first_sep+1, "Bandwidth")) {
-			sprintf(szFormat, szPrintFormat, rep->bandwidth);
-			strcat(solved_template, szFormat);
-		}
-		else if (!strcmp(first_sep+1, "Time")) {
-			if (resolve_type==GF_DASH_RESOLVE_URL_MEDIA_TEMPLATE) {
-				strcat(solved_template, "$Time$");
-			} else if (timeline) {
-				/*uses segment timeline*/
-				u32 k, nb_seg, cur_idx, nb_repeat;
-				u64 time, start_time;
-				nb_seg = gf_list_count(timeline->entries);
-				cur_idx = 0;
-				start_time=0;
-				for (k=0; k<nb_seg; k++) {
-					GF_MPD_SegmentTimelineEntry *ent = gf_list_get(timeline->entries, k);
-					if (item_index>cur_idx+ent->repeat_count) {
-						cur_idx += 1 + ent->repeat_count;
-						if (ent->start_time) start_time = ent->start_time;
-
-						start_time += ent->duration * (1 + ent->repeat_count);
-						continue;
-					}
-					*segment_duration = ent->duration;
-					*segment_duration = (u32) ((Double) (*segment_duration) * 1000.0 / timescale);
-					nb_repeat = item_index - cur_idx;
-					time = ent->start_time ? ent->start_time : start_time;
-					time += nb_repeat * ent->duration;
-
-					/*replace final 'd' with LLD (%lld or I64d)*/
-					szPrintFormat[strlen(szPrintFormat)-1] = 0;
-					strcat(szPrintFormat, &LLD[1]);
-					sprintf(szFormat, szPrintFormat, time);
-					strcat(solved_template, szFormat);
-					break;
-				}
-			}
-		}
-		else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unknown template identifier %s - disabling rep\n\n", first_sep+1));
-			*out_url = NULL;
-			gf_free(url);
-			gf_free(solved_template);
-			group->selection = GF_DASH_GROUP_NOT_SELECTABLE;
-			return GF_NON_COMPLIANT_BITSTREAM;
-		}
-		if (format_tag) format_tag[0] = '%';
-		second_sep[0] = '$';
-		/*look for next keyword - copy over remaining text if any*/
-		first_sep = strchr(second_sep+1, '$');
-		if (first_sep) first_sep[0] = 0;
-		if (strlen(second_sep+1))
-			strcat(solved_template, second_sep+1);
-		if (first_sep) first_sep[0] = '$';
-	}
-	*out_url = gf_url_concatenate(url, solved_template);
-	gf_free(url);
-	gf_free(solved_template);
-	return GF_OK;
+	return e;
 }
 
 static GF_Err gf_dash_download_init_segment(GF_DashClient *dash, GF_DASH_Group *group)
@@ -2439,7 +2081,7 @@
 		return GF_BAD_PARAM;
 	gf_mx_p(dash->dl_mutex);
 
-	assert( group->adaptation_set && group->adaptation_set->representations );
+	assert(group->adaptation_set && group->adaptation_set->representations);
 	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
 	if (!rep) {
 		gf_mx_v(dash->dl_mutex);
@@ -2448,7 +2090,7 @@
 	}
 	start_range = end_range = 0;
 
-	e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_INIT, 0, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
+	e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
 	if (e) {
 		gf_mx_v(dash->dl_mutex);
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to resolve initialization URL: %s\n", gf_error_to_string(e) ));
@@ -2458,7 +2100,7 @@
 	/*no error and no init segment, go for media segment - this is needed for TS so that the set of media streams can be
 	declared to the player */
 	if (!base_init_url) {
-		e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_MEDIA, group->download_segment_index, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
+		e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_MEDIA, group->download_segment_index, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
 		if (e) {
 			gf_mx_v(dash->dl_mutex);
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to resolve media URL: %s\n", gf_error_to_string(e) ));
@@ -2506,7 +2148,7 @@
 				if (a_rep==rep) continue;
 				if (a_rep->playback.disabled) continue;
 
-				e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_DASH_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur, NULL);
+				e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur, NULL);
 				if (!e && a_base_init_url) {
 					a_rep->playback.cached_init_segment_url = a_base_init_url;
 					a_rep->playback.init_start_range = a_start;
@@ -2536,14 +2178,12 @@
 	}
 
 
-	if (e == GF_URL_ERROR && !base_init_url && !group->download_abort_type) { /* We have a 404 and started with segments */
+	if ((e==GF_URL_ERROR) && base_init_url && !group->download_abort_type) { /* We have a 404 and started with segments */
 		/* It is possible that the first segment has been deleted while we made the first request...
-		* so we try with the next segment on some M3U8 servers */
-
+		 * so we try with the next segment on some M3U8 servers */
 		gf_free(base_init_url);
-
-		e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_MEDIA, group->download_segment_index + 1, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
-		if (!e) {
+		e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_MEDIA, group->download_segment_index + 1, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
+		if (e != GF_OK) {
 			gf_mx_v(dash->dl_mutex);
 			return e;
 		}
@@ -2598,7 +2238,7 @@
 		}
 
 		if (stricmp(mime, mime_type)) {
-			Bool valid = 0;
+			Bool valid = GF_FALSE;
 			char *stype1, *stype2;
 			stype1 = strchr(mime_type, '/');
 			stype2 = strchr(mime, '/');
@@ -2663,7 +2303,7 @@
 				if (a_rep==rep) continue;
 				if (a_rep->playback.disabled) continue;
 
-				e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_DASH_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur, NULL);
+				e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur, NULL);
 				if (!e && a_base_init_url) {
 					e = gf_dash_download_resource(dash->dash_io, &(group->segment_download), a_base_init_url, a_start, a_end, 1, group);
 
@@ -2800,7 +2440,7 @@
 	for (i=0; i<count; i++) {
 		Double seg_dur;
 		GF_DASH_Group *group;
-		Bool found = 0;
+		Bool found = GF_FALSE;
 		Bool has_dependent_representations = GF_FALSE;
 		GF_MPD_AdaptationSet *set = gf_list_get(period->adaptation_sets, i);
 		for (j=0; j<gf_list_count(dash->groups); j++) {
@@ -3134,16 +2774,16 @@
 		char *sidx_file = NULL;
 		u64 duration, index_start_range, index_end_range, init_start_range, init_end_range;
 		Bool index_in_base, init_in_base;
-		Bool init_needs_byte_range = 0;
-		Bool has_seen_sidx = 0;
-		Bool is_isom = 1;
+		Bool init_needs_byte_range = GF_FALSE;
+		Bool has_seen_sidx = GF_FALSE;
+		Bool is_isom = GF_TRUE;
 		rep = gf_list_get(group->adaptation_set->representations, i);
 
-		index_in_base = init_in_base = 0;
-		e = gf_dash_resolve_url(group->dash->mpd, rep, group, group->dash->base_url, GF_DASH_RESOLVE_URL_INIT, 0, &init_url, &init_start_range, &init_end_range, &duration, &init_in_base);
+		index_in_base = init_in_base = GF_FALSE;
+		e = gf_dash_resolve_url(group->dash->mpd, rep, group, group->dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &init_url, &init_start_range, &init_end_range, &duration, &init_in_base);
 		if (e) goto exit;
 
-		e = gf_dash_resolve_url(group->dash->mpd, rep, group, group->dash->base_url, GF_DASH_RESOLVE_URL_INDEX, 0, &index_url, &index_start_range, &index_end_range, &duration, &index_in_base);
+		e = gf_dash_resolve_url(group->dash->mpd, rep, group, group->dash->base_url, GF_MPD_RESOLVE_URL_INDEX, 0, &index_url, &index_start_range, &index_end_range, &duration, &index_in_base);
 		if (e) goto exit;
 
 
@@ -3210,10 +2850,10 @@
 
 				cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, group->segment_download);
 				if (init_in_base) {
+					char szName[100];
 					GF_SAFEALLOC(rep->segment_list->initialization_segment, GF_MPD_URL);
 					//we need to store the init segment since it has the same name as the rest of the segments and will be destroyed when cleaning up the cache ..
 					if (!strnicmp(cache_name, "gmem://", 7)) {
-						char szName[100];
 						char *mem_address;
 						if (sscanf(cache_name, "gmem://%d@%p", &rep->playback.init_segment_size, &mem_address) != 2) {
 							e = GF_IO_ERR;
@@ -3224,14 +2864,29 @@
 
 						sprintf(szName, "gmem://%d@%p", rep->playback.init_segment_size, rep->playback.init_segment_data);
 						rep->segment_list->initialization_segment->sourceURL = gf_strdup(szName);
-						cache_name = rep->segment_list->initialization_segment->sourceURL;
-						//cleanup cache right away
-						group->dash->dash_io->delete_cache_file(group->dash->dash_io, group->segment_download, init_url);
-
 					} else {
-						rep->segment_list->initialization_segment->sourceURL = gf_strdup(cache_name);
+						FILE *t = fopen(cache_name, "rb");
+						if (t) {
+							u32 res;
+							fseek(t, 0, SEEK_END);
+							rep->playback.init_segment_size = ftell(t);
+							fseek(t, 0, SEEK_SET);
+
+							rep->playback.init_segment_data = gf_malloc(sizeof(char) * rep->playback.init_segment_size);
+							res = (u32) fread(rep->playback.init_segment_data, sizeof(char), rep->playback.init_segment_size, t);
+							if (res != rep->playback.init_segment_size) {
+								GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Failed to store init segment\n"));
+							} else {
+								sprintf(szName, "gmem://%d@%p", rep->playback.init_segment_size, rep->playback.init_segment_data);
+								rep->segment_list->initialization_segment->sourceURL = gf_strdup(szName);
+							}
+						}
 					}
 
+					cache_name = rep->segment_list->initialization_segment->sourceURL;
+					//cleanup cache right away
+					group->dash->dash_io->delete_cache_file(group->dash->dash_io, group->segment_download, init_url);
+
 				}
 				if (index_in_base) {
 					sidx_file = (char *)cache_name;
@@ -3397,8 +3052,8 @@
 		u32 active_rep, nb_rep;
 		const char *mime_type;
 		u32 nb_rep_ok = 0;
-		Bool disabled = 0;
-		Bool cp_supported = 0;
+		Bool disabled = GF_FALSE;
+		Bool cp_supported = GF_FALSE;
 		GF_DASH_Group *group = gf_list_get(dash->groups, group_i);
 
 		if ((dash->debug_group_index>=0) && (group_i != (u32) dash->debug_group_index)) {
@@ -3576,7 +3231,7 @@
 {
 	Double bitrate, time, speed;
 	u32 k, dl_rate;
-	Bool go_up = 0;
+	Bool go_up = GF_FALSE;
 	u32 nb_inter_rep = 0;
 	GF_MPD_Representation *new_rep;
 	u32 total_size, bytes_per_sec;
@@ -3589,7 +3244,7 @@
 
 	if (/*(!group->buffering || !group->min_bandwidth_selected) && */ total_size && bytes_per_sec && group->current_downloaded_segment_duration) {
 	} else {
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Downloaded segment %s %d bytes at %d bytes per seconds - skiping rate adaptation\n", dash->dash_io->get_url(dash->dash_io, group->segment_download), total_size, bytes_per_sec));
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Downloaded segment %s %d bytes at %d bytes per seconds - skipping rate adaptation\n", dash->dash_io->get_url(dash->dash_io, group->segment_download), total_size, bytes_per_sec));
 		return;
 	}
 
@@ -3640,7 +3295,7 @@
 	}
 
 	if (!dash->disable_switching && new_rep && (new_rep!=rep)) {
-		Bool do_switch = 1;
+		Bool do_switch = GF_TRUE;
 		//if we're switching to the next upper bitrate (no intermediate bitrates), do not immediately switch
 		//but for a given number of segments - this avoids fluctuation in the quality
 		if (go_up && ! nb_inter_rep) {
@@ -3666,8 +3321,13 @@
 
 static void gf_dash_group_check_time(GF_DASH_Group *group)
 {
-	s64 check_time = (s64) gf_net_get_utc();
-	u32 nb_droped = 0;
+	s64 check_time;
+	u32 nb_droped;
+	
+	if (group->dash->is_m3u8) return;
+	
+	check_time = (s64) gf_net_get_utc();
+	nb_droped = 0;
 
 	while (1) {
 		u32 seg_dur_ms;
@@ -3684,7 +3344,7 @@
 			group->dash->tsb_exceeded = (u32) -1;
 			return;
 		}
-		if (now>group->time_shift_buffer_depth) {
+		if (((s32) group->time_shift_buffer_depth > 0) && (now > group->time_shift_buffer_depth)) {
 			group->download_segment_index ++;
 			nb_droped ++;
 			group->dash->time_in_tsb = 0;
@@ -3711,9 +3371,9 @@
 	GF_DashClient *dash = (GF_DashClient*) par;
 	GF_MPD_Representation *rep;
 	u32 i, group_count, ret = 0;
-	Bool go_on = 1;
+	Bool go_on = GF_TRUE;
 	u32 min_wait = 0;
-	Bool first_period_in_mpd = 1;
+	Bool first_period_in_mpd = GF_TRUE;
 	char *new_base_seg_url;
 	assert(dash);
 	if (!dash->mpd) {
@@ -3810,8 +3470,8 @@
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updated MPD in %d ms\n", diff));
 				}
 			} else {
-				Bool all_groups_done = 1;
-				Bool cache_full = 1;
+				Bool all_groups_done = GF_TRUE;
+				Bool cache_full = GF_TRUE;
 
 				/*wait if nothing is ready to be downloaded*/
 				if (min_wait>1) {
@@ -3892,7 +3552,7 @@
 		for (i=0; i<group_count; i++) {
 			//commented out as we end up doing too many requets
 #if 0
-			Bool in_segment_avail_time=0;
+			Bool in_segment_avail_time = GF_FALSE;
 #endif
 			u64 start_range, end_range;
 			Bool use_byterange;
@@ -4043,7 +3703,7 @@
 
 
 			/* At this stage, there are some segments left to be downloaded */
-			e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_MEDIA, group->download_segment_index, &new_base_seg_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
+			e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_MEDIA, group->download_segment_index, &new_base_seg_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
 			gf_mx_v(dash->dl_mutex);
 			if (e) {
 				/*do something!!*/
@@ -4194,8 +3854,8 @@
 				gf_mx_p(dash->dl_mutex);
 
 				assert(group->nb_cached_segments<group->max_cached_segments);
-				assert( local_file_name );
-				if (! empty_file) {
+				assert(local_file_name);
+				if (!empty_file) {
 
 					group->cached[group->nb_cached_segments].cache = gf_strdup(local_file_name);
 					group->cached[group->nb_cached_segments].url = gf_strdup( resource_name );
@@ -4297,11 +3957,11 @@
 static void gf_dash_download_stop(GF_DashClient *dash)
 {
 	u32 i;
-	assert( dash );
+	assert(dash);
 	if (dash->groups) {
 		for (i=0; i<gf_list_count(dash->groups); i++) {
 			GF_DASH_Group *group = gf_list_get(dash->groups, i);
-			assert( group );
+			assert(group);
 			if ((group->selection == GF_DASH_GROUP_SELECTED) && group->segment_download) {
 				if (group->segment_download)
 					dash->dash_io->abort(dash->dash_io, group->segment_download);
@@ -4520,7 +4180,7 @@
 	GF_Err e;
 	GF_MPD_Period *period;
 	GF_DOMParser *mpd_parser;
-	Bool is_local = 0;
+	Bool is_local = GF_FALSE;
 
 	if (!dash || !manifest_url) return GF_BAD_PARAM;
 
@@ -4549,7 +4209,7 @@
 		local_url = manifest_url + 7;
 		is_local = 1;
 		if (strstr(manifest_url, ".m3u8")) {
-			dash->is_m3u8 = 1;
+			dash->is_m3u8 = GF_TRUE;
 		}
 	} else if (strstr(manifest_url, "://")) {
 		const char *reloc_url, *mtype;
@@ -4703,8 +4363,7 @@
 GF_EXPORT
 void gf_dash_close(GF_DashClient *dash)
 {
-	assert( dash );
-
+	assert(dash);
 	gf_dash_download_stop(dash);
 
 	gf_mx_p(dash->dl_mutex);
@@ -5019,6 +4678,11 @@
 }
 
 GF_EXPORT
+Bool gf_dash_is_m3u8(GF_DashClient *dash) {
+	return dash->is_m3u8;
+}
+
+GF_EXPORT
 const char *gf_dash_group_get_segment_mime(GF_DashClient *dash, u32 idx)
 {
 	GF_MPD_Representation *rep;
@@ -5053,7 +4717,7 @@
 GF_EXPORT
 void gf_dash_group_select(GF_DashClient *dash, u32 idx, Bool select)
 {
-	Bool needs_resetup = 0;
+	Bool needs_resetup = GF_FALSE;
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
 	if (!group) return;
 	if (group->selection == GF_DASH_GROUP_NOT_SELECTABLE)
@@ -5123,7 +4787,7 @@
 			//check we didn't select one AS in this group in the previous pass or in this pass
 			if (group->adaptation_set->group>=0) {
 				u32 k;
-				Bool found = 0;
+				Bool found = GF_FALSE;
 				for (k=0; k<gf_list_count(groups_selected); k++) {
 					GF_DASH_Group *ag = gf_list_get(groups_selected, k);
 
@@ -5241,10 +4905,10 @@
 			if (!group->local_files && !dash->keep_files)
 				dash->dash_io->delete_cache_file(dash->dash_io, group->segment_download, group->urlToDeleteNext);
 
-			gf_free( group->urlToDeleteNext);
+			gf_free(group->urlToDeleteNext);
 			group->urlToDeleteNext = NULL;
 		}
-		assert( group->cached[0].url );
+		assert(group->cached[0].url);
 
 		if (group->dont_delete_first_segment) {
 			group->dont_delete_first_segment = 0;
@@ -5424,7 +5088,7 @@
 GF_EXPORT
 void gf_dash_seek(GF_DashClient *dash, Double start_range)
 {
-	Bool is_dynamic = 0;
+	Bool is_dynamic = GF_FALSE;
 	gf_mx_p(dash->dl_mutex);
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Seek request - playing from %g\n", start_range));
@@ -5569,7 +5233,7 @@
 		for (j=0; j<gf_list_count(group->adaptation_set->representations); j++) {
 			GF_Err e;
 			rep = gf_list_get(group->adaptation_set->representations, j);
-			e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_MEDIA_TEMPLATE, i, &seg_url, &start_range, &end_range, &current_dur, NULL);
+			e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE, i, &seg_url, &start_range, &end_range, &current_dur, NULL);
 			if (e)
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to resolve media template URL: %s\n", gf_error_to_string(e)));
 
@@ -5718,7 +5382,7 @@
 		return GF_OK;
 	}
 
-	//TODO segment list adressing:
+	//TODO segment list addressing:
 	return GF_OK;
 }

gpac-0.5.1.svn5491.tar.xz/src/media_tools/dash_segmenter.c -> gpac-0.5.1.svn5619.tar.xz/src/media_tools/dash_segmenter.c Changed

@@ -540,7 +540,7 @@
 	u64 presentationTimeOffset = 0;
 	Double segment_start_time, file_duration, period_duration, max_segment_duration;
 	u32 nb_segments, width, height, sample_rate, nb_channels, sar_w, sar_h, fps_num, fps_denum, startNumber;
-	char *langCode;
+	char *langCode = NULL;
 	u32 index_start_range, index_end_range;
 	Bool force_switch_segment = GF_FALSE;
 	Bool switch_segment = GF_FALSE;
@@ -734,7 +734,7 @@
 		if (dash_input->single_track_num && ((i+1) != dash_input->single_track_num))
 			continue;
 
-		if (! dash_moov_setup) {
+		if (!dash_moov_setup) {
 			e = gf_isom_clone_track(input, i+1, output, GF_FALSE, &TrackNum);
 			if (e) goto err_exit;
 
@@ -1266,7 +1266,7 @@
 				if (next) {
 					defaultDuration = (u32) (next->DTS - sample->DTS);
 				} else {
-					defaultDuration = (u32) (gf_isom_get_media_duration(input, tf->OriginalTrack)- sample->DTS);
+					defaultDuration = (u32) (gf_isom_get_media_duration(input, tf->OriginalTrack) - sample->DTS);
 				}
 
 				if (tf->splitable) {
@@ -1276,6 +1276,7 @@
 						if (SegmentDuration + frag_dur > MaxSegmentDuration) {
 							split_sample_duration = defaultDuration;
 							defaultDuration = (u32) (tf->TimeScale * (MaxSegmentDuration - SegmentDuration) / dash_cfg->dash_scale - tf->FragmentLength);
+							assert(defaultDuration);
 							split_sample_duration -= defaultDuration;
 							nb_samp++;
 						}
@@ -1296,9 +1297,9 @@
 				}
 
 				if (tf==tfref) {
-					if (segments_start_with_sap && first_sample_in_segment ) {
+					if (segments_start_with_sap && first_sample_in_segment) {
 						first_sample_in_segment = GF_FALSE;
-						if (! SAP_type) segments_start_with_sap = GF_FALSE;
+						if (!SAP_type) segments_start_with_sap = GF_FALSE;
 					}
 					if (ref_track_first_dts > sample->DTS)
 						ref_track_first_dts = sample->DTS;
@@ -1421,7 +1422,7 @@
 					stop_frag = GF_TRUE;
 				} else if (tf==tfref) {
 					/*fragmenting on "clock" track: no drift control*/
-					if (!dash_cfg->fragments_start_with_rap || ( (next && next->IsRAP) || split_at_rap) ) {
+					if (!dash_cfg->fragments_start_with_rap || ( tf->splitable && split_sample_duration ) || ( (next && next->IsRAP) || split_at_rap) ) {
 						if (tf->FragmentLength * dash_cfg->dash_scale >= MaxFragmentDuration * tf->TimeScale) {
 							stop_frag = GF_TRUE;
 						}
@@ -1482,9 +1483,10 @@
 #endif
 
 		if (force_switch_segment || ((SegmentDuration >= MaxSegmentDuration) && (!split_seg_at_rap || next_sample_rap || tf->splitable))) {
-
-			if (!min_seg_dur || (min_seg_dur>SegmentDuration)) min_seg_dur = SegmentDuration;
-			if (max_seg_dur < SegmentDuration) max_seg_dur = SegmentDuration;
+			if (!min_seg_dur || (min_seg_dur>SegmentDuration))
+				min_seg_dur = SegmentDuration;
+			if (max_seg_dur < SegmentDuration)
+				max_seg_dur = SegmentDuration;			
 			total_seg_dur += SegmentDuration;
 
 			if (mpd_timeline_bs) {
@@ -1596,10 +1598,8 @@
 	if (!switch_segment) {
 		u64 idx_start_range, idx_end_range;
 
-		if (!min_seg_dur || (min_seg_dur>SegmentDuration)) min_seg_dur = SegmentDuration;
-		if (max_seg_dur < SegmentDuration) max_seg_dur = SegmentDuration;
 		total_seg_dur += SegmentDuration;
-
+		
 		segment_start_time += SegmentDuration;
 
 		gf_isom_close_segment(output, dash_cfg->subsegs_per_sidx, ref_track_id, ref_track_first_dts, tfref ? tfref->media_time_to_pres_time_shift : tf->media_time_to_pres_time_shift, ref_track_next_cts, dash_cfg->daisy_chain_sidx, 1, dash_cfg->segment_marker_4cc, &idx_start_range, &idx_end_range);
@@ -1769,7 +1769,6 @@
 			if (!sar_h) sar_h = 1;
 			fprintf(dash_cfg->mpd, " sar=\"%d:%d\"", sar_w, sar_h);
 		}
-
 	}
 	if (sample_rate) fprintf(dash_cfg->mpd, " audioSamplingRate=\"%d\"", sample_rate);
 	if (segments_start_with_sap || split_seg_at_rap) {
@@ -2257,6 +2256,7 @@
 					switch (stype1) {
 					case GF_ISOM_SUBTYPE_AVC_H264:
 					case GF_ISOM_SUBTYPE_AVC2_H264:
+					case GF_ISOM_SUBTYPE_MPEG4_CRYP:
 						if (use_avc3)
 							merge_mode = 2;
 						break;
@@ -2333,6 +2333,7 @@
 							gf_isom_hevc_set_inband_config(init_seg, track, 1);
 							use_hevc = GF_TRUE;
 							gf_isom_set_brand_info(init_seg, GF_4CC('i','s','o','6'), 1);
+							sps_merge_failed = 0;
 							break;
 						case GF_ISOM_SUBTYPE_AVC_H264:
 						case GF_ISOM_SUBTYPE_AVC2_H264:
@@ -2340,6 +2341,7 @@
 							gf_isom_avc_set_inband_config(init_seg, track, 1);
 							use_avc3 = GF_TRUE;
 							gf_isom_set_brand_info(init_seg, GF_4CC('i','s','o','6'), 1);
+							sps_merge_failed = 0;
 							break;
 						}
 						goto retry_track;
@@ -2422,7 +2424,7 @@
 			}
 
 			if (!dash_opts->pssh_moof) {
-				e = gf_isom_clone_pssh(init_seg, in, GF_TRUE);
+				e = gf_isom_clone_pssh(init_seg, in, GF_FALSE);
 			}
 		}
 		gf_isom_close(in);
@@ -2434,7 +2436,7 @@
 		gf_delete_file(szInitName);
 		return GF_OK;
 	} else if (sps_merge_failed) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Couldnt merge AVC|H264 SPS from different files (same SPS ID used) - different sample descriptions will be used\n"));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Could not merge AVC|H264 SPS from different files (same SPS ID used) - disabling bitstream switching\n"));
 		*disable_bs_switching = GF_TRUE;
 		gf_isom_delete(init_seg);
 		gf_delete_file(szInitName);
@@ -4010,7 +4012,8 @@
 		gf_media_reduce_aspect_ratio(&max_width, &max_height);
 		fprintf(mpd, " par=\"%d:%d\"", max_width, max_height);
 	}
-	if (szLang && strcmp(szLang, "und")) {
+	//add lang even if "und" to comply with dash-if 
+	if (szLang) {
 		fprintf(mpd, " lang=\"%s\"", szLang);
 	}
 	/*this should be fixed to use info collected during segmentation process*/
@@ -4396,6 +4399,7 @@
 	u32 max_period = 0;
 	u32 cur_group_id = 0;
 	u32 max_sap_type = 0;
+	u32 max_comp_per_input;
 	u32 last_period_rep_idx_plus_one = 0;
 	Bool use_cenc = GF_FALSE;
 	Bool none_supported = GF_TRUE;
@@ -4573,19 +4577,6 @@
 		}
 		dash_profile = 0;
 	}
-	if ((dash_profile==GF_DASH_PROFILE_LIVE) && !seg_name) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: WARNING! DASH Live profile requested but no -segment-name\n\tusing \"%%s_dash\" by default\n\n"));
-		seg_name = "%s_dash";
-	}
-
-	/*if output id not in the current working dir, concatenate output path to segment name*/
-	szSegName[0] = 0;
-	if (seg_name) {
-		if (gf_url_get_resource_path(mpdfile, szSegName)) {
-			strcat(szSegName, seg_name);
-			seg_name = szSegName;
-		}
-	}
 
 	/*adjust params based on profiles*/
 	switch (dash_profile) {
@@ -4625,6 +4616,20 @@
 		break;
 	}
 
+	if (use_url_template && !seg_name) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: WARNING! DASH Live profile requested but no -segment-name\n\tusing \"%%s_dash\" by default\n\n"));
+		seg_name = "%s_dash";
+	}
+	/*if output id not in the current working dir, concatenate output path to segment name*/
+	szSegName[0] = 0;
+	if (seg_name) {
+		if (gf_url_get_resource_path(mpdfile, szSegName)) {
+			strcat(szSegName, seg_name);
+			seg_name = szSegName;
+		}
+	}
+
+
 	segment_mode = single_segment ? 1 : (single_file ? 2 : 0);
 
 	if (single_segment) {
@@ -4679,6 +4684,7 @@
 	dash_opts.no_fragments_defaults = no_fragments_defaults;
 
 
+	max_comp_per_input = 0;
 	for (cur_period=0; cur_period<max_period; cur_period++) {
 		u32 first_in_period = 0;
 		Double period_duration=0;
@@ -4708,6 +4714,8 @@
 				use_cenc = GF_TRUE;
 				break;
 			}
+			if (max_comp_per_input < dash_inputs[i].nb_components)
+				max_comp_per_input = dash_inputs[i].nb_components;
 		}
 		if (first_in_period) {
 			dash_inputs[first_in_period-1].period_duration = period_duration;
@@ -4715,6 +4723,15 @@
 		presentation_duration += period_duration;
 	}
 
+	if ((max_comp_per_input>1) && (dash_profile==GF_DASH_PROFILE_AVC264_LIVE)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Muxed representations not allowed in DASH-IF AVC264 live profile\n\tswitching to regular live profile\n"));
+		dash_profile = GF_DASH_PROFILE_LIVE;
+	}
+	if ((max_comp_per_input>1) && (dash_profile==GF_DASH_PROFILE_AVC264_ONDEMAND)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Muxed representations not allowed in DASH-IF AVC264 onDemand profile\n\tswitching to regular onDemand profile\n"));
+		dash_profile = GF_DASH_PROFILE_ONDEMAND;
+	}
+
 	active_period_start = 0;
 	if (dash_ctx) {
 		Double duration;
@@ -4819,7 +4836,7 @@
 			strcat(szPeriodXML, ".mpd");
 
 			if (xlink) {
-				//TODOD !
+				//TODO !
 				//write_period_header(mpd, id, 0.0, period_duration, dash_dynamic, xlink);
 			} else {
 				dash_insert_period_xml(mpd, szPeriodXML);

gpac-0.5.1.svn5491.tar.xz/src/media_tools/dvb_mpe.c -> gpac-0.5.1.svn5619.tar.xz/src/media_tools/dvb_mpe.c Changed

@@ -310,7 +310,7 @@
 	u32 i, i_holes;
 	MPE_Error_Holes *mff_holes;
 	u32 offset; /* offset to get through the datagram */
-	u8 ip_adress_bootstrap[4];
+	u8 ip_address_bootstrap[4];
 	Bool Boostrap_ip;
 
 	offset =0;
@@ -342,18 +342,18 @@
 
 
 			/* 224.0.23.14 IP Bosstrap */
-			ip_adress_bootstrap[0]=224;
-			ip_adress_bootstrap[1]=0;
-			ip_adress_bootstrap[2]=23;
-			ip_adress_bootstrap[3]=14;
+			ip_address_bootstrap[0]=224;
+			ip_address_bootstrap[1]=0;
+			ip_address_bootstrap[2]=23;
+			ip_address_bootstrap[3]=14;
 			socket_simu(ip_packet,ts, 1);
 
 			if(ip_packet->u8_rx_adr[3] == 8) {
 				fprintf(stderr, "\n");
 			}
 
-			/* compare the destination ip adress and the ESG Bootstrap adress */
-			Boostrap_ip = gf_m2ts_compare_ip(ip_packet->u8_rx_adr,ip_adress_bootstrap);
+			/* compare the destination ip address and the ESG Bootstrap address */
+			Boostrap_ip = gf_m2ts_compare_ip(ip_packet->u8_rx_adr,ip_address_bootstrap);
 			if(Boostrap_ip) {
 				fprintf(stderr, "ESG Bootstrap found !\n");
 			}
@@ -422,12 +422,12 @@
 }
 
 
-Bool gf_m2ts_compare_ip(u8 rx_ip_adress[4], u8 ip_adress_bootstrap[4])
+Bool gf_m2ts_compare_ip(u8 rx_ip_address[4], u8 ip_address_bootstrap[4])
 {
 	u8 i;
 	for (i=0; i<4; i++)
 	{
-		if (rx_ip_adress[i] != ip_adress_bootstrap[i])
+		if (rx_ip_address[i] != ip_address_bootstrap[i])
 			return 0;
 	}
 	return 1;
@@ -936,7 +936,7 @@
 	u32 i_streams, i_targets,i,j,l;
 	GF_M2TS_IP_Stream *ip_stream_buff;
 	GF_M2TS_IP_Target *ip_targets;
-	u8 *ip_adress;
+	u8 *ip_address;
 	GF_M2TS_IP_PLATFORM * ip_platform = ts->ip_platform;
 	assert( ts );
 	if (!ts->ip_platform) return;
@@ -955,7 +955,7 @@
 		ip_stream_buff=gf_list_get(ip_platform->ip_streams, i);
 		fprintf(stderr, "PID:%d \n",ip_stream_buff->PID);
 		fprintf(stderr, "Target IP Adress : \n");
-		/*Print the target IP adress */
+		/*Print the target IP address */
 		i_targets = gf_list_count(ip_stream_buff->targets);
 		for(j=0; j<i_targets; j++)
 		{
@@ -963,8 +963,8 @@
 
 			l=0;
 
-			ip_adress = ip_targets->address;
-			fprintf(stderr, "%d.%d.%d.%d/%d ",ip_adress[0],ip_adress[1],ip_adress[2],ip_adress[3],ip_targets->slash_mask);
+			ip_address = ip_targets->address;
+			fprintf(stderr, "%d.%d.%d.%d/%d ",ip_address[0],ip_address[1],ip_address[2],ip_address[3],ip_targets->slash_mask);
 			fprintf(stderr, "RX port :");
 			while(ip_targets->rx_port[l] != 0)
 			{
@@ -1087,8 +1087,8 @@
 		} else {
 			/*
 				binding of the socket to send data to port 4600 on the local machine
-				the first adress / port parameters are NULL or 0 because there are not needed for sending UDP datagrams
-				the second adress is "localhost" and the port is the destination port on localhost
+				the first address / port parameters are NULL or 0 because there are not needed for sending UDP datagrams
+				the second address is "localhost" and the port is the destination port on localhost
 			*/
 			e = gf_sk_bind(Sock_Struct->sock, "127.0.0.1", ip_packet->u32_rx_udp_port,/*name*/"127.0.0.1", ip_packet->u32_rx_udp_port, 0);
 			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Setting up socket for MPE on 127.0.0.1:%d\n", ip_packet->u32_rx_udp_port ));

gpac-0.5.1.svn5491.tar.xz/src/media_tools/img.c -> gpac-0.5.1.svn5619.tar.xz/src/media_tools/img.c Changed

@@ -462,8 +462,8 @@
 		png_set_tRNS_to_alpha(png_ptr);
 		png_read_update_info(png_ptr, info_ptr);
 	}
-	*width = png_get_image_width(png_ptr, info_ptr);
-	*height = png_get_image_height(png_ptr, info_ptr);
+	*width = (u32) png_get_image_width(png_ptr, info_ptr);
+	*height = (u32) png_get_image_height(png_ptr, info_ptr);
 
 	switch (png_get_color_type(png_ptr, info_ptr)) {
 	case PNG_COLOR_TYPE_GRAY:
@@ -485,7 +485,7 @@
 
 	}
 
-	out_size = png_get_rowbytes(png_ptr, info_ptr) * png_get_image_height(png_ptr, info_ptr);
+	out_size = (u32) (png_get_rowbytes(png_ptr, info_ptr) * png_get_image_height(png_ptr, info_ptr));
 	/*new cfg, reset*/
 	if (*dst_size != out_size) {
 		*dst_size = out_size;
@@ -494,9 +494,10 @@
 		return GF_BUFFER_TOO_SMALL;
 	}
 	*dst_size = out_size;
+	if (!dst) return GF_BAD_PARAM;
 
 	/*read*/
-	stride = png_get_rowbytes(png_ptr, info_ptr);
+	stride = (u32) png_get_rowbytes(png_ptr, info_ptr);
 	rows = (png_bytepp) gf_malloc(sizeof(png_bytep) * png_get_image_height(png_ptr, info_ptr));
 	for (i=0; i<png_get_image_height(png_ptr, info_ptr); i++) {
 		rows[i] = (png_bytep)dst + i*stride;
@@ -703,7 +704,7 @@
 }
 #endif	/*GPAC_HAS_PNG*/
 
-
+GF_EXPORT
 GF_Err gf_img_file_dec(char *png_filename, u32 *hint_oti, u32 *width, u32 *height, u32 *pixel_format, char **dst, u32 *dst_size)
 {
 	u32 fsize, read, oti;
@@ -719,6 +720,8 @@
 		if (!ext) return GF_NOT_SUPPORTED;
 		if (!stricmp(ext, ".png")) oti = GPAC_OTI_IMAGE_PNG;
 		else if (!stricmp(ext, ".jpg") || !stricmp(ext, ".jpeg")) oti = GPAC_OTI_IMAGE_JPEG;
+	} else if (hint_oti) {
+		oti = *hint_oti;
 	}
 	gf_f64_seek(f, 0, SEEK_END);
 	fsize = (u32)gf_f64_tell(f);
@@ -735,7 +738,7 @@
 		e = gf_img_jpeg_dec(data, fsize, width, height, pixel_format, NULL, dst_size, 0);
 		if (*dst_size) {
 			*dst = gf_malloc(*dst_size);
-			return gf_img_jpeg_dec(data, fsize, width, height, pixel_format, NULL, dst_size, 0);
+			return gf_img_jpeg_dec(data, fsize, width, height, pixel_format, *dst, dst_size, 0);
 		}
 #endif
 	} else if (oti == GPAC_OTI_IMAGE_PNG) {

gpac-0.5.1.svn5491.tar.xz/src/media_tools/isom_hinter.c -> gpac-0.5.1.svn5619.tar.xz/src/media_tools/isom_hinter.c Changed

gpac-0.5.1.svn5491.tar.xz/src/media_tools/isom_tools.c -> gpac-0.5.1.svn5619.tar.xz/src/media_tools/isom_tools.c Changed

gpac-0.5.1.svn5491.tar.xz/src/media_tools/m3u8.c -> gpac-0.5.1.svn5619.tar.xz/src/media_tools/m3u8.c Changed

@@ -1,48 +1,45 @@
 /**
-*			GPAC - Multimedia Framework C SDK
-*
-*			Authors: Pierre Souchay, Jean Le Feuvre
-*			Copyright (c) Telecom ParisTech 2010-2012
-*					All rights reserved
-*
-* This file is part of GPAC
-*
-* GPAC is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation; either version 2, or (at your option)
-* any later version.
-*
-* GPAC is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; see the file COPYING. If not, write to
-* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-*/
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Pierre Souchay, Jean Le Feuvre, Romain Bouqueau
+ *			Copyright (c) Telecom ParisTech 2010-2012, Romain Bouqueau
+ *					All rights reserved
+ *
+ * This file is part of GPAC
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
 
 #define _GNU_SOURCE
 
 #include <gpac/internal/m3u8.h>
-#include <string.h>
-#include <stdio.h>
 #include <gpac/network.h>
 
-#define MYLOG(msg) GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, msg)
 
 
-#if defined(WIN32) || defined(_WIN32_WCE)
-#define bzero(a, b) memset(a, 0x0, b)
-#endif
+/********** playlist_element **********/
 
-GF_Err cleanup_list_of_elements(GF_List * list) {
+GF_Err playlist_element_del(PlaylistElement * e);
+
+static GF_Err cleanup_list_of_elements(GF_List *list) {
 	GF_Err result = GF_OK;
 	if (list == NULL)
 		return result;
 	while (gf_list_count(list)) {
-		PlaylistElement * pl = (PlaylistElement *) gf_list_get(list, 0);
+		PlaylistElement *pl = (PlaylistElement *) gf_list_get(list, 0);
 		if (pl)
 			result |= playlist_element_del(pl);
 		gf_list_rem(list, 0);
@@ -51,6 +48,9 @@
 	return result;
 }
 
+/**
+ * Deletes an Playlist element
+ */
 GF_Err playlist_element_del(PlaylistElement * e) {
 	GF_Err result = GF_OK;
 	if (e == NULL)
@@ -63,16 +63,28 @@
 		gf_free(e->codecs);
 		e->codecs = NULL;
 	}
-	assert( e->url);
+	if (e->language) {
+		gf_free(e->language);
+		e->language = NULL;
+	}
+	if (e->audio_group) {
+		gf_free(e->audio_group);
+		e->audio_group = NULL;
+	}
+	if (e->video_group) {
+		gf_free(e->video_group);
+		e->video_group = NULL;
+	}
+	assert(e->url);
 	gf_free(e->url);
 	e->url = NULL;
 
-	switch (e->elementType) {
+	switch (e->element_type) {
 	case TYPE_UNKNOWN:
-	case TYPE_STREAM:
+	case TYPE_MEDIA:
 		break;
 	case TYPE_PLAYLIST:
-		assert( e->element.playlist.elements);
+		assert(e->element.playlist.elements);
 		result |= cleanup_list_of_elements(e->element.playlist.elements);
 		e->element.playlist.elements = NULL;
 	default:
@@ -82,343 +94,294 @@
 	return result;
 }
 
-Program * program_new(int programId) {
-	Program * program = (Program*)gf_malloc(sizeof(Program));
-	if (program == NULL) {
-		return NULL;
-	}
-	program->programId = programId;
-	program->bitrates = gf_list_new();
-	if (program->bitrates == NULL) {
-		gf_free(program);
-		return NULL;
-	}
-	return program;
-}
-
-GF_Err program_del(Program * program) {
-	GF_Err e = GF_OK;
-	if (program == NULL)
-		return e;
-	if ( program->bitrates) {
-		while (gf_list_count(program->bitrates)) {
-			GF_List * l = gf_list_get(program->bitrates, 0);
-			cleanup_list_of_elements(l);
-			gf_list_rem(program->bitrates, 0);
-		}
-		gf_list_del(program->bitrates);
-	}
-	program->bitrates = NULL;
-	gf_free(program);
-	return e;
-}
-
-/*
-static GF_Err playlist_del(Playlist * pl){
-GF_Err result = GF_OK;
-if (pl == NULL)
-return result;
-if (pl->elements){
-result|= cleanup_list_of_elements(pl->elements);
-pl->elements = NULL;
-}
-gf_free(pl);
-return result;
-}*/
-
-PlaylistElement * playlist_element_new(PlaylistElementType elementType, const char * url, const char * title, const char *codecs, int durationInfo, u64 byteRangeStart, u64 byteRangeEnd) {
-	PlaylistElement * e = gf_malloc(sizeof(PlaylistElement));
-	bzero(e, sizeof(PlaylistElement));
-	assert( url );
+/**
+ * Creates an Playlist element.
+ * This element can be either a playlist of a stream according to first parameter.
+ * \return NULL if element could not be created. Elements will be deleted recursively.
+ */
+static PlaylistElement* playlist_element_new(PlaylistElementType element_type, const char *url, const char *title, const char *codecs, const char *language, double duration_info, u64 byte_range_start, u64 byte_range_end) {
+	PlaylistElement *e = gf_malloc(sizeof(PlaylistElement));
+	memset(e, 0, sizeof(PlaylistElement));
 	if (e == NULL)
 		return NULL;
-	e->durationInfo = durationInfo;
-	e->byteRangeStart = byteRangeStart;
-	e->byteRangeEnd = byteRangeEnd;
+	e->duration_info = duration_info;
+	e->byte_range_start = byte_range_start;
+	e->byte_range_end = byte_range_end;
 
 	e->title = (title ? gf_strdup(title) : NULL);
 	e->codecs = (codecs ? gf_strdup(codecs) : NULL);
-	assert( url);
+	e->language = (language ? gf_strdup(language) : NULL);
+	assert(url);
 	e->url = gf_strdup(url);
 	e->bandwidth = 0;
-	e->elementType = elementType;
-	if (elementType == TYPE_PLAYLIST) {
-		e->element.playlist.is_ended = 0;
-		e->element.playlist.target_duration = durationInfo;
-		e->element.playlist.currentMediaSequence = 0;
-		e->element.playlist.mediaSequenceMin = 0;
-		e->element.playlist.mediaSequenceMax = 0;
+	e->element_type = element_type;
+	if (element_type == TYPE_PLAYLIST) {
+		e->element.playlist.is_ended = GF_FALSE;
+		e->element.playlist.target_duration = duration_info;
+		e->element.playlist.current_media_seq = 0;
+		e->element.playlist.media_seq_min = 0;
+		e->element.playlist.media_seq_max = 0;
 		e->element.playlist.elements = gf_list_new();
 		if (NULL == (e->element.playlist.elements)) {
 			if (e->title)
 				gf_free(e->title);
 			if (e->codecs)
 				gf_free(e->codecs);
+			if (e->language)
+				gf_free(e->language);
+			if (e->audio_group)
+				gf_free(e->audio_group);
+			if (e->video_group)
+				gf_free(e->video_group);
 			if (e->url)
 				gf_free(e->url);
 			e->url = NULL;
 			e->title = NULL;
 			e->codecs = NULL;
+			e->language = NULL;
+			e->audio_group = NULL;
+			e->video_group = NULL;
 			gf_free(e);
 			return NULL;
 		}
 	} else {
-		/* Nothing to do, stream is an empty structure */
+		/* Nothing to do, media is an empty structure */
 	}
 	assert(e->bandwidth == 0);
 	assert(e->url);
 	return e;
 }
-/*
-Playlist * playlist_new(){
-Playlist * pl = gf_malloc(sizeof(Playlist));
-if (pl == NULL)
-return NULL;
-pl->currentMediaSequence = 1;
-pl->target_duration = 0;
-pl->mediaSequenceMin = 0;
-pl->mediaSequenceMax = 0;
-pl->is_ended = 0;
-pl->elements = gf_list_new();
-if (pl->elements == NULL){
-gf_free(pl);
-return NULL;
-}
-return pl;
-}
-*/
 
-VariantPlaylist * variant_playlist_new ()
-{
-	VariantPlaylist * pl = (VariantPlaylist*)gf_malloc( sizeof(VariantPlaylist) );
-	if (pl == NULL)
-		return NULL;
-	pl->programs = gf_list_new();
-	if (! pl->programs) {
-		gf_free( pl );
+
+/********** stream **********/
+
+/**
+ * Creates a new stream properly initialized
+ */
+static Stream* stream_new(int stream_id) {
+	Stream *program = (Stream *) gf_malloc(sizeof(Stream));
+	if (program == NULL) {
 		return NULL;
 	}
-	pl->currentProgram = -1;
-	pl->playlistNeedsRefresh = 1;
-	return pl;
-}
-
-GF_Err variant_playlist_del (VariantPlaylist * playlist) {
-	if (playlist == NULL)
-		return GF_OK;
-	assert( playlist->programs);
-	while (gf_list_count(playlist->programs)) {
-		Program * p = gf_list_get(playlist->programs, 0);
-		assert(p);
-		while (gf_list_count( p->bitrates )) {
-			PlaylistElement * pl = gf_list_get(p->bitrates, 0);
-			assert( pl );
-			playlist_element_del(pl);
-			gf_list_rem(p->bitrates, 0);
-		}
-		gf_list_del(p->bitrates);
-		p->bitrates = NULL;
-		program_del(p);
-		gf_list_rem(playlist->programs, 0);
+	program->stream_id = stream_id;
+	program->variants = gf_list_new();
+	if (program->variants == NULL) {
+		gf_free(program);
+		return NULL;
 	}
-	gf_list_del(playlist->programs);
-	playlist->programs = NULL;
-	gf_free(playlist);
-	return GF_OK;
-}
-
-GF_Err playlist_element_dump(const PlaylistElement * e, int indent) {
-	int i;
-	GF_Err r = GF_OK;
-	for (i = 0 ; i < indent; i++)
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, (" ") );
-	if (e == NULL) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] NULL PlaylistElement\n"));
-		return r;
-	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] PlayListElement[%p, title=%s, codecs=%s, duration=%d, bandwidth=%d, url=%s, type=%s]\n",
-	 (void*)e,
-	 e->title,
-	 e->codecs,
-	 e->durationInfo,
-	 e->bandwidth,
-	 e->url,
-	 e->elementType == TYPE_STREAM ? "stream" : "playlist"));
-	if (TYPE_PLAYLIST == e->elementType) {
-		int sz;
-		assert( e->element.playlist.elements);
-		sz = gf_list_count(e->element.playlist.elements);
-		indent+=2;
-		for (i = 0 ; i < sz ; i++) {
-			PlaylistElement * el = gf_list_get(e->element.playlist.elements, i);
-			assert( el);
-			r|= playlist_element_dump( el, indent);
-		}
-	}
-	return r;
+	return program;
 }
 
-GF_Err variant_playlist_dump(const VariantPlaylist * pl) {
-	int i, count;
+/**
+ * Deletes the specified stream
+ */
+static GF_Err stream_del(Stream *stream) {
 	GF_Err e = GF_OK;
-	if (pl == NULL) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] VariantPlaylist = NULL\n"));
+	if (stream == NULL)
 		return e;
+	if (stream->variants) {
+		while (gf_list_count(stream->variants)) {
+			GF_List *l = gf_list_get(stream->variants, 0);
+			cleanup_list_of_elements(l);
+			gf_list_rem(stream->variants, 0);
+		}
+		gf_list_del(stream->variants);
 	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] VariantPlaylist = {\n"));
-	assert( pl->programs);
-	count = gf_list_count( pl->programs);
-	for (i = 0 ; i < count ; i++) {
-		int j, countj;
-		Program * p = gf_list_get(pl->programs, i);
-		assert( p );
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] program[programId=%d]{\n", p->programId));
-		assert( p->bitrates );
-		countj = gf_list_count(p->bitrates);
-		for (j = 0; j < countj; j++) {
-			PlaylistElement * el = gf_list_get(p->bitrates, j);
-			assert(el);
-			e |= playlist_element_dump( el, 4);
-		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] }\n"));
-	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8]}\n"));
+	stream->variants = NULL;
+	gf_free(stream);
 	return e;
 }
 
-Program * variant_playlist_find_matching_program(const VariantPlaylist * pl, const u32 programId) {
-	u32 count, i;
-	assert( pl);
-	assert( pl->programs);
-	assert(programId >= 0);
-	count = gf_list_count(pl->programs);
-	for (i = 0 ; i < count ; i++) {
-		Program * cur = gf_list_get(pl->programs, i);
-		assert( cur );
-		if (programId == cur->programId) {
-			/* We found the program */
-			return cur;
-		}
-	}
-	return NULL;
-}
 
-Program * variant_playlist_get_current_program(const VariantPlaylist * pl) {
-	assert( pl );
-	return variant_playlist_find_matching_program(pl, pl->currentProgram);
-}
+/********** accumulated_attributes **********/
 
+typedef enum _e_MediaType {
+	MEDIA_TYPE_UNKNOWN = 0,
+	MEDIA_TYPE_AUDIO = 0x100000,
+	MEDIA_TYPE_VIDEO = 0x200000,
+	MEDIA_TYPE_SUBTITLES = 0x300000,
+	MEDIA_TYPE_CLOSED_CAPTIONS = 0x400000
+} MediaType;
 
+static GFINLINE int string2num(const char *s) {
+	u64 ret=0, i, shift=2;
+	u8 hash[GF_SHA1_DIGEST_SIZE];
+	gf_sha1_csum((u8*)s, (u32)strlen(s), hash);
+	assert(shift*GF_SHA1_DIGEST_SIZE < 64);
+	for (i=0; i<GF_SHA1_DIGEST_SIZE; ++i)
+		ret += (ret << shift) + hash[i];
+	return (int)(ret % MEDIA_TYPE_AUDIO);
+}
 
-typedef struct _s_accumulated_attributes {
-	char * title;
-	int durationInSeconds;
-	int bandwidth;
-	int width, height;
-	int programId;
-	char * codecs;
-	int targetDurationInSeconds;
-	int minMediaSequence;
-	int currentMediaSequence;
-	Bool isVariantPlaylist;
-	Bool isPlaylistEnded;
-	u64 byteRangeStart, byteRangeEnd;
-} s_accumulated_attributes;
 
-static Bool safe_start_equals(const char * attribute, const char * line) {
+#define GROUP_ID_TO_PROGRAM_ID(type, group_id) (\
+	MEDIA_TYPE_##type + \
+	string2num(group_id) \
+	) \
+
+static Bool safe_start_equals(const char *attribute, const char *line) {
 	size_t len, atlen;
 	if (line == NULL)
-		return 0;
+		return GF_FALSE;
 	len = strlen(line);
 	atlen = strlen(attribute);
 	if (len < atlen)
-		return 0;
-	return 0 == strncmp(attribute, line, atlen);
+		return GF_FALSE;
+	return (0 == strncmp(attribute, line, atlen));
 }
 
-static char ** extractAttributes(const char * name, const char * line, const int numberOfAttributes) {
-	int sz, i, currentAttribute, start;
-	char ** ret;
-	u8 quote=0;
+typedef struct _s_accumulated_attributes {
+	//TODO: store as a structure with: { attribute, version, mandatory }
+	char *title;
+	char *mediaURL;
+	double duration_in_seconds;
+	int bandwidth;
+	int width, height;
+	int stream_id;
+	char *codecs;
+	char *language;
+	MediaType type;
+	union {
+		char *audio;
+		char *video;
+	} group;
+	int target_duration_in_seconds;
+	int min_media_sequence;
+	int current_media_seq;
+	int version;
+	int compatibility_version; /*compute version required by the M3U8 content*/
+	Bool is_master_playlist;
+	Bool is_playlist_ended;
+	u64 byte_range_start, byte_range_end;
+} s_accumulated_attributes;
+
+static void reset_attributes(s_accumulated_attributes *attributes) {
+	memset(attributes, 0, sizeof(s_accumulated_attributes));
+	attributes->bandwidth = 0;
+	attributes->duration_in_seconds = 0;
+	attributes->target_duration_in_seconds = 0;
+	attributes->type = MEDIA_TYPE_UNKNOWN;
+	attributes->is_master_playlist = GF_FALSE;
+	attributes->is_playlist_ended = GF_FALSE;
+	attributes->min_media_sequence = 1;
+	attributes->current_media_seq = 0;
+	attributes->version = 1;
+	attributes->compatibility_version = 0;
+}
+
+static char** extract_attributes(const char *name, const char *line, const int num_attributes) {
+	int sz, i, curr_attribute, start;
+	char **ret;
+	u8 quote = 0;
 	int len = (u32) strlen(line);
 	start = (u32) strlen(name);
 	if (len <= start)
 		return NULL;
 	if (!safe_start_equals(name, line))
 		return NULL;
-	ret = gf_calloc((numberOfAttributes + 1 ), sizeof(char*));
-	currentAttribute = 0;
-	for (i = start ; i <= len ; i++) {
-		if (line[i] == '\0' || (!quote && line[i] == ',') || (line[i] == quote) ) {
+	ret = gf_calloc((num_attributes + 1), sizeof(char*));
+	curr_attribute = 0;
+	for (i=start; i<=len; i++) {
+		if (line[i] == '\0' || (!quote && line[i] == ',') || (line[i] == quote)) {
 			u32 spaces = 0;
 			sz = 1 + i - start;
-			while (line[start+spaces] == ' ') spaces++;
-			ret[currentAttribute] = gf_calloc( (1+sz-spaces), sizeof(char));
-			strncpy(ret[currentAttribute], &(line[start+spaces]), sz-spaces);
-			currentAttribute++;
+			while (line[start+spaces] == ' ')
+				spaces++;
+			ret[curr_attribute] = gf_calloc( (1+sz-spaces), sizeof(char));
+			strncpy(ret[curr_attribute], &(line[start+spaces]), sz-spaces);
+			curr_attribute++;
 			start = i+1;
 			if (start == len) {
 				return ret;
 			}
 		}
 		if ((line[i] == '\'') || (line[i] == '"')) {
-			if (quote) quote = 0;
-			else quote = line[i];
+			if (quote)
+				quote = 0;
+			else
+				quote = line[i];
 		}
 	}
-	if (currentAttribute == 0) {
+	if (curr_attribute == 0) {
 		gf_free(ret);
 		return NULL;
 	}
 	return ret;
 }
 
+#define M3U8_COMPATIBILITY_VERSION(v) \
+	if (v > attributes->compatibility_version) \
+		attributes->compatibility_version = v;
+
 /**
-* Parses the attributes and accumulate into the attributes structure
-*/
-static char ** parseAttributes(const char * line, s_accumulated_attributes * attributes) {
-	int intValue, i;
-	char ** ret;
-	char * endPtr;
-	char * utility;
+ * Parses the attributes and accumulate into the attributes structure
+ */
+static char** parse_attributes(const char *line, s_accumulated_attributes *attributes) {
+	int int_value, i;
+	double double_value;
+	char **ret;
+	char *end_ptr;
+	char *utility;
 	if (line == NULL)
 		return NULL;
 	if (!safe_start_equals("#EXT", line))
 		return NULL;
 	if (safe_start_equals("#EXT-X-ENDLIST", line)) {
-		attributes->isPlaylistEnded = 1;
+		attributes->is_playlist_ended = GF_TRUE;
+		M3U8_COMPATIBILITY_VERSION(1);
 		return NULL;
 	}
-	ret = extractAttributes("#EXT-X-TARGETDURATION:", line, 1);
+	/* reset not accumated attributes */
+	attributes->type = MEDIA_TYPE_UNKNOWN;
+
+	ret = extract_attributes("#EXT-X-TARGETDURATION:", line, 1);
 	if (ret) {
 		/* #EXT-X-TARGETDURATION:<seconds> */
 		if (ret[0]) {
-			intValue = strtol(ret[0], &endPtr, 10);
-			if (endPtr != ret[0]) {
-				attributes->targetDurationInSeconds = intValue;
+			int_value = (s32) strtol(ret[0], &end_ptr, 10);
+			if (end_ptr != ret[0]) {
+				attributes->target_duration_in_seconds = int_value;
 			}
 		}
+		M3U8_COMPATIBILITY_VERSION(1);
 		return ret;
 	}
-	ret = extractAttributes("#EXT-X-MEDIA-SEQUENCE:", line, 1);
+	ret = extract_attributes("#EXT-X-MEDIA-SEQUENCE:", line, 1);
 	if (ret) {
 		/* #EXT-X-MEDIA-SEQUENCE:<number> */
 		if (ret[0]) {
-			intValue = strtol(ret[0], &endPtr, 10);
-			if (endPtr != ret[0]) {
-				attributes->minMediaSequence = intValue;
-				attributes->currentMediaSequence = intValue;
+			int_value = (s32)strtol(ret[0], &end_ptr, 10);
+			if (end_ptr != ret[0]) {
+				attributes->min_media_sequence = int_value;
+				attributes->current_media_seq = int_value;
+			}
+		}
+		M3U8_COMPATIBILITY_VERSION(1);
+		return ret;
+	}
+	ret = extract_attributes("#EXT-X-VERSION:", line, 1);
+	if (ret) {
+		/* #EXT-X-VERSION:<number> */
+		if (ret[0]) {
+			int_value = (s32)strtol(ret[0], &end_ptr, 10);
+			if (end_ptr != ret[0]) {
+				attributes->version = int_value;
 			}
+			M3U8_COMPATIBILITY_VERSION(2);
 		}
 		return ret;
 	}
-	ret = extractAttributes("#EXTINF:", line, 2);
+	ret = extract_attributes("#EXTINF:", line, 2);
 	if (ret) {
+		M3U8_COMPATIBILITY_VERSION(1);
 		/* #EXTINF:<duration>,<title> */
 		if (ret[0]) {
-			intValue = strtol(ret[0], &endPtr, 10);
-			if (endPtr != ret[0]) {
-				attributes->durationInSeconds = intValue;
+			double_value = strtod(ret[0], &end_ptr);
+			if (end_ptr != ret[0]) {
+				attributes->duration_in_seconds = double_value;
+			}
+			if (strstr(ret[0], ".") || (double_value > (int)double_value)) {
+				M3U8_COMPATIBILITY_VERSION(3);
 			}
 		}
 		if (ret[1]) {
@@ -426,31 +389,60 @@
 		}
 		return ret;
 	}
-	ret = extractAttributes("#EXT-X-KEY:", line, 4);
+	ret = extract_attributes("#EXT-X-KEY:", line, 4);
 	if (ret) {
 		/* #EXT-X-KEY:METHOD=<method>[,URI="<URI>"] */
-		/* Not Supported for now */
+		const char *method = "METHOD=";
+		const size_t method_len = strlen(method);
+		if (safe_start_equals(method, ret[0])) {
+			if (strncmp(ret[0]+method_len, "NONE", 4)) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] EXT-X-KEY not supported.\n", line));
+			}
+		}
+		M3U8_COMPATIBILITY_VERSION(1);
+		return ret;
+	}
+	ret = extract_attributes("#EXT-X-PROGRAM-DATE-TIME:", line, 1);
+	if (ret) {
+		/* #EXT-X-PROGRAM-DATE-TIME:<YYYY-MM-DDThh:mm:ssZ> */
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH,("[M3U8] EXT-X-PROGRAM-DATE-TIME not supported.\n", line));
+		M3U8_COMPATIBILITY_VERSION(1);
+		return ret;
+	}
+	ret = extract_attributes("#EXT-X-ALLOW-CACHE:", line, 1);
+	if (ret) {
+		/* #EXT-X-ALLOW-CACHE:<YES|NO> */
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH,("[M3U8] EXT-X-ALLOW-CACHE not supported.\n", line));
+		M3U8_COMPATIBILITY_VERSION(1);
+		return ret;
+	}
+	ret = extract_attributes("#EXT-X-PLAYLIST-TYPE", line, 1);
+	if (ret) {
+		/* #EXT-X-PLAYLIST-TYPE:<EVENT|VOD> */
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH,("[M3U8] EXT-X-PLAYLIST-TYPE not supported.\n", line));
+		M3U8_COMPATIBILITY_VERSION(3);
 		return ret;
 	}
-	ret = extractAttributes("#EXT-X-STREAM-INF:", line, 10);
+	ret = extract_attributes("#EXT-X-STREAM-INF:", line, 10);
 	if (ret) {
 		/* #EXT-X-STREAM-INF:[attribute=value][,attribute=value]* */
 		i = 0;
-		attributes->isVariantPlaylist = 1;
+		attributes->is_master_playlist = GF_TRUE;
+		M3U8_COMPATIBILITY_VERSION(1);
 		while (ret[i] != NULL) {
 			if (safe_start_equals("BANDWIDTH=", ret[i])) {
 				utility = &(ret[i][10]);
-				intValue = strtol(utility, &endPtr, 10);
-				if (endPtr != utility)
-					attributes->bandwidth = intValue;
+				int_value = (s32) strtol(utility, &end_ptr, 10);
+				if (end_ptr != utility)
+					attributes->bandwidth = int_value;
 			} else if (safe_start_equals("PROGRAM-ID=", ret[i])) {
 				utility = &(ret[i][11]);
-				intValue = strtol(utility, &endPtr, 10);
-				if (endPtr != utility)
-					attributes->programId = intValue;
+				int_value = (s32) strtol(utility, &end_ptr, 10);
+				if (end_ptr != utility)
+					attributes->stream_id = int_value;
 			} else if (safe_start_equals("CODECS=\"", ret[i])) {
-				intValue = (u32) strlen(ret[i]);
-				if (ret[i][intValue-1] == '"') {
+				int_value = (u32) strlen(ret[i]);
+				if (ret[i][int_value-1] == '"') {
 					attributes->codecs = gf_strdup(&(ret[i][7]));
 				}
 			} else if (safe_start_equals("RESOLUTION=", ret[i])) {
@@ -460,46 +452,473 @@
 					attributes->width = w;
 					attributes->height = h;
 				}
+				M3U8_COMPATIBILITY_VERSION(2);
+			} else if (safe_start_equals("AUDIO=", ret[i])) {
+				assert(attributes->type == MEDIA_TYPE_UNKNOWN);
+				attributes->type = MEDIA_TYPE_AUDIO;
+				attributes->group.audio = gf_strdup(ret[i] + 6);
+				M3U8_COMPATIBILITY_VERSION(4);
+			} else if (safe_start_equals("VIDEO=", ret[i])) {
+				assert(attributes->type == MEDIA_TYPE_UNKNOWN);
+				attributes->type = MEDIA_TYPE_VIDEO;
+				attributes->group.video = gf_strdup(ret[i] + 6);
+				M3U8_COMPATIBILITY_VERSION(4);
 			}
 			i++;
 		}
+		if (!attributes->stream_id) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] Invalid #EXT-X-STREAM-INF: no PROGRAM-ID found. Ignoring the line.\n"));
+			return NULL;
+		}
 		return ret;
 	}
-	ret = extractAttributes("#EXT-X-BYTERANGE:", line, 1);
+	ret = extract_attributes("#EXT-X-DISCONTINUITY", line, 0);
+	if (ret) {
+		/* #EXT-X-DISCONTINUITY */
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] EXT-X-DISCONTINUITY not supported.\n", line));
+		M3U8_COMPATIBILITY_VERSION(1);
+		return ret;
+	}
+	ret = extract_attributes("#EXT-X-BYTERANGE:", line, 1);
 	if (ret) {
 		/* #EXT-X-BYTERANGE:<begin@end> */
 		if (ret[0]) {
 			u64 begin, size;
 			if (sscanf(ret[0], LLU"@"LLU, &size, &begin) == 2) {
 				if (size) {
-					attributes->byteRangeStart = begin;
-					attributes->byteRangeEnd = begin + size - 1;
+					attributes->byte_range_start = begin;
+					attributes->byte_range_end = begin + size - 1;
 				} else {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH,("[M3U8] Invalid byte range %s\n", ret[0]));
 				}
 			}
 		}
+		M3U8_COMPATIBILITY_VERSION(4);
 		return ret;
 	}
+	ret = extract_attributes("#EXT-X-MEDIA:", line, 14);
+	if (ret) {
+		/* #EXT-X-MEDIA:[TYPE={AUDIO,VIDEO}],[URI],[GROUP-ID],[LANGUAGE],[NAME],[DEFAULT={YES,NO}],[AUTOSELECT={YES,NO}] */
+		M3U8_COMPATIBILITY_VERSION(4);
+		attributes->is_master_playlist = GF_TRUE;
+		i = 0;
+		while (ret[i] != NULL) {
+			if (safe_start_equals("TYPE=", ret[i])) {
+				if (!strncmp(ret[i]+5, "AUDIO", 5)) {
+					attributes->type = MEDIA_TYPE_AUDIO;
+				} else if (!strncmp(ret[i]+5, "VIDEO", 5)) {
+					attributes->type = MEDIA_TYPE_VIDEO;
+				} else {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] Invalid #EXT-X-MEDIA:TYPE=%s\n", ret[i]+5));
+				}
+			} else if (safe_start_equals("URI=\"", ret[i])) {
+				size_t len;
+				attributes->mediaURL = gf_strdup(ret[i]+5);
+				len = strlen(attributes->mediaURL);
+				if (len && (attributes->mediaURL[len-1] == '"')) {
+					attributes->mediaURL[len-1] = '\0';
+				} else {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] Misformed #EXT-X-MEDIA:URI=%s. Quotes are incorrect.\n", ret[i]+5));
+				}
+			} else if (safe_start_equals("GROUP-ID=", ret[i])) {
+				if (attributes->type == MEDIA_TYPE_AUDIO) {
+					attributes->group.audio = gf_strdup(ret[i]+9);
+					attributes->stream_id = GROUP_ID_TO_PROGRAM_ID(AUDIO, attributes->group.audio);
+				} else if (attributes->type == MEDIA_TYPE_VIDEO) {
+					attributes->group.video = gf_strdup(ret[i]+9);
+					attributes->stream_id = GROUP_ID_TO_PROGRAM_ID(VIDEO, attributes->group.video);
+				} else if (attributes->type == MEDIA_TYPE_UNKNOWN) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH,("[M3U8] Invalid #EXT-X-MEDIA:GROUP-ID=%s. Ignoring the line.\n", ret[i]+9));
+					return NULL;
+				}
+			} else if (safe_start_equals("LANGUAGE=\"", ret[i])) {
+				size_t len;
+				attributes->language = gf_strdup(ret[i]+9);
+				len = strlen(attributes->language);
+				if (len && (attributes->language[len-1] == '"')) {
+					attributes->language[len-1] = '\0';
+				} else {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] Misformed #EXT-X-MEDIA:LANGUAGE=%s. Quotes are incorrect.\n", ret[i]+5));
+				}
+			} else if (safe_start_equals("NAME=", ret[i])) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH,("[M3U8] EXT-X-MEDIA:NAME not supported\n"));
+				//attributes->name = gf_strdup(ret[i]+5);
+			} else if (safe_start_equals("DEFAULT=", ret[i])) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH,("[M3U8] EXT-X-MEDIA:DEFAULT not supported\n"));
+				if (!strncmp(ret[i]+8, "YES", 3)) {
+					//TODO
+				} else if (!strncmp(ret[i]+8, "NO", 2)) {
+					//TODO
+				} else {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] Invalid #EXT-X-MEDIA:DEFAULT=%s\n", ret[i]+8));
+				}
+			} else if (safe_start_equals("AUTOSELECT=", ret[i])) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH,("[M3U8] EXT-X-MEDIA:AUTOSELECT not supported\n"));
+				if (!strncmp(ret[i]+11, "YES", 3)) {
+					//TODO
+				} else if (!strncmp(ret[i]+11, "NO", 2)) {
+					//TODO
+				} else {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] Invalid #EXT-X-MEDIA:AUTOSELECT=%s\n", ret[i]+11));
+				}
+			}
+
+			i++;
+		}
+
+		if (attributes->type == MEDIA_TYPE_UNKNOWN) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] Invalid #EXT-X-MEDIA: TYPE is missing. Ignoring the line.\n"));
+			return NULL;
+		}
+		if (attributes->type == MEDIA_TYPE_CLOSED_CAPTIONS && attributes->mediaURL) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] Invalid #EXT-X-MEDIA: TYPE is CLOSED-CAPTIONS but URI is present. Ignoring the URI.\n"));
+			gf_free(attributes->mediaURL);
+			attributes->mediaURL = NULL;
+		}
+		if ((attributes->type == MEDIA_TYPE_AUDIO && !attributes->group.audio)
+			|| (attributes->type == MEDIA_TYPE_VIDEO && !attributes->group.video)) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] Invalid #EXT-X-MEDIA: missing GROUP-ID attribute. Ignoring the line.\n"));
+				return NULL;
+		}
+		if (!attributes->stream_id) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] Invalid #EXT-X-MEDIA: no ID was computed. Check previous errors. Ignoring the line.\n"));
+			return NULL;
+		}
+
+		return ret;
+	}
+	GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("[M3U8] Unknown line in M3U8 file %s\n", line));
+	return NULL;
+}
+
+/**
+ * Creates a new MasterPlaylist
+ * \return NULL if MasterPlaylist element could not be allocated
+ */
+MasterPlaylist* master_playlist_new()
+{
+	MasterPlaylist *pl = (MasterPlaylist*)gf_malloc(sizeof(MasterPlaylist));
+	if (pl == NULL)
+		return NULL;
+	pl->streams = gf_list_new();
+	if (!pl->streams) {
+		gf_free(pl);
+		return NULL;
+	}
+	pl->current_stream = -1;
+	pl->playlist_needs_refresh = GF_TRUE;
+	return pl;
+}
+
+
+/********** master_playlist **********/
+
+GF_Err gf_m3u8_master_playlist_del(MasterPlaylist *playlist) {
+	if (playlist == NULL)
+		return GF_OK;
+	assert(playlist->streams);
+	while (gf_list_count(playlist->streams)) {
+		Stream *p = gf_list_get(playlist->streams, 0);
+		assert(p);
+		while (gf_list_count(p->variants)) {
+			PlaylistElement *pl = gf_list_get(p->variants, 0);
+			assert(pl);
+			playlist_element_del(pl);
+			gf_list_rem(p->variants, 0);
+		}
+		gf_list_del(p->variants);
+		p->variants = NULL;
+		stream_del(p);
+		gf_list_rem(playlist->streams, 0);
+	}
+	gf_list_del(playlist->streams);
+	playlist->streams = NULL;
+	gf_free(playlist);
+
+	return GF_OK;
+}
+
+static Stream* master_playlist_find_matching_stream(const MasterPlaylist *pl, const u32 stream_id) {
+	u32 count, i;
+	assert(pl);
+	assert(pl->streams);
+	assert(stream_id >= 0);
+	count = gf_list_count(pl->streams);
+	for (i=0; i<count; i++) {
+		Stream *cur = gf_list_get(pl->streams, i);
+		assert(cur);
+		if (stream_id == cur->stream_id) {
+			/* We found the program */
+			return cur;
+		}
+	}
 	return NULL;
 }
 
+
+/********** sub_playlist **********/
+
 #define M3U8_BUF_SIZE 2048
 
-GF_Err parse_root_playlist(const char * file, VariantPlaylist ** playlist, const char * baseURL)
+GF_EXPORT
+GF_Err gf_m3u8_parse_master_playlist(const char *file, MasterPlaylist **playlist, const char *baseURL)
 {
-	return parse_sub_playlist(file, playlist, baseURL, NULL, NULL);
+	return gf_m3u8_parse_sub_playlist(file, playlist, baseURL, NULL, NULL);
 }
 
-GF_Err parse_sub_playlist(const char * file, VariantPlaylist ** playlist, const char * baseURL, Program * in_program, PlaylistElement *sub_playlist)
+GF_Err declare_sub_playlist(char *currentLine, const char *baseURL, s_accumulated_attributes *attribs, PlaylistElement *sub_playlist, MasterPlaylist **playlist, Stream *in_stream)
+{
+	int i;
+
+	char *fullURL = strstr(currentLine, "?");
+	if (fullURL) {
+		/*some URL contains garbage after the filename*/
+		size_t len = fullURL-currentLine;
+		fullURL = gf_malloc(len+1);
+		strncpy(fullURL, currentLine, len);
+		fullURL[len] = '\0';
+	} else {
+		fullURL = currentLine;
+	}
+	if (gf_url_is_local(fullURL)) {
+		/*
+		if (gf_url_is_local(baseURL)){
+		int num_chars = -1;
+		if (baseURL[strlen(baseURL)-1] == '/'){
+		num_chars = gf_asprintf(&fullURL, "%s%s", baseURL, currentLine);
+		} else {
+		num_chars = gf_asprintf(&fullURL, "%s/%s", baseURL, currentLine);
+		}
+		if (num_chars < 0 || fullURL == NULL){
+		gf_m3u8_master_playlist_del(*playlist);
+		playlist = NULL;
+		return GF_OUT_OF_MEM;
+		}
+		} else */ {
+			char *currFullURL = fullURL;
+			fullURL = gf_url_concatenate(baseURL, currFullURL);
+			if (currFullURL != currentLine)
+				gf_free(currFullURL);
+		}
+
+		assert(fullURL);
+	}
+	
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] declaring sub-playlist %s\n", fullURL));
+	
+	{
+		u32 count;
+		PlaylistElement *curr_playlist = sub_playlist;
+		/* First, we have to find the matching stream */
+		Stream *stream = in_stream;
+		if (!in_stream)
+			stream = master_playlist_find_matching_stream(*playlist, attribs->stream_id);
+		/* We did not found the stream, we create it */
+		if (stream == NULL) {
+			stream = stream_new(attribs->stream_id);
+			if (stream == NULL) {
+				/* OUT of memory */
+				gf_m3u8_master_playlist_del(*playlist);
+				playlist = NULL;
+				return GF_OUT_OF_MEM;
+			}
+			gf_list_add((*playlist)->streams, stream);
+			/* take the first regular variant stream */
+			if ((*playlist)->current_stream < 0 && stream->stream_id < MEDIA_TYPE_AUDIO)
+				(*playlist)->current_stream = stream->stream_id;
+		}
+
+		/* OK, we have a stream, we have to choose the elements within the same stream variant */
+		assert(stream);
+		assert(stream->variants);
+		count = gf_list_count(stream->variants);
+
+		if (!curr_playlist) {
+			for (i=0; i<(s32)count; i++) {
+				PlaylistElement *i_playlist_element = gf_list_get(stream->variants, i);
+				assert(i_playlist_element);
+				if (stream->stream_id < MEDIA_TYPE_AUDIO) {
+					/* regular stream (EXT-X-STREAM-INF) */
+					if (i_playlist_element->bandwidth == attribs->bandwidth) {
+						curr_playlist = i_playlist_element;
+						break;
+					}
+				} else {
+					/* group streams (EXT-X-MEDIA) */
+					//TODO: add renditions and compare depending on context parameters
+				}
+			}
+		}
+
+		if (attribs->is_master_playlist) {
+			/* We are the Master Playlist */
+			if (curr_playlist != NULL) {
+				/* should not happen, it means we redefine something previously added */
+				assert(0);
+			}
+			curr_playlist = playlist_element_new(
+				TYPE_UNKNOWN,
+				fullURL,
+				attribs->title,
+				attribs->codecs,
+				attribs->language,
+				attribs->duration_in_seconds,
+				attribs->byte_range_start, attribs->byte_range_end);
+			if (curr_playlist == NULL) {
+				/* OUT of memory */
+				gf_m3u8_master_playlist_del(*playlist);
+				playlist = NULL;
+				return GF_OUT_OF_MEM;
+			}
+			assert(fullURL);
+			if (curr_playlist->url)
+				gf_free(curr_playlist->url);
+			curr_playlist->url = gf_strdup(fullURL);
+			if (curr_playlist->title)
+				gf_free(curr_playlist->title);
+			curr_playlist->title = attribs->title ? gf_strdup(attribs->title) : NULL;
+			if (curr_playlist->codecs)
+				gf_free(curr_playlist->codecs);
+			curr_playlist->codecs = attribs->codecs ? gf_strdup(attribs->codecs) : NULL;
+			if (curr_playlist->audio_group) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[M3U8] Warning: found an AUDIO group in the master playlist."));
+			}
+			if (curr_playlist->video_group) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[M3U8] Warning: found an VIDEO group in the master playlist."));
+			}
+			gf_list_add(stream->variants, curr_playlist);
+			curr_playlist->width = attribs->width;
+			curr_playlist->height = attribs->height;
+		} else {
+			/* Normal Playlist */
+			assert((*playlist)->streams);
+			if (curr_playlist == NULL) {
+				/* This is a "normal" playlist without any element in it */
+				PlaylistElement *subElement;
+				assert(baseURL);
+				curr_playlist = playlist_element_new(
+					TYPE_PLAYLIST,
+					baseURL,
+					attribs->title,
+					attribs->codecs,
+					attribs->language,
+					attribs->duration_in_seconds,
+					attribs->byte_range_start, attribs->byte_range_end);
+				if (curr_playlist == NULL) {
+					/* OUT of memory */
+					gf_m3u8_master_playlist_del(*playlist);
+					playlist = NULL;
+					return GF_OUT_OF_MEM;
+				}
+				assert(curr_playlist->element.playlist.elements);
+				assert(fullURL);
+				assert(curr_playlist->url && !curr_playlist->title && !curr_playlist->codecs);
+				curr_playlist->title = NULL;
+				curr_playlist->codecs = NULL;
+				subElement = playlist_element_new(
+					TYPE_UNKNOWN,
+					fullURL,
+					attribs->title,
+					attribs->codecs,
+					attribs->language,
+					attribs->duration_in_seconds,
+					attribs->byte_range_start, attribs->byte_range_end);
+				if (subElement == NULL) {
+					gf_m3u8_master_playlist_del(*playlist);
+					playlist_element_del(curr_playlist);
+					playlist = NULL;
+					return GF_OUT_OF_MEM;
+				}
+				gf_list_add(curr_playlist->element.playlist.elements, subElement);
+				gf_list_add(stream->variants, curr_playlist);
+				curr_playlist->element.playlist.computed_duration += subElement->duration_info;
+				assert(stream);
+				assert(stream->variants);
+				assert(curr_playlist);
+			} else {
+				PlaylistElement *subElement = playlist_element_new(
+					TYPE_UNKNOWN,
+					fullURL,
+					attribs->title,
+					attribs->codecs,
+					attribs->language,
+					attribs->duration_in_seconds,
+					attribs->byte_range_start, attribs->byte_range_end);
+				if (curr_playlist->element_type != TYPE_PLAYLIST) {
+					curr_playlist->element_type = TYPE_PLAYLIST;
+					if (!curr_playlist->element.playlist.elements)
+						curr_playlist->element.playlist.elements = gf_list_new();
+				}
+				if (subElement == NULL) {
+					gf_m3u8_master_playlist_del(*playlist);
+					playlist_element_del(curr_playlist);
+					playlist = NULL;
+					return GF_OUT_OF_MEM;
+				}
+				gf_list_add(curr_playlist->element.playlist.elements, subElement);
+				curr_playlist->element.playlist.computed_duration += subElement->duration_info;
+			}
+		}
+
+		curr_playlist->element.playlist.current_media_seq = attribs->current_media_seq;
+		/* We first set the default duration for element, aka targetDuration */
+		if (attribs->target_duration_in_seconds > 0) {
+			curr_playlist->element.playlist.target_duration = attribs->target_duration_in_seconds;
+			curr_playlist->duration_info = attribs->target_duration_in_seconds;
+		}
+		if (attribs->duration_in_seconds) {
+			if (curr_playlist->duration_info == 0) {
+				/* we set the playlist duration info as the duration of a segment, only if it's not set
+				There are cases of playlist with the last segment with a duration different from the others
+				(example: Apple bipbop test)*/
+				curr_playlist->duration_info = attribs->duration_in_seconds;
+			}
+		}
+		curr_playlist->element.playlist.media_seq_min = attribs->min_media_sequence;
+		curr_playlist->element.playlist.media_seq_max = attribs->current_media_seq++;
+		if (attribs->bandwidth > 1)
+			curr_playlist->bandwidth = attribs->bandwidth;
+		if (attribs->is_playlist_ended)
+			curr_playlist->element.playlist.is_ended = GF_TRUE;
+	}
+	/* Cleanup all line-specific fields */
+	if (attribs->title) {
+		gf_free(attribs->title);
+		attribs->title = NULL;
+	}
+	attribs->duration_in_seconds = 0;
+	attribs->bandwidth = 0;
+	attribs->stream_id = 0;
+	if (attribs->codecs != NULL) {
+		gf_free(attribs->codecs);
+		attribs->codecs = NULL;
+	}
+	if (attribs->language != NULL) {
+		gf_free(attribs->language);
+		attribs->language = NULL;
+	}
+	if (attribs->group.audio != NULL) {
+		gf_free(attribs->group.audio);
+		attribs->group.audio = NULL;
+	}
+	if (attribs->group.video != NULL) {
+		gf_free(attribs->group.video);
+		attribs->group.video = NULL;
+	}
+	if (fullURL != currentLine) {
+		gf_free(fullURL);
+	}
+	return GF_OK;
+}
+
+GF_Err gf_m3u8_parse_sub_playlist(const char *file, MasterPlaylist **playlist, const char *baseURL, Stream *in_stream, PlaylistElement *sub_playlist)
 {
 	int len, i, currentLineNumber;
-	FILE * f=NULL;
+	FILE *f = NULL;
 	char *m3u8_payload;
 	u32 m3u8_size, m3u8pos;
-	VariantPlaylist * pl;
 	char currentLine[M3U8_BUF_SIZE];
-	char ** attributes = NULL;
+	char **attributes = NULL;
 	s_accumulated_attributes attribs;
 
 	if (!strncmp(file, "gmem://", 7)) {
@@ -510,36 +929,28 @@
 	} else {
 		f = gf_f64_open(file, "rt");
 		if (!f) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH,("[M3U8] Cannot Open m3u8 file %s for reading\n", file));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH,("[M3U8] Cannot open m3u8 file %s for reading\n", file));
 			return GF_SERVICE_ERROR;
 		}
 	}
 	if (*playlist == NULL) {
-		*playlist = variant_playlist_new();
+		*playlist = master_playlist_new();
 		if (!(*playlist)) {
 			if (f) fclose(f);
 			return GF_OUT_OF_MEM;
 		}
 	}
-	pl = *playlist;
 	currentLineNumber = 0;
-	bzero(&attribs, sizeof(s_accumulated_attributes));
-	attribs.bandwidth = 0;
-	attribs.durationInSeconds = 0;
-	attribs.targetDurationInSeconds = 0;
-	attribs.isVariantPlaylist = 0;
-	attribs.isPlaylistEnded = 0;
-	attribs.minMediaSequence = 0;
-	attribs.currentMediaSequence = 0;
-	m3u8pos=0;
+	reset_attributes(&attribs);
+	m3u8pos = 0;
 	while (1) {
-		char * eof;
+		char *eof;
 		if (f) {
 			if (!fgets(currentLine, sizeof(currentLine), f))
 				break;
 		} else {
-			u32 __idx=0;
-			if (m3u8pos>=m3u8_size)
+			u32 __idx = 0;
+			if (m3u8pos >= m3u8_size)
 				break;
 			while (1) {
 				currentLine[__idx] = m3u8_payload[m3u8pos];
@@ -558,252 +969,76 @@
 		eof = strchr(currentLine, '\n');
 		if (eof)
 			eof[0] = '\0';
-		len = (u32) strlen( currentLine);
+		len = (u32) strlen(currentLine);
 		if (len < 1)
 			continue;
 		if (currentLineNumber == 1) {
 			/* Playlist MUST start with #EXTM3U */
-			/*			if (len < 7 || strncmp("#EXTM3U", currentLine, 7)!=0) {
-							fclose(f);
-							variant_playlist_del(pl);
-							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Failed to parse M3U8 File, it should start with #EXTM3U, but was : %s\n", currentLine));
-							return GF_STREAM_NOT_FOUND;
-						}
-						continue;
-			*/
+			if (len < 7 || (strncmp("#EXTM3U", currentLine, 7) != 0)) {
+				fclose(f);
+				gf_m3u8_master_playlist_del(*playlist);
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Failed to parse M3U8 File, it should start with #EXTM3U, but was : %s\n", currentLine));
+				return GF_STREAM_NOT_FOUND;
+			}
+			continue;
 		}
 		if (currentLine[0] == '#') {
 			/* A comment or a directive */
-			if (strncmp("#EXT", currentLine, 4)==0) {
-				attributes = parseAttributes(currentLine, &attribs);
+			if (strncmp("#EXT", currentLine, 4) == 0) {
+				attributes = parse_attributes(currentLine, &attribs);
 				if (attributes == NULL) {
-					MYLOG(("Comment at line %d : %s\n", currentLineNumber, currentLine));
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Comment at line %d : %s\n", currentLineNumber, currentLine));
 				} else {
-					MYLOG(("Directive at line %d: \"%s\", attributes=", currentLineNumber, currentLine));
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Directive at line %d: \"%s\", attributes=", currentLineNumber, currentLine));
 					i = 0;
 					while (attributes[i] != NULL) {
-						MYLOG((" [%d]='%s'", i, attributes[i]));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, (" [%d]='%s'", i, attributes[i]));
 						gf_free(attributes[i]);
 						attributes[i] = NULL;
 						i++;
 					}
-					MYLOG(("\n"));
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("\n"));
 					gf_free(attributes);
 					attributes = NULL;
 				}
-				if (attribs.isPlaylistEnded) {
-					pl->playlistNeedsRefresh = 0;
-				}
-			}
-		} else {
-			char * fullURL = currentLine;
-
-			if (gf_url_is_local(currentLine)) {
-				/*
-				if (gf_url_is_local(baseURL)){
-				int num_chars = -1;
-				if (baseURL[strlen(baseURL)-1] == '/'){
-				num_chars = asprintf(&fullURL, "%s%s", baseURL, currentLine);
-				} else {
-				num_chars = asprintf(&fullURL, "%s/%s", baseURL, currentLine);
-				}
-				if (num_chars < 0 || fullURL == NULL){
-				variant_playlist_del(*playlist);
-				playlist = NULL;
-				return GF_OUT_OF_MEM;
+				if (attribs.is_playlist_ended) {
+					(*playlist)->playlist_needs_refresh = GF_FALSE;
 				}
-				} else */ {
-					fullURL = gf_url_concatenate(baseURL, currentLine);
-				}
-				assert( fullURL );
-			}
-			{
-				u32 count;
-				PlaylistElement * currentPlayList = sub_playlist;
-				/* First, we have to find the matching program */
-				Program * program = in_program;
-				if (!in_program) program = variant_playlist_find_matching_program(pl, attribs.programId);
-				/* We did not found the program, we create it */
-				if (program == NULL) {
-					program = program_new(attribs.programId);
-					if (program == NULL) {
-						/* OUT of memory */
-						variant_playlist_del(*playlist);
+				if (attribs.mediaURL) {
+					GF_Err e = declare_sub_playlist(attribs.mediaURL, baseURL, &attribs, sub_playlist, playlist, in_stream);
+					gf_free(attribs.mediaURL);
+					attribs.mediaURL = NULL;
+					if (e != GF_OK) {
 						if (f) fclose(f);
-						playlist = NULL;
-						return GF_OUT_OF_MEM;
+						return e;
 					}
-					gf_list_add(pl->programs, program);
-					if (pl->currentProgram < 0)
-						pl->currentProgram = program->programId;
 				}
-
-				/* OK, we have a program, we have to choose the elements with same bandwidth */
-				assert( program );
-				assert( program->bitrates);
-				count = gf_list_count( program->bitrates);
-
-				if (!currentPlayList) {
-					for (i = 0; i < (s32) count; i++) {
-						PlaylistElement * itPlayListElement = gf_list_get(program->bitrates, i);
-						assert( itPlayListElement );
-						if (itPlayListElement->bandwidth == attribs.bandwidth) {
-							currentPlayList = itPlayListElement;
-							break;
-						}
-					}
-				}
-
-				if (attribs.isVariantPlaylist) {
-					/* We are the Variant Playlist */
-					if (currentPlayList != NULL) {
-						/* should not happen, it means we redefine something previsouly added */
-						//assert( 0 );
-					}
-					currentPlayList = playlist_element_new(
-					 TYPE_UNKNOWN,
-					 fullURL,
-					 attribs.title,
-					 attribs.codecs,
-					 attribs.durationInSeconds,
-					 attribs.byteRangeStart, attribs.byteRangeEnd);
-					if (currentPlayList == NULL) {
-						/* OUT of memory */
-						variant_playlist_del(*playlist);
-						playlist = NULL;
-						if (f) fclose(f);
-						return GF_OUT_OF_MEM;
-					}
-					assert( fullURL);
-					currentPlayList->url = gf_strdup(fullURL);
-					currentPlayList->title = attribs.title ? gf_strdup(attribs.title):NULL;
-					currentPlayList->codecs = attribs.codecs ? gf_strdup(attribs.codecs):NULL;
-					gf_list_add(program->bitrates, currentPlayList);
-					currentPlayList->width = attribs.width;
-					currentPlayList->height = attribs.height;
-				} else {
-					/* Normal Playlist */
-					assert( pl->programs);
-					if (currentPlayList == NULL) {
-						/* This is in facts a "normal" playlist without any element in it */
-						PlaylistElement * subElement;
-						assert(baseURL);
-						currentPlayList = playlist_element_new(
-						 TYPE_PLAYLIST,
-						 baseURL,
-						 attribs.title,
-						 attribs.codecs,
-						 attribs.durationInSeconds,
-						 attribs.byteRangeStart, attribs.byteRangeEnd);
-						if (currentPlayList == NULL) {
-							/* OUT of memory */
-							variant_playlist_del(*playlist);
-							playlist = NULL;
-							if (f) fclose(f);
-							return GF_OUT_OF_MEM;
-						}
-						assert(currentPlayList->element.playlist.elements);
-						assert( fullURL);
-						assert( currentPlayList->url);
-						currentPlayList->title = NULL;
-						currentPlayList->codecs = NULL;
-						subElement = playlist_element_new(
-						 TYPE_UNKNOWN,
-						 fullURL,
-						 attribs.title,
-						 attribs.codecs,
-						 attribs.durationInSeconds,
-						 attribs.byteRangeStart, attribs.byteRangeEnd);
-						if (subElement == NULL) {
-							variant_playlist_del(*playlist);
-							playlist_element_del(currentPlayList);
-							playlist = NULL;
-							if (f) fclose(f);
-							return GF_OUT_OF_MEM;
-						}
-						gf_list_add(currentPlayList->element.playlist.elements, subElement);
-						gf_list_add(program->bitrates, currentPlayList);
-						currentPlayList->element.playlist.computed_duration += subElement->durationInfo;
-						assert( program );
-						assert( program->bitrates);
-						assert( currentPlayList);
-
-					} else {
-						PlaylistElement * subElement = playlist_element_new(
-						 TYPE_UNKNOWN,
-						 fullURL,
-						 attribs.title,
-						 attribs.codecs,
-						 attribs.durationInSeconds,
-						 attribs.byteRangeStart, attribs.byteRangeEnd);
-						if (currentPlayList->elementType != TYPE_PLAYLIST) {
-							currentPlayList->elementType = TYPE_PLAYLIST;
-							if (!currentPlayList->element.playlist.elements)
-								currentPlayList->element.playlist.elements = gf_list_new();
-						}
-						if (subElement == NULL) {
-							variant_playlist_del(*playlist);
-							playlist_element_del(currentPlayList);
-							playlist = NULL;
-							if (f) fclose(f);
-							return GF_OUT_OF_MEM;
-						}
-						gf_list_add(currentPlayList->element.playlist.elements, subElement);
-						currentPlayList->element.playlist.computed_duration += subElement->durationInfo;
-					}
-				}
-
-				currentPlayList->element.playlist.currentMediaSequence = attribs.currentMediaSequence ;
-				/* We first set the default duration for element, aka targetDuration */
-				if (attribs.targetDurationInSeconds > 0) {
-					currentPlayList->element.playlist.target_duration = attribs.targetDurationInSeconds;
-					currentPlayList->durationInfo = attribs.targetDurationInSeconds;
-				}
-				if (attribs.durationInSeconds) {
-					if (currentPlayList->durationInfo == 0) {
-						/* we set the playlist duration info as the duration of a segment, only if it's not set
-						 There are cases of playlist with the last segment with a duration different from the others
-						 (example: Apple bipbop test)*/
-						currentPlayList->durationInfo = attribs.durationInSeconds;
-					}
-				}
-				currentPlayList->element.playlist.mediaSequenceMin = attribs.minMediaSequence;
-				currentPlayList->element.playlist.mediaSequenceMax = attribs.currentMediaSequence++;
-				if (attribs.bandwidth > 1)
-					currentPlayList->bandwidth = attribs.bandwidth;
-				if (attribs.isPlaylistEnded)
-					currentPlayList->element.playlist.is_ended = 1;
-			}
-			/* Cleanup all line-specific fields */
-			if (attribs.title) {
-				gf_free(attribs.title);
-				attribs.title = NULL;
-			}
-			attribs.durationInSeconds = 0;
-			attribs.bandwidth = 0;
-			attribs.programId = 0;
-			if (attribs.codecs != NULL) {
-				gf_free(attribs.codecs);
-				attribs.codecs = NULL;
 			}
-			if (fullURL != currentLine) {
-				gf_free(fullURL);
+		} else {
+			GF_Err e = declare_sub_playlist(currentLine, baseURL, &attribs, sub_playlist, playlist, in_stream);
+			if (e != GF_OK) {
+				if (f) fclose(f);
+				return e;
 			}
 		}
 	}
 	if (f) fclose(f);
 
-	for (i=0; i < (int) gf_list_count(pl->programs); i++) {
+	for (i=0; i<(int)gf_list_count((*playlist)->streams); i++) {
 		u32 j;
-		Program *prog = gf_list_get(pl->programs, i);
+		Stream *prog = gf_list_get((*playlist)->streams, i);
 		prog->computed_duration = 0;
-		for (j=0; j<gf_list_count(prog->bitrates); j++) {
-			PlaylistElement *ple = gf_list_get(prog->bitrates, j);
-			if (ple->elementType==TYPE_PLAYLIST) {
+		for (j=0; j<gf_list_count(prog->variants); j++) {
+			PlaylistElement *ple = gf_list_get(prog->variants, j);
+			if (ple->element_type == TYPE_PLAYLIST) {
 				if (ple->element.playlist.computed_duration > prog->computed_duration)
 					prog->computed_duration = ple->element.playlist.computed_duration;
 			}
 		}
 	}
+
+	if (attribs.version < attribs.compatibility_version) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[M3U8] Version %d specified but tags from version %d detected\n", attribs.version, attribs.compatibility_version));
+	}
 	return GF_OK;
 }

gpac-0.5.1.svn5491.tar.xz/src/media_tools/media_export.c -> gpac-0.5.1.svn5619.tar.xz/src/media_tools/media_export.c Changed

@@ -748,7 +748,22 @@
 	udesc = NULL;
 
 	/* check if the output file name needs an extension or already has one */
-	add_ext = (dumper->out_name && strrchr(dumper->out_name , '.')==NULL) ? GF_TRUE : GF_FALSE;
+	if (dumper->out_name) {
+		char *lastPathPart;
+		lastPathPart = strrchr(dumper->out_name , GF_PATH_SEPARATOR);
+		if (!lastPathPart) {
+			lastPathPart = dumper->out_name;
+		} else {
+			lastPathPart++;
+		}
+		if (strrchr(lastPathPart , '.')==NULL) {
+			add_ext = GF_TRUE;
+		} else {
+			add_ext = GF_FALSE;
+		}
+	} else {
+		add_ext = GF_FALSE;
+	}
 	strcpy(szName, dumper->out_name ? dumper->out_name : "");
 
 	/* Find the decoder configuration:
@@ -1429,9 +1444,9 @@
 
 		max_size = 0;
 		frame = NULL;
-		num_samples = AVI_video_frames(in);
+		num_samples = (u32) AVI_video_frames(in);
 		for (i=0; i<num_samples; i++) {
-			size = AVI_frame_size(in, i);
+			size = (s32) AVI_frame_size(in, i);
 			if (!size) {
 				AVI_read_frame(in, NULL, (int*)&key);
 				continue;
@@ -1452,7 +1467,7 @@
 	}
 	i = 0;
 	tot_size = max_size = 0;
-	while ((size = AVI_audio_size(in, i) )>0) {
+	while ((size = (s32) AVI_audio_size(in, i) )>0) {
 		if (max_size<(u32) size) max_size=size;
 		tot_size += size;
 		i++;
@@ -1524,7 +1539,7 @@
 	num_samples = 0;
 	while (1) {
 		Bool continuous;
-		size = AVI_read_audio(in, frame, max_size, (int*)&continuous);
+		size = (s32) AVI_read_audio(in, frame, max_size, (int*)&continuous);
 		if (!size) break;
 		num_samples += size;
 		gf_fwrite(frame, 1, size, fout);
@@ -2190,7 +2205,7 @@
 							svg_data[d_stream.total_out - done] = 0;
 							fprintf(nhml, "%s", svg_data);
 							if (err== Z_STREAM_END) break;
-							done = d_stream.total_out;
+							done = (u32) d_stream.total_out;
 							d_stream.avail_out = 2048;
 							d_stream.next_out = (Bytef*)svg_data;
 						}

gpac-0.5.1.svn5491.tar.xz/src/media_tools/media_import.c -> gpac-0.5.1.svn5619.tar.xz/src/media_tools/media_import.c Changed

@@ -181,10 +181,12 @@
 	u8 OTI;
 	char *dsi, *data;
 	FILE *src;
-	Bool import_mpeg4 = 0;
+	Bool import_mpeg4 = GF_FALSE;
 
-	if (import->flags & GF_IMPORT_FORCE_MPEG4) import_mpeg4 = 1;
-	else if (import->esd) import_mpeg4 = 1;
+	if (import->flags & GF_IMPORT_FORCE_MPEG4)
+		import_mpeg4 = GF_TRUE;
+	else if (import->esd)
+		import_mpeg4 = GF_TRUE;
 
 	src = gf_f64_open(import->in_name, "rb");
 	if (!src) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
@@ -455,15 +457,37 @@
 	GF_Err e;
 	u16 sr;
 	u32 nb_chan;
-	Bool force_mpeg4 = 0;
+	Bool force_mpeg4 = GF_FALSE;
 	FILE *in;
-	u32 hdr, size, max_size, track, di;
+	u32 hdr, size, max_size, track, di, id3_end = 0;
 	u64 done, tot_size, offset, duration;
 	GF_ISOSample *samp;
 
 	in = gf_f64_open(import->in_name, "rb");
 	if (!in) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
 
+
+	{
+		unsigned char id3v2[10];
+		u32 pos = (u32) fread(id3v2, sizeof(unsigned char), 10, in);
+		if (pos == 10) {
+			/* Did we read an ID3v2 ? */
+			if (id3v2[0] == 'I' && id3v2[1] == 'D' && id3v2[2] == '3') {
+				u32 sz = ((id3v2[9] & 0x7f) + ((id3v2[8] & 0x7f) << 7) + ((id3v2[7] & 0x7f) << 14) + ((id3v2[6] & 0x7f) << 21));
+
+				while (sz) {
+					u32 r = (u32) fread(id3v2, sizeof(unsigned char), 1, in);
+					if (r != 1) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[MP3 import] failed to read ID3\n"));
+					}
+					sz--;
+				}
+				id3_end = ftell(in); 
+			}
+		}
+		fseek(in, id3_end, SEEK_SET);
+	}
+
 	hdr = gf_mp3_get_next_header(in);
 	if (!hdr) {
 		fclose(in);
@@ -536,7 +560,7 @@
 
 	gf_f64_seek(in, 0, SEEK_END);
 	tot_size = gf_f64_tell(in);
-	gf_f64_seek(in, 0, SEEK_SET);
+	gf_f64_seek(in, id3_end, SEEK_SET);
 
 	e = GF_OK;
 	samp = gf_isom_sample_new();
@@ -697,7 +721,7 @@
 					num_lay = gf_bs_read_int(bs, 3);
 					for (j=0; j<=num_lay; j++) {
 						u32 frameLengthType;
-						Bool same_cfg = 0;
+						Bool same_cfg = GF_FALSE;
 						if (i || j) same_cfg = gf_bs_read_int(bs, 1);
 
 						if (!same_cfg) {
@@ -1498,8 +1522,8 @@
 			import->tk_info[i+1].track_num = i+2;
 			import->tk_info[i+1].type = GF_ISOM_MEDIA_AUDIO;
 			import->tk_info[i+1].flags = GF_IMPORT_USE_DATAREF;
-			import->tk_info[i+1].audio_info.sample_rate = AVI_audio_rate(in);
-			import->tk_info[i+1].audio_info.nb_channels = AVI_audio_channels(in);
+			import->tk_info[i+1].audio_info.sample_rate = (u32) AVI_audio_rate(in);
+			import->tk_info[i+1].audio_info.nb_channels = (u32) AVI_audio_channels(in);
 			import->nb_tracks ++;
 		}
 		AVI_close(in);
@@ -1562,7 +1586,7 @@
 	max_size = 0;
 	samp_offset = 0;
 	frame = NULL;
-	num_samples = AVI_video_frames(in);
+	num_samples = (u32) AVI_video_frames(in);
 	samp = gf_isom_sample_new();
 	PL = 0;
 	track = 0;
@@ -1904,7 +1928,7 @@
 
 	i = 0;
 	tot_size = max_size = 0;
-	while ((size = AVI_audio_size(in, i) )>0) {
+	while ((size = (s32) AVI_audio_size(in, i) )>0) {
 		if (max_size<size) max_size=size;
 		tot_size += size;
 		i++;
@@ -1933,7 +1957,7 @@
 			if (max_size) is_cbr = 0;
 			max_size = size;
 		}
-		size = 4 + AVI_read_audio(in, &frame[4], size - 4, &continuous);
+		size = 4 + (s32) AVI_read_audio(in, &frame[4], size - 4, &continuous);
 
 		if ((import->flags & GF_IMPORT_USE_DATAREF) && !continuous) {
 			gf_import_message(import, GF_IO_ERR, "Cannot use media references, splitted input audio frame found");
@@ -2089,6 +2113,10 @@
 	}
 
 	gf_odf_desc_del((GF_Descriptor *) iod);
+	if ( ! gf_isom_get_track_count(import->dest)) {
+		u32 timescale = gf_isom_get_timescale(import->orig);
+		gf_isom_set_timescale(import->dest, timescale);
+	}
 
 	e = gf_isom_clone_track(import->orig, track_in, import->dest, (import->flags & GF_IMPORT_USE_DATAREF), &track);
 	if (e) goto exit;
@@ -2990,7 +3018,7 @@
 	}
 
 	memcpy(samp->data + offset, dest, sizeof(char)*stream.total_out);
-	samp->dataLength = offset + stream.total_out;
+	samp->dataLength = (u32) (offset + stream.total_out);
 	gf_free(dest);
 
 	deflateEnd(&stream);
@@ -3477,11 +3505,11 @@
 			e = gf_xml_parse_bit_sequence(node, &samp->data, &samp->dataLength);
 			max_size = samp->dataLength;
 		} else {
-			Bool close = 0;
+			Bool close = GF_FALSE;
 			FILE *f = mdia;
 			if (strlen(szMediaTemp)) {
 				f = gf_f64_open(szMediaTemp, "rb");
-				close = 1;
+				close = GF_TRUE;
 				if (offset) gf_f64_seek(f, offset, SEEK_SET);
 			} else {
 				if (!offset) offset = media_done;
@@ -5455,16 +5483,16 @@
 	last_poc = max_last_poc = max_last_b_poc = prev_last_poc = 0;
 	max_total_delay = 0;
 
-	gf_isom_set_cts_packing(import->dest, track, 1);
-	has_cts_offset = 0;
+	gf_isom_set_cts_packing(import->dest, track, GF_TRUE);
+	has_cts_offset = GF_FALSE;
 	min_poc = 0;
 	poc_shift = 0;
-	flush_next_sample = 0;
-	is_empty_sample = 1;
+	flush_next_sample = GF_FALSE;
+	is_empty_sample = GF_TRUE;
 
 	while (gf_bs_available(bs)) {
 		s32 res;
-		Bool force_shvc = 0;
+		Bool force_shvc = GF_FALSE;
 		GF_HEVCConfig *prev_cfg;
 		u8 nal_unit_type, temporal_id, layer_id;
 		Bool skip_nal, add_sps, is_slice, has_vcl_nal;
@@ -6824,7 +6852,7 @@
 		if (!stream_id) stream_id = 1000;
 
 		if ((type==1) || (type==2) || (type==7)) {
-			Bool in_root_od = 0;
+			Bool in_root_od = GF_FALSE;
 			u32 mtype, stype;
 			char *name = "Unknown";
 
@@ -6922,10 +6950,10 @@
 					import->nb_tracks++;
 				}
 			} else if ((stream_id==import->trackID) && !track) {
-				Bool delete_esd = 0;
+				Bool delete_esd = GF_FALSE;
 				if (!import->esd) {
 					import->esd = gf_odf_desc_esd_new(0);
-					delete_esd = 1;
+					delete_esd = GF_TRUE;
 					if (import->esd->URLString) gf_free(import->esd->URLString);
 					import->esd->URLString = NULL;
 				}
@@ -7143,7 +7171,7 @@
 	GF_MediaImporter *import= (GF_MediaImporter *)tsimp->import;
 	if (mtype != GF_ISOM_MEDIA_ESM) {
 		u32 di;
-		Bool destroy_esd = 0;
+		Bool destroy_esd = GF_FALSE;
 		if (import->esd) mpeg4_es_id = import->esd->ESID;
 		else if (!mpeg4_es_id) mpeg4_es_id = import->trackID;
 
@@ -7637,26 +7665,26 @@
 		if (tsimp->avccfg && !pck->data[0] && !pck->data[1]) {
 			GF_AVCConfigSlot *slc;
 			s32 idx;
-			Bool add_sps, is_subseq = 0;
+			Bool add_sps, is_subseq = GF_FALSE;
 			u32 nal_type = pck->data[4] & 0x1F;
 
 			switch (nal_type) {
 			case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
-				is_subseq = 1;
+				is_subseq = GF_TRUE;
 			case GF_AVC_NALU_SEQ_PARAM:
 				idx = gf_media_avc_read_sps(pck->data+4, pck->data_len-4, &tsimp->avc, is_subseq, NULL);
 
-				add_sps = 0;
+				add_sps = GF_FALSE;
 				if (idx>=0) {
 					if (is_subseq) {
 						if ((tsimp->avc.sps[idx].state & AVC_SUBSPS_PARSED) && !(tsimp->avc.sps[idx].state & AVC_SUBSPS_DECLARED)) {
 							tsimp->avc.sps[idx].state |= AVC_SUBSPS_DECLARED;
-							add_sps = 1;
+							add_sps = GF_TRUE;
 						}
 					} else {
 						if ((tsimp->avc.sps[idx].state & AVC_SPS_PARSED) && !(tsimp->avc.sps[idx].state & AVC_SPS_DECLARED)) {
 							tsimp->avc.sps[idx].state |= AVC_SPS_DECLARED;
-							add_sps = 1;
+							add_sps = GF_TRUE;
 						}
 					}
 					if (add_sps) {
@@ -7693,7 +7721,7 @@
 				return;
 			/*remove*/
 			case GF_AVC_NALU_ACCESS_UNIT:
-				tsimp->force_next_au_start = 1;
+				tsimp->force_next_au_start = GF_TRUE;
 				return;
 			case GF_AVC_NALU_FILLER_DATA:
 			case GF_AVC_NALU_END_OF_SEQ:
@@ -7709,8 +7737,8 @@
 			}
 
 			if (tsimp->force_next_au_start) {
-				is_au_start = 1;
-				tsimp->force_next_au_start = 0;
+				is_au_start = GF_TRUE;
+				tsimp->force_next_au_start = GF_FALSE;
 			}
 		}
 
@@ -7719,7 +7747,7 @@
 #ifndef GPAC_DISABLE_HEVC
 		else if (tsimp->hevccfg && !pck->data[0] && !pck->data[1]) {
 			s32 idx;
-			Bool add_sps, is_subseq = 0;
+			Bool add_sps, is_subseq = GF_FALSE;
 			u32 nal_type = (pck->data[4] & 0x7E) >> 1;
 
 			switch (nal_type) {
@@ -8071,7 +8099,7 @@
 	GF_TSImport tsimp;
 	u64 fsize, done;
 	u32 size, i;
-	Bool do_import = 1;
+	Bool do_import = GF_TRUE;
 	FILE *mts;
 	char progress[1000];
 
@@ -8222,7 +8250,7 @@
 	int		 version;
 	vobsub_file	 *vobsub = NULL;
 	u32		 c, trackID, track, di;
-	Bool		 destroy_esd = 0;
+	Bool		 destroy_esd = GF_FALSE;
 	GF_Err		 err = GF_OK;
 	GF_ISOSample	 *samp = NULL;
 	GF_List		 *subpic;
@@ -8658,7 +8686,7 @@
 	gf_f64_seek(f, offset, SEEK_SET);
 
 	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		Bool is_chap_or_sub = 0;
+		Bool is_chap_or_sub = GF_FALSE;
 		import->nb_tracks = 0;
 		while (!is_chap_or_sub && (fgets(line, 1024, f) != NULL)) {
 			char *sep;
@@ -8973,7 +9001,7 @@
 	 || !stricmp(fmt, "AVC") || !stricmp(fmt, "H264") )
 		return gf_import_avc_h264(importer);
 	/*HEVC video*/
-	if (!strnicmp(ext, ".hevc", 5) || !strnicmp(ext, ".hvc", 4) || !strnicmp(ext, ".265", 4) || !strnicmp(ext, ".shvc", 5)
+	if (!strnicmp(ext, ".hevc", 5) || !strnicmp(ext, ".hvc", 4) || !strnicmp(ext, ".265", 4) || !strnicmp(ext, ".h265", 5) || !strnicmp(ext, ".shvc", 5)
 	 || !stricmp(fmt, "HEVC") || !stricmp(fmt, "SHVC") || !stricmp(fmt, "H265") )
 		return gf_import_hevc(importer);
 	/*AC3 and E-AC3*/
@@ -9057,7 +9085,7 @@
 		gf_free(xml_type);
 	}
 
-	return gf_import_message(importer, e, "Unknown input file type");
+	return gf_import_message(importer, e, "[Importer] Unknown input file type for \"%s\"", importer->in_name);
 }

gpac-0.5.1.svn5491.tar.xz/src/media_tools/mpd.c -> gpac-0.5.1.svn5619.tar.xz/src/media_tools/mpd.c Changed

@@ -1,27 +1,27 @@
-/*
-*			GPAC - Multimedia Framework C SDK
-*
+/**
+ *			GPAC - Multimedia Framework C SDK
+ *
 *			Authors: Jean Le Feuvre, Cyril COncolato
 *			Copyright (c) Telecom ParisTech 2000-2012
-*					All rights reserved
-*
-* This file is part of GPAC / 3GPP/MPEG Media Presentation Description input module
-*
-* GPAC is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation; either version 2, or (at your option)
-* any later version.
-*
-* GPAC is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; see the file COPYING. If not, write to
-* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-*/
+ *					All rights reserved
+ *
+ * This file is part of GPAC / 3GPP/MPEG Media Presentation Description input module
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
 
 #include <gpac/internal/mpd.h>
 #include <gpac/download.h>
@@ -51,7 +51,7 @@
 {
 	if (child->type != GF_XML_NODE_TYPE) return 0;
 	if (!mpd->xml_namespace && !child->ns) return 1;
-	if (mpd->xml_namespace && child->ns && !strcmp(mpd->xml_namespace, child->ns) ) return 1;
+	if (mpd->xml_namespace && child->ns && !strcmp(mpd->xml_namespace, child->ns)) return 1;
 	return 0;
 }
 
@@ -430,9 +430,22 @@
 	return GF_OK;
 }
 
+#define MPD_STORE_EXTENSION_ATTR(_elem)	\
+			if (!_elem->attributes) _elem->attributes = gf_list_new();	\
+			i--;	\
+			gf_list_rem(root->attributes, i);	\
+			gf_list_add(_elem->attributes, att);	\
+
+#define MPD_STORE_EXTENSION_NODE(_elem)	\
+		if (!_elem->children) _elem->children = gf_list_new();	\
+		i--;	\
+		gf_list_rem(root->content, i);	\
+		gf_list_add(_elem->children, child);	\
+
 static GF_Err gf_mpd_parse_descriptor(GF_List *container, GF_XMLNode *root)
 {
 	GF_XMLAttribute *att;
+	GF_XMLNode *child;
 	GF_MPD_Descriptor *mpd_desc;
 	u32 i = 0;
 
@@ -441,8 +454,20 @@
 		if (!strcmp(att->name, "schemeIdUri")) mpd_desc->scheme_id_uri = gf_mpd_parse_string(att->value);
 		else if (!strcmp(att->name, "value")) mpd_desc->value = gf_mpd_parse_string(att->value);
 		else if (!strcmp(att->name, "id")) mpd_desc->id = gf_mpd_parse_string(att->value);
+		else {
+			MPD_STORE_EXTENSION_ATTR(mpd_desc)
+		}
 	}
 	gf_list_add(container, mpd_desc);
+
+	i = 0;
+	while ( (child = gf_list_enum(root->content, &i))) {
+		if (child->type != GF_XML_NODE_TYPE) continue;
+
+		MPD_STORE_EXTENSION_NODE(mpd_desc)
+
+	}
+
 	return GF_OK;
 }
 
@@ -739,9 +764,8 @@
 	if (ptr->sourceURL) gf_free(ptr->sourceURL);
 	gf_free(ptr);
 }
-void gf_mpd_string_free(void *_item)
-{
-	gf_free( (char *) _item );
+void gf_mpd_string_free(void *_item) {
+	gf_free(_item);
 }
 
 void gf_mpd_prog_info_free(void *_item)
@@ -807,12 +831,37 @@
 	if (ptr->bitstream_switching) gf_free(ptr->bitstream_switching);
 	gf_free(ptr);
 }
+
+void gf_mpd_extensible_free(GF_MPD_ExtensibleVirtual *item)
+{
+	if (item->attributes) {
+		while (gf_list_count(item->attributes)) {
+			GF_XMLAttribute *att = gf_list_last(item->attributes);
+			gf_list_rem_last(item->attributes);
+			if (att->name) gf_free(att->name);
+			if (att->value) gf_free(att->value);
+			gf_free(att);
+		}
+		gf_list_del(item->attributes);
+	}
+	if (item->children) {
+		while (gf_list_count(item->children)) {
+			GF_XMLNode *child = gf_list_last(item->children);
+			gf_list_rem_last(item->children);
+			gf_xml_dom_node_del(child);
+		}
+		gf_list_del(item->children);
+	}
+}
+
 void gf_mpd_descriptor_free(void *item)
 {
 	GF_MPD_Descriptor *mpd_desc = (GF_MPD_Descriptor*) item;
 	if (mpd_desc->id) gf_free(mpd_desc->id);
 	if (mpd_desc->scheme_id_uri) gf_free(mpd_desc->scheme_id_uri);
 	if (mpd_desc->value) gf_free(mpd_desc->value);
+	gf_mpd_extensible_free((GF_MPD_ExtensibleVirtual *)mpd_desc);
+
 	gf_free(mpd_desc);
 }
 
@@ -902,6 +951,7 @@
 	gf_mpd_del_list(mpd->periods, gf_mpd_period_free, 0);
 	if (mpd->profiles) gf_free(mpd->profiles);
 	if (mpd->ID) gf_free(mpd->ID);
+	gf_mpd_extensible_free((GF_MPD_ExtensibleVirtual*) mpd);
 	gf_free(mpd);
 }
 
@@ -910,18 +960,14 @@
 GF_Err gf_mpd_complete_from_dom(GF_XMLNode *root, GF_MPD *mpd, const char *default_base_url)
 {
 	GF_Err e;
-	Bool ns_ok = 0;
-	u32 att_index, child_index;
+	u32 i;
+	Bool ns_ok = GF_FALSE;
 	GF_XMLAttribute *att;
 	GF_XMLNode *child;
 
 	if (!root || !mpd) return GF_BAD_PARAM;
-
-	att_index = 0;
-	child_index = gf_list_count(root->attributes);
-	for (att_index = 0 ; att_index < child_index; att_index++) {
-		att = gf_list_get(root->attributes, att_index);
-		if (!att) continue;
+	i=0;
+	while ((att = gf_list_enum(root->attributes, &i))) {
 		if (!strcmp(att->name, "xmlns")) {
 			if (!root->ns && (!strcmp(att->value, "urn:mpeg:dash:schema:mpd:2011") || !strcmp(att->value, "urn:mpeg:DASH:schema:MPD:2011")) ) {
 				ns_ok = 1;
@@ -945,13 +991,8 @@
 		return gf_mpd_parse_period(mpd, root);
 	}
 
-	att_index = 0;
-	for (att_index = 0 ; att_index < child_index; att_index++) {
-		att = gf_list_get(root->attributes, att_index);
-		if (!att) {
-			continue;
-		}
-
+	i = 0;
+	while ((att = gf_list_enum(root->attributes, &i))) {
 		if (!strcmp(att->name, "id")) {
 			mpd->ID = gf_mpd_parse_string(att->value);
 		} else if (!strcmp(att->name, "profiles")) {
@@ -979,35 +1020,36 @@
 			mpd->max_segment_duration = gf_mpd_parse_duration(att->value);
 		} else if (!strcmp(att->name, "maxSubsegmentDuration")) {
 			mpd->max_subsegment_duration = gf_mpd_parse_duration(att->value);
+		} else {
+			MPD_STORE_EXTENSION_ATTR(mpd)
 		}
 	}
 	if (mpd->type == GF_MPD_TYPE_STATIC)
 		mpd->minimum_update_period = mpd->time_shift_buffer_depth = 0;
 
-	child_index = 0;
-	while (1) {
-		child = gf_list_get(root->content, child_index);
-		if (!child) {
-			break;
-		} else if (gf_mpd_valid_child(mpd, child) ) {
-			if (!strcmp(child->name, "ProgramInformation")) {
-				e = gf_mpd_parse_program_info(mpd, child);
-				if (e) return e;
-			} else if (!strcmp(child->name, "Location")) {
-				e = gf_mpd_parse_location(mpd, child);
-				if (e) return e;
-			} else if (!strcmp(child->name, "Period")) {
-				e = gf_mpd_parse_period(mpd, child);
-				if (e) return e;
-			} else if (!strcmp(child->name, "Metrics")) {
-				e = gf_mpd_parse_metrics(mpd, child);
-				if (e) return e;
-			} else if (!strcmp(child->name, "BaseURL")) {
-				e = gf_mpd_parse_base_url(mpd->base_URLs, child);
-				if (e) return e;
-			}
+	i = 0;
+	while ( ( child = gf_list_enum(root->content, &i )) ) {
+		if (! gf_mpd_valid_child(mpd, child)) 
+			continue;
+
+		if (!strcmp(child->name, "ProgramInformation")) {
+			e = gf_mpd_parse_program_info(mpd, child);
+			if (e) return e;
+		} else if (!strcmp(child->name, "Location")) {
+			e = gf_mpd_parse_location(mpd, child);
+			if (e) return e;
+		} else if (!strcmp(child->name, "Period")) {
+			e = gf_mpd_parse_period(mpd, child);
+			if (e) return e;
+		} else if (!strcmp(child->name, "Metrics")) {
+			e = gf_mpd_parse_metrics(mpd, child);
+			if (e) return e;
+		} else if (!strcmp(child->name, "BaseURL")) {
+			e = gf_mpd_parse_base_url(mpd->base_URLs, child);
+			if (e) return e;
+		} else {
+			MPD_STORE_EXTENSION_NODE(mpd)
 		}
-		child_index++;
 	}
 	return GF_OK;
 }
@@ -1018,17 +1060,16 @@
 {
 	if (!root || !mpd) return GF_BAD_PARAM;
 
-	assert( !mpd->periods );
+	assert(!mpd->periods);
 	mpd->periods = gf_list_new();
 	mpd->program_infos = gf_list_new();
 	mpd->base_URLs = gf_list_new();
 	mpd->locations = gf_list_new();
 	mpd->metrics = gf_list_new();
+
 	/*setup some defaults*/
 	mpd->type = GF_MPD_TYPE_STATIC;
-	/*infinite by default*/
-	mpd->time_shift_buffer_depth = (u32) -1;
-
+	mpd->time_shift_buffer_depth = (u32) -1; /*infinite by default*/
 	mpd->xml_namespace = NULL;
 
 	return gf_mpd_complete_from_dom(root, mpd, default_base_url);
@@ -1041,20 +1082,21 @@
 {
 	GF_Err e;
 	char *sep, *template_base, *template_ext;
-	u32 i, count, j, count2, k, count3, template_width, template_idx_start;
+	u32 i, nb_streams, j, k, template_width, template_idx_start;
 	Double update_interval;
-	VariantPlaylist * pl = NULL;
+	MasterPlaylist *pl = NULL;
 	Bool use_template;
-	Program *prog;
+	Stream *stream;
 	PlaylistElement *pe, *the_pe, *elt;
 	FILE *fmpd;
 	Bool is_end;
 	u32 max_dur = 0;
 
-	e = parse_root_playlist(m3u8_file, &pl, base_url);
+	e = gf_m3u8_parse_master_playlist(m3u8_file, &pl, base_url);
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[M3U8] Failed to parse root playlist '%s', error = %s\n", m3u8_file, gf_error_to_string(e)));
-		if (pl) variant_playlist_del(pl);
+		if (pl)
+			gf_m3u8_master_playlist_del(pl);
 		pl = NULL;
 		return e;
 	}
@@ -1062,55 +1104,54 @@
 		gf_delete_file(m3u8_file);
 		mpd_file = m3u8_file;
 	}
+
 	the_pe = NULL;
 	pe = NULL;
-	i=0;
-	assert( pl );
-	assert( pl->programs );
-	while ((prog = gf_list_enum(pl->programs, &i))) {
-		u32 j=0;
-
-		while (NULL != (pe = gf_list_enum(prog->bitrates, &j))) {
-			Bool found = 0;
-			u32 k;
+	i = 0;
+	assert(pl);
+	assert(pl->streams);
+	while ((stream = gf_list_enum(pl->streams, &i))) {
+		j = 0;
+		while (NULL != (pe = gf_list_enum(stream->variants, &j))) {
+			Bool found = GF_FALSE;
 			char *suburl;
-
-			if (!pe->url )
+			if (!pe->url)
 				continue;
 
-			/*filter out duplicated entries (seen on M6 m3u8)*/
-			for (k=0; k<j-1; k++) {
-				PlaylistElement *a_pe = gf_list_get(prog->bitrates, k);
+			/* filter out duplicated entries (seen on M6 m3u8) */
+			for (k=0; k<j-1; ++k) {
+				PlaylistElement *a_pe = gf_list_get(stream->variants, k);
 				if (a_pe->url && pe->url && !strcmp(a_pe->url, pe->url)) {
-					found = 1;
+					found = GF_TRUE;
 					break;
 				}
 			}
-			if (found) continue;
+			if (found)
+				continue;
 
 			the_pe = pe;
 			suburl = NULL;
-
-			/*not HLS*/
-			if ( !strstr(pe->url, ".m3u8"))
-				continue;
+			if (!strstr(pe->url, ".m3u8"))
+				continue; /*not HLS*/
 
 			if (strcmp(base_url, pe->url))
 				suburl = gf_url_concatenate(base_url, pe->url);
 
 			if (!suburl || !strcmp(base_url, suburl)) {
-				if (suburl) gf_free(suburl);
+				if (suburl)
+					gf_free(suburl);
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD Generator] Not downloading, programs are identical for %s...\n", pe->url));
 				continue;
 			}
+
 			if (getter && getter->new_session && getter->del_session && getter->get_cache_name) {
 				e = getter->new_session(getter, suburl);
 				if (e) {
 					gf_free(suburl);
 					break;
 				}
-				if (e==GF_OK) {
-					e = parse_sub_playlist(getter->get_cache_name(getter), &pl, suburl, prog, pe);
+				if (e == GF_OK) {
+					e = gf_m3u8_parse_sub_playlist(getter->get_cache_name(getter), &pl, suburl, stream, pe);
 				}
 				getter->del_session(getter);
 
@@ -1122,78 +1163,88 @@
 				}
 				e = gf_dm_sess_process(sess);
 				if (e==GF_OK) {
-					e = parse_sub_playlist(gf_dm_sess_get_cache_name(sess), &pl, suburl, prog, pe);
+					e = gf_m3u8_parse_sub_playlist(gf_dm_sess_get_cache_name(sess), &pl, suburl, prog, pe);
 				}
 				gf_service_download_del(sess);
 #endif
-				gf_free(suburl);
 			} else { /* for use in MP4Box */
-				if (strstr(suburl, "://") ) {
+				if (strstr(suburl, "://")) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD Generator] Downloading %s...\n", suburl));
 					e = gf_dm_wget(suburl, "tmp.m3u8", 0, 0);
-					if (e==GF_OK) {
-						e = parse_sub_playlist("tmp.m3u8", &pl, suburl, prog, pe);
+					if (e == GF_OK) {
+						e = gf_m3u8_parse_sub_playlist("tmp.m3u8", &pl, suburl, stream, pe);
+					} else {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD Generator] Download faile for %s\n", suburl));
 					}
 					gf_delete_file("tmp.m3u8");
 				} else {
-					e = parse_sub_playlist(suburl, &pl, suburl, prog, pe);
+					e = gf_m3u8_parse_sub_playlist(suburl, &pl, suburl, stream, pe);
 				}
 			}
+			gf_free(suburl);
+		}
+		if (max_dur < (u32) stream->computed_duration) {
+			max_dur = (u32) stream->computed_duration;
 		}
-		if (max_dur < (u32) prog->computed_duration)
-			max_dur = (u32) prog->computed_duration;
 	}
 
-	is_end = !pl->playlistNeedsRefresh;
+	is_end = !pl->playlist_needs_refresh;
 	assert(the_pe);
 
 	update_interval = 0;
 	/*update interval is set to the duration of the last media file with rules defined in http live streaming RFC section 6.3.4*/
 	switch (reload_count) {
 	case 0:
-		update_interval = the_pe->durationInfo;
+		update_interval = the_pe->duration_info;
 		break;
 	case 1:
-		update_interval = (Double)the_pe->durationInfo/2;
+		update_interval = (Double)the_pe->duration_info / 2;
 		break;
 	case 2:
-		update_interval = 3*((Double)the_pe->durationInfo/2);
+		update_interval = 3 * ((Double)the_pe->duration_info / 2);
 		break;
 	default:
-		update_interval = 3*(the_pe->durationInfo);
+		update_interval = 3 * the_pe->duration_info;
 		break;
 	}
-	if (is_end || ((the_pe->elementType == TYPE_PLAYLIST) && the_pe->element.playlist.is_ended)) {
+	if (is_end || ((the_pe->element_type == TYPE_PLAYLIST) && the_pe->element.playlist.is_ended)) {
 		update_interval = 0;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD Generator] NO NEED to refresh playlist !\n"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD Generator] No need to refresh playlist!\n"));
 	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD Generator] Playlist will be refreshed every %g seconds, len=%d\n", update_interval, the_pe->durationInfo));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD Generator] Playlist will be refreshed every %g seconds, len=%d\n", update_interval, the_pe->duration_info));
 	}
 
-	assert( mpd_file );
+	assert(mpd_file);
 	fmpd = gf_f64_open(mpd_file, "wt");
 	if (!fmpd) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD Generator] Cannot write to temp file %s!\n", mpd_file));
-		variant_playlist_del(pl);
+		gf_m3u8_master_playlist_del(pl);
 		return GF_IO_ERR;
 	}
+
 	fprintf(fmpd, "<MPD type=\"%s\" xmlns=\"urn:mpeg:DASH:schema:MPD:2011\" profiles=\"urn:mpeg:dash:profile:full:2011\"", is_end ? "static" : "dynamic" );
 	sep = strrchr(m3u8_file, '/');
-	if (!sep) sep = strrchr(m3u8_file, '\\');
-	if (sep) sep = sep + 1;
-	else sep = (char *)m3u8_file;
+	if (!sep)
+		sep = strrchr(m3u8_file, '\\');
+	if (sep)
+		sep = sep + 1;
+	else
+		sep = (char *)m3u8_file;
 	fprintf(fmpd, " id=\"%s\"", sep);
 
-	if (update_interval) fprintf(fmpd, " minimumUpdatePeriod=\"PT%02.2gS\"", update_interval);
-	if (is_end) fprintf(fmpd, " mediaPresentationDuration=\"PT%dS\"", max_dur);
+	if (update_interval)
+		fprintf(fmpd, " minimumUpdatePeriod=\"PT%02.2gS\"", update_interval);
+	if (is_end)
+		fprintf(fmpd, " mediaPresentationDuration=\"PT%dS\"", max_dur);
 	fprintf(fmpd, " minBufferTime=\"PT1.5S\"");
 	fprintf(fmpd, ">\n");
 
 	fprintf(fmpd, " <ProgramInformation moreInformationURL=\"http://gpac.sourceforge.net\">\n");
 	{
-		char * title = the_pe->title;
+		char *title = the_pe->title;
 		if (!title || strlen(title) < 2)
 			title = the_pe->url;
-		fprintf(fmpd, " <Title>%s</Title>\n", title );
+		fprintf(fmpd, " <Title>%s</Title>\n", title);
 	}
 	fprintf(fmpd, " <Source>Generated from URL %s</Source>\n", base_url );
 	fprintf(fmpd, " <Copyright>Generated by GPAC %s from %s</Copyright>\n", GPAC_FULL_VERSION, base_url);
@@ -1202,25 +1253,28 @@
 	fprintf(fmpd, " <Period start=\"PT0S\"");
 	if (is_end) fprintf(fmpd, " duration=\"PT%dS\"", max_dur);
 	fprintf(fmpd, " >\n");
-
-
-	count = gf_list_count(pl->programs);
+	
+	nb_streams = gf_list_count(pl->streams);
 	/*check if we use templates*/
 	template_base = NULL;
 	template_ext = NULL;
 	use_template = use_mpd_templates;
 	template_width = 0;
 	template_idx_start = 0;
-	for (i=0; i<count; i++) {
-		prog = gf_list_get(pl->programs, i);
-		count2 = gf_list_count(prog->bitrates);
-		for (j = 0; j<count2; j++) {
-			pe = gf_list_get(prog->bitrates, j);
-			if (pe->elementType != TYPE_PLAYLIST)
+	elt = NULL;
+	for (i=0; i<nb_streams; i++) {
+		u32 count_variants;
+		stream = gf_list_get(pl->streams, i);
+		count_variants = gf_list_count(stream->variants);
+		for (j=0; j<count_variants; j++) {
+			u32 count_elements;
+			pe = gf_list_get(stream->variants, j);
+			if (pe->element_type != TYPE_PLAYLIST)
 				continue;
 
-			count3 = gf_list_count(pe->element.playlist.elements);
-			if (!count3) continue;
+			count_elements = gf_list_count(pe->element.playlist.elements);
+			if (!count_elements)
+				continue;
 
 			if (!template_base && use_template) {
 				char *sub_url;
@@ -1247,7 +1301,7 @@
 					}
 					k++;
 					if (!template_base[k]) {
-						use_template = 0;
+						use_template = GF_FALSE;
 						break;
 					}
 				}
@@ -1255,22 +1309,28 @@
 			if (!template_ext) template_ext="";
 
 			if (use_template) {
-				for (k=0; k<count3; k++) {
+				for (k=0; k<count_elements; k++) {
 					char szURL[GF_MAX_PATH], *sub_url;
 					elt = gf_list_get(pe->element.playlist.elements, k);
 
-					if (template_width==2) sprintf(szURL, "%s%02d%s", template_base, template_idx_start + k, template_ext);
-					else if (template_width==3) sprintf(szURL, "%s%03d%s", template_base, template_idx_start + k, template_ext);
-					else if (template_width==4) sprintf(szURL, "%s%04d%s", template_base, template_idx_start + k, template_ext);
-					else if (template_width==5) sprintf(szURL, "%s%05d%s", template_base, template_idx_start + k, template_ext);
-					else if (template_width==6) sprintf(szURL, "%s%06d%s", template_base, template_idx_start + k, template_ext);
-					else sprintf(szURL, "%s%d%s", template_base, template_idx_start + k, template_ext);
+					if (template_width == 2)
+						sprintf(szURL, "%s%02d%s", template_base, template_idx_start + k, template_ext);
+					else if (template_width == 3)
+						sprintf(szURL, "%s%03d%s", template_base, template_idx_start + k, template_ext);
+					else if (template_width == 4)
+						sprintf(szURL, "%s%04d%s", template_base, template_idx_start + k, template_ext);
+					else if (template_width == 5)
+						sprintf(szURL, "%s%05d%s", template_base, template_idx_start + k, template_ext);
+					else if (template_width == 6)
+						sprintf(szURL, "%s%06d%s", template_base, template_idx_start + k, template_ext);
+					else
+						sprintf(szURL, "%s%d%s", template_base, template_idx_start + k, template_ext);
 
 					sub_url = strrchr(elt->url, '/');
 					if (!sub_url) sub_url = elt->url;
 					else sub_url ++;
 					if (strcmp(szURL, sub_url)) {
-						use_template = 0;
+						use_template = GF_FALSE;
 						break;
 					}
 				}
@@ -1278,95 +1338,98 @@
 
 		}
 	}
+	
+	nb_streams = gf_list_count(pl->streams);
+	for (i=0; i<nb_streams; i++) {
+		u32 count_variants;
+		u32 width, height, samplerate, num_channels;
+		fprintf(fmpd, " <AdaptationSet segmentAlignment=\"true\">\n");
 
-	fprintf(fmpd, " <AdaptationSet segmentAlignment=\"true\">\n");
-
-	/*if we use templates, put the SegmentTemplate element at the adaptationSet level*/
-	if (use_template) {
-		fprintf(fmpd, " <SegmentTemplate");
+		/*if we use templates, put the SegmentTemplate element at the adaptationSet level*/
+		if (use_template) {
+			fprintf(fmpd, " <SegmentTemplate");
 
-		fprintf(fmpd, " duration=\"%d\"", pe->durationInfo);
-		if (template_width>1) {
-			fprintf(fmpd, " media=\"%s$%%0%ddNumber$%s\"", template_base, template_width, template_ext);
-		} else {
-			fprintf(fmpd, " media=\"%s$Number$%s\"", template_base, template_ext);
+			fprintf(fmpd, " duration=\"%d\"", (u32) pe->duration_info);
+			if (template_width > 1) {
+				fprintf(fmpd, " media=\"%s$%%0%ddNumber$%s\"", template_base, template_width, template_ext);
+			} else {
+				fprintf(fmpd, " media=\"%s$Number$%s\"", template_base, template_ext);
+			}
+			fprintf(fmpd, " startNumber=\"%d\"", template_idx_start);
+			fprintf(fmpd, "/>\n");
 		}
-		fprintf(fmpd, " startNumber=\"%d\"", template_idx_start);
-		fprintf(fmpd, "/>\n");
-	}
 
-	if (do_import) {
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
-		GF_Err e;
-		GF_MediaImporter import;
-		char *tmp_file = NULL;
-		elt = gf_list_get(pe->element.playlist.elements, 0);
-		memset(&import, 0, sizeof(GF_MediaImporter));
-		import.trackID = 0;
-		import.flags = GF_IMPORT_PROBE_ONLY;
-
-		if (strstr(elt->url, "://") && !strstr(elt->url, "file://")) {
-			tmp_file = strrchr(elt->url, '/');
-			if (!tmp_file) tmp_file = strrchr(elt->url, '\\');
-			if (tmp_file) {
-				e = gf_dm_wget(elt->url, tmp_file, 0, 0);
-				if (e==GF_OK) {
-					import.in_name = tmp_file;
-					e = gf_media_import(&import);
+		if (elt && do_import) {
+	#ifndef GPAC_DISABLE_MEDIA_IMPORT
+			GF_Err e;
+			GF_MediaImporter import;
+			char *tmp_file = NULL;
+			elt = gf_list_get(pe->element.playlist.elements, 0);
+			memset(&import, 0, sizeof(GF_MediaImporter));
+			import.trackID = 0;
+			import.flags = GF_IMPORT_PROBE_ONLY;
+
+			if (strstr(elt->url, "://") && !strstr(elt->url, "file://")) {
+				tmp_file = strrchr(elt->url, '/');
+				if (!tmp_file) tmp_file = strrchr(elt->url, '\\');
+				if (tmp_file) {
+					e = gf_dm_wget(elt->url, tmp_file, 0, 0);
+					if (e==GF_OK) {
+						import.in_name = tmp_file;
+						e = gf_media_import(&import);
+					}
 				}
+			} else {
+				import.in_name = elt->url;
+				e = gf_media_import(&import);
 			}
-		} else {
-			import.in_name = elt->url;
-			e = gf_media_import(&import);
-		}
-
-		if (import.nb_tracks>1) {
-			for (k=0; k<import.nb_tracks; k++) {
-				fprintf(fmpd, " <ContentComponent id=\"%d\"", import.tk_info[k].track_num);
-				if (import.tk_info[k].lang)
-					fprintf(fmpd, " lang=\"%s\"", gf_4cc_to_str(import.tk_info[k].lang));
-				switch (import.tk_info[k].type) {
-				case GF_ISOM_MEDIA_VISUAL:
-					fprintf(fmpd, " contentType=\"video\"");
-					break;
-				case GF_ISOM_MEDIA_AUDIO:
-					fprintf(fmpd, " contentType=\"audio\"");
-					break;
-				default:
-					fprintf(fmpd, " contentType=\"application\"");
-					break;
+
+			if (import.nb_tracks > 1) {
+				for (k=0; k<import.nb_tracks; k++) {
+					fprintf(fmpd, " <ContentComponent id=\"%d\"", import.tk_info[k].track_num);
+					if (import.tk_info[k].lang)
+						fprintf(fmpd, " lang=\"%s\"", gf_4cc_to_str(import.tk_info[k].lang));
+					switch (import.tk_info[k].type) {
+					case GF_ISOM_MEDIA_VISUAL:
+						fprintf(fmpd, " contentType=\"video\"");
+						break;
+					case GF_ISOM_MEDIA_AUDIO:
+						fprintf(fmpd, " contentType=\"audio\"");
+						break;
+					default:
+						fprintf(fmpd, " contentType=\"application\"");
+						break;
+					}
+					fprintf(fmpd, "/>\n");
 				}
-				fprintf(fmpd, "/>\n");
 			}
+			if (tmp_file)
+				gf_delete_file(tmp_file);
+	#endif
 		}
-		if (tmp_file)
-			gf_delete_file(tmp_file);
-#endif
-	}
 
-	/*check if we use templates*/
-	count = gf_list_count(pl->programs);
-	for (i=0; i<count; i++) {
-		u32 width, height, samplerate, num_channels;
-		prog = gf_list_get(pl->programs, i);
-		count2 = gf_list_count(prog->bitrates);
-		for (j = 0; j<count2; j++) {
+		/*check if we use templates*/
+		stream = gf_list_get(pl->streams, i);
+		count_variants = gf_list_count(stream->variants);
+		for (j=0; j<count_variants; j++) {
 			char *base_url;
+			u32 count_elements;
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 			Bool import_file = do_import;
 #endif
-			Bool is_aac = 0;
+			Bool is_aac = GF_FALSE;
 			char *byte_range_media_file = NULL;
-			pe = gf_list_get(prog->bitrates, j);
+			pe = gf_list_get(stream->variants, j);
 
-			if (pe->elementType == TYPE_STREAM) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] NOT SUPPORTED: M3U8 Stream\n"));
-			} else if (pe->elementType != TYPE_PLAYLIST) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] NOT SUPPORTED: M3U8 unknown type\n"));
+			if (pe->element_type == TYPE_MEDIA) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] NOT SUPPORTED: M3U8 Media\n"));
+			} else if (pe->element_type != TYPE_PLAYLIST) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] NOT SUPPORTED: M3U8 unknown type for %s\n", pe->url));
 			}
 
-			count3 = gf_list_count(pe->element.playlist.elements);
-			if (!count3) continue;
+			count_elements = gf_list_count(pe->element.playlist.elements);
+			if (!count_elements)
+				continue;
 
 			base_url = gf_strdup(pe->url);
 			sep = strrchr(base_url, '/');
@@ -1378,14 +1441,19 @@
 			}
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 			if (pe->bandwidth && pe->codecs && pe->width && pe->height) {
-				import_file = 0;
+				import_file = GF_FALSE;
 			}
 #endif
 
+			k = 0;
+try_next_segment:
+			k++;
+			elt = gf_list_get(pe->element.playlist.elements, k);
+			if (!elt)
+				break;
 			/*get rid of level 0 aac*/
-			elt = gf_list_get(pe->element.playlist.elements, 0);
 			if (elt && strstr(elt->url, ".aac"))
-				is_aac = 1;
+				is_aac = GF_TRUE;
 
 			if (is_aac)
 				fprintf(fmpd, "\n");
 		}
-	}
 
-	if (template_base) {
-		gf_free(template_base);
-		template_base = NULL;
-	}
+		if (template_base) {
+			gf_free(template_base);
+			template_base = NULL;
+		}
 
-	fprintf(fmpd, " </AdaptationSet>\n");
+		fprintf(fmpd, " </AdaptationSet>\n");
+	}
 	fprintf(fmpd, " </Period>\n");
 	fprintf(fmpd, "</MPD>");
+
 	fclose(fmpd);
-	variant_playlist_del(pl);
+	gf_m3u8_master_playlist_del(pl);
+
+	return GF_OK;
+}
+
+void gf_mpd_print_date(FILE *out, char *name, u64 time)
+{
+	time_t gtime;
+	struct tm *t;
+	gtime = time / 1000;
+	t = gmtime(&gtime);
+	fprintf(out, " %s=\"%d-%02d-%02dT%02d:%02d:%02dZ\"", name, 1900+t->tm_year, t->tm_mon+1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
+}
+
+void gf_mpd_print_duration(FILE *out, char *name, u32 duration)
+{
+	u32 h, m;
+	Double s;
+	h = (u32) (duration / 3600000);
+	m = (u32) (duration/ 60000) - h*60;
+	s = ((Double) duration/1000.0) - h*3600 - m*60;
+
+	fprintf(out, " %s=\"PT%02dH%02dM%02.2fS\"", name, h, m, s);
+}
+
+static void gf_mpd_print_base_url(FILE *out, GF_List *base_URLs, char *indent) 
+{
+	GF_MPD_BaseURL *url;
+	u32 i;
+	i=0; 
+	while ((url = (GF_MPD_BaseURL *)gf_list_enum(base_URLs, &i))) {
+		fprintf(out, "%s<BaseURL ", indent);
+		if (url->service_location)
+			fprintf(out, " serviceLocation=\"%s\"", url->service_location);
+		if (url->byte_range)
+			fprintf(out, " byteRange=\""LLD"-"LLD"\"", url->byte_range->start_range, url->byte_range->end_range);
+		fprintf(out, ">%s</BaseURL>\n", url->URL);
+	}
+}
+
+static void gf_mpd_print_url(FILE *out, GF_MPD_URL *url, char *name, char *indent)
+{
+	fprintf(out, "%s<%s", indent, name);
+	if (url->byte_range) fprintf(out, " range=\""LLD"-"LLD"\"", url->byte_range->start_range, url->byte_range->end_range);
+	if (url->sourceURL) fprintf(out, " range=\"%s\"", url->sourceURL);
+	fprintf(out, "/>\n");
+}
+
+static void gf_mpd_print_segment_base_attr(FILE *out, GF_MPD_SegmentBase *s)
+{
+	if (s->timescale) fprintf(out, " timescale=\"%d\"", s->timescale);
+	if (s->presentation_time_offset) fprintf(out, " timescale=\""LLU"\"", s->presentation_time_offset);
+	if (s->index_range) fprintf(out, " indexRange=\""LLD"-"LLD"\"", s->index_range->start_range, s->index_range->end_range);
+	if (s->index_range_exact) fprintf(out, " indexRangeExact=\"true\"");
+	if (s->availability_time_offset) fprintf(out, " availabilityTimeOffset=\"%g\"", s->availability_time_offset);
+	if (s->time_shift_buffer_depth) 
+		gf_mpd_print_duration(out, "timeShiftBufferDepth", s->time_shift_buffer_depth);
+}
+
+static void gf_mpd_print_segment_base(FILE *out, GF_MPD_SegmentBase *s, char *indent)
+{
+	fprintf(out, "%s<SegmentBase", indent);
+	gf_mpd_print_segment_base_attr(out, s);
+	fprintf(out, ">\n");
+
+	if (s->initialization_segment) gf_mpd_print_url(out, s->initialization_segment, "Initialization", indent);
+	if (s->representation_index) gf_mpd_print_url(out, s->representation_index, "RepresentationIndex", indent);
+
+	fprintf(out, "%s</SegmentBase>\n", indent);
+}
+
+static void gf_mpd_print_segment_timeline(FILE *out, GF_MPD_SegmentTimeline *tl, char *indent)
+{
+	u32 i;
+	GF_MPD_SegmentTimelineEntry *se;
+	fprintf(out, "%s <SegmentTimeline>\n", indent);
+
+	i = 0;
+	while ( (se = gf_list_enum(tl->entries, &i))) {
+		fprintf(out, "%s <S ", indent);
+		if (se->start_time) fprintf(out, " t=\""LLD"\"", se->start_time);
+		if (se->duration) fprintf(out, " d=\"%d\"", se->duration);
+		if (se->repeat_count) fprintf(out, " r=\"%d\"", se->repeat_count);
+		fprintf(out, ">\n");
+	}
+	fprintf(out, "%s </SegmentTimeline>\n", indent);
+}
+
+static u32 gf_mpd_print_multiple_segment_base(FILE *out, GF_MPD_MultipleSegmentBase *ms, char *indent)
+{
+	gf_mpd_print_segment_base_attr(out, (GF_MPD_SegmentBase *)ms);
+
+	if (ms->duration) fprintf(out, " duration=\""LLD"\"", ms->duration);
+	if (ms->start_number != (u32) -1) fprintf(out, " startNumber=\"%d\"", ms->start_number);
+
+
+	if (!ms->bitstream_switching_url && !ms->segment_timeline && !ms->initialization_segment && !ms->representation_index) {
+		fprintf(out, "/>\n");
+		return 1;
+	}
+	fprintf(out, ">\n");
+
+	if (ms->initialization_segment) gf_mpd_print_url(out, ms->initialization_segment, "Initialization", indent);
+	if (ms->representation_index) gf_mpd_print_url(out, ms->representation_index, "RepresentationIndex", indent);
+
+	if (ms->segment_timeline) gf_mpd_print_segment_timeline(out, ms->segment_timeline, indent);
+	if (ms->bitstream_switching_url) gf_mpd_print_url(out, ms->bitstream_switching_url, "BitstreamSwitching", indent);
+	return 0;
+}
+
+static void gf_mpd_print_segment_list(FILE *out, GF_MPD_SegmentList *s, char *indent)
+{
+	fprintf(out, "%s<SegmentList", indent);
+	if (s->xlink_href) {
+		fprintf(out, " xlink:href=\"%s\"", s->xlink_href);
+		if (s->xlink_actuate_on_load) 
+			fprintf(out, " actuate=\"onLoad\"");
+	}
+	gf_mpd_print_multiple_segment_base(out, (GF_MPD_MultipleSegmentBase *)s, indent);
+
+	if (s->segment_URLs) {
+		u32 i;
+		GF_MPD_SegmentURL *url;
+		i = 0;
+		while ( (url = gf_list_enum(s->segment_URLs, &i))) {
+			fprintf(out, "%s<SegmentURL", indent);
+			if (url->media) fprintf(out, " media=\"%s\"", url->media);
+			if (url->index) fprintf(out, " index=\"%s\"", url->index);
+			if (url->media_range) fprintf(out, " mediaRange=\""LLD"-"LLD"\"", url->media_range->start_range, url->media_range->end_range);
+			if (url->index_range) fprintf(out, " indexRange=\""LLD"-"LLD"\"", url->index_range->start_range, url->index_range->end_range);
+			fprintf(out, ">\n");
+		}
+	}
+	fprintf(out, "%s</SegmentList>\n", indent);
+}
+
+static void gf_mpd_print_segment_template(FILE *out, GF_MPD_SegmentTemplate *s, char *indent)
+{
+	fprintf(out, "%s<SegmentTemplate", indent);
+
+	if (s->media) fprintf(out, " media=\"%s\"", s->media);
+	if (s->index) fprintf(out, " index=\"%s\"", s->index);
+	if (s->initialization) fprintf(out, " initialization=\"%s\"", s->initialization);
+	if (s->bitstream_switching) fprintf(out, " bitstreamSwitching=\"%s\"", s->bitstream_switching);
+
+	if (gf_mpd_print_multiple_segment_base(out, (GF_MPD_MultipleSegmentBase *)s, indent))
+		return;
+
+	fprintf(out, "%s</SegmentTemplate>\n", indent);
+}
+
+static void gf_mpd_extensible_print_attr(FILE *out, GF_MPD_ExtensibleVirtual *item)
+{
+	if (item->attributes) {
+		u32 j=0;
+		GF_XMLAttribute *att;
+		while ((att = (GF_XMLAttribute *)gf_list_enum(item->attributes, &j))) {
+			fprintf(out, " %s=\"%s\"", att->name, att->value);
+		}
+	}
+}
+
+static void gf_mpd_extensible_print_nodes(FILE *out, GF_MPD_ExtensibleVirtual *item)
+{
+	if (item->children) {
+		u32 j=0;
+		GF_XMLNode *child;
+		fprintf(out, ">\n");
+		while ((child = (GF_XMLNode *)gf_list_enum(item->children, &j))) {
+			char *txt = gf_xml_dom_serialize(child, 0);
+			fprintf(out, "%s", txt);
+			gf_free(txt);
+		}
+	}
+}
+
+static void gf_mpd_print_descriptors(FILE *out, GF_List *desc_list, char *desc_name, char *indent)
+{
+	u32 i=0;
+	GF_MPD_Descriptor *desc;
+	while ((desc = (GF_MPD_Descriptor *)gf_list_enum(desc_list, &i))) {
+		fprintf(out, "%s<%s", indent, desc_name);
+		if (desc->id) fprintf(out, " id=\"%s\"", desc->id);
+		if (desc->scheme_id_uri) fprintf(out, " schemeIdUri=\"%s\"", desc->scheme_id_uri);
+		if (desc->value) fprintf(out, " value=\"%s\"", desc->value);
+	
+		if (desc->attributes) gf_mpd_extensible_print_attr(out, (GF_MPD_ExtensibleVirtual*)desc);
+
+		if (desc->children) {
+			gf_mpd_extensible_print_nodes(out, (GF_MPD_ExtensibleVirtual*)desc);
+			fprintf(out, "%s</%s>\n", indent, desc_name);
+		} else {
+			fprintf(out, "/>\n");
+		}
+	}
+}
+
+static u32 gf_mpd_print_common_representation(FILE *out, GF_MPD_CommonAttributes *ca, char *indent, Bool can_close)
+{
+	if (ca->profiles) fprintf(out, " profiles=\"%s\"", ca->profiles);
+	if (ca->width) fprintf(out, " width=\"%d\"", ca->width);
+	if (ca->height) fprintf(out, " height=\"%d\"", ca->height);
+	if (ca->sar) fprintf(out, " sar=\"%d:%d\"", ca->sar->num, ca->sar->den);
+	if (ca->framerate) fprintf(out, " frameRate=\"%d:%d\"", ca->framerate->num, ca->framerate->den);
+	if (ca->samplerate) fprintf(out, " audioSamplingRate=\"%d\"", ca->samplerate);
+	if (ca->mime_type) fprintf(out, " mimeType=\"%s\"", ca->mime_type);
+	if (ca->segmentProfiles) fprintf(out, " segmentProfiles=\"%s\"", ca->segmentProfiles);
+	if (ca->codecs) fprintf(out, " codecs=\"%s\"", ca->codecs);
+	if (ca->maximum_sap_period) fprintf(out, " maximumSAPPeriod=\"%d\"", ca->maximum_sap_period);
+	if (ca->starts_with_sap) fprintf(out, " startWithSAP=\"%d\"", ca->starts_with_sap);
+	if (ca->max_playout_rate) fprintf(out, " maxPlayoutRate=\"%g\"", ca->max_playout_rate);
+	if (ca->coding_dependency) fprintf(out, " codingDependency=\"true\"");
+	if (ca->scan_type!=GF_MPD_SCANTYPE_UNKNWON) fprintf(out, " scanType=\"%s\"", ca->scan_type==GF_MPD_SCANTYPE_PROGRESSIVE ? "progressive" : "interlaced");
+
+	if (can_close && !gf_list_count(ca->frame_packing) && !gf_list_count(ca->audio_channels) && !gf_list_count(ca->content_protection) && !gf_list_count(ca->essential_properties) && !gf_list_count(ca->supplemental_properties) && !ca->isobmf_tracks) {
+		fprintf(out, "/>\n");
+		return 1;
+	}
+
+	fprintf(out, ">\n");
+
+	if (ca->isobmf_tracks) {
+		u32 k=0;
+		GF_MPD_ISOBMFInfo *info;
+		fprintf(out, "%s<ISOBMFInfo>\n", indent);
+		while ((info = (GF_MPD_ISOBMFInfo *) gf_list_enum(ca->isobmf_tracks, &k))) {
+			fprintf(out, "%s <ISOBMFTrack", indent);
+			if (info->trackID) fprintf(out, " ID=\"%d\"", info->trackID);
+			if (info->stsd) fprintf(out, " stsd=\"%s\"", info->stsd);
+			if (info->mediaOffset) fprintf(out, " offset=\""LLD"\"", info->mediaOffset);
+			fprintf(out, "/>\n");
+		}
+		fprintf(out, "%s</ISOBMFInfo>\n", indent);
+	}
+
+	gf_mpd_print_descriptors(out, ca->frame_packing, "Framepacking", indent);
+	gf_mpd_print_descriptors(out, ca->audio_channels, "AudioChannelConfiguration", indent);
+	gf_mpd_print_descriptors(out, ca->content_protection, "ContentProtection", indent);
+	gf_mpd_print_descriptors(out, ca->essential_properties, "EssentialProperty", indent);
+	gf_mpd_print_descriptors(out, ca->supplemental_properties, "SupplementalProperty", indent);
+	return 0;
+}
+
+static void gf_mpd_print_representation(FILE *out, GF_MPD_Representation *rep)
+{
+	Bool can_close = GF_FALSE;
+	fprintf(out, " <Representation");
+	if (rep->id) fprintf(out, " id=\"%s\"", rep->id);
+	if (rep->bandwidth) fprintf(out, " bandwidth=\"%d\"", rep->bandwidth);
+	if (rep->quality_ranking) fprintf(out, " qualityRanking=\"%d\"", rep->quality_ranking);
+	if (rep->dependency_id) fprintf(out, " dependencyId=\"%s\"", rep->dependency_id);
+	if (rep->media_stream_structure_id) fprintf(out, " mediaStreamStructureId=\"%s\"", rep->media_stream_structure_id);
+
+
+	if (!gf_list_count(rep->base_URLs) && !rep->segment_base && !rep->segment_template && !rep->segment_list && !gf_list_count(rep->sub_representations)) {
+		can_close = 1;
+	}
+
+	if (gf_mpd_print_common_representation(out, (GF_MPD_CommonAttributes*)rep, " ", can_close)) 
+		return;
+
+	gf_mpd_print_base_url(out, rep->base_URLs, " ");
+	if (rep->segment_base) {
+		gf_mpd_print_segment_base(out, rep->segment_base, " ");
+	}
+	if (rep->segment_list) {
+		gf_mpd_print_segment_list(out, rep->segment_list, " ");
+	}
+	if (rep->segment_template) {
+		gf_mpd_print_segment_template(out, rep->segment_template, " ");
+	}
+		/*TODO
+					e = gf_mpd_parse_subrepresentation(rep->sub_representations, child);
+					if (e) return e;
+		*/
+
+	fprintf(out, " </Representation>\n");
+}
+
+static void gf_mpd_print_adaptation_set(FILE *out, GF_MPD_AdaptationSet *as)
+{
+	u32 i;
+	GF_MPD_Representation *rep;
+	fprintf(out, " <AdaptationSet");
+
+	if (as->xlink_href) {
+		fprintf(out, " xlink:href=\"%s\"", as->xlink_href);
+		if (as->xlink_actuate_on_load) 
+			fprintf(out, " actuate=\"onLoad\"");
+	}
+	if (as->id) fprintf(out, " id=\"%d\"", as->id);
+	if (as->group != (u32) -1) fprintf(out, " group=\"%d\"", as->group);
+	if (as->lang) fprintf(out, " lang=\"%s\"", as->lang);
+	if (as->par) fprintf(out, " par=\"%d:%d\"", as->par->num, as->par->den);
+	if (as->min_bandwidth) fprintf(out, " minBandwidth=\"%d\"", as->min_bandwidth);
+	if (as->max_bandwidth) fprintf(out, " maxBandwidth=\"%d\"", as->max_bandwidth);
+	if (as->min_width) fprintf(out, " minWidth=\"%d\"", as->min_width);
+	if (as->max_width) fprintf(out, " maxWidth=\"%d\"", as->max_width);
+	if (as->min_height) fprintf(out, " minHeight=\"%d\"", as->min_height);
+	if (as->max_height) fprintf(out, " maxHeight=\"%d\"", as->max_height);
+	if (as->min_framerate) fprintf(out, " minFrameRate=\"%d\"", as->min_framerate);
+	if (as->max_framerate) fprintf(out, " maxFrameRate=\"%d\"", as->max_framerate);
+	if (as->segment_alignment) fprintf(out, " segmentAlignment=\"true\"");
+	if (as->bitstream_switching) fprintf(out, " bitstreamSwitching=\"true\"");
+	if (as->subsegment_alignment) fprintf(out, " subsegmentAlignment=\"true\"");
+	if (as->subsegment_starts_with_sap) fprintf(out, " subsegmentStartsWithSAP=\"%d\"", as->subsegment_starts_with_sap);
+
+
+	gf_mpd_print_common_representation(out, (GF_MPD_CommonAttributes*)as, " ", 0);
+	
+	gf_mpd_print_base_url(out, as->base_URLs, " ");
+
+	gf_mpd_print_descriptors(out, as->accessibility, "Accessibility", " ");
+	gf_mpd_print_descriptors(out, as->role, "Role", " ");
+	gf_mpd_print_descriptors(out, as->rating, "Rating", " ");
+	gf_mpd_print_descriptors(out, as->viewpoint, "Viewpoint", " ");
+
+//			e = gf_mpd_parse_content_component(set->content_component, child);
+	
+	if (as->segment_base) {
+		gf_mpd_print_segment_base(out, as->segment_base, " ");
+	}
+	if (as->segment_list) {
+		gf_mpd_print_segment_list(out, as->segment_list, " ");
+	}
+	if (as->segment_template) {
+		gf_mpd_print_segment_template(out, as->segment_template, " ");
+	}
+
+	i=0;
+	while ((rep = (GF_MPD_Representation *)gf_list_enum(as->representations, &i))) {
+		gf_mpd_print_representation(out, rep);
+	}
+	fprintf(out, " </AdaptationSet>\n");
+
+
+}
+
+static void gf_mpd_print_period(GF_MPD_Period *period, FILE *out)
+{
+	GF_MPD_AdaptationSet *as;
+	u32 i;
+	fprintf(out, " <Period");
+	if (period->xlink_href) {
+		fprintf(out, " xlink:href=\"%s\"", period->xlink_href);
+		if (period->xlink_actuate_on_load) 
+			fprintf(out, " actuate=\"onLoad\"");
+	}
+	if (period->ID) 
+		fprintf(out, " id=\"%s\"", period->ID);
+	if (period->start) 
+		gf_mpd_print_duration(out, "start", period->start);
+	if (period->duration) 
+		gf_mpd_print_duration(out, "duration", period->start);
+	if (period->bitstream_switching) 
+		fprintf(out, " bitstreamSwitching=\"true\"");
+
+	fprintf(out, ">\n");
+	
+	gf_mpd_print_base_url(out, period->base_URLs, " ");
+
+	if (period->segment_base) {
+		gf_mpd_print_segment_base(out, period->segment_base, " ");
+	}
+	if (period->segment_list) {
+		gf_mpd_print_segment_list(out, period->segment_list, " ");
+	}
+	if (period->segment_template) {
+		gf_mpd_print_segment_template(out, period->segment_template, " ");
+	}
+
+	i=0;
+	while ( (as = (GF_MPD_AdaptationSet *) gf_list_enum(period->adaptation_sets, &i))) {
+		gf_mpd_print_adaptation_set(out, as);
+	}
+	fprintf(out, " </Period>\n");
+
+}
+
+static GF_Err gf_mpd_write(GF_MPD *mpd, FILE *out)
+{
+	u32 i;
+	GF_MPD_ProgramInfo *info;
+	char *text;
+	GF_MPD_Period *period;
+
+	fprintf(out, "<?xml version=\"1.0\"?>\n<MPD xmlns=\"%s\" type=\"%s\"", mpd->xml_namespace, (mpd->type == GF_MPD_TYPE_STATIC) ? "static" : "dynamic");
+
+	if (mpd->ID)
+		fprintf(out, " ID=\"%s\"", mpd->ID);
+	
+	if (mpd->profiles)
+		fprintf(out, " profiles=\"%s\"", mpd->profiles);
+	if (mpd->availabilityStartTime)
+		gf_mpd_print_date(out, "availabilityStartTime", mpd->availabilityStartTime);
+	if (mpd->availabilityEndTime)
+		gf_mpd_print_date(out, "availabilityStartTime", mpd->availabilityEndTime);
+	if (mpd->publishTime)
+		gf_mpd_print_date(out, "availabilityStartTime", mpd->publishTime);
+	if (mpd->media_presentation_duration) 
+		gf_mpd_print_duration(out, "mediaPresentationDuration", mpd->media_presentation_duration);
+	if (mpd->minimum_update_period) 
+		gf_mpd_print_duration(out, "minimumUpdatePeriod", mpd->minimum_update_period);
+	if (mpd->min_buffer_time) 
+		gf_mpd_print_duration(out, "minBufferTime", mpd->min_buffer_time);
+	if (mpd->time_shift_buffer_depth) 
+		gf_mpd_print_duration(out, "timeShiftBufferDepth", mpd->time_shift_buffer_depth);
+	if (mpd->suggested_presentaton_delay) 
+		gf_mpd_print_duration(out, "suggestedPresentationDelay", mpd->suggested_presentaton_delay);
+	if (mpd->max_segment_duration) 
+		gf_mpd_print_duration(out, "maxSegmentDuration", mpd->max_segment_duration);
+	if (mpd->max_subsegment_duration) 
+		gf_mpd_print_duration(out, "maxSubsegmentDuration", mpd->max_subsegment_duration);
+
+	if (mpd->attributes) gf_mpd_extensible_print_attr(out, (GF_MPD_ExtensibleVirtual*)mpd);
+
+	fprintf(out, ">\n");
+
+	if (mpd->children) {
+		gf_mpd_extensible_print_nodes(out, (GF_MPD_ExtensibleVirtual*)mpd);
+	} 
+
+	i=0; 
+	while ((info = (GF_MPD_ProgramInfo *)gf_list_enum(mpd->program_infos, &i))) {
+		fprintf(out, " <ProgramInformation");
+		if (info->lang) {
+			fprintf(out, " lang=\"%s\"", info->lang);
+		}
+		if (info->more_info_url) {
+			fprintf(out, " moreInformationURL=\"%s\"", info->more_info_url);
+		}
+		fprintf(out, ">\n");
+		if (info->title) {
+			fprintf(out, " <Title>%s</Title>\n", info->title);
+		}
+		if (info->source) {
+			fprintf(out, " <Source>%s</Source>\n", info->source);
+		}
+		if (info->copyright) {
+			fprintf(out, " <Copyright>%s</Copyright>\n", info->copyright);
+		}
+		fprintf(out, " </ProgramInformation>\n");
+	}
+
+	gf_mpd_print_base_url(out, mpd->base_URLs, " ");
+
+	i=0; 
+	while ((text = (char *)gf_list_enum(mpd->locations, &i))) {
+		fprintf(out, " <Location>%s</Location>\n", text);
+	}
+
+/*
+	i=0; 
+	while ((text = (char *)gf_list_enum(mpd->metrics, &i))) {
+		
+	}
+*/
+
+	i=0; 
+	while ((period = (GF_MPD_Period *)gf_list_enum(mpd->periods, &i))) {
+		gf_mpd_print_period(period, out);
+	}
+
+
+	fprintf(out, "</MPD>\n");
+
 	return GF_OK;
 }
+
+GF_EXPORT
+GF_Err gf_mpd_write_file(GF_MPD *mpd, char *file_name)
+{
+	GF_Err e;
+	FILE *out;
+	if (!strcmp(file_name, "std")) out = stdout;
+	else {
+		out = fopen(file_name, "wb");
+		if (!out) return GF_IO_ERR;
+	}
+
+	e = gf_mpd_write(mpd, out);
+	fclose(out);
+	return e;
+}
+
+
+GF_EXPORT
+GF_Err gf_mpd_resolve_url(GF_MPD *mpd, GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set, GF_MPD_Period *period, const char *mpd_url, GF_MPD_URLResolveType resolve_type, u32 item_index, u32 nb_segments_removed, char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration, Bool *is_in_base_url)
+{
+	GF_MPD_BaseURL *url_child;
+	GF_MPD_SegmentTimeline *timeline = NULL;
+	u32 start_number = 1;
+	u32 timescale=0;
+	char *url;
+	char *url_to_solve, *solved_template, *first_sep, *media_url;
+	char *init_template, *index_template;
+
+	*out_range_start = *out_range_end = 0;
+	*out_url = NULL;
+
+	/*resolve base URLs from document base (download location) to representation (media)*/
+	url = gf_strdup(mpd_url);
+
+	url_child = gf_list_get(mpd->base_URLs, 0);
+	if (url_child) {
+		char *t_url = gf_url_concatenate(url, url_child->URL);
+		gf_free(url);
+		url = t_url;
+	}
+
+	url_child = gf_list_get(period->base_URLs, 0);
+	if (url_child) {
+		char *t_url = gf_url_concatenate(url, url_child->URL);
+		gf_free(url);
+		url = t_url;
+	}
+
+	url_child = gf_list_get(set->base_URLs, 0);
+	if (url_child) {
+		char *t_url = gf_url_concatenate(url, url_child->URL);
+		gf_free(url);
+		url = t_url;
+	}
+
+	url_child = gf_list_get(rep->base_URLs, 0);
+	if (url_child) {
+		char *t_url = gf_url_concatenate(url, url_child->URL);
+		gf_free(url);
+		url = t_url;
+	}
+
+	/*single URL*/
+	if (!rep->segment_list && !set->segment_list && !period->segment_list && !rep->segment_template && !set->segment_template && !period->segment_template) {
+		GF_MPD_URL *res_url;
+		GF_MPD_SegmentBase *base_seg = NULL;
+		if (item_index > 0)
+			return GF_EOS;
+		switch (resolve_type) {
+		case GF_MPD_RESOLVE_URL_MEDIA:
+		case GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE:
+			if (!url) return GF_NON_COMPLIANT_BITSTREAM;
+			*out_url = url;
+			return GF_OK;
+		case GF_MPD_RESOLVE_URL_INIT:
+		case GF_MPD_RESOLVE_URL_INDEX:
+			res_url = NULL;
+			base_seg = rep->segment_base;
+			if (!base_seg) base_seg = set->segment_base;
+			if (!base_seg) base_seg = period->segment_base;
+
+			if (base_seg) {
+				if (resolve_type == GF_MPD_RESOLVE_URL_INDEX) {
+					res_url = base_seg->representation_index;
+				} else {
+					res_url = base_seg->initialization_segment;
+				}
+			}
+			if (is_in_base_url) *is_in_base_url = 0;
+			/*no initialization segment / index, use base URL*/
+			if (res_url && res_url->sourceURL) {
+				*out_url = gf_url_concatenate(url, res_url->sourceURL);
+				gf_free(url);
+			} else {
+				*out_url = url;
+				if (is_in_base_url) *is_in_base_url = 1;
+			}
+			if (res_url && res_url->byte_range) {
+				*out_range_start = res_url->byte_range->start_range;
+				*out_range_end = res_url->byte_range->end_range;
+			} else if (base_seg && base_seg->index_range && (resolve_type == GF_MPD_RESOLVE_URL_INDEX)) {
+				*out_range_start = base_seg->index_range->start_range;
+				*out_range_end = base_seg->index_range->end_range;
+			}
+			return GF_OK;
+		default:
+			break;
+		}
+		gf_free(url);
+		return GF_BAD_PARAM;
+	}
+
+	/*segmentList*/
+	if (rep->segment_list || set->segment_list || period->segment_list) {
+		GF_MPD_URL *init_url, *index_url;
+		GF_MPD_SegmentURL *segment;
+		GF_List *segments = NULL;
+		u32 segment_count;
+
+		init_url = index_url = NULL;
+
+		/*apply inheritance of attributes, lowest level having preceedence*/
+		if (period->segment_list) {
+			if (period->segment_list->initialization_segment) init_url = period->segment_list->initialization_segment;
+			if (period->segment_list->representation_index) index_url = period->segment_list->representation_index;
+			if (period->segment_list->segment_URLs) segments = period->segment_list->segment_URLs;
+			if (period->segment_list->start_number != (u32) -1) start_number = period->segment_list->start_number;
+			if (period->segment_list->segment_timeline) timeline = period->segment_list->segment_timeline;
+			if (!timescale && period->segment_list->timescale) timescale = period->segment_list->timescale;
+		}
+		if (set->segment_list) {
+			if (set->segment_list->initialization_segment) init_url = set->segment_list->initialization_segment;
+			if (set->segment_list->representation_index) index_url = set->segment_list->representation_index;
+			if (set->segment_list->segment_URLs) segments = set->segment_list->segment_URLs;
+			if (set->segment_list->start_number != (u32) -1) start_number = set->segment_list->start_number;
+			if (set->segment_list->segment_timeline) timeline = set->segment_list->segment_timeline;
+			if (!timescale && set->segment_list->timescale) timescale = set->segment_list->timescale;
+		}
+		if (rep->segment_list) {
+			if (rep->segment_list->initialization_segment) init_url = rep->segment_list->initialization_segment;
+			if (rep->segment_list->representation_index) index_url = rep->segment_list->representation_index;
+			if (rep->segment_list->segment_URLs) segments = rep->segment_list->segment_URLs;
+			if (rep->segment_list->start_number != (u32) -1) start_number = rep->segment_list->start_number;
+			if (rep->segment_list->segment_timeline) timeline = rep->segment_list->segment_timeline;
+			if (!timescale && rep->segment_list->timescale) timescale = rep->segment_list->timescale;
+		}
+
+
+		segment_count = gf_list_count(segments);
+
+		switch (resolve_type) {
+		case GF_MPD_RESOLVE_URL_INIT:
+			if (init_url) {
+				if (init_url->sourceURL) {
+					*out_url = gf_url_concatenate(url, init_url->sourceURL);
+					gf_free(url);
+				} else {
+					*out_url = url;
+				}
+				if (init_url->byte_range) {
+					*out_range_start = init_url->byte_range->start_range;
+					*out_range_end = init_url->byte_range->end_range;
+				}
+			} else {
+				gf_free(url);
+			}
+			return GF_OK;
+		case GF_MPD_RESOLVE_URL_MEDIA:
+		case GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE:
+			if (!url) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Media URL is not set in segment list\n"));
+				return GF_SERVICE_ERROR;
+			}
+			if ((item_index >= segment_count) || ((s32) item_index < 0)) {
+				gf_free(url);
+				return GF_EOS;
+			}
+			*out_url = url;
+			segment = gf_list_get(segments, item_index);
+			if (segment->media) {
+				*out_url = gf_url_concatenate(url, segment->media);
+				gf_free(url);
+			}
+			if (segment->media_range) {
+				*out_range_start = segment->media_range->start_range;
+				*out_range_end = segment->media_range->end_range;
+			}
+			if (segment->duration) {
+				*segment_duration = (u32) ((Double) (segment->duration) * 1000.0 / timescale);
+			}
+			return GF_OK;
+		case GF_MPD_RESOLVE_URL_INDEX:
+			if (item_index >= segment_count) {
+				gf_free(url);
+				return GF_EOS;
+			}
+			*out_url = url;
+			segment = gf_list_get(segments, item_index);
+			if (segment->index) {
+				*out_url = gf_url_concatenate(url, segment->index);
+				gf_free(url);
+			}
+			if (segment->index_range) {
+				*out_range_start = segment->index_range->start_range;
+				*out_range_end = segment->index_range->end_range;
+			}
+			return GF_OK;
+		default:
+			break;
+		}
+		gf_free(url);
+		return GF_BAD_PARAM;
+	}
+
+	/*segmentTemplate*/
+	media_url = init_template = index_template = NULL;
+
+	/*apply inheritance of attributes, lowest level having preceedence*/
+	if (period->segment_template) {
+		if (period->segment_template->initialization) init_template = period->segment_template->initialization;
+		if (period->segment_template->index) index_template = period->segment_template->index;
+		if (period->segment_template->media) media_url = period->segment_template->media;
+		if (period->segment_template->start_number != (u32) -1) start_number = period->segment_template->start_number;
+		if (period->segment_template->segment_timeline) timeline = period->segment_template->segment_timeline;
+		if (!timescale && period->segment_template->timescale) timescale = period->segment_template->timescale;
+	}
+	if (set->segment_template) {
+		if (set->segment_template->initialization) init_template = set->segment_template->initialization;
+		if (set->segment_template->index) index_template = set->segment_template->index;
+		if (set->segment_template->media) media_url = set->segment_template->media;
+		if (set->segment_template->start_number != (u32) -1) start_number = set->segment_template->start_number;
+		if (set->segment_template->segment_timeline) timeline = set->segment_template->segment_timeline;
+		if (!timescale && set->segment_template->timescale) timescale = set->segment_template->timescale;
+	}
+	if (rep->segment_template) {
+		if (rep->segment_template->initialization) init_template = rep->segment_template->initialization;
+		if (rep->segment_template->index) index_template = rep->segment_template->index;
+		if (rep->segment_template->media) media_url = rep->segment_template->media;
+		if (rep->segment_template->start_number != (u32) -1) start_number = rep->segment_template->start_number;
+		if (rep->segment_template->segment_timeline) timeline = rep->segment_template->segment_timeline;
+		if (!timescale && rep->segment_template->timescale) timescale = rep->segment_template->timescale;
+	}
+
+	/*offset the start_number with the number of discarded segments (no longer in our lists)*/
+	start_number += nb_segments_removed;
+
+	if (!media_url) {
+		GF_MPD_BaseURL *base = gf_list_get(rep->base_URLs, 0);
+		if (!base) return GF_BAD_PARAM;
+		media_url = base->URL;
+	}
+	url_to_solve = NULL;
+	switch (resolve_type) {
+	case GF_MPD_RESOLVE_URL_INIT:
+		url_to_solve = init_template;
+		break;
+	case GF_MPD_RESOLVE_URL_MEDIA:
+	case GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE:
+		url_to_solve = media_url;
+		break;
+	case GF_MPD_RESOLVE_URL_INDEX:
+		url_to_solve = index_template;
+		break;
+	default:
+		gf_free(url);
+		return GF_BAD_PARAM;
+	}
+	if (!url_to_solve) {
+		gf_free(url);
+		return GF_OK;
+	}
+	/*let's solve the template*/
+	solved_template = gf_malloc(sizeof(char)*(strlen(url_to_solve) + (rep->id ? strlen(rep->id) : 0)) * 2);
+	solved_template[0] = 0;
+	strcpy(solved_template, url_to_solve);
+	first_sep = strchr(solved_template, '$');
+	if (first_sep) first_sep[0] = 0;
+
+	first_sep = strchr(url_to_solve, '$');
+	while (first_sep) {
+		char szPrintFormat[50];
+		char szFormat[100];
+		char *format_tag;
+		char *second_sep = strchr(first_sep+1, '$');
+		if (!second_sep) {
+			gf_free(url);
+			gf_free(solved_template);
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		second_sep[0] = 0;
+		format_tag = strchr(first_sep+1, '%');
+
+		if (format_tag) {
+			strcpy(szPrintFormat, format_tag);
+			format_tag[0] = 0;
+			if (!strchr(szPrintFormat, 'd') && !strchr(szPrintFormat, 'i') && !strchr(szPrintFormat, 'u'))
+				strcat(szPrintFormat, "d");
+		} else {
+			strcpy(szPrintFormat, "%d");
+		}
+		/* identifier is $$ -> replace by $*/
+		if (!strlen(first_sep+1)) {
+			strcat(solved_template, "$");
+		}
+		else if (!strcmp(first_sep+1, "RepresentationID")) {
+			strcat(solved_template, rep->id);
+		}
+		else if (!strcmp(first_sep+1, "Number")) {
+			if (resolve_type==GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE) {
+				strcat(solved_template, "$Number$");
+			} else {
+				sprintf(szFormat, szPrintFormat, start_number + item_index);
+				strcat(solved_template, szFormat);
+			}
+		}
+		else if (!strcmp(first_sep+1, "Index")) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Wrong template identifier Index detected - using Number instead\n\n"));
+			sprintf(szFormat, szPrintFormat, start_number + item_index);
+			strcat(solved_template, szFormat);
+		}
+		else if (!strcmp(first_sep+1, "Bandwidth")) {
+			sprintf(szFormat, szPrintFormat, rep->bandwidth);
+			strcat(solved_template, szFormat);
+		}
+		else if (!strcmp(first_sep+1, "Time")) {
+			if (resolve_type==GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE) {
+				strcat(solved_template, "$Time$");
+			} else if (timeline) {
+				/*uses segment timeline*/
+				u32 k, nb_seg, cur_idx, nb_repeat;
+				u64 time, start_time;
+				nb_seg = gf_list_count(timeline->entries);
+				cur_idx = 0;
+				start_time=0;
+				for (k=0; k<nb_seg; k++) {
+					GF_MPD_SegmentTimelineEntry *ent = gf_list_get(timeline->entries, k);
+					if (item_index>cur_idx+ent->repeat_count) {
+						cur_idx += 1 + ent->repeat_count;
+						if (ent->start_time) start_time = ent->start_time;
+
+						start_time += ent->duration * (1 + ent->repeat_count);
+						continue;
+					}
+					*segment_duration = ent->duration;
+					*segment_duration = (u32) ((Double) (*segment_duration) * 1000.0 / timescale);
+					nb_repeat = item_index - cur_idx;
+					time = ent->start_time ? ent->start_time : start_time;
+					time += nb_repeat * ent->duration;
+
+					/*replace final 'd' with LLD (%lld or I64d)*/
+					szPrintFormat[strlen(szPrintFormat)-1] = 0;
+					strcat(szPrintFormat, &LLD[1]);
+					sprintf(szFormat, szPrintFormat, time);
+					strcat(solved_template, szFormat);
+					break;
+				}
+			}
+		}
+		else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unknown template identifier %s - disabling rep\n\n", first_sep+1));
+			*out_url = NULL;
+			gf_free(url);
+			gf_free(solved_template);
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		if (format_tag) format_tag[0] = '%';
+		second_sep[0] = '$';
+		/*look for next keyword - copy over remaining text if any*/
+		first_sep = strchr(second_sep+1, '$');
+		if (first_sep) first_sep[0] = 0;
+		if (strlen(second_sep+1))
+			strcat(solved_template, second_sep+1);
+		if (first_sep) first_sep[0] = '$';
+	}
+	*out_url = gf_url_concatenate(url, solved_template);
+	gf_free(url);
+	gf_free(solved_template);
+	return GF_OK;
+}
+

gpac-0.5.1.svn5491.tar.xz/src/media_tools/mpegts.c -> gpac-0.5.1.svn5619.tar.xz/src/media_tools/mpegts.c Changed

@@ -1438,7 +1438,7 @@
 		Bool has_syntax_indicator;
 		u8 table_id;
 		u16 extended_table_id;
-		u32 status, section_start;
+		u32 status, section_start, i;
 		GF_M2TS_Table *t, *prev_t;
 		unsigned char *data;
 		Bool section_valid = 0;
@@ -1568,11 +1568,32 @@
 			}
 
 			if (t->last_section_number == t->section_number) {
+				u32 table_size;
+				
 				status |= GF_M2TS_TABLE_END;
+
+				table_size = 0;
+				for (i=0; i<gf_list_count(t->sections); i++) {
+					GF_M2TS_Section *section = gf_list_get(t->sections, i);
+					table_size += section->data_size;
+				}
+				if (t->is_repeat) {
+					if (t->table_size != table_size) {
+						status |= GF_M2TS_TABLE_UPDATE;
+						GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] Repeated section found with different sizes (old table %d bytes, new table %d bytes)\n", t->table_size, table_size) );
+
+						t->table_size = table_size;
+					}
+				} else {
+					t->table_size = table_size;
+				}
+
 				t->is_init = 1;
 				/*reset section number*/
 				t->section_number = 0;
+
 				t->is_repeat = 0;
+
 			}
 
 			if (sec->process_individual) {
@@ -2096,8 +2117,8 @@
 
 	nb_es = 0;
 
-	/*skip if already received*/
-	if (status&GF_M2TS_TABLE_REPEAT) {
+	/*skip if already received but no update detected (eg same data) */
+	if ((status&GF_M2TS_TABLE_REPEAT) && !(status&GF_M2TS_TABLE_UPDATE)) {
 		if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_PMT_REPEAT, pmt->program);
 		return;
 	}
@@ -3145,6 +3166,7 @@
 			if (!es) {
 				u32 i, j;
 				for(i=0; i<gf_list_count(ts->programs); i++) {
+					GF_M2TS_PES *first_pes = NULL;
 					GF_M2TS_Program *program = (GF_M2TS_Program *)gf_list_get(ts->programs,i);
 					if(program->pcr_pid != hdr.pid) continue;
 					for (j=0; j<gf_list_count(program->streams); j++) {
@@ -3153,10 +3175,17 @@
 							ts->ess[hdr.pid] = (GF_M2TS_ES *) pes;
 							break;
 						}
+						if (pes->flags & GF_M2TS_ES_IS_PES) 
+							first_pes = pes;
+					}
+					//non found, use the first media stream as a PCR destination - Q: is it legal to have PCR only streams not declared in PMT ?
+					if (!es) {
+						es = (GF_M2TS_ES *) first_pes;
 					}
 					break;
 				}
-				es = ts->ess[hdr.pid];
+				if (!es) 
+					es = ts->ess[hdr.pid];
 			}
 			if (es) {
 				GF_M2TS_PES_PCK pck;

gpac-0.5.1.svn5491.tar.xz/src/media_tools/text_import.c -> gpac-0.5.1.svn5619.tar.xz/src/media_tools/text_import.c Changed

@@ -902,6 +902,7 @@
 {
 	u32 idx = 0, body_num = 0;
 	GF_XMLNode *node = NULL, *body_node = NULL;
+	*sample_list_node = NULL;
 	while ( (node = (GF_XMLNode*)gf_list_enum(root->content, &idx))) {
 		if (!strcmp(node->name, "body")) {
 			*sample_list_node = node;
@@ -1129,7 +1130,7 @@
 										ts_end = (h*3600 + m*60+s)*1000+ms;
 									}
 								}
-								if ((ts_begin != -1) && (ts_end != -1) && !samp_text) {
+								if ((ts_begin != -1) && (ts_end != -1) && !samp_text && sample_list_node) {
 									e = gf_xml_dom_append_child(sample_list_node, div_node);
 									assert(e == GF_OK);
 									assert(!samp_text);
@@ -1163,7 +1164,7 @@
 												ts_end = (h*3600 + m*60+s)*1000+ms;
 											}
 										}
-										if ((ts_begin != -1) && (ts_end != -1) && !samp_text) {
+										if ((ts_begin != -1) && (ts_end != -1) && !samp_text && sample_list_node) {
 											if (samp_text) {
 												e = gf_import_message(import, GF_BAD_PARAM, "TTML: duplicated sample text under . Abort.\n");
 												goto exit;

gpac-0.5.1.svn5491.tar.xz/src/media_tools/webvtt.c -> gpac-0.5.1.svn5619.tar.xz/src/media_tools/webvtt.c Changed

gpac-0.5.1.svn5491.tar.xz/src/odf/odf_code.c -> gpac-0.5.1.svn5619.tar.xz/src/odf/odf_code.c Changed

gpac-0.5.1.svn5491.tar.xz/src/scene_manager/encode_isom.c -> gpac-0.5.1.svn5619.tar.xz/src/scene_manager/encode_isom.c Changed

@@ -228,8 +228,14 @@
 	if (!mux->file_name) return GF_OK;
 
 	memset(&import, 0, sizeof(GF_MediaImporter));
-	strcpy(szName, mux->file_name);
-	ext = strrchr(szName, '.');
+    if (mux->src_url) {
+        ext = gf_url_concatenate(mux->src_url, mux->file_name);
+        strcpy(szName, ext ? ext : mux->file_name);
+        if (ext) gf_free(ext);
+    } else {
+        strcpy(szName, mux->file_name);
+    }
+    ext = strrchr(szName, '.');
 
 	/*get track types for AVI*/
 	if (ext && !strnicmp(ext, ".avi", 4)) {
@@ -298,6 +304,13 @@
 	e = GF_OK;
 	/*SRT/SUB BIFS import if text node unspecified*/
 	if (mux->textNode) {
+        if (mux->src_url) {
+            char *src = gf_url_concatenate(mux->src_url, mux->file_name);
+            if (src) {
+                gf_free(mux->file_name);
+                mux->file_name = src;
+            }
+        } 
 		e = gf_sm_import_bifs_subtitle(ctx, esd, mux);
 		gf_sm_remove_mux_info(esd);
 	}
@@ -493,6 +506,7 @@
 			is_in_iod = 1;
 			goto force_scene_rap;
 		}
+		gf_bifs_encoder_set_source_url(bifs_enc, opts->src_url);
 #else
 		return GF_NOT_SUPPORTED;
 #endif

gpac-0.5.1.svn5491.tar.xz/src/scene_manager/loader_bt.c -> gpac-0.5.1.svn5619.tar.xz/src/scene_manager/loader_bt.c Changed

@@ -166,7 +166,7 @@
 		}
 
 next_line:
-		parser->line_start_pos = gztell(parser->gz_in);
+		parser->line_start_pos = (s32) gztell(parser->gz_in);
 		parser->line_buffer[0] = 0;
 		if (parser->unicode_type) {
 			u8 c1, c2;
@@ -202,13 +202,13 @@
 					break;
 				}
 				else if (is_ret && wchar!='\n') {
-					u32 fpos = gztell(parser->gz_in);
+					u32 fpos = (u32) gztell(parser->gz_in);
 					gzseek(parser->gz_in, fpos-2, SEEK_SET);
 					is_ret = 1;
 					break;
 				}
 				if (wchar==' ') {
-					last_space_pos_stream = gztell(parser->gz_in);
+					last_space_pos_stream = (u32) gztell(parser->gz_in);
 					last_space_pos = (u32) (dst - l);
 				}
 				dst++;
@@ -260,7 +260,7 @@
 						break;
 					}
 				}
-				pos = gztell(parser->gz_in);
+				pos = (u32) gztell(parser->gz_in);
 				gzseek(parser->gz_in, pos-rew, SEEK_SET);
 			}
 		}
@@ -281,7 +281,7 @@
 		parser->line++;
 
 		{
-			u32 pos = gztell(parser->gz_in);
+			u32 pos = (u32) gztell(parser->gz_in);
 			if (pos>=parser->file_pos) {
 				parser->file_pos = pos;
 				if (parser->line>1) gf_set_progress("BT Parsing", pos, parser->file_size);
@@ -3062,12 +3062,8 @@
 		}
 	} else if (desc->tag==GF_ODF_MUXINFO_TAG) {
 		GF_MuxInfo *mi = (GF_MuxInfo *)desc;
-		if (mi->file_name) {
-			char *res_name = gf_url_concatenate(parser->load->fileName, (const char *) mi->file_name);
-			if (res_name) {
-				gf_free(mi->file_name);
-				mi->file_name = res_name;
-			}
+		if (! mi->src_url) {
+            mi->src_url = gf_strdup(parser->load->fileName);
 		}
 	}
 	return desc;

gpac-0.5.1.svn5491.tar.xz/src/scene_manager/loader_xmt.c -> gpac-0.5.1.svn5619.tar.xz/src/scene_manager/loader_xmt.c Changed

@@ -893,7 +893,7 @@
 		break;
 	case GF_SG_VRML_SFTIME:
 		res = xmt_parse_time(parser, info->name, (SFTime *)info->far_ptr, a_value);
-		xmt_check_time_offset(parser, n, info);
+		if (n) xmt_check_time_offset(parser, n, info);
 		break;
 	case GF_SG_VRML_SFCOLOR:
 		res = xmt_parse_float(parser, info->name, & ((SFColor *)info->far_ptr)->red, a_value);
@@ -1917,16 +1917,15 @@
 		else if (!strcmp(att->name, "ES_ID")) xmt_desc_name = att->value;
 		else if (!strcmp(att->name, "OCR_ES_ID")) ocr_ref = att->value;
 		else if (!strcmp(att->name, "dependsOn_ES_ID")) dep_ref = att->value;
-		else if ((desc->tag==GF_ODF_MUXINFO_TAG) && (!stricmp(att->name, "fileName") || !stricmp(att->name, "url"))) {
-			char *res_name = gf_url_concatenate(parser->load->fileName, (const char *)att->value);
-			e = gf_odf_set_field(desc, att->name, res_name ? res_name : att->value);
-			if (e) xmt_report(parser, e, "Warning: %s not a valid attribute for descriptor %s", att->name, name);
-			if (res_name)
-				gf_free(res_name);
-		} else {
+		else {
 			e = gf_odf_set_field(desc, att->name, att->value);
 			if (e) xmt_report(parser, e, "Warning: %s not a valid attribute for descriptor %s", att->name, name);
-		}
+ //store src path but do not concatenate, othewise we break BT<->XMT conversion ...
+ if ((desc->tag==GF_ODF_MUXINFO_TAG) && (!stricmp(att->name, "fileName") || !stricmp(att->name, "url"))) {
+ GF_MuxInfo *mux = (GF_MuxInfo *) desc;
+ if (!mux->src_url) mux->src_url = gf_strdup(parser->load->fileName);
+ }
+ }
 	}
 	if (binaryID || xmt_desc_name) {
 		if ((tag == GF_ODF_IOD_TAG) || (tag == GF_ODF_OD_TAG))
@@ -2705,7 +2704,7 @@
 					parser->command_buffer = NULL;
 				} else {
 					//empty <Insert>
-					if ((parser->command->tag==GF_SG_ROUTE_INSERT) && !parser->command->fromNodeID) {
+					if (parser->command && (parser->command->tag==GF_SG_ROUTE_INSERT) && !parser->command->fromNodeID) {
 						gf_list_del_item(parser->scene_au->commands, parser->command);
 					}
 					parser->command = NULL;

gpac-0.5.1.svn5491.tar.xz/src/scene_manager/scene_manager.c -> gpac-0.5.1.svn5619.tar.xz/src/scene_manager/scene_manager.c Changed

gpac-0.5.1.svn5491.tar.xz/src/scenegraph/dom_smjs.c -> gpac-0.5.1.svn5619.tar.xz/src/scenegraph/dom_smjs.c Changed

@@ -993,7 +993,7 @@
 SMJS_SET_PRIVATE(c, obj, NULL);
 gf_list_del_item(n->sgprivate->scenegraph->objects, obj);
 
-dom_js_pre_destroy(c, n->sgprivate->scenegraph, n);
+gf_sg_js_dom_pre_destroy(c, n->sgprivate->scenegraph, n);
 dom_unregister_node(n);
 }
 
@@ -2877,7 +2877,7 @@
 		/*we're sure the graph is a "nomade" one since we initially put the refcount to 1 ourselves*/
 		ctx->document->reference_count--;
 		if (!ctx->document->reference_count) {
-			dom_js_pre_destroy(ctx->c, ctx->document, NULL);
+			gf_sg_js_dom_pre_destroy(ctx->c, ctx->document, NULL);
 			gf_sg_del(ctx->document);
 		}
 	}
@@ -3143,12 +3143,6 @@
 		ctx->sess = NULL;
 	}
 
-	/*error, complete reset*/
-	if (error) {
-		xml_http_reset(ctx);
-	} else {
-		ctx->html_status = 200;
-	}
 	/*but stay in loaded mode*/
 	ctx->readyState = XHR_READYSTATE_DONE;
 	xml_http_state_change(ctx);
@@ -4542,7 +4536,8 @@
 
 void html_media_element_js_finalize(JSContext *c, GF_Node *n);
 
-void dom_js_pre_destroy(JSContext *c, GF_SceneGraph *sg, GF_Node *n)
+GF_EXPORT
+void gf_sg_js_dom_pre_destroy(JSContext *c, GF_SceneGraph *sg, GF_Node *n)
 {
 	u32 i, count;
 	if (n) {

gpac-0.5.1.svn5491.tar.xz/src/scenegraph/svg_attributes.c -> gpac-0.5.1.svn5619.tar.xz/src/scenegraph/svg_attributes.c Changed

gpac-0.5.1.svn5491.tar.xz/src/scenegraph/svg_smjs.c -> gpac-0.5.1.svn5619.tar.xz/src/scenegraph/svg_smjs.c Changed

gpac-0.5.1.svn5491.tar.xz/src/scenegraph/vrml_smjs.c -> gpac-0.5.1.svn5619.tar.xz/src/scenegraph/vrml_smjs.c Changed

gpac-0.5.1.svn5491.tar.xz/src/terminal/channel.c -> gpac-0.5.1.svn5619.tar.xz/src/terminal/channel.c Changed

@@ -970,7 +970,10 @@
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: At OTB %u got OCR %u (original TS "LLU") - diff %d%s (diff with prev OCR %d)\n", ch->esd->ESID, gf_clock_real_time(ch->clock), OCR_TS, hdr.objectClockReference, pcr_diff, (hdr.m2ts_pcr==2) ? " - PCR Discontinuity flag" : "", pcr_pcrprev_diff));
 
 			//PCR loop or disc - use 10 sec as a threshold - it may happen that video is sent up to 4 or 5 seconds ahead of the PCR in some systems
-			if (ch->IsClockInit && ABS(pcr_pcrprev_diff) > 10000) {
+			//1- check the PCR diff is greater than 10 seconds
+			//2- check the diff between this PCR diff and last PCR diff is greater than 10 seconds
+			//the first test is used to avoid disc detecting when the TS is sent in burst (eg DASH): 
+			if (ch->IsClockInit && (ABS(pcr_diff) > 10000)  && (ABS(pcr_pcrprev_diff) > 10000) ) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] ES%d: At OTB %u detected PCR %s (PCR diff %d - last PCR diff %d)\n", ch->esd->ESID, gf_clock_real_time(ch->clock), (hdr.m2ts_pcr==2) ? "discontinuity" : "looping", pcr_diff, ch->prev_pcr_diff));
 				gf_clock_discontinuity(ch->clock, ch->odm->parentscene, (hdr.m2ts_pcr==2) ? GF_TRUE : GF_FALSE);

gpac-0.5.1.svn5491.tar.xz/src/terminal/clock.c -> gpac-0.5.1.svn5619.tar.xz/src/terminal/clock.c Changed

gpac-0.5.1.svn5491.tar.xz/src/terminal/decoder.c -> gpac-0.5.1.svn5619.tar.xz/src/terminal/decoder.c Changed

gpac-0.5.1.svn5491.tar.xz/src/terminal/media_control.c -> gpac-0.5.1.svn5619.tar.xz/src/terminal/media_control.c Changed

@@ -416,17 +416,21 @@
 
 	/*check for changes*/
 	if (!stack->is_init) {
+		need_restart = 0;
 		/*not linked yet*/
 		if (!odm) return;
 		stack->media_speed = stack->control->mediaSpeed;
 		stack->enabled = stack->control->enabled;
 		stack->media_start = stack->control->mediaStartTime;
-		stack->media_stop = stack->control->mediaStopTime;
+		if (stack->media_stop != stack->control->mediaStopTime) {
+			if (stack->control->mediaStopTime) need_restart  = 1;
+			stack->media_stop = stack->control->mediaStopTime;
+		}
 		stack->is_init = 1;
 		stack->paused = 0;
 		/*the object has already been started, and media start time is not 0, restart*/
 		if (stack->stream->num_open) {
-			if ( (stack->media_start > 0) || (gf_list_count(stack->seg)>0 )  || (stack->media_speed!=FIX_ONE ) ) {
+			if (need_restart  || (stack->media_start > 0) || (gf_list_count(stack->seg)>0 )  || (stack->media_speed!=FIX_ONE ) ) {
 				mediacontrol_restart(odm);
 			} else if (stack->media_speed == 0) {
 				mediacontrol_pause(odm);

gpac-0.5.1.svn5491.tar.xz/src/terminal/media_manager.c -> gpac-0.5.1.svn5619.tar.xz/src/terminal/media_manager.c Changed

@@ -372,7 +372,7 @@
 		if (do_scene) {
 			u32 ms_until_next=0;
 			u32 time_taken = gf_sys_clock();
-			gf_sc_draw_frame(term->compositor, &ms_until_next);
+			gf_sc_draw_frame(term->compositor, 0, &ms_until_next);
 			time_taken = gf_sys_clock() - time_taken;
 			if (ms_until_next<term->frame_duration/2) {
 				left = 0;
@@ -665,7 +665,7 @@
 
 	if (term->flags & GF_TERM_NO_COMPOSITOR_THREAD) {
 		u32 ms_until_next;
-		gf_sc_draw_frame(term->compositor, &ms_until_next);
+		gf_sc_draw_frame(term->compositor, 0, &ms_until_next);
 		if (ms_until_next<term->compositor->frame_duration/2) {
 			time_taken=0;
 		}
@@ -705,8 +705,18 @@
 			gf_mx_v(term->mm_mx);
 		}
 
-		if (!gf_sc_draw_frame(term->compositor, NULL))
-			break;
+		if (!gf_sc_draw_frame(term->compositor, 1, NULL)) {
+			if (!term->root_scene || !term->root_scene->root_od)
+				break;
+
+			//wait for audio to be flushed
+			if (gf_sc_check_audio_pending(term->compositor) ) 
+				continue;
+
+			//force end of buffer
+			if (gf_scene_check_clocks(term->root_scene->root_od->net_service, term->root_scene, 1))
+				break;
+		}
 
 		if (! (term->user->init_flags & GF_TERM_NO_REGULATION))
 			break;
@@ -714,3 +724,10 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_term_process_flush_video(GF_Terminal *term)
+{
+	if (!(term->flags & GF_TERM_NO_COMPOSITOR_THREAD) ) return GF_BAD_PARAM;
+	gf_sc_flush_video(term->compositor);
+	return GF_OK;
+}

gpac-0.5.1.svn5491.tar.xz/src/terminal/media_memory.c -> gpac-0.5.1.svn5619.tar.xz/src/terminal/media_memory.c Changed

gpac-0.5.1.svn5491.tar.xz/src/terminal/media_object.c -> gpac-0.5.1.svn5619.tar.xz/src/terminal/media_object.c Changed

@@ -365,10 +365,10 @@
 
 
 GF_EXPORT
-char *gf_mo_fetch_data(GF_MediaObject *mo, Bool resync, Bool *eos, u32 *timestamp, u32 *size, s32 *ms_until_pres, s32 *ms_until_next)
+char *gf_mo_fetch_data(GF_MediaObject *mo, GF_MOFetchMode resync, Bool *eos, u32 *timestamp, u32 *size, s32 *ms_until_pres, s32 *ms_until_next)
 {
 	GF_Codec *codec;
-	Bool force_decode = GF_FALSE;
+	u32 force_decode_mode = 0;
 	u32 obj_time;
 	GF_CMUnit *CU;
 	s32 diff;
@@ -405,6 +405,8 @@
 		gf_odm_lock(mo->odm, 0);
 		return NULL;
 	}
+	if (resync==GF_MO_FETCH_PAUSED)
+		resync=GF_MO_FETCH;
 
 	bench_mode = mo->odm->term->bench_mode;
 
@@ -415,28 +417,36 @@
 			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d: Resizing output buffer %d -> %d\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, codec->CB->UnitSize, codec->force_cb_resize));
 			gf_codec_resize_composition_buffer(codec, codec->force_cb_resize);
 			codec->force_cb_resize=0;
-			force_decode = GF_TRUE;
+ //decode and resize CB
+			force_decode_mode = 1;
 		}
 	}
 
-	/*fast forward, bench mode with composition memory: force decode if no data is available*/
-	if (! *eos && ((codec->ck->speed > FIX_ONE) || (codec->odm->term->bench_mode && !codec->CB->no_allocation) || (codec->type==GF_STREAM_AUDIO) ) )
-		force_decode = GF_TRUE;
+	/*fast forward, bench mode with composition memory: force one decode if no data is available*/
+ if (! *eos && ((codec->ck->speed > FIX_ONE) || (codec->odm->term->bench_mode && !codec->CB->no_allocation) || (codec->type==GF_STREAM_AUDIO) ) ) {
+ force_decode_mode = 2;
+ }
 
-	if (force_decode) {
-		u32 retry=100;
+	if (force_decode_mode) {
+		u32 retry = 100;
 		gf_odm_lock(mo->odm, 0);
 		while (retry) {
 			if (gf_term_lock_codec(codec, GF_TRUE, GF_TRUE)) {
 				gf_codec_process(codec, 1);
 				gf_term_lock_codec(codec, GF_FALSE, GF_TRUE);
-				break;
 			}
+// if (force_decode_mode==2) break;
+
+			CU = gf_cm_get_output(codec->CB);
+			if (CU)
+				break;
+
 			retry--;
-			gf_sleep(0);
+			//we will wait max 100 ms for the CB to be re-fill
+			gf_sleep(1);
 		}
-		if (!retry && codec->force_cb_resize) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM%d] At %d could not resize and decode next frame in one pass - blank frame after TS %d\n", mo->odm->OD->objectDescriptorID, gf_clock_time(codec->ck), mo->timestamp));
+		if (!retry && (force_decode_mode==1)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM%d] At %d could not resize, decode and fetch next frame in 100 ms - blank frame after TS %d\n", mo->odm->OD->objectDescriptorID, gf_clock_time(codec->ck), mo->timestamp));
 		}
 		if (!gf_odm_lock_mo(mo))
 			return NULL;
@@ -453,10 +463,10 @@
 	/*note this assert is NOT true when recomputing DTS from CTS on the fly (MPEG1/2 RTP and H264/AVC RTP)*/
 	//assert(CU->TS >= codec->CB->LastRenderedTS);
 
-	if (codec->CB->UnitCount<=1) resync = GF_FALSE;
+	if (codec->CB->UnitCount<=1) resync = GF_MO_FETCH;
 
 	if (bench_mode && resync) {
-		resync = GF_FALSE;
+		resync = GF_MO_FETCH;
 		if (mo->timestamp == CU->TS) {
 			if (CU->next->dataLength) {
 				gf_cm_drop_output(codec->CB);
@@ -470,8 +480,8 @@
 	obj_time = gf_clock_time(codec->ck);
 
 	//no drop mode, only for speed = 1: all frames are presented, we discard the current output only if already presented and next frame time is mature
-	if ((codec->ck->speed==1) && !(mo->odm->term->flags & GF_TERM_DROP_LATE_FRAMES) && (mo->type==GF_MEDIA_OBJECT_VIDEO)) {
-		resync=GF_FALSE;
+	if (!codec->ck->Paused && (codec->ck->speed==1) && !(mo->odm->term->flags & GF_TERM_DROP_LATE_FRAMES) && (mo->type==GF_MEDIA_OBJECT_VIDEO)) {
+		resync=GF_MO_FETCH;
 		if (/*gf_clock_is_started(mo->odm->codec->ck) && */ (mo->timestamp==CU->TS) && CU->next->dataLength && (CU->next->TS <= obj_time) ) {
 			gf_cm_drop_output(codec->CB);
 			CU = gf_cm_get_output(codec->CB);
@@ -489,7 +499,7 @@
 				break;
 
 			if (!CU->next->dataLength) {
-				if (force_decode) {
+				if (force_decode_mode) {
 					obj_time = gf_clock_time(codec->ck);
 					gf_odm_lock(mo->odm, 0);
 					if (gf_term_lock_codec(codec, GF_TRUE, GF_TRUE)) {
@@ -557,6 +567,9 @@
 		*eos = GF_FALSE;
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d (%s)] At OTB %u fetch frame TS %u size %d (previous TS %d) - %d unit in CB - UTC "LLU" ms - %d ms until CTS is due - %d ms until next frame\n", mo->odm->OD->objectDescriptorID, mo->odm->net_service->url, gf_clock_time(codec->ck), CU->TS, mo->framesize, mo->timestamp, codec->CB->UnitCount, gf_net_get_utc(), mo->ms_until_pres, mo->ms_until_next ));
+	} else if (*eos) {
+		//already rendered the last frame, consider we no longer have pending late frame on this stream
+		mo->ms_until_pres = 0;
 	}
 
 	/*also adjust CU time based on consummed bytes in input, since some codecs output very large audio chunks*/

gpac-0.5.1.svn5491.tar.xz/src/terminal/media_sensor.c -> gpac-0.5.1.svn5619.tar.xz/src/terminal/media_sensor.c Changed

gpac-0.5.1.svn5491.tar.xz/src/terminal/mpeg4_inline.c -> gpac-0.5.1.svn5619.tar.xz/src/terminal/mpeg4_inline.c Changed

gpac-0.5.1.svn5491.tar.xz/src/terminal/network_service.c -> gpac-0.5.1.svn5619.tar.xz/src/terminal/network_service.c Changed

gpac-0.5.1.svn5491.tar.xz/src/terminal/object_manager.c -> gpac-0.5.1.svn5619.tar.xz/src/terminal/object_manager.c Changed

gpac-0.5.1.svn5491.tar.xz/src/terminal/scene.c -> gpac-0.5.1.svn5619.tar.xz/src/terminal/scene.c Changed

@@ -1692,6 +1692,10 @@
 				} else if (!scene->selected_service_id || (scene->selected_service_id==odm->OD->ServiceID)) {
 					gf_list_add(to_restart, odm);
 				}
+				//addon are inserted from outside the parent service, and won't share the same service_ID - restart if addon is enabled
+				else if (odm->addon && odm->subscene && odm->addon->enabled) {
+					gf_list_add(to_restart, odm);
+				}
 
 				if (odm->state == GF_ODM_STATE_PLAY) {
 					gf_odm_stop(odm, 1);
@@ -1919,29 +1923,43 @@
 }
 
 /*returns 0 if any of the clock still hasn't seen EOS*/
-Bool gf_scene_check_clocks(GF_ClientService *ns, GF_Scene *scene)
+Bool gf_scene_check_clocks(GF_ClientService *ns, GF_Scene *scene, Bool check_buffering)
 {
 	GF_Clock *ck;
 	u32 i;
 	if (scene) {
 		GF_ObjectManager *odm;
 		if (scene->root_od->net_service != ns) {
-			if (!gf_scene_check_clocks(scene->root_od->net_service, scene)) return 0;
+			if (!gf_scene_check_clocks(scene->root_od->net_service, scene, check_buffering)) return 0;
 		}
 		i=0;
 		while ( (odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i)) ) {
 			if (odm->net_service && (odm->net_service != ns)) {
-				if (!gf_scene_check_clocks(odm->net_service, NULL)) return 0;
-			} else if (odm->codec && odm->codec->CB && !gf_cm_is_eos(odm->codec->CB) ) {
-				return 0;
+				if (!gf_scene_check_clocks(odm->net_service, NULL, check_buffering)) return 0;
+			} else if (odm->codec && odm->codec->CB) {
+				if (!check_buffering) {
+					if (!gf_cm_is_eos(odm->codec->CB) ) {
+						return 0;
+					}
+				} else {
+					if (odm->codec->ck->Buffering) {
+						return 0;
+					}
+				}
 			}
 		}
 	}
 	i=0;
 	while ( (ck = (GF_Clock *)gf_list_enum(ns->Clocks, &i) ) ) {
-		if (!ck->has_seen_eos) return 0;
+		if (!check_buffering) {
+			if (!ck->has_seen_eos) return 0;
+		} else {
+			if (ck->Buffering) return 0;
+		}
+
 	}
-	if (scene) {
+
+	if (!check_buffering && scene) {
 		if (scene->scene_codec && (scene->scene_codec->Status != GF_ESM_CODEC_STOP)) return 0;
 		if (scene->od_codec && (scene->od_codec->Status != GF_ESM_CODEC_STOP)) return 0;
 	}
@@ -2156,7 +2174,7 @@
 				addon->enabled = 1;
 
 			//restart addon
-			if (!addon->root_od && addon->timeline_ready) {
+			if (!addon->root_od && addon->timeline_ready && addon->enabled) {
 				load_associated_media(scene, addon);
 			}
 			//nothing associated, deactivate addon

gpac-0.5.1.svn5491.tar.xz/src/terminal/terminal.c -> gpac-0.5.1.svn5619.tar.xz/src/terminal/terminal.c Changed

@@ -681,12 +681,12 @@
 			gf_list_add(tmp->unthreaded_extensions, ifce);
 	}
 
-	gf_term_lock_media_queue(tmp, 1);
+	gf_mx_p(tmp->mm_mx);
 	if (!gf_list_count(tmp->unthreaded_extensions)) {
 		gf_list_del(tmp->unthreaded_extensions);
 		tmp->unthreaded_extensions = NULL;
 	}
-	gf_term_lock_media_queue(tmp, 0);
+	gf_mx_v(tmp->mm_mx);
 
 	if (0 == gf_cfg_get_key_count(user->config, "MimeTypes")) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[Terminal] Initializing Mime Types..."));
@@ -834,20 +834,26 @@
 	GF_ClientService *ns;
 	/*only play/pause if connected*/
 	if (!term || !term->root_scene || !term->root_scene->root_od) return GF_BAD_PARAM;
-	if (term->play_state == GF_STATE_PLAYING) return GF_BAD_PARAM;
 
-	gf_sc_lock(term->compositor, 1);
-	i=0;
-	while ( (ns = (GF_ClientService*)gf_list_enum(term->net_services, &i)) ) {
-		GF_Clock *ck;
-		j=0;
-		while ( (ck = (GF_Clock *)gf_list_enum(ns->Clocks, &j)) ) {
-			ck->init_time += ms_diff;
+	if (ms_diff) {
+		if (term->play_state == GF_STATE_PLAYING) return GF_BAD_PARAM;
+
+		gf_sc_lock(term->compositor, 1);
+		i=0;
+		while ( (ns = (GF_ClientService*)gf_list_enum(term->net_services, &i)) ) {
+			GF_Clock *ck;
+			j=0;
+			while ( (ck = (GF_Clock *)gf_list_enum(ns->Clocks, &j)) ) {
+				ck->init_time += ms_diff;
+			}
 		}
+		term->compositor->step_mode = 1;
+
+		gf_sc_next_frame_state(term->compositor, GF_SC_DRAW_FRAME);
+		gf_sc_lock(term->compositor, 0);
 	}
-	term->compositor->step_mode = 1;
-	gf_sc_next_frame_state(term->compositor, GF_SC_DRAW_FRAME);
-	gf_sc_lock(term->compositor, 0);
+
+	gf_sc_flush_next_audio(term->compositor);
 	return GF_OK;
 }
 
@@ -989,7 +995,7 @@
 		if (gf_list_count(term->x3d_sensors)) return 0;
 	}
 	/*check no clocks are still running*/
-	if (!gf_scene_check_clocks(term->root_scene->root_od->net_service, term->root_scene)) return 0;
+	if (!gf_scene_check_clocks(term->root_scene->root_od->net_service, term->root_scene, 0)) return 0;
 	if (term->root_scene->is_dynamic_scene) return 1;
 
 	/*ask compositor if there are sensors*/
@@ -1184,7 +1190,7 @@
 	}
 
 	/*extensions*/
-	gf_term_lock_media_queue(term, 1);
+	gf_mx_p(term->mm_mx);
 	if (!term->reload_state && term->unthreaded_extensions) {
 		u32 i, count;
 		count = gf_list_count(term->unthreaded_extensions);
@@ -1193,7 +1199,7 @@
 			ifce->process(ifce, GF_TERM_EXT_PROCESS, NULL);
 		}
 	}
-	gf_term_lock_media_queue(term, 0);
+	gf_mx_v(term->mm_mx);
 
 
 	/*need to reload*/
@@ -1256,7 +1262,7 @@
 
 	/*prevent the media manager / term to access the list of services to destroy, otherwise
 	we could unload the module while poping its CloseService() call stack which can lead to
-	random crashes (return adresses no longer valid) - cf any "stress mode" playback of a playlist*/
+	random crashes (return addresses no longer valid) - cf any "stress mode" playback of a playlist*/
 	gf_term_lock_media_queue(term, 1);
 
 #if 0
@@ -2401,4 +2407,10 @@
 	if (width) *width = term->compositor->vp_width;
 	if (height) *height = term->compositor->vp_height;
 	return GF_OK;
-}
\ No newline at end of file
+}
+
+GF_EXPORT
+u32 gf_term_get_clock(GF_Terminal *term)
+{
+	return gf_sc_ar_get_clock(term->compositor->audio_renderer);
+}

gpac-0.5.1.svn5491.tar.xz/src/utils/alloc.c -> gpac-0.5.1.svn5619.tar.xz/src/utils/alloc.c Changed

@@ -181,8 +181,8 @@
 #define assert(p)
 #endif
 
-static void register_address(void *ptr, size_t size, char *filename, int line);
-static int unregister_address(void *ptr, char *filename, int line);
+static void register_address(void *ptr, size_t size, const char *filename, int line);
+static int unregister_address(void *ptr, const char *filename, int line);
 
 static void gf_memory_log(unsigned int level, const char *fmt, ...);
 enum
@@ -199,28 +199,28 @@
 	GF_MEMORY_DEBUG,
 };
 
-static void *gf_mem_malloc_basic(size_t size, char *filename, int line)
+static void *gf_mem_malloc_basic(size_t size, const char *filename, int line)
 {
 	return MALLOC(size);
 }
-static void *gf_mem_calloc_basic(size_t num, size_t size_of, char *filename, int line)
+static void *gf_mem_calloc_basic(size_t num, size_t size_of, const char *filename, int line)
 {
 	return CALLOC(num, size_of);
 }
-static void *gf_mem_realloc_basic(void *ptr, size_t size, char *filename, int line)
+static void *gf_mem_realloc_basic(void *ptr, size_t size, const char *filename, int line)
 {
 	return REALLOC(ptr, size);
 }
-static void gf_mem_free_basic(void *ptr, char *filename, int line)
+static void gf_mem_free_basic(void *ptr, const char *filename, int line)
 {
 	FREE(ptr);
 }
-static char *gf_mem_strdup_basic(const char *str, char *filename, int line)
+static char *gf_mem_strdup_basic(const char *str, const char *filename, int line)
 {
 	STRDUP(str);
 }
 
-void *gf_mem_malloc_tracker(size_t size, char *filename, int line)
+void *gf_mem_malloc_tracker(size_t size, const char *filename, int line)
 {
 	void *ptr = MALLOC(size);
 	if (!ptr) {
@@ -233,7 +233,7 @@
 	return ptr;
 }
 
-void *gf_mem_calloc_tracker(size_t num, size_t size_of, char *filename, int line)
+void *gf_mem_calloc_tracker(size_t num, size_t size_of, const char *filename, int line)
 {
 	size_t size = num*size_of;
 	void *ptr = CALLOC(num, size_of);
@@ -247,7 +247,7 @@
 	return ptr;
 }
 
-void gf_mem_free_tracker(void *ptr, char *filename, int line)
+void gf_mem_free_tracker(void *ptr, const char *filename, int line)
 {
 	int size_prev;
 	if (ptr && (size_prev=unregister_address(ptr, filename, line))) {
@@ -256,7 +256,7 @@
 	}
 }
 
-void *gf_mem_realloc_tracker(void *ptr, size_t size, char *filename, int line)
+void *gf_mem_realloc_tracker(void *ptr, size_t size, const char *filename, int line)
 {
 	void *ptr_g;
 	int size_prev;
@@ -283,7 +283,7 @@
 	return ptr_g;
 }
 
-char *gf_mem_strdup_tracker(const char *str, char *filename, int line)
+char *gf_mem_strdup_tracker(const char *str, const char *filename, int line)
 {
 	char *ptr;
 	if (!str) return NULL;
@@ -292,11 +292,11 @@
 	return ptr;
 }
 
-static void *(*gf_mem_malloc_proto)(size_t size, char *filename, int line) = gf_mem_malloc_basic;
-static void *(*gf_mem_calloc_proto)(size_t num, size_t size_of, char *filename, int line) = gf_mem_calloc_basic;
-static void *(*gf_mem_realloc_proto)(void *ptr, size_t size, char *filename, int line) = gf_mem_realloc_basic;
-static void (*gf_mem_free_proto)(void *ptr, char *filename, int line) = gf_mem_free_basic;
-static char *(*gf_mem_strdup_proto)(const char *str, char *filename, int line) = gf_mem_strdup_basic;
+static void *(*gf_mem_malloc_proto)(size_t size, const char *filename, int line) = gf_mem_malloc_basic;
+static void *(*gf_mem_calloc_proto)(size_t num, size_t size_of, const char *filename, int line) = gf_mem_calloc_basic;
+static void *(*gf_mem_realloc_proto)(void *ptr, size_t size, const char *filename, int line) = gf_mem_realloc_basic;
+static void (*gf_mem_free_proto)(void *ptr, const char *filename, int line) = gf_mem_free_basic;
+static char *(*gf_mem_strdup_proto)(const char *str, const char *filename, int line) = gf_mem_strdup_basic;
 
 #ifndef MY_GF_EXPORT
 #if defined(__GNUC__) && __GNUC__ >= 4
@@ -307,30 +307,30 @@
 #endif
 #endif
 
-MY_GF_EXPORT void *gf_mem_malloc(size_t size, char *filename, int line)
+MY_GF_EXPORT void *gf_mem_malloc(size_t size, const char *filename, int line)
 {
 	return gf_mem_malloc_proto(size, filename, line);
 }
 
-MY_GF_EXPORT void *gf_mem_calloc(size_t num, size_t size_of, char *filename, int line)
+MY_GF_EXPORT void *gf_mem_calloc(size_t num, size_t size_of, const char *filename, int line)
 {
 	return gf_mem_calloc_proto(num, size_of, filename, line);
 }
 
 MY_GF_EXPORT
-void *gf_mem_realloc(void *ptr, size_t size, char *filename, int line)
+void *gf_mem_realloc(void *ptr, size_t size, const char *filename, int line)
 {
 	return gf_mem_realloc_proto(ptr, size, filename, line);
 }
 
 MY_GF_EXPORT
-void gf_mem_free(void *ptr, char *filename, int line)
+void gf_mem_free(void *ptr, const char *filename, int line)
 {
 	gf_mem_free_proto(ptr, filename, line);
 }
 
 MY_GF_EXPORT
-char *gf_mem_strdup(const char *str, char *filename, int line)
+char *gf_mem_strdup(const char *str, const char *filename, int line)
 {
 	return gf_mem_strdup_proto(str, filename, line);
 }
@@ -386,7 +386,7 @@
 
 
 /*base functions (add, find, del_item, del) are implemented upon a stack model*/
-static void gf_memory_add_stack(memory_element **p, void *ptr, int size, char *filename, int line)
+static void gf_memory_add_stack(memory_element **p, void *ptr, int size, const char *filename, int line)
 {
 	memory_element *element = (memory_element*)MALLOC(sizeof(memory_element)+strlen(filename)+1);
 	element->ptr = ptr;
@@ -447,7 +447,7 @@
 #if GPAC_MEMORY_TRACKING_HASH_TABLE
 
 /*this list is implemented as a stack to minimise the cost of freeing recent allocations*/
-static void gf_memory_add(memory_list *p, void *ptr, int size, char *filename, int line)
+static void gf_memory_add(memory_list *p, void *ptr, int size, const char *filename, int line)
 {
 	unsigned int hash;
 	if (!*p) *p = (memory_list) CALLOC(HASH_ENTRIES, sizeof(memory_element*));
@@ -525,7 +525,7 @@
 memory_list memory_add = NULL, memory_rem = NULL;
 GF_Mutex *gpac_allocations_lock = NULL;
 
-static void register_address(void *ptr, size_t size, char *filename, int line)
+static void register_address(void *ptr, size_t size, const char *filename, int line)
 {
 	/*mutex initialization*/
 	if (gpac_allocations_lock == 0) {
@@ -580,7 +580,7 @@
 #endif
 
 /*returns the size of the unregistered block*/
-static int unregister_address(void *ptr, char *filename, int line)
+static int unregister_address(void *ptr, const char *filename, int line)
 {
 	int size = 0; /*default: failure*/
 
@@ -663,13 +663,20 @@
 }
 
 /*prints allocations sum-up*/
-void gf_memory_size()
+static void print_memory_size()
 {
 	unsigned int level = gpac_nb_alloc_blocs ? GF_MEMORY_ERROR : GF_MEMORY_INFO;
 	gf_memory_log(level, "[MemTracker] Total: %d bytes allocated in %d blocks\n", gpac_allocated_memory, gpac_nb_alloc_blocs);
 }
 
+GF_EXPORT
+u64 gf_memory_size()
+{
+	return (u64) gpac_allocated_memory;
+}
+
 /*prints the state of current allocations*/
+GF_EXPORT
 void gf_memory_print()
 {
 	/*if lists are empty, the mutex is also NULL*/
@@ -702,7 +709,7 @@
 				curr_element = next_element;
 			}
 		}
-		gf_memory_size();
+		print_memory_size();
 
 		/*unlock*/
 		gf_mx_v(gpac_allocations_lock);

gpac-0.5.1.svn5491.tar.xz/src/utils/base_encoding.c -> gpac-0.5.1.svn5619.tar.xz/src/utils/base_encoding.c Changed

gpac-0.5.1.svn5491.tar.xz/src/utils/cache.c -> gpac-0.5.1.svn5619.tar.xz/src/utils/cache.c Changed

@@ -346,7 +346,8 @@
 	return entry ? entry->cache_filename : NULL;
 }
 
-GF_Err appendHttpCacheHeaders(const DownloadedCacheEntry entry, char * httpRequest) {
+GF_EXPORT
+GF_Err gf_cache_append_http_headers(const DownloadedCacheEntry entry, char * httpRequest) {
 	if (!entry || !httpRequest)
 		return GF_BAD_PARAM;
 	if (entry->flags)
@@ -560,14 +561,35 @@
 	if (entry->writeFilePtr) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK,
 		       ("[CACHE] Closing file %s, %d bytes written.\n", entry->cache_filename, entry->written_in_cache));
-		if (fflush( entry->writeFilePtr ) || fclose( entry->writeFilePtr ))
+
+		if (fflush( entry->writeFilePtr ) || fclose( entry->writeFilePtr )) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Failed to flush/close file on disk\n"));
 			e = GF_IO_ERR;
-		e|= gf_cache_flush_disk_cache(entry);
-		if (e == GF_OK && success) {
-			e|= gf_cache_set_last_modified_on_disk( entry, gf_cache_get_last_modified_on_server(entry));
-			e|= gf_cache_set_etag_on_disk( entry, gf_cache_get_etag_on_server(entry));
 		}
-		e|= gf_cache_flush_disk_cache(entry);
+		if (!e) {
+			e = gf_cache_flush_disk_cache(entry);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Failed to flush cache entry on disk\n"));
+			}
+		}
+		if (!e && success) {
+			e = gf_cache_set_last_modified_on_disk( entry, gf_cache_get_last_modified_on_server(entry));
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Failed to set last-modified\n"));
+			} else {
+				e = gf_cache_set_etag_on_disk( entry, gf_cache_get_etag_on_server(entry));
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Failed to set etag\n"));
+				}
+			}
+		}
+		if (!e) {
+			e = gf_cache_flush_disk_cache(entry);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Failed to flush cache entry on disk after etag/last-modified\n"));
+			}
+		}
+
 #if defined(_BSD_SOURCE) || _XOPEN_SOURCE >= 500
 		/* On  UNIX, be sure to flush all the data */
 		sync();
@@ -656,7 +678,7 @@
 		memset(entry->mem_storage + entry->written_in_cache, 0, 2);
 		sprintf(entry->cache_filename, "gmem://%d@%p", entry->written_in_cache, entry->mem_storage);
 
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] Writing %d bytes to cache\n", size));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] Storing %d bytes to memory\n", size));
 		return GF_OK;
 	}
 
@@ -810,8 +832,8 @@
 		gf_cfg_del ( entry->properties );
 		entry->properties = NULL;
 		if (propfile) {
-			if (GF_OK !=  gf_delete_file( propfile ))
-				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[CACHE] gf_cache_delete_entry:%d, failed to delete file %s\n", __LINE__, propfile));
+			//this may fil becaus ethe prop file is not yet flushed to disk
+			gf_delete_file( propfile );
 			gf_free ( propfile );
 		}
 	}
@@ -838,7 +860,7 @@
 		entry->cacheSize = ( u32 ) gf_f64_tell ( the_cache );
 		fclose ( the_cache );
 		if (keyValue) {
-			entry->contentLength = strtoul( keyValue, &endPtr, 10);
+			entry->contentLength = (u32) strtoul( keyValue, &endPtr, 10);
 			if (*endPtr!='\0' || entry->contentLength != entry->cacheSize) {
 				entry->flags |= CORRUPTED;
 				GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] gf_cache_create_entry:%d, Cache corrupted: file and cache info size mismatch.\n", __LINE__));

gpac-0.5.1.svn5491.tar.xz/src/utils/color.c -> gpac-0.5.1.svn5619.tar.xz/src/utils/color.c Changed

gpac-0.5.1.svn5491.tar.xz/src/utils/downloader.c -> gpac-0.5.1.svn5619.tar.xz/src/utils/downloader.c Changed

@@ -147,6 +147,8 @@
 	/* Range information if needed for the download (cf flag) */
 	Bool needs_range;
 	u64 range_start, range_end;
+	
+	u32 connect_time, ssl_setup_time, reply_time, total_time_since_req, req_hdr_size, rsp_hdr_size;
 
 	/*0: GET
 	 1: HEAD
@@ -177,7 +179,7 @@
 	Bool chunked;
 	u32 nb_left_in_chunk;
 
-	u32 request_time;
+	u64 request_start_time;
 	/*private extension*/
 	void *ext;
 };
@@ -689,10 +691,8 @@
 	sess->connection_close = 0;
 
 	if (sess->status >= GF_NETIO_DISCONNECTED) {
-		if (force_close) {
-			if (sess->use_cache_file) {
-				gf_cache_close_write_cache(sess->cache_entry, sess, 0);
-			}
+		if (force_close && sess->use_cache_file && sess->cache_entry) {
+			gf_cache_close_write_cache(sess->cache_entry, sess, 0);
 		}
 		return;
 	}
@@ -869,7 +869,7 @@
 
 GF_EXPORT
 GF_Err gf_dm_get_url_info(const char * url, GF_URL_Info * info, const char * baseURL) {
-	char *tmp, *tmp_url, *current_pos, *urlConcatenateWithBaseURL;
+	char *tmp, *tmp_url, *current_pos, *urlConcatenateWithBaseURL, *ipv6;
 	char * copyOfUrl;
 	s32 proto_offset;
 	gf_dm_url_info_del(info);
@@ -952,7 +952,10 @@
 		info->server_name = gf_strdup(tmp_url);
 	}
 
-	tmp = strrchr(current_pos, ':');
+	//scan for port number after IPv6 adress ']' end char
+	ipv6 = strrchr(current_pos, ']');
+	tmp = strrchr(ipv6 ? ipv6 : current_pos, ':');
+
 	if (tmp) {
 		info->port = atoi(tmp+1);
 		tmp[0] = 0;
@@ -1236,7 +1239,7 @@
 	GF_Err e;
 	u16 proxy_port = 0;
 	const char *proxy, *ip;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("gf_dm_connect"":%d\n", __LINE__));
+
 	if (!sess->sock) {
 		sess->num_retry = 40;
 		sess->sock = gf_sk_new(GF_SOCK_TYPE_TCP);
@@ -1294,6 +1297,7 @@
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Connecting to %s:%d\n", proxy, proxy_port));
 
 	if (sess->status == GF_NETIO_SETUP) {
+		u64 now =gf_sys_clock_high_res();
 		e = gf_sk_connect(sess->sock, (char *) proxy, proxy_port, (char *)ip);
 
 		/*retry*/
@@ -1311,7 +1315,9 @@
 			return;
 		}
 
+		sess->connect_time = (u32) (gf_sys_clock_high_res() - now);
 		sess->status = GF_NETIO_CONNECTED;
+ GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Connected to %s:%d\n", proxy, proxy_port));
 		gf_dm_sess_notify_state(sess, GF_NETIO_CONNECTED, GF_OK);
 		gf_sk_set_buffer_size(sess->sock, 1, GF_DOWNLOAD_BUFFER_SIZE);
 		gf_sk_set_buffer_size(sess->sock, 0, GF_DOWNLOAD_BUFFER_SIZE);
@@ -1319,6 +1325,7 @@
 
 #ifdef GPAC_HAS_SSL
 	if (!sess->ssl && (sess->flags & GF_DOWNLOAD_SESSION_USE_SSL)) {
+		u64 now =gf_sys_clock_high_res();
 		if (!sess->dm->ssl_ctx)
 			ssl_init(sess->dm, 0);
 		/*socket is connected, configure SSL layer*/
@@ -1368,6 +1375,8 @@
 					gf_dm_sess_notify_state(sess, sess->status, sess->last_error);
 				}
 			}
+
+			sess->ssl_setup_time = (u32) (gf_sys_clock_high_res() - now);
 		}
 	}
 #endif
@@ -1620,6 +1629,8 @@
 		opt = gf_cfg_get_key(cfg, "General", "CacheDirectory");
 	else
 		opt = NULL;
+
+retry_cache:
 	if (!opt) {
 		default_cache_dir = gf_get_default_cache_directory();
 		opt = default_cache_dir;
@@ -1629,7 +1640,30 @@
 		sprintf(dm->cache_directory, "%s%c", opt, GF_PATH_SEPARATOR);
 	} else {
 		dm->cache_directory = gf_strdup(opt);
+	}
 
+	//check cache exists
+	if (!default_cache_dir) {
+		FILE *test;
+		char szTemp[GF_MAX_PATH];
+		strcpy(szTemp, dm->cache_directory);
+		strcat(szTemp, "gpaccache.test");
+		test = fopen(szTemp, "wb");
+		if (!test) {
+			gf_mkdir(dm->cache_directory);
+			test = fopen(szTemp, "wb");
+			if (!test) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[Cache] Cannot write to %s directory, using system temp cache\n", dm->cache_directory ));
+				gf_free(dm->cache_directory);
+				dm->cache_directory = NULL;
+				opt = NULL;
+				goto retry_cache;
+			}
+		}
+		if (test) {
+			fclose(test);
+			gf_delete_file(szTemp);
+		}
 	}
 
 	opt = cfg ? gf_cfg_get_key(cfg, "Downloader", "MaxRate") : NULL;
@@ -1945,7 +1979,9 @@
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK,
 			 ("[CACHE] url %s saved as %s\n", gf_cache_get_url(sess->cache_entry), gf_cache_get_cache_filename(sess->cache_entry)));
 		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] url %s downloaded in "LLU" us (%d kbps)\n", gf_cache_get_url(sess->cache_entry), gf_sys_clock() - sess->start_time, 8*sess->bytes_per_sec/1024 ));
+		sess->total_time_since_req = (u32) (gf_sys_clock_high_res() - sess->request_start_time);
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] url %s downloaded in "LLU" us (%d kbps) (%d us since request)\n", gf_cache_get_url(sess->cache_entry), gf_sys_clock_high_res() - sess->start_time, 8*sess->bytes_per_sec/1024, sess->total_time_since_req ));
 	}
 
 	if (rewrite_size && sess->chunked) {
@@ -2080,15 +2116,6 @@
 	return ret;
 }
 
-static GFINLINE char *http_is_header(char *line, char *header_name)
-{
-	char *res;
-	if (strnicmp(line, header_name, strlen(header_name))) return NULL;
-	res = line + strlen(header_name);
-	while ((res[0] == ':') || (res[0] == ' ')) res+=1;
-	return res;
-}
-
 /*!
 * Sends the HTTP headers
 * \param sess The GF_DownloadSession
@@ -2267,7 +2294,7 @@
 		strcat(sHTTP, "Icy-Metadata: 1\r\n");
 
 		/*cached headers are not appended in POST*/
-		if (!no_cache && !sess->disable_cache && (GF_OK < appendHttpCacheHeaders( sess->cache_entry, sHTTP)) ) {
+		if (!no_cache && !sess->disable_cache && (GF_OK < gf_cache_append_http_headers( sess->cache_entry, sHTTP)) ) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("Cache Entry : %p, FAILED to append cache directives.", sess->cache_entry));
 		}
 	}
@@ -2303,6 +2330,9 @@
 			}
 		}
 
+		sess->request_start_time = gf_sys_clock_high_res();
+		sess->req_hdr_size = len+par.size;
+
 #ifdef GPAC_HAS_SSL
 		if (sess->ssl) {
 			u32 writelen = len+par.size;
@@ -2316,16 +2346,19 @@
 		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Sending request %s\n\n", tmp_buf));
 		gf_free(tmp_buf);
 	} else {
+		u32 len = (u32) strlen(sHTTP);
+
+		sess->request_start_time = gf_sys_clock_high_res();
+		sess->req_hdr_size = len;
 
 #ifdef GPAC_HAS_SSL
 		if (sess->ssl) {
-			u32 len = strlen(sHTTP);
 			e = GF_OK;
 			if (len != SSL_write(sess->ssl, sHTTP, len))
 				e = GF_IP_NETWORK_FAILURE;
 		} else
 #endif
-			e = gf_sk_send(sess->sock, sHTTP, (u32) strlen(sHTTP));
+			e = gf_sk_send(sess->sock, sHTTP, len);
 
 #ifndef GPAC_DISABLE_LOG
 		if (e) {
@@ -2335,7 +2368,6 @@
 		}
 #endif
 	}
-	sess->request_time = gf_sys_clock();
 
 	if (e) {
 		sess->status = GF_NETIO_STATE_ERROR;
@@ -2461,6 +2493,15 @@
 		par.msg_type = GF_NETIO_PARSE_HEADER;
 		gf_dm_sess_user_io(sess, &par);
 	}
+
+	if (sHTTP) {
+		sHTTP[bytesRead]=0;
+		par.error = 0;
+		par.data = sHTTP + BodyStart;
+		par.size = (u32) strlen(par.data);
+		par.msg_type = GF_NETIO_DATA_EXCHANGE;
+		gf_dm_sess_user_io(sess, &par);
+	}
 }
 
 /*!
@@ -2480,6 +2521,7 @@
 	char comp[400];
 	GF_Err e;
 	char * new_location;
+	const char * mime_type;
 	assert( sess->status == GF_NETIO_WAIT_FOR_REPLY );
 	bytesRead = res = 0;
 	new_location = NULL;
@@ -2500,7 +2542,7 @@
 		switch (e) {
 		case GF_IP_NETWORK_EMPTY:
 			if (!bytesRead) {
-				if (gf_sys_clock() - sess->request_time > sess->dm->request_timeout) {
+				if (gf_sys_clock_high_res() - sess->request_start_time > 1000 * sess->dm->request_timeout) {
 					sess->last_error = GF_IP_NETWORK_EMPTY;
 					sess->status = GF_NETIO_STATE_ERROR;
 					return GF_IP_NETWORK_EMPTY;
@@ -2555,6 +2597,9 @@
 	sHTTP[BodyStart-1] = 0;
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] %s\n\n", sHTTP));
 
+	sess->reply_time = (u32) (gf_sys_clock_high_res() - sess->request_start_time);
+	sess->rsp_hdr_size = BodyStart;
+
 	LinePos = gf_token_get_line(sHTTP, 0, bytesRead, buf, 1024);
 	Pos = gf_token_get(buf, 0, " \t\r\n", comp, 400);
 
@@ -2618,29 +2663,29 @@
 
 		}
 		else if (!stricmp(hdrp->name, "Content-Type")) {
-			char * mime_type = gf_strdup(hdrp->value);
+			char *mime = gf_strdup(hdrp->value);
 			while (1) {
-				u32 len = (u32) strlen(mime_type);
-				char c = len ? mime_type[len-1] : 0;
+				u32 len = (u32) strlen(mime);
+				char c = len ? mime[len-1] : 0;
 				if ((c=='\r') || (c=='\n')) {
-					mime_type[len-1] = 0;
+					mime[len-1] = 0;
 				} else {
 					break;
 				}
 			}
-			val = strchr(mime_type, ';');
+			val = strchr(mime, ';');
 			if (val) val[0] = 0;
 
-			strlwr(mime_type);
+			strlwr(mime);
 			if (rsp_code<300) {
 				if (sess->cache_entry) {
-					gf_cache_set_mime_type(sess->cache_entry, mime_type);
+					gf_cache_set_mime_type(sess->cache_entry, mime);
 				} else {
-					sess->mime_type = mime_type;
-					mime_type = NULL;
+					sess->mime_type = mime;
+					mime = NULL;
 				}
 			}
-			if (mime_type) gf_free(mime_type);
+			if (mime) gf_free(mime);
 		}
 		else if (!stricmp(hdrp->name, "Content-Range")) {
 			range = 1;
@@ -2780,6 +2825,9 @@
 	case 304:
 	{
 		sess->status = GF_NETIO_PARSE_REPLY;
+		assert(sess->cache_entry);
+		sess->total_size = gf_cache_get_cache_filesize(sess->cache_entry);
+
 		gf_dm_sess_notify_state(sess, GF_NETIO_PARSE_REPLY, GF_OK);
 		gf_dm_disconnect(sess, 0);
 		if (sess->user_proc) {
@@ -2927,7 +2975,7 @@
 		goto exit;
 	}
 
-	notify_headers(sess, sHTTP, bytesRead, BodyStart);
+	notify_headers(sess, NULL, bytesRead, BodyStart);
 
 	if (sess->http_read_type != GET)
 		sess->use_cache_file = 0;
@@ -2937,58 +2985,61 @@
 		gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
 		sess->http_read_type = 0;
 		return GF_OK;
+
+
+	}
+
+
+	mime_type = gf_cache_get_mime_type(sess->cache_entry);
+	if (!ContentLength && mime_type && ((strstr(mime_type, "ogg") || (!strcmp(mime_type, "audio/mpeg"))))) {
+		if (0 == sess->icy_metaint)
+			sess->icy_metaint = -1;
+		sess->use_cache_file = 0;
 	}
-	{
-		const char * mime_type = gf_cache_get_mime_type(sess->cache_entry);
-		if (!ContentLength && mime_type && ((strstr(mime_type, "ogg") || (!strcmp(mime_type, "audio/mpeg"))))) {
-			if (0 == sess->icy_metaint)
-				sess->icy_metaint = -1;
-			sess->use_cache_file = 0;
-		}
 
 #ifndef GPAC_DISABLE_LOGS
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTP] Error connecting to %s: %s\n", sess->server_name, gf_error_to_string(e) ) );
-		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Connected to %s\n", sess->server_name ) );
-		}
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTP] Error processing rely from %s: %s\n", sess->server_name, gf_error_to_string(e) ) );
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTP] Reply processed from %s\n", sess->server_name ) );
+	}
 #endif
 
-		/*some servers may reply without content length, but we MUST have it*/
-		if (e) goto exit;
-		if (sess->icy_metaint != 0) {
-			assert( ! sess->use_cache_file );
-			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] ICY protocol detected\n"));
-			if (mime_type && !stricmp(mime_type, "video/nsv")) {
-				gf_cache_set_mime_type(sess->cache_entry, "audio/aac");
-			}
-			sess->icy_bytes = 0;
+	/*some servers may reply without content length, but we MUST have it*/
+	if (e) goto exit;
+	if (sess->icy_metaint != 0) {
+		assert( ! sess->use_cache_file );
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] ICY protocol detected\n"));
+		if (mime_type && !stricmp(mime_type, "video/nsv")) {
+			gf_cache_set_mime_type(sess->cache_entry, "audio/aac");
+		}
+		sess->icy_bytes = 0;
+		sess->total_size = SIZE_IN_STREAM;
+		sess->status = GF_NETIO_DATA_EXCHANGE;
+	} else if (!ContentLength && !sess->chunked) {
+		if (sess->http_read_type == GET) {
 			sess->total_size = SIZE_IN_STREAM;
+			sess->use_cache_file = 0;
 			sess->status = GF_NETIO_DATA_EXCHANGE;
-		} else if (!ContentLength && !sess->chunked) {
-			if (sess->http_read_type == GET) {
-				sess->total_size = SIZE_IN_STREAM;
-				sess->use_cache_file = 0;
-				sess->status = GF_NETIO_DATA_EXCHANGE;
-				sess->bytes_done = 0;
-			} else {
-				gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
-				gf_dm_disconnect(sess, 0);
-				return GF_OK;
-			}
+			sess->bytes_done = 0;
 		} else {
-			sess->total_size = ContentLength;
-			if (sess->use_cache_file && sess->http_read_type == GET ) {
-				e = gf_cache_open_write_cache(sess->cache_entry, sess);
-				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ( "[CACHE] Failed to open cache, error=%d\n", e));
-					goto exit;
-				}
+			gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
+			gf_dm_disconnect(sess, 0);
+			return GF_OK;
+		}
+	} else {
+		sess->total_size = ContentLength;
+		if (sess->use_cache_file && sess->http_read_type == GET ) {
+			e = gf_cache_open_write_cache(sess->cache_entry, sess);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ( "[CACHE] Failed to open cache, error=%d\n", e));
+				goto exit;
 			}
-			sess->status = GF_NETIO_DATA_EXCHANGE;
-			sess->bytes_done = 0;
 		}
+		sess->status = GF_NETIO_DATA_EXCHANGE;
+		sess->bytes_done = 0;
 	}
+	
 
 	/* we may have existing data in this buffer ... */
 	if (!e && (BodyStart < (s32) bytesRead)) {
@@ -3099,7 +3150,7 @@
 	GF_DownloadSession *dnload;
 	if (!filename || !url || !dm)
 		return GF_BAD_PARAM;
-	f= fopen(filename, "w");
+	f= fopen(filename, "wb");
 	if (!f) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[WGET] Failed to open file %s for write.\n", filename));
 		return GF_IO_ERR;
@@ -3108,7 +3159,7 @@
 	if (!dnload) {
 		return GF_BAD_PARAM;
 	}
-	dnload->use_cache_file = 1;
+	dnload->use_cache_file = 0;
 	dnload->force_data_write_callback = 1;
 	if (end_range) {
 		dnload->range_start = start_range;
@@ -3160,7 +3211,7 @@
 		e = gf_cache_close_write_cache(dnload->cache_entry, dnload, e == GF_OK);
 
 	if (!e) {
-		u32 size = ftell(f), read;
+		u32 size = (u32) ftell(f), read;
 		*out_size = size;
 		*out_data = gf_malloc(sizeof(char)* ( 1 + size));
 		fseek(f, 0, SEEK_SET);
@@ -3432,4 +3483,18 @@
 	return NULL;
 }
 
+GF_EXPORT
+GF_Err gf_dm_sess_get_header_sizes_and_times(GF_DownloadSession *sess, u32 *req_hdr_size, u32 *rsp_hdr_size, u32 *connect_time, u32 *reply_time, u32 *download_time)
+{
+	if (!sess) return GF_BAD_PARAM;
+
+	if (req_hdr_size) *req_hdr_size = sess->req_hdr_size;
+	if (rsp_hdr_size) *rsp_hdr_size = sess->rsp_hdr_size;
+	if (connect_time) *connect_time = sess->connect_time;
+	if (reply_time) *reply_time = sess->reply_time;
+	if (download_time) *download_time = sess->total_time_since_req;
+	return GF_OK;
+}
+
+
 #endif

gpac-0.5.1.svn5491.tar.xz/src/utils/error.c -> gpac-0.5.1.svn5619.tar.xz/src/utils/error.c Changed

gpac-0.5.1.svn5491.tar.xz/src/utils/module.c -> gpac-0.5.1.svn5619.tar.xz/src/utils/module.c Changed

gpac-0.5.1.svn5491.tar.xz/src/utils/os_config_init.c -> gpac-0.5.1.svn5619.tar.xz/src/utils/os_config_init.c Changed

@@ -265,7 +265,8 @@
 #ifdef GPAC_IPHONE
 		res = realpath(user_home, buf);
 		if (res) {
-			strcpy(file_path, buf);
+            strcpy(file_path, buf);
+            strcat(file_path, "/Documents");
 		} else
 #endif
 			strcpy(file_path, user_home);
@@ -364,7 +365,7 @@
 		/*iOS app is distributed with embedded GUI*/
 		get_default_install_path(app_path, GF_PATH_APP);
 		strcat(app_path, "/gui");
-		if (check_file_exists("gui_old.bt", app_path, file_path)) return 1;
+		if (check_file_exists("gui.bt", app_path, file_path)) return 1;
 #endif
 	}
 	else { // (path_type==GF_PATH_MODULES)
@@ -397,11 +398,16 @@
 	if (!f) return NULL;
 	fclose(f);
 
+#ifndef GPAC_IPHONE
 	if (! get_default_install_path(szPath, GF_PATH_MODULES)) {
 		gf_delete_file(szPath);
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] default modules not found\n"));
 		return NULL;
 	}
+#else
+	get_default_install_path(szPath, GF_PATH_APP);
+	strcpy(szPath, "");
+#endif
 
 	cfg = gf_cfg_new(file_path, CFG_FILE_NAME);
 	if (!cfg) return NULL;
@@ -538,10 +544,10 @@
 
 	/*if startup file was disabled, do not attempt to correct it*/
 	if (gf_cfg_get_key(cfg, "General", "StartupFile")==NULL) return;
-
+    
 	if ( get_default_install_path(path, GF_PATH_GUI) ) {
 		opt = gf_cfg_get_key(cfg, "General", "StartupFile");
-		if (strstr(opt, "gui.bt") && strcmp(opt, path)) {
+		if (strstr(opt, "gui.bt") && strcmp(opt, path) && strstr(path, ".app") ) {
 #if defined(__DARWIN__) || defined(__APPLE__)
 			strcat(path, "/gui.bt");
 			gf_cfg_set_key(cfg, "General", "StartupFile", path);
@@ -579,18 +585,20 @@
 		fprintf(stderr, "Fatal error: Cannot create a configuration file in application or user home directory - no write access\n");
 		return NULL;
 	}
+
 	cfg = gf_cfg_new(szPath, CFG_FILE_NAME);
 	if (!cfg) {
 		fprintf(stderr, "GPAC config file %s not found in %s - creating new file\n", CFG_FILE_NAME, szPath);
 		cfg = create_default_config(szPath);
 	}
-
 	if (!cfg) {
-		fprintf(stderr, "Cannot create config file %s in %s directory\n", CFG_FILE_NAME, szPath);
+		fprintf(stderr, "\nCannot create config file %s in %s directory\n", CFG_FILE_NAME, szPath);
 		return NULL;
 	}
 
+#ifndef GPAC_IPHONE
 	fprintf(stderr, "Using config file in %s directory\n", szPath);
+#endif
 
 	check_modules_dir(cfg);

gpac-0.5.1.svn5491.tar.xz/src/utils/os_divers.c -> gpac-0.5.1.svn5619.tar.xz/src/utils/os_divers.c Changed

@@ -84,7 +84,7 @@
 {
 	struct timeval now;
 	gettimeofday(&now, NULL);
-	return ( (now.tv_sec)*1000 + (now.tv_usec) / 1000) - sys_start_time;
+	return (u32) ( ( (now.tv_sec)*1000 + (now.tv_usec) / 1000) - sys_start_time );
 }
 
 GF_EXPORT
@@ -139,93 +139,6 @@
 #endif
 }
 
-
-GF_Err gf_rmdir(char *DirPathName)
-{
-#if defined (_WIN32_WCE)
-	TCHAR swzName[MAX_PATH];
-	BOOL res;
-	CE_CharToWide(DirPathName, swzName);
-	res = RemoveDirectory(swzName);
-	if (! res) {
-		int err = GetLastError();
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot delete director %s: last error %d\n", DirPathName, err ));
-	}
-#elif defined (WIN32)
-	int res = rmdir(DirPathName);
-	if (res==-1) {
-		int err = GetLastError();
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot delete director %s: last error %d\n", DirPathName, err ));
-		return GF_IO_ERR;
-	}
-#else
-	int res = rmdir(DirPathName);
-	if (res==-1) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot delete director %s: last error %d\n", DirPathName, errno ));
-		return GF_IO_ERR;
-	}
-#endif
-	return GF_OK;
-}
-
-GF_EXPORT
-GF_Err gf_mkdir(char* DirPathName)
-{
-#if defined (_WIN32_WCE)
-	TCHAR swzName[MAX_PATH];
-	BOOL res;
-	CE_CharToWide(DirPathName, swzName);
-	res = CreateDirectory(swzName, NULL);
-	if (! res) {
-		int err = GetLastError();
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory %s: last error %d\n", DirPathName, err ));
-	}
-#elif defined (WIN32)
-	int res = mkdir(DirPathName);
-	if (res==-1) {
-		int err = GetLastError();
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory %s: last error %d\n", DirPathName, err ));
-	}
-#else
-	int res = mkdir(DirPathName, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
-	if (res==-1) {
-		if(errno == 17) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory %s, it already exists: last error %d \n", DirPathName, errno ));
-			return GF_BAD_PARAM;
-		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory %s: last error %d\n", DirPathName, errno ));
-			return GF_IO_ERR;
-		}
-	}
-#endif
-	return GF_OK;
-}
-
-static Bool delete_dir(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
-{
-	Bool directory_clean_mode = *(Bool*)cbck;
-
-	if(directory_clean_mode) {
-		gf_cleanup_dir(item_path);
-		gf_rmdir(item_path);
-	} else {
-		gf_delete_file(item_path);
-	}
-	return 0;
-}
-
-GF_Err gf_cleanup_dir(char* DirPathName)
-{
-	Bool directory_clean_mode;
-
-	directory_clean_mode = 1;
-	gf_enum_directory(DirPathName, 1, delete_dir, &directory_clean_mode, NULL);
-	directory_clean_mode = 0;
-	gf_enum_directory(DirPathName, 0, delete_dir, &directory_clean_mode, NULL);
-
-	return GF_OK;
-}
-
 #ifndef gettimeofday
 #ifdef _WIN32_WCE
 
@@ -389,70 +302,6 @@
 #endif
 
 GF_EXPORT
-GF_Err gf_delete_file(const char *fileName)
-{
-#if defined(_WIN32_WCE)
-	TCHAR swzName[MAX_PATH];
-	CE_CharToWide((char*)fileName, swzName);
-	return (DeleteFile(swzName)==0) ? GF_IO_ERR : GF_OK;
-#elif defined(WIN32)
-	/* success if != 0 */
-	return (DeleteFile(fileName)==0) ? GF_IO_ERR : GF_OK;
-#else
-	/* success is == 0 */
-	return ( remove(fileName) == 0) ? GF_OK : GF_IO_ERR;
-#endif
-}
-
-/**
- * Remove existing single-quote from a single-quoted string.
- * The caller is responsible for deallocating the returns string with gf_free()
- */
-static char* gf_sanetize_single_quoted_string(const char *src) {
-	int i, j;
-	char *out = gf_malloc(4*strlen(src)+3);
-	out[0] = '\'';
-	for (i=0, j=1; (out[j]=src[i]); ++i, ++j) {
-		if (src[i]=='\'') {
-			out[++j]='\\';
-			out[++j]='\'';
-			out[++j]='\'';
-		}
-	}
-	out[j++] = '\'';
-	out[j++] = 0;
-	return out;
-}
-
-GF_EXPORT
-GF_Err gf_move_file(const char *fileName, const char *newFileName)
-{
-#if defined(_WIN32_WCE)
-	TCHAR swzName[MAX_PATH];
-	TCHAR swzNewName[MAX_PATH];
-	CE_CharToWide((char*)fileName, swzName);
-	CE_CharToWide((char*)newFileName, swzNewName);
-	return (MoveFile(swzName, swzNewName) == 0 ) ? GF_IO_ERR : GF_OK;
-#elif defined(WIN32)
-	/* success if != 0 */
-	return (MoveFile(fileName, newFileName) == 0 ) ? GF_IO_ERR : GF_OK;
-#else
-	GF_Err e = GF_IO_ERR;
-	char cmd[1024], *arg1, *arg2;
-	if (!fileName || !newFileName)
-		return GF_IO_ERR;
-	arg1 = gf_sanetize_single_quoted_string(fileName);
-	arg2 = gf_sanetize_single_quoted_string(newFileName);
-	if (snprintf(cmd, sizeof cmd, "mv %s %s", arg1, arg2) >= sizeof cmd) goto error;
-	e = (system(cmd) == 0) ? GF_OK : GF_IO_ERR;
-error:
-	gf_free(arg1);
-	gf_free(arg2);
-	return e;
-#endif
-}
-
-GF_EXPORT
 void gf_rand_init(Bool Reset)
 {
 	if (Reset) {
@@ -477,73 +326,6 @@
 #endif
 
 GF_EXPORT
-u64 gf_file_modification_time(const char *filename)
-{
-#if defined(_WIN32_WCE)
-	WCHAR _file[GF_MAX_PATH];
-	WIN32_FIND_DATA FindData;
-	HANDLE fh;
-	ULARGE_INTEGER uli;
-	ULONGLONG time_ms;
-	BOOL ret;
-	CE_CharToWide((char *) filename, _file);
-	fh = FindFirstFile(_file, &FindData);
-	if (fh == INVALID_HANDLE_VALUE) return 0;
-	uli.LowPart = FindData.ftLastWriteTime.dwLowDateTime;
-	uli.HighPart = FindData.ftLastWriteTime.dwHighDateTime;
-	ret = FindClose(fh);
-	if (!ret) {
-		DWORD err = GetLastError();
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[core] FindClose() in gf_file_modification_time() returned the following error code: %d\n", err));
-	}
-	time_ms = uli.QuadPart/10000;
-	return time_ms;
-#elif defined(WIN32) && !defined(__GNUC__)
-	struct _stat64 sb;
-	if (_stat64(filename, &sb) != 0) return 0;
-	return sb.st_mtime;
-#else
-	struct stat sb;
-	if (stat(filename, &sb) != 0) return 0;
-	return sb.st_mtime;
-#endif
-	return 0;
-}
-
-GF_EXPORT
-FILE *gf_temp_file_new()
-{
-#if defined(_WIN32_WCE)
-	TCHAR pPath[MAX_PATH+1];
-	TCHAR pTemp[MAX_PATH+1];
-	if (!GetTempPath(MAX_PATH, pPath)) {
-		pPath[0] = '.';
-		pPath[1] = '.';
-	}
-	if (GetTempFileName(pPath, TEXT("git"), 0, pTemp))
-		return _wfopen(pTemp, TEXT("w+b"));
-
-	return NULL;
-#elif defined(WIN32)
-	char tmp[MAX_PATH], t_file[100];
-	FILE *res = tmpfile();
-	if (res) return res;
-	{
-		u32 err = GetLastError();
-		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Win32] system failure for tmpfile(): 0x%08x\n", err));
-	}
-	/*tmpfile() may fail under vista ...*/
-	if (!GetEnvironmentVariable("TEMP",tmp,MAX_PATH))
-		return NULL;
-	sprintf(t_file, "\\gpac_%08x.tmp", (u32) tmp);
-	strcat(tmp, t_file);
-	return gf_f64_open(tmp, "w+b");
-#else
-	return tmpfile();
-#endif
-}
-
-GF_EXPORT
 void gf_utc_time_since_1970(u32 *sec, u32 *msec)
 {
 #if defined (WIN32) && !defined(_WIN32_WCE)
@@ -554,7 +336,7 @@
 #else
 	struct timeval tv;
 	gettimeofday(&tv, NULL);
-	*sec = tv.tv_sec;
+	*sec = (u32) tv.tv_sec;
 	*msec = tv.tv_usec/1000;
 #endif
 }
@@ -583,259 +365,6 @@
 }
 
 
-/*enumerate directories*/
-GF_EXPORT
-GF_Err gf_enum_directory(const char *dir, Bool enum_directory, gf_enum_dir_item enum_dir_fct, void *cbck, const char *filter)
-{
-	char item_path[GF_MAX_PATH];
-	GF_FileEnumInfo file_info;
-
-#if defined(_WIN32_WCE)
-	char _path[GF_MAX_PATH];
-	unsigned short path[GF_MAX_PATH];
-	unsigned short w_filter[GF_MAX_PATH];
-	char file[GF_MAX_PATH];
-#else
-	char path[GF_MAX_PATH], *file;
-#endif
-
-#ifdef WIN32
-	WIN32_FIND_DATA FindData;
-	HANDLE SearchH;
-#else
-	DIR *the_dir;
-	struct dirent* the_file;
-	struct stat st;
-#endif
-
-	if (!dir || !enum_dir_fct) return GF_BAD_PARAM;
-
-	if (filter && (!strcmp(filter, "*") || !filter[0])) filter=NULL;
-
-	memset(&file_info, 0, sizeof(GF_FileEnumInfo) );
-
-	if (!strcmp(dir, "/")) {
-#if defined(WIN32) && !defined(_WIN32_WCE)
-		u32 len;
-		char *drives, *volume;
-		len = GetLogicalDriveStrings(0, NULL);
-		drives = gf_malloc(sizeof(char)*(len+1));
-		drives[0]=0;
-		GetLogicalDriveStrings(len, drives);
-		len = (u32) strlen(drives);
-		volume = drives;
-		file_info.directory = GF_TRUE;
-		file_info.drive = GF_TRUE;
-		while (len) {
-			enum_dir_fct(cbck, volume, "", &file_info);
-			volume += len+1;
-			len = (u32) strlen(volume);
-		}
-		gf_free(drives);
-		return GF_OK;
-#elif defined(__SYMBIAN32__)
-		RFs iFs;
-		TDriveList aList;
-		iFs.Connect();
-		iFs.DriveList(aList);
-		for (TInt i=0; i<KMaxDrives; i++) {
-			if (aList[i]) {
-				char szDrive[10];
-				TChar aDrive;
-				iFs.DriveToChar(i, aDrive);
-				sprintf(szDrive, "%c:", (TUint)aDrive);
-				enum_dir_fct(cbck, szDrive, "", &file_info);
-			}
-		}
-		iFs.Close();
-		FlushItemList();
-		return GF_OK;
-#endif
-	}
-
-
-#if defined (_WIN32_WCE)
-	switch (dir[strlen(dir) - 1]) {
-	case '/':
-	case '\\':
-		sprintf(_path, "%s*", dir);
-		break;
-	default:
-		sprintf(_path, "%s%c*", dir, GF_PATH_SEPARATOR);
-		break;
-	}
-	CE_CharToWide(_path, path);
-	CE_CharToWide((char *)filter, w_filter);
-#elif defined(WIN32)
-	switch (dir[strlen(dir) - 1]) {
-	case '/':
-	case '\\':
-		sprintf(path, "%s*", dir);
-		break;
-	default:
-		sprintf(path, "%s%c*", dir, GF_PATH_SEPARATOR);
-		break;
-	}
-#else
-	strcpy(path, dir);
-	if (path[strlen(path)-1] != '/') strcat(path, "/");
-#endif
-
-#ifdef WIN32
-	SearchH= FindFirstFile(path, &FindData);
-	if (SearchH == INVALID_HANDLE_VALUE) return GF_IO_ERR;
-
-#if defined (_WIN32_WCE)
-	_path[strlen(_path)-1] = 0;
-#else
-	path[strlen(path)-1] = 0;
-#endif
-
-	while (SearchH != INVALID_HANDLE_VALUE) {
-
-#else
-
-	the_dir = opendir(path);
-	if (the_dir == NULL) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot open directory %s for enumeration\n", path));
-		return GF_IO_ERR;
-	}
-	the_file = readdir(the_dir);
-	while (the_file) {
-
-#endif
-
-		memset(&file_info, 0, sizeof(GF_FileEnumInfo) );
-
-
-#if defined (_WIN32_WCE)
-		if (!wcscmp(FindData.cFileName, _T(".") )) goto next;
-		if (!wcscmp(FindData.cFileName, _T("..") )) goto next;
-#elif defined(WIN32)
-		if (!strcmp(FindData.cFileName, ".")) goto next;
-		if (!strcmp(FindData.cFileName, "..")) goto next;
-#else
-		if (!strcmp(the_file->d_name, "..")) goto next;
-		if (the_file->d_name[0] == '.') goto next;
-#endif
-
-#ifdef WIN32
-		file_info.directory = (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? GF_TRUE : GF_FALSE;
-		if (!enum_directory && file_info.directory) goto next;
-		if (enum_directory && !file_info.directory) goto next;
-#endif
-
-		if (filter) {
-#if defined (_WIN32_WCE)
-			short ext[30];
-			short *sep = wcsrchr(FindData.cFileName, (wchar_t) '.');
-			if (!sep) goto next;
-			wcscpy(ext, sep+1);
-			wcslwr(ext);
-			if (!wcsstr(w_filter, ext)) goto next;
-#elif defined(WIN32)
-			char ext[30];
-			char *sep = strrchr(FindData.cFileName, '.');
-			if (!sep) goto next;
-			strcpy(ext, sep+1);
-			strlwr(ext);
-			if (!strstr(filter, ext)) goto next;
-#else
-			char ext[30];
-			char *sep = strrchr(the_file->d_name, '.');
-			if (!sep) goto next;
-			strcpy(ext, sep+1);
-			strlwr(ext);
-			if (!strstr(filter, sep+1)) goto next;
-#endif
-		}
-
-#if defined(WIN32)
-		file_info.hidden = (FindData.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) ? 1 : 0;
-		file_info.system = (FindData.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) ? 1 : 0;
-		file_info.size = MAXDWORD;
-		file_info.size += 1;
-		file_info.size *= FindData.nFileSizeHigh;
-		file_info.size += FindData.nFileSizeLow;
-		file_info.last_modified = (u64) ((*(LONGLONG *) &FindData.ftLastWriteTime - TIMESPEC_TO_FILETIME_OFFSET) / 10000000);
-#endif
-
-#if defined (_WIN32_WCE)
-		CE_WideToChar(FindData.cFileName, file);
-		strcpy(item_path, _path);
-		strcat(item_path, file);
-#elif defined(WIN32)
-		strcpy(item_path, path);
-		strcat(item_path, FindData.cFileName);
-		file = FindData.cFileName;
-#else
-		strcpy(item_path, path);
-		strcat(item_path, the_file->d_name);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Core] Checking file %s for enum\n", item_path));
-
-		if (stat( item_path, &st ) != 0) goto next;
-
-		file_info.directory = ((st.st_mode & S_IFMT) == S_IFDIR) ? GF_TRUE : GF_FALSE;
-		if (enum_directory && !file_info.directory) goto next;
-		if (!enum_directory && file_info.directory) goto next;
-
-		file_info.size = st.st_size;
-
-		{
-			struct tm _t = * gmtime(& st.st_mtime);
-			file_info.last_modified = mktime(&_t);
-		}
-		file = the_file->d_name;
-		if (file && file[0]=='.') file_info.hidden = 1;
-
-		if (file_info.directory) {
-			char * parent_name = strrchr(item_path, '/');
-			if (!parent_name) {
-				file_info.drive = GF_TRUE;
-			} else {
-				struct stat st_parent;
-				parent_name[0] = 0;
-				if (stat(item_path, &st_parent) == 0) {
-					if ((st.st_dev != st_parent.st_dev) || ((st.st_dev == st_parent.st_dev) && (st.st_ino == st_parent.st_ino))) {
-						file_info.drive = GF_TRUE;
-					}
-				}
-				parent_name[0] = '/';
-			}
-		}
-#endif
-		if (enum_dir_fct(cbck, file, item_path, &file_info)) {
-#ifdef WIN32
-			BOOL ret = FindClose(SearchH);
-			if (!ret) {
-				DWORD err = GetLastError();
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[core] FindClose() in gf_enum_directory() returned(1) the following error code: %d\n", err));
-			}
-#endif
-			break;
-		}
-
-next:
-#ifdef WIN32
-		if (!FindNextFile(SearchH, &FindData)) {
-			BOOL ret = FindClose(SearchH);
-			if (!ret) {
-				DWORD err = GetLastError();
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[core] FindClose() in gf_enum_directory() returned(2) the following error code: %d\n", err));
-			}
-			break;
-		}
-#else
-		the_file = readdir(the_dir);
-#endif
-	}
-#ifndef WIN32
-	closedir(the_dir);
-#endif
-	return GF_OK;
-}
-
-
 #ifndef WIN32
 GF_EXPORT
 char * my_str_upr(char *str)
@@ -858,109 +387,6 @@
 }
 #endif
 
-GF_EXPORT
-u64 gf_f64_tell(FILE *fp)
-{
-#if defined(_WIN32_WCE)
-	return (u64) ftell(fp);
-#elif defined(GPAC_CONFIG_WIN32)	/* mingw or cygwin */
-#if (_FILE_OFFSET_BITS >= 64)
-	return (u64) ftello64(fp);
-#else
-	return (u64) ftell(fp);
-#endif
-#elif defined(WIN32)
-	return (u64) _ftelli64(fp);
-#elif defined(GPAC_CONFIG_LINUX) && !defined(GPAC_ANDROID)
-	return (u64) ftello64(fp);
-#elif (defined(GPAC_CONFIG_FREEBSD) || defined(GPAC_CONFIG_DARWIN))
-	return (u64) ftello(fp);
-#else
-	return (u64) ftell(fp);
-#endif
-}
-
-GF_EXPORT
-u64 gf_f64_seek(FILE *fp, s64 offset, s32 whence)
-{
-#if defined(_WIN32_WCE)
-	return (u64) fseek(fp, (s32) offset, whence);
-#elif defined(GPAC_CONFIG_WIN32)	/* mingw or cygwin */
-#if (_FILE_OFFSET_BITS >= 64)
-	return (u64) fseeko64(fp, offset, whence);
-#else
-	return (u64) fseek(fp, (s32) offset, whence);
-#endif
-#elif defined(WIN32)
-	return (u64) _fseeki64(fp, offset, whence);
-#elif defined(GPAC_CONFIG_LINUX) && !defined(GPAC_ANDROID)
-	return fseeko64(fp, (off64_t) offset, whence);
-#elif (defined(GPAC_CONFIG_FREEBSD) || defined(GPAC_CONFIG_DARWIN))
-	return fseeko(fp, (off_t) offset, whence);
-#else
-	return fseek(fp, (s32) offset, whence);
-#endif
-}
-
-GF_EXPORT
-FILE *gf_f64_open(const char *file_name, const char *mode)
-{
-#if defined(WIN32)
-	FILE *res = fopen(file_name, mode);
-	if (res) return res;
-	if (strchr(mode, 'w') || strchr(mode, 'a')) {
-		u32 err = GetLastError();
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Win32] system failure for file opening of %s in mode %s: 0x%08x\n", file_name, mode, err));
-	}
-	return NULL;
-#elif defined(GPAC_CONFIG_LINUX) && !defined(GPAC_ANDROID)
-	return fopen64(file_name, mode);
-#elif (defined(GPAC_CONFIG_FREEBSD) || defined(GPAC_CONFIG_DARWIN))
-	return fopen(file_name, mode);
-#else
-	return fopen(file_name, mode);
-#endif
-}
-
-#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! defined(_GNU_SOURCE)
-#define HAVE_STRERROR_R 1
-#endif
-
-GF_EXPORT
-size_t gf_fwrite(const void *ptr, size_t size, size_t nmemb,
- FILE *stream)
-{
-	size_t result = fwrite(ptr, size, nmemb, stream);
-	if (result != nmemb) {
-#ifdef _WIN32_WCE
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Error writing data: %d blocks to write but %d blocks written\n", nmemb, result));
-#else
-#if defined WIN32 && !defined(GPAC_CONFIG_WIN32)
-		errno_t errno_save;
-		_get_errno(&errno_save);
-#else
-		int errno_save = errno;
-#endif
-		//if (errno_save!=0)
-		{
-#ifdef HAVE_STRERROR_R
-#define ERRSTR_BUF_SIZE 256
-			char errstr[ERRSTR_BUF_SIZE];
-			if(strerror_r(errno_save, errstr, ERRSTR_BUF_SIZE) != 0)
-			{
-				strerror_r(0, errstr, ERRSTR_BUF_SIZE);
-			}
-#else
-			char *errstr = (char*)strerror(errno_save);
-#endif
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Error writing data (%s): %d blocks to write but %d blocks written\n", errstr, nmemb, result));
-		}
-#endif
-	}
-	return result;
-}
-
-
 /*seems OK under mingw also*/
 #ifdef WIN32
 #ifdef _WIN32_WCE
@@ -1047,7 +473,7 @@
 	if (ch_peek != -1) return 1;
 	t_new.c_cc[VMIN]=0;
 	tcsetattr(0, TCSANOW, &t_new);
-	nread = read(0, &ch, 1);
+	nread = (s32) read(0, &ch, 1);
 	t_new.c_cc[VMIN]=1;
 	tcsetattr(0, TCSANOW, &t_new);
 	if(nread == 1) {
@@ -1077,8 +503,6 @@
 #endif
 
 
-
-
 static u32 sys_init = 0;
 static u32 last_update_time = 0;
 static u64 last_process_k_u_time = 0;
@@ -1257,7 +681,7 @@
 {
 	//for OSX we allow overwrite of argc/argv due to different behavior between console-mode apps and GUI
 #if !defined(__DARWIN__) && !defined(__APPLE__)
-	if (!gpac_argc && (argc>=0) ) 
+	if (!gpac_argc && (argc>=0) )
 #endif
 	{
 		gpac_argc = (u32) argc;
@@ -1381,7 +805,7 @@
 			}
 		}
 #else
-		the_rti.nb_cores = sysconf( _SC_NPROCESSORS_ONLN );
+		the_rti.nb_cores = (u32) sysconf( _SC_NPROCESSORS_ONLN );
 #endif
 
 		sys_start_time = gf_sys_clock();
@@ -1423,10 +847,6 @@
 		if (psapi_hinst) FreeLibrary(psapi_hinst);
 		psapi_hinst = NULL;
 #endif
-
-#ifdef GPAC_MEMORY_TRACKING
-		gf_memory_print();
-#endif
 	}
 }
 
@@ -1942,12 +1362,12 @@
 
 	if (last_update_time) {
 		the_rti.sampling_period_duration = (entry_time - last_update_time);
-		the_rti.process_cpu_time_diff = (process_u_k_time - last_process_k_u_time) * 10;
+		the_rti.process_cpu_time_diff = (u32) (process_u_k_time - last_process_k_u_time) * 10;
 
 		/*oops, we have no choice but to assume 100% cpu usage during this period*/
 		if (!u_k_time) {
 			the_rti.total_cpu_time_diff = the_rti.sampling_period_duration;
-			u_k_time = last_cpu_u_k_time + the_rti.sampling_period_duration;
+			u_k_time = (u32) (last_cpu_u_k_time + the_rti.sampling_period_duration);
 			the_rti.cpu_idle_time = 0;
 			the_rti.total_cpu_usage = 100;
 			if (!the_rti.process_cpu_time_diff) the_rti.process_cpu_time_diff = the_rti.total_cpu_time_diff;
@@ -1955,7 +1375,7 @@
 		} else {
 			u64 samp_sys_time;
 			/*move to ms (/proc/stat gives times in 100 ms unit*/
-			the_rti.total_cpu_time_diff = (u_k_time - last_cpu_u_k_time)*10;
+			the_rti.total_cpu_time_diff = (u32) (u_k_time - last_cpu_u_k_time)*10;
 
 			/*we're not that accurate....*/
 			if (the_rti.total_cpu_time_diff > the_rti.sampling_period_duration)
@@ -1964,7 +1384,7 @@
 
 			if (!idle_time) idle_time = (the_rti.sampling_period_duration - the_rti.total_cpu_time_diff)/10;
 			samp_sys_time = u_k_time - last_cpu_u_k_time;
-			the_rti.cpu_idle_time = idle_time - last_cpu_idle_time;
+			the_rti.cpu_idle_time = (u32) (idle_time - last_cpu_idle_time);
 			the_rti.total_cpu_usage = (u32) ( 100 * samp_sys_time / (the_rti.cpu_idle_time + samp_sys_time ) );
 			/*move to ms (/proc/stat gives times in 100 ms unit*/
 			the_rti.cpu_idle_time *= 10;
@@ -2289,21 +1709,21 @@
 #if defined(_WIN32_WCE)
 	return 0;
 #else
- //this has been commented due to some reports of broken implementation on some systems ...
- //		s32 val = timezone;
- //		return val;
-
- 
- /*FIXME - avoid errors at midnight when estimating timezone this does not work !!*/
- s32 t_timezone;
- struct tm t_gmt, t_local;
- time_t t_time;
- t_time = time(NULL);
- t_gmt = *gmtime(&t_time);
- t_local = *localtime(&t_time);
-
- t_timezone = (t_gmt.tm_hour - t_local.tm_hour) * 3600 + (t_gmt.tm_min - t_local.tm_min) * 60;
- return t_timezone;
+	//this has been commented due to some reports of broken implementation on some systems ...
+	//		s32 val = timezone;
+	//		return val;
+
+
+	/*FIXME - avoid errors at midnight when estimating timezone this does not work !!*/
+	s32 t_timezone;
+	struct tm t_gmt, t_local;
+	time_t t_time;
+	t_time = time(NULL);
+	t_gmt = *gmtime(&t_time);
+	t_local = *localtime(&t_time);
+
+	t_timezone = (t_gmt.tm_hour - t_local.tm_hour) * 3600 + (t_gmt.tm_min - t_local.tm_min) * 60;
+	return t_timezone;
 #endif
 
 }

gpac-0.5.1.svn5619.tar.xz/src/utils/os_file.c Added

@@ -0,0 +1,624 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre - Copyright (c) Telecom ParisTech 2000-2012
+ *			 Romain Bouqueau - Copyright (c) Romain Bouqueau 2015
+ *					All rights reserved
+ *
+ * This file is part of GPAC / common tools sub-project
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gpac/tools.h>
+
+#if defined(_WIN32_WCE)
+
+#include <winbase.h>
+#include <tlhelp32.h>
+
+#elif defined(WIN32)
+
+#include <windows.h>
+#include <direct.h>
+#include <sys/stat.h>
+
+#else
+
+#include <sys/stat.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <time.h>
+#include <sys/time.h>
+
+#ifndef __BEOS__
+#include <errno.h>
+#endif
+
+#endif
+
+
+GF_Err gf_rmdir(char *DirPathName)
+{
+#if defined (_WIN32_WCE)
+	TCHAR swzName[MAX_PATH];
+	BOOL res;
+	CE_CharToWide(DirPathName, swzName);
+	res = RemoveDirectory(swzName);
+	if (! res) {
+		int err = GetLastError();
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot delete director %s: last error %d\n", DirPathName, err ));
+	}
+#elif defined (WIN32)
+	int res = rmdir(DirPathName);
+	if (res==-1) {
+		int err = GetLastError();
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot delete director %s: last error %d\n", DirPathName, err ));
+		return GF_IO_ERR;
+	}
+#else
+	int res = rmdir(DirPathName);
+	if (res==-1) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot delete director %s: last error %d\n", DirPathName, errno ));
+		return GF_IO_ERR;
+	}
+#endif
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_mkdir(char* DirPathName)
+{
+#if defined (_WIN32_WCE)
+	TCHAR swzName[MAX_PATH];
+	BOOL res;
+	CE_CharToWide(DirPathName, swzName);
+	res = CreateDirectory(swzName, NULL);
+	if (! res) {
+		int err = GetLastError();
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory %s: last error %d\n", DirPathName, err ));
+	}
+#elif defined (WIN32)
+	int res = mkdir(DirPathName);
+	if (res==-1) {
+		int err = GetLastError();
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory %s: last error %d\n", DirPathName, err ));
+	}
+#else
+	int res = mkdir(DirPathName, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
+	if (res==-1) {
+		if(errno == 17) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory %s, it already exists: last error %d \n", DirPathName, errno ));
+			return GF_BAD_PARAM;
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory %s: last error %d\n", DirPathName, errno ));
+			return GF_IO_ERR;
+		}
+	}
+#endif
+	return GF_OK;
+}
+
+static Bool delete_dir(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
+{
+	Bool directory_clean_mode = *(Bool*)cbck;
+
+	if(directory_clean_mode) {
+		gf_cleanup_dir(item_path);
+		gf_rmdir(item_path);
+	} else {
+		gf_delete_file(item_path);
+	}
+	return 0;
+}
+
+GF_Err gf_cleanup_dir(char* DirPathName)
+{
+	Bool directory_clean_mode;
+
+	directory_clean_mode = 1;
+	gf_enum_directory(DirPathName, 1, delete_dir, &directory_clean_mode, NULL);
+	directory_clean_mode = 0;
+	gf_enum_directory(DirPathName, 0, delete_dir, &directory_clean_mode, NULL);
+
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_delete_file(const char *fileName)
+{
+#if defined(_WIN32_WCE)
+	TCHAR swzName[MAX_PATH];
+	CE_CharToWide((char*)fileName, swzName);
+	return (DeleteFile(swzName)==0) ? GF_IO_ERR : GF_OK;
+#elif defined(WIN32)
+	/* success if != 0 */
+	return (DeleteFile(fileName)==0) ? GF_IO_ERR : GF_OK;
+#else
+	/* success is == 0 */
+	return ( remove(fileName) == 0) ? GF_OK : GF_IO_ERR;
+#endif
+}
+
+/**
+ * Remove existing single-quote from a single-quoted string.
+ * The caller is responsible for deallocating the returns string with gf_free()
+ */
+static char* gf_sanetize_single_quoted_string(const char *src) {
+ int i, j;
+ char *out = gf_malloc(4*strlen(src)+3);
+ out[0] = '\'';
+ for (i=0, j=1; (out[j]=src[i]); ++i, ++j) {
+ if (src[i]=='\'') {
+ out[++j]='\\';
+ out[++j]='\'';
+ out[++j]='\'';
+ }
+ }
+ out[j++] = '\'';
+ out[j++] = 0;
+ return out;
+}
+
+GF_EXPORT
+GF_Err gf_move_file(const char *fileName, const char *newFileName)
+{
+#if defined(_WIN32_WCE)
+	TCHAR swzName[MAX_PATH];
+	TCHAR swzNewName[MAX_PATH];
+	CE_CharToWide((char*)fileName, swzName);
+	CE_CharToWide((char*)newFileName, swzNewName);
+	return (MoveFile(swzName, swzNewName) == 0 ) ? GF_IO_ERR : GF_OK;
+#elif defined(WIN32)
+	/* success if != 0 */
+	return (MoveFile(fileName, newFileName) == 0 ) ? GF_IO_ERR : GF_OK;
+#else
+	GF_Err e = GF_IO_ERR;
+	char cmd[1024], *arg1, *arg2;
+	if (!fileName || !newFileName)
+		return GF_IO_ERR;
+	arg1 = gf_sanetize_single_quoted_string(fileName);
+	arg2 = gf_sanetize_single_quoted_string(newFileName);
+	if (snprintf(cmd, sizeof cmd, "mv %s %s", arg1, arg2) >= sizeof cmd) goto error;
+	e = (system(cmd) == 0) ? GF_OK : GF_IO_ERR;
+error:
+	gf_free(arg1);
+	gf_free(arg2);
+	return e;
+#endif
+}
+
+GF_EXPORT
+u64 gf_file_modification_time(const char *filename)
+{
+#if defined(_WIN32_WCE)
+	WCHAR _file[GF_MAX_PATH];
+	WIN32_FIND_DATA FindData;
+	HANDLE fh;
+	ULARGE_INTEGER uli;
+	ULONGLONG time_ms;
+	BOOL ret;
+	CE_CharToWide((char *) filename, _file);
+	fh = FindFirstFile(_file, &FindData);
+	if (fh == INVALID_HANDLE_VALUE) return 0;
+	uli.LowPart = FindData.ftLastWriteTime.dwLowDateTime;
+	uli.HighPart = FindData.ftLastWriteTime.dwHighDateTime;
+	ret = FindClose(fh);
+	if (!ret) {
+		DWORD err = GetLastError();
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[core] FindClose() in gf_file_modification_time() returned the following error code: %d\n", err));
+	}
+	time_ms = uli.QuadPart/10000;
+	return time_ms;
+#elif defined(WIN32) && !defined(__GNUC__)
+	struct _stat64 sb;
+	if (_stat64(filename, &sb) != 0) return 0;
+	return sb.st_mtime;
+#else
+	struct stat sb;
+	if (stat(filename, &sb) != 0) return 0;
+	return sb.st_mtime;
+#endif
+	return 0;
+}
+
+GF_EXPORT
+FILE *gf_temp_file_new()
+{
+#if defined(_WIN32_WCE)
+	TCHAR pPath[MAX_PATH+1];
+	TCHAR pTemp[MAX_PATH+1];
+	if (!GetTempPath(MAX_PATH, pPath)) {
+		pPath[0] = '.';
+		pPath[1] = '.';
+	}
+	if (GetTempFileName(pPath, TEXT("git"), 0, pTemp))
+		return _wfopen(pTemp, TEXT("w+b"));
+
+	return NULL;
+#elif defined(WIN32)
+	char tmp[MAX_PATH], t_file[100];
+	FILE *res = tmpfile();
+	if (res) return res;
+	{
+		u32 err = GetLastError();
+		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Win32] system failure for tmpfile(): 0x%08x\n", err));
+	}
+	/*tmpfile() may fail under vista ...*/
+	if (!GetEnvironmentVariable("TEMP",tmp,MAX_PATH))
+		return NULL;
+	sprintf(t_file, "\\gpac_%08x.tmp", (u32) tmp);
+	strcat(tmp, t_file);
+	return gf_f64_open(tmp, "w+b");
+#else
+	return tmpfile();
+#endif
+}
+
+/*enumerate directories*/
+GF_EXPORT
+GF_Err gf_enum_directory(const char *dir, Bool enum_directory, gf_enum_dir_item enum_dir_fct, void *cbck, const char *filter)
+{
+	char item_path[GF_MAX_PATH];
+	GF_FileEnumInfo file_info;
+
+#if defined(_WIN32_WCE)
+	char _path[GF_MAX_PATH];
+	unsigned short path[GF_MAX_PATH];
+	unsigned short w_filter[GF_MAX_PATH];
+	char file[GF_MAX_PATH];
+#else
+	char path[GF_MAX_PATH], *file;
+#endif
+
+#ifdef WIN32
+	WIN32_FIND_DATA FindData;
+	HANDLE SearchH;
+#else
+	DIR *the_dir;
+	struct dirent* the_file;
+	struct stat st;
+#endif
+
+	if (!dir || !enum_dir_fct) return GF_BAD_PARAM;
+
+	if (filter && (!strcmp(filter, "*") || !filter[0])) filter=NULL;
+
+	memset(&file_info, 0, sizeof(GF_FileEnumInfo) );
+
+	if (!strcmp(dir, "/")) {
+#if defined(WIN32) && !defined(_WIN32_WCE)
+		u32 len;
+		char *drives, *volume;
+		len = GetLogicalDriveStrings(0, NULL);
+		drives = gf_malloc(sizeof(char)*(len+1));
+		drives[0]=0;
+		GetLogicalDriveStrings(len, drives);
+		len = (u32) strlen(drives);
+		volume = drives;
+		file_info.directory = GF_TRUE;
+		file_info.drive = GF_TRUE;
+		while (len) {
+			enum_dir_fct(cbck, volume, "", &file_info);
+			volume += len+1;
+			len = (u32) strlen(volume);
+		}
+		gf_free(drives);
+		return GF_OK;
+#elif defined(__SYMBIAN32__)
+		RFs iFs;
+		TDriveList aList;
+		iFs.Connect();
+		iFs.DriveList(aList);
+		for (TInt i=0; i<KMaxDrives; i++) {
+			if (aList[i]) {
+				char szDrive[10];
+				TChar aDrive;
+				iFs.DriveToChar(i, aDrive);
+				sprintf(szDrive, "%c:", (TUint)aDrive);
+				enum_dir_fct(cbck, szDrive, "", &file_info);
+			}
+		}
+		iFs.Close();
+		FlushItemList();
+		return GF_OK;
+#endif
+	}
+
+
+#if defined (_WIN32_WCE)
+	switch (dir[strlen(dir) - 1]) {
+	case '/':
+	case '\\':
+		sprintf(_path, "%s*", dir);
+		break;
+	default:
+		sprintf(_path, "%s%c*", dir, GF_PATH_SEPARATOR);
+		break;
+	}
+	CE_CharToWide(_path, path);
+	CE_CharToWide((char *)filter, w_filter);
+#elif defined(WIN32)
+	switch (dir[strlen(dir) - 1]) {
+	case '/':
+	case '\\':
+		sprintf(path, "%s*", dir);
+		break;
+	default:
+		sprintf(path, "%s%c*", dir, GF_PATH_SEPARATOR);
+		break;
+	}
+#else
+	strcpy(path, dir);
+	if (path[strlen(path)-1] != '/') strcat(path, "/");
+#endif
+
+#ifdef WIN32
+	SearchH= FindFirstFile(path, &FindData);
+	if (SearchH == INVALID_HANDLE_VALUE) return GF_IO_ERR;
+
+#if defined (_WIN32_WCE)
+	_path[strlen(_path)-1] = 0;
+#else
+	path[strlen(path)-1] = 0;
+#endif
+
+	while (SearchH != INVALID_HANDLE_VALUE) {
+
+#else
+
+	the_dir = opendir(path);
+	if (the_dir == NULL) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot open directory %s for enumeration\n", path));
+		return GF_IO_ERR;
+	}
+	the_file = readdir(the_dir);
+	while (the_file) {
+
+#endif
+
+		memset(&file_info, 0, sizeof(GF_FileEnumInfo) );
+
+
+#if defined (_WIN32_WCE)
+		if (!wcscmp(FindData.cFileName, _T(".") )) goto next;
+		if (!wcscmp(FindData.cFileName, _T("..") )) goto next;
+#elif defined(WIN32)
+		if (!strcmp(FindData.cFileName, ".")) goto next;
+		if (!strcmp(FindData.cFileName, "..")) goto next;
+#else
+		if (!strcmp(the_file->d_name, "..")) goto next;
+		if (the_file->d_name[0] == '.') goto next;
+#endif
+
+#ifdef WIN32
+		file_info.directory = (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? GF_TRUE : GF_FALSE;
+		if (!enum_directory && file_info.directory) goto next;
+		if (enum_directory && !file_info.directory) goto next;
+#endif
+
+		if (filter) {
+#if defined (_WIN32_WCE)
+			short ext[30];
+			short *sep = wcsrchr(FindData.cFileName, (wchar_t) '.');
+			if (!sep) goto next;
+			wcscpy(ext, sep+1);
+			wcslwr(ext);
+			if (!wcsstr(w_filter, ext)) goto next;
+#elif defined(WIN32)
+			char ext[30];
+			char *sep = strrchr(FindData.cFileName, '.');
+			if (!sep) goto next;
+			strcpy(ext, sep+1);
+			strlwr(ext);
+			if (!strstr(filter, ext)) goto next;
+#else
+			char ext[30];
+			char *sep = strrchr(the_file->d_name, '.');
+			if (!sep) goto next;
+			strcpy(ext, sep+1);
+			strlwr(ext);
+			if (!strstr(filter, sep+1)) goto next;
+#endif
+		}
+
+#if defined(WIN32)
+		file_info.hidden = (FindData.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) ? 1 : 0;
+		file_info.system = (FindData.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) ? 1 : 0;
+		file_info.size = MAXDWORD;
+		file_info.size += 1;
+		file_info.size *= FindData.nFileSizeHigh;
+		file_info.size += FindData.nFileSizeLow;
+		file_info.last_modified = (u64) ((*(LONGLONG *) &FindData.ftLastWriteTime - TIMESPEC_TO_FILETIME_OFFSET) / 10000000);
+#endif
+
+#if defined (_WIN32_WCE)
+		CE_WideToChar(FindData.cFileName, file);
+		strcpy(item_path, _path);
+		strcat(item_path, file);
+#elif defined(WIN32)
+		strcpy(item_path, path);
+		strcat(item_path, FindData.cFileName);
+		file = FindData.cFileName;
+#else
+		strcpy(item_path, path);
+		strcat(item_path, the_file->d_name);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Core] Checking file %s for enum\n", item_path));
+
+		if (stat( item_path, &st ) != 0) goto next;
+
+		file_info.directory = ((st.st_mode & S_IFMT) == S_IFDIR) ? GF_TRUE : GF_FALSE;
+		if (enum_directory && !file_info.directory) goto next;
+		if (!enum_directory && file_info.directory) goto next;
+
+		file_info.size = st.st_size;
+
+		{
+			struct tm _t = * gmtime(& st.st_mtime);
+			file_info.last_modified = mktime(&_t);
+		}
+		file = the_file->d_name;
+		if (file && file[0]=='.') file_info.hidden = 1;
+
+		if (file_info.directory) {
+			char * parent_name = strrchr(item_path, '/');
+			if (!parent_name) {
+				file_info.drive = GF_TRUE;
+			} else {
+				struct stat st_parent;
+				parent_name[0] = 0;
+				if (stat(item_path, &st_parent) == 0) {
+					if ((st.st_dev != st_parent.st_dev) || ((st.st_dev == st_parent.st_dev) && (st.st_ino == st_parent.st_ino))) {
+						file_info.drive = GF_TRUE;
+					}
+				}
+				parent_name[0] = '/';
+			}
+		}
+#endif
+		if (enum_dir_fct(cbck, file, item_path, &file_info)) {
+#ifdef WIN32
+			BOOL ret = FindClose(SearchH);
+			if (!ret) {
+				DWORD err = GetLastError();
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[core] FindClose() in gf_enum_directory() returned(1) the following error code: %d\n", err));
+			}
+#endif
+			break;
+		}
+
+next:
+#ifdef WIN32
+		if (!FindNextFile(SearchH, &FindData)) {
+			BOOL ret = FindClose(SearchH);
+			if (!ret) {
+				DWORD err = GetLastError();
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[core] FindClose() in gf_enum_directory() returned(2) the following error code: %d\n", err));
+			}
+			break;
+		}
+#else
+		the_file = readdir(the_dir);
+#endif
+	}
+#ifndef WIN32
+	closedir(the_dir);
+#endif
+	return GF_OK;
+}
+
+GF_EXPORT
+u64 gf_f64_tell(FILE *fp)
+{
+#if defined(_WIN32_WCE)
+	return (u64) ftell(fp);
+#elif defined(GPAC_CONFIG_WIN32)	/* mingw or cygwin */
+#if (_FILE_OFFSET_BITS >= 64)
+	return (u64) ftello64(fp);
+#else
+	return (u64) ftell(fp);
+#endif
+#elif defined(WIN32)
+	return (u64) _ftelli64(fp);
+#elif defined(GPAC_CONFIG_LINUX) && !defined(GPAC_ANDROID)
+	return (u64) ftello64(fp);
+#elif (defined(GPAC_CONFIG_FREEBSD) || defined(GPAC_CONFIG_DARWIN))
+	return (u64) ftello(fp);
+#else
+	return (u64) ftell(fp);
+#endif
+}
+
+GF_EXPORT
+u64 gf_f64_seek(FILE *fp, s64 offset, s32 whence)
+{
+#if defined(_WIN32_WCE)
+	return (u64) fseek(fp, (s32) offset, whence);
+#elif defined(GPAC_CONFIG_WIN32)	/* mingw or cygwin */
+#if (_FILE_OFFSET_BITS >= 64)
+	return (u64) fseeko64(fp, offset, whence);
+#else
+	return (u64) fseek(fp, (s32) offset, whence);
+#endif
+#elif defined(WIN32)
+	return (u64) _fseeki64(fp, offset, whence);
+#elif defined(GPAC_CONFIG_LINUX) && !defined(GPAC_ANDROID)
+	return fseeko64(fp, (off64_t) offset, whence);
+#elif (defined(GPAC_CONFIG_FREEBSD) || defined(GPAC_CONFIG_DARWIN))
+	return fseeko(fp, (off_t) offset, whence);
+#else
+	return fseek(fp, (s32) offset, whence);
+#endif
+}
+
+GF_EXPORT
+FILE *gf_f64_open(const char *file_name, const char *mode)
+{
+#if defined(WIN32)
+	FILE *res = fopen(file_name, mode);
+	if (res) return res;
+	if (strchr(mode, 'w') || strchr(mode, 'a')) {
+		u32 err = GetLastError();
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Win32] system failure for file opening of %s in mode %s: 0x%08x\n", file_name, mode, err));
+	}
+	return NULL;
+#elif defined(GPAC_CONFIG_LINUX) && !defined(GPAC_ANDROID)
+	return fopen64(file_name, mode);
+#elif (defined(GPAC_CONFIG_FREEBSD) || defined(GPAC_CONFIG_DARWIN))
+	return fopen(file_name, mode);
+#else
+	return fopen(file_name, mode);
+#endif
+}
+
+#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! defined(_GNU_SOURCE)
+#define HAVE_STRERROR_R 1
+#endif
+
+GF_EXPORT
+size_t gf_fwrite(const void *ptr, size_t size, size_t nmemb,
+ FILE *stream)
+{
+	size_t result = fwrite(ptr, size, nmemb, stream);
+	if (result != nmemb) {
+#ifdef _WIN32_WCE
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Error writing data: %d blocks to write but %d blocks written\n", nmemb, result));
+#else
+#if defined WIN32 && !defined(GPAC_CONFIG_WIN32)
+		errno_t errno_save;
+		_get_errno(&errno_save);
+#else
+		int errno_save = errno;
+#endif
+		//if (errno_save!=0)
+		{
+#ifdef HAVE_STRERROR_R
+#define ERRSTR_BUF_SIZE 256
+			char errstr[ERRSTR_BUF_SIZE];
+			if(strerror_r(errno_save, errstr, ERRSTR_BUF_SIZE) != 0)
+			{
+				strerror_r(0, errstr, ERRSTR_BUF_SIZE);
+			}
+#else
+			char *errstr = (char*)strerror(errno_save);
+#endif
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Error writing data (%s): %d blocks to write but %d blocks written\n", errstr, nmemb, result));
+		}
+#endif
+	}
+	return result;
+}
+

gpac-0.5.1.svn5491.tar.xz/src/utils/os_net.c -> gpac-0.5.1.svn5619.tar.xz/src/utils/os_net.c Changed

@@ -379,9 +379,9 @@
 		res = setsockopt(sock->socket, SOL_SOCKET, SO_RCVBUF, (char *) &NewSize, sizeof(u32) );
 	}
 	if (res<0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Core] Couldn't set socket %s buffer size: %d\n", SendBuffer ? "send" : "receive", res));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Socket] Couldn't set socket %s buffer size to %d: %d\n", SendBuffer ? "send" : "receive", NewSize, res));
 	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Core] Set socket %s buffer size\n", SendBuffer ? "send" : "receive"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Socket] Set socket %s buffer size to %d\n", SendBuffer ? "send" : "receive", NewSize));
 	}
 	return GF_OK;
 }
@@ -483,8 +483,10 @@
 
 	gf_sk_free(sock);
 
+	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Solving %s address\n", PeerName));
 	res = gf_sk_get_ipv6_addr(PeerName, PortNumber, AF_UNSPEC, AI_PASSIVE, type);
 	if (!res) return GF_IP_CONNECTION_FAILURE;
+	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Host %s found\n", PeerName));
 
 	/*turn on MobileIP*/
 	if (local_ip && MobileIPAdd && !strcmp(MobileIPAdd, local_ip) ) {
@@ -525,12 +527,14 @@
 			}
 		}
 
+ GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Connecting to %s:%d\n", PeerName, PortNumber));
 		ret = connect(sock->socket, aip->ai_addr, (int) aip->ai_addrlen);
 		if (ret == SOCKET_ERROR) {
 			closesocket(sock->socket);
 			sock->socket = NULL_SOCKET;
 			continue;
 		}
+ GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Connected to %s:%d\n", PeerName, PortNumber));
 
 		memcpy(&sock->dest_addr, aip->ai_addr, aip->ai_addrlen);
 		sock->dest_addr_len = (u32) aip->ai_addrlen;
@@ -562,6 +566,7 @@
 	/*get the server IP*/
 	sock->dest_addr.sin_addr.s_addr = inet_addr(PeerName);
 	if (sock->dest_addr.sin_addr.s_addr==INADDR_NONE) {
+ GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Solving %s address\n", PeerName));
 		Host = gethostbyname(PeerName);
 		if (Host == NULL) {
 			switch (LASTSOCKERROR) {
@@ -574,14 +579,16 @@
 				return GF_IP_NETWORK_FAILURE;
 			}
 		}
+ GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Host %s found\n", PeerName));
 		memcpy((char *) &sock->dest_addr.sin_addr, Host->h_addr_list[0], sizeof(u32));
 	}
 
 	if (sock->flags & GF_SOCK_IS_TCP) {
+ GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Connecting to %s:%d\n", PeerName, PortNumber));
 		ret = connect(sock->socket, (struct sockaddr *) &sock->dest_addr, sizeof(struct sockaddr));
 		if (ret == SOCKET_ERROR) {
 			u32 res = LASTSOCKERROR;
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Core] Couldn't connect socket - last sock error %d\n", res));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Sock_IPV4] Couldn't connect socket - last sock error %d\n", res));
 			switch (res) {
 			case EAGAIN:
 				return GF_IP_SOCK_WOULD_BLOCK;
@@ -606,6 +613,7 @@
 				return GF_IP_CONNECTION_FAILURE;
 			}
 		}
+ GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Connected to %s:%d\n", PeerName, PortNumber));
 	}
 #endif
 	return GF_OK;
@@ -858,9 +866,9 @@
 	count = 0;
 	while (count < length) {
 		if (sock->flags & GF_SOCK_HAS_PEER) {
-			res = sendto(sock->socket, (char *) buffer+count, length - count, 0, (struct sockaddr *) &sock->dest_addr, sock->dest_addr_len);
+			res = (s32) sendto(sock->socket, (char *) buffer+count, length - count, 0, (struct sockaddr *) &sock->dest_addr, sock->dest_addr_len);
 		} else {
-			res = send(sock->socket, (char *) buffer+count, length - count, 0);
+			res = (s32) send(sock->socket, (char *) buffer+count, length - count, 0);
 		}
 		if (res == SOCKET_ERROR) {
 			switch (res = LASTSOCKERROR) {
@@ -1058,7 +1066,7 @@
 		struct sockaddr_in local_address;
 
 		local_address.sin_family = AF_INET;
-		local_address.sin_addr.s_addr = local_add_id;
+		local_address.sin_addr.s_addr = (u32) local_add_id;
 		local_address.sin_port = htons( MultiPortNumber);
 
 		ret = bind(sock->socket, (struct sockaddr *) &local_address, sizeof(local_address));
@@ -1078,7 +1086,7 @@
 
 	/*now join the multicast*/
 	M_req.imr_multiaddr.s_addr = inet_addr(multi_IPAdd);
-	M_req.imr_interface.s_addr = local_add_id;
+	M_req.imr_interface.s_addr = (u32) local_add_id;
 
 	ret = setsockopt(sock->socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *) &M_req, sizeof(M_req));
 	if (ret == SOCKET_ERROR) {
@@ -1158,9 +1166,9 @@
 	}
 #endif
 	if (sock->flags & GF_SOCK_HAS_PEER)
-		res = recvfrom(sock->socket, (char *) buffer + startFrom, length - startFrom, 0, (struct sockaddr *)&sock->dest_addr, &sock->dest_addr_len);
+		res = (s32) recvfrom(sock->socket, (char *) buffer + startFrom, length - startFrom, 0, (struct sockaddr *)&sock->dest_addr, &sock->dest_addr_len);
 	else {
-		res = recv(sock->socket, (char *) buffer + startFrom, length - startFrom, 0);
+		res = (s32) recv(sock->socket, (char *) buffer + startFrom, length - startFrom, 0);
 		if (res == 0)
 			return GF_IP_CONNECTION_CLOSED;
 	}
@@ -1416,7 +1424,7 @@
 #endif
 	count = 0;
 	while (count < length) {
-		res = sendto(sock->socket, (char *) buffer+count, length - count, 0, (struct sockaddr *) &remote_add, remote_add_len);
+		res = (s32) sendto(sock->socket, (char *) buffer+count, length - count, 0, (struct sockaddr *) &remote_add, remote_add_len);
 		if (res == SOCKET_ERROR) {
 			switch (LASTSOCKERROR) {
 			case EAGAIN:
@@ -1469,7 +1477,7 @@
 #endif
 
 
-	res = recv(sock->socket, (char *) buffer + startFrom, length - startFrom, 0);
+	res = (s32) recv(sock->socket, (char *) buffer + startFrom, length - startFrom, 0);
 	if (res == SOCKET_ERROR) {
 		switch (LASTSOCKERROR) {
 		case EAGAIN:
@@ -1523,7 +1531,7 @@
 	//direct writing
 	count = 0;
 	while (count < length) {
-		res = send(sock->socket, (char *) buffer+count, length - count, 0);
+		res = (s32) send(sock->socket, (char *) buffer+count, length - count, 0);
 		if (res == SOCKET_ERROR) {
 			switch (LASTSOCKERROR) {
 			case EAGAIN:

gpac-0.5.1.svn5491.tar.xz/src/utils/os_thread.c -> gpac-0.5.1.svn5619.tar.xz/src/utils/os_thread.c Changed

gpac-0.5.1.svn5491.tar.xz/src/utils/sha1.c -> gpac-0.5.1.svn5619.tar.xz/src/utils/sha1.c Changed

@@ -292,7 +292,7 @@
 /*
 * SHA-1 final digest
 */
-void gf_sha1_finish(GF_SHA1Context *ctx, u8 output[20] )
+void gf_sha1_finish(GF_SHA1Context *ctx, u8 output[GF_SHA1_DIGEST_SIZE] )
 {
 	u32 last, padn;
 	u32 high, low;
@@ -661,7 +661,7 @@
 		message_array++;
 	}
 }
-void gf_sha1_finish(GF_SHA1Context *context, u8 output[20] )
+void gf_sha1_finish(GF_SHA1Context *context, u8 output[GF_SHA1_DIGEST_SIZE] )
 {
 	if (context->Corrupted)
 	{
@@ -688,7 +688,7 @@
 * Output = SHA-1( file contents )
 */
 GF_EXPORT
-s32 gf_sha1_file( const char *path, u8 output[20] )
+s32 gf_sha1_file( const char *path, u8 output[GF_SHA1_DIGEST_SIZE] )
 {
 	FILE *f;
 	size_t n;
@@ -723,7 +723,7 @@
 * Output = SHA-1( input buffer )
 */
 GF_EXPORT
-void gf_sha1_csum( u8 *input, u32 ilen, u8 output[20] )
+void gf_sha1_csum( u8 *input, u32 ilen, u8 output[GF_SHA1_DIGEST_SIZE] )
 {
 	GF_SHA1Context *ctx;
 
@@ -733,13 +733,13 @@
 }
 
 GF_EXPORT
-void gf_sha1_csum_hexa(u8 *buf, u32 buflen, u8 digest[41]) {
-	u8 tmp[20];
+void gf_sha1_csum_hexa(u8 *buf, u32 buflen, u8 digest[GF_SHA1_DIGEST_SIZE_HEXA]) {
+	u8 tmp[GF_SHA1_DIGEST_SIZE];
 	gf_sha1_csum (buf, buflen, tmp );
 	digest[0] = 0;
 	{
 		int i;
-		for ( i=0; i<20; i++ )
+		for ( i=0; i<GF_SHA1_DIGEST_SIZE; i++ )
 		{
 			char t[3];
 			t[2] = 0;

gpac-0.5.1.svn5491.tar.xz/src/utils/symbian_os.cpp -> gpac-0.5.1.svn5619.tar.xz/src/utils/symbian_os.cpp Changed

gpac-0.5.1.svn5491.tar.xz/src/utils/xml_parser.c -> gpac-0.5.1.svn5619.tar.xz/src/utils/xml_parser.c Changed

@@ -1980,14 +1980,11 @@
 	}\
 
 
-GF_EXPORT
-GF_Err gf_xml_parse_bit_sequence(GF_XMLNode *bsroot, char **specInfo, u32 *specInfoSize)
+static GF_Err gf_xml_parse_bit_sequence_bs(GF_XMLNode *bsroot, GF_BitStream *bs)
 {
 	u32 i, j;
 	GF_XMLNode *node;
 	GF_XMLAttribute *att;
-	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	if (!bs) return GF_OUT_OF_MEM;
 
 	i=0;
 	while ((node = (GF_XMLNode *) gf_list_enum(bsroot->content, &i))) {
@@ -1996,15 +1993,23 @@
 		u64 offset = 0;
 		s64 value = 0;
 		bin128 word128;
+		Float val_float = 0;
+		Double val_double = 0;
 		Bool use_word128 = GF_FALSE;
 		Bool use_text = GF_FALSE;
 		Bool big_endian = GF_TRUE;
+		Bool has_float = GF_FALSE;
+		Bool has_double = GF_FALSE;
 		const char *szFile = NULL;
 		const char *szString = NULL;
 		const char *szBase64 = NULL;
 		const char *szData = NULL;
 		if (node->type) continue;
-		if (stricmp(node->name, "BS") ) continue;
+		
+		if (stricmp(node->name, "BS") ) {
+			gf_xml_parse_bit_sequence_bs(node, bs);
+			continue;
+		}
 
 		j=0;
 		while ( (att = (GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
@@ -2012,6 +2017,12 @@
 				XML_SCAN_INT("%d", nb_bits);
 			} else if (!stricmp(att->name, "value")) {
 				XML_SCAN_INT(LLD, value);
+			} else if (!stricmp(att->name, "float")) {
+				sscanf(att->value, "%f", &val_float);
+				has_float = GF_TRUE;
+			} else if (!stricmp(att->name, "double")) {
+				sscanf(att->value, "%lf", &val_double);
+				has_double = GF_TRUE;
 			} else if (!stricmp(att->name, "mediaOffset") || !stricmp(att->name, "dataOffset")) {
 				XML_SCAN_INT(LLU, offset);
 			} else if (!stricmp(att->name, "dataLength")) {
@@ -2033,10 +2044,8 @@
 			} else if (!stricmp(att->name, "data")) {
 				szData = att->value;
 				if (!strnicmp(szData, "0x", 2)) szData += 2;
-			} else if (!stricmp(att->name, "endian")) {
-				if (!stricmp(att->value, "little")) {
-					big_endian = GF_FALSE;
-				}
+			} else if (!stricmp(att->name, "endian") && !stricmp(att->value, "little")) {
+				big_endian = GF_FALSE;
 			}
 		}
 		if (szString) {
@@ -2048,17 +2057,24 @@
 		} else if (szBase64) {
 			u32 len = (u32) strlen(szBase64);
 			char *data = (char *) gf_malloc(sizeof(char)*len);
-			u32 ret = (u32) gf_base64_decode((char *)szBase64, len, data, len);
+			u32 ret;
+			if (!data ) return GF_OUT_OF_MEM;
+
+			ret = (u32) gf_base64_decode((char *)szBase64, len, data, len);
 			if ((s32) ret >=0) {
 				gf_bs_write_int(bs, ret, nb_bits);
 				gf_bs_write_data(bs, data, ret);
 			} else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[XML/NHML] Error decoding base64 %s\n", att->value));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[XML/NHML] Error decoding base64 %s\n", att->value));
+				gf_free(data);
+				return GF_BAD_PARAM;
 			}
 			gf_free(data);
 		} else if (szData) {
 			u32 j, len = (u32) strlen(szData);
 			char *data = (char *) gf_malloc(sizeof(char)*len/2);
+			if (!data) return GF_OUT_OF_MEM;
+
 			for (j=0; j<len; j+=2) {
 				u32 v;
 				char szV[5];
@@ -2069,49 +2085,69 @@
 			gf_bs_write_int(bs, len/2, nb_bits);
 			gf_bs_write_data(bs, data, len/2);
 			gf_free(data);
+		} else if (has_float) {
+			gf_bs_write_float(bs, val_float);
+		} else if (has_double) {
+			gf_bs_write_double(bs, val_double);
 		} else if (nb_bits) {
 			if (!big_endian) {
 				if (nb_bits == 16)
 					gf_bs_write_u16_le(bs, (u32)value);
 				else if (nb_bits == 32)
 					gf_bs_write_u32_le(bs, (u32)value);
-				else
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[XML/NHML] Little-endian values can only be 16 or 32-bit\n"));
+				else {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[XML/NHML] Little-endian values can only be 16 or 32-bit\n"));
+					return GF_BAD_PARAM;
+				}
 			}
 			else {
 				if (nb_bits<33) gf_bs_write_int(bs, (s32) value, nb_bits);
 				else gf_bs_write_long_int(bs, value, nb_bits);
 			}
 		} else if (szFile) {
+			u32 read, remain;
 			char block[1024];
 			FILE *_tmp = gf_f64_open(szFile, use_text ? "rt" : "rb");
-			if (_tmp) {
-				u32 read, remain;
-				if (!size) {
-					gf_f64_seek(_tmp, 0, SEEK_END);
-					size = (u32) gf_f64_tell(_tmp);
-					//if offset only copy from offset until end
-					if ((u64) size > offset)
-						size -= (u32) offset;
-				}
-				remain = size;
-				gf_f64_seek(_tmp, offset, SEEK_SET);
-				while (remain) {
-					read = (u32) fread(block, 1, (remain>1024) ? 1024 : remain, _tmp);
-					gf_bs_write_data(bs, block, read);
-					remain -= size;
-				}
-				fclose(_tmp);
+
+			if (!_tmp) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[XML/NHML] Error opening file %s\n", szFile));
+				return GF_URL_ERROR;
 			}
+
+			if (!size) {
+				gf_f64_seek(_tmp, 0, SEEK_END);
+				size = (u32) gf_f64_tell(_tmp);
+				//if offset only copy from offset until end
+				if ((u64) size > offset)
+					size -= (u32) offset;
+			}
+			remain = size;
+			gf_f64_seek(_tmp, offset, SEEK_SET);
+			while (remain) {
+				read = (u32) fread(block, 1, (remain>1024) ? 1024 : remain, _tmp);
+				gf_bs_write_data(bs, block, read);
+				remain -= size;
+			}
+			fclose(_tmp);
 		} else if (use_word128) {
 			gf_bs_write_data(bs, (char *)word128, 16);
 		}
 	}
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_xml_parse_bit_sequence(GF_XMLNode *bsroot, char **data, u32 *data_size)
+{
+	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	if (!bs) return GF_OUT_OF_MEM;
+
+	gf_xml_parse_bit_sequence_bs(bsroot, bs);
+
 	gf_bs_align(bs);
-	gf_bs_get_content(bs, specInfo, specInfoSize);
+	gf_bs_get_content(bs, data, data_size);
 	gf_bs_del(bs);
 	return GF_OK;
-
 }
 
 #endif